~larsu/gtk/images-in-menubars

From: Robert Ancell <robert.ancell@canonical.com>

Date: Tue, 20 May 2014 10:03:30 +1200

 

Backported from:

0f26b26f1d93f002ccd5fe6b6fd636172bfbb24b

c41231cc0fdc791a7a69cdd77af51c8162f44aa4

053b65a21af312b8b9361367939a221aa7f474a7

2fdb266c0d0f038a74decda7440ebbb7bdb02e68

ec729d06491a2a5bb9ba3f287fbc102b5036bc8f

92c2e99ddac668d729f42bff501f70fb56fbb76c

c6de20496c4075a0f1daf8be450d8522aaaea82f

4e4ccb76cd8b5b7dc4342f35fcf64ace30019641

c7e7e350839b19732a2eea7a2151c0c3a76c2544

c42146d88c324189a3a70189f1a60156697ad9ab

---

 create mode 100644 docs/reference/gtk/mir.xml

 create mode 100644 gdk/mir/Makefile.am

 create mode 100644 gdk/mir/gdkmir-debug.c

 create mode 100644 gdk/mir/gdkmirwindow.c

 create mode 100644 gdk/mir/gdkmirwindowimpl.c

 

--- a/Makefile.am

+++ b/Makefile.am

 

 

 ## Copy .pc files to target-specific names

        rm -f $@ && \

        cp gdk-3.0.pc $@

 

        gtk+-quartz-3.0.pc              \

        gtk+-broadway-3.0.pc            \

        gtk+-wayland-3.0.pc             \

        gail-3.0.pc                     \

        config.lt

 

--- a/configure.ac

+++ b/configure.ac

               [AS_HELP_STRING([--enable-wayland-backend],

                               [enable the wayland gdk backend])],

                              [backend_set=yes])

 

 if test -z "$backend_set"; then

   if test "$platform_win32" = yes; then

   else

     enable_x11_backend=yes

     enable_wayland_backend=maybe

   fi

 fi

 

   AM_CONDITIONAL(USE_WAYLAND, false)

 fi

 

+if test "$enable_mir_backend" = "maybe" ; then

+  PKG_CHECK_EXISTS($MIR_DEPENDENCIES, [have_mir_deps=yes], [have_mir_deps=no])

