diff -ru fspanel-0.7/fspanel.c fspanel-0.7p/fspanel.c --- fspanel-0.7/fspanel.c Mon Jun 11 09:59:48 2001 +++ fspanel-0.7p/fspanel.c Mon Aug 20 10:00:57 2001 @@ -24,12 +24,13 @@ #include "fspanel.h" /* you can edit these */ +#define WITHOUT_CLOCK #define MAX_TASK_WIDTH 145 #define ICONWIDTH 16 #define ICONHEIGHT 16 #define WINHEIGHT 24 #define WINWIDTH (scr_width) /* don't edit these */ #define TEXTPAD 6 @@ -423,7 +424,10 @@ while (!xfs); /*time_width = XTextWidth (xfs, "88:88", 5); */ +#ifdef WITH_CLOCK #define time_width (35) +#endif + text_y = xfs->ascent + ((WINHEIGHT - xfs->ascent) / 2); gcv.font = xfs->fid; @@ -522,6 +526,7 @@ XSetClipMask (dd, fore_gc, None); } +#ifdef WITH_CLOCK void gui_draw_clock (taskbar * tb) { @@ -557,6 +562,8 @@ time_str, 5); } +#endif + void draw_dot (Window win, int x, int y) { @@ -607,7 +614,11 @@ draw_up_triangle (tb); draw_down_triangle (tb); +#ifdef WITH_CLOCK width = WINWIDTH - 80 - time_width - (TEXTPAD * 4); +#else + width = WINWIDTH - 80 - (TEXTPAD * 4); +#endif x = 80; if (tb->num_tasks == 0) @@ -637,8 +648,10 @@ set_foreground (0); fill_rect (tb, x + 2, 0, WINWIDTH, WINHEIGHT); } - + +#ifdef WITH_CLOCK gui_draw_clock (tb); +#endif gui_draw_vline (tb, 8); gui_draw_vline (tb, 74); @@ -989,8 +1002,13 @@ tv.tv_sec = 60 - lt->tm_sec; FD_ZERO (&fd); FD_SET (xfd, &fd); + if (select (xfd + 1, &fd, 0, 0, &tv) == 0) +#ifdef WITH_CLOCK gui_draw_clock (tb); +#else + ; +#endif while (XPending (dd)) {