X-Git-Url: https://git.brokenzipper.com/gitweb?a=blobdiff_plain;f=src%2Ftint.c;h=dc90b02220b5e220211383b7dcfb2b9a8a989e44;hb=3dda49f22f1c317f3eb7e738e8f14c394f6d9d37;hp=10ccb3638672d9b366994d9907cb726bb4ce71a8;hpb=0357305cec0f78ba4d4717467025ead6be25ce0c;p=chaz%2Ftint2 diff --git a/src/tint.c b/src/tint.c index 10ccb36..dc90b02 100644 --- a/src/tint.c +++ b/src/tint.c @@ -35,10 +35,8 @@ #include "config.h" #include "task.h" #include "taskbar.h" +#include "systraybar.h" #include "panel.h" -#include "docker.h" -#include "net.h" -#include "kde.h" void signal_handler(int sig) @@ -52,15 +50,18 @@ 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)); + memset(&systray, 0, sizeof(Systraybar)); server.dsp = XOpenDisplay (NULL); if (!server.dsp) { - fprintf(stderr, "Could not open display.\n"); + fprintf(stderr, "tint2 exit : could not open display.\n"); exit(0); } server_init_atoms (); @@ -74,14 +75,6 @@ void init () XSetErrorHandler ((XErrorHandler) server_catch_error); - // init systray - //display = server.dsp; - //root = RootWindow(display, DefaultScreen(display)); - //create_main_window(); - //kde_init(); - //net_init(); - //printf("ici 4\n"); - imlib_context_set_display (server.dsp); imlib_context_set_visual (server.visual); imlib_context_set_colormap (DefaultColormap (server.dsp, server.screen)); @@ -101,6 +94,17 @@ 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); + 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 (server.monitor) free(server.monitor); XFreeGC(server.dsp, server.gc); @@ -136,44 +140,89 @@ void event_button_press (XEvent *e) Panel *panel = get_panel(e->xany.window); if (!panel) return; + if (wm_menu) { + 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; + // 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); + 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; - } - } - } + 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); + 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); if (!panel) return; + if (wm_menu) { + 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); + return; + } + } + int action = TOGGLE_ICONIFY; int x = e->xbutton.x; int y = e->xbutton.y; @@ -195,14 +244,34 @@ 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 (x >= tskbar->area.posx && x <= (tskbar->area.posx + tskbar->area.width)) - goto suite; - } + Clock clk = panel->clock; + 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 { + 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; + } + } + } // TODO: check better solution to keep window below - //XLowerWindow (server.dsp, panel.main_win); + XLowerWindow (server.dsp, panel->main_win); task_drag = 0; return; @@ -222,30 +291,41 @@ 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 - //XLowerWindow (server.dsp, panel.main_win); + 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; + Window win = e->xproperty.window; + Atom at = e->xproperty.atom; if (win == server.root_win) { if (!server.got_root_win) { @@ -253,28 +333,31 @@ void event_property_notify (Window win, Atom at) server.got_root_win = 1; } - /* Change number of desktops */ + // 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(); panel_refresh = 1; } - /* Change desktop */ + // 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 */ + // Window list else if (at == server.atom._NET_CLIENT_LIST) { task_refresh_tasklist(); panel_refresh = 1; } - /* Change active */ + // Change active else if (at == server.atom._NET_ACTIVE_WINDOW) { GSList *l0; if (task_active) { @@ -295,6 +378,10 @@ void event_property_notify (Window win, Atom at) 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++) { @@ -311,8 +398,8 @@ void event_property_notify (Window win, Atom at) } 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]); } @@ -324,7 +411,7 @@ void event_property_notify (Window win, Atom at) if (!tsk) return; //printf("atom root_win = %s, %s\n", XGetAtomName(server.dsp, at), tsk->title); - /* Window title changed */ + // 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; @@ -343,9 +430,18 @@ void event_property_notify (Window win, Atom at) } panel_refresh = 1; } - /* Iconic state */ + // Demand attention + else if (at == server.atom._NET_WM_STATE) { + if (window_is_urgent (win)) { + task_urgent = tsk; + tick_urgent = 0; + time_precision = 1; + } + } else if (at == server.atom.WM_STATE) { - if (window_is_iconified (win)) + // Iconic state + // TODO : try to delete following code + if (window_is_iconified (win)) { if (task_active) { if (task_active->win == tsk->win) { Task *tsk2; @@ -361,8 +457,9 @@ void event_property_notify (Window win, Atom at) task_active = 0; } } - } - /* Window icon changed */ + } + } + // Window icon changed else if (at == server.atom._NET_WM_ICON) { get_icon(tsk); Task *tsk2; @@ -382,11 +479,21 @@ void event_property_notify (Window win, Atom at) } panel_refresh = 1; } - /* Window desktop changed */ + // 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); + 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; + } } if (!server.got_root_win) server.root_win = RootWindow (server.dsp, server.screen); @@ -394,19 +501,47 @@ void event_property_notify (Window win, Atom at) } +void event_expose (XEvent *e) +{ + 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; + // 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 ()) { + Task *tsk = task_get_task (win); + tsk->area.is_active = 1; + task_active = tsk; + } panel_refresh = 1; } } @@ -415,22 +550,38 @@ 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; + + // 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; + // update clock + if (time1_format) { + for (i=0 ; i < nb_panel ; i++) + panel1[i].clock.area.resize = 1; } - panel_refresh = 1; + panel_refresh = 1; } @@ -441,15 +592,24 @@ int main (int argc, char *argv[]) int x11_fd, i, c; struct timeval tv; 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) { @@ -459,11 +619,6 @@ load_config: } config_finish(); - // BUG: refresh(clock) is needed here, but 'on the paper' it's not necessary. - for (i=0 ; i < nb_panel ; i++) { - refresh(&panel1[i].clock.area); - } - x11_fd = ConnectionNumber(server.dsp); XSync(server.dsp, False); @@ -483,25 +638,19 @@ 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: - event_button_release (&e); + 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); + event_expose(&e); break; case PropertyNotify: - //printf("PropertyNotify %lx\n", e.xproperty.window); - event_property_notify (e.xproperty.window, e.xproperty.atom); + event_property_notify(&e); break; case ConfigureNotify: @@ -509,26 +658,76 @@ load_config: goto load_config; else 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; + for (it = systray.list_icons; it; it = g_slist_next(it)) { + if (((TrayWindow*)it->data)->id == e.xany.window) { + remove_icon((TrayWindow*)it->data); + break; + } + } + break; + + case ClientMessage: + 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(); + event_timer(); switch (signal_pending) { case SIGUSR1: + signal_pending = 0; goto load_config; case SIGINT: case SIGTERM: + case SIGHUP: cleanup (); return 0; } if (panel_refresh) { - for (i=0 ; i < nb_panel ; i++) - visual_refresh(&panel1[i]); - XFlush (server.dsp); 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); + + 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(); + } } } }