diff options
| author | Dmitry Antipov <dmantipov@yandex.ru> | 2013-08-28 09:45:38 +0400 |
|---|---|---|
| committer | Dmitry Antipov <dmantipov@yandex.ru> | 2013-08-28 09:45:38 +0400 |
| commit | f60e429a1a1a0d6a51761ef12e54dde52967f085 (patch) | |
| tree | 83be6ff103b71cb7b59fa171b631437f0c6720c7 /src/nsterm.m | |
| parent | 0acfedd3496a4a375c27215d13bf63466fdb1071 (diff) | |
| download | emacs-f60e429a1a1a0d6a51761ef12e54dde52967f085.tar.gz | |
Redesign redisplay interface to drop global output_cursor.
* dispextern.h (struct redisplay_interface): Remove cursor_to member.
(toplevel): Remove declaration of output_cursor.
(set_output_cursor, x_cursor_to): Remove prototype.
* window.h (struct window): New member output_cursor.
(output_cursor_to): New function to replace RIF member.
* dispnew.c (redraw_overlapped_rows, update_marginal_area)
(update_text_area, set_window_cursor_after_update): Use it.
* xdisp.c (output_cursor, set_output_cursor, x_cursor_to): Remove.
(x_write_glyphs, x_insert_glyphs, x_clear_end_of_line):
* nsterm.m (ns_update_window_begin, ns_update_window_end):
* w32term.c (x_update_window_begin, x_update_window_end):
* xterm.c (x_update_window_begin, x_update_window_end):
Adjust to use per-window output cursor.
Diffstat (limited to 'src/nsterm.m')
| -rw-r--r-- | src/nsterm.m | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/src/nsterm.m b/src/nsterm.m index 01ee2319ddf..921c3a5ce05 100644 --- a/src/nsterm.m +++ b/src/nsterm.m @@ -720,7 +720,7 @@ ns_update_window_begin (struct window *w) Mouse_HLInfo *hlinfo = MOUSE_HL_INFO (f); NSTRACE (ns_update_window_begin); - set_output_cursor (&w->cursor); + w->output_cursor = w->cursor; block_input (); @@ -756,8 +756,8 @@ ns_update_window_end (struct window *w, bool cursor_on_p, if (cursor_on_p) display_and_set_cursor (w, 1, - output_cursor.hpos, output_cursor.vpos, - output_cursor.x, output_cursor.y); + w->output_cursor.hpos, w->output_cursor.vpos, + w->output_cursor.x, w->output_cursor.y); if (draw_window_fringes (w, 1)) x_draw_vertical_border (w); @@ -1989,9 +1989,6 @@ ns_clear_frame (struct frame *f) mark_window_cursors_off (XWINDOW (FRAME_ROOT_WINDOW (f))); - output_cursor.hpos = output_cursor.vpos = 0; - output_cursor.x = -1; - r = [view bounds]; block_input (); @@ -3978,7 +3975,6 @@ static struct redisplay_interface ns_redisplay_interface = ns_after_update_window_line, ns_update_window_begin, ns_update_window_end, - x_cursor_to, ns_flush, 0, /* flush_display_optional */ x_clear_window_mouse_face, |