#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()
{
- 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.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);
+ if (panel->battery.area.on_screen)
+ systray.area.posx -= (panel->battery.area.width + panel->area.paddingx);
systray.area.redraw = 1;
}
free_area(&systray.area);
- if (net_sel_win != None) {
- XDestroyWindow(server.dsp, net_sel_win);
- net_sel_win = None;
- }
+ cleanup_net();
}
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;
- 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);
+ XSelectInput(server.dsp, traywin->id, StructureNotifyMask|ResizeRedirectMask);
// position and size the icon window
XMoveResizeWindow(server.dsp, traywin->id, traywin->x, traywin->y, icon_size, icon_size);
+ // ceci intervertie les fonds : le premier icone prend le fond du dernier
+ // le dernier prend le fond de l'avant dernier, ...
+ XSetWindowBackgroundPixmap (server.dsp, panel->main_win, systray.area.pix.pmap);
// resize our window so that the new window can fit in it
//fix_geometry();
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);
+ if (panel->battery.area.on_screen)
+ systray.area.posx -= (panel->battery.area.width + panel->area.paddingx);
systray.area.redraw = 1;
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);
-int net_init()
+ 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);
}
-//int width, height;
+void cleanup_net()
+{
+ if (net_sel_win != None) {
+ XDestroyWindow(server.dsp, net_sel_win);
+ net_sel_win = None;
+ }
+}
+
/*
void fix_geometry()