xemacs-beta: src/window.c comparison

comparison src/window.c @ 280:7df0dd720c89 r21-0b38

Import from CVS: tag r21-0b38

author	cvs
date	Mon, 13 Aug 2007 10:32:22 +0200
parents	6330739388db
children	c42ec1d1cded

comparison

equal deleted inserted replaced

-:c20b2fb5bb0a
+:7df0dd720c89
 Return the number of columns by which WINDOW's modeline is scrolled from
 left margin. If the window has no modeline, return nil.
 */
 (window))
 {
-struct window *w;
+struct window *w = decode_window (window);
-w = decode_window (window);
 return (WINDOW_HAS_MODELINE_P (w)) ? make_int (w->modeline_hscroll) : Qnil;
 }
 DEFUN ("set-modeline-hscroll", Fset_modeline_hscroll, 2, 2, 0, /*
 Set number of columns WINDOW's modeline is scrolled from left margin to NCOL.
 NCOL should be zero or positive. If NCOL is negative, it will be forced to 0.
 If the window has no modeline, do nothing and return nil.
 */
 (window, ncol))
 {
-struct window *w;
+struct window *w = decode_window (window);
-int ncols;
-w = decode_window (window);
 if (WINDOW_HAS_MODELINE_P (w))
 {
+int ncols;
 CHECK_INT (ncol);
 ncols = XINT (ncol);
 if (ncols < 0) ncols = 0;
 if (w->modeline_hscroll != ncols)
 	MARK_MODELINE_CHANGED;
 {
 struct window *w = decode_window (window);
 if (NILP (guarantee))
 {
-Lisp_Object buf = w->buffer;
+Lisp_Object buf;
+buf = w->buffer;
 CHECK_BUFFER (buf);
 return make_int (BUF_Z (XBUFFER (buf)) - w->window_end_pos[CURRENT_DISP]);
 }
 else
 {
 /* These functions used to be `buffer-left-margin-pixel-width', etc.
 but there is no sensible way to implement those functions, since
 you can't in general derive a window from a buffer. */
-DEFUN ("window-left-margin-pixel-width",
+DEFUN ("window-left-margin-pixel-width", Fwindow_left_margin_pixel_width,
-Fwindow_left_margin_pixel_width, 0, 1, 0, /*
+0, 1, 0, /*
 Return the width in pixels of the left outside margin of window WINDOW.
 If WINDOW is nil, the selected window is assumed.
 */
 (window))
 {
 return make_int (window_left_margin_width (decode_window (window)));
 }
-DEFUN ("window-right-margin-pixel-width",
+DEFUN ("window-right-margin-pixel-width", Fwindow_right_margin_pixel_width,
-Fwindow_right_margin_pixel_width, 0, 1, 0, /*
+0, 1, 0, /*
 Return the width in pixels of the right outside margin of window WINDOW.
 If WINDOW is nil, the selected window is assumed.
 */
 (window))
 {
 else
 arg = Fprefix_numeric_value (arg);
 return Fset_window_hscroll (window, make_int (w->hscroll - XINT (arg)));
 }
-DEFUN ("recenter", Frecenter, 0, 2, "_P", /*
+DEFUN ("center-to-window-line", Fcenter_to_window_line, 0, 2, "_P", /*
-Center point in WINDOW and redisplay frame.  With N, put point on line N.
+Center point in WINDOW.  With N, put point on line N.
 The desired position of point is always relative to the window.
-Just C-u as prefix means put point in the center of the window.
-No N (i.e., it is nil) erases the entire frame and then
-redraws with point in the center of the window.
 If WINDOW is nil, the selected window is used.
 */
 (n, window))
 {
-struct window *w;
+struct window *w = decode_window (window);
-struct buffer *b;
+struct buffer *b = XBUFFER (w->buffer);
+Bufpos opoint = BUF_PT (b);
 Bufpos startp;
-Bufpos opoint;
+if (NILP (n))
-if (NILP (window))
+startp = start_with_line_at_pixpos (w, opoint, window_half_pixpos (w));
-window = Fselected_window (Qnil);
-else
-CHECK_WINDOW (window);
-w = XWINDOW (window);
-b = XBUFFER (w->buffer);
-opoint = BUF_PT (b);
-if (LISTP (n))
-{
-struct frame *f = XFRAME (w->frame);
-if (NILP (n))
-	{
-	  MARK_FRAME_CHANGED (f);
-	  SET_FRAME_CLEAR (f);
-	}
-startp = start_with_line_at_pixpos (w, opoint, window_half_pixpos (w));
-}
 else
 {
 n = Fprefix_numeric_value (n);
 CHECK_INT (n);
 startp = start_with_point_on_display_line (w, opoint, XINT (n));
 }
 Fset_marker (w->start[CURRENT_DISP], make_int (startp), w->buffer);
 w->start_at_line_beg = beginning_of_line_p (b, startp);
 w->force_start = 1;
 MARK_WINDOWS_CHANGED (w);
 return Qnil;
 }
 DEFUN ("move-to-window-line", Fmove_to_window_line, 1, 2, "_P", /*
 Position point relative to WINDOW.
 With no argument, position text at center of window.
 An argument specifies window line; zero means top of window,
 negative means relative to bottom of window.
 struct buffer *b;
 int height;
 Bufpos start, new_point;
 int selected;
+/* Don't use decode_window() because we need the new value of
+WINDOW.  */
 if (NILP (window))
 window = Fselected_window (Qnil);
 else
 CHECK_WINDOW (window);
 w = XWINDOW (window);
 DEFSUBR (Fscroll_down);
 DEFSUBR (Fscroll_left);
 DEFSUBR (Fscroll_right);
 DEFSUBR (Fother_window_for_scrolling);
 DEFSUBR (Fscroll_other_window);
-DEFSUBR (Frecenter);
+DEFSUBR (Fcenter_to_window_line);
 DEFSUBR (Fmove_to_window_line);
 #ifdef MEMORY_USAGE_STATS
 DEFSUBR (Fwindow_memory_usage);
 #endif
 DEFSUBR (Fwindow_configuration_p);

Mercurial > hg > xemacs-beta

comparison src/window.c @ 280:7df0dd720c89 r21-0b38