xemacs-beta: src/window.c comparison

comparison src/window.c @ 424:11054d720c21 r21-2-20

Import from CVS: tag r21-2-20

author	cvs
date	Mon, 13 Aug 2007 11:26:11 +0200
parents	95016f13131a
children

comparison

equal deleted inserted replaced

-:28d9c139be4c
+:11054d720c21
 #include "elhash.h"
 #include "commands.h"
 #include "gutter.h"
 Lisp_Object Qwindowp, Qwindow_live_p, Qwindow_configurationp;
-Lisp_Object Qscroll_up, Qscroll_down, Qdisplay_buffer;
+Lisp_Object Qdisplay_buffer;
 #ifdef MEMORY_USAGE_STATS
 Lisp_Object Qface_cache, Qglyph_cache, Qline_start_cache, Qother_redisplay;
 #ifdef HAVE_SCROLLBARS
 Lisp_Object Qscrollbar_instances;
 Lisp_Object Vvertical_divider_line_width;
 /* Spacing between outer egde of divider border and window edge */
 Lisp_Object Vvertical_divider_spacing;
+/* How much to scroll by per-line. */
+Lisp_Object Vwindow_pixel_scroll_increment;
 /* Scroll if point lands on the bottom line and that line is partially
 clipped. */
 int scroll_on_clipped_lines;
 /* The minibuffer window of the selected frame.
 /* Number of lines of continuity in scrolling by screenfuls.  */
 int next_screen_context_lines;
 /* List of freed window configurations with 1 - 10 windows. */
-Lisp_Object Vwindow_configuration_free_list[10];
+static Lisp_Object Vwindow_configuration_free_list[10];
 #define SET_LAST_MODIFIED(w, cache_too)		\
 do {						\
 (w)->last_modified[CURRENT_DISP] = Qzero;	\
 (w)->last_modified[DESIRED_DISP] = Qzero;	\
 (w)->last_facechange[CMOTION_DISP] = Qzero;	\
 } while (0)
 #define MARK_DISP_VARIABLE(field)		\
-markobj (window->field[CURRENT_DISP]);	\
+mark_object (window->field[CURRENT_DISP]);	\
-markobj (window->field[DESIRED_DISP]);	\
+mark_object (window->field[DESIRED_DISP]);	\
-markobj (window->field[CMOTION_DISP]);
+mark_object (window->field[CMOTION_DISP]);
 static Lisp_Object
-mark_window (Lisp_Object obj, void (*markobj) (Lisp_Object))
+mark_window (Lisp_Object obj)
 {
 struct window *window = XWINDOW (obj);
-markobj (window->frame);
+mark_object (window->frame);
-markobj (window->mini_p);
+mark_object (window->mini_p);
-markobj (window->next);
+mark_object (window->next);
-markobj (window->prev);
+mark_object (window->prev);
-markobj (window->hchild);
+mark_object (window->hchild);
-markobj (window->vchild);
+mark_object (window->vchild);
-markobj (window->parent);
+mark_object (window->parent);
-markobj (window->buffer);
+mark_object (window->buffer);
 MARK_DISP_VARIABLE (start);
 MARK_DISP_VARIABLE (pointm);
-markobj (window->sb_point);	/* #### move to scrollbar.c? */
+mark_object (window->sb_point);	/* #### move to scrollbar.c? */
-markobj (window->use_time);
+mark_object (window->use_time);
 MARK_DISP_VARIABLE (last_modified);
 MARK_DISP_VARIABLE (last_point);
 MARK_DISP_VARIABLE (last_start);
 MARK_DISP_VARIABLE (last_facechange);
-markobj (window->line_cache_last_updated);
+mark_object (window->line_cache_last_updated);
-markobj (window->redisplay_end_trigger);
+mark_object (window->redisplay_end_trigger);
-markobj (window->subwindow_instance_cache);
+mark_object (window->subwindow_instance_cache);
-mark_face_cachels (window->face_cachels, markobj);
+mark_face_cachels (window->face_cachels);
-mark_glyph_cachels (window->glyph_cachels, markobj);
+mark_glyph_cachels (window->glyph_cachels);
-#define WINDOW_SLOT(slot, compare) ((void) (markobj (window->slot)))
+#define WINDOW_SLOT(slot, compare) mark_object (window->slot)
 #include "winslots.h"
 return Qnil;
 }
 #endif
 int
 window_truncation_on (struct window *w)
 {
+/* Minibuffer windows are never truncated.
+### is this the right way ? */
+if (MINI_WINDOW_P (w))
+return 0;
 /* Horizontally scrolled windows are truncated. */
 if (w->hscroll)
 return 1;
 /* If truncate_partial_width_windows is true and the window is not
 if (!NILP (XBUFFER (w->buffer)->truncate_lines))
 return 1;
 return 0;
 }
+DEFUN ("window-truncated-p", Fwindow_truncated_p, 0, 1, 0, /*
+Returns Non-Nil iff the window is truncated.
+*/
+(window))
+{
+struct window *w = decode_window (window);
+return window_truncation_on (w) ? Qt : Qnil;
+}
 static int
 have_undivided_common_edge (struct window *w_right, void *closure)
 {
 struct window *w_left = (struct window *) closure;
 return Qnil; /* happens at startup */
 {
 struct frame *f = decode_frame_or_selected (con_dev_or_frame);
 return FRAME_SELECTED_WINDOW (f);
+}
+}
+DEFUN ("last-nonminibuf-window", Flast_nonminibuf_window, 0, 1, 0, /*
+Return the last selected window that is not a minibuffer window.
+If the optional argument CON-DEV-OR-FRAME is specified and is a frame,
+return the last non-minibuffer window used by that frame.  If
+CON-DEV-OR-FRAME is a device, then the selected frame on that device
+will be used.  If CON-DEV-OR-FRAME is a console, the selected frame on
+that console's selected device will be used.  Otherwise, the selected
+frame is used.
+*/
+(con_dev_or_frame))
+{
+if (NILP (con_dev_or_frame) && NILP (Fselected_device (Qnil)))
+return Qnil; /* happens at startup */
+{
+struct frame *f = decode_frame_or_selected (con_dev_or_frame);
+return FRAME_LAST_NONMINIBUF_WINDOW (f);
 }
 }
 DEFUN ("minibuffer-window", Fminibuffer_window, 0, 1, 0, /*
 Return the window used now for minibuffers.
 #undef CURCHARSIZE
 #undef MINCHARSIZE
-/* Scroll contents of window WINDOW up N lines.  */
+/* Scroll contents of window WINDOW up N lines. If N < (top line height /
+average line height) then we just adjust the top clip.  */
 void
 window_scroll (Lisp_Object window, Lisp_Object n, int direction,
 	       Error_behavior errb)
 {
 struct window *w = XWINDOW (window);
 struct buffer *b = XBUFFER (w->buffer);
 int selected = EQ (window, Fselected_window (Qnil));
 int value = 0;
 Lisp_Object point, tem;
+display_line_dynarr *dla;
+int fheight, fwidth, modeline = 0;
+struct display_line* dl;
 if (selected)
 point = make_int (BUF_PT (b));
 else
 {
 {
 Fvertical_motion (make_int (-window_char_height (w, 0) / 2),
 window, Qnil);
 Fset_marker (w->start[CURRENT_DISP], point, w->buffer);
 w->start_at_line_beg = beginning_of_line_p (b, XINT (point));
+WINDOW_TEXT_TOP_CLIP (w) = 0;
 MARK_WINDOWS_CHANGED (w);
 }
 if (!NILP (n))
 {
 if (direction == 1 && !value)
 {
 return;
 }
-else if (value > 0)
-{
+/* Determine parameters to test for partial line scrolling with. */
-int vtarget;
+dla = window_display_lines (w, CURRENT_DISP);
-Bufpos startp, old_start;
+if (INTP (Vwindow_pixel_scroll_increment))
-old_start = marker_position (w->start[CURRENT_DISP]);
+fheight = XINT (Vwindow_pixel_scroll_increment);
-startp = vmotion (w, old_start, value, &vtarget);
+else if (!NILP (Vwindow_pixel_scroll_increment));
+default_face_height_and_width (window, &fheight, &fwidth);
-if (vtarget < value &&
-	  (w->window_end_pos[CURRENT_DISP] == -1
+if (Dynarr_length (dla) >= 1)
-	   || (BUF_Z (b) - w->window_end_pos[CURRENT_DISP] > BUF_ZV (b))))
+modeline = Dynarr_atp (dla, 0)->modeline;
+dl = Dynarr_atp (dla, modeline);
+if (value > 0)
+{
+/* Go for partial display line scrolling. This just means bumping
+	 the clip by a reasonable amount and redisplaying, everything else
+	 remains unchanged. */
+if (!NILP (Vwindow_pixel_scroll_increment)
+	  &&
+	  Dynarr_length (dla) >= (1 + modeline)
+	  &&
+	  (dl->ascent - dl->top_clip) - fheight * value > 0)
 	{
-	  maybe_signal_error (Qend_of_buffer, Qnil, Qwindow, errb);
+	  WINDOW_TEXT_TOP_CLIP (w) += value * fheight;
-	  return;
+	  MARK_WINDOWS_CHANGED (w);
 	}
 else
 	{
-	  set_marker_restricted (w->start[CURRENT_DISP], make_int (startp),
+	  int vtarget;
-				 w->buffer);
+	  Bufpos startp, old_start;
-	  w->force_start = 1;
-	  w->start_at_line_beg = beginning_of_line_p (b, startp);
+	  if (WINDOW_TEXT_TOP_CLIP (w))
-	  MARK_WINDOWS_CHANGED (w);
-	  if (!point_would_be_visible (w, startp, XINT (point)))
 	    {
-	      if (selected)
+	      WINDOW_TEXT_TOP_CLIP (w) = 0;
-		BUF_SET_PT (b, startp);
+	      MARK_WINDOWS_CHANGED (w);
-	      else
+	    }
-		set_marker_restricted (w->pointm[CURRENT_DISP],
-				       make_int (startp),
+	  old_start = marker_position (w->start[CURRENT_DISP]);
-				       w->buffer);
+	  startp = vmotion (w, old_start, value, &vtarget);
+	  if (vtarget < value &&
+	      (w->window_end_pos[CURRENT_DISP] == -1
+	       || (BUF_Z (b) - w->window_end_pos[CURRENT_DISP] > BUF_ZV (b))))
+	    {
+	      maybe_signal_error (Qend_of_buffer, Qnil, Qwindow, errb);
+	      return;
+	    }
+	  else
+	    {
+	      set_marker_restricted (w->start[CURRENT_DISP], make_int (startp),
+				     w->buffer);
+	      w->force_start = 1;
+	      w->start_at_line_beg = beginning_of_line_p (b, startp);
+	      MARK_WINDOWS_CHANGED (w);
+	      if (!point_would_be_visible (w, startp, XINT (point)))
+		{
+		  if (selected)
+		    BUF_SET_PT (b, startp);
+		  else
+		    set_marker_restricted (w->pointm[CURRENT_DISP],
+					   make_int (startp),
+					   w->buffer);
+		}
 	    }
 	}
 }
 else if (value < 0)
 {
-int vtarget;
+/* Go for partial display line scrolling. This just means bumping
-Bufpos startp, old_start;
+	 the clip by a reasonable amount and redisplaying, everything else
+	 remains unchanged. */
-old_start = marker_position (w->start[CURRENT_DISP]);
+if (!NILP (Vwindow_pixel_scroll_increment)
-startp = vmotion (w, old_start, value, &vtarget);
+	  &&
+	  Dynarr_length (dla) >= (1 + modeline)
-if (vtarget > value
+	  &&
-	  && marker_position (w->start[CURRENT_DISP]) == BUF_BEGV (b))
+	  (dl->ascent - dl->top_clip) - fheight * value <
+	  (dl->ascent + dl->descent - dl->clip)
+	  &&
+	  WINDOW_TEXT_TOP_CLIP (w) + value * fheight > 0)
 	{
-	  maybe_signal_error (Qbeginning_of_buffer, Qnil, Qwindow, errb);
+	  WINDOW_TEXT_TOP_CLIP (w) += value * fheight;
-	  return;
+	  MARK_WINDOWS_CHANGED (w);
 	}
 else
 	{
-	  set_marker_restricted (w->start[CURRENT_DISP], make_int (startp),
+	  int vtarget;
-				 w->buffer);
+	  Bufpos startp, old_start;
-	  w->force_start = 1;
-	  w->start_at_line_beg = beginning_of_line_p (b, startp);
+	  if (WINDOW_TEXT_TOP_CLIP (w))
-	  MARK_WINDOWS_CHANGED (w);
-	  if (!point_would_be_visible (w, startp, XINT (point)))
 	    {
-	      Bufpos new_point;
+	      WINDOW_TEXT_TOP_CLIP (w) = 0;
+	      MARK_WINDOWS_CHANGED (w);
-	      if (MINI_WINDOW_P (w))
+	    }
-		new_point = startp;
-	      else
+	  old_start = marker_position (w->start[CURRENT_DISP]);
-		new_point = start_of_last_line (w, startp);
+	  startp = vmotion (w, old_start, value, &vtarget);
-	      if (selected)
+	  if (vtarget > value
-		BUF_SET_PT (b, new_point);
+	      && marker_position (w->start[CURRENT_DISP]) == BUF_BEGV (b))
-	      else
+	    {
-		set_marker_restricted (w->pointm[CURRENT_DISP],
+	      maybe_signal_error (Qbeginning_of_buffer, Qnil, Qwindow, errb);
-				       make_int (new_point),
+	      return;
-				       w->buffer);
+	    }
+	  else
+	    {
+	      set_marker_restricted (w->start[CURRENT_DISP], make_int (startp),
+				     w->buffer);
+	      w->force_start = 1;
+	      w->start_at_line_beg = beginning_of_line_p (b, startp);
+	      MARK_WINDOWS_CHANGED (w);
+	      if (!point_would_be_visible (w, startp, XINT (point)))
+		{
+		  Bufpos new_point;
+		  if (MINI_WINDOW_P (w))
+		    new_point = startp;
+		  else
+		    new_point = start_of_last_line (w, startp);
+		  if (selected)
+		    BUF_SET_PT (b, new_point);
+		  else
+		    set_marker_restricted (w->pointm[CURRENT_DISP],
+					   make_int (new_point),
+					   w->buffer);
+		}
 	    }
 	}
 }
 else	/* value == 0 && direction == -1 */
 {
+if (WINDOW_TEXT_TOP_CLIP (w))
+	{
+	  WINDOW_TEXT_TOP_CLIP (w) = 0;
+	  MARK_WINDOWS_CHANGED (w);
+	}
 if (marker_position (w->start[CURRENT_DISP]) == BUF_BEGV (b))
 	{
 	  maybe_signal_error (Qbeginning_of_buffer, Qnil, Qwindow, errb);
 	  return;
 	}
 				       make_int (new_point),
 				       w->buffer);
 	    }
 	}
 }
 }
 DEFUN ("scroll-up", Fscroll_up, 0, 1, "_P", /*
 Scroll text of current window upward N lines; or near full screen if no arg.
 A near full screen is `next-screen-context-lines' less than a full screen.
 #define WINDOW_CONFIGURATIONP(x) RECORDP (x, window_configuration)
 #define GC_WINDOW_CONFIGURATIONP(x) GC_RECORDP (x, window_configuration)
 #define CHECK_WINDOW_CONFIGURATION(x) CHECK_RECORD (x, window_configuration)
 static Lisp_Object
-mark_window_config (Lisp_Object obj, void (*markobj) (Lisp_Object))
+mark_window_config (Lisp_Object obj)
 {
 struct window_config *config = XWINDOW_CONFIGURATION (obj);
 int i;
-markobj (config->current_window);
+mark_object (config->current_window);
-markobj (config->current_buffer);
+mark_object (config->current_buffer);
-markobj (config->minibuffer_scroll_window);
+mark_object (config->minibuffer_scroll_window);
-markobj (config->root_window);
+mark_object (config->root_window);
 for (i = 0; i < config->saved_windows_count; i++)
 {
 struct saved_window *s = SAVED_WINDOW_N (config, i);
-markobj (s->window);
+mark_object (s->window);
-markobj (s->buffer);
+mark_object (s->buffer);
-markobj (s->start);
+mark_object (s->start);
-markobj (s->pointm);
+mark_object (s->pointm);
-markobj (s->sb_point);
+mark_object (s->sb_point);
-markobj (s->mark);
+mark_object (s->mark);
 #if 0
 /* #### This looked like this. I do not see why specifier cached
 	 values should not be marked, as such specifiers as toolbars
 	 might have GC-able instances. Freed configs are not marked,
 	 aren't they?  -- kkm */
-markobj (s->dedicated);
+mark_object (s->dedicated);
 #else
-#define WINDOW_SLOT(slot, compare) ((void) (markobj (s->slot)))
+#define WINDOW_SLOT(slot, compare) mark_object (s->slot)
 #include "winslots.h"
 #endif
 }
 return Qnil;
 }
 	  w->line_cache_last_updated = Qzero;
 	  SET_LAST_MODIFIED (w, 1);
 	  SET_LAST_FACECHANGE (w);
 	  w->config_mark = 0;
