#define SYSTEM_TRAY_BEGIN_MESSAGE 1
#define SYSTEM_TRAY_CANCEL_MESSAGE 2
-Window net_sel_win;
+// selection window
+Window net_sel_win = None;
+// freedesktop specification doesn't allow multi systray
+Systraybar systray;
-void init_systray(Systraybar *sysbar, Area *parent)
+
+void init_systray()
{
- Panel *panel = (Panel *)parent;
+ cleanup_systray();
+
+ Panel *panel = &panel1[0];
+ systray.area.parent = panel;
+ systray.area.panel = panel;
+ systray.area._resize = resize_systray;
- sysbar->area.parent = parent;
- sysbar->area.panel = panel;
+ if (systray.area.visible) {
+ if (XGetSelectionOwner(server.dsp, server.atom._NET_SYSTEM_TRAY_SCREEN) != None) {
+ fprintf(stderr, "tint2 : another systray is running\n");
+ systray.area.visible = 0;
+ }
+ }
- sysbar->area.posy = parent->pix.border.width + parent->paddingy;
- sysbar->area.height = parent->height - (2 * sysbar->area.posy);
- sysbar->area.width = 100;
+ if (systray.area.visible)
+ systray.area.visible = net_init();
- sysbar->area.posx = panel->area.width - panel->clock.area.width - panel->area.paddingxlr - panel->area.pix.border.width - panel->area.paddingx - sysbar->area.width;
+ if (!systray.area.visible)
+ return;
- sysbar->area.redraw = 1;
+ // 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;
-//printf("init_systray");
+ systray.area.posx = panel->area.width - panel->area.paddingxlr - panel->area.pix.border.width - systray.area.width;
+ if (panel->clock.area.visible)
+ systray.area.posx -= (panel->clock.area.width + panel->area.paddingx);
- net_init();
+ systray.area.redraw = 1;
}
-// net_sel_atom == server.atom._NET_SYSTEM_TRAY
-// net_opcode_atom == server.atom._NET_SYSTEM_TRAY_OPCODE
-// net_manager_atom == server.atom.MANAGER
-// net_message_data_atom == server.atom._NET_SYSTEM_TRAY_MESSAGE_DATA
+void cleanup_systray()
+{
+ free_area(&systray.area);
+
+ if (net_sel_win != None) {
+ XDestroyWindow(server.dsp, net_sel_win);
+ net_sel_win = None;
+ }
+ if (systray.list_icons) {
+ g_slist_free(systray.list_icons);
+ systray.list_icons = 0;
+ }
+}
+
-int resize_systray (Systraybar *sysbar)
+int net_init()
{
- return 0;
+ // init systray protocol
+ net_sel_win = XCreateSimpleWindow(server.dsp, server.root_win, -1, -1, 1, 1, 0, 0, 0);
+
+ // v0.2 trayer specification. tint2 always orizontal.
+ int orient = 0;
+ XChangeProperty(server.dsp, net_sel_win, server.atom._NET_SYSTEM_TRAY_ORIENTATION, XA_CARDINAL, 32, PropModeReplace, (unsigned char *) &orient, 1);
+
+ XSetSelectionOwner(server.dsp, server.atom._NET_SYSTEM_TRAY_SCREEN, net_sel_win, CurrentTime);
+ if (XGetSelectionOwner(server.dsp, server.atom._NET_SYSTEM_TRAY_SCREEN) != net_sel_win) {
+ fprintf(stderr, "tint2 : can't get systray manager\n");
+ return 0;
+ }
+
+ XClientMessageEvent ev;
+ ev.type = ClientMessage;
+ ev.window = server.root_win;
+ ev.message_type = server.atom.MANAGER;
+ ev.format = 32;
+ ev.data.l[0] = CurrentTime;
+ ev.data.l[1] = server.atom._NET_SYSTEM_TRAY_SCREEN;
+ 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, (XEvent*)&ev);
+
+ return 1;
+}
+
+
+void resize_systray (void *obj)
+{
+ Systraybar *sysbar = obj;
+ Panel *panel = sysbar->area.panel;
+ int count = g_slist_length(systray.list_icons);
+
+ if (!count) systray.area.width = 0;
+ else systray.area.width = 30 * count;
+
+ systray.area.posx = panel->area.width - panel->area.paddingxlr - panel->area.pix.border.width - systray.area.width;
+ if (panel->clock.area.visible)
+ systray.area.posx -= (panel->clock.area.width + panel->area.paddingx);
+
+ systray.area.redraw = 1;
+
+ // resize other objects on panel
+ printf("resize_systray %d %d\n", systray.area.posx, systray.area.width);
}
{
GSList *it;
- //* find the proper width and height
+ // find the proper width and height
width = 0;
height = icon_size;
for (it = icons; it != NULL; it = g_slist_next(it)) {
}
-static void net_create_selection_window()
-{
- net_sel_win = XCreateSimpleWindow(server.dsp, root, -1, -1, 1, 1, 0, 0, 0);
-}
-
-
gboolean error;
int window_error_handler(Display *d, XErrorEvent *e)
{
// The traywin must have its id and type set.
gboolean icon_add(Window id)
{
- TrayWindow *traywin;
+ TrayWindow *traywin;
- traywin = g_new0(TrayWindow, 1);
- traywin->id = id;
+ traywin = g_new0(TrayWindow, 1);
+ traywin->id = id;
- if (!icon_swallow(traywin)) {
- g_free(traywin);
- return FALSE;
- }
+ systray.list_icons = g_slist_append(systray.list_icons, traywin);
+ printf("ajout d'un icone %d (%lx)\n", g_slist_length(systray.list_icons), id);
+ 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;
- // find the positon for the systray app window
+ if (!icon_swallow(traywin)) {
+ printf("not icon_swallow\n");
+ g_free(traywin);
+ return FALSE;
+ }
+
+ // 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);
+ // add the new icon to the list
+ icons = g_slist_append(icons, traywin);
- // watch for the icon trying to resize itself!
- XSelectInput(server.dsp, traywin->id, StructureNotifyMask);
+ // 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);
+ // 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();
+ // 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, win);
+ // 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);
- // show the window
- XMapRaised(server.dsp, traywin->id);
+ // show the window
+ XMapRaised(server.dsp, traywin->id);
- return TRUE;
+ return TRUE;
}
-void net_init()
+void icon_remove(TrayWindow *traywin)
{
- // init systray protocol
- net_sel_win = XCreateSimpleWindow(server.dsp, server.root_win, -1, -1, 1, 1, 0, 0, 0);
+ XErrorHandler old;
+ Window win_id = traywin->id;
- XSetSelectionOwner(server.dsp, server.atom._NET_SYSTEM_TRAY, net_sel_win, CurrentTime);
- if (XGetSelectionOwner(server.dsp, server.atom._NET_SYSTEM_TRAY) != net_sel_win) {
- fprintf(stderr, "tint error : can't get trayer selection");
- return;
- }
+ XSelectInput(server.dsp, traywin->id, NoEventMask);
+
+ // remove it 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;
- XEvent m;
- m.type = ClientMessage;
- m.xclient.message_type = server.atom.MANAGER;
- m.xclient.format = 32;
- m.xclient.data.l[0] = CurrentTime;
- m.xclient.data.l[1] = server.atom._NET_SYSTEM_TRAY;
- m.xclient.data.l[2] = net_sel_win;
- m.xclient.data.l[3] = 0;
- m.xclient.data.l[4] = 0;
- XSendEvent(server.dsp, server.root_win, False, StructureNotifyMask, &m);
+/*
+ // reparent it to root
+ error = FALSE;
+ old = XSetErrorHandler(window_error_handler);
+ XReparentWindow(server.dsp, win_id, root, 0, 0);
+ XSync(server.dsp, False);
+ XSetErrorHandler(old);
+
+ reposition_icons();
+ fix_geometry();
+ */
}
void net_message(XClientMessageEvent *e)
{
- unsigned long opcode;
- Window id;
-
- opcode = e->data.l[1];
-
- switch (opcode)
- {
- case SYSTEM_TRAY_REQUEST_DOCK: /* dock a new icon */
- id = e->data.l[2];
- 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) {
- //g_printerr("Text For Message From Dockapp:\n%s\n", e->data.b);
- id = e->window;
- break;
- }
-
- /* unknown message type. not in the spec. */
- //g_printerr("Warning: Received unknown client message to System Tray selection window.\n");
- break;
- }
+ unsigned long opcode;
+ Window id;
+
+ opcode = e->data.l[1];
+
+ switch (opcode) {
+ case SYSTEM_TRAY_REQUEST_DOCK:
+ panel_refresh = 1;
+ id = e->data.l[2];
+ 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);
+ id = e->window;
+ }
+ // unknown message type. not in the spec
+ break;
+ }
}
projects / chaz / tint2 / blobdiff