1
0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2024-12-19 10:22:27 +00:00
Commit Graph

258 Commits

Author SHA1 Message Date
Karl Heuer
c81412a05f (x_calc_absolute_position): Use menubar_height field.
In toolkit case, use outermost Emacs widget and its parent.
[USE_X_TOOLKIT] (x_make_frame_visible): Do call x_set_offset.
1995-05-24 04:41:16 +00:00
Karl Heuer
59e755be76 (Qvendor_specific_keysyms): New var.
(syms_of_xterm): Initialize and staticpro it.
(x_term_init): Initialize Vsystem_key_alist according to vendor.
1995-05-13 00:13:02 +00:00
Karl Heuer
10ceaf0356 (x_term_init): Add stub to initialize Vsystem_key_alist. 1995-04-29 04:17:56 +00:00
Karl Heuer
0ad5446c55 (x_term_init): If the previous kboard was the dummy one,
switch to the new one immediately.
1995-04-24 22:34:27 +00:00
Karl Heuer
0f9419350b (x_focus_frame, x_focus_event_frame, x_highlight_frame):
Delete these vars; now part of struct x_display_info.
(x_new_focus_frame): New arg DPYINFO.  Callers changed.
Use the struct members instead of the globals.
Call x_frame_rehighlight instead of XTframe_rehighlight, so we can
pass on the dpyinfo pointer.
(x_mouse_leave): New arg DPYINFO.  Callers changed.
(XTframe_rehighlight): New arg FRAME.  Callers changed.
Now does all the work in x_frame_rehighlight.
(x_frame_rehighlight): New function, code from XTframe_rehighlight.
(XTread_socket): Use the struct members instead of the globals.
(x_unfocus_frame, x_iconify_frame, x_destroy_window): Likewise.
(x_display_box_cursor, x_make_frame_invisible): Likewise.
(x_term_init): Initialize the struct members.
(x_initialize): Delete initialization of deleted globals.
1995-04-24 18:27:33 +00:00
Richard M. Stallman
2d7fc7e8f9 (x_term_init): Call XtSetLanguageProc only if HAVE_X11XTR6.
(XTread_socket): Pass dpyinfo to popup_get_selection.

