X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2Ftint.c;h=cd0b2b87df8e2c3183fd262955f704d3654c5041;hb=9becd8bd3b513a0bbfe778b2ef88f6d598fdf03a;hp=96ac0a01a9cbf16a2ea069f1378cb040b725edb2;hpb=985e8a8ae0792d1fc2b305830ced5514314473eb;p=chaz%2Ftint2 diff --git a/src/tint.c b/src/tint.c index 96ac0a0..cd0b2b8 100644 --- a/src/tint.c +++ b/src/tint.c @@ -19,10 +19,10 @@ **************************************************************************/ #include -#include #include #include #include +#include #include #include #include @@ -37,7 +37,8 @@ #include "taskbar.h" #include "systraybar.h" #include "panel.h" - +#include "tooltip.h" +#include "timer.h" void signal_handler(int sig) { @@ -46,323 +47,447 @@ void signal_handler(int sig) } -void init () +void init (int argc, char *argv[]) { + int i; + + // read options + for (i = 1; i < argc; ++i) { + if (!strcmp(argv[i], "-h") || !strcmp(argv[i], "--help")) { + printf("Usage: tint2 [-c] \n"); + exit(0); + } + if (!strcmp(argv[i], "-v") || !strcmp(argv[i], "--version")) { + printf("tint2 version 0.8\n"); + exit(0); + } + if (!strcmp(argv[i], "-c")) { + i++; + if (i < argc) + config_path = strdup(argv[i]); + } + if (!strcmp(argv[i], "-s")) { + i++; + if (i < argc) + snapshot_path = strdup(argv[i]); + } + } + // Set signal handler - signal(SIGUSR1, signal_handler); - signal(SIGINT, signal_handler); - signal(SIGTERM, signal_handler); - - // 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); + struct sigaction sa = { .sa_handler = signal_handler }; + sigaction(SIGUSR1, &sa, 0); + sigaction(SIGINT, &sa, 0); + sigaction(SIGTERM, &sa, 0); + sigaction(SIGHUP, &sa, 0); + signal(SIGCHLD, SIG_IGN); // don't have to wait() after fork() + // block all signals, such that no race conditions occur before pselect in our main loop + sigset_t block_mask; + sigaddset(&block_mask, SIGINT); + sigaddset(&block_mask, SIGTERM); + sigaddset(&block_mask, SIGHUP); + sigaddset(&block_mask, SIGUSR1); + sigprocmask(SIG_BLOCK, &block_mask, 0); + + + // 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.desktop = server_get_current_desktop (); XGCValues gcv; - server.gc = XCreateGC (server.dsp, server.root_win, (unsigned long)0, &gcv) ; + server.gc = XCreateGC (server.dsp, server.root_win, (unsigned long)0, &gcv); + server_init_visual(); + XSetErrorHandler ((XErrorHandler) server_catch_error); + + imlib_context_set_display (server.dsp); + imlib_context_set_visual (server.visual); + imlib_context_set_colormap (server.colormap); + + /* Catch events */ + XSelectInput (server.dsp, server.root_win, PropertyChangeMask|StructureNotifyMask); + + setlocale (LC_ALL, ""); + + // load default icon + gchar *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); + } - XSetErrorHandler ((XErrorHandler) server_catch_error); + // get monitor and desktop config + get_monitors(); + get_desktops(); +} - 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); +void cleanup() +{ + cleanup_systray(); + stop_net(); + cleanup_panel(); + cleanup_tooltip(); + cleanup_clock(); +#ifdef ENABLE_BATTERY + cleanup_battery(); +#endif + + if (default_icon) { + imlib_context_set_image(default_icon); + imlib_free_image(); + } + if (config_path) g_free(config_path); + if (snapshot_path) g_free(snapshot_path); - setlocale (LC_ALL, ""); + if (server.monitor) free(server.monitor); + XFreeGC(server.dsp, server.gc); + XCloseDisplay(server.dsp); } -void cleanup() +void get_snapshot(const char *path) { - cleanup_panel(); + Panel *panel = &panel1[0]; + + 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); - 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 (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); - if (clock_lclick_command) g_free(clock_lclick_command); - if (clock_rclick_command) g_free(clock_rclick_command); - - if (server.monitor) free(server.monitor); - XFreeGC(server.dsp, server.gc); - XCloseDisplay(server.dsp); + refresh(&panel->area); + + Imlib_Image img = NULL; + imlib_context_set_drawable(panel->temp_pmap); + img = imlib_create_image_from_drawable(0, 0, 0, panel->area.width, panel->area.height, 0); + + imlib_context_set_image(img); + imlib_save_image(path); + imlib_free_image(); } 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 (task_active && tsk->win == task_active->win) + 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); + break; + case NEXT_TASK: + if (task_active) { + Task *tsk1; + tsk1 = next_task(task_active); + set_active(tsk1->win); + } + break; + case PREV_TASK: + if (task_active) { + Task *tsk1; + tsk1 = prev_task(task_active); + set_active(tsk1->win); + } + } +} + + +int tint2_handles_click(Panel* panel, XButtonEvent* e) +{ + Task* task = click_task(panel, e->x, e->y); + if (task) { + if( (e->button == 1) + || (e->button == 2 && mouse_middle != 0) + || (e->button == 3 && mouse_right != 0) + || (e->button == 4 && mouse_scroll_up != 0) + || (e->button == 5 && mouse_scroll_down !=0) ) + { + return 1; + } + else + return 0; + } + // no task clicked --> check if taskbar clicked + Taskbar *tskbar = click_taskbar(panel, e->x, e->y); + if (tskbar && e->button == 1 && panel_mode == MULTI_DESKTOP) + return 1; + if (click_clock(panel, e->x, e->y)) { + if ( (e->button == 1 && clock_lclick_command) || (e->button == 2 && clock_rclick_command) ) + return 1; + else + return 0; + } + return 0; +} + + +void forward_click(XEvent* e) +{ + // 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); } void event_button_press (XEvent *e) { - Panel *panel = get_panel(e->xany.window); + Panel *panel = get_panel(e->xany.window); if (!panel) return; - if (wm_menu) { - if ((e->xbutton.x < panel->area.paddingxlr) || (e->xbutton.x > panel->area.width-panel->area.paddingxlr) || (e->xbutton.y < panel->area.paddingy) || (e->xbutton.y > panel->area.paddingy+panel->g_taskbar.height)) { - // forward the click to the desktop window (thanks conky) - XUngrabPointer(server.dsp, e->xbutton.time); - e->xbutton.window = server.root_win; - XSetInputFocus(server.dsp, e->xbutton.window, RevertToParent, e->xbutton.time); - XSendEvent(server.dsp, e->xbutton.window, False, ButtonPressMask, e); - return; - } + + if (wm_menu && !tint2_handles_click(panel, &e->xbutton) ) { + forward_click(e); + return; } + task_drag = click_task(panel, e->xbutton.x, e->xbutton.y); - if (e->xbutton.button != 1) 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; - for (l0 = panel->area.list; l0 ; l0 = l0->next) { - tskbar = l0->data; - if (!tskbar->area.on_screen) continue; - 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); + XLowerWindow (server.dsp, panel->main_win); } void event_button_release (XEvent *e) { - Panel *panel = get_panel(e->xany.window); + Panel *panel = get_panel(e->xany.window); if (!panel) return; - if (wm_menu) { - if ((e->xbutton.x < panel->area.paddingxlr) || (e->xbutton.x > panel->area.width-panel->area.paddingxlr) || (e->xbutton.y < panel->area.paddingy) || (e->xbutton.y > panel->area.paddingy+panel->g_taskbar.height)) { - // 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; - } + if (wm_menu && !tint2_handles_click(panel, &e->xbutton)) { + forward_click(e); + task_drag = 0; + return; } - int action = TOGGLE_ICONIFY; - int x = e->xbutton.x; - //int y = e->xbutton.y; // unused - 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; - Clock clk = panel->clock; - if (clk.area.on_screen && x >= clk.area.posx && x <= (clk.area.posx + clk.area.width)) + 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); - else { - for (l0 = panel->area.list; l0 ; l0 = l0->next) { - tskbar = l0->data; - if (!tskbar->area.on_screen) continue; - if (x >= tskbar->area.posx && x <= (tskbar->area.posx + tskbar->area.width)) - goto suite; + 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); } - // 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); + // 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 (XEvent *e) { - 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(); + 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++) { panel1[i].area.resize = 1; } task_refresh_tasklist(); + active_task(); panel_refresh = 1; - } - // Change desktop - else if (at == server.atom._NET_CURRENT_DESKTOP) { - server.desktop = server_get_current_desktop (); - if (panel_mode != MULTI_DESKTOP) { - visible_object(); - } - } - // Window list - else if (at == server.atom._NET_CLIENT_LIST) { - //printf("Window list\n"); - task_refresh_tasklist(); - panel_refresh = 1; - } - // Change active - else if (at == server.atom._NET_ACTIVE_WINDOW) { - //printf("Change active\n"); - 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; - } + } + // 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 + if (server.nb_desktop > old_desktop) { + // can happen if last desktop is deleted and we've been on the last desktop + panel->taskbar[old_desktop].area.is_active = 0; + panel->taskbar[old_desktop].area.resize = 1; } + panel->taskbar[server.desktop].area.is_active = 1; + panel->taskbar[server.desktop].area.resize = 1; + panel_refresh = 1; } - 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; - } - 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); - } - } + // check ALLDESKTOP task => resize taskbar + Taskbar *tskbar; + Task *tsk; + GSList *l; + if (server.nb_desktop > old_desktop) { + 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; } } - task_active = t; } - panel_refresh = 1; - } - // Wallpaper changed - else if (at == server.atom._XROOTPMAP_ID) { + 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) { + active_task(); + 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 { + // xfce4 sends _NET_WM_STATE after minimized to tray, so we need to check if window is mapped + // if it is mapped and not set as skip_taskbar, we must add it to our task list + XWindowAttributes wa; + XGetWindowAttributes(server.dsp, win, &wa); + if (wa.map_state == IsViewable && !window_is_skip_taskbar(win)) { + if ( (tsk = add_task(win)) ) + panel_refresh = 1; + else + return; + } + else + 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); @@ -378,39 +503,45 @@ void event_property_notify (XEvent *e) } } } - panel_refresh = 1; - } + panel_refresh = 1; + } // Demand attention - else if (at == server.atom._NET_WM_STATE) { - if (window_is_urgent (win)) { - task_urgent = tsk; - time_precision = 1; + else if (at == server.atom._NET_WM_STATE) { + if (window_is_urgent (win)) { + add_urgent(tsk); } - } - 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; - } - } + if (window_is_skip_taskbar(win)) { + remove_task( tsk ); + panel_refresh = 1; } } - // Window icon changed - else if (at == server.atom._NET_WM_ICON) { - get_icon(tsk); +// 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 +// 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++) { @@ -420,188 +551,263 @@ void event_property_notify (XEvent *e) 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) { + panel_refresh = 1; + } + // Window desktop changed + else if (at == server.atom._NET_WM_DESKTOP) { int desktop = window_get_desktop (win); //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); - add_task (win); + tsk = add_task (win); + active_task(); panel_refresh = 1; } - } + } + else if (at == server.atom.WM_HINTS) { + XWMHints* wmhints = XGetWMHints(server.dsp, win); + if (wmhints && wmhints->flags & XUrgencyHint) { + add_urgent(tsk); + } + XFree(wmhints); + } - if (!server.got_root_win) server.root_win = RootWindow (server.dsp, server.screen); - } + if (!server.got_root_win) server.root_win = RootWindow (server.dsp, server.screen); + } } void event_expose (XEvent *e) { - Panel *panel; - + Panel *panel; panel = get_panel(e->xany.window); if (!panel) return; -/* - if (systray.area.on_screen) { - // force trayer refresh - //XClearWindow(tray_data.dpy, ti->mid_parent); - //x11_send_visibility(tray_data.dpy, dst, VisibilityFullyObscured); - //x11_send_visibility(tray_data.dpy, dst, VisibilityUnobscured); - - GSList *l; - TrayWindow *traywin; - for (l = systray.list_icons; l ; l = l->next) { - traywin = (TrayWindow*)l->data; - // send Expose event - XClearArea(server.dsp, traywin->id, 0, 0, systray.area.width, systray.area.height, True); - //printf("expose %lx\n", traywin->id); - } - - //x11_refresh_window(tray_data.dpy, ti->wid, ti->l.wnd_sz.x, ti->l.wnd_sz.y, True); - } -*/ - panel_refresh = 1; - //XCopyArea (server.dsp, panel->temp_pmap, panel->main_win, server.gc, 0, 0, panel->area.width, panel->area.height, 0, 0); - + // TODO : one panel_refresh per panel ? + panel_refresh = 1; } void event_configure_notify (Window win) { - 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)) { - // task on another monitor - 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; + // change in root window (xrandr) + if (win == server.root_win) { + get_monitors(); + init_config(); + config_read_file (config_path); + init_panel(); + cleanup_config(); + 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; } - panel_refresh = 1; - } + } + + // '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 ()) { + GSList* task_list = task_get_tasks(win); + while (task_list) { + Task *tsk = task_list->data; + tsk->area.is_active = 1; + task_active = tsk; + task_list = task_list->next; + } + } + panel_refresh = 1; + } } -void event_timer() +void dnd_message(XClientMessageEvent *e) { - struct timeval stv; - int i; - - if (gettimeofday(&stv, 0)) return; - - if (abs(stv.tv_sec - time_clock.tv_sec) < time_precision) return; - - // urgent task - if (task_urgent) { - task_urgent->area.is_active = !task_urgent->area.is_active; - task_urgent->area.redraw = 1; + 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); } - // update battery - if (panel1[0].battery.area.on_screen) { - update_battery(&battery_state); - for (i=0 ; i < nb_panel ; i++) - panel1[i].battery.area.resize = 1; - } - - // update clock - if (time1_format) { - time_clock.tv_sec = stv.tv_sec; - time_clock.tv_sec -= time_clock.tv_sec % time_precision; - for (i=0 ; i < nb_panel ; i++) - panel1[i].clock.area.resize = 1; - } - panel_refresh = 1; + // 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); } int main (int argc, char *argv[]) { - XEvent e; - fd_set fd; - int x11_fd, i, c; - struct timeval tv; - Panel *panel; + XEvent e; + fd_set fdset; + int x11_fd, i; + Panel *panel; GSList *it; + const struct timespec* timeout; - c = getopt (argc, argv, "c:"); - init (); + 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: - event_button_press (&e); - break; - - case ButtonRelease: - event_button_release(&e); - break; - - case Expose: - event_expose(&e); - break; - - case PropertyNotify: - event_property_notify(&e); - 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); + } + init_panel(); + cleanup_config(); + if (snapshot_path) { + get_snapshot(snapshot_path); + cleanup(); + exit(0); + } + + x11_fd = ConnectionNumber(server.dsp); + XSync(server.dsp, False); + + sigset_t empty_mask; + sigemptyset(&empty_mask); + + while (1) { + if (panel_refresh) { + panel_refresh = 0; + // QUESTION: do we need this first refresh_systray, because we check refresh_systray once again later... + 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); + + 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(); + } + } + + // thanks to AngryLlama for the timer + // Create a File Description Set containing x11_fd + FD_ZERO (&fdset); + FD_SET (x11_fd, &fdset); + update_next_timeout(); + if (next_timeout.tv_sec >= 0 && next_timeout.tv_nsec >= 0) + timeout = &next_timeout; + else + timeout = 0; + + // Wait for X Event or a Timer + if (pselect(x11_fd+1, &fdset, 0, 0, timeout, &empty_mask) > 0) { + 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: { + if (!g_tooltip.enabled) break; + Panel* panel = get_panel(e.xmotion.window); + Area* area = click_area(panel, e.xmotion.x, e.xmotion.y); + if (area->_get_tooltip_text) + tooltip_trigger_show(area, panel, 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 MapNotify: + if (e.xany.window == g_tooltip.window) + tooltip_update(); + break; + + case PropertyNotify: + event_property_notify(&e); + break; + + case ConfigureNotify: + event_configure_notify (e.xconfigure.window); + break; + + case ReparentNotify: + if (!systray_enabled) + 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: - if (!systray.area.on_screen) break; + if (e.xany.window == g_tooltip.window || !systray.area.on_screen) + break; for (it = systray.list_icons; it; it = g_slist_next(it)) { if (((TrayWindow*)it->data)->id == e.xany.window) { remove_icon((TrayWindow*)it->data); @@ -612,46 +818,34 @@ load_config: case ClientMessage: if (!systray.area.on_screen) break; - //printf("ClientMessage\n"); 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; - } - } - } - event_timer(); - - switch (signal_pending) { - case SIGUSR1: - goto load_config; - case SIGINT: - case SIGTERM: - cleanup (); - return 0; - } - - if (panel_refresh) { - panel_refresh = 0; - - for (i=0 ; i < nb_panel ; i++) { - panel = &panel1[i]; + else if (e.xclient.message_type == server.atom.XdndPosition) { + dnd_message(&e.xclient); + } + break; + } + } + } - 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); + callback_timeout_expired(); - 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); + switch (signal_pending) { + case SIGUSR1: // reload config file + signal_pending = 0; + init_config(); + config_read_file (config_path); + init_panel(); + cleanup_config(); + break; + case SIGINT: + case SIGTERM: + case SIGHUP: + cleanup (); + return 0; } - } + } } -// **************************************************** -// main_win doesn't include panel.area.paddingx, so we have WM capabilities on left and right. -// this feature is disabled ! -//XCopyArea (server.dsp, server.pmap, p->main_win, server.gc, p->area.paddingxlr, 0, p->area.width-(2*p->area.paddingxlr), p->area.height, 0, 0); -//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);