X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2Ftint.c;h=718668f160e43d33604edbfd57074ba9eeba7715;hb=0b77fdd627f62cb7eaaa1faeb2bcd4b2680b6280;hp=f54bebe6ee9c5d4e411dbfa4f664ed2cd3ea8c7d;hpb=a1783c29169a83f9359106678c26fdc28815ccde;p=chaz%2Ftint2 diff --git a/src/tint.c b/src/tint.c index f54bebe..718668f 100644 --- a/src/tint.c +++ b/src/tint.c @@ -86,13 +86,21 @@ void init () void cleanup() { - cleanup_systray(); 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 (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); @@ -128,6 +136,24 @@ void event_button_press (XEvent *e) 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; + // 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; + } + } + + if (e->xbutton.button != 1) return; + if (panel_mode != MULTI_DESKTOP) { // drag and drop disabled XLowerWindow (server.dsp, panel->main_win); @@ -137,7 +163,6 @@ void event_button_press (XEvent *e) 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 (!tskbar->area.on_screen) continue; @@ -162,14 +187,21 @@ void event_button_press (XEvent *e) 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); 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; + } + } + int action = TOGGLE_ICONIFY; int x = e->xbutton.x; - int y = e->xbutton.y; + //int y = e->xbutton.y; // unused switch (e->xbutton.button) { case 2: action = mouse_middle; @@ -188,12 +220,17 @@ void event_button_release (XEvent *e) // search taskbar Taskbar *tskbar; GSList *l0; - 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; - } + Clock clk = panel->clock; + if (clk.area.on_screen && x >= clk.area.posx && x <= (clk.area.posx + clk.area.width)) + 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; + } + } // TODO: check better solution to keep window below XLowerWindow (server.dsp, panel->main_win); @@ -294,6 +331,10 @@ void event_property_notify (XEvent *e) 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++) { @@ -345,9 +386,8 @@ void event_property_notify (XEvent *e) // Demand attention else if (at == server.atom._NET_WM_STATE) { if (window_is_urgent (win)) { - printf(" event_property_notify _NET_WM_STATE_DEMANDS_ATTENTION\n"); - } - else { + task_urgent = tsk; + time_precision = 1; } } else if (at == server.atom.WM_STATE) { @@ -393,9 +433,14 @@ void event_property_notify (XEvent *e) } // Window desktop changed else if (at == server.atom._NET_WM_DESKTOP) { - remove_task (tsk); - add_task (win); - panel_refresh = 1; + 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); + panel_refresh = 1; + } } if (!server.got_root_win) server.root_win = RootWindow (server.dsp, server.screen); @@ -436,7 +481,7 @@ void event_expose (XEvent *e) void event_configure_notify (Window win) { - if (panel_mode != SINGLE_MONITOR) return; + if (nb_panel == 1) return; if (server.nb_monitor == 1) return; Task *tsk = task_get_task (win); @@ -460,22 +505,33 @@ void event_configure_notify (Window win) void event_timer() { struct timeval stv; - - if (!time1_format) return; + int i; 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; - // update clock - time_clock.tv_sec = stv.tv_sec; - time_clock.tv_sec -= time_clock.tv_sec % time_precision; + // urgent task + if (task_urgent) { + task_urgent->area.is_active = !task_urgent->area.is_active; + task_urgent->area.redraw = 1; + } - int i; - for (i=0 ; i < nb_panel ; i++) { - panel1[i].clock.area.resize = 1; + // 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; } - panel_refresh = 1; + + // update clock + if (time1_format) { + for (i=0 ; i < nb_panel ; i++) + panel1[i].clock.area.resize = 1; + } + panel_refresh = 1; } @@ -524,8 +580,7 @@ load_config: switch (e.type) { case ButtonPress: - //printf("ButtonPress %lx\n", e.xproperty.window); - if (e.xbutton.button == 1) event_button_press (&e); + event_button_press (&e); break; case ButtonRelease: @@ -549,6 +604,7 @@ load_config: case UnmapNotify: case DestroyNotify: + 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) { remove_icon((TrayWindow*)it->data); @@ -558,6 +614,7 @@ load_config: break; 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); @@ -566,7 +623,7 @@ load_config: } } } - else event_timer(); + event_timer(); switch (signal_pending) { case SIGUSR1: @@ -594,10 +651,4 @@ load_config: } } -// **************************************************** -// 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);