X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2Fsystray%2Fsystraybar.c;h=18c1f22e97ed3e4523316d85f75e6274704812da;hb=a1783c29169a83f9359106678c26fdc28815ccde;hp=0fa8daeb56e42656b33f36d1a59c9de15f33f156;hpb=e9f82fb210675167061fd45697f49e6eb733c732;p=chaz%2Ftint2

diff --git a/src/systray/systraybar.c b/src/systray/systraybar.c
index 0fa8dae..18c1f22 100644
--- a/src/systray/systraybar.c
+++ b/src/systray/systraybar.c
@@ -39,71 +39,60 @@ GSList *icons;
 // selection window
 Window net_sel_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) {
+	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");
-			run_systray = 0;
+			systray.area.on_screen = 0;
 		}
 	}
 
-	if (run_systray)
-		run_systray = net_init();
+	if (systray.area.on_screen)
+		systray.area.on_screen = net_init();
 
-	// 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;
-
-		sysbar->area.parent = panel;
-		sysbar->area.panel = panel;
+	// 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.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.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.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;
-	}
+	systray.area.redraw = 1;
 }
 
 
 void cleanup_systray()
 {
-   Panel *panel;
-   int i;
+   if (systray.list_icons) {
+		GSList *it;
 
-	for (i=0 ; i < nb_panel ; i++) {
-		panel = &panel1[i];
-	   if (!panel->systray.area.visible) continue;
+		for (it = systray.list_icons; it; it = it->next)
+			remove_icon((TrayWindow*)it->data);
 
-		free_area(&panel->systray.area);
-	}
+      g_slist_free(systray.list_icons);
+      systray.list_icons = 0;
+   }
+
+	free_area(&systray.area);
 
 	if (net_sel_win != None) {
   		XDestroyWindow(server.dsp, net_sel_win);
@@ -112,6 +101,76 @@ void cleanup_systray()
 }
 
 
+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);
+	}
+}
+
+
+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);
+}
+
+
 int net_init()
 {
 	// init systray protocol
@@ -137,28 +196,19 @@ int net_init()
 	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)
-{
-   return 0;
-}
-
-
-
-Window win, root;
-int width, height;
-int border;
-int icon_size;
-
+//int width, height;
 
+/*
 void fix_geometry()
 {
   GSList *it;
+  Panel *panel = systray.area.panel;
 
   // find the proper width and height
   width = 0;
@@ -167,9 +217,9 @@ void fix_geometry()
     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)
@@ -185,13 +235,14 @@ 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);
 
@@ -200,19 +251,30 @@ gboolean icon_swallow(TrayWindow *traywin)
 
 
 // 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) +
@@ -222,26 +284,36 @@ gboolean icon_add(Window id)
 
 	// 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;
 }
 
 
@@ -253,121 +325,30 @@ void net_message(XClientMessageEvent *e)
 	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_REQUEST_DOCK:
+			id = e->data.l[2];
+			if (id) add_icon(id);
+			break;
 
-	case SYSTEM_TRAY_CANCEL_MESSAGE:
-		//g_printerr("Message Cancelled\n");
-		id = e->window;
-		break;
+		case SYSTEM_TRAY_BEGIN_MESSAGE:
+			printf("message from dockapp\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_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);
-  }
-}
-*/