xemacs-beta: src/window.c comparison

comparison src/window.c @ 263:727739f917cb r20-5b30

Import from CVS: tag r20-5b30

author	cvs
date	Mon, 13 Aug 2007 10:24:41 +0200
parents	11cf20601dec
children	8efd647ea9ca

comparison

equal deleted inserted replaced

-:9d8607af9e13
+:727739f917cb
 					       int pixel_height,
 					       int include_gutters_p);
 static int window_char_height_to_pixel_height (struct window *w,
 					       int char_height,
 					       int include_gutters_p);
-static void change_window_height (struct window *w, int delta, int widthflag);
+static void change_window_height (struct window *w, int delta, int widthflag,
+int inpixels);
+static int window_displayed_pixel_height (struct window *);
 /* Thickness of shadow border around 3d modelines. */
 Lisp_Object Vmodeline_shadow_thickness;
 (window))
 {
 return make_int (decode_window (window)->pixel_height);
 }
+DEFUN ("window-displayed-pixel-height", Fwindow_displayed_pixel_height, 0, 1, 0, /*
+Return the height in pixels of the buffer-displaying portion of WINDOW.
+Unlike `window-pixel-height', the space occupied by the gutters
+(modeline, horizontal scrollbar, ...) is not counted.
+*/
+(window))
+{
+return make_int (window_displayed_pixel_height (decode_window (window)));
+}
 DEFUN ("window-width", Fwindow_width, 0, 1, 0, /*
 Return the number of display columns in WINDOW.
 This is the width that is usable columns available for text in WINDOW.
 */
 (window))
 */
 (n, side, window))
 {
 struct window *w = decode_window (window);
 CHECK_INT (n);
-change_window_height (w, XINT (n), !NILP (side));
+change_window_height (w, XINT (n), !NILP (side), /* inpixels */ 0);
+return Qnil;
+}
+DEFUN ("enlarge-window-pixels", Fenlarge_window_pixels, 1, 3, "_p", /*
+Make the selected window ARG pixels bigger.
+From program, optional second arg non-nil means grow sideways ARG pixels,
+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), /* inpixels */ 1);
 return Qnil;
 }
 DEFUN ("shrink-window", Fshrink_window, 1, 3, "_p", /*
 Make the selected window ARG lines smaller.
 selected window.
 */
 (n, side, window))
 {
 CHECK_INT (n);
-change_window_height (decode_window (window), -XINT (n), !NILP (side));
+change_window_height (decode_window (window), -XINT (n), !NILP (side),
+/* inpixels */ 0);
+return Qnil;
+}
+DEFUN ("shrink-window-pixels", Fshrink_window_pixels, 1, 3, "_p", /*
+Make the selected window ARG pixels smaller.
+From program, optional second arg non-nil means shrink sideways ARG pixels,
+and optional third ARG specifies the window to change instead of the
+selected window.
+*/
+(n, side, window))
+{
+CHECK_INT (n);
+change_window_height (decode_window (window), -XINT (n), !NILP (side),
+/* inpixels */ 1);
 return Qnil;
 }
 static int
 window_pixel_height (Lisp_Object window)
 }
 return num_lines;
 }
+/*
+* Return height in pixels of buffer-displaying portion of window w.
+* Does not include the gutters (modeline, scrollbars, ...)
+*/
+int
+window_displayed_pixel_height (struct window *w)
+{
+return (WINDOW_HEIGHT (w)
+- window_top_gutter_height (w)
+- window_bottom_gutter_height (w));
+}
 static int
 window_pixel_width (Lisp_Object window)
 {
 return WINDOW_WIDTH (XWINDOW (window));
 }
 /* Unlike set_window_pixheight, this function
 also changes the heights of the siblings so as to
 keep everything consistent. */
 static void
-change_window_height (struct window *win, int delta, int widthflag)
+change_window_height (struct window *win, int delta, int widthflag,
+int inpixels)
 {
 Lisp_Object parent;
 Lisp_Object window = Qnil;
 struct window *w;
 struct frame *f;
 }
 sizep = &CURSIZE (w);
 dim = CURCHARSIZE (w);
-if ((dim + delta) < MINCHARSIZE (window))
+if ((inpixels  && (*sizep + delta) < MINSIZE (window)) ||
+(!inpixels && (dim + delta) < MINCHARSIZE (window)))
 {
 if (MINI_WINDOW_P (XWINDOW (window)))
 	return;
 else if (!NILP (parent))
 	{
 	  Fdelete_window (window, Qnil);
 	  return;
 	}
 }
-delta *= (widthflag ? defwidth : defheight);
+if (!inpixels)
+delta *= (widthflag ? defwidth : defheight);
 {
 int maxdelta;
 maxdelta = ((!NILP (parent))
 	      }
 	  }
 	  w->toolbar_buttons_captioned_p = p->toolbar_buttons_captioned_p;
 	  w->default_toolbar = p->default_toolbar;
 	  w->default_toolbar_width = p->default_toolbar_width;
+	  w->default_toolbar_height = p->default_toolbar_height;
 	  w->default_toolbar_visible_p = p->default_toolbar_visible_p;
 	  w->default_toolbar_border_width = p->default_toolbar_border_width;
 #endif /* HAVE_TOOLBARS */
 	  w->left_margin_width = p->left_margin_width;
 	  w->right_margin_width = p->right_margin_width;
 	  }
 }
 p->toolbar_buttons_captioned_p = w->toolbar_buttons_captioned_p;
 p->default_toolbar = w->default_toolbar;
 p->default_toolbar_width = w->default_toolbar_width;
+p->default_toolbar_height = w->default_toolbar_height;
 p->default_toolbar_visible_p = w->default_toolbar_visible_p;
 p->default_toolbar_border_width = w->default_toolbar_border_width;
 #endif /* HAVE_TOOLBARS */
 p->left_margin_width = w->left_margin_width;
 p->right_margin_width = w->right_margin_width;
 DEFSUBR (Fpos_visible_in_window_p);
 DEFSUBR (Fwindow_buffer);
 DEFSUBR (Fwindow_frame);
 DEFSUBR (Fwindow_height);
 DEFSUBR (Fwindow_displayed_height);
+DEFSUBR (Fwindow_displayed_pixel_height);
 DEFSUBR (Fwindow_width);
 DEFSUBR (Fwindow_pixel_height);
 DEFSUBR (Fwindow_pixel_width);
 DEFSUBR (Fwindow_hscroll);
 DEFSUBR (Fmodeline_hscroll);
 DEFSUBR (Fdelete_window);
 DEFSUBR (Fset_window_buffer);
 DEFSUBR (Fselect_window);
 DEFSUBR (Fsplit_window);
 DEFSUBR (Fenlarge_window);
+DEFSUBR (Fenlarge_window_pixels);
 DEFSUBR (Fshrink_window);
+DEFSUBR (Fshrink_window_pixels);
 DEFSUBR (Fscroll_up);
 DEFSUBR (Fscroll_down);
 DEFSUBR (Fscroll_left);
 DEFSUBR (Fscroll_right);
 DEFSUBR (Fother_window_for_scrolling);

Mercurial > hg > xemacs-beta

comparison src/window.c @ 263:727739f917cb r20-5b30