xemacs-beta: src/window.c comparison

comparison src/window.c @ 26:441bb1e64a06 r19-15b96

Import from CVS: tag r19-15b96

author	cvs
date	Mon, 13 Aug 2007 08:51:32 +0200
parents	8fc7fe29b841
children	e04119814345

comparison

equal deleted inserted replaced

-:383a494979f8
+:441bb1e64a06
 extern void energize_buffer_hidden_hook ();
 extern void energize_window_selected_hook ();
 extern void energize_window_deselected_hook ();
 extern Lisp_Object desired_psheet_buffer ();
 extern void make_psheets_desired ();
-#endif
+#endif /* ENERGIZE */
 /* Thickness of shadow border around 3d modelines. */
 Lisp_Object Vmodeline_shadow_thickness;
 /* Whether a modeline should be displayed. */
 Lisp_Object Vminibuf_scroll_window;
 /* Non-nil means this is the buffer whose window C-M-v should scroll.  */
 Lisp_Object Vother_window_scroll_buffer;
-/* Non-nil means it's function to call to display temp buffers.  */
+/* Non-nil means it's the function to call to display temp buffers.  */
 Lisp_Object Vtemp_buffer_show_function;
 Lisp_Object Vtemp_buffer_show_hook;
 /* If a window gets smaller than either of these, it is removed. */
 static void finalize_window (void *header, int for_disksave);
 DEFINE_LRECORD_IMPLEMENTATION ("window", window,
 mark_window, print_window, finalize_window,
 			       0, 0, struct window);
-#define MARK_DISP_VARIABLE(field)			\
+#define MARK_DISP_VARIABLE(field)		\
-((markobj) (window->field[CURRENT_DISP]));		\
+((markobj) (window->field[CURRENT_DISP]));	\
-((markobj) (window->field[DESIRED_DISP]));		\
+((markobj) (window->field[DESIRED_DISP]));	\
 ((markobj) (window->field[CMOTION_DISP]));
 static Lisp_Object
 mark_window (Lisp_Object obj, void (*markobj) (Lisp_Object))
 {
 ((markobj) (window->modeline_shadow_thickness));
 #ifdef HAVE_SCROLLBARS
 ((markobj) (window->scrollbar_width));
 ((markobj) (window->scrollbar_height));
 ((markobj) (window->scrollbar_pointer));
-#endif
+#endif /* HAVE_SCROLLBARS */
 ((markobj) (window->left_margin_width));
 ((markobj) (window->right_margin_width));
 #ifdef HAVE_TOOLBARS
 ((markobj) (window->toolbar[0]));
 ((markobj) (window->toolbar[1]));
 ((markobj) (window->toolbar_buttons_captioned_p));
 ((markobj) (window->default_toolbar));
 ((markobj) (window->default_toolbar_height));
 ((markobj) (window->default_toolbar_width));
 ((markobj) (window->default_toolbar_visible_p));
-#endif
+#endif /* HAVE_TOOLBARS */
 ((markobj) (window->minimum_line_ascent));
 ((markobj) (window->minimum_line_descent));
 ((markobj) (window->use_left_overflow));
 ((markobj) (window->use_right_overflow));
 #ifdef HAVE_MENUBARS
 ((markobj) (window->menubar_visible_p));
-#endif
+#endif /* HAVE_MENUBARS */
 ((markobj) (window->text_cursor_visible_p));
 /* End cached specifiers. */
 ((markobj) (window->dedicated));
 mark_face_cachels (window->face_cachels, markobj);
 mark_glyph_cachels (window->glyph_cachels, markobj);
 * It also becomes a convenient place to stick scrollbar instances
 * since they extrapolate out to having the same problem described for
 * the display structures.
 */
-/* Create a new mindow mirror structure and associated redisplay
+/* Create a new window mirror structure and associated redisplay
 structs. */
 static struct window_mirror *
 new_window_mirror (struct frame *f)
 {
 struct window_mirror *t;
 }
 else
 if (!mir)
 mir = new_window_mirror (XFRAME (XWINDOW (win)->frame));
-mir->next = update_mirror_internal (XWINDOW (win)->next, mir->next);
+mir->next   = update_mirror_internal (XWINDOW (win)->next,   mir->next);
 mir->hchild = update_mirror_internal (XWINDOW (win)->hchild, mir->hchild);
 mir->vchild = update_mirror_internal (XWINDOW (win)->vchild, mir->vchild);
 /*
 * If the redisplay structs are not empty and the mirror has
 t->buffer = b;
 }
-/* Determining a windows position based solely on its pixel
+/* Determining a window's position based solely on its pixel
 positioning doesn't work.  Instead, we do it the intelligent way,
 by checking its positioning in the window hierarchy. */
 int
 window_is_leftmost (struct window *w)
 {
 }
 else
 return 0;
 #else
 return (!window_is_leftmost (w));
-#endif
+#endif /* HAVE_SCROLLBARS */
 }
 int
 window_scrollbar_width (struct window *w)
 {
 return 0;
 return XINT (w->scrollbar_width);
 #else
 return 0;
-#endif
+#endif /* HAVE_SCROLLBARS */
 }
 /* Horizontal scrollbars are only active on windows with truncation
 turned on. */
 int
 return 0;
 return XINT (w->scrollbar_height);
 #else
 return 0;
