little dectshark changes

git-svn-id: https://dedected.org/svn/trunk@83 8d8ab74c-27aa-4a3d-9bde-523a2bc1f624

5 files changed, 26 insertions, 15 deletions

diff --git a/com-on-air_cs-linux/tools/dectshark/dectshark.cpp b/com-on-air_cs-linux/tools/dectshark/dectshark.cpp
index 6fd5b63..aab3d3a 100644
--- a/com-on-air_cs-linux/tools/dectshark/dectshark.cpp
+++ b/com-on-air_cs-linux/tools/dectshark/dectshark.cpp
@@ -38,6 +38,9 @@ int main(int argc, char *argv[])
 }
 
 
+void printnil(char *,...)
+{
+}
 
 
 
diff --git a/com-on-air_cs-linux/tools/dectshark/dectshark.h b/com-on-air_cs-linux/tools/dectshark/dectshark.h
index 7fe362b..bac1d11 100644
--- a/com-on-air_cs-linux/tools/dectshark/dectshark.h
+++ b/com-on-air_cs-linux/tools/dectshark/dectshark.h
@@ -24,3 +24,13 @@
 #include "config.h"
 
 extern config cfg;
+
+
+
+void printnil(char *,...);
+
+#if 0
+#define LOG printf
+#else
+#define LOG printnil
+#endif
diff --git a/com-on-air_cs-linux/tools/dectshark/gui.cpp b/com-on-air_cs-linux/tools/dectshark/gui.cpp
index d3d8861..2b33c92 100644
--- a/com-on-air_cs-linux/tools/dectshark/gui.cpp
+++ b/com-on-air_cs-linux/tools/dectshark/gui.cpp
@@ -26,7 +26,7 @@ void print_gui::work()
 			{
 				case 'q':
 					cfg.stop();
-					goto end;
+					exit(0);
 					break;	
 			}
 		}
@@ -47,14 +47,12 @@ void print_gui::work()
 				case SNIFFMODE_SCAN:
 					break;
 				case SNIFFMODE_SYNC:
-					gui=new syncmode_gui(SW,SH);
+					gui=new syncmode_gui(COLS>=80?COLS:80,LINES>=25?LINES:25);
 					break;
 			}
 		}
 	}
 
-end:	return;
-
 }
 
 
@@ -71,7 +69,9 @@ void print_gui::initcurses()
 	init_pair(5,COLOR_YELLOW,COLOR_GREEN);
 	init_pair(6,COLOR_RED,COLOR_GREEN);
 
-	gui=new scanmode_gui(SW,SH);
+	
+
+	gui=new scanmode_gui(COLS>=80?COLS:80,LINES>=25?LINES:25);
 }
 
 void print_gui::refreshscreen()
diff --git a/com-on-air_cs-linux/tools/dectshark/gui.h b/com-on-air_cs-linux/tools/dectshark/gui.h
index 0679369..38bbf7e 100644
--- a/com-on-air_cs-linux/tools/dectshark/gui.h
+++ b/com-on-air_cs-linux/tools/dectshark/gui.h
@@ -6,9 +6,6 @@
 #include "scanmode_gui.h"
 #include "syncmode_gui.h"
 
-#define SW 80
-#define SH 25
-
 
 class print_gui
 {
diff --git a/com-on-air_cs-linux/tools/dectshark/mode_gui.h b/com-on-air_cs-linux/tools/dectshark/mode_gui.h
index 6abaf4d..1fd1541 100644
--- a/com-on-air_cs-linux/tools/dectshark/mode_gui.h
+++ b/com-on-air_cs-linux/tools/dectshark/mode_gui.h
@@ -3,19 +3,20 @@
 
 #include "dectshark.h"
 
+
 class mode_gui
 {
 public:
-	mode_gui()					{printf("ARRRR1!\n");}
-	mode_gui(int x,int y)				{printf("ARRRR2!\n");}
-	virtual ~mode_gui()				{printf("ARRRR3!\n");}
+	mode_gui()					{LOG("ARRRR1!\n");}
+	mode_gui(int x,int y)				{LOG("ARRRR2!\n");}
+	virtual ~mode_gui()				{LOG("ARRRR3!\n");}
 
-	virtual WINDOW *getmainwin()			{printf("ARRRR4!\n");return NULL;}
+	virtual WINDOW *getmainwin()			{LOG("ARRRR4!\n");return NULL;}
 
-	virtual void tick()				{printf("ARRRR5!\n");}
-	virtual unsigned int keypressed(int key)	{printf("ARRRR6!\n");return 0;}
+	virtual void tick()				{LOG("ARRRR5!\n");}
+	virtual unsigned int keypressed(int key)	{LOG("ARRRR6!\n");return 0;}
 
-	virtual void refreshscreen()			{printf("ARRRR7!\n");}
+	virtual void refreshscreen()			{LOG("ARRRR7!\n");}
 
 protected: