xemacs-beta: src/window.c comparison

comparison src/window.c @ 149:538048ae2ab8 r20-3b1

Import from CVS: tag r20-3b1

author	cvs
date	Mon, 13 Aug 2007 09:36:16 +0200
parents	fe104dbd9147
children	8eaf7971accc

comparison

equal deleted inserted replaced

-:f659db2a1f73
+:538048ae2ab8
 int
 window_needs_vertical_divider (struct window *w)
 {
 #ifdef HAVE_SCROLLBARS
-struct frame *f = XFRAME (w->frame);
+return (!window_scrollbar_width (w) &&
+	  ((XFRAME (w->frame)->scrollbar_on_left) ?
-if (!window_scrollbar_width (w))
+	   !window_is_leftmost  (w) :
-{
+	   !window_is_rightmost (w)));
-if (f->scrollbar_on_left)
-	return (!window_is_leftmost (w));
-else
-	return (!window_is_rightmost (w));
-}
-else
-return 0;
 #else
-return (!window_is_leftmost (w));
+return !window_is_leftmost (w);
 #endif /* HAVE_SCROLLBARS */
 }
 int
 window_scrollbar_width (struct window *w)
 return ncol;
 }
 #if 0 /* bogus RMS crock */
-xxDEFUN ("window-redisplay-end-trigger", Fwindow_redisplay_end_trigger, 0, 1, 0 /*
+xxDEFUN ("window-redisplay-end-trigger",
+	 Fwindow_redisplay_end_trigger, 0, 1, 0, /*
 Return WINDOW's redisplay end trigger value.
 See `set-window-redisplay-end-trigger' for more information.
 */
 	 (window))
 {
 return decode_window (window)->redisplay_end_trigger;
 }
-xxDEFUN ("set-window-redisplay-end-trigger", Fset_window_redisplay_end_trigger, 2, 2, 0 /*
+xxDEFUN ("set-window-redisplay-end-trigger",
+	 Fset_window_redisplay_end_trigger, 2, 2, 0, /*
 Set WINDOW's redisplay end trigger value to VALUE.
 VALUE should be a buffer position (typically a marker) or nil.
 If it is a buffer position, then if redisplay in WINDOW reaches a position
 beyond VALUE, the functions in `redisplay-end-trigger-functions' are called
 with two arguments: WINDOW, and the end trigger value.
 */
 (window))
 {
 struct window *w = decode_window (window);
 struct frame *f = XFRAME (w->frame);
-int left, top;
+int left = w->pixel_left - FRAME_LEFT_BORDER_END (f);
-left = w->pixel_left - FRAME_LEFT_BORDER_END (f);
+int top  = w->pixel_top  - FRAME_TOP_BORDER_END  (f);
-top = w->pixel_top - FRAME_TOP_BORDER_END (f);
 return list4 (make_int (left),
 		make_int (top),
 		make_int (left + w->pixel_width),
 		make_int (top + w->pixel_height));
 */
 (window, arg))
 {
 register struct window *w = decode_window (window);
-if (NILP (arg))
+w->dedicated = NILP (arg) ? Qnil : Qt;
-w->dedicated = Qnil;
-else
-w->dedicated = Qt;
 return w->dedicated;
 }
 /* FSFmacs has window-display-table here.  We have display table as a
 Return the width in pixels of the left outside margin of window WINDOW.
 If WINDOW is nil, the selected window is assumed.
 */
 (window))
 {
-struct window *w = decode_window (window);
+return make_int (window_left_margin_width (decode_window (window)));
-return (make_int (window_left_margin_width (w)));
 }
 DEFUN ("window-right-margin-pixel-width",
 Fwindow_right_margin_pixel_width, 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))
 {
-struct window *w = decode_window (window);
+return make_int (window_right_margin_width (decode_window (window)));
-return (make_int (window_right_margin_width (w)));
 }
 DEFUN ("delete-other-windows", Fdelete_other_windows, 0, 1, "", /*
 Make WINDOW (or the selected window) fill its frame.
 Only the frame WINDOW is on is affected.
 #### This is a kludge.  The correct approach is not to do this
 but to fix set-window-configuration. */
 #if 0
 else if (EQ (tem, buffer))
-return (Qnil);
+return Qnil;
 #endif
 else if (! EQ (tem, Qt))	/* w->buffer is t when the window
 				   is first being set up.  */
 {
 if (!NILP (w->dedicated) && !EQ (tem, buffer))
 and optional third ARG specifies the window to change instead of the
 selected window.
 */
 (n, side, window))
 {
-struct window *w = decode_window (window);
 CHECK_INT (n);
-change_window_height (w, -XINT (n), !NILP (side));
+change_window_height (decode_window (window), -XINT (n), !NILP (side));
 return Qnil;
 }
 static int
 window_pixel_height (Lisp_Object window)
 {
-struct window *w = XWINDOW (window);
+return WINDOW_HEIGHT (XWINDOW (window));
-return WINDOW_HEIGHT (w);
 }
 static int
 window_pixel_height_to_char_height (struct window *w, int pixel_height,
 				    int include_gutters_p)
 	      /* If this line is clipped then we know that there is no
 blank room between eob and the modeline.  If we are
 scrolling on clipped lines just know off the clipped
 line and return .*/
 	      if (scroll_on_clipped_lines && dl->clip)
-		return (num_lines - 1);
+		return num_lines - 1;
 	      ypos1 = dl->ypos + dl->descent - dl->clip;
 	    }
 	}
 default_face_height_and_width (window, &defheight, &defwidth);
 }
 static int
 window_pixel_width (Lisp_Object window)
 {
-struct window *w = XWINDOW (window);
+return WINDOW_WIDTH (XWINDOW (window));
-return WINDOW_WIDTH (w);
 }
 static int
 window_pixel_width_to_char_width (struct window *w, int pixel_width,
 				  int include_margins_p)
 if (NILP (arg))
 arg = make_int (window_char_width (w, 0) - 2);
 else
 arg = Fprefix_numeric_value (arg);