+  AC_MSG_CHECKING([for MIR_DEPENDENCIES])

 # strip leading space

 GDK_BACKENDS=${GDK_BACKENDS#* }

 

 LDFLAGS="$saved_ldflags"

 

 GDK_PACKAGES="$PANGO_PACKAGES gdk-pixbuf-2.0 >= gdk_pixbuf_required_version cairo >= cairo_required_version cairo-gobject >= cairo_required_version"

 if test "x$enable_x11_backend" = xyes; then

   GDK_PRIVATE_PACKAGES="$GDK_PRIVATE_PACKAGES pangoft2"

 fi

 PKG_CHECK_MODULES(ATK, $ATK_PACKAGES)

 

 GTK_PACKAGES="atk >= atk_required_version cairo >= cairo_required_version cairo-gobject >= cairo_required_version gdk-pixbuf-2.0 >= gdk_pixbuf_required_version gio-2.0 >= glib_required_version"

 if test "x$enable_x11_backend" = xyes; then

   GTK_PRIVATE_PACKAGES="$GTK_PRIVATE_PACKAGES pangoft2"

 fi

 gdk/win32/rc/gdk.rc

 gdk/quartz/Makefile

 gdk/wayland/Makefile

 gdk/gdkversionmacros.h

 gtk/Makefile

 gtk/makefile.msc

--- a/docs/reference/gtk/Makefile.am

+++ b/docs/reference/gtk/Makefile.am

        osx.sgml                                \

        broadway.xml                            \

        wayland.xml                             \

        question_index.sgml                     \

        resources.sgml                          \

        text_widget.sgml                        \

--- a/docs/reference/gtk/building.sgml

+++ b/docs/reference/gtk/building.sgml

           </group>

           <sbr/>

           <group>

             <arg choice="plain">--enable-introspection=[no/auto/yes]</arg>

           </group>

           <sbr/>

           <systemitem>--disable-quartz-backend</systemitem>,

           <systemitem>--enable-broadway-backend</systemitem>,

           <systemitem>--disable-broadway-backend</systemitem>,

 

         <para>

           Enables specific backends for GDK.  If none of these options

--- a/docs/reference/gtk/gtk-docs.sgml

+++ b/docs/reference/gtk/gtk-docs.sgml

@@ -413,6 +413,7 @@

   </part>

 

   <xi:include href="glossary.xml" />

--- /dev/null

+++ b/docs/reference/gtk/mir.xml

@@ -0,0 +1,35 @@

+</refsect1>

+

+</refentry>

--- a/docs/reference/gtk/running.sgml

+++ b/docs/reference/gtk/running.sgml

         <listitem><para>Selects the Wayland backend for connecting to Wayland display servers</para></listitem>

       </varlistentry>

 

     </variablelist>

     Since 3.10, this environment variable can contain a comma-separated list

     of backend names, which are tried in order. The list may also contain

--- a/gdk/Makefile.am

+++ b/gdk/Makefile.am

 

 SUBDIRS = $(GDK_BACKENDS) .

 

 

 CLEANFILES =

 

 libgdk_3_la_LIBADD += wayland/libgdk-wayland.la

 endif

 

 if HAVE_INTROSPECTION

 

 introspection_files =          \

--- a/gdk/gdkdisplaymanager.c

+++ b/gdk/gdkdisplaymanager.c

@@ -60,6 +60,10 @@

 /**

  * SECTION:gdkdisplaymanager

  * @Short_description: Maintains a list of all open GdkDisplays

 #ifdef GDK_WINDOWING_WAYLAND

   { "wayland",  _gdk_wayland_display_open },

 #endif

 #ifdef GDK_WINDOWING_BROADWAY

   { "broadway", _gdk_broadway_display_open },

 #endif

--- /dev/null

+++ b/gdk/mir/Makefile.am

@@ -0,0 +1,39 @@

+       gdkmir.h

+

+-include $(top_srcdir)/git.mk

--- /dev/null

+++ b/gdk/mir/gdkmir-debug.c

@@ -0,0 +1,293 @@

+      break;

+    }

+}

--- /dev/null

+++ b/gdk/mir/gdkmir-private.h

@@ -0,0 +1,92 @@

+void _gdk_mir_print_event (const MirEvent *event);

+

+#endif /* __GDK_PRIVATE_MIR_H__ */

--- /dev/null

+++ b/gdk/mir/gdkmir.h

@@ -0,0 +1,39 @@

+#define GDK_IS_MIR_DISPLAY(object)        (G_TYPE_CHECK_INSTANCE_TYPE ((object), GDK_TYPE_MIR_DISPLAY))

+

+#define GDK_TYPE_MIR_WINDOW              (gdk_mir_window_get_type ())

+

+GDK_AVAILABLE_IN_3_10

+GType gdk_mir_display_get_type (void);

+

+GDK_AVAILABLE_IN_3_10

+

+GDK_AVAILABLE_IN_3_10

+GType gdk_mir_window_get_type (void);

+

+#endif /* __GDK_MIR_H__ */

--- /dev/null

+++ b/gdk/mir/gdkmircursor.c

@@ -0,0 +1,177 @@

+  cursor_class->get_surface = gdk_mir_cursor_get_surface;

+  object_class->finalize = gdk_mir_cursor_finalize;

+}

--- /dev/null

+++ b/gdk/mir/gdkmirdevicemanager.c

@@ -0,0 +1,120 @@

+  device_manager_class->get_client_pointer = gdk_mir_device_manager_get_client_pointer;

