X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2Fsystray%2Fsystraybar.c;h=d382d8a72eaa5c5ce61e8b350f6ef8d8f0c63d67;hb=bd9ade337cc85297242a10d5eb258aad2e71d021;hp=0a728e73c552ea721c14ca80d3ad3f2d7dacbfd8;hpb=950baafde9286fcff4d2c3bdbf66ee3ddb1a2433;p=chaz%2Ftint2

diff --git a/src/systray/systraybar.c b/src/systray/systraybar.c
index 0a728e7..d382d8a 100644
--- a/src/systray/systraybar.c
+++ b/src/systray/systraybar.c
@@ -2,6 +2,7 @@
 * Tint2 : systraybar
 *
 * Copyright (C) 2009 thierry lorthiois (lorthiois@bbsoft.fr)
+* based on 'docker-1.5' from Ben Jansens.
 *
 * This program is free software; you can redistribute it and/or
 * modify it under the terms of the GNU General Public License version 2
@@ -46,10 +47,6 @@ Systraybar systray;
 void init_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)
 		systray.area.on_screen = init_net();
@@ -57,19 +54,24 @@ void init_systray()
 	if (!systray.area.on_screen)
 		return;
 
+	systray.area.parent = panel;
+	systray.area.panel = panel;
+	systray.area._resize = resize_systray;
+
 	// 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;
+	systray.area.redraw = 1;
 
 	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);
+#ifdef ENABLE_BATTERY
 	if (panel->battery.area.on_screen)
 		systray.area.posx -= (panel->battery.area.width + panel->area.paddingx);
-
-	systray.area.redraw = 1;
+#endif
 }
 
 
@@ -91,41 +93,6 @@ 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;
-
-	//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|ResizeRedirectMask);
-
-		// position and size the icon window
-		XMoveResizeWindow(server.dsp, traywin->id, traywin->x, traywin->y, icon_size, icon_size);
-		XSetWindowBackgroundPixmap (server.dsp, panel->main_win, systray.area.pix.pmap);
-
-		// 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;
@@ -144,10 +111,10 @@ void resize_systray(void *obj)
 	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);
+#ifdef ENABLE_BATTERY
 	if (panel->battery.area.on_screen)
 		systray.area.posx -= (panel->battery.area.width + panel->area.paddingx);
-
-	systray.area.redraw = 1;
+#endif
 
 	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;
@@ -156,11 +123,14 @@ void resize_systray(void *obj)
 
 		traywin->y = posy;
 		traywin->x = posx;
+		traywin->width = icon_size;
+		traywin->height = icon_size;
 		posx += (icon_size + systray.area.paddingx);
-	}
 
-	// resize other objects on panel
-	printf("resize_systray %d %d\n", systray.area.posx, systray.area.width);
+		// position and size the icon window
+		XMoveResizeWindow(server.dsp, traywin->id, traywin->x, traywin->y, icon_size, icon_size);
+	}
+	//printf("resize_systray %d %d\n", systray.area.posx, systray.area.width);
 }
 
 /*
@@ -220,7 +190,6 @@ int init_net()
 	ev.data.l[3] = 0;
 	ev.data.l[4] = 0;
 	XSendEvent(server.dsp, server.root_win, False, StructureNotifyMask, (XEvent*)&ev);
-
 	return 1;
 }
 
@@ -234,49 +203,15 @@ void cleanup_net()
 }
 
 
-/*
-void fix_geometry()
-{
-  GSList *it;
-  Panel *panel = systray.area.panel;
-
-  // find the proper width and height
-  width = 0;
-  height = icon_size;
-  for (it = icons; it != NULL; it = g_slist_next(it)) {
-    width += icon_size;
-  }
-
-  XResizeWindow(server.dsp, panel->main_win, width + border * 2, height + border * 2);
-}
-*/
-
 gboolean error;
 int window_error_handler(Display *d, XErrorEvent *e)
 {
-  d=d;e=e;
-  if (e->error_code == BadWindow) {
-    error = TRUE;
-  } else {
-    //g_printerr("X ERROR NOT BAD WINDOW!\n");
-    abort();
-  }
-  return 0;
-}
-
-
-gboolean icon_swallow(Window id)
-{
-  XErrorHandler old;
-  Panel *panel = systray.area.panel;
-
-  error = FALSE;
-  old = XSetErrorHandler(window_error_handler);
-  XReparentWindow(server.dsp, id, panel->main_win, 0, 0);
-  XSync(server.dsp, False);
-  XSetErrorHandler(old);
-
-  return !error;
+	d=d;e=e;
+	error = TRUE;
+	if (e->error_code != BadWindow) {
+		printf("error_handler %d\n", e->error_code);
+	}
+	return 0;
 }
 
 
@@ -284,8 +219,16 @@ gboolean icon_swallow(Window id)
 gboolean add_icon(Window id)
 {
 	TrayWindow *traywin;
+	XErrorHandler old;
+	Panel *panel = systray.area.panel;
+
+	error = FALSE;
+	old = XSetErrorHandler(window_error_handler);
+	XReparentWindow(server.dsp, id, panel->main_win, 0, 0);
+	XSync(server.dsp, False);
+	XSetErrorHandler(old);
 
-	if (!icon_swallow(id)) {
+	if (error != FALSE) {
 		fprintf(stderr, "tint2 : not icon_swallow\n");
 		return FALSE;
 	}
@@ -294,28 +237,19 @@ gboolean add_icon(Window id)
 	traywin->id = id;
 
 	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);
+  	//printf("ajout d'un icone %d (%lx)\n", g_slist_length(systray.list_icons), id);
   	systray.area.resize = 1;
-  	systray.area.redraw = 1;
+	systray.area.redraw = 1;
+
+	// watch for the icon trying to resize itself!
+	XSelectInput(server.dsp, traywin->id, StructureNotifyMask);
+
+	// show the window
+	XMapRaised(server.dsp, traywin->id);
 
 	// 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) +
-	(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);
-*/
-
 	return TRUE;
 }
 
@@ -336,8 +270,9 @@ void remove_icon(TrayWindow *traywin)
 	// 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));
+	//printf("suppression d'un icone %d\n", g_slist_length(systray.list_icons));
   	systray.area.resize = 1;
+	systray.area.redraw = 1;
 
 	// changed in systray force resize on panel
 	Panel *panel = systray.area.panel;
@@ -353,7 +288,6 @@ void net_message(XClientMessageEvent *e)
 	Window id;
 
 	opcode = e->data.l[1];
-
 	switch (opcode) {
 		case SYSTEM_TRAY_REQUEST_DOCK:
 			id = e->data.l[2];
@@ -361,24 +295,29 @@ void net_message(XClientMessageEvent *e)
 			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;
+			// we don't show baloons messages.
 			break;
 
 		default:
 			if (opcode == server.atom._NET_SYSTEM_TRAY_MESSAGE_DATA) {
-				printf("message from dockapp:\n  %s\n", e->data.b);
-				id = e->window;
+				printf("message from dockapp: %s\n", e->data.b);
 			}
-			// unknown message type. not in the spec
+			else
+				printf("SYSTEM_TRAY : unknown message type\n");
 			break;
 	}
 }
 
 
+void refresh_systray()
+{
+	TrayWindow *traywin;
+	GSList *l;
+	for (l = systray.list_icons; l ; l = l->next) {
+		traywin = (TrayWindow*)l->data;
+		XClearArea(server.dsp, traywin->id, 0, 0, traywin->width, traywin->height, True);
+	}
+}
+