-#define WINDOW_SLOT(slot, compare) w->slot = p->slot;
+#define WINDOW_SLOT(slot, compare) w->slot = p->slot
 #include "winslots.h"
 	  /* Reinstall the saved buffer and pointers into it.  */
 	  if (NILP (p->buffer))
 	    w->buffer = p->buffer;
 WINDOW_WIDTH (p) = WINDOW_WIDTH (w);
 WINDOW_HEIGHT (p) = WINDOW_HEIGHT (w);
 p->hscroll = w->hscroll;
 p->modeline_hscroll = w->modeline_hscroll;
-#define WINDOW_SLOT(slot, compare) p->slot = w->slot;
+#define WINDOW_SLOT(slot, compare) p->slot = w->slot
 #include "winslots.h"
 if (!NILP (w->buffer))
 	{
 	  /* Save w's value of point in the window configuration.
 			 Fcurrent_window_configuration (Qnil));
 val = Fprogn (args);
 return unbind_to (speccount, val);
 }
+DEFUN ("current-pixel-column", Fcurrent_pixel_column, 0, 2, 0, /*
+Return the horizontal pixel position of POS in window.
+Beginning of line is column 0. This is calculated using the redisplay
+display tables.  If WINDOW is nil, the current window is assumed.
+If POS is nil, point is assumed. Note that POS must be visible for
+a non-nil result to be returned.
+*/
+(window, pos))
+{
+struct window* w = decode_window (window);
+display_line_dynarr *dla = window_display_lines (w, CURRENT_DISP);
+struct display_line *dl = 0;
+struct display_block *db = 0;
+struct rune* rb = 0;
+int y = w->last_point_y[CURRENT_DISP];
+int x = w->last_point_x[CURRENT_DISP];
+if (MINI_WINDOW_P (w))
+return Qnil;
+if (y<0 || x<0 || y >= Dynarr_length (dla) || !NILP (pos))
+{
+int first_line, i;
+Bufpos point;
+if (NILP (pos))
+	pos = Fwindow_point (window);
+CHECK_INT (pos);
+point = XINT (pos);
+if (Dynarr_length (dla) && Dynarr_atp (dla, 0)->modeline)
+	first_line = 1;
+else
+	first_line = 0;
+for (i = first_line; i < Dynarr_length (dla); i++)
+	{
+	  dl = Dynarr_atp (dla, i);
+	  /* find the vertical location first */
+	  if (point >= dl->bufpos && point <= dl->end_bufpos)
+	    {
+	      db = get_display_block_from_line (dl, TEXT);
+	      for (i = 0; i < Dynarr_length (db->runes); i++)
+		{
+		  rb = Dynarr_atp (db->runes, i);
+		  if (point <= rb->bufpos)
+		    goto found_bufpos;
+		}
+	      return Qnil;
+	    }
+	}
+return Qnil;
+found_bufpos:
+;
+}
+else
+{
+/* optimised case */
+dl = Dynarr_atp (dla, y);
+db = get_display_block_from_line (dl, TEXT);
+if (x >= Dynarr_length (db->runes))
+	return Qnil;
+rb = Dynarr_atp (db->runes, x);
+}
+return make_int (rb->xpos - WINDOW_LEFT (w));
+}
 #ifdef DEBUG_XEMACS
 /* This is short and simple in elisp, but... it was written to debug
 problems purely on the C side.  That is where we need to call it so
 here it is. */
 syms_of_window (void)
 {
 defsymbol (&Qwindowp, "windowp");
 defsymbol (&Qwindow_live_p, "window-live-p");
 defsymbol (&Qwindow_configurationp, "window-configuration-p");
-defsymbol (&Qscroll_up, "scroll-up");
-defsymbol (&Qscroll_down, "scroll-down");
 defsymbol (&Qtemp_buffer_show_hook, "temp-buffer-show-hook");
 defsymbol (&Qdisplay_buffer, "display-buffer");
 #ifdef MEMORY_USAGE_STATS
 defsymbol (&Qface_cache, "face-cache");
 defsymbol (&Qother_redisplay, "other-redisplay");
 /* Qother in general.c */
 #endif
 DEFSUBR (Fselected_window);
+DEFSUBR (Flast_nonminibuf_window);
 DEFSUBR (Fminibuffer_window);
 DEFSUBR (Fwindow_minibuffer_p);
 DEFSUBR (Fwindowp);
 DEFSUBR (Fwindow_live_p);
 DEFSUBR (Fwindow_first_hchild);
 DEFSUBR (Fwindow_first_vchild);
 DEFSUBR (Fwindow_next_child);
 DEFSUBR (Fwindow_previous_child);
 DEFSUBR (Fwindow_parent);
 DEFSUBR (Fwindow_lowest_p);
+DEFSUBR (Fwindow_truncated_p);
 DEFSUBR (Fwindow_highest_p);
 DEFSUBR (Fwindow_leftmost_p);
 DEFSUBR (Fwindow_rightmost_p);
 DEFSUBR (Fpos_visible_in_window_p);
 DEFSUBR (Fwindow_buffer);
 #endif
 DEFSUBR (Fwindow_configuration_p);
 DEFSUBR (Fset_window_configuration);
 DEFSUBR (Fcurrent_window_configuration);
 DEFSUBR (Fsave_window_excursion);
+DEFSUBR (Fcurrent_pixel_column);
+}
+void
+reinit_vars_of_window (void)
+{
+int i;
+/* Make sure all windows get marked */
+minibuf_window = Qnil;
+staticpro_nodump (&minibuf_window);
+for (i = 0; i < countof (Vwindow_configuration_free_list); i++)
+{
+Vwindow_configuration_free_list[i] =
+	make_lcrecord_list (sizeof_window_config_for_n_windows (i + 1),
+			    &lrecord_window_configuration);
+staticpro_nodump (&Vwindow_configuration_free_list[i]);
+}
 }
 void
 vars_of_window (void)
 {
-/* Make sure all windows get marked */
+reinit_vars_of_window ();
-minibuf_window = Qnil;
-staticpro (&minibuf_window);
 DEFVAR_BOOL ("scroll-on-clipped-lines", &scroll_on_clipped_lines /*
 *Non-nil means to scroll if point lands on a line which is clipped.
 */ );
 scroll_on_clipped_lines = 1;
 DEFVAR_LISP ("other-window-scroll-buffer", &Vother_window_scroll_buffer /*
 If non-nil, this is a buffer and \\[scroll-other-window] should scroll its window.
 */ );
 Vother_window_scroll_buffer = Qnil;
+DEFVAR_LISP ("window-pixel-scroll-increment", &Vwindow_pixel_scroll_increment /*
+*Number of pixels to scroll by per requested line.
+If nil then normal line scrolling occurs regardless of line height.
+If t then scrolling is done in increments equal to the height of the default face.
+*/ );
+Vwindow_pixel_scroll_increment = Qt;
 DEFVAR_INT ("next-screen-context-lines", &next_screen_context_lines /*
 *Number of lines of continuity when scrolling by screenfuls.
 */ );
 next_screen_context_lines = 2;
 DEFVAR_INT ("window-min-width", &window_min_width /*
 *Delete any window less than this wide.
 */ );
 window_min_width = 10;
-{
-int i;
-for (i = 0; i < countof (Vwindow_configuration_free_list); i++)
-{
-	Vwindow_configuration_free_list[i] =
-	  make_lcrecord_list (sizeof_window_config_for_n_windows (i + 1),
-			      &lrecord_window_configuration);
-	staticpro (&Vwindow_configuration_free_list[i]);
-}
-}
 }
 void
 specifier_vars_of_window (void)
 {

Mercurial > hg > xemacs-beta

comparison src/window.c @ 424:11054d720c21 r21-2-20