Commit Graph

218 Commits

Author SHA1 Message Date
Jason Rumney
e8ac5d8824 Delete region objects after use. 2004-11-01 08:52:47 +00:00
Jason Rumney
5950869993 (x_draw_glyph_string): Use overline_color for overlines. 2004-10-20 20:09:10 +00:00
Jason Rumney
90665a8192 Remove excessive vertical whitespace. 2004-10-17 14:07:31 +00:00
Kim F. Storm
f94a2622a0 (x_update_window_end): Fix flicker on vertical line between
windows.  Update vertical line after drawing window fringes, but
only if actually drawing any bitmaps--or there is no fringe.
2004-10-07 21:59:39 +00:00
Kim F. Storm
0e9e9a2cc4 (fringe_bmp): Change to pointer.
(max_fringe_bmp): New var.
(w32_define_fringe_bitmap): Expand fringe_bmp.
(w32_draw_fringe_bitmap): Check max_fringe_bmp.
(w32_destroy_fringe_bitmap): Likewise.
2004-09-29 14:23:21 +00:00
Kim F. Storm
d64b707cb1 Rename wait_reading_process_input to wait_reading_process_output. 2004-08-20 10:34:12 +00:00
Jason Rumney
e597eb7d6c (w32_num_mouse_buttons): Rename from Vw32_num_mouse_buttons and make
it an int.
2004-05-17 21:43:22 +00:00
Jason Rumney
07c07cfe9a (x_draw_hollow_cursor): Sync with xterm.c 2004-05-01 10:10:36 +00:00
Kim F. Storm
cb0b194af0 (w32_draw_relief_rect): Add top_p and bot_p args.
(x_draw_glyph_string_box): Fix call to x_draw_relief_rect.
(x_draw_image_foreground, x_draw_image_relief)
(w32_draw_image_foreground_1, x_draw_image_glyph_string):
Draw sliced images.
2004-04-20 22:17:56 +00:00
Kim F. Storm
7292c311e8 (w32_read_socket): Set mouse_face_hidden after clearing highlight. 2004-04-05 21:54:17 +00:00
Jason Rumney
c146466189 (w32_read_socket): Fix last change to ButtonPress handling. 2004-03-01 22:46:39 +00:00
Kim F. Storm
004b1d3853 (w32_read_socket): Remove bufp_r and numcharsp args.
Add hold_quit arg. Rework to use just one, local, inev
input_event. Store inev directly in fifo using
kbd_buffer_store_event_hold.  Update count in one place.
Postpone call to gen_help_event until inev is stored; use new
local do_help for this.
Remove local emacs_event in handing of ButtonPress event; just use
inev instead (so no reason to copy it later).
2004-02-27 23:49:20 +00:00
Jason Rumney
7420e0f55d (w32_draw_fringe_bitmap): Draw overlaid bitmaps
correctly over other bitmaps.
2004-02-22 22:41:52 +00:00
Jason Rumney
f3336ea4a1 (w32_draw_fringe_bitmap): Handle overlay fringe bitmaps. 2004-02-16 00:54:02 +00:00
Kim F. Storm
03cce111cf (w32_define_fringe_bitmap): Bitmaps are now 16 bits wide,
so it is no longer necessary to expand them here.
2004-02-13 23:28:00 +00:00
Sam Steingold
4c1947b96e (w32_draw_fringe_bitmap): Fixed a typo in the last patch. 2004-02-09 18:49:44 +00:00
Kim F. Storm
4fa0780f70 (w32_draw_fringe_bitmap): Copy unadapted code from
xterm.c to handle overlayed fringe bitmaps and to use cursor color
for displaying cursor in fringe.
(w32_define_fringe_bitmap, w32_destroy_fringe_bitmap): New W32
specific functions to define and destroy fringe bitmaps in fringe_bmp.
(w32_redisplay_interface): Add them to redisplay_interface.
(w32_term_init): Call w32_init_fringe instead of explicitly
defining fringe bitmaps in fringe_bmp array.
(x_delete_display): Call w32_reset_fringes instead of explicitly
destroying fringe bitmaps in fringe_bmp array.
2004-02-08 23:20:23 +00:00
Kim F. Storm
5fbcdd1927 (x_update_window_end): Call draw_window_fringes.
(x_after_update_window_line): Just set redraw_fringe_bitmaps_p
in row instead of actually drawing fringe bitmaps.
(w32_draw_fringe_bitmap): Handle bottom aligned bitmaps.
(w32_draw_window_cursor): Draw cursor in fringe.
2004-01-16 18:46:47 +00:00
Jason Rumney
68c6a789cc (w32_text_out): Use s->font, for consistency with callers. 2004-01-01 22:51:46 +00:00
Kim F. Storm
db4f9403e1 (Qface, Qmouse_face): Remove unused externs. 2003-12-27 23:19:43 +00:00
Jan Djärv
068ae0fd96 * w32term.c (w32_read_socket): Remove call to x_check_fullscreen_move,
that function is removed.

