Mercurial > hg > xemacs-beta
annotate src/gpmevent.c @ 2720:6fa9919a9a0b
[xemacs-hg @ 2005-04-08 23:10:01 by crestani]
ChangeLog addition:
2005-04-01 Marcus Crestani <crestani@xemacs.org>
The new allocator.
New configure flag: `MC_ALLOC':
* configure.ac (XE_COMPLEX_ARG_ENABLE): Add `--enable-mc-alloc' as
a new configure flag.
* configure.in (AC_INIT_PARSE_ARGS): Add `--mc-alloc' as a new
configure flag.
* configure.usage: Add description for `mc-alloc'.
DUMP_IN_EXEC:
* Makefile.in.in: Condition the installation of a separate dump
file on !DUMP_ON_EXEC.
* configure.ac (XE_COMPLEX_ARG_ENABLE): Add
`--enable-dump-in-exec' as a new configure flag.
* configure.ac: DUMP_IN_EXEC is define as default for PDUMP but
not default for MC_ALLOC.
* configure.in (AC_INIT_PARSE_ARGS): Add `--dump-in-exec' as a
new configure flag.
* configure.in: DUMP_IN_EXEC is define as default for PDUMP but
not default for MC_ALLOC.
* configure.usage: Add description for `dump-in-exec'.
lib-src/ChangeLog addition:
2005-04-01 Marcus Crestani <crestani@xemacs.org>
The new allocator.
DUMP_IN_EXEC:
* Makefile.in.in: Only compile insert-data-in-exec if
DUMP_IN_EXEC is defined.
lisp/ChangeLog addition:
2005-04-01 Marcus Crestani <crestani@xemacs.org>
The new allocator.
MEMORY_USAGE_STATS
* diagnose.el: Add new lisp function to pretty print statistics
about the new allocator.
* diagnose.el (show-mc-alloc-memory-usage): New.
modules/ChangeLog addition:
2005-04-01 Marcus Crestani <crestani@xemacs.org>
The new allocator.
Remove Lcrecords:
* postgresql/postgresql.c (allocate_pgconn): Allocate with new
allocator.
* postgresql/postgresql.c (allocate_pgresult): Allocate PGresult
with new allocator.
* postgresql/postgresql.h (struct Lisp_PGconn): Add
lrecord_header.
* postgresql/postgresql.h (struct Lisp_PGresult): Add
lrecord_header.
* ldap/eldap.c (allocate_ldap): Allocate with new allocator.
* ldap/eldap.h (struct Lisp_LDAP): Add lrecord_header.
nt/ChangeLog addition:
2005-04-01 Marcus Crestani <crestani@xemacs.org>
The new allocator.
New configure flag: `MC_ALLOC':
* config.inc.samp: Add new flag `MC_ALLOC'.
* xemacs.mak: Add flag and configuration output for `MC_ALLOC'.
New files:
* xemacs.dsp: Add source files mc-alloc.c and mc-alloc.h.
* xemacs.mak: Add new object file mc-alloc.obj to dependencies.
src/ChangeLog addition:
2005-04-01 Marcus Crestani <crestani@xemacs.org>
The new allocator.
New configure flag: `MC_ALLOC':
* config.h.in: Add new flag `MC_ALLOC'.
New files:
* Makefile.in.in: Add new object file mc-alloc.o.
* depend: Add new files to dependencies.
* mc-alloc.c: New.
* mc-alloc.h: New.
Running the new allocator from XEmacs:
* alloc.c (deadbeef_memory): Moved to mc-alloc.c.
* emacs.c (main_1): Initialize the new allocator and add
syms_of_mc_alloc.
* symsinit.h: Add syms_of_mc_alloc.
New lrecord allocation and free functions:
* alloc.c (alloc_lrecord): New. Allocates an lrecord, includes
type checking and initializing of the lrecord_header.
* alloc.c (noseeum_alloc_lrecord): Same as above, but increments
the NOSEEUM cons counter.
* alloc.c (free_lrecord): New. Calls the finalizer and frees the
lrecord.
* lrecord.h: Add lrecord allocation prototypes and comments.
Remove old lrecord FROB block allocation:
* alloc.c (allocate_lisp_storage): Former function to expand
heap. Not needed anymore, remove.
* alloc.c: Completely remove `Fixed-size type macros'
* alloc.c (release_breathing_space): Remove.
* alloc.c (memory_full): Remove release_breathing_space.
* alloc.c (refill_memory_reserve): Remove.
* alloc.c (TYPE_ALLOC_SIZE): Remove.
* alloc.c (DECLARE_FIXED_TYPE_ALLOC): Remove.
* alloc.c (ALLOCATE_FIXED_TYPE_FROM_BLOCK): Remove.
* alloc.c (ALLOCATE_FIXED_TYPE_1): Remove.
* alloc.c (ALLOCATE_FIXED_TYPE): Remove.
* alloc.c (NOSEEUM_ALLOCATE_FIXED_TYPE): Remove.
* alloc.c (struct Lisp_Free): Remove.
* alloc.c (LRECORD_FREE_P): Remove.
* alloc.c (MARK_LRECORD_AS_FREE): Remove.
* alloc.c (MARK_LRECORD_AS_NOT_FREE): Remove.
* alloc.c (PUT_FIXED_TYPE_ON_FREE_LIST): Remove.
* alloc.c (FREE_FIXED_TYPE): Remove.
* alloc.c (FREE_FIXED_TYPE_WHEN_NOT_IN_GC): Remove.
Allocate old lrecords with new allocator:
* alloc.c: DECLARE_FIXED_TYPE_ALLOC removed for all lrecords
defined in alloc.c.
* alloc.c (Fcons): Allocate with new allocator.
* alloc.c (noseeum_cons): Allocate with new allocator.
* alloc.c (make_float): Allocate with new allocator.
* alloc.c (make_bignum): Allocate with new allocator.
* alloc.c (make_bignum_bg): Allocate with new allocator.
* alloc.c (make_ratio): Allocate with new allocator.
* alloc.c (make_ratio_bg): Allocate with new allocator.
* alloc.c (make_ratio_rt): Allocate with new allocator.
* alloc.c (make_bigfloat): Allocate with new allocator.
* alloc.c (make_bigfloat_bf): Allocate with new allocator.
* alloc.c (make_compiled_function): Allocate with new allocator.
* alloc.c (Fmake_symbol): Allocate with new allocator.
* alloc.c (allocate_extent): Allocate with new allocator.
* alloc.c (allocate_event): Allocate with new allocator.
* alloc.c (make_key_data): Allocate with new allocator.
* alloc.c (make_button_data): Allocate with new allocator.
* alloc.c (make_motion_data): Allocate with new allocator.
* alloc.c (make_process_data): Allocate with new allocator.
* alloc.c (make_timeout_data): Allocate with new allocator.
* alloc.c (make_magic_data): Allocate with new allocator.
* alloc.c (make_magic_eval_data): Allocate with new allocator.
* alloc.c (make_eval_data): Allocate with new allocator.
* alloc.c (make_misc_user_data): Allocate with new allocator.
* alloc.c (Fmake_marker): Allocate with new allocator.
* alloc.c (noseeum_make_marker): Allocate with new allocator.
* alloc.c (make_uninit_string): Allocate with new allocator.
* alloc.c (resize_string): Allocate with new allocator.
* alloc.c (make_string_nocopy): Allocate with new allocator.
Garbage Collection:
* alloc.c (GC_CHECK_NOT_FREE): Remove obsolete assertions.
* alloc.c (SWEEP_FIXED_TYPE_BLOCK): Remove.
* alloc.c (SWEEP_FIXED_TYPE_BLOCK_1): Remove.
* alloc.c (sweep_conses): Remove.
* alloc.c (free_cons): Use new allocator to free.
* alloc.c (sweep_compiled_functions): Remove.
* alloc.c (sweep_floats): Remove.
* alloc.c (sweep_bignums): Remove.
* alloc.c (sweep_ratios): Remove.
* alloc.c (sweep_bigfloats): Remove.
* alloc.c (sweep_symbols): Remove.
* alloc.c (sweep_extents): Remove.
* alloc.c (sweep_events): Remove.
* alloc.c (sweep_key_data): Remove.
* alloc.c (free_key_data): Use new allocator to free.
* alloc.c (sweep_button_data): Remove.
* alloc.c (free_button_data): Use new allocator to free.
* alloc.c (sweep_motion_data): Remove.
* alloc.c (free_motion_data): Use new allocator to free.
* alloc.c (sweep_process_data): Remove.
* alloc.c (free_process_data): Use new allocator to free.
* alloc.c (sweep_timeout_data): Remove.
* alloc.c (free_timeout_data): Use new allocator to free.
* alloc.c (sweep_magic_data): Remove.
* alloc.c (free_magic_data): Use new allocator to free.
* alloc.c (sweep_magic_eval_data): Remove.
* alloc.c (free_magic_eval_data): Use new allocator to free.
* alloc.c (sweep_eval_data): Remove.
* alloc.c (free_eval_data): Use new allocator to free.
* alloc.c (sweep_misc_user_data): Remove.
* alloc.c (free_misc_user_data): Use new allocator to free.
* alloc.c (sweep_markers): Remove.
* alloc.c (free_marker): Use new allocator to free.
* alloc.c (garbage_collect_1): Remove release_breathing_space.
* alloc.c (gc_sweep): Remove all the old lcrecord and lrecord
related stuff. Sweeping now works like this: compact string
chars, finalize, sweep.
* alloc.c (common_init_alloc_early): Remove old lrecord
initializations, remove breathing_space.
* emacs.c (Fdump_emacs): Remove release_breathing_space.
* lisp.h: Remove prototype for release_breathing_space.
* lisp.h: Adjust the special cons mark makros.
Lrecord Finalizer:
* alloc.c: Add finalizer to lrecord definition.
* alloc.c (finalize_string): Add finalizer for string.
* bytecode.c: Add finalizer to lrecord definition.
* bytecode.c (finalize_compiled_function): Add finalizer for
compiled function.
* marker.c: Add finalizer to lrecord definition.
* marker.c (finalize_marker): Add finalizer for marker.
These changes build the interface to mc-alloc:
* lrecord.h (MC_ALLOC_CALL_FINALIZER): Tell mc-alloc how to
finalize lrecords.
* lrecord.h (MC_ALLOC_CALL_FINALIZER_FOR_DISKSAVE): Tell
mc-alloc how to finalize for disksave.
Unify lrecords and lcrecords:
* lisp.h (struct Lisp_String): Adjust string union hack to
new lrecord header.
* lrecord.h: Adjust comments.
* lrecord.h (struct lrecord_header): The new lrecord header
includes type, lisp-readonly, free, and uid.
* lrecord.h (set_lheader_implementation): Adjust to new
lrecord_header.
* lrecord.h (struct lrecord_implementation): The field basic_p
for indication of an old lrecord is not needed anymore, remove.
* lrecord.h (MAKE_LRECORD_IMPLEMENTATION): Remove basic_p.
* lrecord.h (MAKE_EXTERNAL_LRECORD_IMPLEMENTATION): Remove
basic_p.
* lrecord.h (copy_sized_lrecord): Remove distinction between
old lrecords and lcrecords.
* lrecord.h (copy_lrecord): Remove distinction between old
lrecords and lcrecords.
* lrecord.h (zero_sized_lrecord): Remove distinction between
old lrecords and lcrecords.
* lrecord.h (zero_lrecord): Remove distinction between old
lrecords and lcrecords.
Remove lcrecords and lcrecord lists:
* alloc.c (basic_alloc_lcrecord): Not needed anymore, remove.
* alloc.c (very_old_free_lcrecord): Not needed anymore, remove.
* alloc.c (copy_lisp_object): No more distinction between
lrecords and lcrecords.
* alloc.c (all_lcrecords): Not needed anymore, remove.
* alloc.c (make_vector_internal): Allocate as lrecord.
* alloc.c (make_bit_vector_internal): Allocate as lrecord.
* alloc.c: Completely remove `lcrecord lists'.
* alloc.c (free_description): Remove.
* alloc.c (lcrecord_list_description): Remove.
* alloc.c (mark_lcrecord_list): Remove.
* alloc.c (make_lcrecord_list): Remove.
* alloc.c (alloc_managed_lcrecord): Remove.
* alloc.c (free_managed_lcrecord): Remove.
* alloc.c (alloc_automanaged_lcrecord): Remove.
* alloc.c (free_lcrecord): Remove.
* alloc.c (lcrecord_stats): Remove.
* alloc.c (tick_lcrecord_stats): Remove.
* alloc.c (disksave_object_finalization_1): Add call to
mc_finalize_for_disksave. Remove the lcrecord way to visit all
objects.
* alloc.c (kkcc_marking): Remove XD_FLAG_FREE_LISP_OBJECT
* alloc.c (sweep_lcrecords_1): Remove.
* alloc.c (common_init_alloc_early): Remove everything related
to lcrecords, remove old lrecord initializations,
* alloc.c (init_lcrecord_lists): Not needed anymore, remove.
* alloc.c (reinit_alloc_early): Remove everything related to
lcrecords.
* alloc.c (init_alloc_once_early): Remove everything related to
lcrecords.
* buffer.c (allocate_buffer): Allocate as lrecord.
* buffer.c (nuke_all_buffer_slots): Use lrecord functions.
* buffer.c (common_init_complex_vars_of_buffer): Allocate as
lrecord.
* buffer.h (struct buffer): Add lrecord_header.
* casetab.c (allocate_case_table): Allocate as lrecord.
* casetab.h (struct Lisp_Case_Table): Add lrecord_header.
* charset.h (struct Lisp_Charset): Add lrecord_header.
* chartab.c (fill_char_table): Use lrecord functions.
* chartab.c (Fmake_char_table): Allocate as lrecord.
* chartab.c (make_char_table_entry): Allocate as lrecord.
* chartab.c (copy_char_table_entry): Allocate as lrecord.
* chartab.c (Fcopy_char_table): Allocate as lrecord.
* chartab.c (put_char_table): Use lrecord functions.
* chartab.h (struct Lisp_Char_Table_Entry): Add lrecord_header.
* chartab.h (struct Lisp_Char_Table): Add lrecord_header.
* console-impl.h (struct console): Add lrecord_header.
* console-msw-impl.h (struct Lisp_Devmode): Add lrecord_header.
* console-msw-impl.h (struct mswindows_dialog_id): Add
lrecord_header.
* console.c (allocate_console): Allocate as lrecord.
* console.c (nuke_all_console_slots): Use lrecord functions.
* console.c (common_init_complex_vars_of_console): Allocate as
lrecord.
* data.c (make_weak_list): Allocate as lrecord.
* data.c (make_weak_box): Allocate as lrecord.
* data.c (make_ephemeron): Allocate as lrecord.
* database.c (struct Lisp_Database): Add lrecord_header.
* database.c (allocate_database): Allocate as lrecord.
* device-impl.h (struct device): Add lrecord_header.
* device-msw.c (allocate_devmode): Allocate as lrecord.
* device.c (nuke_all_device_slots): Use lrecord functions.
* device.c (allocate_device): Allocate as lrecord.
* dialog-msw.c (handle_question_dialog_box): Allocate as lrecord.
* elhash.c (struct Lisp_Hash_Table): Add lrecord_header.
* elhash.c (make_general_lisp_hash_table): Allocate as lrecord.
* elhash.c (Fcopy_hash_table): Allocate as lrecord.
* event-stream.c: Lcrecord lists Vcommand_builder_free_list and
Vtimeout_free_list are no longer needed. Remove.
* event-stream.c (allocate_command_builder): Allocate as lrecord.
* event-stream.c (free_command_builder): Use lrecord functions.
* event-stream.c (event_stream_generate_wakeup): Allocate as
lrecord.
* event-stream.c (event_stream_resignal_wakeup): Use lrecord
functions.
* event-stream.c (event_stream_disable_wakeup): Use lrecord
functions.
* event-stream.c (reinit_vars_of_event_stream): Lcrecord lists
remove.
* events.h (struct Lisp_Timeout): Add lrecord_header.
* events.h (struct command_builder): Add lrecord_header.
* extents-impl.h (struct extent_auxiliary): Add lrecord_header.
* extents-impl.h (struct extent_info): Add lrecord_header.
* extents.c (allocate_extent_auxiliary): Allocate as lrecord.
* extents.c (allocate_extent_info): Allocate as lrecord.
* extents.c (copy_extent): Allocate as lrecord.
* faces.c (allocate_face): Allocate as lrecord.
* faces.h (struct Lisp_Face): Add lrecord_header.
* file-coding.c (allocate_coding_system): Allocate as lrecord.
* file-coding.c (Fcopy_coding_system): Allocate as lrecord.
* file-coding.h (struct Lisp_Coding_System): Add lrecord_header.
* fns.c (Ffillarray): Allocate as lrecord.
* frame-impl.h (struct frame): Add lrecord_header.
* frame.c (nuke_all_frame_slots): Use lrecord functions.
* frame.c (allocate_frame_core): Allocate as lrecord.
* glyphs.c (allocate_image_instance): Allocate as lrecord.
* glyphs.c (Fcolorize_image_instance): Allocate as lrecord.
* glyphs.c (allocate_glyph): Allocate as lrecord.
* glyphs.h (struct Lisp_Image_Instance): Add lrecord_header.
* glyphs.h (struct Lisp_Glyph): Add lrecord_header.
* gui.c (allocate_gui_item): Allocate as lrecord.
* gui.h (struct Lisp_Gui_Item): Add lrecord_header.
* keymap.c (struct Lisp_Keymap): Add lrecord_header.
* keymap.c (make_keymap): Allocate as lrecord.
* lisp.h (struct Lisp_Vector): Add lrecord_header.
* lisp.h (struct Lisp_Bit_Vector): Add lrecord_header.
* lisp.h (struct weak_box): Add lrecord_header.
* lisp.h (struct ephemeron): Add lrecord_header.
* lisp.h (struct weak_list): Add lrecord_header.
* lrecord.h (struct lcrecord_header): Not used, remove.
* lrecord.h (struct free_lcrecord_header): Not used, remove.
* lrecord.h (struct lcrecord_list): Not needed anymore, remove.
* lrecord.h (lcrecord_list): Not needed anymore, remove.
* lrecord.h: (enum data_description_entry_flags): Remove
XD_FLAG_FREE_LISP_OBJECT.
* lstream.c: Lrecord list Vlstream_free_list remove.
* lstream.c (Lstream_new): Allocate as lrecord.
* lstream.c (Lstream_delete): Use lrecod functions.
* lstream.c (reinit_vars_of_lstream): Vlstream_free_list
initialization remove.
* lstream.h (struct lstream): Add lrecord_header.
* emacs.c (main_1): Remove lstream initialization.
* mule-charset.c (make_charset): Allocate as lrecord.
* objects-impl.h (struct Lisp_Color_Instance): Add
lrecord_header.
* objects-impl.h (struct Lisp_Font_Instance): Add lrecord_header.
* objects.c (Fmake_color_instance): Allocate as lrecord.
* objects.c (Fmake_font_instance): Allocate as lrecord.
* objects.c (reinit_vars_of_objects): Allocate as lrecord.
* opaque.c: Lcreord list Vopaque_ptr_list remove.
* opaque.c (make_opaque): Allocate as lrecord.
* opaque.c (make_opaque_ptr): Allocate as lrecord.
* opaque.c (free_opaque_ptr): Use lrecord functions.
* opaque.c (reinit_opaque_early):
* opaque.c (init_opaque_once_early): Vopaque_ptr_list
initialization remove.
* opaque.h (Lisp_Opaque): Add lrecord_header.
* opaque.h (Lisp_Opaque_Ptr): Add lrecord_header.
* emacs.c (main_1): Remove opaque variable initialization.
* print.c (default_object_printer): Use new lrecord_header.
* print.c (print_internal): Use new lrecord_header.
* print.c (debug_p4): Use new lrecord_header.
* process.c (make_process_internal): Allocate as lrecord.
* procimpl.h (struct Lisp_Process): Add lrecord_header.
* rangetab.c (Fmake_range_table): Allocate as lrecord.
* rangetab.c (Fcopy_range_table): Allocate as lrecord.
* rangetab.h (struct Lisp_Range_Table): Add lrecord_header.
* scrollbar.c (create_scrollbar_instance): Allocate as lrecord.
* scrollbar.h (struct scrollbar_instance): Add lrecord_header.
* specifier.c (make_specifier_internal): Allocate as lrecord.
* specifier.h (struct Lisp_Specifier): Add lrecord_header.
* symbols.c:
* symbols.c (Fmake_variable_buffer_local): Allocate as lrecord.
* symbols.c (Fdontusethis_set_symbol_value_handler): Allocate
as lrecord.
* symbols.c (Fdefvaralias): Allocate as lrecord.
* symeval.h (struct symbol_value_magic): Add lrecord_header.
* toolbar.c (update_toolbar_button): Allocate as lrecord.
* toolbar.h (struct toolbar_button): Add lrecord_header.
* tooltalk.c (struct Lisp_Tooltalk_Message): Add lrecord_header.
* tooltalk.c (make_tooltalk_message): Allocate as lrecord.
* tooltalk.c (struct Lisp_Tooltalk_Pattern): Add lrecord_header.
* tooltalk.c (make_tooltalk_pattern): Allocate as lrecord.
* ui-gtk.c (allocate_ffi_data): Allocate as lrecord.
* ui-gtk.c (allocate_emacs_gtk_object_data): Allocate as lrecord.
* ui-gtk.c (allocate_emacs_gtk_boxed_data): Allocate as lrecord.
* ui-gtk.h (structs): Add lrecord_header.
* window-impl.h (struct window): Add lrecord_header.
* window-impl.h (struct window_mirror): Add lrecord_header.
* window.c (allocate_window): Allocate as lrecord.
* window.c (new_window_mirror): Allocate as lrecord.
* window.c (make_dummy_parent): Allocate as lrecord.
MEMORY_USAGE_STATS
* alloc.c (fixed_type_block_overhead): Not used anymore, remove.
* buffer.c (compute_buffer_usage): Get storage size from new
allocator.
* marker.c (compute_buffer_marker_usage): Get storage size from
new allocator.
* mule-charset.c (compute_charset_usage): Get storage size from
new allocator.
* scrollbar-gtk.c (gtk_compute_scrollbar_instance_usage): Get
storage size from new allocator.
* scrollbar-msw.c (mswindows_compute_scrollbar_instance_usage):
Get storage size from new allocator.
* scrollbar-x.c (x_compute_scrollbar_instance_usage): Get
storage size from new allocator.
* scrollbar.c (compute_scrollbar_instance_usage): Get storage
size from new allocator.
* unicode.c (compute_from_unicode_table_size_1): Get storage
size from new allocator.
* unicode.c (compute_to_unicode_table_size_1): Get storage size
from new allocator.
* window.c (compute_window_mirror_usage): Get storage size from
new allocator.
* window.c (compute_window_usage): Get storage size from new
allocator.
MC_ALLOC_TYPE_STATS:
* alloc.c (alloc_lrecord): Bump lrecord count.
* alloc.c (noseeum_alloc_lrecord): Bump lrecord count.
* alloc.c (struct lrecord_stats): Storage for counts.
* alloc.c (init_lrecord_stats): Zero statistics.
* alloc.c (inc_lrecord_stats): Increase the statistic.
* alloc.c (dec_lrecord_stats): Decrease the statistic.
* alloc.c (gc_plist_hack): Used to print the information.
* alloc.c (Fgarbage_collect): Return the collected information.
* mc-alloc.c (remove_cell): Decrease lrecord count.
* mc-alloc.h: Set flag MC_ALLOC_TYPE_STATS.
* emacs.c (main_1): Init lrecord statistics.
* lrecord.h: Add prototypes for *_lrecord_stats.
Strings:
* alloc.c (Fmake_string): Initialize ascii_begin to zero.
* alloc.c (gc_count_num_short_string_in_use): Remove.
* alloc.c (gc_count_string_total_size): Remove.
* alloc.c (gc_count_short_string_total_size): Remove.
* alloc.c (debug_string_purity): Remove.
* alloc.c (debug_string_purity_print): Remove.
* alloc.c (sweep_strings): Remove.
Remove static C-readonly Lisp objects:
* alloc.c (c_readonly): Not needed anymore, remove.
* alloc.c (GC_CHECK_LHEADER_INVARIANTS): Remove some obsolete
lheader invariants assertions.
* buffer.c (DEFVAR_BUFFER_LOCAL_1): Allocate dynamically.
* console.c (DEFVAR_CONSOLE_LOCAL_1): Allocate dynamically.
* gpmevent.c: Indirection via MC_ALLOC_Freceive_gpm_event.
* gpmevent.c (Fgpm_enable): Allocate dynamically.
* gpmevent.c (syms_of_gpmevent): Allocate dynamically.
* lisp.h (C_READONLY): Not needed anymore, remove.
* lisp.h (DEFUN): Allocate dynamically.
* lrecord.h (C_READONLY_RECORD_HEADER_P): Not needed anymore,
remove.
* lrecord.h (SET_C_READONLY_RECORD_HEADER): Not needed anymore,
remove.
* symbols.c (guts_of_unbound_marker):
* symeval.h (defsubr): Allocate dynamically.
* symeval.h (DEFSUBR_MACRO): Allocate dynamically.
* symeval.h (DEFVAR_ SYMVAL_FWD): Allocate dynamically.
* tests.c (TESTS_DEFSUBR): Allocate dynamically.
Definition of mcpro:
* lisp.h: Add mcpro prototypes.
* alloc.c (common_init_alloc_early): Add initialization for
mcpros.
* alloc.c (mcpro_description_1): New.
* alloc.c (mcpro_description): New.
* alloc.c (mcpros_description_1): New.
* alloc.c (mcpros_description): New.
* alloc.c (mcpro_one_name_description_1): New.
* alloc.c (mcpro_one_name_description): New.
* alloc.c (mcpro_names_description_1): New.
* alloc.c (mcpro_names_description): New.
* alloc.c (mcpros): New.
* alloc.c (mcpro_names): New.
* alloc.c (mcpro_1): New.
* alloc.c (mc_pro): New.
* alloc.c (garbage_collect_1): Add mcpros to root set.
Usage of mcpro:
* alloc.c (make_string_nocopy): Add string to root set.
* symbols.c (init_symbols_once_early): Add Qunbound to root set.
Changes to the Portable Dumper:
* alloc.c (FREE_OR_REALLOC_BEGIN): Since dumped objects can be
freed with the new allocator, remove assertion for !DUMPEDP.
* dumper.c: Adjust comments, increase PDUMP_HASHSIZE.
* dumper.c (pdump_make_hash): Shift address only 2 bytes, to
avoid collisions.
* dumper.c (pdump_objects_unmark): No more mark bits within
the object, remove.
* dumper.c (mc_addr_elt): New. Element data structure for mc
hash table.
* dumper.c (pdump_mc_hash): New hash table: `lookup table'.
* dumper.c (pdump_get_mc_addr): New. Lookup for hash table.
* dumper.c (pdump_get_indirect_mc_addr): New. Lookup for
convertibles.
* dumper.c (pdump_put_mc_addr): New. Putter for hash table.
* dumper.c (pdump_dump_mc_data): New. Writes the table for
relocation at load time to the dump file.
* dumper.c (pdump_scan_lisp_objects_by_alignment): New.
Visits all dumped Lisp objects.
* dumper.c (pdump_scan_non_lisp_objects_by_alignment): New.
Visits all other dumped objects.
* dumper.c (pdump_reloc_one_mc): New. Updates all pointers
of an object by using the hash table pdump_mc_hash.
* dumper.c (pdump_reloc_one): Replaced by pdump_reloc_one_mc.
* dumper.c (pdump): Change the structure of the dump file, add
the mc post dump relocation table to dump file.
* dumper.c (pdump_load_finish): Hand all dumped objects to the
new allocator and use the mc post dump relocation table for
relocating the dumped objects at dump file load time, free not
longer used data structures.
* dumper.c (pdump_load): Free the dump file.
* dumper.h: Remove pdump_objects_unmark.
* lrecord.h (DUMPEDP): Dumped objects can be freed, remove.
DUMP_IN_EXEC:
* Makefile.in.in: Linking for and with dump in executable only if
DUMP_IN_EXEC is defined.
* config.h.in: Add new flag `DUMP_IN_EXEC'
* emacs.c: Condition dump-data.h on DUMP_IN_EXEC.
* emacs.c (main_1): Flag `-si' only works if dump image is
written into executable.
Miscellanious
* lrecord.h (enum lrecord_type): Added numbers to all types,
very handy for debugging.
* xemacs.def.in.in: Add mc-alloc functions to make them visible
to the modules.
| author | crestani |
|---|---|
| date | Fri, 08 Apr 2005 23:11:35 +0000 |
| parents | 04bc9d2f42c7 |
| children | 172fb92bd156 |
| rev | line source |
|---|---|
| 440 | 1 /* GPM (General purpose mouse) functions |
| 428 | 2 Copyright (C) 1997 William M. Perry <wmperry@gnu.org> |
| 3 Copyright (C) 1999 Free Software Foundation, Inc. | |
| 793 | 4 Copyright (C) 2002 Ben Wing. |
| 5 | |
| 6 This file is part of XEmacs. | |
| 7 | |
| 8 XEmacs is free software; you can redistribute it and/or modify it | |
| 9 under the terms of the GNU General Public License as published by the | |
| 10 Free Software Foundation; either version 2, or (at your option) any | |
| 11 later version. | |
| 12 | |
| 13 XEmacs is distributed in the hope that it will be useful, but WITHOUT | |
| 14 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or | |
| 15 FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License | |
| 16 for more details. | |
| 17 | |
| 18 You should have received a copy of the GNU General Public License | |
| 19 along with XEmacs; see the file COPYING. If not, write to | |
| 20 the Free Software Foundation, Inc., 59 Temple Place - Suite 330, | |
| 21 Boston, MA 02111-1307, USA. */ | |
| 428 | 22 |
| 23 /* Synched up with: Not in FSF. */ | |
| 24 | |
| 25 /* Authors: William Perry */ | |
| 26 | |
| 27 #include <config.h> | |
| 28 #include "lisp.h" | |
| 793 | 29 |
| 30 #include "commands.h" | |
| 31 #include "console-tty.h" | |
| 428 | 32 #include "console.h" |
| 33 #include "device.h" | |
| 34 #include "events.h" | |
| 793 | 35 #include "lstream.h" |
| 36 #include "process.h" | |
| 428 | 37 #include "sysdep.h" |
| 876 | 38 #include "frame.h" |
| 39 #include "device-impl.h" | |
| 40 #include "console-impl.h" | |
| 41 #include "console-tty-impl.h" | |
| 793 | 42 |
| 428 | 43 #include "sysproc.h" /* for MAXDESC */ |
| 44 | |
| 45 #ifdef HAVE_GPM | |
| 46 #include "gpmevent.h" | |
| 47 #include <gpm.h> | |
| 48 | |
| 49 #define KG_SHIFT 0 | |
| 50 #define KG_CTRL 2 | |
| 51 #define KG_ALT 3 | |
| 52 | |
| 53 extern int gpm_tried; | |
| 54 extern void *gpm_stack; | |
| 55 | |
| 56 static int (*orig_event_pending_p) (int); | |
| 440 | 57 static void (*orig_next_event_cb) (Lisp_Event *); |
| 428 | 58 |
| 59 static Lisp_Object gpm_event_queue; | |
| 60 static Lisp_Object gpm_event_queue_tail; | |
| 61 | |
| 2720 | 62 #ifdef MC_ALLOC |
| 63 static Lisp_Object MC_ALLOC_Freceive_gpm_event; | |
| 64 #endif /* MC_ALLOC */ | |
| 65 | |
| 793 | 66 struct __gpm_state |
| 67 { | |
| 68 int gpm_tried; | |
| 69 int gpm_flag; | |
| 70 void *gpm_stack; | |
| 428 | 71 }; |
| 72 | |
| 73 static struct __gpm_state gpm_state_information[MAXDESC]; | |
| 74 | |
| 75 static void | |
| 76 store_gpm_state (int fd) | |
| 77 { | |
| 793 | 78 gpm_state_information[fd].gpm_tried = gpm_tried; |
| 79 gpm_state_information[fd].gpm_flag = gpm_flag; | |
| 80 gpm_state_information[fd].gpm_stack = gpm_stack; | |
| 428 | 81 } |
| 82 | |
| 83 static void | |
| 84 restore_gpm_state (int fd) | |
| 85 { | |
| 793 | 86 gpm_tried = gpm_state_information[fd].gpm_tried; |
| 87 gpm_flag = gpm_state_information[fd].gpm_flag; | |
| 88 gpm_stack = gpm_state_information[fd].gpm_stack; | |
| 89 gpm_consolefd = gpm_fd = fd; | |
| 428 | 90 } |
| 91 | |
| 92 static void | |
| 93 clear_gpm_state (int fd) | |
| 94 { | |
| 793 | 95 if (fd >= 0) |
| 96 memset (&gpm_state_information[fd], '\0', sizeof (struct __gpm_state)); | |
| 97 gpm_tried = gpm_flag = 1; | |
| 98 gpm_fd = gpm_consolefd = -1; | |
| 99 gpm_stack = NULL; | |
| 428 | 100 } |
| 101 | |
| 102 static int | |
| 440 | 103 get_process_infd (Lisp_Process *p) |
| 428 | 104 { |
| 853 | 105 Lisp_Object instr, outstr, errstr; |
| 106 get_process_streams (p, &instr, &outstr, &errstr); | |
| 428 | 107 assert (!NILP (instr)); |
| 108 return filedesc_stream_fd (XLSTREAM (instr)); | |
| 109 } | |
| 110 | |
| 111 DEFUN ("receive-gpm-event", Freceive_gpm_event, 0, 2, 0, /* | |
| 112 Run GPM_GetEvent(). | |
| 113 This function is the process handler for the GPM connection. | |
| 114 */ | |
| 2286 | 115 (process, UNUSED (string))) |
| 428 | 116 { |
| 793 | 117 Gpm_Event ev; |
| 118 int modifiers = 0; | |
| 119 int button = 1; | |
| 120 Lisp_Object fake_event = Qnil; | |
| 121 Lisp_Event *event = NULL; | |
| 122 struct gcpro gcpro1; | |
| 123 static int num_events; | |
| 428 | 124 |
| 793 | 125 CHECK_PROCESS (process); |
| 428 | 126 |
| 793 | 127 restore_gpm_state (get_process_infd (XPROCESS (process))); |
| 428 | 128 |
| 793 | 129 if (!Gpm_GetEvent (&ev)) |
| 130 { | |
| 131 warn_when_safe (Qnil, Qerror, | |
| 132 "Gpm_GetEvent failed - %d", gpm_fd); | |
| 133 return (Qzero); | |
| 134 } | |
| 428 | 135 |
| 793 | 136 GCPRO1 (fake_event); |
| 428 | 137 |
| 793 | 138 num_events++; |
| 139 | |
| 140 fake_event = Fmake_event (Qnil, Qnil); | |
| 141 event = XEVENT (fake_event); | |
| 428 | 142 |
| 793 | 143 event->timestamp = 0; |
| 144 event->channel = Fselected_frame (Qnil); /* CONSOLE_SELECTED_FRAME (con); */ | |
| 428 | 145 |
| 793 | 146 /* Whow, wouldn't named defines be NICE!?!?! */ |
| 147 modifiers = 0; | |
| 428 | 148 |
| 793 | 149 if (ev.modifiers & 1) modifiers |= XEMACS_MOD_SHIFT; |
| 150 if (ev.modifiers & 2) modifiers |= XEMACS_MOD_META; | |
| 151 if (ev.modifiers & 4) modifiers |= XEMACS_MOD_CONTROL; | |
| 152 if (ev.modifiers & 8) modifiers |= XEMACS_MOD_META; | |
| 153 | |
| 154 if (ev.buttons & GPM_B_LEFT) | |
| 155 button = 1; | |
| 156 else if (ev.buttons & GPM_B_MIDDLE) | |
| 157 button = 2; | |
| 158 else if (ev.buttons & GPM_B_RIGHT) | |
| 159 button = 3; | |
| 428 | 160 |
| 793 | 161 switch (GPM_BARE_EVENTS (ev.type)) |
| 162 { | |
| 163 case GPM_DOWN: | |
| 164 case GPM_UP: | |
| 934 | 165 SET_EVENT_TYPE (event, |
| 166 (ev.type & GPM_DOWN) ? button_press_event : button_release_event); | |
| 1204 | 167 SET_EVENT_BUTTON_X (event, ev.x); |
| 168 SET_EVENT_BUTTON_Y (event, ev.y); | |
| 169 SET_EVENT_BUTTON_BUTTON (event, button); | |
| 170 SET_EVENT_BUTTON_MODIFIERS (event, modifiers); | |
| 793 | 171 break; |
| 172 case GPM_MOVE: | |
| 173 case GPM_DRAG: | |
| 934 | 174 SET_EVENT_TYPE (event, pointer_motion_event); |
| 1204 | 175 SET_EVENT_MOTION_X (event, ev.x); |
| 176 SET_EVENT_MOTION_Y (event, ev.y); | |
| 177 SET_EVENT_MOTION_MODIFIERS (event, modifiers); | |
| 793 | 178 default: |
| 179 /* This will never happen */ | |
| 180 break; | |
| 181 } | |
| 428 | 182 |
| 793 | 183 /* Handle the event */ |
| 184 enqueue_event (fake_event, &gpm_event_queue, &gpm_event_queue_tail); | |
| 428 | 185 |
| 793 | 186 UNGCPRO; |
| 428 | 187 |
| 793 | 188 return (Qzero); |
| 428 | 189 } |
| 190 | |
| 191 static void turn_off_gpm (char *process_name) | |
| 192 { | |
| 793 | 193 Lisp_Object process = Fget_process (build_string (process_name)); |
| 194 int fd = -1; | |
| 428 | 195 |
| 793 | 196 if (NILP (process)) |
| 197 /* Something happened to our GPM process - fail silently */ | |
| 198 return; | |
| 428 | 199 |
| 793 | 200 fd = get_process_infd (XPROCESS (process)); |
| 428 | 201 |
| 793 | 202 restore_gpm_state (fd); |
| 428 | 203 |
| 793 | 204 Gpm_Close(); |
| 428 | 205 |
| 793 | 206 clear_gpm_state (fd); |
| 428 | 207 |
| 793 | 208 Fdelete_process (build_string (process_name)); |
| 428 | 209 } |
| 210 | |
| 211 #ifdef TIOCLINUX | |
| 212 static Lisp_Object | |
| 2286 | 213 tty_get_foreign_selection (Lisp_Object UNUSED (selection_symbol), |
| 214 Lisp_Object UNUSED (target_type)) | |
| 428 | 215 { |
| 793 | 216 /* This function can GC */ |
| 217 struct device *d = decode_device (Qnil); | |
| 218 int fd = DEVICE_INFD (d); | |
| 219 char c = 3; | |
| 220 Lisp_Object output_stream = Qnil; | |
| 221 Lisp_Object terminal_stream = Qnil; | |
| 222 Lisp_Object output_string = Qnil; | |
| 223 struct gcpro gcpro1,gcpro2,gcpro3; | |
| 224 | |
| 225 GCPRO3(output_stream,terminal_stream,output_string); | |
| 428 | 226 |
| 793 | 227 /* The ioctl() to paste actually puts things in the input queue of |
| 228 ** the virtual console, so we need to trap that data, since we are | |
| 229 ** supposed to return the actual string selection from this | |
| 230 ** function. | |
| 231 */ | |
| 428 | 232 |
| 793 | 233 /* I really hate doing this, but it doesn't seem to cause any |
| 234 ** problems, and it makes the Lstream_read stuff further down | |
| 235 ** error out correctly instead of trying to indefinitely read from | |
| 236 ** the console. | |
| 237 ** | |
| 238 ** There is no set_descriptor_blocking() function call, but in my | |
| 239 ** testing under linux, it has not proved fatal to leave the | |
| 240 ** descriptor in non-blocking mode. | |
| 241 ** | |
| 242 ** William Perry Nov 5, 1999 | |
| 243 */ | |
| 244 set_descriptor_non_blocking (fd); | |
| 428 | 245 |
| 793 | 246 /* We need two streams, one for reading from the selected device, |
| 247 ** and one to write the data into. There is no writable version | |
| 248 ** of the lisp-string lstream, so we make do with a resizing | |
| 249 ** buffer stream, and make a string out of it after we are | |
| 250 ** done. | |
| 251 */ | |
| 252 output_stream = make_resizing_buffer_output_stream (); | |
| 253 terminal_stream = make_filedesc_input_stream (fd, 0, -1, LSTR_BLOCKED_OK); | |
| 254 output_string = Qnil; | |
| 255 | |
| 256 /* #### We should arguably use a specbind() and an unwind routine here, | |
| 257 ** #### but I don't care that much right now. | |
| 258 */ | |
| 259 if (NILP (output_stream) || NILP (terminal_stream)) | |
| 260 /* Should we signal an error here? */ | |
| 261 goto out; | |
| 428 | 262 |
| 793 | 263 if (ioctl (fd, TIOCLINUX, &c) < 0) |
| 264 { | |
| 265 /* Could not get the selection - eek */ | |
| 266 UNGCPRO; | |
| 267 return (Qnil); | |
| 268 } | |
| 428 | 269 |
| 793 | 270 while (1) |
| 271 { | |
| 867 | 272 Ibyte tempbuf[1024]; /* some random amount */ |
| 793 | 273 Bytecount i; |
| 274 Bytecount size_in_bytes = | |
| 275 Lstream_read (XLSTREAM (terminal_stream), | |
| 276 tempbuf, sizeof (tempbuf)); | |
| 277 | |
| 278 if (size_in_bytes <= 0) | |
| 279 /* end of the stream */ | |
| 280 break; | |
| 281 | |
| 282 /* convert CR->LF */ | |
| 283 for (i = 0; i < size_in_bytes; i++) | |
| 428 | 284 { |
| 793 | 285 if (tempbuf[i] == '\r') |
| 286 tempbuf[i] = '\n'; | |
| 428 | 287 } |
| 288 | |
| 793 | 289 Lstream_write (XLSTREAM (output_stream), tempbuf, size_in_bytes); |
| 290 } | |
| 428 | 291 |
| 793 | 292 Lstream_flush (XLSTREAM (output_stream)); |
| 428 | 293 |
| 793 | 294 output_string = |
| 295 make_string (resizing_buffer_stream_ptr (XLSTREAM (output_stream)), | |
| 296 Lstream_byte_count (XLSTREAM (output_stream))); | |
| 428 | 297 |
| 793 | 298 Lstream_delete (XLSTREAM (output_stream)); |
| 299 Lstream_delete (XLSTREAM (terminal_stream)); | |
| 428 | 300 |
| 301 out: | |
| 793 | 302 UNGCPRO; |
| 303 return (output_string); | |
| 428 | 304 } |
| 305 | |
| 306 static Lisp_Object | |
| 2286 | 307 tty_selection_exists_p (Lisp_Object UNUSED (selection), |
| 308 Lisp_Object UNUSED (selection_type)) | |
| 428 | 309 { |
| 793 | 310 return (Qt); |
| 428 | 311 } |
| 312 #endif /* TIOCLINUX */ | |
| 313 | |
| 314 #if 0 | |
| 315 static Lisp_Object | |
| 442 | 316 tty_own_selection (Lisp_Object selection_name, Lisp_Object selection_value, |
| 317 Lisp_Object how_to_add, Lisp_Object selection_type) | |
| 428 | 318 { |
| 793 | 319 /* There is no way to do this cleanly - the GPM selection |
| 320 ** 'protocol' (actually the TIOCLINUX ioctl) requires a start and | |
| 321 ** end position on the _screen_, not a string to stick in there. | |
| 322 ** Lame. | |
| 323 ** | |
| 324 ** William Perry Nov 4, 1999 | |
| 325 */ | |
| 428 | 326 } |
| 327 #endif | |
| 328 | |
| 329 /* This function appears to work once in a blue moon. I'm not sure | |
| 793 | 330 ** exactly why either. *sigh* |
| 331 ** | |
| 332 ** William Perry Nov 4, 1999 | |
| 333 ** | |
| 334 ** Apparently, this is the way (mouse-position) is supposed to work, | |
| 335 ** and I was just expecting something else. (mouse-pixel-position) | |
| 336 ** works just fine. | |
| 337 ** | |
| 338 ** William Perry Nov 7, 1999 | |
| 339 */ | |
| 428 | 340 static int |
| 341 tty_get_mouse_position (struct device *d, Lisp_Object *frame, int *x, int *y) | |
| 342 { | |
| 793 | 343 Gpm_Event ev; |
| 344 int num_buttons; | |
| 428 | 345 |
| 793 | 346 memset(&ev,'\0',sizeof(ev)); |
| 428 | 347 |
| 793 | 348 num_buttons = Gpm_GetSnapshot(&ev); |
| 428 | 349 |
| 793 | 350 if (!num_buttons) |
| 351 /* This means there are events pending... */ | |
| 428 | 352 |
| 793 | 353 /* #### In theory, we should drain the events pending, stick |
| 354 ** #### them in the queue, and return the mouse position | |
| 355 ** #### anyway. | |
| 356 */ | |
| 357 return (-1); | |
| 358 *x = ev.x; | |
| 359 *y = ev.y; | |
| 360 *frame = DEVICE_SELECTED_FRAME (d); | |
| 361 return (1); | |
| 428 | 362 } |
| 363 | |
| 364 static void | |
| 2286 | 365 tty_set_mouse_position (struct window *UNUSED (w), int UNUSED (x), |
| 366 int UNUSED (y)) | |
| 428 | 367 { |
| 793 | 368 /* |
| 369 #### I couldn't find any GPM functions that set the mouse position. | |
| 370 #### Mr. Perry had left this function empty; that must be why. | |
| 371 #### karlheg | |
| 372 */ | |
| 428 | 373 } |
| 374 | |
| 375 static int gpm_event_pending_p (int user_p) | |
| 376 { | |
| 793 | 377 Lisp_Object event; |
| 428 | 378 |
| 793 | 379 EVENT_CHAIN_LOOP (event, gpm_event_queue) |
| 380 { | |
| 381 if (!user_p || command_event_p (event)) | |
| 382 return (1); | |
| 383 } | |
| 384 return (orig_event_pending_p (user_p)); | |
| 428 | 385 } |
| 386 | |
| 440 | 387 static void gpm_next_event_cb (Lisp_Event *event) |
| 428 | 388 { |
| 793 | 389 /* #### It would be nice to preserve some sort of ordering of the |
| 390 ** #### different types of events, but that would be quite a bit | |
| 391 ** #### of work, and would more than likely break the abstraction | |
| 392 ** #### between the other event loops and this one. | |
| 393 */ | |
| 440 | 394 |
| 793 | 395 if (!NILP (gpm_event_queue)) |
| 396 { | |
| 397 Lisp_Object queued_event = | |
| 398 dequeue_event (&gpm_event_queue, &gpm_event_queue_tail); | |
| 399 *event = *(XEVENT (queued_event)); | |
| 400 | |
| 401 if (event->event_type == pointer_motion_event) | |
| 428 | 402 { |
| 793 | 403 struct device *d = decode_device (event->channel); |
| 404 int fd = DEVICE_INFD (d); | |
| 428 | 405 |
| 793 | 406 /* Ok, now this is just freaky. Bear with me though. |
| 407 ** | |
| 408 ** If you run gnuclient and attach to a XEmacs running in | |
| 409 ** X or on another TTY, the mouse cursor does not get | |
| 410 ** drawn correctly. This is because the ioctl() fails | |
| 411 ** with EPERM because the TTY specified is not our | |
| 412 ** controlling terminal. If you are the superuser, it | |
| 413 ** will work just spiffy. The appropriate source file (at | |
| 414 ** least in linux 2.2.x) is | |
| 415 ** .../linux/drivers/char/console.c in the function | |
| 416 ** tioclinux(). The following bit of code is brutal to | |
| 417 ** us: | |
| 418 ** | |
| 419 ** if (current->tty != tty && !suser()) | |
| 420 ** return -EPERM; | |
| 421 ** | |
| 422 ** I even tried setting us as a process leader, removing | |
| 423 ** our controlling terminal, and then using the TIOCSCTTY | |
| 424 ** to set up a new controlling terminal, all with no luck. | |
| 425 ** | |
| 426 ** What is even weirder is if you run XEmacs in a VC, and | |
| 427 ** attach to it from another VC with gnuclient, go back to | |
| 428 ** the original VC and hit a key, the mouse pointer | |
| 429 ** displays (in BOTH VCs), until you hit a key in the | |
| 430 ** second VC, after which it does not display in EITHER | |
| 431 ** VC. Bizarre, no? | |
| 432 ** | |
| 433 ** All I can say is thank god Linux comes with source code | |
| 434 ** or I would have been completely confused. Well, ok, | |
| 435 ** I'm still completely confused. I don't see why they | |
| 436 ** don't just check the permissions on the device | |
| 437 ** (actually, if you have enough access to it to get the | |
| 438 ** console's file descriptor, you should be able to do | |
| 439 ** with it as you wish, but maybe that is just me). | |
| 440 ** | |
| 441 ** William M. Perry - Nov 9, 1999 | |
| 442 */ | |
| 428 | 443 |
| 1204 | 444 Gpm_DrawPointer (EVENT_MOTION_X (event),EVENT_MOTION_Y (event), fd); |
| 428 | 445 } |
| 446 | |
| 793 | 447 return; |
| 448 } | |
| 449 | |
| 450 orig_next_event_cb (event); | |
| 428 | 451 } |
| 452 | |
| 453 static void hook_event_callbacks_once (void) | |
| 454 { | |
| 793 | 455 static int hooker; |
| 428 | 456 |
| 793 | 457 if (!hooker) |
| 458 { | |
| 459 orig_event_pending_p = event_stream->event_pending_p; | |
| 460 orig_next_event_cb = event_stream->next_event_cb; | |
| 461 event_stream->event_pending_p = gpm_event_pending_p; | |
| 462 event_stream->next_event_cb = gpm_next_event_cb; | |
| 463 hooker = 1; | |
| 464 } | |
| 428 | 465 } |
| 466 | |
| 467 static void hook_console_methods_once (void) | |
| 468 { | |
| 793 | 469 static int hooker; |
| 428 | 470 |
| 793 | 471 if (!hooker) |
| 472 { | |
| 473 /* Install the mouse position methods for the TTY console type */ | |
| 474 CONSOLE_HAS_METHOD (tty, get_mouse_position); | |
| 475 CONSOLE_HAS_METHOD (tty, set_mouse_position); | |
| 476 CONSOLE_HAS_METHOD (tty, get_foreign_selection); | |
| 477 CONSOLE_HAS_METHOD (tty, selection_exists_p); | |
| 428 | 478 #if 0 |
| 793 | 479 CONSOLE_HAS_METHOD (tty, own_selection); |
| 428 | 480 #endif |
| 793 | 481 } |
| 428 | 482 } |
| 483 | |
| 484 DEFUN ("gpm-enabled-p", Fgpm_enabled_p, 0, 1, 0, /* | |
| 485 Return non-nil if GPM mouse support is currently enabled on DEVICE. | |
| 486 */ | |
| 793 | 487 (device)) |
| 428 | 488 { |
| 793 | 489 char *console_name = ttyname (DEVICE_INFD (decode_device (device))); |
| 490 char process_name[1024]; | |
| 491 Lisp_Object proc; | |
| 428 | 492 |
| 793 | 493 if (!console_name) |
| 494 return (Qnil); | |
| 428 | 495 |
| 793 | 496 memset (process_name, '\0', sizeof(process_name)); |
| 497 snprintf (process_name, sizeof(process_name) - 1, "gpm for %s", | |
| 498 console_name); | |
| 428 | 499 |
| 793 | 500 proc = Fget_process (build_string (process_name)); |
| 428 | 501 |
| 793 | 502 if (NILP (proc)) |
| 503 return (Qnil); | |
| 428 | 504 |
| 793 | 505 if (1) /* (PROCESS_LIVE_P (proc)) */ |
| 506 return (Qt); | |
| 507 return (Qnil); | |
| 428 | 508 } |
| 509 | |
| 510 DEFUN ("gpm-enable", Fgpm_enable, 0, 2, 0, /* | |
| 511 Toggle accepting of GPM mouse events. | |
| 512 */ | |
| 793 | 513 (device, arg)) |
| 428 | 514 { |
| 793 | 515 Gpm_Connect conn; |
| 516 int rval; | |
| 517 Lisp_Object gpm_process; | |
| 518 Lisp_Object gpm_filter; | |
| 519 struct device *d = decode_device (device); | |
| 520 int fd = DEVICE_INFD (d); | |
| 521 char *console_name = ttyname (fd); | |
| 522 char process_name[1024]; | |
| 428 | 523 |
| 793 | 524 hook_event_callbacks_once (); |
| 525 hook_console_methods_once (); | |
| 526 | |
| 527 if (noninteractive) | |
| 528 invalid_operation ("Can't connect to GPM in batch mode", Qunbound); | |
| 428 | 529 |
| 793 | 530 if (!console_name) |
| 531 /* Something seriously wrong here... */ | |
| 532 return (Qnil); | |
| 533 | |
| 534 memset (process_name, '\0', sizeof(process_name)); | |
| 535 snprintf (process_name, sizeof(process_name) - 1, "gpm for %s", | |
| 536 console_name); | |
| 428 | 537 |
| 793 | 538 if (NILP (arg)) |
| 539 { | |
| 540 turn_off_gpm (process_name); | |
| 541 return (Qnil); | |
| 542 } | |
| 428 | 543 |
| 793 | 544 /* DANGER DANGER. |
| 545 ** Though shalt not call (gpm-enable t) after we have already | |
| 546 ** started, or stuff blows up. | |
| 547 */ | |
| 548 if (!NILP (Fgpm_enabled_p (device))) | |
| 549 invalid_operation ("GPM already enabled for this console", Qunbound); | |
| 428 | 550 |
| 793 | 551 conn.eventMask = GPM_DOWN|GPM_UP|GPM_MOVE|GPM_DRAG; |
| 552 conn.defaultMask = GPM_MOVE; | |
| 553 conn.minMod = 0; | |
| 554 conn.maxMod = ((1 << KG_SHIFT) | (1 << KG_ALT) | (1 << KG_CTRL)); | |
| 428 | 555 |
| 793 | 556 /* Reset some silly static variables so that multiple Gpm_Open() |
| 557 ** calls have even a slight chance of working | |
| 558 */ | |
| 559 gpm_tried = 0; | |
| 560 gpm_flag = 0; | |
| 561 gpm_stack = NULL; | |
| 428 | 562 |
| 793 | 563 /* Make sure Gpm_Open() does ioctl() on the correct |
| 564 ** descriptor, or it can get the wrong terminal sizes, etc. | |
| 565 */ | |
| 566 gpm_consolefd = fd; | |
| 440 | 567 |
| 793 | 568 /* We have to pass the virtual console manually, otherwise if you |
| 569 ** use 'gnuclient -nw' to connect to an XEmacs that is running in | |
| 570 ** X, Gpm_Open() tries to use ttyname(0 | 1 | 2) to find out which | |
| 571 ** console you are using, which is of course not correct for the | |
| 572 ** new tty device. | |
| 573 */ | |
| 574 if (strncmp (console_name, "/dev/tty", 8) || !isdigit (console_name[8])) | |
| 575 /* Urk, something really wrong */ | |
| 576 return (Qnil); | |
| 428 | 577 |
| 793 | 578 rval = Gpm_Open (&conn, atoi (console_name + 8)); |
| 428 | 579 |
| 793 | 580 switch (rval) |
| 581 { | |
| 582 case -1: /* General failure */ | |
| 583 break; | |
| 584 case -2: /* We are running under an XTerm */ | |
| 585 Gpm_Close(); | |
| 586 break; | |
| 587 default: | |
| 588 /* Is this really necessary? */ | |
| 589 set_descriptor_non_blocking (gpm_fd); | |
| 590 store_gpm_state (gpm_fd); | |
| 591 gpm_process = | |
| 592 connect_to_file_descriptor (build_string (process_name), Qnil, | |
| 593 make_int (gpm_fd), | |
| 594 make_int (gpm_fd)); | |
| 428 | 595 |
| 793 | 596 if (!NILP (gpm_process)) |
| 597 { | |
| 598 rval = 0; | |
| 599 Fprocess_kill_without_query (gpm_process, Qnil); | |
| 2720 | 600 #ifdef MC_ALLOC |
| 601 gpm_filter = MC_ALLOC_Freceive_gpm_event; | |
| 602 #else /* not MC_ALLOC */ | |
| 793 | 603 gpm_filter = wrap_subr (&SFreceive_gpm_event); |
| 2720 | 604 #endif /* not MC_ALLOC */ |
| 853 | 605 set_process_filter (gpm_process, gpm_filter, 1, 0); |
| 428 | 606 |
| 793 | 607 /* Keep track of the device for later */ |
| 608 /* Fput (gpm_process, intern ("gpm-device"), device); */ | |
| 428 | 609 } |
| 793 | 610 else |
| 611 { | |
| 612 Gpm_Close (); | |
| 613 rval = -1; | |
| 614 } | |
| 615 } | |
| 428 | 616 |
| 793 | 617 return (rval ? Qnil : Qt); |
| 428 | 618 } |
| 619 | |
| 620 void vars_of_gpmevent (void) | |
| 621 { | |
| 793 | 622 gpm_event_queue = Qnil; |
| 623 gpm_event_queue_tail = Qnil; | |
| 624 staticpro (&gpm_event_queue); | |
| 625 staticpro (&gpm_event_queue_tail); | |
| 1204 | 626 dump_add_root_lisp_object (&gpm_event_queue); |
| 627 dump_add_root_lisp_object (&gpm_event_queue_tail); | |
| 428 | 628 } |
| 629 | |
| 630 void syms_of_gpmevent (void) | |
| 631 { | |
| 2720 | 632 #ifdef MC_ALLOC |
| 633 #define DEFSUBR_receive_gpm_event(Fname) \ | |
| 634 do { \ | |
| 635 DEFSUBR_MC_ALLOC (Fname); \ | |
| 636 defsubr (S##Fname); \ | |
| 637 MC_ALLOC_Freceive_gpm_event = wrap_subr (S##Fname); \ | |
| 638 } while (0) | |
| 639 DEFSUBR_receive_gpm_event (Freceive_gpm_event); | |
| 640 #else /* not MC_ALLOC */ | |
| 793 | 641 DEFSUBR (Freceive_gpm_event); |
| 2720 | 642 #endif /* not MC_ALLOC */ |
| 793 | 643 DEFSUBR (Fgpm_enable); |
| 644 DEFSUBR (Fgpm_enabled_p); | |
| 428 | 645 } |
| 646 | |
| 647 #endif /* HAVE_GPM */ |