-return
+return Fset_window_hscroll (window, make_int (w->hscroll + XINT (arg)));
-Fset_window_hscroll (window, make_int (w->hscroll + XINT (arg)));
 }
 DEFUN ("scroll-right", Fscroll_right, 0, 1, "_P", /*
 Scroll selected window display ARG columns right.
 Default for ARG is window width minus 2.
 if (NILP (arg))
 arg = make_int (window_char_width (w, 0) - 2);
 else
 arg = Fprefix_numeric_value (arg);
-return
+return Fset_window_hscroll (window, make_int (w->hscroll - XINT (arg)));
-Fset_window_hscroll (window, make_int (w->hscroll - XINT (arg)));
 }
 DEFUN ("recenter", Frecenter, 0, 2, "_P", /*
 Center point in WINDOW and redisplay frame.  With ARG, put point on line ARG.
 The desired position of point is always relative to the window.
 	    Fset_window_point (window, make_int (new_point));
 	  retval = line_at_center (w, CMOTION_DISP, start, BUF_PT (b));
 	}
-return (make_int (retval));
+return make_int (retval);
 }
 else
 {
 /* #### Is this going to work right when at eob? */
 arg = Fprefix_numeric_value (arg);
 					ovstats);
 stats->scrollbar +=
 compute_scrollbar_instance_usage (d, mir->scrollbar_horizontal_instance,
 					ovstats);
 }
-#endif
+#endif /* HAVE_SCROLLBARS */
 stats->other_redisplay +=
 compute_display_line_dynarr_usage (mir->current_display_lines, ovstats);
 stats->other_redisplay +=
 compute_display_line_dynarr_usage (mir->desired_display_lines, ovstats);
 }
 ((markobj) (s->pointm));
 ((markobj) (s->sb_point));
 ((markobj) (s->mark));
 ((markobj) (s->dedicated));
 }
