X-Git-Url: https://git.brokenzipper.com/gitweb?a=blobdiff_plain;f=src%2Ftint.c;h=afb83cba12bd01b297ec5882b9c2c022d92a0cc9;hb=6f9e73f8f0b88d1258e99397d9ca8b1afca5085e;hp=b84ee185c1ee7879c2eed94d86935e5f905ebb23;hpb=bf2fd3cf8c96d2a747ba4ea3bd8bd9b0a0d7e0e7;p=chaz%2Ftint2 diff --git a/src/tint.c b/src/tint.c index b84ee18..afb83cb 100644 --- a/src/tint.c +++ b/src/tint.c @@ -55,10 +55,11 @@ void init () // 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 (); @@ -91,6 +92,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); + if (battery_low_cmd) g_free(battery_low_cmd); if (server.monitor) free(server.monitor); XFreeGC(server.dsp, server.gc); @@ -135,9 +137,10 @@ void event_button_press (XEvent *e) GSList *l0; Taskbar *tskbar; int x = e->xbutton.x; - int y = e->xbutton.y; + //int y = e->xbutton.y; // unused 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; } @@ -166,7 +169,7 @@ void event_button_release (XEvent *e) 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; @@ -187,6 +190,7 @@ void event_button_release (XEvent *e) 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; } @@ -232,10 +236,12 @@ suite: } -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) { @@ -243,31 +249,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++) { - set_resize(&panel1[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) { @@ -304,7 +310,7 @@ void event_property_notify (Window win, Atom at) } panel_refresh = 1; } - /* Wallpaper changed */ + // Wallpaper changed else if (at == server.atom._XROOTPMAP_ID) { for (i=0 ; i < nb_panel ; i++) { set_panel_background(&panel1[i]); @@ -317,7 +323,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; @@ -336,9 +342,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)) { + printf(" event_property_notify _NET_WM_STATE_DEMANDS_ATTENTION\n"); + } + else { + } + } 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; @@ -354,8 +369,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; @@ -375,7 +391,7 @@ 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); @@ -387,6 +403,37 @@ void event_property_notify (Window win, Atom at) } +void event_expose (XEvent *e) +{ + 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); + +} + + void event_configure_notify (Window win) { if (panel_mode != SINGLE_MONITOR) return; @@ -400,6 +447,11 @@ void event_configure_notify (Window 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,16 +467,19 @@ void event_timer() if (abs(stv.tv_sec - time_clock.tv_sec) < time_precision) return; - // update clock - time_clock.tv_sec = stv.tv_sec; - time_clock.tv_sec -= time_clock.tv_sec % time_precision; + // update battery + update_battery(&battery_state); + + // update clock + time_clock.tv_sec = stv.tv_sec; + time_clock.tv_sec -= time_clock.tv_sec % time_precision; int i; for (i=0 ; i < nb_panel ; i++) { - panel1[i].clock.area.redraw = 1; panel1[i].clock.area.resize = 1; + panel1[i].battery.area.resize = 1; } - panel_refresh = 1; + panel_refresh = 1; } @@ -435,6 +490,7 @@ int main (int argc, char *argv[]) int x11_fd, i, c; struct timeval tv; Panel *panel; + GSList *it; c = getopt (argc, argv, "c:"); init (); @@ -477,19 +533,15 @@ load_config: 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: - event_property_notify (e.xproperty.window, e.xproperty.atom); + event_property_notify(&e); break; case ConfigureNotify: @@ -501,21 +553,21 @@ load_config: 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; + //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; } } @@ -532,14 +584,26 @@ load_config: } if (panel_refresh) { + panel_refresh = 0; + for (i=0 ; i < nb_panel ; i++) { - visual_refresh(&panel1[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; } } } +// **************************************************** +// 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);