* xterm.c (x_set_offset): Use move_offset_left/top instead of
x/y_pixels_outer_diff.
(x_check_expected_move): Calculate move_offset_left/top.

* xterm.h (struct x_output): New members: move_offset_top/left.

* frame.c (x_set_frame_parameters): x_fullscreen_move removed,
call x_set_offset directly.

* frame.h (enum): FULLSCREEN_MOVE_WAIT removed.
2003-10-05 13:42:04 +00:00
Miles Bader
ab5796a9f9 Add arch taglines 2003-09-01 15:45:59 +00:00
Jason Rumney
e9eee23e17 Document last change. 2003-08-31 22:22:29 +00:00
Jason Rumney
4bc2315e9e (w32_per_char_metric): Allow cached metrics to be
returned even when font_type is unknown.
2003-08-31 22:15:15 +00:00
Jason Rumney
ee4a01d19d (w32_read_socket): Fix WM_MOUSEWHEEL assignment. 2003-08-27 22:37:14 +00:00
Jason Rumney
637ad49d45 (construct_mouse_wheel): Construct WHEEL_EVENT.
(w32_read_socket): Map w32 WM_MOUSEWHEEL events to Emacs
WHEEL_EVENT events.
2003-06-01 21:38:37 +00:00
Juanma Barranquero
e471b24112 Add missing code from previous patch by David Ponce. 2003-05-27 22:34:58 +00:00
Jason Rumney
af3a05edaf (GET_WHEEL_DELTA_WPARAM): New macro. 2003-05-27 21:18:22 +00:00
Juanma Barranquero
1c64a4a296 (construct_mouse_wheel): Result is a MOUSE_CLICK_EVENT. Scrolling down/up the
mouse wheel is respectively mapped to mouse button 4 and 5.
(w32_read_socket): Map w32 WM_MOUSEWHEEL events to Emacs MOUSE_CLICK_EVENT
events.  Forward w32 MSH_MOUSEWHEEL events as WM_MOUSEWHEEL events.
2003-05-26 23:03:17 +00:00
Kim F. Storm
62e50ec617 Make (several) trivial substitutions for renamed and
new macros in dispextern.h, frame.h and window.h.
(x_draw_glyph_string_box): Adapt to per-window fringes and
scroll-bars.
(glyph_rect): Use window coordinates returned from
window_from_coordinates rather than frame_to_window_pixel_xy.
(XTset_vertical_scroll_bar): Adapt to per-window fringes and
scroll-bars.
(w32_clip_to_row): Remove superfluous whole_line_p arg and code
(fringes are now inside margins, i.e. always in the clipping area).
All callers changed.
(x_new_font): Set FRAME_COLUMN_WIDTH and FRAME_LINE_HEIGHT
directly, then call compute_fringe_widths.  Don't call
frame_update_line_height.
2003-05-24 22:06:19 +00:00
Richard M. Stallman
c65fd37090 Break the line after the return type in function definition. 2003-04-04 21:15:53 +00:00
Juanma Barranquero
6f5a04e1a9 (x_wm_set_icon_position): Define return value as void. 2003-03-31 21:15:51 +00:00
Kim F. Storm
ccbf77bb5b Remove unnecessary extern declarations.
(x_fullscreen_adjust): Remove. Use generic instead.
(x_redisplay_interface): Add w32_frame_parm_handlers member.
2003-03-31 20:35:36 +00:00
Kim F. Storm
0648dde0da (w32_draw_window_cursor): Fix last change. 2003-03-23 11:38:55 +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
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
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
Jason Rumney
344630d63c (w32_encode_char): Prevent double-byte chars from crashing Emacs. 2003-03-16 22:11:04 +00:00
Kim F. Storm
6b6bd7266c Remove consolidated defines and code.
(BUILD_WCHAR_T, BYTE1, BYTE2): Macros removed; callers changed
to use STORE_XCHAR2B, XCHAR2B_BYTE1, XCHAR2B_BYTE2 instead.
(w32_per_char_metric): Change font_type arg to int for RIF.
(w32_encode_char): Return int according to RIF requirements.
(w32_compute_glyph_string_overhangs): Adapt to RIF.
(w32_get_glyph_overhangs): New function for RIF.  Uses generic
x_get_glyph_overhangs.
(w32_redisplay_interface): Add new members.
2003-03-16 20:47:48 +00:00
Kim F. Storm
b6ae15325f Remove generic fringe code.
(w32_draw_fringe_bitmap): Only perform actual fringe drawing.
(w32_redisplay_interface): Add w32_draw_fringe_bitmap member.
2003-03-12 12:10:19 +00:00
Juanma Barranquero
c13a8a91d7 (w32_make_rdb): New function.
(w32_term_init): Use it to initialize xrdb member of w32_display_info struct.
Delete leftover code.
2003-03-06 13:00:04 +00:00
Jason Rumney
a18bb28da6 * w32term.c (x_draw_glyph_string_foreground)
(x_draw_composite_glyph_string_foreground): Implement overstriking.