-return (Qnil);
+return Qnil;
 }
 static int
 sizeof_window_config_for_n_windows (int n)
 {
 /* Returns a boolean indicating whether the two saved windows are
 identical. */
 static int
 saved_window_equal (struct saved_window *win1, struct saved_window *win2)
 {
-if (!EQ (win1->window, win2->window))
+return
-return 0;
+EQ (win1->window, win2->window) &&
-else if (!EQ (win1->buffer, win2->buffer))
+EQ (win1->buffer, win2->buffer) &&
-return 0;
+!NILP (Fequal (win1->start,    win2->start)) &&
-else if (NILP (Fequal (win1->start, win2->start)))
+!NILP (Fequal (win1->pointm,   win2->pointm)) &&
-return 0;
+!NILP (Fequal (win1->sb_point, win2->sb_point)) &&
-else if (NILP (Fequal (win1->pointm, win2->pointm)))
+!NILP (Fequal (win1->mark,     win2->mark)) &&
-return 0;
+win1->pixel_left   == win2->pixel_left &&
-else if (NILP (Fequal (win1->sb_point, win2->sb_point)))
+win1->pixel_top    == win2->pixel_top &&
-return 0;
+win1->pixel_width  == win2->pixel_width &&
-else if (NILP (Fequal (win1->mark, win2->mark)))
+win1->pixel_height == win2->pixel_height &&
-return 0;
+win1->hscroll      == win2->hscroll &&
-else if (win1->pixel_left != win2->pixel_left)
+win1->parent_index == win2->parent_index &&
-return 0;
+win1->prev_index   == win2->prev_index &&
-else if (win1->pixel_top != win2->pixel_top)
+EQ (win1->dedicated, win2->dedicated) &&
-return 0;
+win1->start_at_line_beg == win2->start_at_line_beg;
-else if (win1->pixel_width != win2->pixel_width)
-return 0;
-else if (win1->pixel_height != win2->pixel_height)
-return 0;
-else if (win1->hscroll != win2->hscroll)
-return 0;
-else if (win1->parent_index != win2->parent_index)
-return 0;
-else if (win1->prev_index != win2->prev_index)
-return 0;
-else if (!EQ (win1->dedicated, win2->dedicated))
-return 0;
-else if (win1->start_at_line_beg != win2->start_at_line_beg)
-return 0;
-return 1;
 }
 /* Returns a boolean indicating whether the two given configurations
 are identical. */
 static int
 return 1;
 fig1 = XWINDOW_CONFIGURATION (conf1);
 fig2 = XWINDOW_CONFIGURATION (conf2);
-if (fig1->saved_windows_count != fig2->saved_windows_count)
+if (!((fig1->saved_windows_count == fig2->saved_windows_count) &&
+	EQ (fig1->current_window,        fig2->current_window) &&
+	EQ (fig1->current_buffer,        fig2->current_buffer) &&
+	EQ (fig1->root_window,           fig2->root_window) &&
+	EQ (fig1->minibuf_scroll_window, fig2->minibuf_scroll_window) &&
+#ifdef ENERGIZE
+	EQ (fig1->p_sheet_buffer,        fig2->p_sheet_buffer) &&
+#endif
+	fig1->frame_width  == fig2->frame_width &&
+	fig1->frame_height == fig2->frame_height))
 return 0;
-else if (!EQ (fig1->current_window, fig2->current_window))
-return 0;
-else if (!EQ (fig1->current_buffer, fig2->current_buffer))
-return 0;
-else if (!EQ (fig1->root_window, fig2->root_window))
-return 0;
-else if (!EQ (fig1->minibuf_scroll_window, fig2->minibuf_scroll_window))
-return 0;
-else if (fig1->frame_width != fig2->frame_width)
-return 0;
-else if (fig1->frame_height != fig2->frame_height)
-return 0;
-#ifdef ENERGIZE
-else if (!EQ (fig1->p_sheet_buffer, fig2->p_sheet_buffer))
-return 0;
-#endif
 for (i = 0; i < fig1->saved_windows_count; i++)
 {
 if (!saved_window_equal (SAVED_WINDOW_N (fig1, i),
 			       SAVED_WINDOW_N (fig2, i)))
 DEFUN ("window-configuration-p", Fwindow_configuration_p, 1, 1, 0, /*
 T if OBJECT is a window-configuration object.
 */
 (obj))
 {
-return (WINDOW_CONFIGURATIONP (obj) ? Qt : Qnil);
+return WINDOW_CONFIGURATIONP (obj) ? Qt : Qnil;
 }
 /*
 * There are getting to be a lot of functions which traverse the
 * window structure doing various things.  It may be worth writing a
 unbind_to (specpdl_count, Qnil);
 UNGCPRO;
-return (Qnil);
+return Qnil;
 }
 /* Mark all subwindows of a window as deleted.  The argument
 W is actually the subwindow tree of the window in question. */
 {
 int j;
 for (j = 0; j < lim; j++)
 {
 if (EQ (SAVED_WINDOW_N (config, j)->window, window))
-	{
+	return j;
-	  return (j);
 	}
-}
 abort ();
 return 0;	/* suppress compiler warning */
 }
 static int
 if (ZEROP (config->p_sheet_buffer)) /* #### necessaryp? */
 config->p_sheet_buffer = Qnil;
 }
 #endif
 save_window_save (FRAME_ROOT_WINDOW (f), config, 0);
-return (result);
+return result;
 }
 Lisp_Object
 save_window_excursion_unwind (Lisp_Object window_config)
 {

Mercurial > hg > xemacs-beta

comparison src/window.c @ 149:538048ae2ab8 r20-3b1