emacs: src/xterm.c comparison

comparison src/xterm.c @ 91630:f3b50ee54418

(x_detect_focus_change): Handle embed client message. (handle_one_xevent): Ditto. (handle_one_xevent): If embedded and we get a button press/release, request focus. (xembed_set_info, xembed_send_message): New functions. (x_make_frame_visible): Call xembed_set_info if embedded. (x_make_frame_invisible): Call xembed_set_info if embedded. (x_term_init): Initialize Xatom_XEMBED. (x_make_frame_visible): Check for FRAME_X_EMBEDDED_P also. (x_iconify_frame): Ditto.

author	Jan Djärv <jan.h.d@swipnet.se>
date	Thu, 07 Feb 2008 14:07:35 +0000
parents	c70e45a7acfd
children	b7a5a89054dc

comparison

equal deleted inserted replaced

-:d2d6b0b017fa
+:f3b50ee54418
 case FocusOut:
 x_focus_changed (event->type,
 		       (event->xfocus.detail == NotifyPointer ?
 			FOCUS_IMPLICIT : FOCUS_EXPLICIT),
 		       dpyinfo, frame, bufp);
+break;
+case ClientMessage:
+if (event->xclient.message_type == dpyinfo->Xatom_XEMBED)
+	{
+	  enum xembed_message msg = event->xclient.data.l[1];
+	  x_focus_changed ((msg == XEMBED_FOCUS_IN ? FocusIn : FocusOut),
+			   FOCUS_EXPLICIT, dpyinfo, frame, bufp);
+	}
 break;
 }
 }
 x_scroll_bar_to_input_event (&event, &inev.ie);
 	    *finish = X_EVENT_GOTO_OUT;
 goto done;
 }
 #endif /* USE_TOOLKIT_SCROLL_BARS */
+	/* XEmbed messages from the embedder (if any).  */
+if (event.xclient.message_type
+	    == dpyinfo->Xatom_XEMBED)
+{
+	    enum xembed_message msg = event.xclient.data.l[1];
+	    if (msg == XEMBED_FOCUS_IN || msg == XEMBED_FOCUS_OUT)
+	      x_detect_focus_change (dpyinfo, &event, &inev.ie);
+	    *finish = X_EVENT_GOTO_OUT;
+goto done;
+}
 	f = x_any_window_to_frame (dpyinfo, event.xclient.window);
 	if (!f)
 	  goto OTHER;
 	if (x_handle_dnd_message (f, &event.xclient, dpyinfo, &inev.ie))
 ignore_next_mouse_click_timeout = 0;
 }
 else
 construct_mouse_click (&inev.ie, &event.xbutton, f);
 }
