1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-03-07 06:22:32 -08:00
Commit graph

16980 commits

Author SHA1 Message Date
Stefan Monnier
999e64847e (store_symval_forwarding): Delete special read-only
hack for type == -1, since we now use ->constant instead.
(Fkill_local_variable): Don't use XBUFFER if it can be nil.
2003-03-25 16:30:15 +00:00
Stefan Monnier
a9b9a78056 (overlays_in): Declare static.
(syms_of_buffer) <enable-multibyte-characters>: Use the symbol's
`constant' field rather than the variable's `type' field.
2003-03-25 16:20:38 +00:00
Andrew Choi
365fa1b37d Allow building on Mac OS X again after Kim's merging of display code. 2003-03-24 19:59:08 +00:00
John Paul Wallington
c0bcce6f07 (redisplay_window): If mini window's buffer is not
empty, then redisplay it like other windows.
2003-03-24 03:33:53 +00:00
Kim F. Storm
0648dde0da (w32_draw_window_cursor): Fix last change. 2003-03-23 11:38:55 +00:00
Kim F. Storm
a526b96ce7 *** empty log message *** 2003-03-23 11:38:33 +00:00
Kenichi Handa
37ab321e4f (make_string_from_bytes, make_specified_string):
Prototypes adjusted.
2003-03-23 02:08:35 +00:00
Kenichi Handa
fcbb914bcd (make_string_from_bytes): Add `const' for the arg
CONTENTS.
(make_specified_string): Likewise.
2003-03-23 02:07:13 +00:00
Jan Djärv
55ba29ee66 Removed one line too many 2003-03-23 01:09:49 +00:00
Jan Djärv
fd4c9408f8 * xdisp.c (get_glyph_string_clip_rect): Removed ; at end of #endif 2003-03-23 01:03:23 +00:00
Jan Djärv
7863d62580 Finally (?) fix flicker in scroll bar. 2003-03-23 00:59:23 +00:00
Kim F. Storm
204ccab1d7 Fix long lines. 2003-03-22 21:41:03 +00:00
Stefan Monnier
00c64fabb0 *** empty log message *** 2003-03-22 20:54:45 +00:00
Thien-Thi Nguyen
af0ad939bd Make sure space precedes end-of-line backslashes. 2003-03-22 01:35:32 +00:00
Kim F. Storm
6e6410cf9d *** empty log message *** 2003-03-21 23:48:53 +00:00
Kim F. Storm
dfbe5d05b1 Fix compilation with --with-x=no. 2003-03-21 23:08:04 +00:00
Kim F. Storm
4612b15525 (STORE_NATIVE_RECT): New macro. 2003-03-21 23:00:21 +00:00
Kim F. Storm
e080d3ebbf * xdisp.c (pixel_to_glyph_coords, glyph_to_pixel_coords):
Add generic versions here.  Remove system specific versions
defined elsewhere.
2003-03-21 22:56:52 +00:00
Kim F. Storm
1853f74c1c (pixel_to_glyph_coords, glyph_to_pixel_coords):
Add prototypes.
2003-03-21 22:55:56 +00:00
Kim F. Storm
b22139fd24 *** empty log message *** 2003-03-21 22:55:37 +00:00
Kim F. Storm
b4ebbb126b (get_glyph_string_clip_rect): Use FRAME_INTERNAL_BORDER_WIDTH. 2003-03-21 21:48:44 +00:00
Kim F. Storm
e5a3b7d969 (struct redisplay_interface): Add active_p argument to
draw_window_cursor member.  All uses changed.
2003-03-21 21:47:46 +00:00
Kim F. Storm
5c9cc435b8 *** empty log message *** 2003-03-21 21:47:09 +00:00
Kim F. Storm
1dabd0cff4 Fix compilation for --with-x=no. 2003-03-21 14:23:32 +00:00
Kim F. Storm
acd3756047 *** empty log message *** 2003-03-21 14:05:12 +00:00
Kim F. Storm
b11ce3eeb6 (No_Cursor): Declare as None for X.
(struct mac_output): Replace member cross_cursor by hand_cursor.
2003-03-21 13:52:57 +00:00
Kim F. Storm
442a09ea21 * xterm.c: Remove consolidated defines and code.
(BETWEEN): Remove unused macro.
(x_draw_vertical_window_border, x_shift_glyphs_for_insert)
(x_define_frame_cursor, x_clear_frame_area)
(x_draw_window_cursor): New X-specific functions for RIF.
(x_redisplay_interface): Add new members.
2003-03-21 13:52:48 +00:00
Kim F. Storm
3d970f2841 Setup and use hand_cursor instead of cross_cursor. 2003-03-21 13:52:37 +00:00
Kim F. Storm
fa3c6b4da4 The following changes consolidate code related to writing and
inserting glyphs, exposing frame, the tool bar, the mouse face,
the output cursor, and help echo from xterm.c, w32term.c and
macterm.c into xdisp.c.  It also generalizes the use of the
window_part enum instead of using numeric values throughout.

* xdisp.c: Consolidate gui-independent code here.
Include keymap.h.
(Qhelp_echo): Import.
(mouse_autoselect_window, x_stretch_cursor_p): Declare here.
(help_echo_string, help_echo_window, help_echo_object)
(previous_help_echo_string, help_echo_pos): Declare here.
(output_cursor, last_mouse_frame, last_tool_bar_item): Declare here.
(estimate_mode_line_height): Define here.  Handle windowing
systems directly (without using estimate_mode_line_height_hook).
(x_y_to_hpos_vpos, get_tool_bar_item, note_tool_bar_highlight):
(update_window_cursor, update_cursor_in_window_tree)
(fast_find_position, fast_find_string_pos)
(note_mode_line_highlight, note_mode_line_or_margin_highlight)
(expose_area, expose_line, expose_overlaps, expose_window)
(expose_window_tree, phys_cursor_in_rect_p): New generic versions;
declared static as they are only used locally in xdisp.c.
(draw_glyphs): Rename from x_draw_glyphs and make static.
(tool_bar_item_info, notice_overwritten_cursor): Make static.
(frame_to_window_pixel_xy, get_glyph_string_clip_rect)
(set_output_cursor, x_cursor_to, handle_tool_bar_click)
(x_write_glyphs, x_insert_glyphs, x_clear_end_of_line):
(x_fix_overlapping_area, draw_phys_cursor_glyph, erase_phys_cursor)
(display_and_set_cursor, x_update_cursor, x_clear_cursor)
(show_mouse_face, clear_mouse_face, cursor_in_mouse_face_p)
(note_mouse_highlight, x_clear_window_mouse_face)
(cancel_mouse_face, x_draw_vertical_border, expose_frame)
(x_intersect_rectangles): New generic functions for use by xdisp.c
and GUI front-ends.
(syms_of_xdisp): Initialize and staticpro help_echo* variables.
Defvar_bool "x-streach-cursor" and "mouse-autoselect-window" here.
2003-03-21 13:52:28 +00:00
Kim F. Storm
b74b839745 (window_from_coordinates): Fix prototype. 2003-03-21 13:52:14 +00:00
Kim F. Storm
341f385808 * window.c (enum window_part): Move to dispextern.h.
(coordinates_in_window): Use enum window_part member names
instead of numbers to describe return value.
(struct check_window_data): Change part member to window_part.
(check_window_containing): Return window_part unaltered.
(window_from_coordinates): Change part arg from int to enum
window_part.  Allow part arg to be null.  All users changed.
2003-03-21 13:52:06 +00:00
Kim F. Storm
b8a9367660 (struct w32_output): Remove cross_cursor member. 2003-03-21 13:51:52 +00:00
Kim F. Storm
8927109950 * w32term.c: Remove consolidated defines and code.
(BETWEEN): Remove unused macro.
(w32_draw_vertical_window_border, w32_shift_glyphs_for_insert)
(w32_define_frame_cursor, w32_clear_frame_area)
(w32_draw_window_cursor): New W32-specific functions for RIF.
(w32_redisplay_interface): Add new members.
2003-03-21 13:51:43 +00:00
Kim F. Storm
d165fbde08 (No_Cursor): Define as 0 for W32.
(XRectangle): Add X compatible rectangle type.
(NativeRectangle): Declare as RECT for W32.
(CONVERT_TO_XRECT, CONVERT_FROM_XRECT, STORE_NATIVE_RECT): New macros.
2003-03-21 13:51:33 +00:00
Kim F. Storm
7d63e5e3e9 Remove setup of cross_cursor (already has hand_cursor). 2003-03-21 13:51:25 +00:00
Kim F. Storm
d9191744d0 Remove consolidated defines and code. 2003-03-21 13:51:17 +00:00
Kim F. Storm
f105f36f46 (estimate_mode_line_height): Move to xdisp.c. 2003-03-21 13:51:06 +00:00
Kim F. Storm
36632fc128 (Display_Info): Add generic typedef. 2003-03-21 13:50:50 +00:00
Kim F. Storm
02d4b97dff Remove consolidated defines and code.
(IT_note_mouse_highlight, dos_rawgetc): Use enum window_part.
2003-03-21 13:50:39 +00:00
Kim F. Storm
57cb6dbe66 (xdisp.o): Add dependency on keymap.h. 2003-03-21 13:50:27 +00:00
Kim F. Storm
31ee2d81f8 (struct mac_output): Replace member cross_cursor by
hand_cursor.
(activate_scroll_bars, deactivate_scroll_bars): Add prototypes.
2003-03-21 13:50:20 +00:00
Kim F. Storm
f9e65eb300 * macterm.c: Remove consolidated defines and code.
(BETWEEN): Remove unused macro.
(mac_draw_vertical_window_border, mac_shift_glyphs_for_insert)
(mac_define_frame_cursor, mac_clear_frame_area)
(mac_draw_window_cursor): New Mac-specific functions for RIF.
(x_redisplay_interface): Add new members.
2003-03-21 13:50:10 +00:00
Kim F. Storm
e119ad0d84 (No_Cursor): Define as 0 for Mac.
(XRectangle): Add X compatible rectangle type.
(NativeRectangle): Declare as Rect for Mac.
(CONVERT_TO_XRECT, CONVERT_FROM_XRECT, STORE_NATIVE_RECT): New macros.
2003-03-21 13:49:57 +00:00
Kim F. Storm
991930738d (x_set_mouse_color): Setup hand_cursor instead of cross_cursor.
(x_set_cursor_color): Use x_display_and_set_cursor instead of x_display_cursor.
2003-03-21 13:49:48 +00:00
Kim F. Storm
169f857ada (make_lispy_event): Use enum window_part. 2003-03-21 13:49:39 +00:00
Kim F. Storm
641bdbf368 (mode_line_string, marginal_area_string): Use enum
window_part instead of int in arg list.  Users changed.
2003-03-21 13:49:31 +00:00
Kim F. Storm
d74b2553d9 * dispextern.h (Display_Info): Generic typedef for *_display_info.
(NativeRectangle): Generic typedef for rectangle type.
(enum window_part): Move here from window.c.
(struct redisplay_interface): New members flush_display_optional,
define_frame_cursor, clear_frame_area, draw_window_cursor,
draw_vertical_window_border, shift_glyphs_for_insert.
Rename member clear_mouse_face to clear_window_mouse_face.
(estimate_mode_line_height_hook): Remove hook.
(auto_raise_tool_bar_buttons_p): Don't declare extern.
(tool_bar_item_info): Remove prototype.
(help_echo_string, help_echo_window, help_echo_object)
(previous_help_echo_string, help_echo_pos)
(last_mouse_frame, last_tool_bar_item, mouse_autoselect_window):
(x_stretch_cursor_p, output_cursor): Declare extern.
(x_draw_glyphs, notice_overwritten_cursor): Remove prototypes.
(x_write_glyphs), x_insert_glyphs, x_clear_end_of_line)
(x_fix_overlapping_area, draw_phys_cursor_glyph, erase_phys_cursor)
(display_and_set_cursor, set_output_cursor, x_cursor_to)
(x_update_cursor, x_clear_cursor, x_draw_vertical_border)
(frame_to_window_pixel_xy, get_glyph_string_clip_rect)
(note_mouse_highlight, x_clear_window_mouse_face, cancel_mouse_face)
(handle_tool_bar_click, clear_mouse_face, show_mouse_face)
(cursor_in_mouse_face_p, expose_frame, x_intersect_rectangles):
Add prototypes.
(mode_line_string, marginal_area_string): Fix prototypes.
2003-03-21 13:49:19 +00:00
Kim F. Storm
2091fe0469 (xdisp.o): Add dependency on blockinput.h and files
included from it.  Add dependency on keymap.h.
2003-03-21 13:48:50 +00:00
Kenichi Handa
8ba01a700a *** empty log message *** 2003-03-21 05:55:03 +00:00
Kenichi Handa
3f817c7366 (Fexpand_file_name): Fix previous change. 2003-03-21 05:45:23 +00:00