Mercurial > emacs
comparison src/ChangeLog @ 47132:0841c154439c
These changes consolidates the handling of the cursor
type in xdisp.c, moving duplicate code and functionality from
xfns.c, xterm.c, w32fns.c, w32term.c, macfns.c, and macterm.c.
| author | Kim F. Storm <storm@cua.dk> |
|---|---|
| date | Fri, 30 Aug 2002 11:58:54 +0000 |
| parents | 256bfac4f5b5 |
| children | 4afe5ef50bf4 |
comparison
equal
deleted
inserted
replaced
| 47131:a37d2dd10e3e | 47132:0841c154439c |
|---|---|
| 1 2002-08-30 Kim F. Storm <storm@cua.dk> | |
| 2 | |
| 3 The following changes consolidates the handling of the cursor | |
| 4 type in xdisp.c, moving duplicate code and functionality from | |
| 5 xfns.c, xterm.c, w32fns.c, w32term.c, macfns.c, and macterm.c. | |
| 6 | |
| 7 * frame.h (enum text_cursor_kinds): Consolidated here. | |
| 8 Added DEFAULT_CURSOR value. | |
| 9 (struct frame) <desired_cursor, cursor_width> | |
| 10 <blink_off_cursor, blink_off_cursor_width>: New fields. | |
| 11 Consolidated from output_x, output_w32 and output_mac structs. | |
| 12 (FRAME_DESIRED_CURSOR, FRAME_CURSOR_WIDTH, FRAME_BLINK_OFF_CURSOR) | |
| 13 (FRAME_BLINK_OFF_CURSOR_WIDTH): Macros consolidated here. | |
| 14 | |
| 15 * xdisp.c (Qbar, Qhbar, Qbox, Qhollow, Vblink_cursor_alist): | |
| 16 Variables consolidated here. | |
| 17 (Valternate_cursor_type, Qalternate_cursor_type): New variables. | |
| 18 (Vcursor_in_non_selected_windows): Renamed from | |
| 19 cursor_in_non_selected_windows and changed to Lisp_Object. | |
| 20 (syms_of_xdisp): Define and staticpro new and moved variables. | |
| 21 (get_specified_cursor_type): Renamed from x_specified_cursor_type; | |
| 22 consolidated here. Recognize Qhollow setting. | |
| 23 (set_frame_cursor_types): New function to set frame cursor types | |
| 24 based on the frame parameters. | |
| 25 (get_window_cursor_type): New function to calculate new cursor | |
| 26 type and width for the specified window. Based on duplicated | |
| 27 code consolidated here. | |
| 28 Enhancements: cursor-in-non-selected-windows may be a cursor type, | |
| 29 check buffer-local alternate-cursor-type and blink-cursor-alist | |
| 30 before using built-in blink off methods. | |
| 31 | |
| 32 * dispextern.h (cursor_in_non_selected_windows): Extern removed. | |
| 33 | |
| 34 * lisp.h (Qcursor_in_non_selected_windows): Extern removed. | |
| 35 (get_specified_cursor_type, get_window_cursor_type) | |
| 36 (set_frame_cursor_types): Added prototypes. | |
| 37 | |
| 38 * macfns.c (x_specified_cursor_type): Removed. | |
| 39 (x_set_cursor_type): Use set_frame_cursor_types. | |
| 40 | |
| 41 * macterm.c (x_specified_cursor_type): Remove prototype. | |
| 42 (x_draw_bar_cursor): Use FRAME_CURSOR_WIDTH. | |
| 43 (x_display_and_set_cursor): Use get_window_cursor_type. | |
| 44 Remove unused local variables cursor_non_selected, active_cursor. | |
| 45 Redraw cursor if hbar cursor width changes. | |
| 46 (make_mac_frame): Set FRAME_DESIRED_CURSOR. | |
| 47 | |
| 48 * macterm.h (enum text_cursor_kinds): Removed. | |
| 49 (struct output_mac) <current_cursor, desired_cursor, cursor_width> | |
| 50 <blink_off_cursor, blink_off_cursor_width>: Members removed. | |
| 51 (FRAME_DESIRED_CURSOR): Macro removed. | |
| 52 | |
| 53 * w32fns.c (Vblink_cursor_alist): Removed. | |
| 54 (Qbar, Qhbar, Qbox, Qhollow): Removed. | |
| 55 (syms_of_w32fns): Don't intern, staticpro, or define them. | |
| 56 (x_specified_cursor_type): Removed. | |
| 57 (x_set_cursor_type): Use set_frame_cursor_types. | |
| 58 | |
| 59 * w32term.c (x_specified_cursor_type): Remove prototype. | |
| 60 (x_draw_bar_cursor): Use FRAME_CURSOR_WIDTH. | |
| 61 (x_display_and_set_cursor): Use get_window_cursor_type. | |
| 62 Remove unused local variables cursor_off_state. | |
| 63 Redraw cursor if hbar cursor width changes. | |
| 64 | |
| 65 * w32term.h (enum text_cursor_kinds): Removed. | |
| 66 (struct output_w32) <current_cursor, desired_cursor, cursor_width> | |
| 67 <blink_off_cursor, blink_off_cursor_width>: Members removed. | |
| 68 (FRAME_DESIRED_CURSOR, FRAME_CURSOR_WIDTH, FRAME_BLINK_OFF_CURSOR) | |
| 69 (FRAME_BLINK_OFF_CURSOR_WIDTH): Macros removed. | |
| 70 | |
| 71 * xfns.c (Vblink_cursor_alist): Removed. | |
| 72 (Qbar, Qhbar, Qbox, Qhollow): Removed. | |
| 73 (syms_of_xfns): Don't intern, staticpro, or define them. | |
| 74 (x_specified_cursor_type): Removed. | |
| 75 (x_set_cursor_type): Use set_frame_cursor_types. | |
| 76 | |
| 77 * xterm.c (x_specified_cursor_type): Remove prototype. | |
| 78 (x_draw_bar_cursor): Use FRAME_CURSOR_WIDTH. | |
| 79 (x_display_and_set_cursor): Use get_window_cursor_type. | |
| 80 Remove unused local variables cursor_off_state. | |
| 81 Redraw cursor if hbar cursor width changes. | |
| 82 | |
| 83 * xterm.h (enum text_cursor_kinds): Removed. | |
| 84 (struct output_x) <current_cursor, desired_cursor, cursor_width> | |
| 85 <blink_off_cursor, blink_off_cursor_width>: Members removed. | |
| 86 (FRAME_DESIRED_CURSOR, FRAME_CURSOR_WIDTH, FRAME_BLINK_OFF_CURSOR) | |
| 87 (FRAME_BLINK_OFF_CURSOR_WIDTH): Macros removed. | |
| 88 (x_specified_cursor_type): Remove prototype. | |
| 89 | |
| 1 2002-08-28 Richard M. Stallman <rms@gnu.org> | 90 2002-08-28 Richard M. Stallman <rms@gnu.org> |
| 2 | 91 |
| 3 * w32fns.c (x_set_cursor_type): Set FRAME_BLINK_OFF_CURSOR and | 92 * w32fns.c (x_set_cursor_type): Set FRAME_BLINK_OFF_CURSOR and |
| 4 FRAME_BLINK_OFF_CURSOR_WIDTH using defaults and Vblink_cursor_alist. | 93 FRAME_BLINK_OFF_CURSOR_WIDTH using defaults and Vblink_cursor_alist. |
| 5 (Vblink_cursor_alist): New variable. | 94 (Vblink_cursor_alist): New variable. |