(XTread_socket): For ConfigureNotify,
combine the USE_X_TOOLKIT and non-toolkit cases, which provides
some things that were missing in the former.
1995-04-14 03:58:51 +00:00
Richard M. Stallman
796e46975d (XTread_socket): Pass dpyinfo to popup_get_selection. 1995-04-11 20:33:52 +00:00
Richard M. Stallman
d806e7202a (XTread_socket): Make deiconify event only if frame was iconified. 1995-04-10 07:32:16 +00:00
Richard M. Stallman
16f60add1c (dumpglyphs): Cast FACE_DEFAULT to (XFontStruct *)
for comparison with face->font.
1995-04-07 18:33:16 +00:00
Karl Heuer
f8c25f1b67 Update copyright. 1995-04-07 02:21:52 +00:00
Karl Heuer
19126e1177 New arg DPYINFO to all callers of x_window_to_frame, x_any_window_to_frame,
and x_top_window_to_frame.
1995-04-03 23:37:17 +00:00
Karl Heuer
39f7900173 (x_delete_display): Extract kboard deletion, for modularity. 1995-03-31 03:57:05 +00:00
Karl Heuer
547d9db874 (x_term_init): Initialize cut_buffers_initialized. 1995-03-31 03:40:24 +00:00
Richard M. Stallman
1cf412ecec (XTmouse_position): New arg `insist'. 1995-03-26 21:12:11 +00:00
Karl Heuer
29b38361ea (get_perdisplay): Deleted.
(same_x_server): New function.
(x_term_init): If this display shares a keyboard with one we've
already opened, then share the structure.
(x_delete_display): Don't delete the kboard until the reference
count becomes zero.
1995-03-15 01:54:19 +00:00
Richard M. Stallman
f48f33caa6 (x_connection_closed): Ignore non-X frames.
Fix the logic for deleting frames that use separate minibuffers
that are on the dead connection.
1995-03-06 04:35:33 +00:00
Paul Reilly
5bf01b68c7 (x_bitmap_icon): Fix test for unallocated icon bitmap. 1995-02-14 21:48:14 +00:00
Richard M. Stallman
92e2441bd1 (x_display_bar_cursor): Use frame's cursor_width.
(x_connection_signal): New function.
(x_initialize): Use it as signal handler.
1995-02-14 14:22:29 +00:00
Karl Heuer
b9737ad379 [MULTI_PERDISPLAY] (x_term_init): Initialize perdisplay.
[MULTI_PERDISPLAY] (x_delete_display): Destroy perdisplay.
(x_delete_display): Use xfree, not free.
1995-02-04 00:12:17 +00:00
Richard M. Stallman
db3906fd07 (x_unqueue_events): Arg is now a Display *.
(x_start_queuing_selection_requests): Likewise.
(x_stop_queuing_selection_requests): Likewise.
1995-02-02 18:54:47 +00:00
Karl Heuer
a1b7a2ab66 [MULTI_PERDISPLAY] (get_perdisplay): Define this as an exported function. 1995-01-31 01:53:12 +00:00
Richard M. Stallman
c5acd733f2 (x_destroy_window): Don't let frame being destroyed remain in
x_focus_event_frame.
1995-01-25 00:44:32 +00:00
Richard M. Stallman
a0a7635faa Don't include param.h. 1995-01-08 20:19:47 +00:00
Richard M. Stallman
0299d313b8 (x_scroll_bar_handle_click): Use GC_WINDOWP.
(XTframe_rehighlight, x_window_to_scroll_bar): Use GC_FRAMEP.
1994-12-30 01:37:53 +00:00
Richard M. Stallman
9f67f20bf8 (XTupdate_begin): Fix backward test in previous change.
(x_display_box_cursor): Don't redraw old cursor spot in mouse face
if cursor was on a newline.

(XTread_socket): Handle button events from outside
the frame, received due to grabbing the mouse with a button.
1994-12-27 21:45:06 +00:00
Richard M. Stallman
37c2c98b16 (XTupdate_begin): Discard records of prior mouse highlight
when frame must be redrawn.

(x_make_frame_visible, x_make_frame_invisible)
(x_iconify_frame): Give error if frame has explicit_parent.
(x_new_font): Don't set window height if frame has explicit_parent.

(x_mouse_leave): New function broken out of XTread_socket.
When x_focus_event_frame is nonzero, assume that frame gets focus.
(XTread_socket): Use x_mouse_leave for LeaveNotify.
1994-12-23 05:12:32 +00:00
Karl Heuer
bddd097cb1 (XTread_socket): Generate iconify and deiconify events. 1994-11-04 04:00:50 +00:00
Karl Heuer
b30ec46658 (XTclear_end_of_line): Finish the line dance here too, just as was done in
XTwrite_glyphs.
1994-11-01 00:26:36 +00:00
Richard M. Stallman
77b686467c (fast_find_position): Special case if POS is end of buffer. 1994-11-01 00:07:34 +00:00
Richard M. Stallman
7f9c7f949a (x_delete_display): Call XrmDestroyDatabase.
(x_destroy_window): Rewrite to fetch dpyinfo just once.

[USE_X_TOOLKIT]: Make application context explicitly
and support multiple top-level shells.
(x_initialize): Call XtToolkitInitialize, XtCreateApplicationContext;
don't open display or make a shell.
(x_term_init): Call XtOpenDisplay.

(x_scroll_bar_create): Use XMapRaised directly.
(x_make_frame_visible, x_iconify_frame): Likewise.
(XMapWindow): Macro definition deleted.
(METABIT): Macro deleted.
(MAXDESC, FD_SETSIZE, FD_SET, FD_CLEAR, FD_ZERO, FD_ISSET): Likewise.
(x_id_name): Variable deleted.
1994-10-29 09:43:07 +00:00
Richard M. Stallman
7a13e8946b (x_catch_errors, x_check_errors, x_had_errors_p)
(x_uncatch_errors): Make the argument a display, not a frame.

(XTread_socket_fake_io_error): New variable.
(XTread_socket): Obey XTread_socket_fake_io_error.

(x_initialize): Init x_noop_count, x_focus_frame
and x_highlight_frame here.
(x_term_init): Not here.

(x_term_init): Open the connection first thing;
if that fails, don't allocate dpyinfo.

(x_delete_display): New function.
(x_connection_closed): New args dpyinfo and error_message.
Delete all frames on the dead display
and all frames using them for minibuffers.
Call x_delete_display.
Maybe signal a Lisp error.

(x_term_init): Don't report error here--just return 0.

(x_scroll_bar_report_motion): Store proper value in
*bar_window (the Emacs window, not the X window number).

(x_scroll_bar_report_motion): Don't clear *fp.

(x_wm_set_icon_pixmap): Use x_bitmap_pixmap.

(show_mouse_face): New arg dpyinfo.  All callers changed.
(clear_mouse_face): New arg dpyinfo.  All callers changed.

(scratch_cursor_gc): Variable deleted.
(dumpglyphs): Use scratch_cursor_gc in x_display_info.

(syms_of_xterm): Don't staticpro mouse_face_window.

(expose_all_windows, expose_all_icons): Variables deleted.
(BLOCK_INPUT_mask): Variable deleted.

(x_term_init): Set up x_id_name field.
(x_id_name): Variable deleted.

(x_font_table, x_font_table_size, x_n_fonts): Vars deleted.
(x_new_font): Use new fields.
(warp_mouse_on_deiconify): Unused variable deleted.

(x_term_init): Set up dpyinfo->xrdb.
Set up dpyinfo->vertical_scroll_bar_cursor.
(x_scroll_bar_create): Use vertical_scroll_bar_cursor slot.
(x_vertical_scroll_bar_cursor): Variable deleted.

(x_term_init): Really return dpyinfo.

(x_term_init): Call add_keyboard_wait_descriptor,
not change_keyboard_wait_descriptor.

(x_term_init): Pass new arg to init_sigio.
Don't set old_fcntl_owner.
Don't call change_input_fd.
(XTread_socket): Loop over displays and process input from each.

(x_display_name_list): New variable.
(syms_of_xterm): staticpro it.
Don't staticpro slots in the_x_screen.
(x_term_init): Update x_display_name_list along with x_display_list.
Actually malloc the x_display_info.
(the_x_screen): Variable deleted.
1994-10-26 09:26:40 +00:00
Richard M. Stallman
334208b772 Use FRAME_X_DISPLAY instead of x_current_display and XDISPLAY.
(x_make_frame_visible, x_make_frame_invisible):
Pass a frame ptr to x_sync.

(x_term_init): Init all the components of dpyinfo.

(x_display_info_for_display): New function.

(x_*_mod_mask): Variables deleted.
(x_x_to_emacs_modifiers, x_emacs_to_x_modifiers):
New arg dpyinfo; all callers changed.
Store the masks in that structure.

(icon_bitmap): Variable deleted.
(x_bitmap_icon): Use icon_bitmap_id in x_display_info.

(icon_font_info): Variable deleted.

(x_term_init): Set up `connection' field.

(x_find_modifier_meanings):
Arg is now struct x_display_info *.
(x_term_init): Return an x_display_info *.
Store all the data in it, including X atoms and xrdb.
Put the x_display_info structure on x_display_list.
Pass name as Lisp_Object.
(the_x_screen): Variable moved here.
(syms_of_xterm): Staticpro parts of the_x_screen.

(windowinfo): Variable deleted.

(Xatom_*): Variables deleted.
(x_iconify_frame, XTread_socket): Get atoms from the x_display_info,

(XTread_socket): Don't update Vmouse_depressed.

(x_mouse_grabbed): Variable deleted.
(note_mouse_highlight): Use grabbed field instead.
(XTmouse_position, XTread_socket): Likewise.

(x_calc_absolute_position, x_wm_set_size_hint):
Get screen height, width from the x_display_info structure.
1994-10-22 04:34:16 +00:00
Karl Heuer
0ccf5d73ba (do_line_dance): Decrement index only once per loop. 1994-10-18 01:29:09 +00:00
Morten Welinder
87485d6fc9 *** empty log message *** 1994-10-17 08:42:36 +00:00
Richard M. Stallman
990ba8548c (dumpglyphs): Explicitly draw background stipple.
(x_bitmap_icon): Arg FILE is now a Lisp_Object.
(x_iconify_frame, x_make_frame_visible): Supply FILE arg to it.

(x_bitmap_icon): Properly discard the previous bitmap.
(x_text_icon): Discard bitmap only if we have one.
1994-10-17 07:24:58 +00:00
Richard M. Stallman
7f2ae03622 (x_bitmap_icon): Allow bitmap to come from file.
(x_wm_set_icon_pixmap): Second arg is now pixmap_id;
call x_lookup_pixmap.
(x_text_icon): Call x_destroy_bitmap.
1994-10-15 22:01:22 +00:00
Karl Heuer
58769bee4d (stuffline, scraplines): Functions deleted.
(line_dance, line_dance_len, line_dance_in_progress): New vars.
(XTins_del_lines): Don't do any X calls; just update the array.
(do_line_dance): New function.  Do the X calls here.
(XTupdate_end, XTwrite_glyphs): Call do_line_dance.
1994-10-15 04:49:14 +00:00
Richard M. Stallman
8ed24d5a14 (x_new_font): Don't keep looping after the FONT property. 1994-10-14 04:45:04 +00:00
Richard M. Stallman
bdcd49ba41 (x_term_init): Call XtSetLanguageProc or XSetLocaleModifiers.
(x_make_frame_visible, x_iconify_frame):
Call x_bitmap_icon if frame wants a bitmap icon.
1994-10-11 09:27:47 +00:00
Karl Heuer
90e1eb6f4d (construct_mouse_click): Don't use XFASTINT as an lvalue. 1994-10-04 19:48:36 +00:00
Karl Heuer
e0c1aef22b (x_new_focus_frame, construct_mouse_click, construct_menu_click,
note_mouse_highlight, XTmouse_position, x_scroll_bar_create,
x_scroll_bar_set_handle, x_scroll_bar_move, XTset_vertical_scroll_bar,
XTredeem_scroll_bar, x_scroll_bar_handle_click, x_scroll_bar_note_movement,
x_scroll_bar_report_motion, XTread_socket, x_make_frame_visible): Use new
accessor macros instead of calling XSET directly.
1994-10-04 19:46:12 +00:00
Richard M. Stallman
c0a0492738 (input_signal_count): New variable.
(XTread_socket): Increment it.
(x_make_frame_visible): Exit final loop when XTread_sockets has run.
1994-10-04 19:38:53 +00:00
Paul Reilly
a263cd2dd9 (XTread_socket): Use popup_get_selection() for X11 menubar event handling. 1994-10-02 13:37:59 +00:00
Karl Heuer
b2cad82634 (x_new_font): New rule for computing column width. Factored out common code.
(XTset_vertical_scroll_bar): Use new width formula.
[!USE_X_TOOLKIT] (x_set_window_size): Likewise.
1994-09-28 00:59:24 +00:00
Karl Heuer
9bc4522e80 (x_scroll_bar_clear): Use type test macros. 1994-09-27 00:24:27 +00:00
Richard M. Stallman
4eacadbd66 (x_destroy_window): Decrement ref count of x_screen struct. 1994-09-23 04:54:46 +00:00
Richard M. Stallman
7965883ba7 (note_mouse_highlight): Pass new arg to overlays_at. 1994-09-21 06:44:59 +00:00
Karl Heuer
480407eb72 * xterm.c (x_new_font): Compute number of scrollbar columns. 1994-09-20 05:05:02 +00:00
Karl Heuer
bde7c50060 Add #include "intervals.h" 1994-09-17 03:15:29 +00:00
Richard M. Stallman
6ccf47d10f Delete X11 conditionals.
(XTupdate_end, XTupdate_begin, XTclear_end_of_line)
(XTclear_frame, XRINGBELL, stufflines, scraplines, dumprectangle)
(XTread_socket, x_draw_box, clear_cursor, refreshicon, x_iconify_frame)
(x_bitmap_icon, x_text_icon, x_new_font, x_term_init)
(x_calc_absolute_position, x_set_window_size)
(x_make_frame_visible, x_make_frame_invisible): Delete X10 code.
(dumpqueue, x_do_pending_expose, dumpborder, XEvent, x_read_exposes)
(enqueue_event, dequeue_event, queue_event_count)
(mouse_event_pending_p, x_set_resize_hint): Delete X10 versions.
1994-09-16 09:23:15 +00:00