Merge lp:~gordallott/unity/unity-gtk3 into lp:unity

[Gord Allott]

port to gtk3, based on lp:~bilalakhtar/unity/port-to-gtk3 - will require that to be merged in first for the kudos,

needs trunk bamf (for updated wnck), needs updated libunity-misc (https://code.launchpad.net/~gordallott/libunity-misc/port-to-gdk3-gtk3/+merge/64820) - indicator3 - gtk3, gdk3, everything3

breaks notification-area, added FIXME-GTK tag to the code that i changed that affects notification-area

[Neil J. Patel (njpatel)]

I'll merge it with my changes.

review: Approve

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2011-06-17 11:04:33 +0000
+++ CMakeLists.txt	2011-06-17 11:04:34 +0000
@@ -126,7 +126,7 @@
 #
 # src (Compiz Plugin)
 #
-set (UNITY_PLUGIN_DEPS "nux-0.9;libbamf;dee-1.0;gio-2.0;gio-unix-2.0;dbusmenu-glib-0.4;x11;libstartup-notification-1.0;gthread-2.0;indicator;atk;unity-misc;gconf-2.0;libutouch-geis;gtk+-3.0")
+set (UNITY_PLUGIN_DEPS "nux-0.9;libbamf3;dee-1.0;gio-2.0;gio-unix-2.0;dbusmenu-glib-0.4;x11;libstartup-notification-1.0;gthread-2.0;indicator3;atk;unity-misc;gconf-2.0;libutouch-geis;gtk+-3.0")
 
 find_package (Compiz REQUIRED)
 include (CompizPlugin)
 
=== modified file 'services/panel-service.c'
--- services/panel-service.c	2011-04-10 23:51:05 +0000
+++ services/panel-service.c	2011-06-17 11:04:34 +0000
@@ -222,12 +222,14 @@
 
   if (e->type == 5 && self->priv->last_menu_button != 0) //FocusChange
     {
-      gint       x=0, y=0, width=0, height=0, depth=0, x_root=0, y_root=0;
+      gint       x=0, y=0, width=0, height=0, x_root=0, y_root=0;
       GdkWindow *window = gtk_widget_get_window (GTK_WIDGET (self->priv->last_menu));
       if (window == NULL)
         return GDK_FILTER_CONTINUE;
-
-      Window     xwindow = gdk_x11_drawable_get_xid (GDK_DRAWABLE (window));
+			
+			//FIXME-GTK3 - is this compatible? drawable is gone from gdk3
+      Window     xwindow = gdk_x11_window_get_xid (window);
+      //Window     xwindow = gdk_x11_drawable_get_xid (GDK_DRAWABLE (window));
 
       if (xwindow == 0)
         return GDK_FILTER_CONTINUE;
@@ -246,7 +248,7 @@
                      &win_y,
                      &mask_return);
 
-      gdk_window_get_geometry (window, &x, &y, &width, &height, &depth);
+      gdk_window_get_geometry (window, &x, &y, &width, &height);
       gdk_window_get_origin (window, &x, &y);
 
       if (x_root > x
@@ -268,6 +270,8 @@
   // ITS A WORKAROUND SO I CAN TEST THE PANEL SCRUBBING
   // DONT HATE ME
   // --------------------------------------------------------------------------
+  //FIXME-GTK3 - i'm not porting this, fix your code :P
+  /*
   else if (e->type == 6)
     {
       int       x_root=0, y_root=0;
@@ -295,6 +299,8 @@
           g_signal_emit (self, _service_signals[ACTIVE_MENU_POINTER_MOTION], 0);
         }
     }
+  */
+  // -> I HATE YOU
   // /DONT HATE ME
   // /FIXME
   // --------------------------------------------------------------------------
 
=== modified file 'src/PanelTray.cpp'
--- src/PanelTray.cpp	2011-06-17 11:04:33 +0000
+++ src/PanelTray.cpp	2011-06-17 11:04:34 +0000
@@ -44,20 +44,26 @@
   SetMinMaxSize (1, 24);
   gtk_window_move (GTK_WINDOW (_window), 200, 12);
   gtk_widget_set_name (_window, "UnityPanelApplet");
-  gtk_widget_set_colormap (_window, gdk_screen_get_rgba_colormap (gdk_screen_get_default ())); 
+  
+  //FIXME-GTK3 - can't set the colourmap anymore
+  //gtk_widget_set_colormap (_window, gdk_screen_get_rgba_colormap (gdk_screen_get_default ())); 
   gtk_widget_realize (_window);
-  gdk_window_set_back_pixmap (gtk_widget_get_window(GTK_WIDGET(_window)), NULL, FALSE);
+  
+  //FIXME-GTK3 - is this compatible? not entirely sure, *should* be
+  gdk_window_set_background_pattern (gtk_widget_get_window(GTK_WIDGET(_window)), NULL);
+  //gdk_window_set_back_pixmap (gtk_widget_get_window(GTK_WIDGET(_window)), NULL, FALSE);
+  
   gtk_widget_set_app_paintable (_window, TRUE);
-  _tray_expose_id = g_signal_connect (_window, "expose-event", G_CALLBACK (PanelTray::OnTrayExpose), this);
+  _tray_expose_id = g_signal_connect (_window, "draw", G_CALLBACK (PanelTray::OnTrayDraw), this);
 
   if (!g_getenv ("UNITY_PANEL_TRAY_DISABLE"))
   {
     _tray = na_tray_new_for_screen (gdk_screen_get_default (),
-                                    GTK_ORIENTATION_HORIZONTAL,
-                                    (NaTrayFilterCallback)FilterTrayCallback,
-                                    this);
-    _tray_icon_added_id = g_signal_connect (na_tray_get_manager (_tray), "tray_icon_removed",
-                                            G_CALLBACK (PanelTray::OnTrayIconRemoved), this);
+                                    GTK_ORIENTATION_HORIZONTAL);
+                
+    // FIXME-GTK3 - na_tray_get_manager no longer exists - we could easily add it though i guess              
+    //_tray_icon_added_id = g_signal_connect (na_tray_get_manager (_tray), "tray_icon_removed",
+    //                                        G_CALLBACK (PanelTray::OnTrayIconRemoved), this);
 
     gtk_container_add (GTK_CONTAINER (_window), GTK_WIDGET (_tray));
     gtk_widget_show (GTK_WIDGET (_tray));
@@ -66,11 +72,11 @@
 
 PanelTray::~PanelTray ()
 {
-  if (_tray)
-  {
-    g_signal_handler_disconnect (na_tray_get_manager (_tray), _tray_icon_added_id);
-    _tray = NULL;
-  }
+  //if (_tray)
+  //{
+  //  g_signal_handler_disconnect (na_tray_get_manager (_tray), _tray_icon_added_id);
+  //  _tray = NULL;
+   //}
 
   g_idle_remove_by_data (this);
  
@@ -96,12 +102,6 @@
   }
 }
 
-Window
-PanelTray::GetTrayWindow ()
-{
-  return GDK_WINDOW_XWINDOW (gtk_widget_get_window(GTK_WIDGET(_window)));
-}
-
 void
 PanelTray::Sync ()
 {
@@ -192,14 +192,13 @@
 }
 
 gboolean
-PanelTray::OnTrayExpose (GtkWidget *widget, GdkEventExpose *ev, PanelTray *tray)
+PanelTray::OnTrayDraw (GtkWidget *widget, cairo_t *cr, PanelTray *tray)
 {
-  cairo_t *cr = gdk_cairo_create (gtk_widget_get_window(GTK_WIDGET(widget)));
   GtkAllocation alloc;
 
   gtk_widget_get_allocation (widget, &alloc);
 
-  gdk_cairo_region (cr, ev->region);
+  //gdk_cairo_region (cr, ev->region);
   cairo_clip (cr);
 
   cairo_set_operator (cr, CAIRO_OPERATOR_CLEAR);
@@ -210,11 +209,9 @@
   cairo_rectangle (cr, 0, 0, alloc.width, alloc.height);
   cairo_fill (cr);
 
-  cairo_destroy (cr);
-
-  gtk_container_propagate_expose (GTK_CONTAINER (widget),
-                                  gtk_bin_get_child (GTK_BIN (widget)),
-                                  ev);
+  gtk_container_propagate_draw (GTK_CONTAINER (widget),
+                                gtk_bin_get_child (GTK_BIN (widget)),
+                                cr);
 
   return FALSE;
 }
 
=== modified file 'src/PanelTray.h'
--- src/PanelTray.h	2011-06-09 16:08:05 +0000
+++ src/PanelTray.h	2011-06-17 11:04:34 +0000
@@ -45,8 +45,6 @@
 
   void Draw (nux::GraphicsEngine& gfx_content, bool force_draw);
 
-  Window GetTrayWindow ();
-
   void Sync ();
 
   virtual void OnEntryAdded(unity::indicator::Entry::Ptr const& proxy);
@@ -63,7 +61,7 @@
   static gboolean FilterTrayCallback (NaTray *tray, NaTrayChild *child, PanelTray *self);
   static void     OnTrayIconRemoved  (NaTrayManager *manager, NaTrayChild *child, PanelTray *self);
   static gboolean IdleSync (PanelTray *tray);
-  static gboolean OnTrayExpose (GtkWidget *widget, GdkEventExpose *ev, PanelTray *tray);
+  static gboolean OnTrayDraw (GtkWidget *widget, cairo_t *cr, PanelTray *tray);
 
 private:
   GSettings *_settings;
 
=== modified file 'src/PanelView.cpp'
--- src/PanelView.cpp	2011-06-02 08:37:18 +0000
+++ src/PanelView.cpp	2011-06-17 11:04:34 +0000
@@ -327,12 +327,6 @@
   }
 }
 
