(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.
(unexec): Do CHECH_SCNHDR on _RCONST if that's defined.
Ignore rdata_section if there is none.
(update_dynamic_symbols): New arg new_name. Call changed.
Fix some calls to WRITE.
(fatal_unexec): Declare all arguments.
(struct x_display_info): New fields bitmaps, bitmaps_size, bitmaps_last.
(struct x_bitmap_record): Structure moved here.
(struct font_info): New type.
(struct x_display_info): New fields font_table, font_table_size and n_fonts.
(struct x_display_info): New field scratch_cursor_gc.
(mouse_face_*): New fields.
(struct x_display_info): New field x_id_name.
(struct x_display_info): Replace elements `name'
and `face_list_cache' with one cons cell `name_list_element'.
(x_display_name_list): Variable declared.
until the frame is put on the frame list.
(Fx_close_connection): Call x_delete_display.
(x_display_info_for_name, Fx_open_connection):
Signal error if x_term_init fails.
(Fx_open_connection): New arg must_succeed.
(x_real_positions): Catch errors and retry if error happens.
No need to block input here.
(Fx_create_frame): Don't store the frame name
till after FRAME_X_DISPLAY_INFO is set up.
(Fx_close_connection): Renamed from Fx_close_current_connection
Many doc fixes and Lisp function arg renamings.
(x_bitmaps, x_bitmap_size, x_bitmap_last):
Variables deleted. Use fields in x_display_info instead.
(x_bitmaps_free): Variable deleted.
(x_destroy_bitmap, x_allocate_bitmap_record): Don't use or set it.
(x_allocate_bitmap_record): New arg f. Callers changed.
(x_lookup_pixmap): Function deleted.
(x_destroy_all_bitmaps): New function.
(Fx_close_current_connection): Call x_destroy_all_bitmaps.
Free the fonts in the font table. Free various other data
that dpyinfo points to. Avoid using Fdelq.
(x_set_name, Fx_create_frame): Use x_id_name field.
(Fx_close_current_connection):
Call delete_keyboard_wait_descriptor.
(Fx_close_current_connection): Call check_x_display_info.
Delete the display from x_display_list and x_display_name_list.
(Fx_display_list): New function.
(syms_of_xfns): defsubr it.
(Fx_list_fonts): Use `name_list_element' field.
(x_display_info_for_name): Scan x_display_name_list
along with x_display_list.
(stuff_char): Do nothing if read_socket_hook.
(setpgrp_of_tty): Function deleted.
(init_sigio): Take fd as argument. Callers changed.
Don't call request_sigio; do the work here.
(request_sigio, unrequest_sigio): Do nothing if read_socket_hook.
(init_sys_modes): Don't call EMACS_GET_TTY unless we are going
to change the settings.
(non_keyboard_wait_mask): New variable.
(Fset_process_filter): Update non_keyboard_wait_mask
(create_process, Fopen_network_stream, deactivate_process):
(init_process, sigchld_handler): Likewise.
(wait_reading_process_input): Maybe use non_keyboard_wait_mask.
(add_keyboard_wait_descriptor):
Renamed from change_keyboard_wait_descriptor.
Clear the old descriptor's bit only the first call.
(delete_keyboard_wait_descriptor): New function.
(keyboard_bit_set): New function.
(wait_reading_process_input): Use keyboard_bit_set.
Start the loop over process descs from 0, and explicitly
ignore non-process input descs.
(init_process): Don't init keyboard_descriptor.
(keyboard_descriptor): Variable deleted.
(add_keyboard_wait_descriptor): Don't set keyboard_descriptor.
(delete_keyboard_wait_descriptor): New function.
(Xatom_*): Variables deleted.
Use slots in x_display_info structure instead.
(symbol_to_x_atom, x_atom_to_symbol):
New arg dpyinfo. All callers changed.
(xatoms_of_xselect): Function deleted.
(struct bp): New field heap.
(get_bloc, free_bloc, obtain, r_alloc_sbrk): Update new fields.
(reorder_bloc): New function.
(update_heap_bloc_correspondence):
Renamed from update_heap_free_pointers. Update new fields.
(relinquish): Add error check for new fields.
(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.
(check_x_display_info): New function.
(Fx_create_frame): Use it.
(x_screen_planes): New function.
(EMACS_CLASS): Macro moved to xterm.h.
(Qdisplay): New variable.
(syms_of_xfns): Set it up.
(Fx_create_frame): Handle display parameter
which says where to get the FRAME_X_DISPLAY_INFO.
(x_display_info_for_name): New function.
(select_visual): New arg dpy.
(Fx_open_connection): Get dpyinfo from x_term_init.
Don't set up atoms, xrdb here. Pass name as Lisp_Object.
(the_x_screen): Variable moved to xterm.c.
(syms_of_xfns): Don't staticpro it here.
(xrdb): Variable deleted.
(Fx_get_resource): Use selected_frame's xrdb.
(x_get_resource_string): Likewise.
(Fx_open_connection): Store the atoms in x_display_info.
(hack_wm_protocols): New arg f. Get atoms from x_display_info.
(x_window): Get atoms from x_display_info.
(Vmouse_depressed, mouse_buffer_offset): Variables deleted.
(syms_of_xfns): Delete Lisp variables too.
(Fx_synchronize): Take frame as arg.
(Fx_close_current_connection): Take frame as arg. Error is not fatal.
(mouse_timestamp): Variable deleted.
(screen_visual, x_screen_planes): Variables deleted.
(x_screen, x_screen_height, x_screen_width): Variables deleted.
(Fx_open_connection): Don't set them here.
Put that info in the x_display_info structure.
(x_window): Get the visual from x_display_info structure.
(x_decode_color): Use n_planes from x_display_info structure.
Use FRAME_X_DISPLAY instead of x_current_display and XDISPLAY.
(x_in_use): New variable,
(check_x, using_x_p): Test x_in_use.
(Fx_open_connection): Set x_in_use.
(check_x_frame): New function.
(defined_color): New arg f specifies frame. Callers changed.
(x_decode_color): New arg f. All callers changed.
(Fx_color_values, Fx_color_defined_p): New arg FRAME.
Use check_x_frame.
(Fx_list_fonts): Use check_x_frame.
(EVENT_QUEUES_EMPTY, Ftrack_mouse, tracking_off): Changed accordingly.
(kbd_buffer_get_event): Let do_mouse_tracking specify the display
for mouse tracking.
selected_frame. Pass frame to x_stop_queuing_selection_requests and
x_start_queuing_selection_requests.
(x_own_selection, Fx_disown_selection_internal, Fx_selection_exists_p)
(Fx_store_cut_buffer_internal, Fx_get_cut_buffer_internal)
(Fx_rotate_cut_buffers_internal): Get display from selected_frame.
search_fastmap.
(syms_of_search): Initialize it.
(searchbuf_head): New variable.
(compile_pattern_1): Renamed from compile_pattern and made static.
Copy the regexp string in case the caller modifies it in place later.
(compile_pattern): New code, uses a cached entry if one is available.
The pattern buffer is now a return value instead of an arg.
(set_search_regs): Set num_regs directly, since there's no active
pattern buffer to pass to re_set_registers.
(Fstore_match_data): Likewise.
(Flooking_at): Use the new calling convention for compile_pattern.
(Fstring_match, fast_string_match, search_buffer): Likewise.
