Linux: make sure the fullscreen window always gets focus...

plugin/linux/main_linux.cc

 /*
  * Copyright 2009, Google Inc.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
@@ skipping 455 matching lines @@
                      obj->in_plugin());
   obj->client()->AddEventToQueue(event);
   if (event.type() == Event::TYPE_MOUSEUP && obj->in_plugin() &&
       obj->got_double_click_[button_event->button - 1]) {
     obj->got_double_click_[button_event->button - 1] = false;
     event.set_type(Event::TYPE_DBLCLICK);
     obj->client()->AddEventToQueue(event);
   }
   if (event.in_plugin() && event.type() == Event::TYPE_MOUSEDOWN &&
       obj->HitFullscreenClickRegion(event.x(), event.y())) {
-    obj->RequestFullscreenDisplay();
+    obj->RequestFullscreenDisplay(button_event->time);
   }
   return TRUE;
 }
 
 static gboolean GtkHandleKey(GtkWidget *widget,
                              GdkEventKey *key_event,
                              PluginObject *obj) {
   Event::Type type;
   switch (key_event->type) {
     case GDK_KEY_PRESS:
@@ skipping 416 matching lines @@
   CancelFullscreenDisplay();
   return TRUE;
 }
 
 bool PluginObject::GetDisplayMode(int id, o3d::DisplayMode *mode) {
   return renderer()->GetDisplayMode(id, mode);
 }
 
 // TODO: Where should this really live?  It's platform-specific, but in
 // PluginObject, which mainly lives in cross/o3d_glue.h+cc.
-bool PluginObject::RequestFullscreenDisplay() {
+bool PluginObject::RequestFullscreenDisplay(guint32 timestamp) {
   if (fullscreen_ || fullscreen_pending_) {
     return false;
   }
   if (!g_xembed_support) {
     // I tested every Linux browser I could that worked with our plugin and not
     // a single one lacked XEmbed/Gtk2 support, so I don't think that case is
     // worth implementing.
     DLOG(ERROR) << "Fullscreen not supported without XEmbed/Gtk2; please use a "
         "modern web browser";
     return false;
@@ skipping 22 matching lines @@
   gtk_window_set_default_size(window, width, height);
   // This is probably superfluous since we have already set an appropriate
   // size, but let's do it anyway. It could still be relevant for some window
   // managers.
   gtk_window_fullscreen(window);
   g_signal_connect(window, "configure-event",
                    G_CALLBACK(GtkConfigureEventCallback), this);
   g_signal_connect(window, "delete-event",
                    G_CALLBACK(GtkDeleteEventCallback), this);
   gtk_fullscreen_container_ = widget;
-  gtk_widget_show(widget);
+  // The timestamp here is optional. Presumably it is used by the window manager
+  // for obscure policy decisions (e.g., UI races).

[piman, 2010/02/22 22:41:53]

FYI the timestamp is most likely used to properly order requests because the WM
runs asynchronously, and could get requests from the client and X out-of-order.

+  gtk_window_present_with_time(window, timestamp);
+  // Explicitly set focus, otherwise we may not get it depending on the window
+  // manager's policy for present.
+  gdk_window_focus(widget->window, timestamp);
   // We defer switching to the new window until it gets displayed and assigned
   // it's final dimensions in the configure-event.
   fullscreen_pending_ = true;
   return true;
 }
 
 void PluginObject::CancelFullscreenDisplay() {
   if (!fullscreen_) {
     return;
   }
   o3d::DisplayWindowLinux default_display;
   default_display.set_display(display_);
   default_display.set_window(drawable_);
   if (!renderer()->CancelFullscreen(default_display,
                                     prev_width_,
                                     prev_height_)) {
     return;
   }
   renderer()->Resize(prev_width_, prev_height_);
   client()->SendResizeEvent(renderer()->width(), renderer()->height(),
                             false);
   SetGtkEventSource(gtk_container_);
   gtk_widget_destroy(gtk_fullscreen_container_);
   gtk_fullscreen_container_ = NULL;
   fullscreen_window_ = 0;
   fullscreen_ = false;
 }
 }  // namespace _o3d
 }  // namespace glue