X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2Fsystray%2Fsystraybar.c;h=d382d8a72eaa5c5ce61e8b350f6ef8d8f0c63d67;hb=bd9ade337cc85297242a10d5eb258aad2e71d021;hp=18c1f22e97ed3e4523316d85f75e6274704812da;hpb=a1783c29169a83f9359106678c26fdc28815ccde;p=chaz%2Ftint2 diff --git a/src/systray/systraybar.c b/src/systray/systraybar.c index 18c1f22..d382d8a 100644 --- a/src/systray/systraybar.c +++ b/src/systray/systraybar.c @@ -2,6 +2,7 @@ * Tint2 : systraybar * * Copyright (C) 2009 thierry lorthiois (lorthiois@bbsoft.fr) +* based on 'docker-1.5' from Ben Jansens. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License version 2 @@ -37,7 +38,7 @@ GSList *icons; #define SYSTEM_TRAY_CANCEL_MESSAGE 2 // selection window -Window net_sel_win = None; +Window net_sel_win = None, hint_win = None; // freedesktop specification doesn't allow multi systray Systraybar systray; @@ -45,38 +46,32 @@ Systraybar systray; void init_systray() { - cleanup_systray(); - Panel *panel = &panel1[0]; - systray.area.parent = panel; - systray.area.panel = panel; - systray.area._draw_foreground = draw_systray; - systray.area._resize = resize_systray; - - if (systray.area.on_screen) { - if (XGetSelectionOwner(server.dsp, server.atom._NET_SYSTEM_TRAY_SCREEN) != None) { - fprintf(stderr, "tint2 : another systray is running\n"); - systray.area.on_screen = 0; - } - } if (systray.area.on_screen) - systray.area.on_screen = net_init(); + systray.area.on_screen = init_net(); if (!systray.area.on_screen) return; + systray.area.parent = panel; + systray.area.panel = panel; + systray.area._resize = resize_systray; + // configure systray // draw only one systray (even with multi panel) systray.area.posy = panel->area.pix.border.width + panel->area.paddingy; systray.area.height = panel->area.height - (2 * systray.area.posy); systray.area.width = 0; + systray.area.redraw = 1; systray.area.posx = panel->area.width - panel->area.paddingxlr - panel->area.pix.border.width - systray.area.width; if (panel->clock.area.on_screen) systray.area.posx -= (panel->clock.area.width + panel->area.paddingx); - - systray.area.redraw = 1; +#ifdef ENABLE_BATTERY + if (panel->battery.area.on_screen) + systray.area.posx -= (panel->battery.area.width + panel->area.paddingx); +#endif } @@ -94,44 +89,7 @@ void cleanup_systray() free_area(&systray.area); - if (net_sel_win != None) { - XDestroyWindow(server.dsp, net_sel_win); - net_sel_win = None; - } -} - - -void draw_systray(void *obj, cairo_t *c, int active) -{ - Systraybar *sysbar = obj; - Panel *panel = sysbar->area.panel; - TrayWindow *traywin; - GSList *l; - int icon_size; - - icon_size = sysbar->area.height - (2 * sysbar->area.pix.border.width) - (2 * sysbar->area.paddingy); - for (l = systray.list_icons; l ; l = l->next) { - traywin = (TrayWindow*)l->data; - - printf("draw_systray %d %d\n", systray.area.posx, systray.area.width); - // watch for the icon trying to resize itself! - XSelectInput(server.dsp, traywin->id, StructureNotifyMask); - - // position and size the icon window - XMoveResizeWindow(server.dsp, traywin->id, traywin->x, traywin->y, icon_size, icon_size); - - // resize our window so that the new window can fit in it - //fix_geometry(); - - // flush before clearing, otherwise the clear isn't effective. - XFlush(server.dsp); - // make sure the new child will get the right stuff in its background - // for ParentRelative. - XClearWindow(server.dsp, panel->main_win); - - // show the window - XMapRaised(server.dsp, traywin->id); - } + cleanup_net(); } @@ -153,8 +111,10 @@ void resize_systray(void *obj) systray.area.posx = panel->area.width - panel->area.pix.border.width - panel->area.paddingxlr - systray.area.width; if (panel->clock.area.on_screen) systray.area.posx -= (panel->clock.area.width + panel->area.paddingx); - - systray.area.redraw = 1; +#ifdef ENABLE_BATTERY + if (panel->battery.area.on_screen) + systray.area.posx -= (panel->battery.area.width + panel->area.paddingx); +#endif posy = panel->area.pix.border.width + panel->area.paddingy + systray.area.pix.border.width + systray.area.paddingy; posx = systray.area.posx + systray.area.pix.border.width + systray.area.paddingxlr; @@ -163,16 +123,49 @@ void resize_systray(void *obj) traywin->y = posy; traywin->x = posx; + traywin->width = icon_size; + traywin->height = icon_size; posx += (icon_size + systray.area.paddingx); - } - // resize other objects on panel - printf("resize_systray %d %d\n", systray.area.posx, systray.area.width); + // position and size the icon window + XMoveResizeWindow(server.dsp, traywin->id, traywin->x, traywin->y, icon_size, icon_size); + } + //printf("resize_systray %d %d\n", systray.area.posx, systray.area.width); } +/* +void create_hint_win() +{ + XWMHints hints; + XClassHint classhints; + Panel *panel = systray.area.panel; + + hint_win = XCreateSimpleWindow(server.dsp, server.root_win, 0, 0, 1, 1, 0, 0, 0); + + hints.flags = StateHint | WindowGroupHint | IconWindowHint; + hints.initial_state = WithdrawnState; + hints.window_group = hint_win; + hints.icon_window = panel->main_win; -int net_init() + classhints.res_name = "docker"; + classhints.res_class = "Docker"; + + XSetWMProperties(server.dsp, hint_win, NULL, NULL, NULL, 0, + NULL, &hints, &classhints); + + XMapWindow(server.dsp, hint_win); +} +*/ + +int init_net() { + if (XGetSelectionOwner(server.dsp, server.atom._NET_SYSTEM_TRAY_SCREEN) != None) { + fprintf(stderr, "tint2 : another systray is running\n"); + return 0; + } + + //create_hint_win(); + // init systray protocol net_sel_win = XCreateSimpleWindow(server.dsp, server.root_win, -1, -1, 1, 1, 0, 0, 0); @@ -197,56 +190,28 @@ int net_init() ev.data.l[3] = 0; ev.data.l[4] = 0; XSendEvent(server.dsp, server.root_win, False, StructureNotifyMask, (XEvent*)&ev); - return 1; } -//int width, height; - -/* -void fix_geometry() +void cleanup_net() { - GSList *it; - Panel *panel = systray.area.panel; - - // find the proper width and height - width = 0; - height = icon_size; - for (it = icons; it != NULL; it = g_slist_next(it)) { - width += icon_size; - } - - XResizeWindow(server.dsp, panel->main_win, width + border * 2, height + border * 2); + if (net_sel_win != None) { + XDestroyWindow(server.dsp, net_sel_win); + net_sel_win = None; + } } -*/ + gboolean error; int window_error_handler(Display *d, XErrorEvent *e) { - d=d;e=e; - if (e->error_code == BadWindow) { - error = TRUE; - } else { - //g_printerr("X ERROR NOT BAD WINDOW!\n"); - abort(); - } - return 0; -} - - -gboolean icon_swallow(Window id) -{ - XErrorHandler old; - Panel *panel = systray.area.panel; - - error = FALSE; - old = XSetErrorHandler(window_error_handler); - XReparentWindow(server.dsp, id, panel->main_win, 0, 0); - XSync(server.dsp, False); - XSetErrorHandler(old); - - return !error; + d=d;e=e; + error = TRUE; + if (e->error_code != BadWindow) { + printf("error_handler %d\n", e->error_code); + } + return 0; } @@ -254,8 +219,16 @@ gboolean icon_swallow(Window id) gboolean add_icon(Window id) { TrayWindow *traywin; + XErrorHandler old; + Panel *panel = systray.area.panel; - if (!icon_swallow(id)) { + error = FALSE; + old = XSetErrorHandler(window_error_handler); + XReparentWindow(server.dsp, id, panel->main_win, 0, 0); + XSync(server.dsp, False); + XSetErrorHandler(old); + + if (error != FALSE) { fprintf(stderr, "tint2 : not icon_swallow\n"); return FALSE; } @@ -264,28 +237,19 @@ gboolean add_icon(Window id) traywin->id = id; systray.list_icons = g_slist_prepend(systray.list_icons, traywin); - printf("ajout d'un icone %d (%lx)\n", g_slist_length(systray.list_icons), id); + //printf("ajout d'un icone %d (%lx)\n", g_slist_length(systray.list_icons), id); systray.area.resize = 1; - systray.area.redraw = 1; + systray.area.redraw = 1; + + // watch for the icon trying to resize itself! + XSelectInput(server.dsp, traywin->id, StructureNotifyMask); + + // show the window + XMapRaised(server.dsp, traywin->id); // changed in systray force resize on panel - Panel *panel = systray.area.panel; panel->area.resize = 1; panel_refresh = 1; - -// => calcul x, y, width, height dans resize -/* - // find the positon for the systray app window - int count = g_slist_length(icons); - traywin->x = border + ((width % icon_size) / 2) + - (count % (width / icon_size)) * icon_size; - traywin->y = border + ((height % icon_size) / 2) + - (count / (height / icon_size)) * icon_size; - - // add the new icon to the list - icons = g_slist_append(icons, traywin); -*/ - return TRUE; } @@ -306,8 +270,9 @@ void remove_icon(TrayWindow *traywin) // remove from our list systray.list_icons = g_slist_remove(systray.list_icons, traywin); g_free(traywin); - printf("suppression d'un icone %d\n", g_slist_length(systray.list_icons)); + //printf("suppression d'un icone %d\n", g_slist_length(systray.list_icons)); systray.area.resize = 1; + systray.area.redraw = 1; // changed in systray force resize on panel Panel *panel = systray.area.panel; @@ -323,7 +288,6 @@ void net_message(XClientMessageEvent *e) Window id; opcode = e->data.l[1]; - switch (opcode) { case SYSTEM_TRAY_REQUEST_DOCK: id = e->data.l[2]; @@ -331,24 +295,29 @@ void net_message(XClientMessageEvent *e) break; case SYSTEM_TRAY_BEGIN_MESSAGE: - printf("message from dockapp\n"); - id = e->window; - break; - case SYSTEM_TRAY_CANCEL_MESSAGE: - printf("message cancelled\n"); - id = e->window; + // we don't show baloons messages. break; default: if (opcode == server.atom._NET_SYSTEM_TRAY_MESSAGE_DATA) { - printf("message from dockapp:\n %s\n", e->data.b); - id = e->window; + printf("message from dockapp: %s\n", e->data.b); } - // unknown message type. not in the spec + else + printf("SYSTEM_TRAY : unknown message type\n"); break; } } +void refresh_systray() +{ + TrayWindow *traywin; + GSList *l; + for (l = systray.list_icons; l ; l = l->next) { + traywin = (TrayWindow*)l->data; + XClearArea(server.dsp, traywin->id, 0, 0, traywin->width, traywin->height, True); + } +} +