diff options
| -rw-r--r-- | ChangeLog | 14 | ||||
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | matchbox/managers/simple/matchbox-window-manager-2-simple.c | 21 | ||||
| -rw-r--r-- | matchbox/theme-engines/mb-wm-theme-cairo.c | 3 |
4 files changed, 35 insertions, 5 deletions
@@ -1,5 +1,19 @@ 2008-02-20 Tomas Frydrych <tf@o-hand.com> + * configure.ac: + Bumped clutter requirement to 0.7. + + * matchbox/theme-engines/mb-wm-theme-cairo.c: + (mb_wm_theme_cairo_init): + Removed call to gtk_init (must be called by the application main() + function so display connection can be set up correctly. + + * matchbox/managers/simple/matchbox-window-manager-2-simple.c: + (main): + Call gtk_init() if GTK integration is enabled. + +2008-02-20 Tomas Frydrych <tf@o-hand.com> + * matchbox/core/mb-wm-main-context.h: Added missing prototype for mb_wm_main_context_handle_x_event(). diff --git a/configure.ac b/configure.ac index 45a52a4..a7a6cc6 100644 --- a/configure.ac +++ b/configure.ac @@ -82,7 +82,7 @@ case $comp_mgr in needed_pkgs="$needed_pkgs xcomposite xdamage " ;; clutter ) comp_mgr="yes (clutter)" - needed_pkgs="$needed_pkgs clutter-0.5 xcomposite xdamage " + needed_pkgs="$needed_pkgs clutter-0.7 xcomposite xdamage " gmloop="yes" ;; framework-only ) comp_mgr="yes (framework only)" ;; diff --git a/matchbox/managers/simple/matchbox-window-manager-2-simple.c b/matchbox/managers/simple/matchbox-window-manager-2-simple.c index 7218e9f..6b43b8e 100644 --- a/matchbox/managers/simple/matchbox-window-manager-2-simple.c +++ b/matchbox/managers/simple/matchbox-window-manager-2-simple.c @@ -8,6 +8,10 @@ # include <clutter/clutter-x11.h> #endif +#if USE_GTK +#include <gdk/gdkx.h> +#endif + enum { KEY_ACTION_PAGE_NEXT, KEY_ACTION_PAGE_PREV, @@ -90,14 +94,29 @@ main(int argc, char **argv) mb_wm_object_init(); +#if USE_GTK + printf ("initializing gtk\n"); + + gtk_init (&argc, &argv); + dpy = GDK_DISPLAY(); +#endif + #if USE_CLUTTER /* * If using clutter, we share the display connection, and hook * our xevent handler into the clutter main loop. + * + * If we are also doing gtk integration, we need to make clutter to + * use the gtk display connection. */ + if (dpy) + clutter_x11_set_display (dpy); + clutter_init (&argc, &argv); - dpy = clutter_x11_get_default_display (); + if (!dpy) + dpy = clutter_x11_get_default_display (); + #endif wm = mb_wm_new_with_dpy (argc, argv, dpy); diff --git a/matchbox/theme-engines/mb-wm-theme-cairo.c b/matchbox/theme-engines/mb-wm-theme-cairo.c index d562213..24453d9 100644 --- a/matchbox/theme-engines/mb-wm-theme-cairo.c +++ b/matchbox/theme-engines/mb-wm-theme-cairo.c @@ -82,9 +82,6 @@ mb_wm_theme_cairo_init (MBWMObject *obj, va_list vap) * Plan here is to just get the GTK settings so we can follow * colors set by widgets. */ - - gtk_init (NULL, NULL); - gwin = gtk_window_new (GTK_WINDOW_POPUP); gtk_widget_ensure_style (gwin); #endif |