Mercurial > hg > xemacs-beta

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

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Import from CVS: tag r20-5b30
author cvs
date Mon, 13 Aug 2007 10:24:41 +0200
parents 41ff10fd062f
children 8efd647ea9ca
comparison
equal deleted inserted replaced
262:9d8607af9e13 263:727739f917cb
742 742
743 display_line_dynarr *cla = window_display_lines (w, CURRENT_DISP); 743 display_line_dynarr *cla = window_display_lines (w, CURRENT_DISP);
744 struct display_line *dl; 744 struct display_line *dl;
745 struct display_block *db; 745 struct display_block *db;
746 struct rune *rb; 746 struct rune *rb;
747
748 int x = w->last_point_x[CURRENT_DISP]; 747 int x = w->last_point_x[CURRENT_DISP];
749 int y = w->last_point_y[CURRENT_DISP]; 748 int y = w->last_point_y[CURRENT_DISP];
749
750 extern int cursor_in_echo_area;
751
752 /*
753 * Bail if cursor_in_echo_area is non-zero and we're fiddling
754 * with the cursor in a minibuffer window, since that is a
755 * special case that is handled elsewhere and this function
756 * need not handle it. Return 1 so the caller will assume we
757 * succeeded.
758 */
759 if (cursor_in_echo_area && MINI_WINDOW_P (w))
760 return 1;
750 761
751 if (y < 0 || y >= Dynarr_length (cla)) 762 if (y < 0 || y >= Dynarr_length (cla))
752 return 0; 763 return 0;
753 764
754 dl = Dynarr_atp (cla, y); 765 dl = Dynarr_atp (cla, y);
956 ****************************************************************************/ 967 ****************************************************************************/
957 void 968 void
958 redisplay_redraw_cursor (struct frame *f, int run_end_begin_meths) 969 redisplay_redraw_cursor (struct frame *f, int run_end_begin_meths)
959 { 970 {
960 struct window *w = XWINDOW (FRAME_SELECTED_WINDOW (f)); 971 struct window *w = XWINDOW (FRAME_SELECTED_WINDOW (f));
961 972 extern int cursor_in_echo_area;
973
974 if (cursor_in_echo_area)
975 if (FRAME_HAS_MINIBUF_P (f))
976 {
977 w = XWINDOW (FRAME_MINIBUF_WINDOW (f));
978 }
979 else
980 return;
962 redraw_cursor_in_window (w, run_end_begin_meths); 981 redraw_cursor_in_window (w, run_end_begin_meths);
963 } 982 }
964 983
965 /***************************************************************************** 984 /*****************************************************************************
966 redisplay_clear_top_of_window 985 redisplay_clear_top_of_window