comparison src/ChangeLog @ 111413:d53ee71e7e89

Unify mouse-highlight code for all GUI and TTY sessions. term.c: Remove static mouse_face_* variables. All users changed. (term_show_mouse_face, term_clear_mouse_face) (fast_find_position, term_mouse_highlight): Functions deleted. (tty_draw_row_with_mouse_face): New function. (term_mouse_movement): Call note_mouse_highlight instead of term_mouse_highlight. nsterm.m (ns_update_window_begin, ns_update_window_end) (ns_update_end, x_destroy_window, ns_frame_up_to_date) (ns_dumpglyphs_box_or_relief, ns_maybe_dumpglyphs_background) (ns_dumpglyphs_image, ns_dumpglyphs_stretch) (ns_initialize_display_info, keyDown, mouseMoved, mouseExited): Replace Display_Info with Mouse_HLInfo everywhere where mouse_face_* members were accessed for mouse highlight purposes. xterm.c (x_update_window_begin, x_update_window_end) (x_update_end, XTframe_up_to_date, x_set_mouse_face_gc) (handle_one_xevent, x_free_frame_resources, x_term_init): Replace Display_Info with Mouse_HLInfo everywhere where mouse_face_* members were accessed for mouse highlight purposes. w32term.c (x_update_window_begin, x_update_window_end) (x_update_end, w32_read_socket, x_free_frame_resources) (w32_initialize_display_info): Replace Display_Info with Mouse_HLInfo everywhere where mouse_face_* members were accessed for mouse highlight purposes. xdisp.c (show_mouse_face, note_mode_line_or_margin_highlight) (note_mouse_highlight) [HAVE_WINDOW_SYSTEM]: Don't run GUI code unless the frame is on a window-system. (get_tool_bar_item, handle_tool_bar_click) (note_tool_bar_highlight, draw_glyphs, erase_phys_cursor) (show_mouse_face, clear_mouse_face, coords_in_mouse_face_p) (note_mode_line_or_margin_highlight, note_mouse_highlight) (x_clear_window_mouse_face, cancel_mouse_face, expose_frame): Replace Display_Info with Mouse_HLInfo everywhere where mouse_face_* members were accessed for mouse highlight purposes. (coords_in_mouse_face_p): Move prototype out of the HAVE_WINDOW_SYSTEM conditional. (x_y_to_hpos_vpos, frame_to_window_pixel_xy): Move out of the HAVE_WINDOW_SYSTEM block. (try_window_id) [HAVE_GPM || MSDOS]: Call x_clear_window_mouse_face. (draw_row_with_mouse_face): Implementation for HAVE_WINDOW_SYSTEM systems. Call tty_draw_row_with_mouse_face for TTY systems. (show_mouse_face): Call draw_row_with_mouse_face, instead of calling draw_glyphs directly. (show_mouse_face, clear_mouse_face, coords_in_mouse_face_p) (cursor_in_mouse_face_p, rows_from_pos_range) (mouse_face_from_buffer_pos, mouse_face_from_string_pos) (note_mode_line_or_margin_highlight, note_mouse_highlight) (x_clear_window_mouse_face, cancel_mouse_face): Move out of the HAVE_WINDOW_SYSTEM block. Ifdef away window-system specific fragments. (note_mouse_highlight): Call popup_activated for MSDOS as well. Clear mouse highlight if pointer is over glyphs whose OBJECT is an integer. (mouse_face_from_buffer_pos): Add parentheses around && within ||. (x_consider_frame_title, tool_bar_lines_needed): Move prototypes to HAVE_WINDOW_SYSTEM-only part. (get_window_cursor_type): Move inside a HAVE_WINDOW_SYSTEM-only part. Remove "#ifdef HAVE_WINDOW_SYSTEM" from body of function. (null_glyph_slice): Move declaration into HAVE_WINDOW_SYSTEM-only part. dispnew.c (mirror_make_current): Set Y coordinate of the mode-line and header-line rows. (init_display): Setup initial frame's output_data for text terminal frames. xmenu.c (popup_activated): Don't define on MSDOS, which now has its own definition on msdos.c. msdos.c (show_mouse_face, clear_mouse_face) (fast_find_position, IT_note_mode_line_highlight) (IT_note_mouse_highlight): Functions deleted. (IT_frame_up_to_date, dos_rawgetc): Call note_mouse_highlight instead of IT_note_mouse_highlight. (draw_row_with_mouse_face, popup_activated): New functions. (dos_set_window_size, draw_row_with_mouse_face, IT_update_begin) (IT_update_end, IT_frame_up_to_date, internal_terminal_init) (dos_rawgetc): Replace Display_Info with Mouse_HLInfo everywhere where mouse_face_* members were accessed for mouse highlight purposes. msdos.h (initialize_msdos_display): Add prototype. frame.h (MOUSE_HL_INFO): New macro. lisp.h (Mouse_HLInfo): New data type. xterm.h (struct x_display_info): w32term.h (struct w32_display_info): nsterm.h (struct ns_display_info): termchar.h (struct tty_display_info): Use it instead of mouse_face_* members. dispextern.h (show_mouse_face, clear_mouse_face): Update type of 1st argument. (frame_to_window_pixel_xy, note_mouse_highlight) (x_clear_window_mouse_face, cancel_mouse_face, clear_mouse_face) (show_mouse_face, cursor_in_mouse_face_p): Move prototypes out of HAVE_WINDOW_SYSTEM conditional. (draw_row_with_mouse_face): Declare prototype. (tty_draw_row_with_mouse_face): Declare prototype.
author Eli Zaretskii <eliz@gnu.org>
date Sat, 06 Nov 2010 10:28:31 +0200
parents 717c8af799d3 9a687477468c
children d291fc8615a3
comparison
equal deleted inserted replaced
111412:cc7702f421a0 111413:d53ee71e7e89
1 2010-11-05 Eli Zaretskii <eliz@gnu.org>
2
3 Unify mouse-highlight code for all GUI and TTY sessions.
4
5 * term.c: Remove static mouse_face_* variables. All users
6 changed.
7 (term_show_mouse_face, term_clear_mouse_face)
8 (fast_find_position, term_mouse_highlight): Functions deleted.
9 (tty_draw_row_with_mouse_face): New function.
10 (term_mouse_movement): Call note_mouse_highlight instead of
11 term_mouse_highlight.
12
13 * nsterm.m (ns_update_window_begin, ns_update_window_end)
14 (ns_update_end, x_destroy_window, ns_frame_up_to_date)
15 (ns_dumpglyphs_box_or_relief, ns_maybe_dumpglyphs_background)
16 (ns_dumpglyphs_image, ns_dumpglyphs_stretch)
17 (ns_initialize_display_info, keyDown, mouseMoved, mouseExited):
18 Replace Display_Info with Mouse_HLInfo everywhere where
19 mouse_face_* members were accessed for mouse highlight purposes.
20
21 * xterm.c (x_update_window_begin, x_update_window_end)
22 (x_update_end, XTframe_up_to_date, x_set_mouse_face_gc)
23 (handle_one_xevent, x_free_frame_resources, x_term_init): Replace
24 Display_Info with Mouse_HLInfo everywhere where mouse_face_*
25 members were accessed for mouse highlight purposes.
26
27 * w32term.c (x_update_window_begin, x_update_window_end)
28 (x_update_end, w32_read_socket, x_free_frame_resources)
29 (w32_initialize_display_info): Replace Display_Info with
30 Mouse_HLInfo everywhere where mouse_face_* members were accessed
31 for mouse highlight purposes.
32
33 * xdisp.c (show_mouse_face, note_mode_line_or_margin_highlight)
34 (note_mouse_highlight) [HAVE_WINDOW_SYSTEM]: Don't run GUI code
35 unless the frame is on a window-system.
36 (get_tool_bar_item, handle_tool_bar_click)
37 (note_tool_bar_highlight, draw_glyphs, erase_phys_cursor)
38 (show_mouse_face, clear_mouse_face, coords_in_mouse_face_p)
39 (note_mode_line_or_margin_highlight, note_mouse_highlight)
40 (x_clear_window_mouse_face, cancel_mouse_face, expose_frame):
41 Replace Display_Info with Mouse_HLInfo everywhere where
42 mouse_face_* members were accessed for mouse highlight purposes.
43 (coords_in_mouse_face_p): Move prototype out of the
44 HAVE_WINDOW_SYSTEM conditional.
45 (x_y_to_hpos_vpos, frame_to_window_pixel_xy): Move out of the
46 HAVE_WINDOW_SYSTEM block.
47 (try_window_id) [HAVE_GPM || MSDOS]: Call
48 x_clear_window_mouse_face.
49 (draw_row_with_mouse_face): Implementation for HAVE_WINDOW_SYSTEM
50 systems. Call tty_draw_row_with_mouse_face for TTY systems.
51 (show_mouse_face): Call draw_row_with_mouse_face, instead of
52 calling draw_glyphs directly.
53 (show_mouse_face, clear_mouse_face, coords_in_mouse_face_p)
54 (cursor_in_mouse_face_p, rows_from_pos_range)
55 (mouse_face_from_buffer_pos, mouse_face_from_string_pos)
56 (note_mode_line_or_margin_highlight, note_mouse_highlight)
57 (x_clear_window_mouse_face, cancel_mouse_face): Move out of the
58 HAVE_WINDOW_SYSTEM block. Ifdef away window-system specific
59 fragments.
60 (note_mouse_highlight): Call popup_activated for MSDOS as well.
61 Clear mouse highlight if pointer is over glyphs whose OBJECT is an
62 integer.
63 (mouse_face_from_buffer_pos): Add parentheses around && within ||.
64 (x_consider_frame_title, tool_bar_lines_needed): Move
65 prototypes to HAVE_WINDOW_SYSTEM-only part.
66 (get_window_cursor_type): Move inside a HAVE_WINDOW_SYSTEM-only
67 part. Remove "#ifdef HAVE_WINDOW_SYSTEM" from body of function.
68 (null_glyph_slice): Move declaration into HAVE_WINDOW_SYSTEM-only
69 part.
70
71 * dispnew.c (mirror_make_current): Set Y coordinate of the
72 mode-line and header-line rows.
73 (init_display): Setup initial frame's output_data for text
74 terminal frames.
75
76 * xmenu.c (popup_activated): Don't define on MSDOS, which now has
77 its own definition on msdos.c.
78
79 * msdos.c (show_mouse_face, clear_mouse_face)
80 (fast_find_position, IT_note_mode_line_highlight)
81 (IT_note_mouse_highlight): Functions deleted.
82 (IT_frame_up_to_date, dos_rawgetc): Call note_mouse_highlight
83 instead of IT_note_mouse_highlight.
84 (draw_row_with_mouse_face, popup_activated): New functions.
85 (dos_set_window_size, draw_row_with_mouse_face, IT_update_begin)
86 (IT_update_end, IT_frame_up_to_date, internal_terminal_init)
87 (dos_rawgetc): Replace Display_Info with Mouse_HLInfo everywhere
88 where mouse_face_* members were accessed for mouse highlight
89 purposes.
90
91 * msdos.h (initialize_msdos_display): Add prototype.
92
93 * frame.h (MOUSE_HL_INFO): New macro.
94
95 * lisp.h (Mouse_HLInfo): New data type.
96
97 * xterm.h (struct x_display_info):
98 * w32term.h (struct w32_display_info):
99 * nsterm.h (struct ns_display_info):
100 * termchar.h (struct tty_display_info): Use it instead of
101 mouse_face_* members.
102
103 * dispextern.h (show_mouse_face, clear_mouse_face): Update type of
104 1st argument.
105 (frame_to_window_pixel_xy, note_mouse_highlight)
106 (x_clear_window_mouse_face, cancel_mouse_face, clear_mouse_face)
107 (show_mouse_face, cursor_in_mouse_face_p): Move prototypes out of
108 HAVE_WINDOW_SYSTEM conditional.
109 (draw_row_with_mouse_face): Declare prototype.
110 (tty_draw_row_with_mouse_face): Declare prototype.
111
1 2010-11-05 Eli Zaretskii <eliz@gnu.org> 112 2010-11-05 Eli Zaretskii <eliz@gnu.org>
2 113
3 * term.c (append_glyphless_glyph, produce_glyphless_glyph): Remove 114 * term.c (append_glyphless_glyph, produce_glyphless_glyph): Remove
4 unused variables. 115 unused variables.
5 116