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

diff --git a/src/systray/systraybar.c b/src/systray/systraybar.c
index 6d72240..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
@@ -37,7 +38,7 @@ GSList *icons;
 #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;
@@ -45,57 +46,126 @@ Systraybar systray;
 
 void init_systray()
 {
-	cleanup_systray();
-
 	Panel *panel = &panel1[0];
-	systray.area.parent = panel;
-	systray.area.panel = panel;
-	systray.area._resize = resize_systray;
 
-	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;
-		}
-	}
-
-	if (systray.area.visible)
-		systray.area.visible = net_init();
+	if (systray.area.on_screen)
+		systray.area.on_screen = init_net();
 
-	if (!systray.area.visible)
+	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.visible)
+	if (panel->clock.area.on_screen)
 		systray.area.posx -= (panel->clock.area.width + panel->area.paddingx);
-
-	systray.area.redraw = 1;
+#ifdef ENABLE_BATTERY
+	if (panel->battery.area.on_screen)
+		systray.area.posx -= (panel->battery.area.width + panel->area.paddingx);
+#endif
 }
 
 
 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) {
+		GSList *it;
+
+		for (it = systray.list_icons; it; it = it->next)
+			remove_icon((TrayWindow*)it->data);
+
       g_slist_free(systray.list_icons);
       systray.list_icons = 0;
    }
+
+	free_area(&systray.area);
+
+	cleanup_net();
 }
 
 
-int net_init()
+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);
+#ifdef ENABLE_BATTERY
+	if (panel->battery.area.on_screen)
+		systray.area.posx -= (panel->battery.area.width + panel->area.paddingx);
+#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;
+	for (l = systray.list_icons; l ; l = l->next) {
+		traywin = (TrayWindow*)l->data;
+
+		traywin->y = posy;
+		traywin->x = posx;
+		traywin->width = icon_size;
+		traywin->height = icon_size;
+		posx += (icon_size + systray.area.paddingx);
+
+		// 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);
+}
+
+/*
+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);
+
+	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);
 
@@ -120,167 +190,95 @@ int net_init()
 	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);
-}
-
-
-
-Window win, root;
-int width, height;
-int border;
-int icon_size;
-
-
-void fix_geometry()
+void cleanup_net()
 {
-  GSList *it;
-
-  // 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, win, width + border * 2, height + border * 2);
+	if (net_sel_win != None) {
+  		XDestroyWindow(server.dsp, net_sel_win);
+  		net_sel_win = None;
+	}
 }
 
 
 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(TrayWindow *traywin)
-{
-  XErrorHandler old;
-
-  error = FALSE;
-  old = XSetErrorHandler(window_error_handler);
-  XReparentWindow(server.dsp, traywin->id, 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;
 }
 
 
 // The traywin must have its id and type set.
-gboolean icon_add(Window id)
+gboolean add_icon(Window id)
 {
 	TrayWindow *traywin;
-
-	traywin = g_new0(TrayWindow, 1);
-	traywin->id = id;
-
-	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
+	XErrorHandler old;
 	Panel *panel = systray.area.panel;
-	panel->area.resize = 1;
-	panel_refresh = 1;
-	return TRUE;
 
-	if (!icon_swallow(traywin)) {
-		printf("not icon_swallow\n");
-		g_free(traywin);
+	error = FALSE;
+	old = XSetErrorHandler(window_error_handler);
+	XReparentWindow(server.dsp, id, panel->main_win, 0, 0);
+	XSync(server.dsp, False);
+	XSetErrorHandler(old);
+
+	if (error != FALSE) {
+		fprintf(stderr, "tint2 : not icon_swallow\n");
 		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;
+	traywin = g_new0(TrayWindow, 1);
+	traywin->id = id;
 
-	// add the new icon to the list
-	icons = g_slist_append(icons, traywin);
+	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;
 
 	// 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, win);
+	XSelectInput(server.dsp, traywin->id, StructureNotifyMask);
 
 	// show the window
 	XMapRaised(server.dsp, traywin->id);
 
+	// changed in systray force resize on panel
+	panel->area.resize = 1;
+	panel_refresh = 1;
 	return TRUE;
 }
 
 
-void icon_remove(TrayWindow *traywin)
+void remove_icon(TrayWindow *traywin)
 {
 	XErrorHandler old;
-	Window win_id = traywin->id;
 
 	XSelectInput(server.dsp, traywin->id, NoEventMask);
 
-	// remove it from our list
+	// 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);
+
+	// 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;
 	panel->area.resize = 1;
 	panel_refresh = 1;
-	return;
 
-/*
-	// 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();
-	*/
 }
 
 
@@ -290,122 +288,36 @@ void net_message(XClientMessageEvent *e)
 	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;
+		case SYSTEM_TRAY_REQUEST_DOCK:
+			id = e->data.l[2];
+			if (id) add_icon(id);
+			break;
+
+		case SYSTEM_TRAY_BEGIN_MESSAGE:
+		case SYSTEM_TRAY_CANCEL_MESSAGE:
+			// we don't show baloons messages.
+			break;
+
+		default:
+			if (opcode == server.atom._NET_SYSTEM_TRAY_MESSAGE_DATA) {
+				printf("message from dockapp: %s\n", e->data.b);
+			}
+			else
+				printf("SYSTEM_TRAY : unknown message type\n");
+			break;
 	}
 }
 
 
-/*
-void event_loop()
+void refresh_systray()
 {
-  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);
-  }
+	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);
+	}
 }
-*/
+