xemacs-beta: src/window.c comparison

comparison src/window.c @ 2289:7fa4bc78a35d

[xemacs-hg @ 2004-09-21 02:59:59 by james] Darryl Okahata's patch to add current-pixel-row.

author	james
date	Tue, 21 Sep 2004 03:00:27 +0000
parents	04bc9d2f42c7
children	21f73f4563a7

comparison

equal deleted inserted replaced

-:63d767a4650c
+:7fa4bc78a35d
 record_unwind_protect (save_window_excursion_unwind,
 			 call1 (Qcurrent_window_configuration, Qnil));
 return unbind_to_1 (speccount, Fprogn (args));
 }
-DEFUN ("current-pixel-column", Fcurrent_pixel_column, 0, 2, 0, /*
+static int
-Return the horizontal pixel position of POS in window.
+get_current_pixel_pos (Lisp_Object window, Lisp_Object pos,
-Beginning of line is column 0. This is calculated using the redisplay
+		       struct window **w,
-display tables.  If WINDOW is nil, the current window is assumed.
+		       struct rune **rb, struct display_line **dl)
-If POS is nil, point is assumed. Note that POS must be visible for
+{
-a non-nil result to be returned.
+display_line_dynarr *dla;
-*/
+struct display_block *db = NULL;
-(window, pos))
+int x, y;
-{
-struct window* w = decode_window (window);
+*rb = NULL;
-display_line_dynarr *dla = window_display_lines (w, CURRENT_DISP);
+*dl = NULL;
+*w = decode_window (window);
-struct display_line *dl = 0;
+dla = window_display_lines (*w, CURRENT_DISP);
-struct display_block *db = 0;
+x = (*w)->last_point_x[CURRENT_DISP];
-struct rune* rb = 0;
+y = (*w)->last_point_y[CURRENT_DISP];
-int y = w->last_point_y[CURRENT_DISP];
+if (MINI_WINDOW_P (*w))
-int x = w->last_point_x[CURRENT_DISP];
+return 0;
-if (MINI_WINDOW_P (w))
-return Qnil;
 if (y<0 || x<0 || y >= Dynarr_length (dla) || !NILP (pos))
 {
 int first_line, i;
 Charbpos point;
 else
 	first_line = 0;
 for (i = first_line; i < Dynarr_length (dla); i++)
 	{
-	  dl = Dynarr_atp (dla, i);
+	  *dl = Dynarr_atp (dla, i);
 	  /* find the vertical location first */
-	  if (point >= dl->charpos && point <= dl->end_charpos)
+	  if (point >= (*dl)->charpos && point <= (*dl)->end_charpos)
 	    {
-	      db = get_display_block_from_line (dl, TEXT);
+	      db = get_display_block_from_line (*dl, TEXT);
 	      for (i = 0; i < Dynarr_length (db->runes); i++)
 		{
-		  rb = Dynarr_atp (db->runes, i);
+		  *rb = Dynarr_atp (db->runes, i);
-		  if (point <= rb->charpos)
+		  if (point <= *rb->charpos)
 		    goto found_charpos;
 		}
-	      return Qnil;
+	      return 0;
 	    }
 	}
-return Qnil;
+return 0;
 found_charpos:
 ;
 }
 else
 {
 /* optimized case */
-dl = Dynarr_atp (dla, y);
+*dl = Dynarr_atp (dla, y);
-db = get_display_block_from_line (dl, TEXT);
+db = get_display_block_from_line (*dl, TEXT);
 if (x >= Dynarr_length (db->runes))
-	return Qnil;
+	return 0;
-rb = Dynarr_atp (db->runes, x);
+*rb = Dynarr_atp (db->runes, x);
 }
+return 1;
+}
+DEFUN ("current-pixel-column", Fcurrent_pixel_column, 0, 2, 0, /*
+Return the horizontal pixel position of point POS in window.
+Beginning of line is column 0.  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.  This is calculated using
+the redisplay display tables; because of this, the returned value will
+only be correct if the redisplay tables are up-to-date.  Use
+\"(sit-for 0)\" to insure that they are; however, if WINDOW is part of
+a new frame, use the following instead:
+(while (not (frame-visible-p frame)) (sleep-for .5))
+*/
+(window, pos))
+{
+struct window* w;
+struct display_line *dl;
+struct rune* rb;
+if (!get_current_pixel_pos(window, pos, &w, &rb, &dl))
+return Qnil;
 return make_int (rb->xpos - WINDOW_LEFT (w));
+}
+DEFUN ("current-pixel-row", Fcurrent_pixel_row, 0, 2, 0, /*
+Return the vertical pixel position of point POS in window.  Top of
+window is row 0.  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.  This is calculated using the redisplay
+display tables; because of this, the returned value will only be
+correct if the redisplay tables are up-to-date.  Use \"(sit-for 0)\"
+to insure that they are; however, if WINDOW is part of a new frame,
+use the following instead:
+(while (not (frame-visible-p frame)) (sleep-for .5))
+*/
+(window, pos))
+{
+struct window* w;
+struct display_line *dl;
+struct rune* rb;
+if (!get_current_pixel_pos(window, pos, &w, &rb, &dl))
+return Qnil;
+return make_int (dl->ypos - dl->ascent - WINDOW_TOP (w));
 }
 #ifdef DEBUG_XEMACS
 /* This is short and simple in elisp, but... it was written to debug
 #ifdef MEMORY_USAGE_STATS
 DEFSUBR (Fwindow_memory_usage);
 #endif
 DEFSUBR (Fsave_window_excursion);
 DEFSUBR (Fcurrent_pixel_column);
+DEFSUBR (Fcurrent_pixel_row);
 }
 void
 reinit_vars_of_window (void)
 {

Mercurial > hg > xemacs-beta

comparison src/window.c @ 2289:7fa4bc78a35d