+  object_class->constructed = gdk_mir_device_manager_constructed;

+}

--- /dev/null

+++ b/gdk/mir/gdkmirdisplay.c

+/*

+ * Copyright © 2014 Canonical Ltd

+ *

+{

+  GdkMirDisplay *display = GDK_MIR_DISPLAY (object);

+

+

+  G_OBJECT_CLASS (gdk_mir_display_parent_class)->dispose (object);

+}

+}

+

+static void

+gdk_mir_display_create_window_impl (GdkDisplay    *display,

+                                    GdkWindow     *window,

+                                    GdkWindow     *real_parent,

+  display_class->after_process_all_updates = gdk_mir_display_after_process_all_updates;

+  display_class->get_next_serial = gdk_mir_display_get_next_serial;

+  display_class->notify_startup_complete = gdk_mir_display_notify_startup_complete;

+  display_class->create_window_impl = gdk_mir_display_create_window_impl;

+  display_class->get_keymap = gdk_mir_display_get_keymap;

+  display_class->push_error_trap = gdk_mir_display_push_error_trap;

+  display_class->text_property_to_utf8_list = gdk_mir_display_text_property_to_utf8_list;

+  display_class->utf8_to_string_target = gdk_mir_display_utf8_to_string_target;

+}

--- /dev/null

+++ b/gdk/mir/gdkmireventsource.c

@@ -0,0 +1,631 @@

+  event->scroll.y = y;

+  event->scroll.state = state;

+  event->scroll.direction = GDK_SCROLL_SMOOTH;

+

+  send_event (window, get_pointer (window), event);

+}

+

+  g_main_context_wakeup (NULL);

+}

--- /dev/null

+++ b/gdk/mir/gdkmirkeyboard.c

@@ -0,0 +1,173 @@

+  device_class->window_at_position = gdk_mir_keyboard_window_at_position;

+  device_class->select_window_events = gdk_mir_keyboard_select_window_events;

+}

--- /dev/null

+++ b/gdk/mir/gdkmirkeymap.c

@@ -0,0 +1,466 @@

+  keymap_class->map_virtual_modifiers = gdk_mir_keymap_map_virtual_modifiers;

+  keymap_class->get_modifier_state = gdk_mir_keymap_get_modifier_state;

+}

--- /dev/null

+++ b/gdk/mir/gdkmirpointer.c

@@ -0,0 +1,250 @@

+  device_class->window_at_position = gdk_mir_pointer_window_at_position;

+  device_class->select_window_events = gdk_mir_pointer_select_window_events;

+}

--- /dev/null

+++ b/gdk/mir/gdkmirscreen.c

@@ -0,0 +1,804 @@

+  screen_class->query_visual_types = gdk_mir_screen_query_visual_types;

+  screen_class->get_monitor_scale_factor = gdk_mir_screen_get_monitor_scale_factor;

+}

--- /dev/null

+++ b/gdk/mir/gdkmirwindow.c

@@ -0,0 +1,52 @@

+gdk_mir_window_class_init (GdkMirWindowClass *klass)

+{

+}

--- /dev/null

+++ b/gdk/mir/gdkmirwindowimpl.c

@@ -0,0 +1,1336 @@

+  impl_class->set_opaque_region = gdk_mir_window_impl_set_opaque_region;

+  impl_class->set_shadow_width = gdk_mir_window_impl_set_shadow_width;

+}

--- a/gtk/gtktooltip.c

+++ b/gtk/gtktooltip.c

@@ -39,6 +39,9 @@

 

 

 /**

+          toplevel = gtk_widget_get_toplevel (tooltip->tooltip_widget);

+          if (GTK_IS_WINDOW (toplevel))

+            gtk_window_set_transient_for (GTK_WINDOW (tooltip->current_window),

+                                          GTK_WINDOW (toplevel));

+        }

+#endif