+if (FRAME_X_EMBEDDED_P (f))
+xembed_send_message (f, event.xbutton.time,
+XEMBED_REQUEST_FOCUS, 0, 0, 0);
 }
 else
 {
 struct scroll_bar *bar
 = x_window_to_scroll_bar (event.xbutton.display,
 x_raise_frame (f);
 else
 x_lower_frame (f);
 }
+/* XEmbed implementation.  */
+void
+xembed_set_info (f, flags)
+struct frame *f;
+enum xembed_info flags;
+{
+Atom atom;
+unsigned long data[2];
+atom = XInternAtom (FRAME_X_DISPLAY (f), "_XEMBED_INFO", False);
+data[0] = XEMBED_VERSION;
+data[1] = flags;
+XChangeProperty (FRAME_X_DISPLAY (f), FRAME_OUTER_WINDOW (f), atom, atom,
+		   32, PropModeReplace, (unsigned char *) data, 2);
+}
+void
+xembed_send_message (f, time, message, detail, data1, data2)
+struct frame *f;
+Time time;
+enum xembed_message message;
+long detail;
+long data1;
+long data2;
+{
+XEvent event;
+event.xclient.type = ClientMessage;
+event.xclient.window = FRAME_X_OUTPUT (f)->parent_desc;
+event.xclient.message_type = FRAME_X_DISPLAY_INFO (f)->Xatom_XEMBED;
+event.xclient.format = 32;
+event.xclient.data.l[0] = time;
+event.xclient.data.l[1] = message;
+event.xclient.data.l[2] = detail;
+event.xclient.data.l[3] = data1;
+event.xclient.data.l[4] = data2;
+XSendEvent (FRAME_X_DISPLAY (f), FRAME_X_OUTPUT (f)->parent_desc,
+	      False, NoEventMask, &event);
+XSync (FRAME_X_DISPLAY (f), False);
+}
 /* Change of visibility.  */
 /* This tries to wait until the frame is really visible.
 However, if the window manager asks the user where to position
 the frame, this will return before the user finishes doing that.
 /* We test FRAME_GARBAGED_P here to make sure we don't
 	 call x_set_offset a second time
 	 if we get to x_make_frame_visible a second time
 	 before the window gets really visible.  */
 if (! FRAME_ICONIFIED_P (f)
+	  && ! FRAME_X_EMBEDDED_P (f)
 	  && ! f->output_data.x->asked_for_visible)
 	x_set_offset (f, f->left_pos, f->top_pos, 0);
 f->output_data.x->asked_for_visible = 1;
 if (! EQ (Vx_no_window_manager, Qt))
 	x_wm_set_window_state (f, NormalState);
 #ifdef USE_X_TOOLKIT
-/* This was XtPopup, but that did nothing for an iconified frame.  */
+if (FRAME_X_EMBEDDED_P (f))
-XtMapWidget (f->output_data.x->widget);
+	xembed_set_info (f, XEMBED_MAPPED);
+else
+	{
+	  /* This was XtPopup, but that did nothing for an iconified frame.  */
+	  XtMapWidget (f->output_data.x->widget);
+	}
 #else /* not USE_X_TOOLKIT */
 #ifdef USE_GTK
 gtk_widget_show_all (FRAME_GTK_OUTER_WIDGET (f));
 gtk_window_deiconify (GTK_WINDOW (FRAME_GTK_OUTER_WIDGET (f)));
 #else
-XMapRaised (FRAME_X_DISPLAY (f), FRAME_X_WINDOW (f));
+if (FRAME_X_EMBEDDED_P (f))
+	xembed_set_info (f, XEMBED_MAPPED);
+else
+	XMapRaised (FRAME_X_DISPLAY (f), FRAME_X_WINDOW (f));
 #endif /* not USE_GTK */
 #endif /* not USE_X_TOOLKIT */
 #if 0 /* This seems to bring back scroll bars in the wrong places
 	 if the window configuration has changed.  They seem
 	 to come back ok without this.  */
 Don't do this if the window has never been visible before,
 because the window manager may choose the position
 and we don't want to override it.  */
-if (! FRAME_VISIBLE_P (f) && ! FRAME_ICONIFIED_P (f)
+if (! FRAME_VISIBLE_P (f)
+	&& ! FRAME_ICONIFIED_P (f)
+	&& ! FRAME_X_EMBEDDED_P (f)
 	&& f->win_gravity == NorthWestGravity
 	&& previously_visible)
 {
 	Drawable rootw;
 	int x, y;
 #ifdef USE_GTK
 if (FRAME_GTK_OUTER_WIDGET (f))
 gtk_widget_hide (FRAME_GTK_OUTER_WIDGET (f));
 else
+#else
+if (FRAME_X_EMBEDDED_P (f))
+xembed_set_info (f, 0);
+else
 #endif
 {
 if (! XWithdrawWindow (FRAME_X_DISPLAY (f), window,
 			 DefaultScreen (FRAME_X_DISPLAY (f))))
 UNBLOCK_INPUT;
 #else /* not USE_X_TOOLKIT */
 /* Make sure the X server knows where the window should be positioned,
 in case the user deiconifies with the window manager.  */
-if (! FRAME_VISIBLE_P (f) && !FRAME_ICONIFIED_P (f))
+if (! FRAME_VISIBLE_P (f)
+&& ! FRAME_ICONIFIED_P (f)
+&& ! FRAME_X_EMBEDDED_P (f))
 x_set_offset (f, f->left_pos, f->top_pos, 0);
 /* Since we don't know which revision of X we're running, we'll use both
 the X11R3 and X11R4 techniques.  I don't know if this is a good idea.  */
 dpyinfo->Xatom_DONE = XInternAtom (dpyinfo->display, "DONE", False);
 dpyinfo->Xatom_Scrollbar = XInternAtom (dpyinfo->display, "SCROLLBAR",
 					  False);
+dpyinfo->Xatom_XEMBED = XInternAtom (dpyinfo->display, "_XEMBED",
+				       False);
 dpyinfo->cut_buffers_initialized = 0;
 dpyinfo->x_dnd_atoms_size = 8;
 dpyinfo->x_dnd_atoms_length = 0;
 dpyinfo->x_dnd_atoms = xmalloc (sizeof (*dpyinfo->x_dnd_atoms)

Mercurial > emacs

comparison src/xterm.c @ 91630:f3b50ee54418