-#endif
+#endif /* HAVE_SCROLLBARS */
 }
 int
 window_modeline_height (struct window *w)
 {
 DEFUN ("window-minibuffer-p", Fwindow_minibuffer_p, 1, 1, 0, /*
 Return non-nil if WINDOW is a minibuffer window.
 */
 (window))
 {
-struct window *w = decode_window (window);
+return (MINI_WINDOW_P (decode_window (window)) ? Qt : Qnil);
-return (MINI_WINDOW_P (w) ? Qt : Qnil);
 }
 DEFUN ("window-first-hchild", Fwindow_first_hchild, 1, 1, 0, /*
 Return the first horizontal child of WINDOW, or nil.
 */
 (window))
 {
-struct window *w = decode_window (window);
+return decode_window (window)->hchild;
-return w->hchild;
 }
 DEFUN ("window-first-vchild", Fwindow_first_vchild, 1, 1, 0, /*
 Return the first vertical child of WINDOW, or nil.
 */
 (window))
 {
-struct window *w = decode_window (window);
+return decode_window (window)->vchild;
-return w->vchild;
 }
 DEFUN ("window-next-child", Fwindow_next_child, 1, 1, 0, /*
 Return the next window on the same level as WINDOW, or nil.
 */
 (window))
 {
-struct window *w = decode_window (window);
+return decode_window (window)->next;
-return w->next;
 }
 DEFUN ("window-previous-child", Fwindow_previous_child, 1, 1, 0, /*
 Return the previous window on the same level as WINDOW, or nil.
 */
 (window))
 {
-struct window *w = decode_window (window);
+return decode_window (window)->prev;
-return w->prev;
 }
 DEFUN ("window-parent", Fwindow_parent, 1, 1, 0, /*
 Return the parent of WINDOW, or nil.
 */
 (window))
 {
-struct window *w = decode_window (window);
+return decode_window (window)->parent;
-return w->parent;
 }
 DEFUN ("window-lowest-p", Fwindow_lowest_p, 1, 1, 0, /*
 Return non-nil if WINDOW is along the bottom of its frame.
 */
 (window))
 {
-struct window *w = decode_window (window);
+return window_is_lowest (decode_window (window)) ? Qt : Qnil;
-return window_is_lowest (w) ? Qt : Qnil;
 }
 DEFUN ("window-highest-p", Fwindow_highest_p, 1, 1, 0, /*
 Return non-nil if WINDOW is along the top of its frame.
 */
 (window))
 {
-struct window *w = decode_window (window);
+return window_is_highest (decode_window (window)) ? Qt : Qnil;
-return window_is_highest (w) ? Qt : Qnil;
 }
 DEFUN ("window-leftmost-p", Fwindow_leftmost_p, 1, 1, 0, /*
 Return non-nil if WINDOW is along the left edge of its frame.
 */
 (window))
 {
-struct window *w = decode_window (window);
+return window_is_leftmost (decode_window (window)) ? Qt : Qnil;
-return window_is_leftmost (w) ? Qt : Qnil;
 }
 DEFUN ("window-rightmost-p", Fwindow_rightmost_p, 1, 1, 0, /*
 Return non-nil if WINDOW is along the right edge of its frame.
 */
 (window))
 {
-struct window *w = decode_window (window);
+return window_is_rightmost (decode_window (window)) ? Qt : Qnil;
-return window_is_rightmost (w) ? Qt : Qnil;
 }
 DEFUN ("pos-visible-in-window-p", Fpos_visible_in_window_p, 0, 2, 0, /*
 Return t if position POS is currently on the frame in WINDOW.
 Returns nil if that position is scrolled vertically out of view.
 POS defaults to point in WINDOW's buffer; WINDOW, to the selected window.
 */
 (pos, window))
 {
-struct window *w;
+struct window *w = decode_window (window);
 Bufpos top;
 Bufpos posint;
 struct buffer *buf;
-w = decode_window (window);
 top = marker_position (w->start[CURRENT_DISP]);
 buf = XBUFFER (w->buffer);
 if (NILP (pos))
 Return the number of display columns in WINDOW.
 This is the width that is usable columns available for text in WINDOW.
 */
 (window))
 {
-struct window *w = decode_window (window);
+return (make_int (window_char_width (decode_window (window), 0)));
-return (make_int (window_char_width (w, 0)));
 }
 DEFUN ("window-pixel-width", Fwindow_pixel_width, 0, 1, 0, /*
 Return the width of WINDOW in pixels.  Defaults to current window.
 */
 return ncol;
 }
 #if 0 /* bogus RMS crock */
-xxDEFUN ("window-redisplay-end-trigger", Fwindow_redisplay_end_trigger,
+xxDEFUN ("window-redisplay-end-trigger", Fwindow_redisplay_end_trigger, 0, 1, 0 /*
-Swindow_redisplay_end_trigger, 0, 1, 0 /*
 Return WINDOW's redisplay end trigger value.
 See `set-window-redisplay-end-trigger' for more information.
-*/ )
+*/
-(window)
+	 (window))
-Lisp_Object window;
 {
 return decode_window (window)->redisplay_end_trigger;
 }
-xxDEFUN ("set-window-redisplay-end-trigger", Fset_window_redisplay_end_trigger,
+xxDEFUN ("set-window-redisplay-end-trigger", Fset_window_redisplay_end_trigger, 2, 2, 0 /*
-Sset_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.
 Afterwards the end-trigger value is reset to nil.
-*/ )
+*/
-(window, value)
+	 (window, value))
-register Lisp_Object window, value;
+{
-{
+return (decode_window (window)->redisplay_end_trigger = value);
-register struct window *w;
-w = decode_window (window);
-w->redisplay_end_trigger = value;
-return value;
 }
 #endif /* 0 */
 DEFUN ("window-pixel-edges", Fwindow_pixel_edges, 0, 1, 0, /*
 	  else break;
 	  while (tem = XWINDOW (window)->next, !NILP (tem))
 	    window = tem;
 	}
 }
-/* "acceptable" is the correct spelling. */
 /* Which windows are acceptable?
 Exit the loop and accept this window if
 this isn't a minibuffer window,
 or we're accepting all minibuffer windows,
 or this is the active minibuffer and we are accepting that one, or

Mercurial > hg > xemacs-beta

comparison src/window.c @ 26:441bb1e64a06 r19-15b96