xemacs-beta: src/frame.c comparison

comparison src/frame.c @ 284:558f606b08ae r21-0b40

Import from CVS: tag r21-0b40

author	cvs
date	Mon, 13 Aug 2007 10:34:13 +0200
parents	c42ec1d1cded
children	57709be46d1b

comparison

equal deleted inserted replaced

-:fa3d41851a08
+:558f606b08ae
 Lisp_Object frmcons, devcons, concons;
 FRAME_LOOP_NO_BREAK (frmcons, devcons, concons)
 unhold_one_frame_size_changes (XFRAME (XCAR (frmcons)));
 }
+void
+invalidate_vertical_divider_cache_in_frame (struct frame *f)
+{
+/* Invalidate cached value of needs_vertical_divider_p in
+every and all windows */
+map_windows (f, invalidate_vertical_divider_cache_in_window, 0);
+}
 /*
 * Frame size may change due to changes in scrollbars, toolbars,
 * default font etc. These changes are applied early in redisplay
 * frame.
 {
 return FRAMEP (object) && FRAME_LIVE_P (XFRAME (object)) ? Qt : Qnil;
 }
+DEFUN ("focus-frame", Ffocus_frame, 1, 1, 0, /*
+Select FRAME and give it the window system focus.
+This function is not affected by the value of `focus-follows-mouse'.
+*/
+(frame))
+{
+CHECK_LIVE_FRAME (frame);
+MAYBE_DEVMETH (XDEVICE (FRAME_DEVICE (XFRAME (frame))), focus_on_frame,
+		 (XFRAME (frame)));
+/* FRAME will be selected by the time we receive the next event.
+However, it is better to select it explicitly now, in case the
+Lisp code depends on frame being selected.  */
+Fselect_frame (frame);
+return Qnil;
+}
 /* Called from Fselect_window() */
 void
 select_frame_1 (Lisp_Object frame)
 {
 struct frame *f = XFRAME (frame);
 Subsequent editing commands apply to its selected window.
 The selection of FRAME lasts until the next time the user does
 something to select a different frame, or until the next time this
 function is called.
-Note that this does not actually cause the window-system focus to
+Note that this does not actually cause the window-system focus to be
-be set to this frame, or the select-frame-hook or deselect-frame-hook
+set to this frame, or the `select-frame-hook' or `deselect-frame-hook'
 to be run, until the next time that XEmacs is waiting for an event.
 Also note that when focus-follows-mouse is non-nil, the frame
 selection is temporary and is reverted when the current command
 terminates, much like the buffer selected by `set-buffer'.  In order
-to effect a permanent focus change in this case, bind
+to effect a permanent focus change, use `focus-frame'.
-focus-follows-mouse to nil, select the frame you want, and do
-a (sit-for 0) within the scope of the binding.
 */
 (frame))
 {
 CHECK_LIVE_FRAME (frame);
 return 0;
 }
 DEFUN ("mouse-pixel-position", Fmouse_pixel_position, 0, 1, 0, /*
 Return a list (WINDOW X . Y) giving the current mouse window and position.
-The position is given in pixel units, where (0, 0) is the
+The position is given in pixel units, where (0, 0) is the upper-left corner.
-upper-left corner.
+When the cursor is not over a window, the return value is a list (nil nil).
 DEVICE specifies the device on which to read the mouse position, and
 defaults to the selected device.  If the device is a mouseless terminal
 or Emacs hasn't been programmed to read its mouse position, it returns
 the device's selected window for WINDOW and nil for X and Y.
 */
 (device))
 {
 struct device *d = decode_device (device);
 Lisp_Object frame;
-Lisp_Object window;
+Lisp_Object window = Qnil;
 Lisp_Object x = Qnil;
 Lisp_Object y = Qnil;
 int intx, inty;
-if (mouse_pixel_position_1 (d, &frame, &intx, &inty))
+if (mouse_pixel_position_1 (d, &frame, &intx, &inty) > 0)
 {
 struct window *w =
 	find_window_by_pixel_pos (intx, inty, XFRAME (frame)->root_window);
-if (!w)
+if (w)
-	window = Qnil;
-else
 	{
 	  XSETWINDOW (window, w);
 	  /* Adjust the position to be relative to the window. */
 	  intx -= w->pixel_left;
 	  inty -= w->pixel_top;
 	  XSETINT (x, intx);
 	  XSETINT (y, inty);
 	}
 }
-else
+else if (FRAMEP (frame))
-{
+window = FRAME_SELECTED_WINDOW (XFRAME (frame));
-if (FRAMEP (frame))
-	window = FRAME_SELECTED_WINDOW (XFRAME (frame));
-else
-	window = Qnil;
-}
 return Fcons (window, Fcons (x, y));
 }
 DEFUN ("mouse-position", Fmouse_position, 0, 1, 0, /*
 Return a list (WINDOW X . Y) giving the current mouse window and position.
-The position is given in character cells, where (0, 0) is the
+The position is of a character under cursor, where (0, 0) is the upper-left
-upper-left corner of the window.
+corner of the window.
+When the cursor is not over a character, or not over a window, the return
+value is a list (nil nil).
 DEVICE specifies the device on which to read the mouse position, and
 defaults to the selected device.  If the device is a mouseless terminal
 or Emacs hasn't been programmed to read its mouse position, it returns
 the device's selected window for WINDOW and nil for X and Y.
 */
 (device))
 {
-Lisp_Object val = Fmouse_pixel_position (device);
+struct device *d = decode_device (device);
+struct window *w;
+Lisp_Object frame, window = Qnil, lisp_x = Qnil, lisp_y = Qnil;
 int x, y, obj_x, obj_y;
-struct window *w;
-struct frame *f;
 Bufpos bufpos, closest;
 Charcount modeline_closest;
 Lisp_Object obj1, obj2;
-if (NILP (XCAR (val)) || NILP (XCAR (XCDR (val))))
+if (mouse_pixel_position_1 (d, &frame, &x, &y) > 0)
-return val;
+{
-w = XWINDOW (XCAR (val));
+int res = pixel_to_glyph_translation (XFRAME (frame), x, y, &x, &y,
-x = XINT (XCAR (XCDR (val)));
+					    &obj_x, &obj_y, &w, &bufpos,
-y = XINT (XCDR (XCDR (val)));
+					    &closest, &modeline_closest,
-f = XFRAME (w->frame);
+					    &obj1, &obj2);
+if (res == OVER_TEXT)
-if (x >= 0 && y >= 0)
-{
-if (pixel_to_glyph_translation (f, x, y, &x, &y, &obj_x, &obj_y, &w,
-				      &bufpos, &closest, &modeline_closest,
-				      &obj1, &obj2)
-	  != OVER_NOTHING)
 	{
-	  XCAR (XCDR (val)) = make_int (x);
+	  lisp_x = make_int (x);
-	  XCDR (XCDR (val)) = make_int (y);
+	  lisp_y = make_int (y);
+	  XSETWINDOW (window, w);
 	}
 }
-else
+else if (FRAMEP (frame))
-{
+window = FRAME_SELECTED_WINDOW (XFRAME (frame));
-XCAR (XCDR (val)) = Qnil;
-XCDR (XCDR (val)) = Qnil;
+return Fcons (window, Fcons (lisp_x, lisp_y));
-}
-return val;
 }
 DEFUN ("mouse-position-as-motion-event", Fmouse_position_as_motion_event, 0, 1, 0, /*
 Return the current mouse position as a motion event.
 This allows you to call the standard event functions such as
 DEFSUBR (Fframep);
 DEFSUBR (Fframe_live_p);
 #if 0 /* FSFmacs */
 DEFSUBR (Fignore_event);
 #endif
+DEFSUBR (Ffocus_frame);
 DEFSUBR (Fselect_frame);
 DEFSUBR (Fselected_frame);
 DEFSUBR (Factive_minibuffer_window);
 DEFSUBR (Flast_nonminibuf_frame);
 DEFSUBR (Fframe_root_window);

Mercurial > hg > xemacs-beta

comparison src/frame.c @ 284:558f606b08ae r21-0b40