X-Git-Url: https://git.brokenzipper.com/gitweb?a=blobdiff_plain;f=src%2Ftint.c;h=d0985622cdbc5d4b55d9620b096c96eb18622de7;hb=b0ff4722b169b9bc26240a0fdecbc2d911f7afb8;hp=b84ee185c1ee7879c2eed94d86935e5f905ebb23;hpb=bf2fd3cf8c96d2a747ba4ea3bd8bd9b0a0d7e0e7;p=chaz%2Ftint2 diff --git a/src/tint.c b/src/tint.c index b84ee18..d098562 100644 --- a/src/tint.c +++ b/src/tint.c @@ -37,6 +37,7 @@ #include "taskbar.h" #include "systraybar.h" #include "panel.h" +#include "tooltip.h" void signal_handler(int sig) @@ -46,40 +47,62 @@ void signal_handler(int sig) } -void init () +void init (int argc, char *argv[]) { + int c; + + // read options + while ((c = getopt(argc , argv, "c:j:v")) != -1) { + switch (c) { + case 'c': + config_path = strdup (optarg); + break; + case 'j': + thumbnail_path = strdup (optarg); + break; + case 'v': + printf("tint2 version 0.7-svn\n"); + exit(0); + break; + } + } + // Set signal handler - signal(SIGUSR1, signal_handler); - signal(SIGINT, signal_handler); - signal(SIGTERM, signal_handler); - - // set global data - memset(&server, 0, sizeof(Server_global)); - - server.dsp = XOpenDisplay (NULL); - if (!server.dsp) { - fprintf(stderr, "Could not open display.\n"); - exit(0); - } - server_init_atoms (); - server.screen = DefaultScreen (server.dsp); + signal(SIGUSR1, signal_handler); + signal(SIGINT, signal_handler); + signal(SIGTERM, signal_handler); + signal(SIGHUP, signal_handler); + signal(SIGCHLD, SIG_IGN); // don't have to wait() after fork() + signal(SIGALRM, tooltip_sighandler); + + // set global data + memset(&server, 0, sizeof(Server_global)); + memset(&systray, 0, sizeof(Systraybar)); + + server.dsp = XOpenDisplay (NULL); + if (!server.dsp) { + fprintf(stderr, "tint2 exit : could not open display.\n"); + exit(0); + } + server_init_atoms (); + server.screen = DefaultScreen (server.dsp); server.root_win = RootWindow(server.dsp, server.screen); - server.depth = DefaultDepth (server.dsp, server.screen); - server.visual = DefaultVisual (server.dsp, server.screen); - server.desktop = server_get_current_desktop (); + server.depth = DefaultDepth (server.dsp, server.screen); + server.visual = DefaultVisual (server.dsp, server.screen); + server.desktop = server_get_current_desktop (); XGCValues gcv; server.gc = XCreateGC (server.dsp, server.root_win, (unsigned long)0, &gcv) ; - XSetErrorHandler ((XErrorHandler) server_catch_error); + XSetErrorHandler ((XErrorHandler) server_catch_error); - imlib_context_set_display (server.dsp); - imlib_context_set_visual (server.visual); - imlib_context_set_colormap (DefaultColormap (server.dsp, server.screen)); + imlib_context_set_display (server.dsp); + imlib_context_set_visual (server.visual); + imlib_context_set_colormap (DefaultColormap (server.dsp, server.screen)); - /* Catch events */ - XSelectInput (server.dsp, server.root_win, PropertyChangeMask|StructureNotifyMask); + /* Catch events */ + XSelectInput (server.dsp, server.root_win, PropertyChangeMask|StructureNotifyMask); - setlocale (LC_ALL, ""); + setlocale (LC_ALL, ""); } @@ -87,238 +110,384 @@ void cleanup() { cleanup_panel(); - 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); - if (time2_format) g_free(time2_format); + 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); + if (time2_format) g_free(time2_format); +#ifdef ENABLE_BATTERY + if (bat1_font_desc) pango_font_description_free(bat1_font_desc); + if (bat2_font_desc) pango_font_description_free(bat2_font_desc); + if (battery_low_cmd) g_free(battery_low_cmd); + if (path_energy_now) g_free(path_energy_now); + if (path_energy_full) g_free(path_energy_full); + if (path_current_now) g_free(path_current_now); + if (path_status) g_free(path_status); +#endif + if (clock_lclick_command) g_free(clock_lclick_command); + if (clock_rclick_command) g_free(clock_rclick_command); + if (config_path) g_free(config_path); + if (thumbnail_path) g_free(thumbnail_path); + + if (server.monitor) free(server.monitor); + XFreeGC(server.dsp, server.gc); + XCloseDisplay(server.dsp); +} + + +Taskbar *click_taskbar (Panel *panel, int x, int y) +{ + Taskbar *tskbar; + int i; + + if (panel_horizontal) { + for (i=0; i < panel->nb_desktop ; i++) { + tskbar = &panel->taskbar[i]; + if (tskbar->area.on_screen && x >= tskbar->area.posx && x <= (tskbar->area.posx + tskbar->area.width)) + return tskbar; + } + } + else { + for (i=0; i < panel->nb_desktop ; i++) { + tskbar = &panel->taskbar[i]; + if (tskbar->area.on_screen && y >= tskbar->area.posy && y <= (tskbar->area.posy + tskbar->area.height)) + return tskbar; + } + } + return NULL; +} + + +Task *click_task (Panel *panel, int x, int y) +{ + GSList *l0; + Taskbar *tskbar; + + if ( (tskbar = click_taskbar(panel, x, y)) ) { + if (panel_horizontal) { + Task *tsk; + for (l0 = tskbar->area.list; l0 ; l0 = l0->next) { + tsk = l0->data; + if (tsk->area.on_screen && x >= tsk->area.posx && x <= (tsk->area.posx + tsk->area.width)) { + return tsk; + } + } + } + else { + Task *tsk; + for (l0 = tskbar->area.list; l0 ; l0 = l0->next) { + tsk = l0->data; + if (tsk->area.on_screen && y >= tsk->area.posy && y <= (tsk->area.posy + tsk->area.height)) { + return tsk; + } + } + } + } + return NULL; +} + - if (server.monitor) free(server.monitor); - XFreeGC(server.dsp, server.gc); - XCloseDisplay(server.dsp); +int click_padding(Panel *panel, int x, int y) +{ + if (panel_horizontal) { + if (x < panel->area.paddingxlr || x > panel->area.width-panel->area.paddingxlr) + return 1; + } + else { + if (y < panel->area.paddingxlr || y > panel->area.height-panel->area.paddingxlr) + return 1; + } + return 0; +} + + +int click_clock(Panel *panel, int x, int y) +{ + Clock clk = panel->clock; + if (panel_horizontal) { + if (clk.area.on_screen && x >= clk.area.posx && x <= (clk.area.posx + clk.area.width)) + return TRUE; + } else { + if (clk.area.on_screen && y >= clk.area.posy && y <= (clk.area.posy + clk.area.height)) + return TRUE; + } + return FALSE; } void window_action (Task *tsk, int action) { - switch (action) { - case CLOSE: - set_close (tsk->win); - break; - case TOGGLE: - set_active(tsk->win); - break; - case ICONIFY: - XIconifyWindow (server.dsp, tsk->win, server.screen); - break; - case TOGGLE_ICONIFY: - if (tsk == task_active) XIconifyWindow (server.dsp, tsk->win, server.screen); - else set_active (tsk->win); - break; - case SHADE: - window_toggle_shade (tsk->win); - break; - } + if (!tsk) return; + int desk; + switch (action) { + case CLOSE: + set_close (tsk->win); + break; + case TOGGLE: + set_active(tsk->win); + break; + case ICONIFY: + XIconifyWindow (server.dsp, tsk->win, server.screen); + break; + case TOGGLE_ICONIFY: + if (tsk == task_active) XIconifyWindow (server.dsp, tsk->win, server.screen); + else set_active (tsk->win); + break; + case SHADE: + window_toggle_shade (tsk->win); + break; + case MAXIMIZE_RESTORE: + window_maximize_restore (tsk->win); + break; + case MAXIMIZE: + window_maximize_restore (tsk->win); + break; + case RESTORE: + window_maximize_restore (tsk->win); + break; + case DESKTOP_LEFT: + if ( tsk->desktop == 0 ) break; + desk = tsk->desktop - 1; + windows_set_desktop(tsk->win, desk); + if (desk == server.desktop) + set_active(tsk->win); + break; + case DESKTOP_RIGHT: + if (tsk->desktop == server.nb_desktop ) break; + desk = tsk->desktop + 1; + windows_set_desktop(tsk->win, desk); + if (desk == server.desktop) + set_active(tsk->win); + } } void event_button_press (XEvent *e) { - Panel *panel = get_panel(e->xany.window); + Panel *panel = get_panel(e->xany.window); if (!panel) return; - if (panel_mode != MULTI_DESKTOP) { - // drag and drop disabled - XLowerWindow (server.dsp, panel->main_win); - return; - } - - GSList *l0; - Taskbar *tskbar; - int x = e->xbutton.x; - int y = e->xbutton.y; - for (l0 = panel->area.list; l0 ; l0 = l0->next) { - tskbar = l0->data; - if (x >= tskbar->area.posx && x <= (tskbar->area.posx + tskbar->area.width)) - break; - } - - if (l0) { - Task *tsk; - for (l0 = tskbar->area.list; l0 ; l0 = l0->next) { - tsk = l0->data; - if (x >= tsk->area.posx && x <= (tsk->area.posx + tsk->area.width)) { - task_drag = tsk; - break; - } - } - } - - XLowerWindow (server.dsp, panel->main_win); + task_drag = click_task(panel, e->xbutton.x, e->xbutton.y); + + if (wm_menu && !task_drag && !click_clock(panel, e->xbutton.x, e->xbutton.y) && (e->xbutton.button != 1) ) { + // forward the click to the desktop window (thanks conky) + XUngrabPointer(server.dsp, e->xbutton.time); + 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; + //printf("**** %d, %d\n", e->xbutton.x, e->xbutton.y); + XSetInputFocus(server.dsp, e->xbutton.window, RevertToParent, e->xbutton.time); + XSendEvent(server.dsp, e->xbutton.window, False, ButtonPressMask, e); + return; + } + + XLowerWindow (server.dsp, panel->main_win); } void event_button_release (XEvent *e) { - // TODO: convert event_button_press(int x, int y) to area->event_button_press() - - Panel *panel = get_panel(e->xany.window); + Panel *panel = get_panel(e->xany.window); if (!panel) return; - int action = TOGGLE_ICONIFY; - int x = e->xbutton.x; - int y = e->xbutton.y; - switch (e->xbutton.button) { - case 2: - action = mouse_middle; - break; - case 3: - action = mouse_right; - break; - case 4: - action = mouse_scroll_up; - break; - case 5: - action = mouse_scroll_down; - break; - } - - // search taskbar - Taskbar *tskbar; - GSList *l0; - for (l0 = panel->area.list; l0 ; l0 = l0->next) { - tskbar = l0->data; - if (x >= tskbar->area.posx && x <= (tskbar->area.posx + tskbar->area.width)) - goto suite; - } - - // TODO: check better solution to keep window below - XLowerWindow (server.dsp, panel->main_win); - task_drag = 0; - return; - -suite: - // drag and drop task - if (task_drag) { - if (tskbar != task_drag->area.parent && action == TOGGLE_ICONIFY) { - if (task_drag->desktop != ALLDESKTOP && panel_mode == MULTI_DESKTOP) { - windows_set_desktop(task_drag->win, tskbar->desktop); - if (tskbar->desktop == server.desktop) - set_active(task_drag->win); - task_drag = 0; - } - return; - } - else task_drag = 0; - } - - // switch desktop - if (panel_mode == MULTI_DESKTOP) - if (tskbar->desktop != server.desktop && action != CLOSE) - set_desktop (tskbar->desktop); - - // action on task - Task *tsk; - GSList *l; - for (l = tskbar->area.list ; l ; l = l->next) { - tsk = l->data; - if (x >= tsk->area.posx && x <= (tsk->area.posx + tsk->area.width)) { - window_action (tsk, action); - break; - } - } - - // to keep window below - XLowerWindow (server.dsp, panel->main_win); + int action = TOGGLE_ICONIFY; + switch (e->xbutton.button) { + case 2: + action = mouse_middle; + break; + case 3: + action = mouse_right; + break; + case 4: + action = mouse_scroll_up; + break; + case 5: + action = mouse_scroll_down; + break; + case 6: + action = mouse_tilt_left; + break; + case 7: + action = mouse_tilt_right; + break; + } + + if ( click_clock(panel, e->xbutton.x, e->xbutton.y)) { + clock_action(e->xbutton.button); + XLowerWindow (server.dsp, panel->main_win); + task_drag = 0; + return; + } + + Taskbar *tskbar; + if ( !(tskbar = click_taskbar(panel, e->xbutton.x, e->xbutton.y)) ) { + // TODO: check better solution to keep window below + XLowerWindow (server.dsp, panel->main_win); + task_drag = 0; + return; + } + + // drag and drop task + if (task_drag) { + if (tskbar != task_drag->area.parent && action == TOGGLE_ICONIFY) { + if (task_drag->desktop != ALLDESKTOP && panel_mode == MULTI_DESKTOP) { + windows_set_desktop(task_drag->win, tskbar->desktop); + if (tskbar->desktop == server.desktop) + set_active(task_drag->win); + task_drag = 0; + } + return; + } + else task_drag = 0; + } + + // switch desktop + if (panel_mode == MULTI_DESKTOP) { + if (tskbar->desktop != server.desktop && action != CLOSE && action != DESKTOP_LEFT && action != DESKTOP_RIGHT) + set_desktop (tskbar->desktop); + } + + // action on task + window_action( click_task(panel, e->xbutton.x, e->xbutton.y), action); + + // to keep window below + XLowerWindow (server.dsp, panel->main_win); } -void event_property_notify (Window win, Atom at) +void event_property_notify (XEvent *e) { - int i, j; - Task *tsk; - - if (win == server.root_win) { - if (!server.got_root_win) { - XSelectInput (server.dsp, server.root_win, PropertyChangeMask|StructureNotifyMask); - server.got_root_win = 1; - } - - /* Change number of desktops */ - else if (at == server.atom._NET_NUMBER_OF_DESKTOPS) { - server.nb_desktop = server_get_number_of_desktop (); - cleanup_taskbar(); + int i, j; + Task *tsk; + Window win = e->xproperty.window; + Atom at = e->xproperty.atom; + + if (win == server.root_win) { + if (!server.got_root_win) { + XSelectInput (server.dsp, server.root_win, PropertyChangeMask|StructureNotifyMask); + server.got_root_win = 1; + } + + // Change number of desktops + else if (at == server.atom._NET_NUMBER_OF_DESKTOPS) { + server.nb_desktop = server_get_number_of_desktop (); + cleanup_taskbar(); init_taskbar(); visible_object(); for (i=0 ; i < nb_panel ; i++) { - set_resize(&panel1[i]); + panel1[i].area.resize = 1; } task_refresh_tasklist(); panel_refresh = 1; - } - /* Change desktop */ - else if (at == server.atom._NET_CURRENT_DESKTOP) { - server.desktop = server_get_current_desktop (); - if (panel_mode != MULTI_DESKTOP) { + } + // Change desktop + else if (at == server.atom._NET_CURRENT_DESKTOP) { + int old_desktop = server.desktop; + server.desktop = server_get_current_desktop (); + for (i=0 ; i < nb_panel ; i++) { + Panel *panel = &panel1[i]; + if (panel_mode == MULTI_DESKTOP && panel->g_taskbar.use_active) { + // redraw both taskbar + panel->taskbar[old_desktop].area.is_active = 0; + panel->taskbar[old_desktop].area.redraw = 1; + panel->taskbar[server.desktop].area.is_active = 1; + panel->taskbar[server.desktop].area.redraw = 1; + panel_refresh = 1; + } + // check ALLDESKTOP task => resize taskbar + Taskbar *tskbar; + Task *tsk; + GSList *l; + tskbar = &panel->taskbar[old_desktop]; + for (l = tskbar->area.list; l ; l = l->next) { + tsk = l->data; + if (tsk->desktop == ALLDESKTOP) { + tsk->area.on_screen = 0; + tskbar->area.resize = 1; + panel_refresh = 1; + } + } + tskbar = &panel->taskbar[server.desktop]; + for (l = tskbar->area.list; l ; l = l->next) { + tsk = l->data; + if (tsk->desktop == ALLDESKTOP) { + tsk->area.on_screen = 1; + tskbar->area.resize = 1; + } + } + } + if (panel_mode != MULTI_DESKTOP) { visible_object(); - } - } - /* Window list */ - else if (at == server.atom._NET_CLIENT_LIST) { - task_refresh_tasklist(); - panel_refresh = 1; - } - /* Change active */ - else if (at == server.atom._NET_ACTIVE_WINDOW) { - GSList *l0; - if (task_active) { + } + } + // Window list + else if (at == server.atom._NET_CLIENT_LIST) { + task_refresh_tasklist(); + panel_refresh = 1; + } + // 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; - } + for (l0 = panel1[i].taskbar[j].area.list; l0 ; l0 = l0->next) { + tsk = l0->data; + tsk->area.is_active = 0; + } } } - task_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 (t) { + 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); - } - } + 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; + task_active = t; } - panel_refresh = 1; - } - /* Wallpaper changed */ - else if (at == server.atom._XROOTPMAP_ID) { + panel_refresh = 1; + } + else if (at == server.atom._XROOTPMAP_ID) { + // change Wallpaper for (i=0 ; i < nb_panel ; i++) { set_panel_background(&panel1[i]); } - panel_refresh = 1; - } - } - else { - tsk = task_get_task (win); - if (!tsk) return; - //printf("atom root_win = %s, %s\n", XGetAtomName(server.dsp, at), tsk->title); - - /* Window title changed */ - if (at == server.atom._NET_WM_VISIBLE_NAME || at == server.atom._NET_WM_NAME || at == server.atom.WM_NAME) { + panel_refresh = 1; + } + } + else { + tsk = task_get_task (win); + if (!tsk) { + if ( at != server.atom._NET_WM_STATE) + return; + else if ( !(tsk = add_task(win)) ) + return; + } + //printf("atom root_win = %s, %s\n", XGetAtomName(server.dsp, at), tsk->title); + + // Window title changed + if (at == server.atom._NET_WM_VISIBLE_NAME || at == server.atom._NET_WM_NAME || at == server.atom.WM_NAME) { Task *tsk2; GSList *l0; get_title(tsk); @@ -334,30 +503,44 @@ void event_property_notify (Window win, Atom at) } } } - panel_refresh = 1; - } - /* Iconic state */ - else if (at == server.atom.WM_STATE) { - if (window_is_iconified (win)) - if (task_active) { - if (task_active->win == tsk->win) { - Task *tsk2; - GSList *l0; - 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) { - tsk2 = l0->data; - tsk2->area.is_active = 0; - } - } - } - task_active = 0; - } - } - } - /* Window icon changed */ - else if (at == server.atom._NET_WM_ICON) { - get_icon(tsk); + panel_refresh = 1; + } + // Demand attention + else if (at == server.atom._NET_WM_STATE) { + if (window_is_urgent (win)) { + task_urgent = tsk; + tick_urgent = 0; + time_precision = 1; + } + if (window_is_skip_taskbar(win)) { + remove_task( tsk ); + panel_refresh = 1; + } + } +// else if (at == server.atom.WM_STATE) { +// // Iconic state +// // TODO : try to delete following code +// if (window_is_iconified (win)) { +// if (task_active) { +// if (task_active->win == tsk->win) { +// Task *tsk2; +// GSList *l0; +// 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) { +// tsk2 = l0->data; +// tsk2->area.is_active = 0; +// } +// } +// } +// task_active = 0; +// } +// } +// } +// } + // Window icon changed + else if (at == server.atom._NET_WM_ICON) { + get_icon(tsk); Task *tsk2; GSList *l0; for (i=0 ; i < nb_panel ; i++) { @@ -367,179 +550,342 @@ void event_property_notify (Window win, Atom at) if (tsk->win == tsk2->win && tsk != tsk2) { tsk2->icon_width = tsk->icon_width; tsk2->icon_height = tsk->icon_height; - tsk2->icon_data = tsk->icon_data; + tsk2->icon = tsk->icon; + tsk2->icon_active = tsk->icon_active; tsk2->area.redraw = 1; } } } } - panel_refresh = 1; - } - /* Window desktop changed */ - else if (at == server.atom._NET_WM_DESKTOP) { - remove_task (tsk); - add_task (win); - panel_refresh = 1; - } - - if (!server.got_root_win) server.root_win = RootWindow (server.dsp, server.screen); - } + panel_refresh = 1; + } + // Window desktop changed + else if (at == server.atom._NET_WM_DESKTOP) { + int desktop = window_get_desktop (win); + int active = tsk->area.is_active; + //printf(" Window desktop changed %d, %d\n", tsk->desktop, desktop); + // bug in windowmaker : send unecessary 'desktop changed' when focus changed + if (desktop != tsk->desktop) { + remove_task (tsk); + tsk = add_task (win); + if (tsk && active) { + tsk->area.is_active = 1; + task_active = tsk; + } + panel_refresh = 1; + } + } + else if (at == server.atom.WM_HINTS) { + XWMHints* wmhints = XGetWMHints(server.dsp, win); + if (wmhints && wmhints->flags & XUrgencyHint) { + task_urgent = tsk; + tick_urgent = 0; + time_precision = 1; + } + XFree(wmhints); + } + + if (!server.got_root_win) server.root_win = RootWindow (server.dsp, server.screen); + } +} + + +void event_expose (XEvent *e) +{ + if (e->xany.window == g_tooltip.window) + tooltip_update(); + else { + Panel *panel; + panel = get_panel(e->xany.window); + if (!panel) return; + // TODO : one panel_refresh per panel ? + panel_refresh = 1; + } } void event_configure_notify (Window win) { - if (panel_mode != SINGLE_MONITOR) 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)) { - // task on another monitor - remove_task (tsk); - add_task (win); - panel_refresh = 1; - } + // change in root window (xrandr) + if (win == server.root_win) { + int i, old_monitor = server.nb_monitor; + + get_monitors(); + if (old_monitor != server.nb_monitor) { + } + for (i=0 ; i < 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; + return; + } + + // '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; + } } void event_timer() { - struct timeval stv; + struct timeval stv; + int i; - if (!time1_format) return; + if (gettimeofday(&stv, 0)) return; - if (gettimeofday(&stv, 0)) return; + if (abs(stv.tv_sec - time_clock.tv_sec) < time_precision) return; + time_clock.tv_sec = stv.tv_sec; + time_clock.tv_sec -= time_clock.tv_sec % time_precision; - if (abs(stv.tv_sec - time_clock.tv_sec) < time_precision) return; + // urgent task + if (task_urgent) { + if (tick_urgent < max_tick_urgent) { + task_urgent->area.is_active = !task_urgent->area.is_active; + task_urgent->area.redraw = 1; + tick_urgent++; + } + } - // update clock - time_clock.tv_sec = stv.tv_sec; - time_clock.tv_sec -= time_clock.tv_sec % time_precision; + // update battery +#ifdef ENABLE_BATTERY + if (panel1[0].battery.area.on_screen) { + update_battery(); + for (i=0 ; i < nb_panel ; i++) + panel1[i].battery.area.resize = 1; + } +#endif - int i; - for (i=0 ; i < nb_panel ; i++) { - panel1[i].clock.area.redraw = 1; - panel1[i].clock.area.resize = 1; + // update clock + if (time1_format) { + for (i=0 ; i < nb_panel ; i++) + panel1[i].clock.area.resize = 1; } - panel_refresh = 1; + panel_refresh = 1; } -int main (int argc, char *argv[]) +void dnd_message(XClientMessageEvent *e) { - XEvent e; - fd_set fd; - int x11_fd, i, c; - struct timeval tv; - Panel *panel; + Panel *panel = get_panel(e->window); + int x, y, mapX, mapY; + Window child; + x = (e->data.l[2] >> 16) & 0xFFFF; + y = e->data.l[2] & 0xFFFF; + XTranslateCoordinates(server.dsp, server.root_win, e->window, x, y, &mapX, &mapY, &child); + Task* task = click_task(panel, mapX, mapY); + if (task) { + if (task->desktop != server.desktop ) + set_desktop (task->desktop); + window_action(task, TOGGLE); + } + + // send XdndStatus event to get more XdndPosition events + XClientMessageEvent se; + se.type = ClientMessage; + se.window = e->data.l[0]; + se.message_type = server.atom.XdndStatus; + se.format = 32; + se.data.l[0] = e->window; // XID of the target window + se.data.l[1] = 0; // bit 0: accept drop bit 1: send XdndPosition events if inside rectangle + se.data.l[2] = 0; // Rectangle x,y for which no more XdndPosition events + se.data.l[3] = (1 << 16) | 1; // Rectangle w,h for which no more XdndPosition events + se.data.l[4] = None; // None = drop will not be accepted + XSendEvent(server.dsp, e->data.l[0], False, NoEventMask, (XEvent*)&se); +} - c = getopt (argc, argv, "c:"); - init (); +int main (int argc, char *argv[]) +{ + XEvent e; + fd_set fd; + int x11_fd, i; + struct timeval tv; + Panel *panel; + GSList *it; + + init (argc, argv); load_config: - i = 0; + i = 0; init_config(); - if (c != -1) - i = config_read_file (optarg); - if (!i) - i = config_read (); - if (!i) { - fprintf(stderr, "usage: tint2 [-c] \n"); - cleanup(); - exit(1); - } - config_finish(); - - x11_fd = ConnectionNumber(server.dsp); - XSync(server.dsp, False); - - while (1) { - // thanks to AngryLlama for the timer - // Create a File Description Set containing x11_fd - FD_ZERO (&fd); - FD_SET (x11_fd, &fd); - - tv.tv_usec = 500000; - tv.tv_sec = 0; - - // Wait for X Event or a Timer - if (select(x11_fd+1, &fd, 0, 0, &tv)) { - while (XPending (server.dsp)) { - XNextEvent(server.dsp, &e); - - switch (e.type) { - case ButtonPress: - //printf("ButtonPress %lx\n", e.xproperty.window); - if (e.xbutton.button == 1) event_button_press (&e); - break; - - case ButtonRelease: - event_button_release (&e); - break; - - case Expose: - panel = get_panel(e.xany.window); - if (!panel) break; - //XCopyArea (server.dsp, panel.area.pix.pmap, server.root_win, server.gc_root, 0, 0, panel.area.width, panel.area.height, server.posx, server.posy); - //XCopyArea (server.dsp, server.pmap, panel.main_win, server.gc, panel.area.paddingxlr, 0, panel.area.width-(2*panel.area.paddingxlr), panel.area.height, 0, 0); - XCopyArea (server.dsp, panel->root_pmap, panel->main_win, server.gc, 0, 0, panel->area.width, panel->area.height, 0, 0); - break; - - case PropertyNotify: - event_property_notify (e.xproperty.window, e.xproperty.atom); - break; - - case ConfigureNotify: - if (e.xconfigure.window == server.root_win) - goto load_config; - else - event_configure_notify (e.xconfigure.window); - break; + if (config_path) + i = config_read_file (config_path); + else + i = config_read (); + if (!i) { + fprintf(stderr, "usage: tint2 [-c] \n"); + cleanup(); + exit(1); + } + config_finish(); + if (thumbnail_path) { + // usage: tint2 -j for internal use + printf("file %s\n", thumbnail_path); + cleanup(); + exit(0); + } + + x11_fd = ConnectionNumber(server.dsp); + XSync(server.dsp, False); + + while (1) { + // thanks to AngryLlama for the timer + // Create a File Description Set containing x11_fd + FD_ZERO (&fd); + FD_SET (x11_fd, &fd); + + tv.tv_usec = 500000; + tv.tv_sec = 0; + + // Wait for X Event or a Timer + if (select(x11_fd+1, &fd, 0, 0, &tv)) { + while (XPending (server.dsp)) { + XNextEvent(server.dsp, &e); + + switch (e.type) { + case ButtonPress: + tooltip_hide(); + event_button_press (&e); + break; + + case ButtonRelease: + event_button_release(&e); + break; + + case MotionNotify: { + Panel* panel = get_panel(e.xmotion.window); + Task* task = click_task(panel, e.xmotion.x, e.xmotion.y); + if (task) + tooltip_trigger_show(task, e.xmotion.x_root, e.xmotion.y_root); + else + tooltip_trigger_hide(); + break; + } + + case LeaveNotify: + tooltip_trigger_hide(); + break; + + case Expose: + event_expose(&e); + break; + + case PropertyNotify: + event_property_notify(&e); + break; + + case ConfigureNotify: + event_configure_notify (e.xconfigure.window); + break; + case ReparentNotify: + if (!systray.area.on_screen) + break; + panel = (Panel*)systray.area.panel; + if (e.xany.window == panel->main_win) // reparented to us + break; + // FIXME: 'reparent to us' badly detected => disabled + break; case UnmapNotify: case DestroyNotify: - /* - GSList *it; - for (it = icons; it; it = g_slist_next(it)) { + if (!systray.area.on_screen) + break; + for (it = systray.list_icons; it; it = g_slist_next(it)) { if (((TrayWindow*)it->data)->id == e.xany.window) { - icon_remove(it); + remove_icon((TrayWindow*)it->data); break; } - }*/ + } break; case ClientMessage: - break; - if (e.xclient.message_type == server.atom._NET_SYSTEM_TRAY_OPCODE && e.xclient.format == 32) - // && e.xclient.window == net_sel_win) + if (!systray.area.on_screen) break; + if (e.xclient.message_type == server.atom._NET_SYSTEM_TRAY_OPCODE && e.xclient.format == 32 && e.xclient.window == net_sel_win) { net_message(&e.xclient); - break; - } - } - } - else event_timer(); + } + else if (e.xclient.message_type == server.atom.XdndPosition) { + dnd_message(&e.xclient); + } + break; + } + } + } + event_timer(); switch (signal_pending) { case SIGUSR1: - goto load_config; + signal_pending = 0; + goto load_config; case SIGINT: case SIGTERM: - cleanup (); - return 0; - } + case SIGHUP: + cleanup (); + return 0; + } - if (panel_refresh) { - for (i=0 ; i < nb_panel ; i++) { - visual_refresh(&panel1[i]); + if (panel_refresh) { + panel_refresh = 0; + + if (refresh_systray) { + panel = (Panel*)systray.area.panel; + XSetWindowBackgroundPixmap (server.dsp, panel->main_win, None); } + for (i=0 ; i < nb_panel ; i++) { + panel = &panel1[i]; + + if (panel->temp_pmap) XFreePixmap(server.dsp, panel->temp_pmap); + panel->temp_pmap = XCreatePixmap(server.dsp, server.root_win, panel->area.width, panel->area.height, server.depth); + refresh(&panel->area); + XCopyArea(server.dsp, panel->temp_pmap, panel->main_win, server.gc, 0, 0, panel->area.width, panel->area.height, 0, 0); + } XFlush (server.dsp); - panel_refresh = 0; + + if (refresh_systray) { + refresh_systray = 0; + panel = (Panel*)systray.area.panel; + // tint2 doen't draw systray icons. it just redraw background. + XSetWindowBackgroundPixmap (server.dsp, panel->main_win, panel->temp_pmap); + // force icon's refresh + refresh_systray_icon(); + } } - } + } }