cosmetic changes

git-svn-id: http://dzen.googlecode.com/svn/trunk@9 f2baff5b-bf2c-0410-a398-912abdc3d8b2

5 files changed, 15 insertions, 14 deletions

diff --git a/action.c b/action.c
index a6813cc..9a9fe6d 100644
--- a/action.c
+++ b/action.c
@@ -46,7 +46,7 @@ struct action_lookup  ac_lookup_table[] = {
     { 0, 0 }
 };
 
-Ev ev_table[256] = {{0}, {0}};
+Ev ev_table[MAXEVENTS] = {{0}, {0}};
 
 /* utilities */
 void
@@ -101,7 +101,7 @@ fill_ev_table(char *input)
             if (subtoken == NULL)
                 break;
             if( (str2 == token) && ((eid = get_ev_id(subtoken)) != -1))
-                0;
+                ;
             else if(eid == -1)
                 break;
 
diff --git a/action.h b/action.h
index 313efe5..47ed4d7 100644
--- a/action.h
+++ b/action.h
@@ -4,6 +4,10 @@
  *
  */
 
+#define MAXEVENTS 32
+#define MAXACTIONS 256
+#define MAXOPTIONS 256
+
 /* Event, Action data structures */
 typedef struct AS As;
 typedef struct EV Ev;
@@ -30,16 +34,16 @@ struct action_lookup {
 };
 
 struct AS {
-    char *options[256];
+    char *options[MAXOPTIONS];
     int (*handler)(char **);
 };
 
 struct EV {
     int isset;
-    As *action[256];
+    As *action[MAXACTIONS];
 };
 
-extern Ev ev_table[256];
+extern Ev ev_table[MAXEVENTS];
 
 /* utility functions */
 void do_action(int);
diff --git a/config.mk b/config.mk
index 2c98474..6663d07 100644
--- a/config.mk
+++ b/config.mk
@@ -15,10 +15,10 @@ INCS = -I. -I/usr/include -I${X11INC}
 LIBS = -L/usr/lib -lc -L${X11LIB} -lX11 -lpthread
 
 # flags
-CFLAGS = -Os ${INCS} -DVERSION=\"${VERSION}\"
-LDFLAGS = ${LIBS}
-#CFLAGS = -g -Wall -O2 ${INCS} -DVERSION=\"${VERSION}\" -DPOSIX_SOURCE
-#LDFLAGS = -g ${LIBS}
+#CFLAGS = -Os ${INCS} -DVERSION=\"${VERSION}\"
+#LDFLAGS = ${LIBS}
+CFLAGS = -g -Wall -Os ${INCS} -DVERSION=\"${VERSION}\" -DPOSIX_SOURCE
+LDFLAGS = -g ${LIBS}
 
 # Solaris
 #CFLAGS = -fast ${INCS} -DVERSION=\"${VERSION}\"
diff --git a/dzen.h b/dzen.h
index 1f1e2c6..e0904c2 100644
--- a/dzen.h
+++ b/dzen.h
@@ -72,7 +72,6 @@ struct SW {
 /* TODO: Remove unused variables */
 struct DZEN {
     int x, y, w, h;
-    int sx, sy, sw, sh;
     Bool running;
     unsigned long norm[ColLast];
 
@@ -95,7 +94,7 @@ struct DZEN {
     Fnt font;
 
     /* position */
-    int hx, hy, hw;
+    int hy, hw;
     int cur_line;
 
     pthread_t read_thread;
diff --git a/main.c b/main.c
index 0df4f5d..cb920a7 100644
--- a/main.c
+++ b/main.c
@@ -265,7 +265,7 @@ x_create_windows(void) {
         dzen.slave_win.width = dzen.title_win.width;
     }
     if(dzen.slave_win.width != DisplayWidth(dzen.dpy, dzen.screen)) {
-        dzen.slave_win.x = dzen.title_win.x + dzen.title_win.width/2 - dzen.slave_win.width/2;
+        dzen.slave_win.x = dzen.title_win.x + (dzen.title_win.width- dzen.slave_win.width)/2;
         if(dzen.slave_win.x < 0)
             dzen.slave_win.x = 0;
         if(dzen.slave_win.width > DisplayWidth(dzen.dpy, dzen.screen))
@@ -378,14 +378,12 @@ main(int argc, char *argv[]) {
         }
         else if(!strncmp(argv[i], "-x", 3)) {
             if(++i < argc) dzen.title_win.x = dzen.slave_win.x = atoi(argv[i]);
-            //if(++i < argc) dzen.hx = atoi(argv[i]);
         }
         else if(!strncmp(argv[i], "-y", 3)) {
             if(++i < argc) dzen.hy = atoi(argv[i]);
         }
         else if(!strncmp(argv[i], "-w", 3)) {
             if(++i < argc) dzen.slave_win.width = atoi(argv[i]);
-            //if(++i < argc) dzen.hw = atoi(argv[i]);
         }
         else if(!strncmp(argv[i], "-tw", 3)) {
             if(++i < argc) dzen.title_win.width = atoi(argv[i]);