#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;
void init_systray()
{
- Panel *panel;
- Systraybar *sysbar;
- int i, run_systray;
-
- cleanup_systray();
-
- run_systray = 0;
- for (i=0 ; i < nb_panel ; i++) {
- if (panel1[i].systray.area.visible) {
- run_systray = 1;
- break;
- }
- }
- if (run_systray) {
- if (XGetSelectionOwner(server.dsp, server.atom._NET_SYSTEM_TRAY_SCREEN) != None) {
- fprintf(stderr, "tint2 : another systray is running\n");
- run_systray = 0;
- }
- }
+ Panel *panel = &panel1[0];
+ systray.area.parent = panel;
+ systray.area.panel = panel;
+ systray.area._draw_foreground = draw_systray;
+ systray.area._resize = resize_systray;
- if (run_systray)
- run_systray = net_init();
+ if (systray.area.on_screen)
+ systray.area.on_screen = init_net();
- // configure sysbar on all panels
- for (i=0 ; i < nb_panel ; i++) {
- panel = &panel1[i];
- sysbar = &panel->systray;
+ if (!systray.area.on_screen)
+ return;
- if (!run_systray) {
- sysbar->area.visible = 0;
- continue;
- }
- if (!sysbar->area.visible)
- continue;
+ // 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;
- sysbar->area.parent = panel;
- sysbar->area.panel = panel;
+ 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);
- sysbar->area.posy = panel->area.pix.border.width + panel->area.paddingy;
- sysbar->area.height = panel->area.height - (2 * sysbar->area.posy);
- sysbar->area.width = 100;
+ systray.area.redraw = 1;
+}
- sysbar->area.posx = panel->area.width - panel->area.paddingxlr - panel->area.pix.border.width - sysbar->area.width;
- if (panel->clock.area.visible)
- sysbar->area.posx -= (panel->clock.area.width + panel->area.paddingx);
- sysbar->area.redraw = 1;
- }
+void cleanup_systray()
+{
+ if (systray.list_icons) {
+ GSList *it;
+
+ for (it = systray.list_icons; it; it = it->next)
+ remove_icon((TrayWindow*)it->data);
+
+ g_slist_free(systray.list_icons);
+ systray.list_icons = 0;
+ }
+
+ free_area(&systray.area);
+
+ cleanup_net();
}
-void cleanup_systray()
+void draw_systray(void *obj, cairo_t *c, int active)
{
- Panel *panel;
- int i;
+ Systraybar *sysbar = obj;
+ Panel *panel = sysbar->area.panel;
+ TrayWindow *traywin;
+ GSList *l;
+ int icon_size;
+
+ printf("draw_systray %d %d\n", systray.area.posx, systray.area.width);
+ 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;
+
+ // watch for the icon trying to resize itself!
+ XSelectInput(server.dsp, traywin->id, StructureNotifyMask);
- for (i=0 ; i < nb_panel ; i++) {
- panel = &panel1[i];
- if (!panel->systray.area.visible) continue;
+ // position and size the icon window
+ XMoveResizeWindow(server.dsp, traywin->id, traywin->x, traywin->y, icon_size, icon_size);
- free_area(&panel->systray.area);
+ // 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);
}
+}
- if (net_sel_win != None) {
- XDestroyWindow(server.dsp, net_sel_win);
- net_sel_win = None;
+
+void resize_systray(void *obj)
+{
+ Systraybar *sysbar = obj;
+ Panel *panel = sysbar->area.panel;
+ TrayWindow *traywin;
+ GSList *l;
+ int count, posx, posy;
+ int icon_size;
+
+ icon_size = sysbar->area.height - (2 * sysbar->area.pix.border.width) - (2 * sysbar->area.paddingy);
+ count = g_slist_length(systray.list_icons);
+
+ if (!count) systray.area.width = 0;
+ else systray.area.width = (2 * systray.area.pix.border.width) + (2 * systray.area.paddingxlr) + (icon_size * count) + ((count-1) * systray.area.paddingx);
+
+ 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;
+
+ 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;
+ for (l = systray.list_icons; l ; l = l->next) {
+ traywin = (TrayWindow*)l->data;
+
+ traywin->y = posy;
+ traywin->x = posx;
+ posx += (icon_size + systray.area.paddingx);
}
+
+ // resize other objects on panel
+ 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;
+
+ 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 net_init()
+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);
ev.data.l[2] = net_sel_win;
ev.data.l[3] = 0;
ev.data.l[4] = 0;
- XSendEvent(server.dsp, server.root_win, False, StructureNotifyMask, &ev);
+ XSendEvent(server.dsp, server.root_win, False, StructureNotifyMask, (XEvent*)&ev);
return 1;
}
-int resize_systray (Systraybar *sysbar)
+void cleanup_net()
{
- return 0;
+ if (net_sel_win != None) {
+ XDestroyWindow(server.dsp, net_sel_win);
+ net_sel_win = None;
+ }
}
-
-Window win, root;
-int width, height;
-int border;
-int icon_size;
-
-
+/*
void fix_geometry()
{
GSList *it;
+ Panel *panel = systray.area.panel;
// find the proper width and height
width = 0;
width += icon_size;
}
- XResizeWindow(server.dsp, win, width + border * 2, height + border * 2);
+ XResizeWindow(server.dsp, panel->main_win, width + border * 2, height + border * 2);
}
-
+*/
gboolean error;
int window_error_handler(Display *d, XErrorEvent *e)
}
-gboolean icon_swallow(TrayWindow *traywin)
+gboolean icon_swallow(Window id)
{
XErrorHandler old;
+ Panel *panel = systray.area.panel;
error = FALSE;
old = XSetErrorHandler(window_error_handler);
- XReparentWindow(server.dsp, traywin->id, win, 0, 0);
+ XReparentWindow(server.dsp, id, panel->main_win, 0, 0);
XSync(server.dsp, False);
XSetErrorHandler(old);
// The traywin must have its id and type set.
-gboolean icon_add(Window id)
+gboolean add_icon(Window id)
{
TrayWindow *traywin;
+ if (!icon_swallow(id)) {
+ fprintf(stderr, "tint2 : not icon_swallow\n");
+ return FALSE;
+ }
+
traywin = g_new0(TrayWindow, 1);
traywin->id = id;
- if (!icon_swallow(traywin)) {
- printf("not icon_swallow\n");
- g_free(traywin);
- return FALSE;
- }
+ 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);
+ systray.area.resize = 1;
+ systray.area.redraw = 1;
+
+ // 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) +
// add the new icon to the list
icons = g_slist_append(icons, traywin);
+*/
+
+ return TRUE;
+}
- // 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);
+void remove_icon(TrayWindow *traywin)
+{
+ XErrorHandler old;
- // resize our window so that the new window can fit in it
- fix_geometry();
+ XSelectInput(server.dsp, traywin->id, NoEventMask);
- // 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, win);
+ // reparent to root
+ error = FALSE;
+ old = XSetErrorHandler(window_error_handler);
+ XReparentWindow(server.dsp, traywin->id, server.root_win, 0, 0);
+ XSync(server.dsp, False);
+ XSetErrorHandler(old);
- // show the window
- XMapRaised(server.dsp, traywin->id);
+ // 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));
+ systray.area.resize = 1;
+
+ // changed in systray force resize on panel
+ Panel *panel = systray.area.panel;
+ panel->area.resize = 1;
+ panel_refresh = 1;
- return TRUE;
}
opcode = e->data.l[1];
switch (opcode) {
- case SYSTEM_TRAY_REQUEST_DOCK:
- panel_refresh = 1;
- id = e->data.l[2];
- printf("add dockapp\n");
- if (id && icon_add(id)) {
- XSelectInput(server.dsp, id, StructureNotifyMask);
- }
- break;
-
- case SYSTEM_TRAY_BEGIN_MESSAGE:
- //g_printerr("Message From Dockapp\n");
- id = e->window;
- break;
-
- case SYSTEM_TRAY_CANCEL_MESSAGE:
- //g_printerr("Message Cancelled\n");
- id = e->window;
- break;
-
- default:
- if (opcode == server.atom._NET_SYSTEM_TRAY_MESSAGE_DATA) {
- printf("message from dockapp:\n %s\n", e->data.b);
+ case SYSTEM_TRAY_REQUEST_DOCK:
+ id = e->data.l[2];
+ if (id) add_icon(id);
+ 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;
- }
- // unknown message type. not in the spec
- break;
+ break;
+
+ default:
+ if (opcode == server.atom._NET_SYSTEM_TRAY_MESSAGE_DATA) {
+ printf("message from dockapp:\n %s\n", e->data.b);
+ id = e->window;
+ }
+ // unknown message type. not in the spec
+ break;
}
}
-/*
-void event_loop()
-{
- XEvent e;
- Window cover;
- GSList *it;
-
- while (!exit_app) {
- while (XPending(server.dsp)) {
- XNextEvent(display, &e);
-
- switch (e.type)
- {
- case PropertyNotify:
- // systray window list has changed?
- if (e.xproperty.atom == kde_systray_prop) {
- XSelectInput(display, win, NoEventMask);
- kde_update_icons();
- XSelectInput(display, win, StructureNotifyMask);
-
- while (XCheckTypedEvent(display, PropertyNotify, &e));
- }
-
- break;
-
- case ConfigureNotify:
- if (e.xany.window != win) {
- // find the icon it pertains to and beat it into submission
- GSList *it;
-
- for (it = icons; it != NULL; it = g_slist_next(it)) {
- TrayWindow *traywin = it->data;
- if (traywin->id == e.xany.window) {
- XMoveResizeWindow(display, traywin->id, traywin->x, traywin->y,
- icon_size, icon_size);
- break;
- }
- }
- break;
- }
-
- // briefly cover the entire containing window, which causes it and
- // all of the icons to refresh their windows. finally, they update
- // themselves when the background of the main window's parent changes.
-
- cover = XCreateSimpleWindow(display, win, 0, 0,
- border * 2 + width, border * 2 + height,
- 0, 0, 0);
- XMapWindow(display, cover);
- XDestroyWindow(display, cover);
-
- break;
-
- case ReparentNotify:
- if (e.xany.window == win) // reparented to us
- break;
- case UnmapNotify:
- case DestroyNotify:
- for (it = icons; it; it = g_slist_next(it)) {
- if (((TrayWindow*)it->data)->id == e.xany.window) {
- icon_remove(it);
- break;
- }
- }
- break;
-
- case ClientMessage:
- if (e.xclient.message_type == net_opcode_atom &&
- e.xclient.format == 32 &&
- e.xclient.window == net_sel_win)
- net_message(&e.xclient);
-
- default:
- break;
- }
- }
- usleep(500000);
- }
-
- // remove/unparent all the icons
- while (icons) {
- // do the remove here explicitly, cuz the event handler isn't going to
- // happen anymore.
- icon_remove(icons);
- }
-}
-*/
projects / chaz / tint2 / blobdiff