-Window
-PanelView::GetTrayWindow ()
-{
-  return _tray->GetTrayWindow ();
-}
-
 void
 PanelView::SetOpacity (float opacity)
 {
 
=== modified file 'src/PanelView.h'
--- src/PanelView.h	2011-05-30 02:49:31 +0000
+++ src/PanelView.h	2011-06-17 11:04:34 +0000
@@ -66,8 +66,6 @@
   void StartFirstMenuShow ();
   void EndFirstMenuShow ();
 
-  Window GetTrayWindow ();
-
   void SetOpacity (float opacity);
 
 protected:
 
=== modified file 'tests/CMakeLists.txt'
--- tests/CMakeLists.txt	2011-06-02 23:26:49 +0000
+++ tests/CMakeLists.txt	2011-06-17 11:04:34 +0000
@@ -7,8 +7,8 @@
 # Unit tests
 #
 find_package (PkgConfig)
-set (TEST_DEPS "${UNITY_PLUGIN_DEPS};indicator")
-pkg_check_modules (TEST_UNIT_DEPS REQUIRED ${TEST_DEPS} indicator)
+set (TEST_DEPS "${UNITY_PLUGIN_DEPS};indicator3")
+pkg_check_modules (TEST_UNIT_DEPS REQUIRED ${TEST_DEPS} indicator3)
 
 set (CFLAGS
      ${TEST_UNIT_DEPS_CFLAGS}