// freedesktop specification doesn't allow multi systray
Systraybar systray;
int refresh_systray;
+int systray_enabled;
void init_systray()
{
- Panel *panel = &panel1[0];
+ start_net();
- if (systray.area.on_screen)
- systray.area.on_screen = init_net();
-
- if (!systray.area.on_screen)
+ if (!systray_enabled)
return;
- systray.area.parent = panel;
- systray.area.panel = panel;
systray.area._draw_foreground = draw_systray;
systray.area._resize = resize_systray;
systray.area.resize = 1;
systray.area.redraw = 1;
+ systray.area.on_screen = 1;
refresh_systray = 0;
+}
+
+
+void init_systray_panel(void *p)
+{
+ Panel *panel =(Panel*)p;
- // configure systray
- // draw only one systray (even with multi panel)
if (panel_horizontal) {
systray.area.posy = panel->area.pix.border.width + panel->area.paddingy;
systray.area.height = panel->area.height - (2 * systray.area.posy);
systray.area.posx = panel->area.pix.border.width + panel->area.paddingy;
systray.area.width = panel->area.width - (2 * panel->area.pix.border.width) - (2 * panel->area.paddingy);
}
+ systray.area.parent = p;
+ systray.area.panel = p;
}
void cleanup_systray()
{
- if (systray.list_icons) {
- // remove_icon change systray.list_icons
- while(systray.list_icons)
- remove_icon((TrayWindow*)systray.list_icons->data);
-
- g_slist_free(systray.list_icons);
- systray.list_icons = 0;
- }
-
+ systray_enabled = 0;
+ systray.area.on_screen = 0;
free_area(&systray.area);
- cleanup_net();
}
else
icon_size = sysbar->area.width;
icon_size = icon_size - (2 * sysbar->area.pix.border.width) - (2 * sysbar->area.paddingy);
- count = g_slist_length(systray.list_icons);
+ count = 0;
+ for (l = systray.list_icons; l ; l = l->next) {
+ if (!((TrayWindow*)l->data)->hide)
+ count++;
+ }
+ //printf("count %d\n", count);
if (panel_horizontal) {
if (!count) systray.area.width = 0;
}
for (l = systray.list_icons; l ; l = l->next) {
traywin = (TrayWindow*)l->data;
+ if (traywin->hide) continue;
traywin->y = posy;
traywin->x = posx;
// ***********************************************
// systray protocol
-int init_net()
+void start_net()
{
+ if (net_sel_win) {
+ // protocol already started
+ if (!systray_enabled)
+ stop_net();
+ return;
+ }
+ else
+ if (!systray_enabled)
+ return;
+
Window win = XGetSelectionOwner(server.dsp, server.atom._NET_SYSTEM_TRAY_SCREEN);
// freedesktop systray specification
int pid;
_NET_WM_PID = XInternAtom(server.dsp, "_NET_WM_PID", True);
- //atom_name = XGetAtomName (dpy,atom);
-
int ret = XGetWindowProperty(server.dsp, win, _NET_WM_PID, 0, 1024, False, AnyPropertyType, &actual_type, &actual_format, &nitems, &bytes_after, &prop);
fprintf(stderr, "tint2 : another systray is running");
fprintf(stderr, " pid=%d", pid);
}
fprintf(stderr, "\n");
- return 0;
+ return;
}
// 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.
- // TODO : vertical panel ??
+ // v0.2 trayer specification. tint2 always horizontal.
+ // Vertical panel will draw the systray horizontal.
int orient = 0;
XChangeProperty(server.dsp, net_sel_win, server.atom._NET_SYSTEM_TRAY_ORIENTATION, XA_CARDINAL, 32, PropModeReplace, (unsigned char *) &orient, 1);
+ VisualID vid = XVisualIDFromVisual(server.visual);
+ XChangeProperty(server.dsp, net_sel_win, XInternAtom(server.dsp, "_NET_SYSTEM_TRAY_VISUAL", False), XA_VISUALID, 32, PropModeReplace, (unsigned char*)&vid, 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) {
+ stop_net();
fprintf(stderr, "tint2 : can't get systray manager\n");
- return 0;
+ return;
}
+ //fprintf(stderr, "tint2 : systray started\n");
XClientMessageEvent ev;
ev.type = ClientMessage;
ev.window = server.root_win;
ev.data.l[3] = 0;
ev.data.l[4] = 0;
XSendEvent(server.dsp, server.root_win, False, StructureNotifyMask, (XEvent*)&ev);
- return 1;
}
-void cleanup_net()
+void stop_net()
{
+ //fprintf(stderr, "tint2 : systray stopped\n");
+ if (systray.list_icons) {
+ // remove_icon change systray.list_icons
+ while(systray.list_icons)
+ remove_icon((TrayWindow*)systray.list_icons->data);
+
+ g_slist_free(systray.list_icons);
+ systray.list_icons = 0;
+ }
+
if (net_sel_win != None) {
XDestroyWindow(server.dsp, net_sel_win);
net_sel_win = None;
TrayWindow *traywin;
XErrorHandler old;
Panel *panel = systray.area.panel;
+ int hide = 0;
error = FALSE;
old = XSetErrorHandler(window_error_handler);
int ret;
ret = XGetWindowProperty(server.dsp, id, server.atom._XEMBED_INFO, 0, 2, False, server.atom._XEMBED_INFO, &acttype, &actfmt, &nbitem, &bytes, &data);
- if (data) XFree(data);
- if (ret != Success) {
+ if (ret == Success) {
+ if (data) {
+ if (nbitem == 2) {
+ //hide = ((data[1] & XEMBED_MAPPED) == 0);
+ //printf("hide %d\n", hide);
+ }
+ XFree(data);
+ }
+ }
+ else {
fprintf(stderr, "tint2 : xembed error\n");
return FALSE;
}
traywin = g_new0(TrayWindow, 1);
traywin->id = id;
+ traywin->hide = hide;
- // systray.list_icons = g_slist_prepend(systray.list_icons, traywin);
- systray.list_icons = g_slist_insert_sorted(systray.list_icons, traywin, compare_traywindows);
+ if (systray.sort == 3)
+ systray.list_icons = g_slist_prepend(systray.list_icons, traywin);
+ else if (systray.sort == 2)
+ systray.list_icons = g_slist_append(systray.list_icons, traywin);
+ else
+ systray.list_icons = g_slist_insert_sorted(systray.list_icons, traywin, compare_traywindows);
systray.area.resize = 1;
systray.area.redraw = 1;
//printf("add_icon id %lx, %d\n", id, g_slist_length(systray.list_icons));
XSelectInput(server.dsp, traywin->id, StructureNotifyMask);
// show the window
- XMapRaised(server.dsp, traywin->id);
+ if (!traywin->hide)
+ XMapRaised(server.dsp, traywin->id);
// changed in systray force resize on panel
panel->area.resize = 1;
void remove_icon(TrayWindow *traywin)
{
XErrorHandler old;
- Window id = traywin->id;
// remove from our list
systray.list_icons = g_slist_remove(systray.list_icons, traywin);
- g_free(traywin);
systray.area.resize = 1;
systray.area.redraw = 1;
//printf("remove_icon id %lx, %d\n", traywin->id);
- XSelectInput(server.dsp, id, NoEventMask);
+ XSelectInput(server.dsp, traywin->id, NoEventMask);
// reparent to root
error = FALSE;
old = XSetErrorHandler(window_error_handler);
- XUnmapWindow(server.dsp, id);
- XReparentWindow(server.dsp, id, server.root_win, 0, 0);
+ if (!traywin->hide)
+ XUnmapWindow(server.dsp, traywin->id);
+ XReparentWindow(server.dsp, traywin->id, server.root_win, 0, 0);
XSync(server.dsp, False);
XSetErrorHandler(old);
+ g_free(traywin);
// changed in systray force resize on panel
Panel *panel = systray.area.panel;
GSList *l;
for (l = systray.list_icons; l ; l = l->next) {
traywin = (TrayWindow*)l->data;
+ if (traywin->hide) continue;
XClearArea(server.dsp, traywin->id, 0, 0, traywin->width, traywin->height, True);
}
}