Upgrade to Gtk+3

index 4608a85..9c1dadf 100644
@@ -1,4 +1,4 @@
-/* 
+/*
  * (C) 2006, 2007 OpenedHand Ltd.
  *
  * Authors: Jorn Baayen <[email protected]>

@@ -148,8 +148,9 @@ get_text_property (WindowSelectorApplet *applet,
         if (gdk_error_trap_pop () || result == 0)
                 return NULL;
 
-        count = gdk_text_property_to_utf8_list
-                        (gdk_x11_xatom_to_atom (text.encoding),
+        count = gdk_text_property_to_utf8_list_for_display
+                        (display,
+                         gdk_x11_xatom_to_atom (text.encoding),
                          text.format,
                          text.value,
                          text.nitems,

@@ -370,7 +371,7 @@ get_current_app_window (WindowSelectorApplet *applet)
 
 
         result = XGetWindowProperty (GDK_DISPLAY_XDISPLAY (display),
-                                     GDK_WINDOW_XWINDOW (applet->root_window),
+                                     GDK_WINDOW_XID (applet->root_window),
                                      applet->atoms[_MB_CURRENT_APP_WINDOW],
                                      0, 1,
                                      False,

@@ -412,18 +413,18 @@ window_menu_item_activate_cb (GtkWidget            *widget,
                         (g_object_get_data (G_OBJECT (widget), "window"));
         screen = GDK_SCREEN_XSCREEN (gtk_widget_get_screen (widget));
         toplevel = gtk_widget_get_toplevel (GTK_WIDGET (applet->button));
-  
+
         /* Send _NET_ACTIVE_WINDOW message */
         xev.xclient.type = ClientMessage;
         xev.xclient.serial = 0;
         xev.xclient.send_event = True;
         xev.xclient.display = DisplayOfScreen (screen);
         xev.xclient.window = window;
-        xev.xclient.message_type = applet->atoms[_NET_ACTIVE_WINDOW]; 
+        xev.xclient.message_type = applet->atoms[_NET_ACTIVE_WINDOW];
         xev.xclient.format = 32;
         xev.xclient.data.l[0] = 2;
         xev.xclient.data.l[1] = gtk_get_current_event_time ();
-        xev.xclient.data.l[2] = GDK_WINDOW_XWINDOW (toplevel->window);
+        xev.xclient.data.l[2] = GDK_WINDOW_XID (gtk_widget_get_window (toplevel));
         xev.xclient.data.l[3] = 0;
         xev.xclient.data.l[4] = 0;
 

@@ -431,7 +432,7 @@ window_menu_item_activate_cb (GtkWidget            *widget,
 	            RootWindowOfScreen (screen),
                     False,
 	            SubstructureRedirectMask,
-	            &xev);        
+	            &xev);
 }
 
 

