fixed switch between config with killall -SIGUSR1 tint2

[chaz/tint2] / src / tint.c

diff --git a/src/tint.c b/src/tint.c
index 35980bffbcb07ce4273d8024b41bcd7494d2d38e..3eebf88dfe2cb5bf3f670b8949abfcd7dc8479ea 100644 (file)
--- a/src/tint.c
+++ b/src/tint.c
@@ -103,13 +103,42 @@ void init (int argc, char *argv[])
        XSelectInput (server.dsp, server.root_win, PropertyChangeMask|StructureNotifyMask);
 
        setlocale (LC_ALL, "");
+
+       // load default icon
+       int i;
+       char *path;
+       const gchar * const *data_dirs;
+       data_dirs = g_get_system_data_dirs ();
+       for (i = 0; data_dirs[i] != NULL; i++)  {
+               path = g_build_filename(data_dirs[i], "tint2", "default_icon.png", NULL);
+               if (g_file_test (path, G_FILE_TEST_EXISTS))
+                       default_icon = imlib_load_image(path);
+               g_free(path);
+       }
+
+       // get monitor and desktop config
+       get_monitors();
+       get_desktops();
 }
 
 
 void cleanup()
 {
+       cleanup_systray();
        cleanup_panel();
 
+       if (default_icon) {
+               imlib_context_set_image(default_icon);
+               imlib_free_image();
+       }
+       if (g_tooltip.window) {
+               XDestroyWindow(server.dsp, g_tooltip.window);
+               g_tooltip.window = 0;
+       }
+       if (g_tooltip.font_desc) {
+               pango_font_description_free(g_tooltip.font_desc);
+               g_tooltip.font_desc = 0;
+       }
        if (time1_font_desc) pango_font_description_free(time1_font_desc);
        if (time2_font_desc) pango_font_description_free(time2_font_desc);
        if (time1_format) g_free(time1_format);
@@ -291,13 +320,6 @@ void event_button_release (XEvent *e)
        Panel *panel = get_panel(e->xany.window);
        if (!panel) return;
 
-       if (wm_menu && click_padding(panel, e->xbutton.x, e->xbutton.y)) {
-                       // forward the click to the desktop window (thanks conky)
-                       e->xbutton.window = server.root_win;
-                       XSendEvent(server.dsp, e->xbutton.window, False, ButtonReleaseMask, e);
-                       return;
-       }
-
        int action = TOGGLE_ICONIFY;
        switch (e->xbutton.button) {
                case 2:
@@ -524,6 +546,9 @@ void event_property_notify (XEvent *e)
                                panel_refresh = 1;
                        }
                }
+// We do not check for the iconified state, since it only unsets our active window
+// but in openbox a shaded window is considered iconified. So we would loose the active window
+// property on unshading it again (commented 01.10.2009)
 //             else if (at == server.atom.WM_STATE) {
 //                     // Iconic state
 //                     // TODO : try to delete following code
@@ -613,42 +638,41 @@ void event_expose (XEvent *e)
 
 void event_configure_notify (Window win)
 {
+       // change in root window (xrandr)
        if (win == server.root_win) {
-               printf("ConfigureNotify on root\n");
-               //XMoveWindow(dpy, fen, pos_x, pos_y);
-               //XResizeWindow(dpy, fen, largeur, hauteur);
+               get_monitors();
+               init_panel();
+               return;
        }
-       else {
-               // check 'win' move in systray
-               TrayWindow *traywin;
-               GSList *l;
-               for (l = systray.list_icons; l ; l = l->next) {
-                       traywin = (TrayWindow*)l->data;
-                       if (traywin->id == win) {
-                               //printf("move tray %d\n", traywin->x);
-                               XMoveResizeWindow(server.dsp, traywin->id, traywin->x, traywin->y, traywin->width, traywin->height);
-                               panel_refresh = 1;
-                               return;
-                       }
-               }
 
-               // check 'win' move in another monitor
-               if (nb_panel == 1) return;
-               if (server.nb_monitor == 1) return;
-               Task *tsk = task_get_task (win);
-               if (!tsk) return;
-
-               Panel *p = tsk->area.panel;
-               if (p->monitor != window_get_monitor (win)) {
-                       remove_task (tsk);
-                       add_task (win);
-                       if (win == window_get_active ()) {
-                               Task *tsk = task_get_task (win);
-                               tsk->area.is_active = 1;
-                               task_active = tsk;
-                       }
+       // 'win' is a trayer icon
+       TrayWindow *traywin;
+       GSList *l;
+       for (l = systray.list_icons; l ; l = l->next) {
+               traywin = (TrayWindow*)l->data;
+               if (traywin->id == win) {
+                       //printf("move tray %d\n", traywin->x);
+                       XMoveResizeWindow(server.dsp, traywin->id, traywin->x, traywin->y, traywin->width, traywin->height);
                        panel_refresh = 1;
+                       return;
+               }
+       }
+
+       // 'win' move in another monitor
+       if (nb_panel == 1) return;
+       Task *tsk = task_get_task (win);
+       if (!tsk) return;
+
+       Panel *p = tsk->area.panel;
+       if (p->monitor != window_get_monitor (win)) {
+               remove_task (tsk);
+               add_task (win);
+               if (win == window_get_active ()) {
+                       Task *tsk = task_get_task (win);
+                       tsk->area.is_active = 1;
+                       task_active = tsk;
                }
+               panel_refresh = 1;
        }
 }
 
@@ -731,7 +755,7 @@ int main (int argc, char *argv[])
        GSList *it;
 
        init (argc, argv);
-load_config:
+
        i = 0;
        init_config();
        if (config_path)
@@ -839,9 +863,13 @@ load_config:
                event_timer();
 
                switch (signal_pending) {
-                       case SIGUSR1:
+                       case SIGUSR1: // reload config file
                                signal_pending = 0;
-                               goto load_config;
+                               init_config();
+                               config_read_file (config_path);
+                               init_panel();
+                               cleanup_config();
+                               break;
                        case SIGINT:
                        case SIGTERM:
                        case SIGHUP: