Commit graph

17875 commits

Author SHA1 Message Date
Kim F. Storm
0bf7d00506 *** empty log message *** 2004-02-17 21:06:22 +00:00
Kim F. Storm
7371cef007 (in_read_avail_input): New static variable to handle re-entrancy.
(read_avail_input): Change buf to pinter to read_avail_input_buf.
Use in_read_avail_input to handle re-entrance; when re-entered,
fully initialize and use tmp_buf array instead of read_avail_input_buf.
2004-02-17 00:29:13 +00:00
Kim F. Storm
b9568dfc77 *** empty log message *** 2004-02-17 00:28:22 +00:00
Kim F. Storm
9940231136 Rework previous change; it didn't consider that the
buf array was allocated on the stack.
(prev_read): Remove variable.
(read_avail_input_buf): New static event buffer array.
(in_read_avail_input): New static variable to avoid re-entrancy.
(read_avail_input): Change buf to pinter to read_avail_input_buf.
Use in_read_avail_input to guard against re-entry.
Do not initialize read_avail_input_buf here; instead assume it
is always cleared on entry.  To ensure that, we clear (just) the
entries that were used before we return.
(init_keyboard): Initialize read_avail_input_buf here.
2004-02-16 23:13:13 +00:00
Kim F. Storm
ab90a54d2f *** empty log message *** 2004-02-16 23:11:58 +00:00
Eli Zaretskii
4e039f3f1f *** empty log message *** 2004-02-16 19:41:27 +00:00
Eli Zaretskii
6ff67d57ae (Fend_of_line): Doc fix. 2004-02-16 19:12:46 +00:00
Eli Zaretskii
7b5368c1a9 *** empty log message *** 2004-02-16 17:18:58 +00:00
Eli Zaretskii
ca4bc494c2 *** empty log message *** 2004-02-16 17:05:44 +00:00
Eli Zaretskii
fe088644a6 (prev_read): New static variable.
(read_avail_input): Use it to zero out only those slots in buf[]
that were used last time we were called.
2004-02-16 16:36:24 +00:00
Eli Zaretskii
3cf0b44b4a (obj): Move fringe.o from here...
(XOBJ, MAC_OBJ): ...to here.
2004-02-16 16:16:16 +00:00
Stephen Eglen
159c348e36 (init_fringe_bitmap): Define j in MAC_OS code. 2004-02-16 11:54:29 +00:00
Stefan Monnier
d2f1499943 Lisp_Object/int mixup. 2004-02-16 04:53:28 +00:00
Jason Rumney
f3336ea4a1 (w32_draw_fringe_bitmap): Handle overlay fringe bitmaps. 2004-02-16 00:54:02 +00:00
Jason Rumney
8d50508a88 *** empty log message *** 2004-02-16 00:53:34 +00:00
Kim F. Storm
ccbc43315d (syms_of_buffer): Doc fix for indicate-buffer-boundaries. 2004-02-15 17:39:43 +00:00
Kim F. Storm
2cc5265869 *** empty log message *** 2004-02-15 17:38:52 +00:00
Steven Tamm
dd4497dc17 (Vmac_emulate_three_button_mouse): New variable for
controlling emulation of a three button mouse with option and
command keys.
(Qreverse, mac_get_enumlated_btn): Handle the emulation
(mac_event_to_emacs_modifiers, XTread_socket): Ditto
2004-02-15 17:16:18 +00:00
Kim F. Storm
bd23113188 (init_fringe_bitmap) [MAC_OS, WORDS_BIG_ENDIAN]: Perform byte-swapping. 2004-02-15 16:19:00 +00:00
Kim F. Storm
c9159cb3f6 *** empty log message *** 2004-02-15 16:18:42 +00:00
Kim F. Storm
d30b6b3390 (Ffringe_bitmaps_at_pos): Add missing arg declarations. 2004-02-13 23:44:37 +00:00
Kim F. Storm
f21a7192c0 *** empty log message *** 2004-02-13 23:44:20 +00:00
Kim F. Storm
12fde2dcdf (struct draw_fringe_bitmap_params): Change member
bits from char to short to facilitate wider bitmaps.
(struct redisplay_interface): Fix prototype of define_fringe_bitmap
member.
2004-02-13 23:29:58 +00:00
Kim F. Storm
0881a0fd14 (struct fringe_bitmap): Change member bits from char to
short to facilitate 16 bits wide bitmaps.  Modify all standard
bitmaps accordingly.
(BYTES_PER_BITMAP_ROW, STANDARD_BITMAP_HEIGHT): New macros.
(FRBITS): Use STANDARD_BITMAP_HEIGHT instead of just sizeof.
(draw_fringe_bitmap): Ditto.
(init_fringe_bitmap) [MAC_OS]: Don't bitswap.
(init_fringe_bitmap) [HAVE_X_WINDOWS]: Enhance bitswapping to
handle up to 16 bits wide bitmaps.
(Fdefine_fringe_bitmap): Doc fix.  Handle wider bitmaps.
2004-02-13 23:28:52 +00:00
Kim F. Storm
dcd0c64591 (mac_draw_bitmap): Handle 16 bits wide bitmaps directly.
(x_draw_fringe_bitmap): Use enhanced mac_draw_bitmap, so we no longer
need to call mac_create_bitmap_from_bitmap_data and mac_free_bitmap.
2004-02-13 23:28:32 +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
Kim F. Storm
82b05d81af (x_draw_fringe_bitmap): Handle wider bitmaps (max 16 bits). 2004-02-13 23:27:38 +00:00
Kim F. Storm
9d7271e8a8 *** empty log message *** 2004-02-12 12:21:08 +00:00
Kim F. Storm
467e281a73 (Fwindow_fringes): Doc fix. 2004-02-12 12:12:41 +00:00
Jan Djärv
706c1e4f43 * xselect.c (x_get_foreign_selection): Add new optional parameter
time_stamp.
(Fx_get_selection_internal): Ditto, pass time_stamp to
x_get_foreign_selection.

