fixed : changed active task with wm_menu option

[chaz/tint2] / src / tint.c

diff --git a/src/tint.c b/src/tint.c
index 260d93cdecdb610c9e448ca0b8c7570b2d47d285..1b4dc488906f67fe76d9e481ca5d0ef3dc20e565 100644 (file)
--- a/src/tint.c
+++ b/src/tint.c
@@ -115,6 +115,10 @@ void init (int argc, char *argv[])
                        default_icon = imlib_load_image(path);
                g_free(path);
        }
+
+       // get monitor and desktop config
+       get_monitors();
+       get_desktops();
 }
 
 
@@ -299,10 +303,10 @@ void event_button_press (XEvent *e)
                e->xbutton.window = server.root_win;
                // icewm doesn't open under the mouse.
                // and xfce doesn't open at all.
-               //e->xbutton.x = e->xbutton.x_root;
-               //e->xbutton.y = e->xbutton.y_root;
+               e->xbutton.x = e->xbutton.x_root;
+               e->xbutton.y = e->xbutton.y_root;
                //printf("**** %d, %d\n", e->xbutton.x, e->xbutton.y);
-               XSetInputFocus(server.dsp, e->xbutton.window, RevertToParent, e->xbutton.time);
+               //XSetInputFocus(server.dsp, e->xbutton.window, RevertToParent, e->xbutton.time);
                XSendEvent(server.dsp, e->xbutton.window, False, ButtonPressMask, e);
                return;
        }
@@ -453,44 +457,7 @@ void event_property_notify (XEvent *e)
                }
                // Change active
                else if (at == server.atom._NET_ACTIVE_WINDOW) {
-                       GSList *l0;
-                       if (task_active) {
-                               for (i=0 ; i < nb_panel ; i++) {
-                                       for (j=0 ; j < panel1[i].nb_desktop ; j++) {
-                                               for (l0 = panel1[i].taskbar[j].area.list; l0 ; l0 = l0->next) {
-                                                       tsk = l0->data;
-                                                       tsk->area.is_active = 0;
-                                               }
-                                       }
-                               }
-                               task_active = 0;
-                       }
-                       Window w1 = window_get_active ();
-                       Task *t = task_get_task(w1);
-                       if (!t) {
-                               Window w2;
-                               if (XGetTransientForHint(server.dsp, w1, &w2) != 0)
-                                       if (w2) t = task_get_task(w2);
-                       }
-                       if (task_urgent == t) {
-                               init_precision();
-                               task_urgent = 0;
-                       }
-                       // put active state on all task (multi_desktop)
-                       if (t) {
-                               for (i=0 ; i < nb_panel ; i++) {
-                                       for (j=0 ; j < panel1[i].nb_desktop ; j++) {
-                                               for (l0 = panel1[i].taskbar[j].area.list; l0 ; l0 = l0->next) {
-                                                       tsk = l0->data;
-                                                       if (tsk->win == t->win) {
-                                                               tsk->area.is_active = 1;
-                                                               //printf("active monitor %d, task %s\n", panel1[i].monitor, tsk->title);
-                                                       }
-                                               }
-                                       }
-                               }
-                               task_active = t;
-                       }
+                       active_task();
                        panel_refresh = 1;
                }
                else if (at == server.atom._XROOTPMAP_ID) {
@@ -636,33 +603,8 @@ void event_configure_notify (Window win)
 {
        // change in root window (xrandr)
        if (win == server.root_win) {
-               int i, old_nb_panel = nb_panel;
-
                get_monitors();
-               if (panel_config.monitor >= 0)
-                       nb_panel = 1;
-               else
-                       nb_panel = server.nb_monitor;
-
-               if (old_nb_panel != nb_panel) {
-                       // changed number of panel
-                       printf("changed number of panel\n");
-                       //realloc(panel1, nb_panel * sizeof(Panel));
-               }
-               for (i=0 ; i < nb_panel && i < old_nb_panel ; i++) {
-                       Panel *panel = &panel1[i];
-
-                       init_panel_size_and_position(panel);
-                       XMoveResizeWindow(server.dsp, panel->main_win, panel->posx, panel->posy, panel->area.width, panel->area.height);
-                       set_panel_background(panel);
-
-                       // force the resize of childs
-                       GSList *l0;
-                       panel->area.resize = 1;
-                       for (l0 = panel->area.list; l0 ; l0 = l0->next)
-                               ((Area*)l0->data)->resize = 1;
-               }
-               panel_refresh = 1;
+               init_panel();
                return;
        }
 
@@ -884,9 +826,13 @@ int main (int argc, char *argv[])
                event_timer();
 
                switch (signal_pending) {
-                       case SIGUSR1:
+                       case SIGUSR1: // reload config file
                                signal_pending = 0;
-                               return 0;
+                               init_config();
+                               config_read_file (config_path);
+                               init_panel();
+                               cleanup_config();
+                               break;
                        case SIGINT:
                        case SIGTERM:
                        case SIGHUP: