comparison src/ChangeLog @ 50239:9fab063b5369

*** empty log message ***
author Kim F. Storm <storm@cua.dk>
date Fri, 21 Mar 2003 14:05:12 +0000
parents 2cbbd995fb66
children 8bd070bffa46
comparison
equal deleted inserted replaced
50238:20e4ebf5399d 50239:9fab063b5369
1 2003-03-21 Kim F. Storm <storm@cua.dk>
2
3 The following changes consolidate code related to writing and
4 inserting glyphs, exposing frame, the tool bar, the mouse face,
5 the output cursor, and help echo from xterm.c, w32term.c and
6 macterm.c into xdisp.c. It also generalizes the use of the
7 window_part enum instead of using numeric values throughout.
8
9 * xdisp.c: Consolidate gui-independent code here.
10 Include keymap.h.
11 (Qhelp_echo): Import.
12 (mouse_autoselect_window, x_stretch_cursor_p): Declare here.
13 (help_echo_string, help_echo_window, help_echo_object)
14 (previous_help_echo_string, help_echo_pos): Declare here.
15 (output_cursor, last_mouse_frame, last_tool_bar_item): Declare here.
16 (estimate_mode_line_height): Define here. Handle windowing
17 systems directly (without using estimate_mode_line_height_hook).
18 (x_y_to_hpos_vpos, get_tool_bar_item, note_tool_bar_highlight):
19 (update_window_cursor, update_cursor_in_window_tree)
20 (fast_find_position, fast_find_string_pos)
21 (note_mode_line_highlight, note_mode_line_or_margin_highlight)
22 (expose_area, expose_line, expose_overlaps, expose_window)
23 (expose_window_tree, phys_cursor_in_rect_p): New generic versions;
24 declared static as they are only used locally in xdisp.c.
25 (draw_glyphs): Rename from x_draw_glyphs and make static.
26 (tool_bar_item_info, notice_overwritten_cursor): Make static.
27 (frame_to_window_pixel_xy, get_glyph_string_clip_rect)
28 (set_output_cursor, x_cursor_to, handle_tool_bar_click)
29 (x_write_glyphs, x_insert_glyphs, x_clear_end_of_line):
30 (x_fix_overlapping_area, draw_phys_cursor_glyph, erase_phys_cursor)
31 (display_and_set_cursor, x_update_cursor, x_clear_cursor)
32 (show_mouse_face, clear_mouse_face, cursor_in_mouse_face_p)
33 (note_mouse_highlight, x_clear_window_mouse_face)
34 (cancel_mouse_face, x_draw_vertical_border, expose_frame)
35 (x_intersect_rectangles): New generic functions for use by xdisp.c
36 and GUI front-ends.
37 (syms_of_xdisp): Initialize and staticpro help_echo* variables.
38 Defvar_bool "x-streach-cursor" and "mouse-autoselect-window" here.
39
40 * dispextern.h (Display_Info): Generic typedef for *_display_info.
41 (NativeRectangle): Generic typedef for rectangle type.
42 (enum window_part): Move here from window.c.
43 (struct redisplay_interface): New members flush_display_optional,
44 define_frame_cursor, clear_frame_area, draw_window_cursor,
45 draw_vertical_window_border, shift_glyphs_for_insert.
46 Rename member clear_mouse_face to clear_window_mouse_face.
47 (estimate_mode_line_height_hook): Remove hook.
48 (auto_raise_tool_bar_buttons_p): Don't declare extern.
49 (tool_bar_item_info): Remove prototype.
50 (help_echo_string, help_echo_window, help_echo_object)
51 (previous_help_echo_string, help_echo_pos)
52 (last_mouse_frame, last_tool_bar_item, mouse_autoselect_window):
53 (x_stretch_cursor_p, output_cursor): Declare extern.
54 (x_draw_glyphs, notice_overwritten_cursor): Remove prototypes.
55 (x_write_glyphs), x_insert_glyphs, x_clear_end_of_line)
56 (x_fix_overlapping_area, draw_phys_cursor_glyph, erase_phys_cursor)
57 (display_and_set_cursor, set_output_cursor, x_cursor_to)
58 (x_update_cursor, x_clear_cursor, x_draw_vertical_border)
59 (frame_to_window_pixel_xy, get_glyph_string_clip_rect)
60 (note_mouse_highlight, x_clear_window_mouse_face, cancel_mouse_face)
61 (handle_tool_bar_click, clear_mouse_face, show_mouse_face)
62 (cursor_in_mouse_face_p, expose_frame, x_intersect_rectangles):
63 Add prototypes.
64 (mode_line_string, marginal_area_string): Fix prototypes.
65
66 * window.c (enum window_part): Move to dispextern.h.
67 (coordinates_in_window): Use enum window_part member names
68 instead of numbers to describe return value.
69 (struct check_window_data): Change part member to window_part.
70 (check_window_containing): Return window_part unaltered.
71 (window_from_coordinates): Change part arg from int to enum
72 window_part. Allow part arg to be null. All users changed.
73
74 * window.h (window_from_coordinates): Fix prototype.
75
76 * term.c (estimate_mode_line_height): Move to xdisp.c.
77
78 * keyboard.c (make_lispy_event): Use enum window_part.
79
80 * dispnew.c (mode_line_string, marginal_area_string): Use enum
81 window_part instead of int in arg list. Users changed.
82
83 * xterm.h (No_Cursor): Declare as None for X.
84 (struct mac_output): Replace member cross_cursor by hand_cursor.
85
86 * xterm.c: Remove consolidated defines and code.
87 (BETWEEN): Remove unused macro.
88 (x_draw_vertical_window_border, x_shift_glyphs_for_insert)
89 (x_define_frame_cursor, x_clear_frame_area)
90 (x_draw_window_cursor): New X-specific functions for RIF.
91 (x_redisplay_interface): Add new members.
92
93 * xfns.c: Setup and use hand_cursor instead of cross_cursor.
94
95 * w32term.h (struct w32_output): Remove cross_cursor member.
96
97 * w32term.c: Remove consolidated defines and code.
98 (BETWEEN): Remove unused macro.
99 (w32_draw_vertical_window_border, w32_shift_glyphs_for_insert)
100 (w32_define_frame_cursor, w32_clear_frame_area)
101 (w32_draw_window_cursor): New W32-specific functions for RIF.
102 (w32_redisplay_interface): Add new members.
103
104 * w32gui.h (No_Cursor): Define as 0 for W32.
105 (XRectangle): Add X compatible rectangle type.
106 (NativeRectangle): Declare as RECT for W32.
107 (CONVERT_TO_XRECT, CONVERT_FROM_XRECT, STORE_NATIVE_RECT): New macros.
108
109 * w32fns.c: Remove setup of cross_cursor (already has hand_cursor).
110
111 * w32console.c: Remove consolidated defines and code.
112
113 * msdos.h (Display_Info): Add generic typedef.
114
115 * msdos.c: Remove consolidated defines and code.
116 (IT_note_mouse_highlight, dos_rawgetc): Use enum window_part.
117
118 * macterm.h (struct mac_output): Replace member cross_cursor by
119 hand_cursor.
120 (activate_scroll_bars, deactivate_scroll_bars): Add prototypes.
121
122 * macterm.c: Remove consolidated defines and code.
123 (BETWEEN): Remove unused macro.
124 (mac_draw_vertical_window_border, mac_shift_glyphs_for_insert)
125 (mac_define_frame_cursor, mac_clear_frame_area)
126 (mac_draw_window_cursor): New Mac-specific functions for RIF.
127 (x_redisplay_interface): Add new members.
128
129 * macgui.h (No_Cursor): Define as 0 for Mac.
130 (XRectangle): Add X compatible rectangle type.
131 (NativeRectangle): Declare as Rect for Mac.
132 (CONVERT_TO_XRECT, CONVERT_FROM_XRECT, STORE_NATIVE_RECT): New macros.
133
134 * macfns.c (x_set_mouse_color): Setup hand_cursor instead of cross_cursor.
135 (x_set_cursor_color): Use x_display_and_set_cursor instead of x_display_cursor.
136
137 * Makefile.in (xdisp.o): Add dependency on blockinput.h and files
138 included from it. Add dependency on keymap.h.
139
140 * makefile.w32-in (xdisp.o): Add dependency on keymap.h.
141
1 2003-03-21 Kenichi Handa <handa@m17n.org> 142 2003-03-21 Kenichi Handa <handa@m17n.org>
2 143
3 * fileio.c (Fexpand_file_name): Fix previous change. 144 * fileio.c (Fexpand_file_name): Fix previous change.
4 145
5 2003-03-19 Kenichi Handa <handa@m17n.org> 146 2003-03-19 Kenichi Handa <handa@m17n.org>