X-Git-Url: https://git.brokenzipper.com/gitweb?a=blobdiff_plain;f=src%2Ftint.c;h=dc90b02220b5e220211383b7dcfb2b9a8a989e44;hb=59e5c6547bc80b147f9b0903a6caad1aaf3c09d5;hp=718668f160e43d33604edbfd57074ba9eeba7715;hpb=0b77fdd627f62cb7eaaa1faeb2bcd4b2680b6280;p=chaz%2Ftint2 diff --git a/src/tint.c b/src/tint.c index 718668f..dc90b02 100644 --- a/src/tint.c +++ b/src/tint.c @@ -50,8 +50,10 @@ void init () { // Set signal handler signal(SIGUSR1, signal_handler); - signal(SIGINT, signal_handler); - signal(SIGTERM, signal_handler); + signal(SIGINT, signal_handler); + signal(SIGTERM, signal_handler); + signal(SIGHUP, signal_handler); + signal(SIGCLD, SIG_IGN); // don't have to wait() after fork() // set global data memset(&server, 0, sizeof(Server_global)); @@ -92,6 +94,7 @@ void cleanup() 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); @@ -99,6 +102,7 @@ void cleanup() 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); @@ -137,7 +141,7 @@ void event_button_press (XEvent *e) 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)) { + if ((panel_horizontal && (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)) || (!panel_horizontal && (e->xbutton.y < panel->area.paddingxlr || e->xbutton.y > panel->area.height-panel->area.paddingxlr || e->xbutton.x < panel->area.paddingy || e->xbutton.x > panel->area.paddingy+panel->g_taskbar.width))) { // forward the click to the desktop window (thanks conky) XUngrabPointer(server.dsp, e->xbutton.time); e->xbutton.window = server.root_win; @@ -162,24 +166,44 @@ void event_button_press (XEvent *e) 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; - } - } - } + if (panel_horizontal) { + 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; + } + } + } + } + else { + int y = e->xbutton.y; + for (l0 = panel->area.list; l0 ; l0 = l0->next) { + tskbar = l0->data; + if (!tskbar->area.on_screen) continue; + if (y >= tskbar->area.posy && y <= (tskbar->area.posy + tskbar->area.height)) + break; + } + if (l0) { + Task *tsk; + for (l0 = tskbar->area.list; l0 ; l0 = l0->next) { + tsk = l0->data; + if (y >= tsk->area.posy && y <= (tsk->area.posy + tsk->area.height)) { + task_drag = tsk; + break; + } + } + } + } XLowerWindow (server.dsp, panel->main_win); } @@ -191,7 +215,7 @@ void event_button_release (XEvent *e) 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)) { + if ((panel_horizontal && (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)) || (!panel_horizontal && (e->xbutton.y < panel->area.paddingxlr || e->xbutton.y > panel->area.height-panel->area.paddingxlr || e->xbutton.x < panel->area.paddingy || e->xbutton.x > panel->area.paddingy+panel->g_taskbar.width))) { // forward the click to the desktop window (thanks conky) e->xbutton.window = server.root_win; XSendEvent(server.dsp, e->xbutton.window, False, ButtonReleaseMask, e); @@ -201,7 +225,7 @@ void event_button_release (XEvent *e) int action = TOGGLE_ICONIFY; int x = e->xbutton.x; - //int y = e->xbutton.y; // unused + int y = e->xbutton.y; switch (e->xbutton.button) { case 2: action = mouse_middle; @@ -221,14 +245,28 @@ void event_button_release (XEvent *e) Taskbar *tskbar; GSList *l0; 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); + if (panel_horizontal) { + 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; + } + } + } 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; + if (clk.area.on_screen && y >= clk.area.posy && y <= (clk.area.posy + clk.area.height)) + 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 (y >= tskbar->area.posy && y <= (tskbar->area.posy + tskbar->area.height)) + goto suite; + } } } @@ -253,19 +291,28 @@ suite: } // switch desktop - if (panel_mode == MULTI_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; - } + if (panel_horizontal) { + if (x >= tsk->area.posx && x <= (tsk->area.posx + tsk->area.width)) { + window_action (tsk, action); + break; + } + } + else { + if (y >= tsk->area.posy && y <= (tsk->area.posy + tsk->area.height)) { + window_action (tsk, action); + break; + } + } } // to keep window below @@ -351,8 +398,8 @@ void event_property_notify (XEvent *e) } panel_refresh = 1; } - // Wallpaper changed else if (at == server.atom._XROOTPMAP_ID) { + // change Wallpaper for (i=0 ; i < nb_panel ; i++) { set_panel_background(&panel1[i]); } @@ -387,6 +434,7 @@ void event_property_notify (XEvent *e) else if (at == server.atom._NET_WM_STATE) { if (window_is_urgent (win)) { task_urgent = tsk; + tick_urgent = 0; time_precision = 1; } } @@ -434,11 +482,16 @@ void event_property_notify (XEvent *e) // 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); - add_task (win); + tsk = add_task (win); + if (tsk && active) { + tsk->area.is_active = 1; + task_active = tsk; + } panel_refresh = 1; } } @@ -454,42 +507,34 @@ void event_expose (XEvent *e) 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); - } -*/ + // TODO : one panel_refresh per panel ? panel_refresh = 1; - //XCopyArea (server.dsp, panel->temp_pmap, panel->main_win, server.gc, 0, 0, panel->area.width, panel->area.height, 0, 0); - } void event_configure_notify (Window win) { + // 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)) { - // task on another monitor remove_task (tsk); add_task (win); if (win == window_get_active ()) { @@ -515,16 +560,21 @@ void event_timer() // urgent task if (task_urgent) { - task_urgent->area.is_active = !task_urgent->area.is_active; - task_urgent->area.redraw = 1; + if (tick_urgent < max_tick_urgent) { + task_urgent->area.is_active = !task_urgent->area.is_active; + task_urgent->area.redraw = 1; + tick_urgent++; + } } // update battery +#ifdef ENABLE_BATTERY if (panel1[0].battery.area.on_screen) { - update_battery(&battery_state); + update_battery(); for (i=0 ; i < nb_panel ; i++) panel1[i].battery.area.resize = 1; } +#endif // update clock if (time1_format) { @@ -544,14 +594,22 @@ int main (int argc, char *argv[]) Panel *panel; GSList *it; - c = getopt (argc, argv, "c:"); init (); load_config: i = 0; + c = getopt (argc, argv, "c:"); init_config(); - if (c != -1) + if (c != -1) { i = config_read_file (optarg); + c = getopt (argc, argv, "j:"); + if (c != -1) { + // usage: tint2 [-c] -j for internal use + printf("file %s\n", optarg); + cleanup(); + exit(0); + } + } if (!i) i = config_read (); if (!i) { @@ -602,9 +660,18 @@ load_config: 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: - if (!systray.area.on_screen) break; + 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); @@ -615,7 +682,6 @@ 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); } @@ -627,9 +693,11 @@ load_config: switch (signal_pending) { case SIGUSR1: + signal_pending = 0; goto load_config; case SIGINT: case SIGTERM: + case SIGHUP: cleanup (); return 0; } @@ -637,6 +705,10 @@ load_config: 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]; @@ -647,6 +719,15 @@ load_config: 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(); + } } } }