win32: Implement the set_accept_focus() vfunc

Implement the ClutterStageWindow::set_accept_focus() virtual function in
the win32 backend.

If accept_focus is set to be TRUE then we call SetforegroundWindow()
after calling ShowWindow(). This is similar to what GDK does when
dealing with the same situation.

http://bugzilla.clutter-project.org/show_bug.cgi?id=2500

diff --git a/clutter/win32/clutter-stage-win32.c b/clutter/win32/clutter-stage-win32.c
index 7c5fac9..6d0588b 100644 (file)
--- a/clutter/win32/clutter-stage-win32.c
+++ b/clutter/win32/clutter-stage-win32.c
@@ -59,6 +59,9 @@ clutter_stage_win32_show (ClutterStageWindow *stage_window,
     {
       ShowWindow (stage_win32->hwnd, do_raise ? SW_SHOW : SW_SHOWNA);
 
+      if (stage_win32->accept_focus)
+        SetForegroundWindow (stage_win32->hwnd);
+
       clutter_actor_map (CLUTTER_ACTOR (stage_win32->wrapper));
     }
 }
@@ -286,6 +289,17 @@ clutter_stage_win32_set_user_resize (ClutterStageWindow *stage_window,
   RedrawWindow (hwnd, NULL, NULL, RDW_FRAME | RDW_INVALIDATE);
 }
 
+static void
+clutter_stage_win32_set_accept_focus (ClutterStageWindow *stage_window,
+                                      gboolean            accept_focus)
+{
+  ClutterStageWin32 *stage_win32 = CLUTTER_STAGE_WIN32 (stage_window);
+
+  accept_focus = !!accept_focus;
+
+  stage_win32->accept_focus = accept_focus;
+}
+
 static ClutterActor *
 clutter_stage_win32_get_wrapper (ClutterStageWindow *stage_window)
 {
@@ -538,10 +552,12 @@ clutter_stage_win32_init (ClutterStageWin32 *stage)
   stage->win_height = 480;
   stage->backend = NULL;
   stage->scroll_pos = 0;
-  stage->is_foreign_win = FALSE;
   stage->wtitle = NULL;
-  stage->is_cursor_visible = TRUE;
   stage->wrapper = NULL;
+
+  stage->is_foreign_win = FALSE;
+  stage->is_cursor_visible = TRUE;
+  stage->accept_focus = TRUE;
 }
 
 static void
@@ -552,6 +568,7 @@ clutter_stage_window_iface_init (ClutterStageWindowIface *iface)
   iface->set_fullscreen = clutter_stage_win32_set_fullscreen;
   iface->set_cursor_visible = clutter_stage_win32_set_cursor_visible;
   iface->set_user_resizable = clutter_stage_win32_set_user_resize;
+  iface->set_accept_focus = clutter_stage_win32_set_accept_focus;
   iface->show = clutter_stage_win32_show;
   iface->hide = clutter_stage_win32_hide;
   iface->resize = clutter_stage_win32_resize;

diff --git a/clutter/win32/clutter-stage-win32.h b/clutter/win32/clutter-stage-win32.h
index 1d9aff8..ac330f8 100644 (file)
--- a/clutter/win32/clutter-stage-win32.h
+++ b/clutter/win32/clutter-stage-win32.h
@@ -50,15 +50,17 @@ struct _ClutterStageWin32
   gint         win_height;
   gint         scroll_pos;
   RECT         fullscreen_rect;
-  gboolean     is_foreign_win;
-  gboolean     tracking_mouse;
   wchar_t     *wtitle;
-  gboolean        is_cursor_visible;
 
   ClutterBackendWin32 *backend;
   ClutterStageState   state;
 
   ClutterStage *wrapper;
+
+  guint is_foreign_win    : 1;
+  guint tracking_mouse    : 1;
+  guint is_cursor_visible : 1;
+  guint accept_focus      : 1;
 };
 
 struct _ClutterStageWin32Class