xemacs-beta: src/window.c comparison

comparison src/window.c @ 5126:2a462149bd6a ben-lisp-object

merge

author	Ben Wing <ben@xemacs.org>
date	Wed, 24 Feb 2010 19:04:27 -0600
parents	b5df3737028a 92dc90c0bb40
children	a9c41067dd88

comparison

equal deleted inserted replaced

-:b5df3737028a
+:2a462149bd6a
 /* Window creation, deletion and examination for XEmacs.
 Copyright (C) 1985-1987, 1992-1995 Free Software Foundation, Inc.
 Copyright (C) 1994, 1995 Board of Trustees, University of Illinois.
-Copyright (C) 1995, 1996, 2002 Ben Wing.
+Copyright (C) 1995, 1996, 2002, 2010 Ben Wing.
 Copyright (C) 1996 Chuck Thompson.
 This file is part of XEmacs.
 XEmacs is free software; you can redistribute it and/or modify it
 real_window (struct window_mirror *mir, int no_abort)
 {
 Lisp_Object retval =
 real_window_internal (mir->frame->root_window,
 			  XWINDOW_MIRROR (mir->frame->root_mirror), mir);
-if (NILP (retval) && !no_abort)
+assert (!NILP (retval) || no_abort);
-ABORT ();
 return retval;
 }
 /* Given a real window, return its mirror structure.  Calls
 struct window_mirror *t;
 if (XFRAME (w->frame)->mirror_dirty)
 update_frame_window_mirror (XFRAME (w->frame));
 t = find_window_mirror (w);
-if (!t)
+assert (t);
-ABORT ();
 if (which == CURRENT_DISP)
 return t->current_display_lines;
 else if (which == DESIRED_DISP)
 return t->desired_display_lines;
 struct window_mirror *t;
 if (XFRAME (w->frame)->mirror_dirty)
 update_frame_window_mirror (XFRAME (w->frame));
 t = find_window_mirror (w);
-if (!t)
+assert (t);
-ABORT ();
 return t->buffer;
 }
 void
 struct window_mirror *t;
 if (XFRAME (w->frame)->mirror_dirty)
 update_frame_window_mirror (XFRAME (w->frame));
 t = find_window_mirror (w);
-if (!t)
+assert (t);
-ABORT ();
 t->buffer = b;
 }
 window = wrap_window (w);
 margin_cwidth = (left_margin ? XINT (w->left_margin_width) :
 		   XINT (w->right_margin_width));
-default_face_height_and_width (window, 0, &font_width);
+default_face_width_and_height (window, &font_width, 0);
 /* The left margin takes precedence over the right margin so we
 subtract its width from the space available for the right
 margin. */
 if (!left_margin)
 start  = marker_position (w->start[CURRENT_DISP]);
 hlimit = WINDOW_TEXT_HEIGHT (w);
 eobuf  = BUF_ZV (XBUFFER (w->buffer));
-default_face_height_and_width (window, &defheight, NULL);
+default_face_width_and_height (window, NULL, &defheight);
 /* guess lines needed in line start cache + a few extra */
 needed = (hlimit + defheight-1) / defheight + 3;
 while (1) {
 unshow_buffer (struct window *w)
 {
 Lisp_Object buf = w->buffer;
 struct buffer *b = XBUFFER (buf);
-if (b != XMARKER (w->pointm[CURRENT_DISP])->buffer)
+assert (b == XMARKER (w->pointm[CURRENT_DISP])->buffer);
-ABORT ();
 /* FSF disables this check, so I'll do it too.  I hope it won't
 break things.  --ben */
 #if 0
 if (w == XWINDOW (Fselected_window (Qnil))
 /* If none of them, then all windows, dedicated or not. */
 w = window_loop (GET_LRU_WINDOW, Qnil, 0, which_frames, 1, which_devices);
 /* At this point we damn well better have found something. */
-if (NILP (w)) ABORT ();
+assert (!NILP (w));
 #endif
 return w;
 }
 	  : 2 * MIN_SAFE_WINDOW_HEIGHT - 1);
 }
 /* Return non-zero if both frame sizes are less than or equal to
 minimal allowed values. ROWS and COLS are in characters */
-int
+static int
-frame_size_valid_p (struct frame *frame, int rows, int cols)
+frame_size_valid_p (struct frame *frame, int cols, int rows)
 {
 return (rows >= frame_min_height (frame)
 	  && cols >= MIN_SAFE_WINDOW_WIDTH);
 }
 minimal allowed values. WIDTH and HEIGHT are in pixels */
 int
 frame_pixsize_valid_p (struct frame *frame, int width, int height)
 {
 int rows, cols;
-pixel_to_real_char_size (frame, width, height, &cols, &rows);
+pixel_to_char_size (frame, width, height, &cols, &rows);
-return frame_size_valid_p (frame, rows, cols);
+return frame_size_valid_p (frame, cols, rows);
 }
 /* If *ROWS or *COLS are too small a size for FRAME, set them to the
 minimum allowable size.  */
 void