* data.c (Fbyteorder): New function.
2004-02-10 17:20:15 +00:00
Jan Djärv
3a42401d9d * xselect.c (x_get_foreign_selection): Add new optional parameter
time_stamp.
(Fx_get_selection_internal): Ditto, pass time_stamp to
x_get_foreign_selection.
2004-02-10 17:19:14 +00:00
Jan Djärv
d4be0d3140 * data.c (Fbyteorder): New function. 2004-02-10 17:18:34 +00:00
Jan Djärv
c2d12b5d17 Move include stdio for some files. 2004-02-10 17:14:51 +00:00
Kim F. Storm
a510f26946 Add fringe.o to OBJ1. 2004-02-10 16:32:07 +00:00
Sam Steingold
4c1947b96e (w32_draw_fringe_bitmap): Fixed a typo in the last patch. 2004-02-09 18:49:44 +00:00
Jan Djärv
5890e9f7ac Move include stdio.h to same place as in other files. 2004-02-09 15:39:49 +00:00
Miles Bader
429e7e2d69 Resolve CVS conflicts 2004-02-09 12:42:04 +00:00
Kim F. Storm
41840482b0 (mac_draw_bitmap): Add overlay_p arg.
(x_draw_fringe_bitmap):  Handle overlayed fringe bitmaps;
thanks to YAMAMOTO Mitsuharu for advice on how to do this.
Use cursor color for displaying cursor in fringe.
2004-02-09 09:18:17 +00:00
Kim F. Storm
a3993cc86e *** empty log message *** 2004-02-09 09:17:22 +00:00
Kim F. Storm
82722af355 *** empty log message *** 2004-02-08 23:32:37 +00:00
Kim F. Storm
fe1a14c1eb (x_draw_fringe_bitmap): Handle overlayed fringe bitmaps.
Use cursor color for displaying cursor in fringe.
(x_redisplay_interface): Add null handlers for
define_fringe_bitmap and destroy_fringe_bitmap functions.
2004-02-08 23:21:19 +00:00
Kim F. Storm
6d9257263e (Voverflow_newline_into_fringe, syms_of_xdisp)
(left_bits, right_bits, up_arrow_bits, down_arrow_bits)
(continued_bits, continuation_bits, ov_bits, first_line_bits)
(last_line_bits, filled_box_cursor_bits, hollow_box_cursor_bits)
(bar_cursor_bits, hbar_cursor_bits, zv_bits, hollow_square_bits)
(fringe_bitmaps, draw_fringe_bitmap, draw_row_fringe_bitmaps)
(draw_window_fringes, compute_fringe_widths, update_window_fringes):
Move fringe handling vars and code to new file fringe.c.
(handle_display_prop): Handle left-fringe and right-fringe
display properties; store user fringe bitmaps in iterator.
(move_it_in_display_line_to): Handle cursor in fringe at eob.
(clear_garbaged_frames): Set force_flush_display_p if resized.
(redisplay_window): Redraw fringe bitmaps if not just_this_one_p.
(display_line): Handle cursor in fringe at eob.
(display_line): Set row user fringe bitmaps from iterator.
2004-02-08 23:20:52 +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
288670f579 (x_draw_fringe_bitmap): Copy unadapted code from
xterm.c to handle overlayed fringe bitmaps and to use cursor color
for displaying cursor in fringe.
(x_redisplay_interface): Add null handlers for
define_fringe_bitmap and destroy_fringe_bitmap functions.
2004-02-08 23:20:10 +00:00
Kim F. Storm
d5653b7876 (syms_of_fringe, init_fringe, init_fringe_once):
Add prototypes.
2004-02-08 23:19:48 +00:00
Kim F. Storm
21fb8f5690 (struct frame): New member force_flush_display_p. 2004-02-08 23:19:37 +00:00
Kim F. Storm
0fc4c63e47 (main) [HAVE_WINDOW_SYSTEM]: Call init_fringe_once,
syms_of_fringe, and init_fringe.
2004-02-08 23:19:25 +00:00
Kim F. Storm
5cbd733a77 (row_equal_p): Compare fringe bitmap faces and overlay
arrows.
(update_frame): Do flush_display if force_flush_display_p to
ensure display (specifically fringes) are updated in a timely
manner when resizing the frame by dragging the mouse.
(update_window_line): Update row if overlay arrow changed.
(scrolling_window): Redraw fringe bitmaps if fringe bitmap faces
or overlay arrow changed.
2004-02-08 23:19:15 +00:00
Kim F. Storm
2251a6f2b7 (FRINGE_ID_BITS): New definition for number of
bits allocated to hold a fringe number.  Increase number of bits
from 4 to 8 to allow user defined fringe bitmaps.
(struct glyph_row, struct it): New members left_user_fringe_bitmap,
left_user_fringe_face_id, right_user_fringe_bitmap,
right_user_fringe_face_id.
(enum fringe_bitmap_type, struct fringe_bitmap, fringe_bitmaps):
Move to new file fringe.c.
(MAX_FRINGE_BITMAPS): Define here.
(struct draw_fringe_bitmap_params): New members bits, cursor_p,
and overlay_p.  Change member which to int.
(struct redisplay_interface): New members define_fringe_bitmap
and destroy_fringe_bitmap.
(valid_fringe_bitmap_id_p): Add prototype.
(w32_init_fringe, w32_reset_fringes) [WINDOWS_NT]: Add prototypes.
2004-02-08 23:18:36 +00:00
Kim F. Storm
2d05deefc7 New file. Move original fringe related declarations
and code from dispextern.h and xdisp.c here.
Rework code to support user defined fringe bitmaps, redefining
standard bitmaps, ability to overlay user defined bitmap with
overlay arrow bitmap, and add faces to bitmaps.
(Voverflow_newline_into_fringe): Declare here.
(enum fringe_bitmap_align): New enum.
(..._bits): All bitmaps are now defined without bitswapping; that
is now done in init_fringe_once (if necessary).
(standard_bitmaps): New array with specifications for the
standard fringe bitmaps.
(fringe_faces): New array.
(valid_fringe_bitmap_id_p): New function.
(draw_fringe_bitmap_1): Rename from draw_fringe_bitmap.
(draw_fringe_bitmap): New function which draws fringe bitmap,
possibly overlaying bitmap with cursor in right fringe or the
overlay arrow in the left fringe.
(update_window_fringes): Do not handle overlay arrow here.
Compare and copy fringe bitmap faces.
(init_fringe_bitmap): New function.
(Fdefine_fringe_bitmap, Fdestroy_fringe_bitmap): New DEFUNs to
define and destroy user defined fringe bitmaps.
(Fset_fringe_bitmap_face): New DEFUN to set face for a fringe bitmap.
(Ffringe_bitmaps_at_pos): New DEFUN to read current fringe bitmaps.
(syms_of_fringe): New function.  Defsubr new DEFUNs.
DEFVAR_LISP Voverflow_newline_into_fringe.
(init_fringe_once, init_fringe): New functions.
(w32_init_fringe, w32_reset_fringes) [WINDOWS_NT]: New functions.
2004-02-08 23:18:16 +00:00