aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog18
-rw-r--r--applets/Makefile.am16
-rw-r--r--applets/clock/Makefile.am10
-rw-r--r--applets/clock/clock.c (renamed from applets/clock.c)2
-rw-r--r--applets/launcher/Makefile.am11
-rw-r--r--applets/launcher/launcher.c (renamed from applets/launcher.c)0
-rw-r--r--applets/systray/Makefile.am31
-rw-r--r--applets/systray/eggmarshalers.list2
-rw-r--r--applets/systray/eggtraymanager.c783
-rw-r--r--applets/systray/eggtraymanager.h97
-rw-r--r--applets/systray/systray.c89
-rw-r--r--configure.ac6
12 files changed, 1050 insertions, 15 deletions
diff --git a/ChangeLog b/ChangeLog
index 29db837..e66dd1c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,21 @@
+2006-08-21 Jorn Baayen <jorn@openedhand.com>
+
+ * applets/Makefile.am:
+ * applets/clock.c:
+ * applets/clock/Makefile.am:
+ * applets/clock/clock.c:
+ * applets/launcher.c:
+ * applets/launcher/Makefile.am:
+ * applets/launcher/launcher.c:
+ * applets/systray/Makefile.am:
+ * applets/systray/eggmarshalers.list:
+ * applets/systray/eggtraymanager.c:
+ * applets/systray/eggtraymanager.h:
+ * applets/systray/systray.c:
+ * configure.ac:
+
+ Added system tray applet & moved applets into their own folders.
+
2006-08-19 Jorn Baayen <jorn@openedhand.com>
* applets/launcher.c:
diff --git a/applets/Makefile.am b/applets/Makefile.am
index 51d73a4..6710d56 100644
--- a/applets/Makefile.am
+++ b/applets/Makefile.am
@@ -1,15 +1,3 @@
-AM_CPPFLAGS=-DPKGDATADIR=\"$(pkgdatadir)\" -DGETTEXT_PACKAGE=\"matchbox-panel\"
-AM_CFLAGS = -Wall -g $(MATCHBOX_PANEL_CFLAGS) $(SN_CFLAGS) \
- -I$(top_srcdir) -I$(top_builddir) -Werror
-
-appletdir = $(libdir)/matchbox-panel
-applet_LTLIBRARIES = libclock.la liblauncher.la
+SUBDIRS = clock launcher systray
-libclock_la_SOURCES = clock.c
-
-liblauncher_la_SOURCES = launcher.c
-liblauncher_la_LIBADD = $(SN_LIBS)
-
-CLEANFILES = $(BUILT_SOURCES)
-DISTCLEANFILES = $(BUILT_SOURCES)
-MAINTAINERCLEANFILES = Makefile.in $(BUILT_SOURCES)
+MAINTAINERCLEANFILES = Makefile.in
diff --git a/applets/clock/Makefile.am b/applets/clock/Makefile.am
new file mode 100644
index 0000000..2df6726
--- /dev/null
+++ b/applets/clock/Makefile.am
@@ -0,0 +1,10 @@
+AM_CPPFLAGS=-DPKGDATADIR=\"$(pkgdatadir)\" -DGETTEXT_PACKAGE=\"matchbox-panel\"
+AM_CFLAGS = -Wall -g $(MATCHBOX_PANEL_CFLAGS) \
+ -I$(top_srcdir) -I$(top_builddir) -Werror
+
+appletdir = $(libdir)/matchbox-panel
+applet_LTLIBRARIES = libclock.la
+
+libclock_la_SOURCES = clock.c
+
+MAINTAINERCLEANFILES = Makefile.in
diff --git a/applets/clock.c b/applets/clock/clock.c
index 2fe01af..62a85c4 100644
--- a/applets/clock.c
+++ b/applets/clock/clock.c
@@ -115,7 +115,7 @@ mb_panel_applet_create (const char *id,
GUINT_TO_POINTER (timeout_id));
/* Is this a vertical panel? */
- if (MIN (panel_width, panel_height) == panel_width) {
+ if (panel_width < panel_height) {
/* Yes: Connect to 'style-set' signal */
g_signal_connect (label,
"style-set",
diff --git a/applets/launcher/Makefile.am b/applets/launcher/Makefile.am
new file mode 100644
index 0000000..f874f05
--- /dev/null
+++ b/applets/launcher/Makefile.am
@@ -0,0 +1,11 @@
+AM_CPPFLAGS=-DPKGDATADIR=\"$(pkgdatadir)\" -DGETTEXT_PACKAGE=\"matchbox-panel\"
+AM_CFLAGS = -Wall -g $(MATCHBOX_PANEL_CFLAGS) $(SN_CFLAGS) \
+ -I$(top_srcdir) -I$(top_builddir) -Werror
+
+appletdir = $(libdir)/matchbox-panel
+applet_LTLIBRARIES = liblauncher.la
+
+liblauncher_la_SOURCES = launcher.c
+liblauncher_la_LIBADD = $(SN_LIBS)
+
+MAINTAINERCLEANFILES = Makefile.in
diff --git a/applets/launcher.c b/applets/launcher/launcher.c
index 7be0f8b..7be0f8b 100644
--- a/applets/launcher.c
+++ b/applets/launcher/launcher.c
diff --git a/applets/systray/Makefile.am b/applets/systray/Makefile.am
new file mode 100644
index 0000000..e1cea11
--- /dev/null
+++ b/applets/systray/Makefile.am
@@ -0,0 +1,31 @@
+AM_CPPFLAGS=-DPKGDATADIR=\"$(pkgdatadir)\" -DGETTEXT_PACKAGE=\"matchbox-panel\"
+AM_CFLAGS = -Wall -g $(MATCHBOX_PANEL_CFLAGS) \
+ -I$(top_srcdir) -I$(top_builddir)
+
+appletdir = $(libdir)/matchbox-panel
+applet_LTLIBRARIES = libsystray.la
+
+eggmarshalers.h: eggmarshalers.list
+ cd $(srcdir) \
+ && $(GLIB_GENMARSHAL) --prefix=_egg_marshal eggmarshalers.list --header > xgen-emh \
+ && cp xgen-emh eggmarshalers.h \
+ && rm -f xgen-emh xgen-emh~
+
+eggmarshalers.c: eggmarshalers.list
+ cd $(srcdir) \
+ && $(GLIB_GENMARSHAL) --prefix=_egg_marshal eggmarshalers.list --body > xgen-emc \
+ && cp xgen-emc eggmarshalers.c \
+ && rm -f xgen-emc xgen-emc~
+
+BUILT_SOURCES = eggmarshalers.c eggmarshalers.h
+
+libsystray_la_SOURCES = $(BUILT_SOURCES) \
+ eggtraymanager.c \
+ eggtraymanager.h \
+ systray.c
+
+EXTRA_DIST = eggmarshalers.list
+
+CLEANFILES = $(BUILT_SOURCES)
+DISTCLEANFILES = $(BUILT_SOURCES)
+MAINTAINERCLEANFILES = Makefile.in $(BUILT_SOURCES)
diff --git a/applets/systray/eggmarshalers.list b/applets/systray/eggmarshalers.list
new file mode 100644
index 0000000..4ea485a
--- /dev/null
+++ b/applets/systray/eggmarshalers.list
@@ -0,0 +1,2 @@
+VOID:OBJECT,STRING,LONG,LONG
+VOID:OBJECT,LONG
diff --git a/applets/systray/eggtraymanager.c b/applets/systray/eggtraymanager.c
new file mode 100644
index 0000000..a5f237b
--- /dev/null
+++ b/applets/systray/eggtraymanager.c
@@ -0,0 +1,783 @@
+/* eggtraymanager.c
+ * Copyright (C) 2002 Anders Carlsson <andersca@gnu.org>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ */
+
+#include <config.h>
+#include <string.h>
+#include <libintl.h>
+
+#include "eggtraymanager.h"
+
+#include <gdkconfig.h>
+#include <glib/gi18n.h>
+#if defined (GDK_WINDOWING_X11)
+#include <gdk/gdkx.h>
+#include <X11/Xatom.h>
+#elif defined (GDK_WINDOWING_WIN32)
+#include <gdk/gdkwin32.h>
+#endif
+#include <gtk/gtkinvisible.h>
+#include <gtk/gtksocket.h>
+#include <gtk/gtkwindow.h>
+
+#include "eggmarshalers.h"
+
+/* Signals */
+enum
+{
+ TRAY_ICON_ADDED,
+ TRAY_ICON_REMOVED,
+ MESSAGE_SENT,
+ MESSAGE_CANCELLED,
+ LOST_SELECTION,
+ LAST_SIGNAL
+};
+
+enum {
+ PROP_0,
+ PROP_ORIENTATION
+};
+
+typedef struct
+{
+ long id, len;
+ long remaining_len;
+
+ long timeout;
+ char *str;
+#ifdef GDK_WINDOWING_X11
+ Window window;
+#endif
+} PendingMessage;
+
+static GObjectClass *parent_class = NULL;
+static guint manager_signals[LAST_SIGNAL] = { 0 };
+
+#define SYSTEM_TRAY_REQUEST_DOCK 0
+#define SYSTEM_TRAY_BEGIN_MESSAGE 1
+#define SYSTEM_TRAY_CANCEL_MESSAGE 2
+
+#define SYSTEM_TRAY_ORIENTATION_HORZ 0
+#define SYSTEM_TRAY_ORIENTATION_VERT 1
+
+#ifdef GDK_WINDOWING_X11
+static gboolean egg_tray_manager_check_running_xscreen (Screen *xscreen);
+#endif
+
+static void egg_tray_manager_init (EggTrayManager *manager);
+static void egg_tray_manager_class_init (EggTrayManagerClass *klass);
+
+static void egg_tray_manager_finalize (GObject *object);
+static void egg_tray_manager_set_property (GObject *object,
+ guint prop_id,
+ const GValue *value,
+ GParamSpec *pspec);
+static void egg_tray_manager_get_property (GObject *object,
+ guint prop_id,
+ GValue *value,
+ GParamSpec *pspec);
+
+static void egg_tray_manager_unmanage (EggTrayManager *manager);
+
+GType
+egg_tray_manager_get_type (void)
+{
+ static GType our_type = 0;
+
+ if (our_type == 0)
+ {
+ static const GTypeInfo our_info =
+ {
+ sizeof (EggTrayManagerClass),
+ (GBaseInitFunc) NULL,
+ (GBaseFinalizeFunc) NULL,
+ (GClassInitFunc) egg_tray_manager_class_init,
+ NULL, /* class_finalize */
+ NULL, /* class_data */
+ sizeof (EggTrayManager),
+ 0, /* n_preallocs */
+ (GInstanceInitFunc) egg_tray_manager_init
+ };
+
+ our_type = g_type_register_static (G_TYPE_OBJECT, "EggTrayManager", &our_info, 0);
+ }
+
+ return our_type;
+
+}
+
+static void
+egg_tray_manager_init (EggTrayManager *manager)
+{
+ manager->invisible = NULL;
+ manager->socket_table = g_hash_table_new (NULL, NULL);
+}
+
+static void
+egg_tray_manager_class_init (EggTrayManagerClass *klass)
+{
+ GObjectClass *gobject_class;
+
+ parent_class = g_type_class_peek_parent (klass);
+ gobject_class = (GObjectClass *)klass;
+
+ gobject_class->finalize = egg_tray_manager_finalize;
+ gobject_class->set_property = egg_tray_manager_set_property;
+ gobject_class->get_property = egg_tray_manager_get_property;
+
+ g_object_class_install_property (gobject_class,
+ PROP_ORIENTATION,
+ g_param_spec_enum ("orientation",
+ _("Orientation"),
+ _("The orientation of the tray."),
+ GTK_TYPE_ORIENTATION,
+ GTK_ORIENTATION_HORIZONTAL,
+ G_PARAM_READWRITE | G_PARAM_CONSTRUCT));
+
+ manager_signals[TRAY_ICON_ADDED] =
+ g_signal_new ("tray_icon_added",
+ G_OBJECT_CLASS_TYPE (klass),
+ G_SIGNAL_RUN_LAST,
+ G_STRUCT_OFFSET (EggTrayManagerClass, tray_icon_added),
+ NULL, NULL,
+ g_cclosure_marshal_VOID__OBJECT,
+ G_TYPE_NONE, 1,
+ GTK_TYPE_SOCKET);
+
+ manager_signals[TRAY_ICON_REMOVED] =
+ g_signal_new ("tray_icon_removed",
+ G_OBJECT_CLASS_TYPE (klass),
+ G_SIGNAL_RUN_LAST,
+ G_STRUCT_OFFSET (EggTrayManagerClass, tray_icon_removed),
+ NULL, NULL,
+ g_cclosure_marshal_VOID__OBJECT,
+ G_TYPE_NONE, 1,
+ GTK_TYPE_SOCKET);
+ manager_signals[MESSAGE_SENT] =
+ g_signal_new ("message_sent",
+ G_OBJECT_CLASS_TYPE (klass),
+ G_SIGNAL_RUN_LAST,
+ G_STRUCT_OFFSET (EggTrayManagerClass, message_sent),
+ NULL, NULL,
+ _egg_marshal_VOID__OBJECT_STRING_LONG_LONG,
+ G_TYPE_NONE, 4,
+ GTK_TYPE_SOCKET,
+ G_TYPE_STRING,
+ G_TYPE_LONG,
+ G_TYPE_LONG);
+ manager_signals[MESSAGE_CANCELLED] =
+ g_signal_new ("message_cancelled",
+ G_OBJECT_CLASS_TYPE (klass),
+ G_SIGNAL_RUN_LAST,
+ G_STRUCT_OFFSET (EggTrayManagerClass, message_cancelled),
+ NULL, NULL,
+ _egg_marshal_VOID__OBJECT_LONG,
+ G_TYPE_NONE, 2,
+ GTK_TYPE_SOCKET,
+ G_TYPE_LONG);
+ manager_signals[LOST_SELECTION] =
+ g_signal_new ("lost_selection",
+ G_OBJECT_CLASS_TYPE (klass),
+ G_SIGNAL_RUN_LAST,
+ G_STRUCT_OFFSET (EggTrayManagerClass, lost_selection),
+ NULL, NULL,
+ g_cclosure_marshal_VOID__VOID,
+ G_TYPE_NONE, 0);
+
+#if defined (GDK_WINDOWING_X11)
+ /* Nothing */
+#elif defined (GDK_WINDOWING_WIN32)
+ g_warning ("Port eggtraymanager to Win32");
+#else
+ g_warning ("Port eggtraymanager to this GTK+ backend");
+#endif
+}
+
+static void
+egg_tray_manager_finalize (GObject *object)
+{
+ EggTrayManager *manager;
+
+ manager = EGG_TRAY_MANAGER (object);
+
+ egg_tray_manager_unmanage (manager);
+
+ g_list_free (manager->messages);
+ g_hash_table_destroy (manager->socket_table);
+
+ G_OBJECT_CLASS (parent_class)->finalize (object);
+}
+
+static void
+egg_tray_manager_set_property (GObject *object,
+ guint prop_id,
+ const GValue *value,
+ GParamSpec *pspec)
+{
+ EggTrayManager *manager = EGG_TRAY_MANAGER (object);
+
+ switch (prop_id)
+ {
+ case PROP_ORIENTATION:
+ egg_tray_manager_set_orientation (manager, g_value_get_enum (value));
+ break;
+ default:
+ G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+ break;
+ }
+}
+
+static void
+egg_tray_manager_get_property (GObject *object,
+ guint prop_id,
+ GValue *value,
+ GParamSpec *pspec)
+{
+ EggTrayManager *manager = EGG_TRAY_MANAGER (object);
+
+ switch (prop_id)
+ {
+ case PROP_ORIENTATION:
+ g_value_set_enum (value, manager->orientation);
+ break;
+ default:
+ G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+ break;
+ }
+}
+
+EggTrayManager *
+egg_tray_manager_new (void)
+{
+ EggTrayManager *manager;
+
+ manager = g_object_new (EGG_TYPE_TRAY_MANAGER, NULL);
+
+ return manager;
+}
+
+#ifdef GDK_WINDOWING_X11
+
+static gboolean
+egg_tray_manager_plug_removed (GtkSocket *socket,
+ EggTrayManager *manager)
+{
+ Window *window;
+
+ window = g_object_get_data (G_OBJECT (socket), "egg-tray-child-window");
+
+ g_hash_table_remove (manager->socket_table, GINT_TO_POINTER (*window));
+ g_object_set_data (G_OBJECT (socket), "egg-tray-child-window",
+ NULL);
+
+ g_signal_emit (manager, manager_signals[TRAY_ICON_REMOVED], 0, socket);
+
+ /* This destroys the socket. */
+ return FALSE;
+}
+
+static void
+egg_tray_manager_handle_dock_request (EggTrayManager *manager,
+ XClientMessageEvent *xevent)
+{
+ GtkWidget *socket;
+ Window *window;
+ GtkRequisition req;
+
+ if (g_hash_table_lookup (manager->socket_table, GINT_TO_POINTER (xevent->data.l[2])))
+ {
+ /* We already got this notification earlier, ignore this one */
+ return;
+ }
+
+ socket = gtk_socket_new ();
+
+ /* We need to set the child window here
+ * so that the client can call _get functions
+ * in the signal handler
+ */
+ window = g_new (Window, 1);
+ *window = xevent->data.l[2];
+
+ g_object_set_data_full (G_OBJECT (socket),
+ "egg-tray-child-window",
+ window, g_free);
+ g_signal_emit (manager, manager_signals[TRAY_ICON_ADDED], 0,
+ socket);
+
+ /* Add the socket only if it's been attached */
+ if (GTK_IS_WINDOW (gtk_widget_get_toplevel (GTK_WIDGET (socket))))
+ {
+ g_signal_connect (socket, "plug_removed",
+ G_CALLBACK (egg_tray_manager_plug_removed), manager);
+
+ gtk_socket_add_id (GTK_SOCKET (socket), *window);
+
+ g_hash_table_insert (manager->socket_table, GINT_TO_POINTER (*window), socket);
+
+ /*
+ * Make sure the icons have a meaningfull size ...
+ */
+ req.width = req.height = 1;
+ gtk_widget_size_request (socket, &req);
+ /*
+ if ((req.width < 16) || (req.height < 16))
+ {
+ gint nw = MAX (24, req.width);
+ gint nh = MAX (24, req.height);
+ g_warning (_("tray icon has requested a size of (%i x %i), resizing to (%i x %i)"),
+ req.width, req.height, nw, nh);
+ gtk_widget_set_size_request(icon, nw, nh);
+ }
+ */
+ gtk_widget_show(socket);
+ }
+ else
+ gtk_widget_destroy (socket);
+}
+
+static void
+pending_message_free (PendingMessage *message)
+{
+ g_free (message->str);
+ g_free (message);
+}
+
+static void
+egg_tray_manager_handle_message_data (EggTrayManager *manager,
+ XClientMessageEvent *xevent)
+{
+ GList *p;
+ int len;
+
+ /* Try to see if we can find the
+ * pending message in the list
+ */
+ for (p = manager->messages; p; p = p->next)
+ {
+ PendingMessage *msg = p->data;
+
+ if (xevent->window == msg->window)
+ {
+ /* Append the message */
+ len = MIN (msg->remaining_len, 20);
+
+ memcpy ((msg->str + msg->len - msg->remaining_len),
+ &xevent->data, len);
+ msg->remaining_len -= len;
+
+ if (msg->remaining_len == 0)
+ {
+ GtkSocket *socket;
+
+ socket = g_hash_table_lookup (manager->socket_table, GINT_TO_POINTER (msg->window));
+
+ if (socket)
+ {
+ g_signal_emit (manager, manager_signals[MESSAGE_SENT], 0,
+ socket, msg->str, msg->id, msg->timeout);
+ }
+ manager->messages = g_list_remove_link (manager->messages,
+ p);
+
+ pending_message_free (msg);
+ }
+
+ return;
+ }
+ }
+}
+
+static void
+egg_tray_manager_handle_begin_message (EggTrayManager *manager,
+ XClientMessageEvent *xevent)
+{
+ GList *p;
+ PendingMessage *msg;
+
+ /* Check if the same message is
+ * already in the queue and remove it if so
+ */
+ for (p = manager->messages; p; p = p->next)
+ {
+ PendingMessage *msg = p->data;
+
+ if (xevent->window == msg->window &&
+ xevent->data.l[4] == msg->id)
+ {
+ /* Hmm, we found it, now remove it */
+ pending_message_free (msg);
+ manager->messages = g_list_remove_link (manager->messages, p);
+ break;
+ }
+ }
+
+ /* Now add the new message to the queue */
+ msg = g_new0 (PendingMessage, 1);
+ msg->window = xevent->window;
+ msg->timeout = xevent->data.l[2];
+ msg->len = xevent->data.l[3];
+ msg->id = xevent->data.l[4];
+ msg->remaining_len = msg->len;
+ msg->str = g_malloc (msg->len + 1);
+ msg->str[msg->len] = '\0';
+ manager->messages = g_list_prepend (manager->messages, msg);
+}
+
+static void
+egg_tray_manager_handle_cancel_message (EggTrayManager *manager,
+ XClientMessageEvent *xevent)
+{
+ GtkSocket *socket;
+
+ socket = g_hash_table_lookup (manager->socket_table, GINT_TO_POINTER (xevent->window));
+
+ if (socket)
+ {
+ g_signal_emit (manager, manager_signals[MESSAGE_CANCELLED], 0,
+ socket, xevent->data.l[2]);
+ }
+}
+
+static GdkFilterReturn
+egg_tray_manager_handle_event (EggTrayManager *manager,
+ XClientMessageEvent *xevent)
+{
+ switch (xevent->data.l[1])
+ {
+ case SYSTEM_TRAY_REQUEST_DOCK:
+ egg_tray_manager_handle_dock_request (manager, xevent);
+ return GDK_FILTER_REMOVE;
+
+ case SYSTEM_TRAY_BEGIN_MESSAGE:
+ egg_tray_manager_handle_begin_message (manager, xevent);
+ return GDK_FILTER_REMOVE;
+
+ case SYSTEM_TRAY_CANCEL_MESSAGE:
+ egg_tray_manager_handle_cancel_message (manager, xevent);
+ return GDK_FILTER_REMOVE;
+ default:
+ break;
+ }
+
+ return GDK_FILTER_CONTINUE;
+}
+
+static GdkFilterReturn
+egg_tray_manager_window_filter (GdkXEvent *xev, GdkEvent *event, gpointer data)
+{
+ XEvent *xevent = (GdkXEvent *)xev;
+ EggTrayManager *manager = data;
+
+ if (xevent->type == ClientMessage)
+ {
+ if (xevent->xclient.message_type == manager->opcode_atom)
+ {
+ return egg_tray_manager_handle_event (manager, (XClientMessageEvent *)xevent);
+ }
+ else if (xevent->xclient.message_type == manager->message_data_atom)
+ {
+ egg_tray_manager_handle_message_data (manager, (XClientMessageEvent *)xevent);
+ return GDK_FILTER_REMOVE;
+ }
+ }
+ else if (xevent->type == SelectionClear)
+ {
+ g_signal_emit (manager, manager_signals[LOST_SELECTION], 0);
+ egg_tray_manager_unmanage (manager);
+ }
+ return GDK_FILTER_CONTINUE;
+}
+
+#endif
+
+static void
+egg_tray_manager_unmanage (EggTrayManager *manager)
+{
+#ifdef GDK_WINDOWING_X11
+ Display *display;
+ guint32 timestamp;
+ GtkWidget *invisible;
+
+ if (manager->invisible == NULL)
+ return;
+
+ invisible = manager->invisible;
+ g_assert (GTK_IS_INVISIBLE (invisible));
+ g_assert (GTK_WIDGET_REALIZED (invisible));
+ g_assert (GDK_IS_WINDOW (invisible->window));
+
+ display = GDK_WINDOW_XDISPLAY (invisible->window);
+
+ if (XGetSelectionOwner (display, manager->selection_atom) ==
+ GDK_WINDOW_XWINDOW (invisible->window))
+ {
+ timestamp = gdk_x11_get_server_time (invisible->window);
+ XSetSelectionOwner (display, manager->selection_atom, None, timestamp);
+ }
+
+ gdk_window_remove_filter (invisible->window, egg_tray_manager_window_filter, manager);
+
+ manager->invisible = NULL; /* prior to destroy for reentrancy paranoia */
+ gtk_widget_destroy (invisible);
+ g_object_unref (G_OBJECT (invisible));
+#endif
+}
+
+static void
+egg_tray_manager_set_orientation_property (EggTrayManager *manager)
+{
+#ifdef GDK_WINDOWING_X11
+ gulong data[1];
+
+ if (!manager->invisible || !manager->invisible->window)
+ return;
+
+ g_assert (manager->orientation_atom != None);
+
+ data[0] = manager->orientation == GTK_ORIENTATION_HORIZONTAL ?
+ SYSTEM_TRAY_ORIENTATION_HORZ :
+ SYSTEM_TRAY_ORIENTATION_VERT;
+
+ XChangeProperty (GDK_WINDOW_XDISPLAY (manager->invisible->window),
+ GDK_WINDOW_XWINDOW (manager->invisible->window),
+ manager->orientation_atom,
+ XA_CARDINAL, 32,
+ PropModeReplace,
+ (guchar *) &data, 1);
+#endif
+}
+
+#ifdef GDK_WINDOWING_X11
+
+static gboolean
+egg_tray_manager_manage_xscreen (EggTrayManager *manager, Screen *xscreen)
+{
+ GtkWidget *invisible;
+ char *selection_atom_name;
+ guint32 timestamp;
+ GdkScreen *screen;
+
+ g_return_val_if_fail (EGG_IS_TRAY_MANAGER (manager), FALSE);
+ g_return_val_if_fail (manager->screen == NULL, FALSE);
+
+ /* If there's already a manager running on the screen
+ * we can't create another one.
+ */
+#if 0
+ if (egg_tray_manager_check_running_xscreen (xscreen))
+ return FALSE;
+#endif
+ screen = gdk_display_get_screen (gdk_x11_lookup_xdisplay (DisplayOfScreen (xscreen)),
+ XScreenNumberOfScreen (xscreen));
+
+ invisible = gtk_invisible_new_for_screen (screen);
+ gtk_widget_realize (invisible);
+
+ gtk_widget_add_events (invisible, GDK_PROPERTY_CHANGE_MASK | GDK_STRUCTURE_MASK);
+
+ selection_atom_name = g_strdup_printf ("_NET_SYSTEM_TRAY_S%d",
+ XScreenNumberOfScreen (xscreen));
+ manager->selection_atom = XInternAtom (DisplayOfScreen (xscreen), selection_atom_name, False);
+
+ g_free (selection_atom_name);
+
+ manager->orientation_atom = XInternAtom (DisplayOfScreen (xscreen),
+ "_NET_SYSTEM_TRAY_ORIENTATION",
+ FALSE);
+ egg_tray_manager_set_orientation_property (manager);
+
+ timestamp = gdk_x11_get_server_time (invisible->window);
+ XSetSelectionOwner (DisplayOfScreen (xscreen), manager->selection_atom,
+ GDK_WINDOW_XWINDOW (invisible->window), timestamp);
+
+ /* Check if we were could set the selection owner successfully */
+ if (XGetSelectionOwner (DisplayOfScreen (xscreen), manager->selection_atom) ==
+ GDK_WINDOW_XWINDOW (invisible->window))
+ {
+ XClientMessageEvent xev;
+
+ xev.type = ClientMessage;
+ xev.window = RootWindowOfScreen (xscreen);
+ xev.message_type = XInternAtom (DisplayOfScreen (xscreen), "MANAGER", False);
+
+ xev.format = 32;
+ xev.data.l[0] = timestamp;
+ xev.data.l[1] = manager->selection_atom;
+ xev.data.l[2] = GDK_WINDOW_XWINDOW (invisible->window);
+ xev.data.l[3] = 0; /* manager specific data */
+ xev.data.l[4] = 0; /* manager specific data */
+
+ XSendEvent (DisplayOfScreen (xscreen),
+ RootWindowOfScreen (xscreen),
+ False, StructureNotifyMask, (XEvent *)&xev);
+
+ manager->invisible = invisible;
+ g_object_ref (G_OBJECT (manager->invisible));
+
+ manager->opcode_atom = XInternAtom (DisplayOfScreen (xscreen),
+ "_NET_SYSTEM_TRAY_OPCODE",
+ False);
+
+ manager->message_data_atom = XInternAtom (DisplayOfScreen (xscreen),
+ "_NET_SYSTEM_TRAY_MESSAGE_DATA",
+ False);
+
+ /* Add a window filter */
+ gdk_window_add_filter (invisible->window, egg_tray_manager_window_filter, manager);
+ return TRUE;
+ }
+ else
+ {
+ gtk_widget_destroy (invisible);
+
+ return FALSE;
+ }
+}
+
+#endif
+
+gboolean
+egg_tray_manager_manage_screen (EggTrayManager *manager,
+ GdkScreen *screen)
+{
+ g_return_val_if_fail (GDK_IS_SCREEN (screen), FALSE);
+ g_return_val_if_fail (manager->screen == NULL, FALSE);
+
+#ifdef GDK_WINDOWING_X11
+ return egg_tray_manager_manage_xscreen (manager,
+ GDK_SCREEN_XSCREEN (screen));
+#else
+ return FALSE;
+#endif
+}
+
+#ifdef GDK_WINDOWING_X11
+
+static gboolean
+egg_tray_manager_check_running_xscreen (Screen *xscreen)
+{
+ Atom selection_atom;
+ char *selection_atom_name;
+
+ selection_atom_name = g_strdup_printf ("_NET_SYSTEM_TRAY_S%d",
+ XScreenNumberOfScreen (xscreen));
+ selection_atom = XInternAtom (DisplayOfScreen (xscreen), selection_atom_name, False);
+ g_free (selection_atom_name);
+
+ if (XGetSelectionOwner (DisplayOfScreen (xscreen), selection_atom) != None)
+ return TRUE;
+ else
+ return FALSE;
+}
+
+#endif
+
+gboolean
+egg_tray_manager_check_running (GdkScreen *screen)
+{
+ g_return_val_if_fail (GDK_IS_SCREEN (screen), FALSE);
+
+#ifdef GDK_WINDOWING_X11
+ return egg_tray_manager_check_running_xscreen (GDK_SCREEN_XSCREEN (screen));
+#else
+ return FALSE;
+#endif
+}
+
+char *
+egg_tray_manager_get_child_title (EggTrayManager *manager,
+ EggTrayManagerChild *child)
+{
+ char *retval = NULL;
+#ifdef GDK_WINDOWING_X11
+ Window *child_window;
+ Atom utf8_string, atom, type;
+ int result;
+ int format;
+ gulong nitems;
+ gulong bytes_after;
+ guchar *val;
+
+ g_return_val_if_fail (EGG_IS_TRAY_MANAGER (manager), NULL);
+ g_return_val_if_fail (GTK_IS_SOCKET (child), NULL);
+
+ child_window = g_object_get_data (G_OBJECT (child),
+ "egg-tray-child-window");
+
+ utf8_string = XInternAtom (GDK_DISPLAY (), "UTF8_STRING", False);
+ atom = XInternAtom (GDK_DISPLAY (), "_NET_WM_NAME", False);
+
+ gdk_error_trap_push ();
+
+ result = XGetWindowProperty (GDK_DISPLAY (),
+ *child_window,
+ atom,
+ 0, G_MAXLONG,
+ False, utf8_string,
+ &type, &format, &nitems,
+ &bytes_after, (guchar **)&val);
+
+ if (gdk_error_trap_pop () || result != Success)
+ return NULL;
+
+ if (type != utf8_string ||
+ format != 8 ||
+ nitems == 0)
+ {
+ if (val)
+ XFree (val);
+ return NULL;
+ }
+
+ if (!g_utf8_validate (val, nitems, NULL))
+ {
+ XFree (val);
+ return NULL;
+ }
+
+ retval = g_strndup (val, nitems);
+
+ XFree (val);
+#endif
+ return retval;
+}
+
+void
+egg_tray_manager_set_orientation (EggTrayManager *manager,
+ GtkOrientation orientation)
+{
+ g_return_if_fail (EGG_IS_TRAY_MANAGER (manager));
+
+ if (manager->orientation != orientation)
+ {
+ manager->orientation = orientation;
+
+ egg_tray_manager_set_orientation_property (manager);
+
+ g_object_notify (G_OBJECT (manager), "orientation");
+ }
+}
+
+GtkOrientation
+egg_tray_manager_get_orientation (EggTrayManager *manager)
+{
+ g_return_val_if_fail (EGG_IS_TRAY_MANAGER (manager), GTK_ORIENTATION_HORIZONTAL);
+
+ return manager->orientation;
+}
diff --git a/applets/systray/eggtraymanager.h b/applets/systray/eggtraymanager.h
new file mode 100644
index 0000000..327c395
--- /dev/null
+++ b/applets/systray/eggtraymanager.h
@@ -0,0 +1,97 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
+/* eggtraymanager.h
+ * Copyright (C) 2002 Anders Carlsson <andersca@gnu.org>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ */
+
+#ifndef __EGG_TRAY_MANAGER_H__
+#define __EGG_TRAY_MANAGER_H__
+
+#include <gtk/gtkwidget.h>
+#ifdef GDK_WINDOWING_X11
+#include <gdk/gdkx.h>
+#endif
+
+G_BEGIN_DECLS
+
+#define EGG_TYPE_TRAY_MANAGER (egg_tray_manager_get_type ())
+#define EGG_TRAY_MANAGER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), EGG_TYPE_TRAY_MANAGER, EggTrayManager))
+#define EGG_TRAY_MANAGER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), EGG_TYPE_TRAY_MANAGER, EggTrayManagerClass))
+#define EGG_IS_TRAY_MANAGER(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), EGG_TYPE_TRAY_MANAGER))
+#define EGG_IS_TRAY_MANAGER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), EGG_TYPE_TRAY_MANAGER))
+#define EGG_TRAY_MANAGER_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), EGG_TYPE_TRAY_MANAGER, EggTrayManagerClass))
+
+typedef struct _EggTrayManager EggTrayManager;
+typedef struct _EggTrayManagerClass EggTrayManagerClass;
+typedef struct _EggTrayManagerChild EggTrayManagerChild;
+
+struct _EggTrayManager
+{
+ GObject parent_instance;
+
+#ifdef GDK_WINDOWING_X11
+ Atom opcode_atom;
+ Atom selection_atom;
+ Atom message_data_atom;
+ Atom orientation_atom;
+#endif
+
+ GtkWidget *invisible;
+ GdkScreen *screen;
+ GtkOrientation orientation;
+
+ GList *messages;
+ GHashTable *socket_table;
+};
+
+struct _EggTrayManagerClass
+{
+ GObjectClass parent_class;
+
+ void (* tray_icon_added) (EggTrayManager *manager,
+ EggTrayManagerChild *child);
+ void (* tray_icon_removed) (EggTrayManager *manager,
+ EggTrayManagerChild *child);
+
+ void (* message_sent) (EggTrayManager *manager,
+ EggTrayManagerChild *child,
+ const gchar *message,
+ glong id,
+ glong timeout);
+
+ void (* message_cancelled) (EggTrayManager *manager,
+ EggTrayManagerChild *child,
+ glong id);
+
+ void (* lost_selection) (EggTrayManager *manager);
+};
+
+GType egg_tray_manager_get_type (void);
+
+gboolean egg_tray_manager_check_running (GdkScreen *screen);
+EggTrayManager *egg_tray_manager_new (void);
+gboolean egg_tray_manager_manage_screen (EggTrayManager *manager,
+ GdkScreen *screen);
+char *egg_tray_manager_get_child_title (EggTrayManager *manager,
+ EggTrayManagerChild *child);
+void egg_tray_manager_set_orientation (EggTrayManager *manager,
+ GtkOrientation orientation);
+GtkOrientation egg_tray_manager_get_orientation (EggTrayManager *manager);
+
+G_END_DECLS
+
+#endif /* __EGG_TRAY_MANAGER_H__ */
diff --git a/applets/systray/systray.c b/applets/systray/systray.c
new file mode 100644
index 0000000..ac94bf5
--- /dev/null
+++ b/applets/systray/systray.c
@@ -0,0 +1,89 @@
+/*
+ * (C) 2006 OpenedHand Ltd.
+ *
+ * Author: Jorn Baayen <jorn@openedhand.com>
+ *
+ * Licensed under the GPL v2 or greater.
+ */
+
+#include <gtk/gtkhbox.h>
+#include <gtk/gtkvbox.h>
+#include <matchbox-panel/mb-panel.h>
+
+#include "eggtraymanager.h"
+
+/* TODO: messages */
+
+/* Tray icon added */
+static void
+tray_icon_added_cb (EggTrayManager *manager,
+ GtkWidget *icon,
+ GtkBox *box)
+{
+ gtk_box_pack_start (box, icon, FALSE, FALSE, 0);
+}
+
+/* Screen changed */
+static void
+screen_changed_cb (GtkWidget *widget,
+ GdkScreen *screen,
+ EggTrayManager *manager)
+{
+ if (!screen)
+ screen = gdk_screen_get_default ();
+
+ if (egg_tray_manager_check_running (screen)) {
+ g_warning ("Another system tray manager is running. "
+ "Not managing screen.");
+
+ return;
+ }
+
+ egg_tray_manager_manage_screen (manager, screen);
+}
+
+G_MODULE_EXPORT GtkWidget *
+mb_panel_applet_create (const char *id,
+ int panel_width,
+ int panel_height)
+{
+ EggTrayManager *manager;
+ GtkOrientation orientation;
+ GtkWidget *box;
+
+ /* Is this a vertical panel? */
+ if (panel_width >= panel_height) {
+ orientation = GTK_ORIENTATION_HORIZONTAL;
+
+ box = gtk_hbox_new (0, FALSE);
+ } else {
+ orientation = GTK_ORIENTATION_VERTICAL;
+
+ box = gtk_vbox_new (0, FALSE);
+ }
+
+ gtk_widget_set_name (box, "MatchboxPanelSystemTray");
+
+ /* Create tray manager */
+ manager = egg_tray_manager_new ();
+ egg_tray_manager_set_orientation (manager, orientation);
+
+ g_signal_connect (manager,
+ "tray-icon-added",
+ G_CALLBACK (tray_icon_added_cb),
+ box);
+
+ g_signal_connect (box,
+ "screen-changed",
+ G_CALLBACK (screen_changed_cb),
+ manager);
+
+ g_object_weak_ref (G_OBJECT (box),
+ (GWeakNotify) g_object_unref,
+ manager);
+
+ /* Show! */
+ gtk_widget_show (box);
+
+ return box;
+}
diff --git a/configure.ac b/configure.ac
index 9ba8694..969ac6b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -26,6 +26,9 @@ if test x$enable_startup_notification != xno; then
AC_DEFINE(USE_LIBSN, [1], [Has Startup Notification Support])
fi
+GLIB_GENMARSHAL=`$PKG_CONFIG --variable=glib_genmarshal glib-2.0`
+AC_SUBST(GLIB_GENMARSHAL)
+
GETTEXT_PACKAGE=matchbox-panel
AC_SUBST(GETTEXT_PACKAGE)
AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, ["$GETTEXT_PACKAGE"],
@@ -39,6 +42,9 @@ Makefile
matchbox-panel.pc
matchbox-panel/Makefile
applets/Makefile
+applets/clock/Makefile
+applets/launcher/Makefile
+applets/systray/Makefile
po/Makefile.in
po/Makefile
])