-check_frame_size (struct frame *frame, int *rows, int *cols)
+check_frame_size (struct frame *frame, int *cols, int *rows)
 {
 int min_height = frame_min_height (frame);
+int min_pixwidth, min_pixheight;
-if (*rows < min_height)
+int min_geomwidth, min_geomheight;
-*rows = min_height;
-if (*cols  < MIN_SAFE_WINDOW_WIDTH)
+/* There is no char_to_frame_unit_size().  This can be done with
-*cols = MIN_SAFE_WINDOW_WIDTH;
+frame_conversion_internal(), but that's currently static, and we can
+do it fine with two steps, as follows. */
+char_to_pixel_size (frame, MIN_SAFE_WINDOW_WIDTH, min_height,
+		      &min_pixwidth, &min_pixheight);
+pixel_to_frame_unit_size (frame, min_pixwidth, min_pixheight,
+			   &min_geomwidth, &min_geomheight);
+if (*rows < min_geomheight)
+*rows = min_geomheight;
+if (*cols  < min_geomwidth)
+*cols = min_geomwidth;
 }
 /* Normally the window is deleted if it gets too small.
 nodelete nonzero means do not do this.
 (The caller should check later and do so if appropriate)  */
 Lisp_Object child, minor_kid, major_kid;
 int minsize;
 int line_size;
 int defheight, defwidth;
-default_face_height_and_width (window, &defheight, &defwidth);
+default_face_width_and_height (window, &defwidth, &defheight);
 line_size = (set_height ? defheight : defwidth);
 check_min_window_sizes ();
 minsize = (set_height ? window_min_height : window_min_width);
 avail_height = (pixel_height -
 		  (include_gutters_p ? 0 :
 		   window_top_window_gutter_height (w) +
 		   window_bottom_window_gutter_height (w)));
-default_face_height_and_width (window, &defheight, &defwidth);
+default_face_width_and_height (window, &defwidth, &defheight);
 if (defheight)
 char_height = avail_height / defheight;
 /* It's the calling function's responsibility to check these values
 int pixel_height;
 Lisp_Object window = wrap_window (w);
-default_face_height_and_width (window, &defheight, &defwidth);
+default_face_width_and_height (window, &defwidth, &defheight);
 avail_height = char_height * defheight;
 pixel_height = (avail_height +
 		  (include_gutters_p ? 0 :
 		   window_top_window_gutter_height (w) +
 		return num_lines - 1;
 	      ypos1 = dl->ypos + dl->descent - dl->clip;
 	    }
 	}
-default_face_height_and_width (window, &defheight, &defwidth);
+default_face_width_and_height (window, &defwidth, &defheight);
 /* #### This probably needs to know about the clipping area once a
 final definition is decided on. */
 if (defheight)
 num_lines += ((ypos2 - ypos1) / defheight);
 }
 		 window_left_gutter_width (w, 0) -
 		 window_right_gutter_width (w, 0) -
 		 (include_margins_p ? 0 : window_left_margin_width (w)) -
 		 (include_margins_p ? 0 : window_right_margin_width (w)));
-default_face_height_and_width (window, &defheight, &defwidth);
+default_face_width_and_height (window, &defwidth, &defheight);
 if (defwidth)
 char_width = (avail_width / defwidth);
 /* It's the calling function's responsibility to check these values
 int pixel_width;
 int defheight, defwidth;
 Lisp_Object window = wrap_window (w);
-default_face_height_and_width (window, &defheight, &defwidth);
+default_face_width_and_height (window, &defwidth, &defheight);
 avail_width = char_width * defwidth;
 pixel_width = (avail_width +
 		 window_left_window_gutter_width (w, 0) +
 		 window_right_window_gutter_width (w, 0) +
 window = wrap_window (win);
 f = XFRAME (win->frame);
 if (EQ (window, FRAME_ROOT_WINDOW (f)))
 invalid_operation ("Won't change only window", Qunbound);
-default_face_height_and_width (window, &defheight, &defwidth);
+default_face_width_and_height (window, &defwidth, &defheight);
 while (1)
 {
 w = XWINDOW (window);
 parent = w->parent;
 dla = window_display_lines (w, CURRENT_DISP);
 if (INTP (Vwindow_pixel_scroll_increment))
 fheight = XINT (Vwindow_pixel_scroll_increment);
 else if (!NILP (Vwindow_pixel_scroll_increment))
-default_face_height_and_width (window, &fheight, &fwidth);
+default_face_width_and_height (window, &fwidth, &fheight);
 if (Dynarr_length (dla) >= 1)
 modeline = Dynarr_begin (dla)->modeline;
 dl = Dynarr_atp (dla, modeline);

Mercurial > hg > xemacs-beta

comparison src/window.c @ 5126:2a462149bd6a ben-lisp-object