@@ -460,7 +461,7 @@ rebuild_menu (WindowSelectorApplet *applet)
 
         gdk_error_trap_push ();
         result = XGetWindowProperty (GDK_DISPLAY_XDISPLAY (display),
-                                     GDK_WINDOW_XWINDOW (applet->root_window),
+                                     GDK_WINDOW_XID (applet->root_window),
                                      applet->atoms
                                              [_MB_APP_WINDOW_LIST_STACKING],
                                      0,

@@ -563,11 +564,13 @@ position_menu (GtkMenu  *menu,
                gpointer  user_data)
 {
         WindowSelectorApplet *applet = user_data;
-        
-        gdk_window_get_origin (applet->button->window, x, y);
-        
-        *x += applet->button->allocation.x;
-        *y += applet->button->allocation.height;
+        GtkAllocation allocation;
+
+        gdk_window_get_origin (gtk_widget_get_window (applet->button), x, y);
+        gtk_widget_get_allocation (applet->button, &allocation);
+
+        *x += allocation.x;
+        *y += allocation.height;
         *push_in = TRUE;
 }
 

@@ -658,7 +661,7 @@ filter_func (GdkXEvent            *xevent,
                     applet->atoms[_MB_APP_WINDOW_LIST_STACKING]) {
                         /* _MB_APP_WINDOW_LIST_STACKING changed.
                          * Rebuild menu if around. */
-                        if (applet->menu && GTK_WIDGET_VISIBLE (applet->menu))
+                        if (applet->menu && gtk_widget_get_visible (applet->menu))
                                 rebuild_menu (applet);
                 }
                 if (xev->xproperty.atom ==

@@ -744,7 +747,7 @@ screen_changed_cb (GtkWidget         *button,
                                applet);
         
         /* Rebuild menu if around */
-        if (applet->menu && GTK_WIDGET_VISIBLE (applet->menu))
+        if (applet->menu && gtk_widget_get_visible (applet->menu))
                 rebuild_menu (applet);
 
         update_current_app (applet);

@@ -800,12 +803,12 @@ mb_panel_applet_create (const char    *id,
                                 applet->image);
                 break;
         case MODE_ICON_NAME:
-                hbox = gtk_hbox_new (FALSE, 4);
+                hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 4);
                 applet->label = gtk_label_new (NULL);
                 applet->image = gtk_image_new ();
                 gtk_box_pack_start (GTK_BOX (hbox), applet->image,
                                 FALSE, FALSE, 2);
-                gtk_box_pack_start (GTK_BOX (hbox), applet->label, 
+                gtk_box_pack_start (GTK_BOX (hbox), applet->label,
                                 TRUE, TRUE, 0);
                 gtk_container_add (GTK_CONTAINER (applet->button), hbox);
                 break;

index 3554d4c..1b304da 100644
@@ -1,10 +1,13 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*- */
+
 /*
  * startup-monitor - A tray app that provides feedback
  *                             on application startup.
  *
- * Copyright 2004 - 2007, Openedhand Ltd.
+ * Copyright 2004 - 2013, Intel Corp
  * By Matthew Allum <[email protected]>,
  * Stefan Schmidt <[email protected]>
+ * Ross Burton <[email protected]>
  *
  * Based on mb-applet-startup-monitor
  *

@@ -16,7 +19,6 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- *
  */
 
 #include <stdio.h>

@@ -38,7 +40,7 @@
 #include <matchbox-panel/mb-panel.h>
 #include <matchbox-panel/mb-panel-scaling-image.h>
 
-#define TIMEOUT                   20
+#define TIMEOUT 20
 #define HOURGLASS_PIXMAPS 8
 
 typedef struct LaunchItem {

@@ -66,6 +68,7 @@ static gboolean timeout (StartupApplet *applet);
 static void
 startup_applet_free (StartupApplet *applet)
 {
+	/* TODO: this should be in unrealize */
         gdk_window_remove_filter (applet->root_window,
                                   (GdkFilterFunc) filter_func, applet);
         g_slice_free (StartupApplet, applet);

@@ -218,12 +221,38 @@ filter_func (GdkXEvent     *gdk_xevent,
         return GDK_FILTER_CONTINUE;
 }
 
+static void
+on_realize (GtkWidget *widget, gpointer user_data)
+{
+        StartupApplet *applet = user_data;
+        GdkDisplay *display;
+        GdkScreen *screen;
+        Display *xdisplay;
+
+        screen = gtk_widget_get_screen (widget);
+        display = gdk_screen_get_display (screen);
+        xdisplay = GDK_DISPLAY_XDISPLAY (display);
+
+        applet->root_window = gdk_screen_get_root_window (screen);
+
+        applet->sn_display = sn_display_new (xdisplay, NULL, NULL);
+        applet->sn_context = sn_monitor_context_new (applet->sn_display,
+                                                     gdk_screen_get_number (screen),
+                                                     monitor_event_func,
+                                                     applet, NULL);
+
+        XSelectInput (xdisplay,
+                      GDK_WINDOW_XID (applet->root_window),
+                      PropertyChangeMask);
+
+        gdk_window_add_filter (applet->root_window, (GdkFilterFunc)filter_func, applet);
+}
+
 G_MODULE_EXPORT GtkWidget *
 mb_panel_applet_create (const char    *id,
                         GtkOrientation orientation)
 {
         StartupApplet *applet;
-        Display *xdisplay;
 
         /* Create applet data structure */
         applet = g_slice_new0 (StartupApplet);

@@ -242,31 +271,7 @@ mb_panel_applet_create (const char    *id,
         g_object_weak_ref (G_OBJECT(applet->image),
                            (GWeakNotify) startup_applet_free, applet);
 
-        xdisplay = GDK_DISPLAY_XDISPLAY
-                                (gtk_widget_get_display
-                                        (GTK_WIDGET (applet->image)));
-
-        applet->sn_display = sn_display_new (xdisplay, NULL, NULL);
-
-        applet->sn_context = sn_monitor_context_new (applet->sn_display,
-                                                     DefaultScreen(xdisplay),
-                                                     monitor_event_func,
-                                                     (void *) applet,
-                                                     NULL);
-
-        /* We have to select for property events on at least one
-         * root window (but not all as INITIATE messages go to
-         * all root windows)
-         */
-        XSelectInput (xdisplay,
-                      DefaultRootWindow(xdisplay), PropertyChangeMask);
-
-        applet->root_window =
-                gdk_window_lookup_for_display
-                        (gdk_x11_lookup_xdisplay (xdisplay), 0);
-
-        gdk_window_add_filter (applet->root_window,
-                               (GdkFilterFunc) filter_func, applet);
+        g_signal_connect (applet->image, "realize", G_CALLBACK (on_realize), applet);
 
         return GTK_WIDGET (applet->image);
 }

index a65817a..a4686ef 100644
@@ -302,37 +302,60 @@ init_notify (StartupApplet *applet)
   return TRUE;
 }
 
+static void
+screen_changed_cb (GtkWidget     *widget,
+                   GdkScreen     *old_screen,
+                   StartupApplet *applet)
+{
+  GdkScreen *screen;
+  GdkDisplay *display;
+  Display *xdisplay;
+
+  if (applet->root_window) {
+    gdk_window_remove_filter (applet->root_window,
+                              (GdkFilterFunc) filter_func,
+                              applet);
+  }
+
+  screen = gtk_widget_get_screen (widget);
+  display = gdk_screen_get_display (screen);
+
+  xdisplay = GDK_DISPLAY_XDISPLAY (display);
+
+  applet->sn_display = sn_display_new (xdisplay, NULL, NULL);
+
+  applet->sn_context = sn_monitor_context_new (applet->sn_display,
+                                               gdk_screen_get_number (screen),
+                                               monitor_event_func,
+                                               applet, NULL);
+
+  /* We have to select for property events on at least one root window (but not
+   * all as INITIATE messages go to all root windows)
+   */
+  XSelectInput (xdisplay, DefaultRootWindow (xdisplay), PropertyChangeMask);
+
+  applet->root_window = gdk_x11_window_lookup_for_display
+    (display, DefaultRootWindow (xdisplay));
+
+  gdk_window_add_filter (applet->root_window, (GdkFilterFunc)filter_func, applet);
+}
+
 G_MODULE_EXPORT GtkWidget *
 mb_panel_applet_create (const char *id, GtkOrientation orientation)
 {
   StartupApplet *applet;
   GtkWidget *widget;
-  Display *xdisplay;
-  
+
   applet = g_slice_new0 (StartupApplet);
 
-  widget = gtk_hbox_new (0, FALSE); /* grr */
+  widget = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
   g_object_weak_ref (G_OBJECT (widget), (GWeakNotify)startup_applet_free, applet);
 
   if (init_notify (applet)) {
-    xdisplay = GDK_DISPLAY_XDISPLAY (gtk_widget_get_display (widget));
-    
-    applet->sn_display = sn_display_new (xdisplay, NULL, NULL);
-    
-    applet->sn_context = sn_monitor_context_new (applet->sn_display,
-                                                 DefaultScreen (xdisplay),
-                                                 monitor_event_func,
-                                                 applet, NULL);
-
-    /* We have to select for property events on at least one root window (but not
-     * all as INITIATE messages go to all root windows)
-     */
-    XSelectInput (xdisplay, DefaultRootWindow (xdisplay), PropertyChangeMask);
-    
-    applet->root_window = gdk_window_lookup_for_display
-      (gdk_x11_lookup_xdisplay (xdisplay), 0);
-    
-    gdk_window_add_filter (applet->root_window, (GdkFilterFunc)filter_func, applet);
+          g_signal_connect (widget,
+                            "screen-changed",
+                            G_CALLBACK (screen_changed_cb),
+                            applet);
   }
 
   /* TODO: need to fix the panel to support invisible widgets */

index 33c13e1..e40ebc3 100644
@@ -1,4 +1,4 @@
-/* 
+/*
  * (C) 2006 OpenedHand Ltd.
  *
  * Author: Jorn Baayen <[email protected]>

@@ -20,7 +20,7 @@ typedef struct {
         gboolean active;
 
         Atom atom;
-        
+
         GdkWindow *root_window;
 } ShowDesktopApplet;
 

@@ -50,7 +50,7 @@ set_active (ShowDesktopApplet *applet, gboolean active)
         applet->active = active;
 
         /* TODO: remove this function and instead use a toggle button? */
-        
+
         icon = "panel-user-desktop";
 
         mb_panel_scaling_image_set_icon (applet->image, icon);

@@ -71,8 +71,7 @@ sync_applet (ShowDesktopApplet *applet)
 
         gdk_error_trap_push ();
         result = XGetWindowProperty (GDK_DISPLAY_XDISPLAY (display),
-                                     GDK_WINDOW_XWINDOW
-                                            (applet->root_window),
+                                     GDK_WINDOW_XID (applet->root_window),
                                      applet->atom,
                                      0,
                                      G_MAXLONG,

@@ -160,13 +159,13 @@ button_clicked_cb (GtkButton         *button,
 
         widget = GTK_WIDGET (button);
         screen = GDK_SCREEN_XSCREEN (gtk_widget_get_screen (widget));
-  
+
         xev.xclient.type = ClientMessage;
         xev.xclient.serial = 0;
         xev.xclient.send_event = True;
         xev.xclient.display = DisplayOfScreen (screen);
         xev.xclient.window = RootWindowOfScreen (screen);
-        xev.xclient.message_type = applet->atom; 
+        xev.xclient.message_type = applet->atom;
         xev.xclient.format = 32;
         xev.xclient.data.l[0] = !applet->active;
         xev.xclient.data.l[1] = 0;

@@ -194,12 +193,10 @@ mb_panel_applet_create (const char    *id,
         ShowDesktopApplet *applet;
         GtkWidget *button, *image;
 
-        /* Create applet data structure */
         applet = g_slice_new0 (ShowDesktopApplet);
 
         applet->root_window = NULL;
 
-        /* Create button */
         button = gtk_button_new ();
         applet->button = GTK_BUTTON (button);
 

@@ -231,7 +228,6 @@ mb_panel_applet_create (const char    *id,
                            (GWeakNotify) show_desktop_applet_free,
                            applet);
 
-        /* Show! */
         gtk_widget_show_all (button);
 
         return button;

index 7e12814..0ec8a43 100644
@@ -143,6 +143,7 @@ button_release_event_cb (GtkWidget      *event_box,
 {
         int x, y;
         pid_t child_pid = 0;
+        GtkAllocation allocation;
 #ifdef USE_LIBSN
         SnLauncherContext *context;
 #endif

@@ -154,16 +155,17 @@ button_release_event_cb (GtkWidget      *event_box,
 
         /* Only process if the button was released inside the button */
         gtk_widget_translate_coordinates (event_box,
-                                          event_box->parent,
+                                          gtk_widget_get_parent (event_box),
                                           event->x,
                                           event->y,
                                           &x,
                                           &y);
 
-        if (x < event_box->allocation.x ||
-            x > event_box->allocation.x + event_box->allocation.width ||
-            y < event_box->allocation.y ||
-            y > event_box->allocation.y + event_box->allocation.height)
+        gtk_widget_get_allocation (event_box, &allocation);
+        if (x < allocation.x ||
+            x > allocation.x + allocation.width ||
+            y < allocation.y ||
+            y > allocation.y + allocation.height)
                 return TRUE;
 
 #ifdef USE_LIBSN

index 828a36d..1d6832f 100644
@@ -1,9 +1,10 @@
 /* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*- */
 
 /*
- * (C) 2006 OpenedHand Ltd.
+ * (C) 2006-2013 Intel Corp
  *
- * Author: Jorn Baayen <[email protected]>
+ * Authors: Ross Burton <[email protected]>
+ *          Jorn Baayen <[email protected]>
  *
  * Licensed under the GPL v2 or greater.
  */

@@ -23,17 +24,16 @@
 
 static GList *open_modules = NULL; /* List of open modules */
 
-/* Extra width and height to reserve for panel struts (see --reserve-extra) */
-static gint extra_width  = 0;
-static gint extra_height = 0;
+enum {
+        ATOM_WM_STRUT_PARTIAL,
+        ATOM_MB_STATE,
+        ATOM_STATE_DOCT_TITLEBAR,
+        ATOM_DOCK_TITLEBAR_DESKTOP,
+        /* Counter */
+        ATOM_LAST
+};
 
-static gboolean snap_right = FALSE;
-static gboolean snap_bottom = FALSE;
-
-static gboolean center_vertical   = FALSE;
-static gboolean center_horizontal = FALSE;
-
-static gboolean fullscreen = FALSE;
+static Atom atoms[ATOM_LAST];
 
 /* Load applet @name with ID @id */
 static GtkWidget *

@@ -132,63 +132,70 @@ load_applets (const char    *applets_desc,
         g_strfreev (applets);
 }
 
-/* Set struts based on the window size and position */
 static void
-set_struts (GtkWidget *window, gint x, gint y, gint w, gint h)
+set_struts (GtkWidget *window, GtkPositionType edge, int size)
 {
-        static Atom net_wm_strut_partial = None;
-
-        guint32    struts [12];
-        gint       screen_width, screen_height;
-        GdkScreen *screen;
-
-        screen = gdk_screen_get_default ();
-
-        screen_width  = gdk_screen_get_width (screen);
-        screen_height = gdk_screen_get_height (screen);
-
-        /* left */
-        struts[0] = x == 0 ? w + extra_width : 0;
-        struts[4] = struts[0] ? y : 0;
-        struts[5] = struts[0] ? y + h : 0;
+        Display *xdisplay;
+        int x, y, w, h;
+        struct {
+                long left;
+                long right;
+                long top;
+                long bottom;
+                long left_start_y;
+                long left_end_y;
+                long right_start_y;
+                long right_end_y;
+                long top_start_x;
+                long top_end_x;
+                long bottom_start_x;
+                long bottom_end_x;
+        } struts = { 0, };
+
+        xdisplay = GDK_SCREEN_XDISPLAY (gtk_widget_get_screen (window));
+        g_assert (xdisplay);
 
-        /* right */
-        struts[1] = x + w == screen_width ? w + extra_width: 0;
-        struts[6] = struts[1] ? y : 0;
-        struts[7] = struts[1] ? y + h : 0;
-
-        /* top */
-        struts[2] = y == 0 ? h + extra_height: 0;
-        struts[8] = struts[2] ? x : 0;
-        struts[9] = struts[2] ? x + w : 0;
+        gtk_window_get_position (GTK_WINDOW (window), &x, &y);
+        gtk_window_get_size (GTK_WINDOW (window), &w, &h);
 
-        /* bottom */
-        struts[3] = y + h == screen_height ? h + extra_height : 0;
-        struts[10] = struts[3] ? x : 0;
-        struts[11] = struts[3] ? x + w : 0;
+        switch (edge) {
+        case GTK_POS_LEFT:
+                struts.left = size;
+                struts.left_start_y = y;
+                struts.left_end_y = y + h;
+                break;
+        case GTK_POS_RIGHT:
+                struts.right = size;
+                struts.right_start_y = y;
+                struts.right_end_y = y + h;
+                break;
+        case GTK_POS_TOP:
+                struts.top = size;
+                struts.top_start_x = x;
+                struts.top_end_x = x + w;
+                break;
+        case GTK_POS_BOTTOM:
+                struts.bottom = size;
+                struts.bottom_start_x = x;
+                struts.bottom_end_x = x + w;
+                break;
+        }
 
         gdk_error_trap_push ();
-
-        if (!net_wm_strut_partial)
-                net_wm_strut_partial = XInternAtom (GDK_DISPLAY () ,
-                                                    "_NET_WM_STRUT_PARTIAL",
-                                                    False);
-
-        XChangeProperty (GDK_DISPLAY (),
-                         GDK_WINDOW_XID (window->window),
-                         net_wm_strut_partial, XA_CARDINAL, 32,
+        XChangeProperty (xdisplay,
+                         GDK_WINDOW_XID (gtk_widget_get_window (window)),
+                         atoms[ATOM_WM_STRUT_PARTIAL], XA_CARDINAL, 32,
                          PropModeReplace,
                          (guchar *) &struts, 12);
-
-        gdk_error_trap_pop ();
+        gdk_error_trap_pop_ignored ();
 }
 
+#if 0
 static void
 screen_size_changed_cb (GdkScreen *screen, GtkWidget *window)
 {
         gint       x, y, w, h;
         gint       screen_width, screen_height;
-
         gtk_window_get_position (GTK_WINDOW (window), &x, &y);
         gtk_window_get_size (GTK_WINDOW (window), &w, &h);
 

@@ -232,6 +239,20 @@ screen_size_changed_cb (GdkScreen *screen, GtkWidget *window)
 
         set_struts (window, x, y, w, h);
 }
+#endif
+
+static void
+get_atoms (Display *xdisplay)
+{
+        static const char *names[] = {
+                "_NET_WM_STRUT_PARTIAL",
+                "_MB_WM_STATE",
+                "_MB_WM_STATE_DOCK_TITLEBAR",
+                "_MB_DOCK_TITLEBAR_SHOW_ON_DESKTOP"
+        };
+
+        XInternAtoms (xdisplay, (char**)names, G_N_ELEMENTS (names), False, atoms);
+}
 
 int
 main (int argc, char **argv)

@@ -239,54 +260,44 @@ main (int argc, char **argv)
         GOptionContext *option_context;
         GOptionGroup *option_group;
         GError *error;
-        char *geometry = NULL, *start_applets = NULL, *end_applets = NULL;
+        char *start_applets = NULL, *end_applets = NULL;
+        char *edge_string = NULL;
+        int size = DEFAULT_HEIGHT;
+        int screen_num = -1;
+        int monitor_num = -1;
+        GtkPositionType edge = GTK_POS_TOP;
         GtkWidget *window, *box, *frame;
+        GdkDisplay *display;
         GdkScreen *screen;
-        int panel_width, panel_height;
-        GtkOrientation orientation;
-        gboolean want_titlebar = FALSE;
+        GtkOrientation orientation = GTK_ORIENTATION_HORIZONTAL;
+        gboolean in_titlebar = FALSE;
+        GdkRectangle screen_geom;
 
+        /* TODO: add these as groups (applets / position) */
         GOptionEntry option_entries[] = {
-                { "geometry", 0, 0, G_OPTION_ARG_STRING, &geometry,
-                  N_("Panel geometry"), N_("[WIDTH][xHEIGHT][{+-}X[{+-}Y]]") },
                 { "start-applets", 0, 0, G_OPTION_ARG_STRING, &start_applets,
                   N_("Applets to pack at the start"), N_("APPLET[:APPLET_ID] ...") },
                 { "end-applets", 0, 0, G_OPTION_ARG_STRING, &end_applets,
                   N_("Applets to pack at the end"), N_("APPLET[:APPLET_ID] ...") },
-                { "titlebar", 0, 0, G_OPTION_ARG_NONE, &want_titlebar,
-                  N_("Display in window titlebar (If Matchbox theme supports)"),
-                  NULL },
-                { "reserve-extra-width", 0, 0, G_OPTION_ARG_INT, &extra_width,
-                  N_("Extra width to reserve in panel strut in addittion to "
-                     "the window width"),
-                  N_("pixels")},
-                { "reserve-extra-height", 0, 0, G_OPTION_ARG_INT, &extra_height,
-                  N_("Extra height to reserve in panel strut in addition to "
-                     "the window height"),
-                  N_("pixels")},
-                { "center-horizontally", 0, 0, G_OPTION_ARG_NONE,
-                  &center_horizontal,
-                  N_("Center panel horizontally"),
-                  NULL },
-                { "center-vertically", 0, 0, G_OPTION_ARG_NONE,
-                  &center_vertical,
-                  N_("Center panel vertically"),
-                  NULL },
-                { "fullscreen", 0, 0, G_OPTION_ARG_NONE,
-                  &fullscreen,
-                  N_("Stretch panel to fullscreen in dominant direction "
-                     "(if used together with the --geometry options "
-                     "while the offset in the dominant direction will be "
-                     "ignored, it must not be specified with the + prefix, "
-                     "e.g., --geometry=200x32+0-0"),
-                  NULL },
+
+                { "screen", 'n', 0, G_OPTION_ARG_INT, &screen_num,
+                  N_("Screen number"), N_("SCREEN") },
+                { "monitor", 'm', 0, G_OPTION_ARG_INT, &monitor_num,
+                  N_("Monitor number"), N_("MONITOR") },
+
+                { "titlebar", 't', 0, G_OPTION_ARG_NONE, &in_titlebar,
+                  N_("Display in window titlebar (with Matchbox theme support)"), NULL },
+                { "edge", 'e', 0, G_OPTION_ARG_STRING, &edge_string,
+                  N_("Panel edge"), N_("TOP|BOTTON|LEFT|RIGHT") },
+                { "size", 's', 0, G_OPTION_ARG_INT, &size,
+                  N_("Panel size"), N_("PIXELS")},
+
                 { NULL }
         };
 
         /* Make sure that GModule is supported */
         if (!g_module_supported ()) {
-                g_warning (_("gmodule support not found. gmodule support is "
-                             "required for matchbox-panel to work"));
+                g_warning (_("GModule support not found, this is required for matchbox-panel to work"));
                 return -1;
         }
 

@@ -316,44 +327,100 @@ main (int argc, char **argv)
 
         g_option_context_free (option_context);
 
+        /* Can't be in the titlebar *and* on an edge, so check for this and exit */
+        if (in_titlebar && edge_string) {
+                g_printerr ("Cannot specify both --edge and --titlebar\n");
+                return 1;
+        }
+
+        if (edge_string) {
+                if (g_ascii_strcasecmp (edge_string, "top") == 0) {
+                        edge = GTK_POS_TOP;
+                } else if (g_ascii_strcasecmp (edge_string, "bottom") == 0) {
+                        edge = GTK_POS_BOTTOM;
+                } else if (g_ascii_strcasecmp (edge_string, "left") == 0) {
+                        edge = GTK_POS_LEFT;
+                } else if (g_ascii_strcasecmp (edge_string, "right") == 0) {
+                        edge = GTK_POS_RIGHT;
+                } else {
+                        g_printerr ("Unparsable edge '%s', expecting top/bottom/left/right\n", edge_string);
+                        return 1;
+                }
+                g_free (edge_string);
+        }
+
         /* Set app name */
         g_set_application_name (_("Matchbox Panel"));
 
+        display = gdk_display_get_default ();
+
+        get_atoms (GDK_DISPLAY_XDISPLAY (display));
+
+        if (screen_num != -1) {
+                screen = gdk_display_get_screen (display, screen_num);
+        } else {
+                screen = gdk_display_get_default_screen (display);
+        }
+
+        if (monitor_num == -1) {
+                monitor_num = gdk_screen_get_primary_monitor (screen);
+        }
+
+        /* Note that this is bare monitor geometry and not the work area, so
+           panels will overlap. */
+        gdk_screen_get_monitor_geometry (screen, monitor_num, &screen_geom);
+
         /* Create window */
         window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
-
         gtk_widget_set_name (window, "MatchboxPanel");
-
-        gtk_window_set_type_hint (GTK_WINDOW (window),
-                                  GDK_WINDOW_TYPE_HINT_DOCK);
+        gtk_window_set_type_hint (GTK_WINDOW (window), GDK_WINDOW_TYPE_HINT_DOCK);
+        gtk_window_set_resizable (GTK_WINDOW (window), FALSE);
 
         /* No key focus please */
         gtk_window_set_accept_focus (GTK_WINDOW (window), FALSE);
 
-        /* Set default panel height */
-        screen = gtk_window_get_screen (GTK_WINDOW (window));
-        gtk_window_set_default_size (GTK_WINDOW (window),
-                                     gdk_screen_get_width (screen),
-                                     DEFAULT_HEIGHT);
-
-        /* Parse geometry string */
-        if (geometry) {
-                if (!gtk_window_parse_geometry (GTK_WINDOW (window),
-                                                geometry)) {
-                        g_warning ("Failed to parse geometry string");
-
-                        gtk_widget_destroy (window);
+        gtk_widget_realize (window);
 
-                        return 1;
+        /* Set size */
+        if (!in_titlebar) {
+                /* TODO: hook this up to GdkScreen:size-changed */
+
+                /* Orientation and size */
+                switch (edge) {
+                case GTK_POS_TOP:
+                case GTK_POS_BOTTOM:
+                        orientation = GTK_ORIENTATION_HORIZONTAL;
+                        gtk_widget_set_size_request (window,
+                                           screen_geom.width, size);
+                        break;
+                case GTK_POS_LEFT:
+                case GTK_POS_RIGHT:
+                        orientation = GTK_ORIENTATION_VERTICAL;
+                        gtk_widget_set_size_request (window,
+                                           size, screen_geom.height);
+                        break;
                 }
-        }
 
-        /* Determine window size */
-        gtk_window_get_size (GTK_WINDOW (window), &panel_width, &panel_height);
+                /* Position */
+                switch (edge) {
+                case GTK_POS_TOP:
+                case GTK_POS_LEFT:
+                        gtk_window_move (GTK_WINDOW (window),
+                                         screen_geom.x, screen_geom.y);
+                        break;
+                case GTK_POS_RIGHT:
+                        gtk_window_move (GTK_WINDOW (window),
+                                         screen_geom.x + screen_geom.width - size,
+                                         screen_geom.y);
+                        break;
+                case GTK_POS_BOTTOM:
+                        gtk_window_move (GTK_WINDOW (window),
+                                         screen_geom.x,
+                                         screen_geom.y + screen_geom.height - size);
+                }
 
-        /* Force size */
-        gtk_widget_set_size_request (window, panel_width, panel_height);
-        gtk_window_resize (GTK_WINDOW (window), panel_width, panel_height);
+                set_struts (window, edge, size);
+        }
 
         /* Add frame */
         frame = gtk_frame_new (NULL);

@@ -362,91 +429,30 @@ main (int argc, char **argv)
         gtk_widget_show (frame);
 
         /* Is this a horizontal or a vertical layout? */
-        if (panel_width >= panel_height) {
-                orientation = GTK_ORIENTATION_HORIZONTAL;
-
+        if (orientation == GTK_ORIENTATION_HORIZONTAL) {
                 gtk_widget_set_name (frame, "MatchboxPanelFrameHorizontal");
-
-                box = gtk_hbox_new (FALSE, 0);
         } else {
-                orientation = GTK_ORIENTATION_VERTICAL;
-
                 gtk_widget_set_name (frame, "MatchboxPanelFrameVertical");
-
-                box = gtk_vbox_new (FALSE, 0);
         }
+        box = gtk_box_new (orientation, 0);
 
         gtk_container_add (GTK_CONTAINER (frame), box);
         gtk_widget_show (box);
 
-        gtk_widget_realize (window);
-
+#if 0
         /* Do we want to display the panel in the Matchbox titlebar? */
-        if (want_titlebar) {
-                const char *names[] = {
-                        /* Set the Matchbox-specific window state */
-                        "_MB_WM_STATE",
-                        /* To the list of these atoms */
-                        "_MB_WM_STATE_DOCK_TITLEBAR",
-                        "_MB_DOCK_TITLEBAR_SHOW_ON_DESKTOP"
-                };
-                Atom atoms[G_N_ELEMENTS (names)];
-
-                XInternAtoms (GDK_DISPLAY (), (char**)names,
-                              G_N_ELEMENTS (names), False, atoms);
-
-                XChangeProperty (GDK_DISPLAY (),
-                                 GDK_WINDOW_XID (window->window),
+        if (in_titlebar) {
+                XChangeProperty (GDK_SCREEN_XDISPLAY (screen),
+                                 GDK_WINDOW_XID (gtk_widget_get_window (window)),
                                  atoms[0], XA_ATOM, 32,
                                  PropModeReplace,
                                  (unsigned char *) &atoms[1], 2);
         } else {
-                /* If we're not in a title bar, set the struts */
-                gint screen_width  = gdk_screen_get_width (screen);
-                gint screen_height = gdk_screen_get_height (screen);
-                gint x, y, w, h;
-
-                gtk_window_get_position (GTK_WINDOW (window), &x, &y);
-                gtk_window_get_size (GTK_WINDOW (window), &w, &h);
-
-                if (fullscreen)
-                        {
-                                if (w > h)
-                                        {
-                                                w = screen_width;
-                                                x = 0;
-                                        }
-                                else
-                                        {
-                                                h = screen_height;
-                                                y = 0;
-                                        }
-
-                                gtk_widget_set_size_request (window, w, h);
-                                gtk_window_resize (GTK_WINDOW (window), w, h);
-                        }
-
-                if (center_horizontal)
-                        x = (screen_width - w) / 2;
-
-                if (center_vertical)
-                        y = (screen_height - h)/ 2;
-
-                if (center_horizontal || center_vertical || fullscreen)
-                        gtk_window_move (GTK_WINDOW (window), x, y);
-
-
-                if (x + w == screen_width)
-                        snap_right = TRUE;
-
-                if (y + h == screen_height)
-                        snap_bottom = TRUE;
-
-                set_struts (window, x, y, w, h);
                 g_signal_connect (screen, "size-changed",
                                   G_CALLBACK (screen_size_changed_cb),
                                   window);
         }
+#endif
 
         /* Load applets */
         load_applets (start_applets,

index 2920b12..2d896e8 100644
@@ -1,4 +1,4 @@
-/* 
+/*
  * (C) 2008 OpenedHand Ltd.
  *
  * Author: Ross Burton <[email protected]>

@@ -20,9 +20,13 @@ reposition (GtkWindow *window)
 
   screen = gtk_window_get_screen (window);
 
-  gtk_widget_size_request ((GtkWidget*)window, &req);
+  gtk_widget_get_preferred_size (GTK_WIDGET (window), &req, NULL);
+
   if (req.height) {
     gtk_window_resize (window, req.width, req.height);
+    /* TODO: get the primary monitor and then use
+       gdk_screen_get_monitor_geometry() to get the geometry of the primary
+       display, not the overall screen. */
     gtk_window_move (window,
                      gdk_screen_get_width (screen) - req.width,
                      gdk_screen_get_height (screen) - req.height);

@@ -45,7 +49,7 @@ find_widget (GtkContainer *container, guint32 id)
 {
   GList *children, *l;
   GtkWidget *w;
-  
+
   children = gtk_container_get_children (container);
   l = g_list_find_custom (children, GINT_TO_POINTER (id), id_compare);
   w = l ? l->data : NULL;

@@ -86,7 +90,7 @@ on_notification_closed (MbNotifyStore *store, guint id, guint reason, GtkWindow
   w = find_widget ((GtkContainer*)box, id);
   if (w)
     gtk_container_remove (GTK_CONTAINER (box), w);
-  
+
   reposition (window);
 }
 

@@ -95,14 +99,15 @@ mb_panel_applet_create (const char *id, GtkOrientation orientation)
 {
   GtkWidget *window, *box;
   MbNotifyStore *notify;
-  
+
   window = gtk_window_new (GTK_WINDOW_POPUP);
   gtk_widget_set_name (window, "MbNotificationBox");
-  
+  gtk_window_set_gravity (GTK_WINDOW (window), GDK_GRAVITY_SOUTH_EAST);
+
   box = gtk_vbox_new (TRUE, 0);
   gtk_container_add (GTK_CONTAINER (window), box);
   gtk_widget_show_all (window);
-  
+
   notify = mb_notify_store_new ();
   g_signal_connect (notify, "notification-added", G_CALLBACK (on_notification_added), window);
   g_signal_connect (notify, "notification-closed", G_CALLBACK (on_notification_closed), window);

index 0d0e97c..e440ec9 100644
@@ -9,7 +9,7 @@ enum {
 };
 
 static guint signals[N_SIGNALS];
-  
+
 #define GET_PRIVATE(o) \
   (G_TYPE_INSTANCE_GET_PRIVATE ((o), MB_TYPE_NOTIFICATION, MbNotificationPrivate))
 

@@ -31,17 +31,21 @@ on_button_release (MbNotification *notification, GdkEventButton *event)
   }
 }
 
-static gint
-expose (GtkWidget *widget, GdkEventExpose *event)
+static gboolean
+on_draw (GtkWidget *widget, cairo_t *cr)
 {
-  if (gtk_widget_is_drawable (widget)) {
-    gtk_paint_box (widget->style, widget->window,
-                   widget->state, GTK_SHADOW_OUT,
-                   &event->area, widget, "notification",
-                   0, 0, -1, -1);
-    
-    (*GTK_WIDGET_CLASS (mb_notification_parent_class)->expose_event) (widget, event);
-  }
+  GtkStyleContext *style;
+  int width, height;
+
+  style = gtk_widget_get_style_context (widget);
+
+  width = gtk_widget_get_allocated_width (widget);
+  height = gtk_widget_get_allocated_height (widget);
+
+  gtk_render_frame (style, cr, 0, 0, width, height);
+
+  (*GTK_WIDGET_CLASS (mb_notification_parent_class)->draw) (widget, cr);
+
   return FALSE;
 }
 

@@ -52,8 +56,8 @@ mb_notification_class_init (MbNotificationClass *klass)
 
   g_type_class_add_private (klass, sizeof (MbNotificationPrivate));
 
-  widget_class->expose_event = expose;
-  
+  widget_class->draw = on_draw;
+
   signals[CLOSED] = g_signal_new ("closed",
                                   G_OBJECT_CLASS_TYPE (klass),
                                   G_SIGNAL_RUN_FIRST,

@@ -73,13 +77,13 @@ mb_notification_init (MbNotification *self)
   gtk_event_box_set_visible_window (GTK_EVENT_BOX (self), FALSE);
   gtk_widget_add_events (GTK_WIDGET (self), GDK_BUTTON_RELEASE_MASK);
   g_signal_connect (self, "button-release-event", G_CALLBACK (on_button_release), NULL);
-  
-  box = gtk_hbox_new (FALSE, 8);
+
+  box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 8);
   gtk_container_add (GTK_CONTAINER (self), box);
 
   priv->image = gtk_image_new ();
   gtk_box_pack_start (GTK_BOX (box), priv->image, FALSE, FALSE, 0);
-  
+
   priv->label = gtk_label_new (NULL);
   gtk_misc_set_alignment (GTK_MISC (priv->label), 0.0, 0.5);
   gtk_box_pack_start (GTK_BOX (box), priv->label, TRUE, TRUE, 0);

@@ -106,7 +110,7 @@ mb_notification_update (MbNotification *notification, Notification *n)
     /* TODO: should this default to no image, or "info" */
     gtk_image_clear (GTK_IMAGE (priv->image));
   }
-  
+
   s = g_strdup_printf ("<big><b>%s</b></big>\n"
                        "\n%s", n->summary, n->body ?: NULL);
   gtk_label_set_markup (GTK_LABEL (priv->label), s);

276 lines not on this page · raw message

68 lines not on this page · raw message

526 lines not on this page · raw message

71 lines not on this page · raw message

830 lines not on this page · raw message

index a1781a7..0408959 100644
@@ -24,10 +24,12 @@
 #ifndef __NA_TRAY_MANAGER_H__
 #define __NA_TRAY_MANAGER_H__
 
-#include <gtk/gtk.h>
 #ifdef GDK_WINDOWING_X11
 #include <gdk/gdkx.h>
 #endif
+#include <gtk/gtk.h>
+
+#include "na-tray-child.h"
 
 G_BEGIN_DECLS
 

@@ -40,7 +42,6 @@ G_BEGIN_DECLS
 	
 typedef struct _NaTrayManager	    NaTrayManager;
 typedef struct _NaTrayManagerClass  NaTrayManagerClass;
-typedef struct _NaTrayManagerChild  NaTrayManagerChild;
 
 struct _NaTrayManager
 {

@@ -49,11 +50,18 @@ struct _NaTrayManager
 #ifdef GDK_WINDOWING_X11
   GdkAtom selection_atom;
   Atom    opcode_atom;
+  Atom    message_data_atom;
 #endif
   
   GtkWidget *invisible;
   GdkScreen *screen;
   GtkOrientation orientation;
+  gint padding;
+  gint icon_size;
+  GdkColor fg;
+  GdkColor error;
+  GdkColor warning;
+  GdkColor success;
 
   GList *messages;
   GHashTable *socket_table;

@@ -64,18 +72,18 @@ struct _NaTrayManagerClass
   GObjectClass parent_class;
 
   void (* tray_icon_added)   (NaTrayManager      *manager,
-			      NaTrayManagerChild *child);
+			      NaTrayChild        *child);
   void (* tray_icon_removed) (NaTrayManager      *manager,
-			      NaTrayManagerChild *child);
+			      NaTrayChild        *child);
 
   void (* message_sent)      (NaTrayManager      *manager,
-			      NaTrayManagerChild *child,
+			      NaTrayChild        *child,
 			      const gchar        *message,
 			      glong               id,
 			      glong               timeout);
   
   void (* message_cancelled) (NaTrayManager      *manager,
-			      NaTrayManagerChild *child,
+			      NaTrayChild        *child,
 			      glong               id);
 
   void (* lost_selection)    (NaTrayManager      *manager);

@@ -87,11 +95,19 @@ gboolean        na_tray_manager_check_running   (GdkScreen          *screen);
 NaTrayManager  *na_tray_manager_new             (void);
 gboolean        na_tray_manager_manage_screen   (NaTrayManager      *manager,
 						 GdkScreen          *screen);
-char           *na_tray_manager_get_child_title (NaTrayManager      *manager,
-						 NaTrayManagerChild *child);
 void            na_tray_manager_set_orientation (NaTrayManager      *manager,
 						 GtkOrientation      orientation);
 GtkOrientation  na_tray_manager_get_orientation (NaTrayManager      *manager);
+void            na_tray_manager_set_padding     (NaTrayManager      *manager,
+						 gint                padding);
+void            na_tray_manager_set_icon_size   (NaTrayManager      *manager,
+						 gint                padding);
+void            na_tray_manager_set_colors      (NaTrayManager      *manager,
+						 GdkColor           *fg,
+						 GdkColor           *error,
+						 GdkColor           *warning,
+						 GdkColor           *success);
+
 
 G_END_DECLS
 

863 lines not on this page · raw message

76 lines not on this page · raw message

122 lines not on this page · raw message

index 25aa041..dc76b06 100644
@@ -1,3 +1,4 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*- */
 /*
  * (C) 2006, 2007 OpenedHand Ltd.
  *

@@ -158,7 +159,7 @@ clear_cache (MBPanelScalingImage *image)
 {
         if (!image->priv->caching)
                 return;
-        
+
         g_hash_table_foreach_remove (image->priv->cache,
                                      return_true,
                                      NULL);

@@ -208,18 +209,18 @@ find_icon (GtkIconTheme *icon_theme,
 
         prefixed = g_strconcat ("panel-", stripped, NULL);
 
-        info = gtk_icon_theme_lookup_icon (icon_theme, 
+        info = gtk_icon_theme_lookup_icon (icon_theme,
                                            prefixed,
                                            size,
                                            0);
 
         if (info == NULL) {
-          info = gtk_icon_theme_lookup_icon (icon_theme, 
+          info = gtk_icon_theme_lookup_icon (icon_theme,
                                              stripped,
                                              size,
                                              0);
         }
-        
+
         g_free (stripped);
         g_free (prefixed);
 

@@ -318,7 +319,7 @@ mb_panel_scaling_image_size_allocate (GtkWidget *widget,
 
         widget_class = GTK_WIDGET_CLASS (mb_panel_scaling_image_parent_class);
         widget_class->size_allocate (widget, allocation);
-        
+
         reload_icon (image, FALSE);
 }
 

@@ -328,7 +329,7 @@ mb_panel_scaling_image_realize (GtkWidget *widget)
         GtkWidgetClass *widget_class;
 
         reload_icon (MB_PANEL_SCALING_IMAGE (widget), TRUE);
-        
+
         widget_class = GTK_WIDGET_CLASS (mb_panel_scaling_image_parent_class);
         widget_class->realize (widget);
 }

@@ -382,7 +383,7 @@ mb_panel_scaling_image_screen_changed (GtkWidget *widget,
 
                 reload_icon (MB_PANEL_SCALING_IMAGE (widget), TRUE);
         }
-        
+
         widget_class = GTK_WIDGET_CLASS (mb_panel_scaling_image_parent_class);
         widget_class->screen_changed (widget, old_screen);
 }

@@ -513,7 +514,7 @@ const char *
 mb_panel_scaling_image_get_icon (MBPanelScalingImage *image)
 {
         g_return_val_if_fail (MB_PANEL_IS_SCALING_IMAGE (image), NULL);
-        
+
         return image->priv->icon;
 }
 

@@ -522,7 +523,7 @@ mb_panel_scaling_image_get_icon (MBPanelScalingImage *image)
  * @image: A #MBPanelScalingImage
  * @caching: TRUE if image caching is desired
  *
- * Sets the caching mode to @caching. If @caching is TRUE, 
+ * Sets the caching mode to @caching. If @caching is TRUE,
  * #GdkPixbuf objects previously loaded by @image will be kept around.
  * Use this if you want to quickly alternate between a fixed set of images.
  *

@@ -562,6 +563,6 @@ gboolean
 mb_panel_scaling_image_get_caching (MBPanelScalingImage *image)
 {
         g_return_val_if_fail (MB_PANEL_IS_SCALING_IMAGE (image), FALSE);
-        
+
         return image->priv->caching;
 }

index dc76b06..56d2d78 100644
@@ -240,16 +240,16 @@ find_icon (GtkIconTheme *icon_theme,
 static void
 reload_icon (MBPanelScalingImage *image, gboolean force)
 {
+        GtkAllocation alloc;
         int size;
         char *file;
         GdkPixbuf *pixbuf;
         GError *error;
 
         /* Determine the required icon size */
-        if (image->priv->orientation == GTK_ORIENTATION_HORIZONTAL)
-                size = GTK_WIDGET (image)->allocation.height;
-        else
-                size = GTK_WIDGET (image)->allocation.width;
+        gtk_widget_get_allocation (GTK_WIDGET (image), &alloc);
+        size = image->priv->orientation == GTK_ORIENTATION_HORIZONTAL
+                ? alloc.height : alloc.width;
 
         if (!force && size == image->priv->size) {
                 return;

@@ -302,7 +302,9 @@ static void
 icon_theme_changed_cb (GtkIconTheme   *icon_theme,
                        MBPanelScalingImage *image)
 {
-        if (!gtk_widget_get_realized (GTK_WIDGET (image)))
+        GtkWidget *widget = GTK_WIDGET (image);
+
+        if (!gtk_widget_get_realized (widget))
                 return;
 
         clear_cache (image);

@@ -320,7 +322,9 @@ mb_panel_scaling_image_size_allocate (GtkWidget *widget,
         widget_class = GTK_WIDGET_CLASS (mb_panel_scaling_image_parent_class);
         widget_class->size_allocate (widget, allocation);
 
-        reload_icon (image, FALSE);
+        if (gtk_widget_get_realized (widget)) {
+                reload_icon (image, FALSE);
+        }
 }
 
 static void

index 1d6832f..ea1bb19 100644
@@ -374,7 +374,7 @@ main (int argc, char **argv)
         window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
         gtk_widget_set_name (window, "MatchboxPanel");
         gtk_window_set_type_hint (GTK_WINDOW (window), GDK_WINDOW_TYPE_HINT_DOCK);
-        gtk_window_set_resizable (GTK_WINDOW (window), FALSE);
+        gtk_window_set_has_resize_grip (GTK_WINDOW (window), FALSE);
 
         /* No key focus please */
         gtk_window_set_accept_focus (GTK_WINDOW (window), FALSE);

index ea1bb19..3f7e3b4 100644
@@ -261,7 +261,8 @@ main (int argc, char **argv)
         GOptionGroup *option_group;
         GError *error;
         char *start_applets = NULL, *end_applets = NULL;
-        char *edge_string = NULL;
+        char *edge_string = NULL, *mode_string = NULL;
+        enum { MODE_DOCK, MODE_TITLEBAR, MODE_WINDOW } mode = MODE_DOCK;
         int size = DEFAULT_HEIGHT;
         int screen_num = -1;
         int monitor_num = -1;

@@ -270,7 +271,6 @@ main (int argc, char **argv)
         GdkDisplay *display;
         GdkScreen *screen;
         GtkOrientation orientation = GTK_ORIENTATION_HORIZONTAL;
-        gboolean in_titlebar = FALSE;
         GdkRectangle screen_geom;
 
         /* TODO: add these as groups (applets / position) */

@@ -285,13 +285,12 @@ main (int argc, char **argv)
                 { "monitor", 'm', 0, G_OPTION_ARG_INT, &monitor_num,
                   N_("Monitor number"), N_("MONITOR") },
 
-                { "titlebar", 't', 0, G_OPTION_ARG_NONE, &in_titlebar,
-                  N_("Display in window titlebar (with Matchbox theme support)"), NULL },
                 { "edge", 'e', 0, G_OPTION_ARG_STRING, &edge_string,
                   N_("Panel edge"), N_("TOP|BOTTON|LEFT|RIGHT") },
                 { "size", 's', 0, G_OPTION_ARG_INT, &size,
                   N_("Panel size"), N_("PIXELS")},
-
+                { "mode", 'm', 0, G_OPTION_ARG_STRING, &mode_string,
+                  N_("Panel mode"), N_("DOCK|TITLEBAR|WINDOW") },
                 { NULL }
         };
 

@@ -327,12 +326,6 @@ main (int argc, char **argv)
 
         g_option_context_free (option_context);
 
-        /* Can't be in the titlebar *and* on an edge, so check for this and exit */
-        if (in_titlebar && edge_string) {
-                g_printerr ("Cannot specify both --edge and --titlebar\n");
-                return 1;
-        }
-
         if (edge_string) {
                 if (g_ascii_strcasecmp (edge_string, "top") == 0) {
                         edge = GTK_POS_TOP;

@@ -349,6 +342,20 @@ main (int argc, char **argv)
                 g_free (edge_string);
         }
 
+        if (mode_string) {
+                if (g_ascii_strcasecmp (mode_string, "dock") == 0) {
+                        mode = MODE_DOCK;
+                } else if (g_ascii_strcasecmp (mode_string, "titlebar") == 0) {
+                        mode = MODE_TITLEBAR;
+                } else if (g_ascii_strcasecmp (mode_string, "window") == 0) {
+                        mode = MODE_WINDOW;
+                } else {
+                        g_printerr ("Unparsable mode '%s', expecting dock/titlebar/window\n", mode_string);
+                        return 1;
+                }
+                g_free (mode_string);
+        }
+
         /* Set app name */
         g_set_application_name (_("Matchbox Panel"));
 

@@ -373,16 +380,18 @@ main (int argc, char **argv)
         /* Create window */
         window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
         gtk_widget_set_name (window, "MatchboxPanel");
-        gtk_window_set_type_hint (GTK_WINDOW (window), GDK_WINDOW_TYPE_HINT_DOCK);
         gtk_window_set_has_resize_grip (GTK_WINDOW (window), FALSE);
 
-        /* No key focus please */
-        gtk_window_set_accept_focus (GTK_WINDOW (window), FALSE);
+        if (mode != MODE_WINDOW) {
+                gtk_window_set_type_hint (GTK_WINDOW (window), GDK_WINDOW_TYPE_HINT_DOCK);
+                gtk_window_set_accept_focus (GTK_WINDOW (window), FALSE);
+        }
 
         gtk_widget_realize (window);
 
         /* Set size */
-        if (!in_titlebar) {
+        switch (mode) {
+        case MODE_DOCK:
                 /* TODO: hook this up to GdkScreen:size-changed */
 
                 /* Orientation and size */

@@ -420,6 +429,28 @@ main (int argc, char **argv)
                 }
 
                 set_struts (window, edge, size);
+                break;
+        case MODE_TITLEBAR:
+                /* TODO */
+                break;
+        case MODE_WINDOW:
+                /* Set the size based on half the screen dimensions, and
+                   requested size */
+                switch (edge) {
+                case GTK_POS_TOP:
+                case GTK_POS_BOTTOM:
+                        orientation = GTK_ORIENTATION_HORIZONTAL;
+                        gtk_widget_set_size_request (window,
+                                           screen_geom.width / 2, size);
+                        break;
+                case GTK_POS_LEFT:
+                case GTK_POS_RIGHT:
+                        orientation = GTK_ORIENTATION_VERTICAL;
+                        gtk_widget_set_size_request (window,
+                                           size, screen_geom.height / 2);
+                        break;
+                }
+                break;
         }
 
         /* Add frame */

449 lines not on this page · raw message

64 lines not on this page · raw message

index e40ebc3..14f9d96 100644
@@ -11,11 +11,11 @@
 #include <gdk/gdkx.h>
 #include <X11/Xatom.h>
 #include <matchbox-panel/mb-panel.h>
-#include <matchbox-panel/mb-panel-scaling-image.h>
+#include <matchbox-panel/mb-panel-scaling-image2.h>
 
 typedef struct {
         GtkButton *button;
-        MBPanelScalingImage *image;
+        MBPanelScalingImage2 *image;
 
         gboolean active;
 

@@ -45,15 +45,11 @@ show_desktop_applet_free (ShowDesktopApplet *applet)
 static void
 set_active (ShowDesktopApplet *applet, gboolean active)
 {
-        const char *icon;
-
         applet->active = active;
 
         /* TODO: remove this function and instead use a toggle button? */
 
-        icon = "panel-user-desktop";
-
-        mb_panel_scaling_image_set_icon (applet->image, icon);
+        mb_panel_scaling_image2_set_icon (applet->image, "panel-user-desktop");
 }
 
 /* Sync @applet with the _NET_SHOWING_DESKTOP root window property */

@@ -206,8 +202,8 @@ mb_panel_applet_create (const char    *id,
 
         gtk_widget_set_name (button, "MatchboxPanelShowDesktop");
 
-        image = mb_panel_scaling_image_new (orientation, NULL);
-        applet->image = MB_PANEL_SCALING_IMAGE (image);
+        image = mb_panel_scaling_image2_new (orientation, NULL);
+        applet->image = MB_PANEL_SCALING_IMAGE2 (image);
 
         gtk_container_add (GTK_CONTAINER (button), image);
 

index 5692ce1..8cdc3a1 100644
@@ -327,8 +327,10 @@ mb_panel_scaling_image2_draw (GtkWidget *widget, cairo_t *cr)
 {
         MBPanelScalingImage2 *image = MB_PANEL_SCALING_IMAGE2 (widget);
 
-        gdk_cairo_set_source_pixbuf (cr, image->priv->pixbuf, 0.0, 0.0);
-        cairo_paint (cr);
+        if (image->priv->pixbuf) {
+                gdk_cairo_set_source_pixbuf (cr, image->priv->pixbuf, 0.0, 0.0);
+                cairo_paint (cr);
+        }
         return TRUE;
 }
 

index e440ec9..c73b21f 100644
@@ -85,7 +85,7 @@ mb_notification_init (MbNotification *self)
   gtk_box_pack_start (GTK_BOX (box), priv->image, FALSE, FALSE, 0);
 
   priv->label = gtk_label_new (NULL);
-  gtk_misc_set_alignment (GTK_MISC (priv->label), 0.0, 0.5);
+  gtk_label_set_xalign (GTK_LABEL (priv->label), 0.0);
   gtk_box_pack_start (GTK_BOX (box), priv->label, TRUE, TRUE, 0);
 }
 

index 861e4ab..ce19067 100644
@@ -116,7 +116,6 @@ na_fixed_tip_init (NaFixedTip *fixedtip)
 
   label = gtk_label_new (NULL);
   gtk_label_set_line_wrap (GTK_LABEL (label), TRUE);
-  gtk_misc_set_alignment (GTK_MISC (label), 0.5, 0.5);
   gtk_widget_show (label);
   gtk_container_add (GTK_CONTAINER (fixedtip), label);
   fixedtip->priv->label = label;

index 7da908f..714bd90 100644
@@ -538,6 +538,8 @@ static void
 na_tray_draw_box (GtkWidget *box,
 		  cairo_t   *cr)
 {
+  /* Transform to window-relative coordinates */
+  gtk_cairo_transform_to_window (cr, box, gtk_widget_get_window (box));
   gtk_container_foreach (GTK_CONTAINER (box), na_tray_draw_icon, cr);
 }
 

index 3f7e3b4..4f5fb74 100644
@@ -387,8 +387,6 @@ main (int argc, char **argv)
                 gtk_window_set_accept_focus (GTK_WINDOW (window), FALSE);
         }
 
-        gtk_widget_realize (window);
-
         /* Set size */
         switch (mode) {
         case MODE_DOCK:

@@ -427,8 +425,6 @@ main (int argc, char **argv)
                                          screen_geom.x,
                                          screen_geom.y + screen_geom.height - size);
                 }
-
-                set_struts (window, edge, size);
                 break;
         case MODE_TITLEBAR:
                 /* TODO */

@@ -453,6 +449,10 @@ main (int argc, char **argv)
                 break;
         }
 
+        gtk_widget_realize (window);
+        if (mode == MODE_DOCK)
+		set_struts (window, edge, size);
+
         /* Add frame */
         frame = gtk_frame_new (NULL);
         gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_NONE);

index 9c1dadf..d269355 100644
@@ -15,7 +15,7 @@
 #include <gdk/gdkx.h>
 
 #include <matchbox-panel/mb-panel.h>
-#include <matchbox-panel/mb-panel-scaling-image.h>
+#include <matchbox-panel/mb-panel-scaling-image2.h>
 
 #define DEFAULT_WINDOW_ICON_NAME "application-x-executable"
 

@@ -792,7 +792,7 @@ mb_panel_applet_create (const char    *id,
 
         switch (applet->mode) {
         case MODE_STATIC_ICON:
-                applet->image = mb_panel_scaling_image_new (orientation,
+                applet->image = mb_panel_scaling_image2_new (orientation,
                         "panel-task-switcher");
                 gtk_container_add (GTK_CONTAINER (applet->button),
                                 applet->image);