Fix some cases where signal connection IDs where being assigned to guint

[~andy/gtk] / gtk / gtkplug.c

diff --git a/gtk/gtkplug.c b/gtk/gtkplug.c
index 18fc239d5276705cbdd4f738f1e79beb20f44195..68554ec738c607ad6e32cbb43c2b1008860fce64 100644 (file)
--- a/gtk/gtkplug.c
+++ b/gtk/gtkplug.c
@@ -48,6 +48,8 @@ static void            gtk_plug_size_allocate         (GtkWidget        *widget,
                                                       GtkAllocation    *allocation);
 static gboolean        gtk_plug_key_press_event       (GtkWidget        *widget,
                                                       GdkEventKey      *event);
+static gboolean        gtk_plug_focus_event           (GtkWidget        *widget,
+                                                      GdkEventFocus    *event);
 static void            gtk_plug_set_focus             (GtkWindow        *window,
                                                       GtkWidget        *focus);
 static gboolean        gtk_plug_focus                 (GtkWidget        *widget,
@@ -123,6 +125,8 @@ gtk_plug_class_init (GtkPlugClass *class)
   widget_class->realize = gtk_plug_realize;
   widget_class->unrealize = gtk_plug_unrealize;
   widget_class->key_press_event = gtk_plug_key_press_event;
+  widget_class->focus_in_event = gtk_plug_focus_event;
+  widget_class->focus_out_event = gtk_plug_focus_event;
 
   widget_class->show = gtk_plug_show;
   widget_class->hide = gtk_plug_hide;
@@ -280,7 +284,9 @@ _gtk_plug_remove_from_socket (GtkPlug   *plug,
   GTK_PRIVATE_UNSET_FLAG (plug, GTK_IN_REPARENT);
   
   socket->plug_widget = NULL;
+  g_object_unref (socket->plug_window);
   socket->plug_window = NULL;
+  
   socket->same_app = FALSE;
 
   plug->same_app = FALSE;
@@ -320,7 +326,7 @@ void
 gtk_plug_construct (GtkPlug         *plug,
                    GdkNativeWindow  socket_id)
 {
-  gtk_plug_construct_for_display (plug, gdk_get_default_display (), socket_id);
+  gtk_plug_construct_for_display (plug, gdk_display_get_default (), socket_id);
 }
 
 /**
@@ -379,7 +385,7 @@ gtk_plug_construct_for_display (GtkPlug         *plug,
 GtkWidget*
 gtk_plug_new (GdkNativeWindow socket_id)
 {
-  return gtk_plug_new_for_display (gdk_get_default_display (), socket_id);
+  return gtk_plug_new_for_display (gdk_display_get_default (), socket_id);
 }
 
 /**
@@ -498,7 +504,6 @@ gtk_plug_realize (GtkWidget *widget)
                            GDK_KEY_RELEASE_MASK |
                            GDK_ENTER_NOTIFY_MASK |
                            GDK_LEAVE_NOTIFY_MASK |
-                           GDK_FOCUS_CHANGE_MASK |
                            GDK_STRUCTURE_MASK);
 
   attributes_mask = GDK_WA_VISUAL | GDK_WA_COLORMAP;
@@ -653,6 +658,17 @@ gtk_plug_key_press_event (GtkWidget   *widget,
     return FALSE;
 }
 
+static gboolean
+gtk_plug_focus_event (GtkWidget      *widget,
+                     GdkEventFocus  *event)
+{
+  /* We eat focus-in events and focus-out events, since they
+   * can be generated by something like a keyboard grab on
+   * a child of the plug.
+   */
+  return FALSE;
+}
+
 static void
 gtk_plug_set_focus (GtkWindow *window,
                    GtkWidget *focus)
@@ -664,25 +680,8 @@ gtk_plug_set_focus (GtkWindow *window,
   /* Ask for focus from embedder
    */
 
-  if (focus && !window->has_focus)
+  if (focus && !window->has_toplevel_focus)
     {
-#if 0      
-      XEvent xevent;
-
-      xevent.xfocus.type = FocusIn;
-      xevent.xfocus.display = GDK_WINDOW_XDISPLAY (plug->socket_window);
-      xevent.xfocus.window = GDK_WINDOW_XWINDOW (plug->socket_window);
-      xevent.xfocus.mode = EMBEDDED_APP_WANTS_FOCUS;
-      xevent.xfocus.detail = FALSE; /* Don't force */
-
-      gdk_error_trap_push ();
-      XSendEvent (GDK_DISPLAY (),
-                 GDK_WINDOW_XWINDOW (plug->socket_window),
-                 False, NoEventMask, &xevent);
-      gdk_display_sync (gdk_drawable_get_display (plug->socket_window));
-      gdk_error_trap_pop ();
-#endif
-
       send_xembed_message (plug, XEMBED_REQUEST_FOCUS, 0, 0, 0,
                           gtk_get_current_event_time ());
     }
@@ -847,19 +846,6 @@ gtk_plug_focus (GtkWidget        *widget,
              
              send_xembed_message (plug, message, 0, 0, 0,
                                   gtk_get_current_event_time ());
-             
-#if 0        
-             gtk_window_set_focus (GTK_WINDOW (widget), NULL);
-
-             gdk_error_trap_push ();
-             XSetInputFocus (GDK_WINDOW_XDISPLAY (plug->socket_window),
-                             GDK_WINDOW_XWINDOW (plug->socket_window),
-                             RevertToParent, event->time);
-             gdk_display_sync (gdk_drawable_get_display (plug->socket_window));
-             gdk_error_trap_pop ();
-
-             gtk_plug_forward_key_press (plug, event);
-#endif       
            }
        }
 
@@ -898,6 +884,9 @@ send_xembed_message (GtkPlug *plug,
       GdkDisplay *display = gdk_drawable_get_display (plug->socket_window);
       XEvent xevent;
 
+      GTK_NOTE(PLUGSOCKET,
+              g_message ("GtkPlug: Sending XEMBED message of type %ld", message));
+
       xevent.xclient.window = GDK_WINDOW_XWINDOW (plug->socket_window);
       xevent.xclient.type = ClientMessage;
       xevent.xclient.message_type = gdk_x11_get_xatom_by_name_for_display (display, "_XEMBED");
@@ -990,20 +979,20 @@ handle_xembed_message (GtkPlug   *plug,
                       glong      data2,
                       guint32    time)
 {
+  GtkWindow *window = GTK_WINDOW (plug);
+  
   GTK_NOTE (PLUGSOCKET,
-           g_message ("Message of type %ld received", message));
+           g_message ("GtkPlug: Message of type %ld received", message));
   
   switch (message)
     {
     case XEMBED_EMBEDDED_NOTIFY:
       break;
     case XEMBED_WINDOW_ACTIVATE:
-      GTK_NOTE(PLUGSOCKET,
-              g_message ("GtkPlug: ACTIVATE received"));
+      _gtk_window_set_is_active (window, TRUE);
       break;
     case XEMBED_WINDOW_DEACTIVATE:
-      GTK_NOTE(PLUGSOCKET,
-              g_message ("GtkPlug: DEACTIVATE received"));
+      _gtk_window_set_is_active (window, FALSE);
       break;
       
     case XEMBED_MODALITY_ON:
@@ -1014,6 +1003,7 @@ handle_xembed_message (GtkPlug   *plug,
       break;
 
     case XEMBED_FOCUS_IN:
+      _gtk_window_set_has_toplevel_focus (window, TRUE);
       switch (detail)
        {
        case XEMBED_FOCUS_FIRST:
@@ -1023,22 +1013,13 @@ handle_xembed_message (GtkPlug   *plug,
          focus_first_last (plug, GTK_DIR_TAB_BACKWARD);
          break;
        case XEMBED_FOCUS_CURRENT:
-         /* fall through */;
+         break;
        }
-      
-    case XEMBED_FOCUS_OUT:
-      {
-       GdkEvent event;
-
-       event.focus_change.type = GDK_FOCUS_CHANGE;
-       event.focus_change.window = GTK_WIDGET (plug)->window;
-       event.focus_change.send_event = TRUE;
-       event.focus_change.in = (message == XEMBED_FOCUS_IN);
-
-       gtk_widget_event (GTK_WIDGET (plug), &event);
+      break;
 
-       break;
-      }
+    case XEMBED_FOCUS_OUT:
+      _gtk_window_set_has_toplevel_focus (window, FALSE);
+      break;
       
     case XEMBED_GRAB_KEY:
     case XEMBED_UNGRAB_KEY:
@@ -1143,7 +1124,7 @@ gtk_plug_filter_func (GdkXEvent *gdk_xevent, GdkEvent *event, gpointer data)
                  }
              }
            else
-             break;
+             goto done;
          }
 
        if (xre->parent != GDK_WINDOW_XWINDOW (gdk_screen_get_root_window (screen)))
@@ -1178,7 +1159,8 @@ gtk_plug_filter_func (GdkXEvent *gdk_xevent, GdkEvent *event, gpointer data)
            if (!was_embedded)
              g_signal_emit (G_OBJECT (plug), plug_signals[EMBEDDED], 0);
          }
-       
+
+      done:
        g_object_unref (plug);
        
        break;