* w32term.c (x_write_glyphs): Clear phys_cursor_on_p if current
phys_cursor's hpos is overwritten.  This is still not completely
correct, as it doesn't really make sense to use hpos at all to
get the cursor glyph (as that is relative to the width of the
characters on the line, which may have changed during the update).

* w32term.c (notice_overwritten_cursor): Handle the special case
of the cursor being in the first blank non-text line at the
end of a window.

* w32term.c (x_draw_hollow_cursor, x_draw_bar_cursor)
(x_draw_phys_cursor_glyph): Set phys_cursor_width here.
Compute from the x position returned by x_draw_glyphs.

* w32term.c (note_mode_line_or_margin_highlight): Renamed from
note_mode_line_highlight and extended.

* w32term.c (last_window): New variable.
(w32_read_socket) <WM_MOUSEMOVE>: Generate SELECT_WINDOW_EVENTs.
(note_mouse_movement): Remove reimplemented code in #if 0.
2003-01-22 23:04:27 +00:00
Jason Rumney
2bf04b9d20 2003-01-21 KOBAYASHI Yasuhiro <kobayays@otsukakj.co.jp>
* w32term.c (note_mode_line_highlight): Delete #if 0 to enable
	function w32_define_cursor.
	(note_mouse_highlight): Initialize, setup cursor accoding to mouse
	position, change member name output_data.x to output_data.w32 and
	add function w32_define_cursor.
	(show_mouse_face): Delete #if 0 to enable function w32_define_cursor
	and change member name output_data.x to output_data.w32.
	(w32_initialize_display_info): Setup
	dpyinfo->vertical_scroll_bar_cursor.

2003-01-21  David Ponce <david@dponce.com>

	* w32term.c (w32_encode_char): For DIM=1 charset, set
	ccl->reg[2] to -1 before calling ccl_driver. (Sync. with xterm.c
	x_encode_char change by Kenichi Handa <handa@m17n.org> on
	2002-09-30.
	(w32_draw_relief_rect): Declare all args.
	(w32_define_cursor): New.
2003-01-21 23:06:50 +00:00
Ben Key
9785d95b98 Revisited my earlier fix for the following entry in etc/PROBLEMS: 'Emacs built on Windows 9x/ME crashes at startup on Windows XP, or Emacs builtpart of on XP crashes at startup on Windows 9x/ME.' Fixed several Windows API errors detected by BoundsChecker 2002-12-18 06:16:28 +00:00
Jason Rumney
706ddb8f9a (last_mousemove_x, last_mousemove_y): New variables.
(w32_read_socket) <WM_MOUSEMOVE>: Use them to detect non-movement.
Be more careful about when help_events are generated.
2002-12-12 19:56:41 +00:00
Jason Rumney
2c26ee517f (w32_get_glyph_string_clip_rect): Clip cursor tightly. 2002-11-16 01:21:22 +00:00
Jason Rumney
4108c39dcb (x_draw_image_foreground)
(w32_draw_image_foreground_1): Use standard copy and invert
operations to draw images.
2002-11-15 23:33:34 +00:00
Jason Rumney
d30591dcce (x_draw_image_foreground, x_draw_image_glyph_string)
(w32_draw_image_foreground_1): Handle image masks.
(x_draw_image_glyph_string): Don't BitBlt transparently.
2002-11-15 18:55:19 +00:00
Juanma Barranquero
d67d16270c (w32_draw_fringe_bitmap): Remove unused local variable window. 2002-11-08 08:42:03 +00:00
Kim F. Storm
1b7334a40e (note_mouse_highlight): Don't use mouse-face if hidden. 2002-10-26 23:53:07 +00:00