Mercurial > hg > xemacs-beta
comparison src/device-x.c @ 1204:e22b0213b713
[xemacs-hg @ 2003-01-12 11:07:58 by michaels]
modules/ChangeLog:
2002-12-16 Ben Wing <ben@xemacs.org>
* postgresql/postgresql.c:
remove ifdef USE_KKCC.
src/ChangeLog:
2003-01-08 Mike Sperber <mike@xemacs.org>
* console.h (CDFW_CONSOLE): Don't lead to a crash if we're dealing
with a dead window/frame/device/console.
2002-12-20 Mike Sperber <mike@xemacs.org>
* ui-gtk.c: Fix typo from Ben's patch: emacs_ffi_data is a
typedef, not a struct. emacs_gtk_object_data is a typedef, not a
struct.
* gtk-glue.c (gdk_event_to_emacs_event): Fix typos from Ben's
patch: le -> emacs_event + rearrange the code.
* event-gtk.c (gtk_event_to_emacs_event): Fix typos from Ben's
patch: ..._UNDERLYING_GDK_EVENT -> ..._GDK_EVENT, ev -> key_event.
* device-gtk.c: Fix typo from Ben's patch: x_keysym_map_hash_table
-> x_keysym_map_hashtable.
2002-12-19 Mike Sperber <mike@xemacs.org>
* menubar-x.c (set_frame_menubar): Initialize protect_me field of
popup_data.
2002-12-16 Ben Wing <ben@xemacs.org>
Major cleanup of KKCC, etc.
KKCC, pdump-related:
-- descriptions are written for all objects. this required some
changes in the format of some objects, e.g. extents, popup-data,
coding system, lstream, lcrecord-list.
-- KKCC now handles weakness in markers, hash tables, elsewhere
correctly (formerly, you'd eventually get a stack overflow due
to endlessly expanding markers).
-- textual changes: lrecord_description -> memory_description,
struct_description -> sized_memory_description.
-- extensive comment describing descriptions and pdump.
-- redo XD_UNION so it works inline and change its format to provide
sufficient info for pdump. implement XD_UNION in pdump. also add
XD_UNION_DYNAMIC_SIZE, which works like XD_UNION except for when
auto-computing structure sizes.
-- add support for XD_INDIRECT in description offsets (used by
extents).
-- add support for "description maps", allowing for indirect
descriptions that are retrieved from an object at run-time. this
generalizes XD_CODING_SYSTEM_END, XD_SPECIFIER_END, etc., which
have now been eliminated.
-- add a fifth field "flags" to memory_description, to support flags
that can be specified for this particular line. Currently defined
flags are XD_FLAG_NO_KKCC (KKCC should ignore this entry; useful
for the weakness above in markers, etc.), XD_FLAG_NO_PDUMP (pdump
should ignore this entry), XD_FLAG_UNION_DEFAULT_ENTRY (in
union maps, this specifies a "default" entry for all remaining
values), and XD_FLAG_FREE_LISP_OBJECT (for use with lcrecord-lists).
-- clean up the kkcc-itis in events, so that the differences
between event data as separate objects and as a union are now
minimized to a small number of places. with the new XD_UNION, we
no longer need event data as separate objects, so this code is no
longer ifdef USE_KKCC, but instead ifdef EVENT_DATA_AS_OBJECTS,
not used by default. make sure that we explicitly free the
separate event data objects when no longer in use, to maintain the
invariant the event processing causes no consing.
-- also remove other USE_KKCC ifdefs when not necessary.
-- allow for KKCC compilation under MS Windows.
-- fix README.kkcc.
-- dump_add_root_object -> dump_add_root_lisp_object.
-- implement dump_add_root_block and use this to handle
dump_add_opaque.
-- factor out some code duplicated in kkcc and pdump.
Other allocation/object-related:
-- change various *slots.h so MARKED_SLOT() call no longer
includes semicolon.
-- free_marker() takes a Lisp_Object not a direct pointer.
-- make bit vectors lcrecords, like vectors, and eliminate code
that essentially duplicated the lcrecord handling.
-- additional asserts in FREE_FIXED_TYPE, formerly duplicated in
the various callers of this.
-- all lcrecord allocation functions now zero out the returned
lcrecords. unnecessary calls to zero_lcrecord removed. add long
comment describing these functions.
-- extract out process and coding system slots, like for buffers,
frames, etc.
-- lcrecords now set the type of items sitting on the free list to
lcrecord_type_free.
-- changes to the way that gap arrays are allocated, for kkcc's
benefit -- now, one single memory block with a stretchy array on
the end, instead of a separate block holding the array.
Error-checking-related:
-- now can compile with C++ under MS Windows. clean up compile errors
discovered that way. (a few were real problems)
-- add C++ error-checking code to verify problems with mismatched
GCPRO/UNGCPRO. (there were a few in the kkcc code.) add long
comment about how to catch insufficient GCPRO (yes, it's possible
using C++).
-- add debug_p4(), a simple object printer, when debug_print()
doesn't work.
-- add dp() and db() as short synonyms of debug_print(),
debug_backtrace().
-- `print' tries EXTREMELY hard to avoid core dumping when printing
when crashing or from debug_print(), and tries as hard as it
reasonably can in other situations.
-- Correct the message output upon crashing to be more up-to-date.
Event-related:
-- document event-matches-key-specifier-p better.
-- generalize the dispatch queues formerly duplicated in the
various event implementations. add event methods to drain pending
events. generalize and clean up QUIT handling, removing
event-specific quit processing. allow arbitrary keystrokes, not
just ASCII, to be the QUIT char. among other things, this should
fix some longstanding bugs in X quit handling. long comment
describing the various event queues.
-- implement delaying of XFlush() if there are pending expose events.
SOMEONE PLEASE TRY THIS OUT.
-- Fix `xemacs -batch -l dunnet' under Cygwin. Try to fix under
MS Windows but not quite there yet.
Other:
-- class -> class_ and no more C++ games with this item.
new -> new_ in the lwlib code, so far not elsewhere.
-- use `struct htentry' not `struct hentry' in elhash.c to avoid
debugger confusion with hash.c.
-- new macros ALIST_LOOP_3, ALIST_LOOP_4.
* README.kkcc:
* alloc.c:
* alloc.c (deadbeef_memory):
* alloc.c (allocate_lisp_storage):
* alloc.c (copy_lisp_object):
* alloc.c (ALLOCATE_FIXED_TYPE_1):
* alloc.c (FREE_FIXED_TYPE):
* alloc.c (make_vector_internal):
* alloc.c (make_bit_vector_internal):
* alloc.c (make_key_data):
* alloc.c (make_button_data):
* alloc.c (make_motion_data):
* alloc.c (make_process_data):
* alloc.c (make_timeout_data):
* alloc.c (make_magic_data):
* alloc.c (make_magic_eval_data):
* alloc.c (make_eval_data):
* alloc.c (make_misc_user_data):
* alloc.c (struct string_chars_block):
* alloc.c (mark_lcrecord_list):
* alloc.c (make_lcrecord_list):
* alloc.c (alloc_managed_lcrecord):
* alloc.c (free_managed_lcrecord):
* alloc.c (alloc_automanaged_lcrecord):
* alloc.c (staticpro_1):
* alloc.c (staticpro):
* alloc.c (lispdesc_indirect_count_1):
* alloc.c (lispdesc_indirect_description_1):
* alloc.c (lispdesc_one_description_line_size):
* alloc.c (lispdesc_structure_size):
* alloc.c (mark_object_maybe_checking_free):
* alloc.c (mark_with_description):
* alloc.c (mark_struct_contents):
* alloc.c (mark_object):
* alloc.c (tick_lcrecord_stats):
* alloc.c (free_cons):
* alloc.c (free_key_data):
* alloc.c (free_button_data):
* alloc.c (free_motion_data):
* alloc.c (free_process_data):
* alloc.c (free_timeout_data):
* alloc.c (free_magic_data):
* alloc.c (free_magic_eval_data):
* alloc.c (free_eval_data):
* alloc.c (free_misc_user_data):
* alloc.c (free_marker):
* alloc.c (compact_string_chars):
* alloc.c (gc_sweep):
* alloc.c (garbage_collect_1):
* alloc.c (Fgarbage_collect):
* alloc.c (common_init_alloc_early):
* alloc.c (init_alloc_early):
* alloc.c (init_alloc_once_early):
* buffer.c:
* buffer.c (mark_buffer):
* buffer.c (MARKED_SLOT):
* buffer.c (cleanup_buffer_undo_lists):
* buffer.c (Fget_file_buffer):
* buffer.h (MARKED_SLOT):
* bufslots.h:
* bytecode.c:
* callint.c:
* casetab.c:
* chartab.c:
* chartab.c (symbol_to_char_table_type):
* cmdloop.c:
* cmdloop.c (Fcommand_loop_1):
* config.h.in (new):
* conslots.h:
* console-gtk-impl.h (struct gtk_frame):
* console-impl.h:
* console-impl.h (struct console):
* console-impl.h (MARKED_SLOT):
* console-impl.h (CONSOLE_QUIT_EVENT):
* console-msw-impl.h (XM_BUMPQUEUE):
* console-msw.c (write_string_to_mswindows_debugging_output):
* console-msw.h:
* console-stream-impl.h:
* console-stream-impl.h (struct stream_console):
* console-stream.c:
* console-stream.c (stream_init_console):
* console-stream.h:
* console-tty.c:
* console-tty.h:
* console-x.h:
* console.c:
* console.c (mark_console):
* console.c (MARKED_SLOT):
* console.c (allocate_console):
* console.c (get_console_variant):
* console.c (create_console):
* console.c (delete_console_internal):
* console.c (Fset_input_mode):
* console.c (Fcurrent_input_mode):
* console.c (common_init_complex_vars_of_console):
* console.h:
* console.h (console_variant):
* console.h (device_metrics):
* data.c:
* data.c (Faref):
* data.c (Faset):
* data.c (decode_weak_list_type):
* database.c:
* debug.c (xemacs_debug_loop):
* debug.c (FROB):
* debug.c (Fadd_debug_class_to_check):
* debug.c (Fdelete_debug_class_to_check):
* debug.c (Fset_debug_classes_to_check):
* debug.c (Fset_debug_class_types_to_check):
* debug.c (Fdebug_types_being_checked):
* debug.h (DASSERT):
* device-gtk.c:
* device-impl.h (struct device):
* device-impl.h (MARKED_SLOT):
* device-msw.c:
* device-x.c:
* device-x.c (x_init_device_class):
* device-x.c (x_comp_visual_info):
* device-x.c (x_try_best_visual_class):
* device-x.c (x_init_device):
* device-x.c (construct_name_list):
* device-x.c (x_get_resource_prefix):
* device-x.c (Fx_get_resource):
* device-x.c (Fx_display_visual_class):
* device.c:
* device.c (MARKED_SLOT):
* device.c (allocate_device):
* device.c (Fmake_device):
* device.c (delete_device_internal):
* device.c (Fset_device_class):
* device.h:
* devslots.h:
* devslots.h (MARKED_SLOT):
* dialog-msw.c:
* dired-msw.c (mswindows_ls_sort_fcn):
* dired-msw.c (mswindows_get_files):
* dired-msw.c (mswindows_format_file):
* doprnt.c (parse_doprnt_spec):
* dumper.c:
* dumper.c (struct):
* dumper.c (dump_add_root_block):
* dumper.c (dump_add_root_struct_ptr):
* dumper.c (dump_add_root_lisp_object):
* dumper.c (pdump_struct_list_elt):
* dumper.c (pdump_get_entry_list):
* dumper.c (pdump_backtrace):
* dumper.c (pdump_bump_depth):
* dumper.c (pdump_register_sub):
* dumper.c (pdump_register_object):
* dumper.c (pdump_register_struct_contents):
* dumper.c (pdump_register_struct):
* dumper.c (pdump_store_new_pointer_offsets):
* dumper.c (pdump_dump_data):
* dumper.c (pdump_reloc_one):
* dumper.c (pdump_allocate_offset):
* dumper.c (pdump_scan_by_alignment):
* dumper.c (pdump_dump_root_blocks):
* dumper.c (pdump_dump_rtables):
* dumper.c (pdump_dump_root_lisp_objects):
* dumper.c (pdump):
* dumper.c (pdump_load_finish):
* dumper.c (pdump_file_get):
* dumper.c (pdump_resource_get):
* dumper.c (pdump_load):
* editfns.c (save_excursion_restore):
* editfns.c (user_login_name):
* editfns.c (save_restriction_restore):
* elhash.c:
* elhash.c (htentry):
* elhash.c (struct Lisp_Hash_Table):
* elhash.c (HTENTRY_CLEAR_P):
* elhash.c (LINEAR_PROBING_LOOP):
* elhash.c (check_hash_table_invariants):
* elhash.c (mark_hash_table):
* elhash.c (hash_table_equal):
* elhash.c (print_hash_table_data):
* elhash.c (free_hentries):
* elhash.c (make_general_lisp_hash_table):
* elhash.c (decode_hash_table_weakness):
* elhash.c (decode_hash_table_test):
* elhash.c (Fcopy_hash_table):
* elhash.c (resize_hash_table):
* elhash.c (pdump_reorganize_hash_table):
* elhash.c (find_htentry):
* elhash.c (Fgethash):
* elhash.c (Fputhash):
* elhash.c (remhash_1):
* elhash.c (Fremhash):
* elhash.c (Fclrhash):
* elhash.c (copy_compress_hentries):
* elhash.c (elisp_maphash_unsafe):
* elhash.c (finish_marking_weak_hash_tables):
* elhash.c (prune_weak_hash_tables):
* elhash.h:
* emacs.c:
* emacs.c (main_1):
* emacs.c (main):
* emacs.c (shut_down_emacs):
* emodules.h (dump_add_root_lisp_object):
* eval.c:
* eval.c (unwind_to_catch):
* eval.c (maybe_signal_error_1):
* eval.c (maybe_signal_continuable_error_1):
* eval.c (maybe_signal_error):
* eval.c (maybe_signal_continuable_error):
* eval.c (maybe_signal_error_2):
* eval.c (maybe_signal_continuable_error_2):
* eval.c (maybe_signal_ferror):
* eval.c (maybe_signal_continuable_ferror):
* eval.c (maybe_signal_ferror_with_frob):
* eval.c (maybe_signal_continuable_ferror_with_frob):
* eval.c (maybe_syntax_error):
* eval.c (maybe_sferror):
* eval.c (maybe_invalid_argument):
* eval.c (maybe_invalid_constant):
* eval.c (maybe_invalid_operation):
* eval.c (maybe_invalid_change):
* eval.c (maybe_invalid_state):
* eval.c (Feval):
* eval.c (call_trapping_problems):
* eval.c (call_with_suspended_errors):
* eval.c (warn_when_safe_lispobj):
* eval.c (warn_when_safe):
* eval.c (vars_of_eval):
* event-Xt.c:
* event-Xt.c (maybe_define_x_key_as_self_inserting_character):
* event-Xt.c (x_to_emacs_keysym):
* event-Xt.c (x_event_to_emacs_event):
* event-Xt.c (emacs_Xt_enqueue_focus_event):
* event-Xt.c (emacs_Xt_format_magic_event):
* event-Xt.c (emacs_Xt_compare_magic_event):
* event-Xt.c (emacs_Xt_hash_magic_event):
* event-Xt.c (emacs_Xt_handle_magic_event):
* event-Xt.c (Xt_timeout_to_emacs_event):
* event-Xt.c (Xt_process_to_emacs_event):
* event-Xt.c (signal_special_Xt_user_event):
* event-Xt.c (emacs_Xt_next_event):
* event-Xt.c (emacs_Xt_event_handler):
* event-Xt.c (emacs_Xt_drain_queue):
* event-Xt.c (emacs_Xt_event_pending_p):
* event-Xt.c (check_if_pending_expose_event):
* event-Xt.c (reinit_vars_of_event_Xt):
* event-Xt.c (vars_of_event_Xt):
* event-gtk.c:
* event-gtk.c (IS_MODIFIER_KEY):
* event-gtk.c (emacs_gtk_format_magic_event):
* event-gtk.c (emacs_gtk_compare_magic_event):
* event-gtk.c (emacs_gtk_hash_magic_event):
* event-gtk.c (emacs_gtk_handle_magic_event):
* event-gtk.c (gtk_to_emacs_keysym):
* event-gtk.c (gtk_timeout_to_emacs_event):
* event-gtk.c (gtk_process_to_emacs_event):
* event-gtk.c (dragndrop_data_received):
* event-gtk.c (signal_special_gtk_user_event):
* event-gtk.c (emacs_gtk_next_event):
* event-gtk.c (gtk_event_to_emacs_event):
* event-gtk.c (generic_event_handler):
* event-gtk.c (emacs_shell_event_handler):
* event-gtk.c (emacs_gtk_drain_queue):
* event-gtk.c (emacs_gtk_event_pending_p):
* event-gtk.c (reinit_vars_of_event_gtk):
* event-gtk.c (vars_of_event_gtk):
* event-msw.c:
* event-msw.c (struct winsock_stream):
* event-msw.c (winsock_reader):
* event-msw.c (winsock_writer):
* event-msw.c (mswindows_enqueue_dispatch_event):
* event-msw.c (mswindows_enqueue_misc_user_event):
* event-msw.c (mswindows_enqueue_magic_event):
* event-msw.c (mswindows_enqueue_process_event):
* event-msw.c (mswindows_enqueue_mouse_button_event):
* event-msw.c (mswindows_enqueue_keypress_event):
* event-msw.c (mswindows_dequeue_dispatch_event):
* event-msw.c (emacs_mswindows_drain_queue):
* event-msw.c (mswindows_need_event_in_modal_loop):
* event-msw.c (mswindows_need_event):
* event-msw.c (mswindows_wm_timer_callback):
* event-msw.c (dde_eval_string):
* event-msw.c (Fdde_alloc_advise_item):
* event-msw.c (mswindows_dde_callback):
* event-msw.c (mswindows_wnd_proc):
* event-msw.c (remove_timeout_mapper):
* event-msw.c (emacs_mswindows_remove_timeout):
* event-msw.c (emacs_mswindows_event_pending_p):
* event-msw.c (emacs_mswindows_format_magic_event):
* event-msw.c (emacs_mswindows_compare_magic_event):
* event-msw.c (emacs_mswindows_hash_magic_event):
* event-msw.c (emacs_mswindows_handle_magic_event):
* event-msw.c (emacs_mswindows_select_console):
* event-msw.c (emacs_mswindows_unselect_console):
* event-msw.c (reinit_vars_of_event_mswindows):
* event-msw.c (vars_of_event_mswindows):
* event-stream.c:
* event-stream.c (mark_command_builder):
* event-stream.c (reset_command_builder_event_chain):
* event-stream.c (allocate_command_builder):
* event-stream.c (copy_command_builder):
* event-stream.c (command_builder_append_event):
* event-stream.c (event_stream_event_pending_p):
* event-stream.c (event_stream_force_event_pending):
* event-stream.c (maybe_read_quit_event):
* event-stream.c (event_stream_drain_queue):
* event-stream.c (remove_quit_p_event):
* event-stream.c (event_stream_quit_p):
* event-stream.c (echo_key_event):
* event-stream.c (maybe_kbd_translate):
* event-stream.c (execute_help_form):
* event-stream.c (event_stream_generate_wakeup):
* event-stream.c (enqueue_dispatch_event):
* event-stream.c (enqueue_magic_eval_event):
* event-stream.c (Fenqueue_eval_event):
* event-stream.c (enqueue_misc_user_event):
* event-stream.c (enqueue_misc_user_event_pos):
* event-stream.c (next_event_internal):
* event-stream.c (Fnext_event):
* event-stream.c (Faccept_process_output):
* event-stream.c (execute_internal_event):
* event-stream.c (munge_keymap_translate):
* event-stream.c (command_builder_find_leaf_no_mule_processing):
* event-stream.c (command_builder_find_leaf):
* event-stream.c (lookup_command_event):
* event-stream.c (is_scrollbar_event):
* event-stream.c (execute_command_event):
* event-stream.c (Fdispatch_event):
* event-stream.c (Fread_key_sequence):
* event-stream.c (dribble_out_event):
* event-stream.c (vars_of_event_stream):
* event-tty.c (tty_timeout_to_emacs_event):
* event-tty.c (emacs_tty_next_event):
* event-tty.c (emacs_tty_drain_queue):
* event-tty.c (reinit_vars_of_event_tty):
* event-unixoid.c:
* event-unixoid.c (find_tty_or_stream_console_from_fd):
* event-unixoid.c (read_event_from_tty_or_stream_desc):
* event-unixoid.c (drain_tty_devices):
* event-unixoid.c (poll_fds_for_input):
* events.c:
* events.c (deinitialize_event):
* events.c (zero_event):
* events.c (mark_event):
* events.c (print_event_1):
* events.c (print_event):
* events.c (event_equal):
* events.c (event_hash):
* events.c (Fmake_event):
* events.c (Fdeallocate_event):
* events.c (Fcopy_event):
* events.c (map_event_chain_remove):
* events.c (character_to_event):
* events.c (event_to_character):
* events.c (Fevent_to_character):
* events.c (format_event_object):
* events.c (upshift_event):
* events.c (downshift_event):
* events.c (event_upshifted_p):
* events.c (Fevent_live_p):
* events.c (Fevent_type):
* events.c (Fevent_timestamp):
* events.c (CHECK_EVENT_TYPE):
* events.c (CHECK_EVENT_TYPE2):
* events.c (CHECK_EVENT_TYPE3):
* events.c (Fevent_key):
* events.c (Fevent_button):
* events.c (Fevent_modifier_bits):
* events.c (event_x_y_pixel_internal):
* events.c (event_pixel_translation):
* events.c (Fevent_process):
* events.c (Fevent_function):
* events.c (Fevent_object):
* events.c (Fevent_properties):
* events.c (syms_of_events):
* events.c (vars_of_events):
* events.h:
* events.h (struct event_stream):
* events.h (struct Lisp_Key_Data):
* events.h (KEY_DATA_KEYSYM):
* events.h (EVENT_KEY_KEYSYM):
* events.h (struct Lisp_Button_Data):
* events.h (EVENT_BUTTON_BUTTON):
* events.h (struct Lisp_Motion_Data):
* events.h (EVENT_MOTION_X):
* events.h (struct Lisp_Process_Data):
* events.h (EVENT_PROCESS_PROCESS):
* events.h (struct Lisp_Timeout_Data):
* events.h (EVENT_TIMEOUT_INTERVAL_ID):
* events.h (struct Lisp_Eval_Data):
* events.h (EVENT_EVAL_FUNCTION):
* events.h (struct Lisp_Misc_User_Data):
* events.h (EVENT_MISC_USER_FUNCTION):
* events.h (struct Lisp_Magic_Eval_Data):
* events.h (EVENT_MAGIC_EVAL_INTERNAL_FUNCTION):
* events.h (struct Lisp_Magic_Data):
* events.h (EVENT_MAGIC_UNDERLYING):
* events.h (EVENT_MAGIC_GDK_EVENT):
* events.h (struct Lisp_Event):
* events.h (XEVENT_CHANNEL):
* events.h (SET_EVENT_TIMESTAMP_ZERO):
* events.h (SET_EVENT_CHANNEL):
* events.h (SET_EVENT_NEXT):
* events.h (XSET_EVENT_TYPE):
* events.h (struct command_builder):
* extents.c:
* extents.c (gap_array_adjust_markers):
* extents.c (gap_array_recompute_derived_values):
* extents.c (gap_array_move_gap):
* extents.c (gap_array_make_gap):
* extents.c (gap_array_insert_els):
* extents.c (gap_array_delete_els):
* extents.c (gap_array_make_marker):
* extents.c (gap_array_delete_marker):
* extents.c (gap_array_move_marker):
* extents.c (make_gap_array):
* extents.c (free_gap_array):
* extents.c (extent_list_num_els):
* extents.c (extent_list_insert):
* extents.c (mark_extent_auxiliary):
* extents.c (allocate_extent_auxiliary):
* extents.c (decode_extent_at_flag):
* extents.c (verify_extent_mapper):
* extents.c (symbol_to_glyph_layout):
* extents.c (syms_of_extents):
* faces.c:
* file-coding.c:
* file-coding.c (struct_detector_category_description =):
* file-coding.c (detector_category_dynarr_description_1):
* file-coding.c (struct_detector_description =):
* file-coding.c (detector_dynarr_description_1):
* file-coding.c (MARKED_SLOT):
* file-coding.c (mark_coding_system):
* file-coding.c (coding_system_extra_description_map):
* file-coding.c (coding_system_description):
* file-coding.c (allocate_coding_system):
* file-coding.c (symbol_to_eol_type):
* file-coding.c (Fcoding_system_aliasee):
* file-coding.c (set_coding_stream_coding_system):
* file-coding.c (struct convert_eol_coding_system):
* file-coding.c (struct undecided_coding_system):
* file-coding.c (undecided_mark_coding_stream):
* file-coding.c (coding_category_symbol_to_id):
* file-coding.c (struct gzip_coding_system):
* file-coding.c (coding_system_type_create):
* file-coding.h:
* file-coding.h (struct Lisp_Coding_System):
* file-coding.h (CODING_SYSTEM_SLOT_DECLARATION):
* file-coding.h (coding_system_variant):
* file-coding.h (struct coding_system_methods):
* file-coding.h (DEFINE_CODING_SYSTEM_TYPE_WITH_DATA):
* file-coding.h (INITIALIZE_CODING_SYSTEM_TYPE_WITH_DATA):
* file-coding.h (struct coding_stream):
* fileio.c (Fsubstitute_in_file_name):
* floatfns.c:
* fns.c:
* fns.c (base64_encode_1):
* frame-gtk.c:
* frame-gtk.c (Fgtk_start_drag_internal):
* frame-impl.h (struct frame):
* frame-impl.h (MARKED_SLOT):
* frame-msw.c:
* frame-x.c:
* frame-x.c (Fcde_start_drag_internal):
* frame-x.c (Foffix_start_drag_internal):
* frame.c:
* frame.c (MARKED_SLOT):
* frame.c (allocate_frame_core):
* frame.c (delete_frame_internal):
* frame.c (Fmouse_position_as_motion_event):
* frameslots.h:
* frameslots.h (MARKED_SLOT_ARRAY):
* free-hook.c:
* glyphs-msw.c (mswindows_widget_instantiate):
* glyphs-x.c:
* glyphs-x.c (convert_EImage_to_XImage):
* glyphs.c:
* glyphs.c (process_image_string_instantiator):
* glyphs.c (mark_image_instance):
* glyphs.c (allocate_image_instance):
* glyphs.c (unmap_subwindow):
* glyphs.c (map_subwindow):
* glyphs.c (syms_of_glyphs):
* glyphs.c (specifier_type_create_image):
* glyphs.h:
* glyphs.h (struct text_image_instance):
* glyphs.h (struct Lisp_Image_Instance):
* gmalloc.c:
* gmalloc.c ("C"):
* gpmevent.c (Freceive_gpm_event):
* gpmevent.c (gpm_next_event_cb):
* gpmevent.c (vars_of_gpmevent):
* gtk-glue.c (gdk_event_to_emacs_event):
* gtk-xemacs.c (gtk_xemacs_class_init):
* gui-msw.c:
* gui-msw.c (mswindows_handle_gui_wm_command):
* gui-msw.c (mswindows_translate_menu_or_dialog_item):
* gui-x.c:
* gui-x.c (mark_popup_data):
* gui-x.c (snarf_widget_value_mapper):
* gui-x.c (gcpro_popup_callbacks):
* gui-x.c (ungcpro_popup_callbacks):
* gui-x.c (free_popup_widget_value_tree):
* gui-x.c (popup_selection_callback):
* gui-x.h:
* gui-x.h (struct popup_data):
* gui.c:
* gui.c (allocate_gui_item):
* gutter.c (decode_gutter_position):
* hash.c (NULL_ENTRY):
* indent.c (vmotion_1):
* indent.c (vmotion_pixels):
* input-method-motif.c (res):
* input-method-xlib.c (IMInstantiateCallback):
* input-method-xlib.c (XIM_init_device):
* input-method-xlib.c (res):
* intl-encap-win32.c:
* intl-encap-win32.c (qxeSHGetDataFromIDList):
* intl-win32.c:
* intl-win32.c (mswindows_multibyte_cp_type):
* intl-win32.c (struct mswindows_multibyte_coding_system):
* keymap.c:
* keymap.c (make_key_description):
* keymap.c (keymap_store):
* keymap.c (get_keyelt):
* keymap.c (keymap_lookup_1):
* keymap.c (define_key_parser):
* keymap.c (key_desc_list_to_event):
* keymap.c (event_matches_key_specifier_p):
* keymap.c (meta_prefix_char_p):
* keymap.c (ensure_meta_prefix_char_keymapp):
* keymap.c (Fdefine_key):
* keymap.c (struct raw_lookup_key_mapper_closure):
* keymap.c (raw_lookup_key):
* keymap.c (raw_lookup_key_mapper):
* keymap.c (lookup_keys):
* keymap.c (lookup_events):
* keymap.c (Flookup_key):
* keymap.c (struct map_keymap_unsorted_closure):
* keymap.c (map_keymap_unsorted_mapper):
* keymap.c (map_keymap_sorted):
* keymap.c (map_keymap_mapper):
* keymap.c (map_keymap):
* keymap.c (accessible_keymaps_mapper_1):
* keymap.c (Faccessible_keymaps):
* keymap.c (Fsingle_key_description):
* keymap.c (raw_keys_to_keys):
* keymap.c (format_raw_keys):
* keymap.c (where_is_recursive_mapper):
* keymap.c (where_is_internal):
* keymap.c (describe_map_mapper_shadow_search):
* keymap.c (keymap_lookup_inherited_mapper):
* keymap.c (describe_map_mapper):
* keymap.h (event_matches_key_specifier_p):
* lisp.h:
* lisp.h (this):
* lisp.h (RETURN_NOT_REACHED):
* lisp.h (struct Lisp_Vector):
* lisp.h (struct Lisp_Bit_Vector):
* lisp.h (UNGCPRO_1):
* lisp.h (NUNGCPRO):
* lisp.h (NNUNGCPRO):
* lisp.h (DECLARE_INLINE_HEADER):
* lrecord.h:
* lrecord.h (struct lrecord_header):
* lrecord.h (struct lcrecord_header):
* lrecord.h (lrecord_type):
* lrecord.h (struct lrecord_implementation):
* lrecord.h (RECORD_DUMPABLE):
* lrecord.h (memory_description_type):
* lrecord.h (data_description_entry_flags):
* lrecord.h (struct memory_description):
* lrecord.h (struct sized_memory_description):
* lrecord.h (XD_INDIRECT):
* lrecord.h (XD_IS_INDIRECT):
* lrecord.h (XD_DYNARR_DESC):
* lrecord.h (DEFINE_BASIC_LRECORD_IMPLEMENTATION):
* lrecord.h (MAKE_LRECORD_IMPLEMENTATION):
* lrecord.h (MAKE_EXTERNAL_LRECORD_IMPLEMENTATION):
* lrecord.h (alloc_lcrecord_type):
* lstream.c:
* lstream.c (Lstream_new):
* lstream.c (lisp_buffer_marker):
* lstream.h:
* lstream.h (lstream_implementation):
* lstream.h (DEFINE_LSTREAM_IMPLEMENTATION):
* lstream.h (DEFINE_LSTREAM_IMPLEMENTATION_WITH_DATA):
* marker.c:
* marker.c (copy_marker_1):
* mem-limits.h:
* menubar-gtk.c:
* menubar-gtk.c (gtk_popup_menu):
* menubar-msw.c:
* menubar-msw.c (mswindows_popup_menu):
* menubar-x.c (make_dummy_xbutton_event):
* menubar-x.c (command_builder_operate_menu_accelerator):
* menubar-x.c (menu_accelerator_safe_compare):
* menubar-x.c (menu_accelerator_safe_mod_compare):
* mule-charset.c:
* mule-charset.c (make_charset):
* mule-charset.c (Fcharset_property):
* mule-coding.c:
* mule-coding.c (ccs_description_1):
* mule-coding.c (ccs_description =):
* mule-coding.c (ccsd_description_1):
* mule-coding.c (ccsd_description =):
* nt.c (getpwnam):
* nt.c (init_mswindows_environment):
* nt.c (get_cached_volume_information):
* nt.c (mswindows_is_executable):
* nt.c (read_unc_volume):
* nt.c (mswindows_access):
* nt.c (mswindows_link):
* nt.c (mswindows_fstat):
* nt.c (mswindows_stat):
* nt.c (mswindows_executable_type):
* nt.c (Fmswindows_short_file_name):
* nt.c (Fmswindows_long_file_name):
* objects-impl.h (struct Lisp_Color_Instance):
* objects-impl.h (struct Lisp_Font_Instance):
* objects-tty.c:
* objects-x.c (allocate_nearest_color):
* objects.c:
* objects.c (Fmake_color_instance):
* objects.c (Fmake_font_instance):
* objects.c (font_instantiate):
* opaque.c:
* opaque.c (make_opaque):
* opaque.c (make_opaque_ptr):
* opaque.c (reinit_opaque_early):
* opaque.c (init_opaque_once_early):
* print.c:
* print.c (printing_badness):
* print.c (printing_major_badness):
* print.c (print_internal):
* print.c (debug_p4):
* print.c (dp):
* print.c (debug_backtrace):
* process-nt.c (nt_create_process):
* process-nt.c (get_internet_address):
* process-unix.c:
* process-unix.c (struct unix_process_data):
* process-unix.c (get_internet_address):
* process-unix.c (unix_alloc_process_data):
* process-unix.c (unix_create_process):
* process-unix.c (try_to_initialize_subtty):
* process-unix.c (unix_kill_child_process):
* process-unix.c (process_type_create_unix):
* process.c:
* process.c (mark_process):
* process.c (MARKED_SLOT):
* process.c (make_process_internal):
* process.c (Fprocess_tty_name):
* process.c (decode_signal):
* process.h:
* procimpl.h:
* procimpl.h (struct process_methods):
* procimpl.h (struct Lisp_Process):
* rangetab.c:
* realpath.c (readlink_and_correct_case):
* redisplay-x.c (x_window_output_end):
* redisplay-x.c (x_redraw_exposed_area):
* redisplay-x.c (x_clear_frame):
* redisplay.c:
* redisplay.h:
* redisplay.h (struct rune_dglyph):
* redisplay.h (struct rune):
* scrollbar.c:
* scrollbar.c (create_scrollbar_instance):
* specifier.c:
* specifier.c (specifier_empty_extra_description_1):
* specifier.c (make_specifier_internal):
* specifier.c (decode_locale_type):
* specifier.c (decode_how_to_add_specification):
* specifier.h:
* specifier.h (struct specifier_methods):
* specifier.h (DEFINE_SPECIFIER_TYPE_WITH_DATA):
* specifier.h (INITIALIZE_SPECIFIER_TYPE_WITH_DATA):
* symbols.c:
* symbols.c (Fsetplist):
* symbols.c (default_value):
* symbols.c (decode_magic_handler_type):
* symbols.c (handler_type_from_function_symbol):
* symbols.c (Fdefvaralias):
* symbols.c (init_symbols_once_early):
* symbols.c (reinit_symbols_early):
* symsinit.h:
* sysdep.c (sys_subshell):
* sysdep.c (tty_init_sys_modes_on_device):
* syswindows.h:
* text.c (dfc_convert_to_external_format):
* text.c (dfc_convert_to_internal_format):
* text.c (reinit_eistring_early):
* text.c (init_eistring_once_early):
* text.c (reinit_vars_of_text):
* text.h:
* text.h (INC_IBYTEPTR_FMT):
* text.h (DEC_IBYTEPTR_FMT):
* toolbar.c:
* toolbar.c (decode_toolbar_position):
* tooltalk.c:
* ui-gtk.c:
* unexnt.c:
* unexnt.c (_start):
* unexnt.c (unexec):
* unexnt.c (get_section_info):
* unicode.c:
* unicode.c (vars_of_unicode):
* window.c:
* window.c (allocate_window):
* window.c (new_window_mirror):
* window.c (update_mirror_internal):
* winslots.h:
author | michaels |
---|---|
date | Sun, 12 Jan 2003 11:08:22 +0000 |
parents | 79c6ff3eef26 |
children | 9fc738581a9d |
comparison
equal
deleted
inserted
replaced
1203:5f2f8dcbfb3e | 1204:e22b0213b713 |
---|---|
98 {"-iconname", "*TopLevelEmacsShell.iconName", XrmoptionSepArg, NULL}, | 98 {"-iconname", "*TopLevelEmacsShell.iconName", XrmoptionSepArg, NULL}, |
99 {"-in", "*TopLevelEmacsShell.iconName", XrmoptionSepArg, NULL}, | 99 {"-in", "*TopLevelEmacsShell.iconName", XrmoptionSepArg, NULL}, |
100 {"-mc", "*pointerColor", XrmoptionSepArg, NULL}, | 100 {"-mc", "*pointerColor", XrmoptionSepArg, NULL}, |
101 {"-cr", "*cursorColor", XrmoptionSepArg, NULL}, | 101 {"-cr", "*cursorColor", XrmoptionSepArg, NULL}, |
102 {"-fontset", "*FontSet", XrmoptionSepArg, NULL}, | 102 {"-fontset", "*FontSet", XrmoptionSepArg, NULL}, |
103 }; | |
104 | |
105 static const struct memory_description x_device_data_description_1 [] = { | |
106 { XD_LISP_OBJECT, offsetof (struct x_device, x_keysym_map_hash_table) }, | |
107 { XD_LISP_OBJECT, offsetof (struct x_device, WM_COMMAND_frame) }, | |
108 { XD_END } | |
109 }; | |
110 | |
111 extern const struct sized_memory_description x_device_data_description; | |
112 | |
113 const struct sized_memory_description x_device_data_description = { | |
114 sizeof (struct x_device), x_device_data_description_1 | |
103 }; | 115 }; |
104 | 116 |
105 /* Functions to synchronize mirroring resources and specifiers */ | 117 /* Functions to synchronize mirroring resources and specifiers */ |
106 int in_resource_setting; | 118 int in_resource_setting; |
107 | 119 |
242 static void | 254 static void |
243 x_init_device_class (struct device *d) | 255 x_init_device_class (struct device *d) |
244 { | 256 { |
245 if (DEVICE_X_DEPTH(d) > 2) | 257 if (DEVICE_X_DEPTH(d) > 2) |
246 { | 258 { |
247 switch (DEVICE_X_VISUAL(d)->class) | 259 switch (DEVICE_X_VISUAL(d)->X_CLASSFIELD) |
248 { | 260 { |
249 case StaticGray: | 261 case StaticGray: |
250 case GrayScale: | 262 case GrayScale: |
251 DEVICE_CLASS (d) = Qgrayscale; | 263 DEVICE_CLASS (d) = Qgrayscale; |
252 break; | 264 break; |
370 return 1; | 382 return 1; |
371 else if ( left->depth == right->depth ) | 383 else if ( left->depth == right->depth ) |
372 { | 384 { |
373 if ( left->colormap_size > right->colormap_size ) | 385 if ( left->colormap_size > right->colormap_size ) |
374 return 1; | 386 return 1; |
375 if ( left->class > right->class ) | 387 if ( left->X_CLASSFIELD > right->X_CLASSFIELD ) |
376 return 1; | 388 return 1; |
377 else if ( left->class < right->class ) | 389 else if ( left->X_CLASSFIELD < right->X_CLASSFIELD ) |
378 return -1; | 390 return -1; |
379 else | 391 else |
380 return 0; | 392 return 0; |
381 } | 393 } |
382 else | 394 else |
391 Display *dpy = DisplayOfScreen (screen); | 403 Display *dpy = DisplayOfScreen (screen); |
392 XVisualInfo vi_in; | 404 XVisualInfo vi_in; |
393 XVisualInfo *vi_out = NULL; | 405 XVisualInfo *vi_out = NULL; |
394 int out_count; | 406 int out_count; |
395 | 407 |
396 vi_in.class = visual_class; | 408 vi_in.X_CLASSFIELD = visual_class; |
397 vi_in.screen = scrnum; | 409 vi_in.screen = scrnum; |
398 vi_out = XGetVisualInfo (dpy, (VisualClassMask | VisualScreenMask), | 410 vi_out = XGetVisualInfo (dpy, (VisualClassMask | VisualScreenMask), |
399 &vi_in, &out_count); | 411 &vi_in, &out_count); |
400 if ( vi_out ) | 412 if ( vi_out ) |
401 { | 413 { |
742 check to see if the user specified that we need a private colormap */ | 754 check to see if the user specified that we need a private colormap */ |
743 if (visual == DefaultVisual (dpy, screen)) | 755 if (visual == DefaultVisual (dpy, screen)) |
744 { | 756 { |
745 sprintf (buf1, "%s.privateColormap", app_name); | 757 sprintf (buf1, "%s.privateColormap", app_name); |
746 sprintf (buf2, "%s.PrivateColormap", app_class); | 758 sprintf (buf2, "%s.PrivateColormap", app_class); |
747 if ((visual->class == PseudoColor) && | 759 if ((visual->X_CLASSFIELD == PseudoColor) && |
748 (XrmGetResource (XtDatabase (dpy), buf1, buf2, &type, &value) | 760 (XrmGetResource (XtDatabase (dpy), buf1, buf2, &type, &value) |
749 == True)) | 761 == True)) |
750 cmap = XCopyColormapAndFree (dpy, DefaultColormap (dpy, screen)); | 762 cmap = XCopyColormapAndFree (dpy, DefaultColormap (dpy, screen)); |
751 else | 763 else |
752 cmap = DefaultColormap (dpy, screen); | 764 cmap = DefaultColormap (dpy, screen); |
1221 | 1233 |
1222 /* If widget is NULL, we are retrieving device or global face data. */ | 1234 /* If widget is NULL, we are retrieving device or global face data. */ |
1223 | 1235 |
1224 static void | 1236 static void |
1225 construct_name_list (Display *display, Widget widget, char *fake_name, | 1237 construct_name_list (Display *display, Widget widget, char *fake_name, |
1226 char *fake_class, char *name, char *class) | 1238 char *fake_class, char *name, char *class_) |
1227 { | 1239 { |
1228 char *stack [100][2]; | 1240 char *stack [100][2]; |
1229 Widget this; | 1241 Widget this; |
1230 int count = 0; | 1242 int count = 0; |
1231 char *name_tail, *class_tail; | 1243 char *name_tail, *class_tail; |
1258 XtGetApplicationNameAndClass (display, | 1270 XtGetApplicationNameAndClass (display, |
1259 &stack [count][0], | 1271 &stack [count][0], |
1260 &stack [count][1]); | 1272 &stack [count][1]); |
1261 | 1273 |
1262 name [0] = 0; | 1274 name [0] = 0; |
1263 class [0] = 0; | 1275 class_ [0] = 0; |
1264 | 1276 |
1265 name_tail = name; | 1277 name_tail = name; |
1266 class_tail = class; | 1278 class_tail = class_; |
1267 for (; count >= 0; count--) | 1279 for (; count >= 0; count--) |
1268 { | 1280 { |
1269 strcat (name_tail, stack [count][0]); | 1281 strcat (name_tail, stack [count][0]); |
1270 for (; *name_tail; name_tail++) | 1282 for (; *name_tail; name_tail++) |
1271 if (*name_tail == '.') *name_tail = '_'; | 1283 if (*name_tail == '.') *name_tail = '_'; |
1290 fetch the resource on. */ | 1302 fetch the resource on. */ |
1291 | 1303 |
1292 static void | 1304 static void |
1293 x_get_resource_prefix (Lisp_Object locale, Lisp_Object device, | 1305 x_get_resource_prefix (Lisp_Object locale, Lisp_Object device, |
1294 Display **display_out, Extbyte_dynarr *name, | 1306 Display **display_out, Extbyte_dynarr *name, |
1295 Extbyte_dynarr *class) | 1307 Extbyte_dynarr *class_) |
1296 { | 1308 { |
1297 if (NILP (locale)) | 1309 if (NILP (locale)) |
1298 locale = Qglobal; | 1310 locale = Qglobal; |
1299 if (NILP (Fvalid_specifier_locale_p (locale))) | 1311 if (NILP (Fvalid_specifier_locale_p (locale))) |
1300 invalid_argument ("Invalid locale", locale); | 1312 invalid_argument ("Invalid locale", locale); |
1331 int name_len, class_len; | 1343 int name_len, class_len; |
1332 XtGetApplicationNameAndClass (*display_out, &appname, &appclass); | 1344 XtGetApplicationNameAndClass (*display_out, &appname, &appclass); |
1333 name_len = strlen (appname); | 1345 name_len = strlen (appname); |
1334 class_len = strlen (appclass); | 1346 class_len = strlen (appclass); |
1335 Dynarr_add_many (name, appname, name_len); | 1347 Dynarr_add_many (name, appname, name_len); |
1336 Dynarr_add_many (class, appclass, class_len); | 1348 Dynarr_add_many (class_, appclass, class_len); |
1337 validify_resource_component (Dynarr_atp (name, 0), name_len); | 1349 validify_resource_component (Dynarr_atp (name, 0), name_len); |
1338 validify_resource_component (Dynarr_atp (class, 0), class_len); | 1350 validify_resource_component (Dynarr_atp (class_, 0), class_len); |
1339 } | 1351 } |
1340 | 1352 |
1341 if (EQ (locale, Qglobal)) | 1353 if (EQ (locale, Qglobal)) |
1342 return; | 1354 return; |
1343 if (BUFFERP (locale)) | 1355 if (BUFFERP (locale)) |
1344 { | 1356 { |
1345 Dynarr_add_literal_string (name, ".buffer."); | 1357 Dynarr_add_literal_string (name, ".buffer."); |
1346 /* we know buffer is live; otherwise we got an error above. */ | 1358 /* we know buffer is live; otherwise we got an error above. */ |
1347 Dynarr_add_validified_lisp_string (name, Fbuffer_name (locale)); | 1359 Dynarr_add_validified_lisp_string (name, Fbuffer_name (locale)); |
1348 Dynarr_add_literal_string (class, ".EmacsLocaleType.EmacsBuffer"); | 1360 Dynarr_add_literal_string (class_, ".EmacsLocaleType.EmacsBuffer"); |
1349 } | 1361 } |
1350 else if (FRAMEP (locale)) | 1362 else if (FRAMEP (locale)) |
1351 { | 1363 { |
1352 Dynarr_add_literal_string (name, ".frame."); | 1364 Dynarr_add_literal_string (name, ".frame."); |
1353 /* we know frame is live; otherwise we got an error above. */ | 1365 /* we know frame is live; otherwise we got an error above. */ |
1354 Dynarr_add_validified_lisp_string (name, Fframe_name (locale)); | 1366 Dynarr_add_validified_lisp_string (name, Fframe_name (locale)); |
1355 Dynarr_add_literal_string (class, ".EmacsLocaleType.EmacsFrame"); | 1367 Dynarr_add_literal_string (class_, ".EmacsLocaleType.EmacsFrame"); |
1356 } | 1368 } |
1357 else | 1369 else |
1358 { | 1370 { |
1359 assert (DEVICEP (locale)); | 1371 assert (DEVICEP (locale)); |
1360 Dynarr_add_literal_string (name, ".device."); | 1372 Dynarr_add_literal_string (name, ".device."); |
1361 /* we know device is live; otherwise we got an error above. */ | 1373 /* we know device is live; otherwise we got an error above. */ |
1362 Dynarr_add_validified_lisp_string (name, Fdevice_name (locale)); | 1374 Dynarr_add_validified_lisp_string (name, Fdevice_name (locale)); |
1363 Dynarr_add_literal_string (class, ".EmacsLocaleType.EmacsDevice"); | 1375 Dynarr_add_literal_string (class_, ".EmacsLocaleType.EmacsDevice"); |
1364 } | 1376 } |
1365 return; | 1377 return; |
1366 } | 1378 } |
1367 | 1379 |
1368 DEFUN ("x-get-resource", Fx_get_resource, 3, 6, 0, /* | 1380 DEFUN ("x-get-resource", Fx_get_resource, 3, 6, 0, /* |
1445 found. If the third arg is `string', a string is returned, and if it is | 1457 found. If the third arg is `string', a string is returned, and if it is |
1446 `integer', an integer is returned. If the third arg is `boolean', then the | 1458 `integer', an integer is returned. If the third arg is `boolean', then the |
1447 returned value is the list (t) for true, (nil) for false, and is nil to | 1459 returned value is the list (t) for true, (nil) for false, and is nil to |
1448 mean ``unspecified''. | 1460 mean ``unspecified''. |
1449 */ | 1461 */ |
1450 (name, class, type, locale, device, noerror)) | 1462 (name, class_, type, locale, device, noerror)) |
1451 { | 1463 { |
1452 Extbyte *name_string, *class_string; | 1464 Extbyte *name_string, *class_string; |
1453 Extbyte *raw_result; | 1465 Extbyte *raw_result; |
1454 XrmDatabase db; | 1466 XrmDatabase db; |
1455 Display *display; | 1467 Display *display; |
1456 Error_Behavior errb = decode_error_behavior_flag (noerror); | 1468 Error_Behavior errb = decode_error_behavior_flag (noerror); |
1457 Lisp_Object codesys; | 1469 Lisp_Object codesys; |
1458 | 1470 |
1459 CHECK_STRING (name); | 1471 CHECK_STRING (name); |
1460 CHECK_STRING (class); | 1472 CHECK_STRING (class_); |
1461 CHECK_SYMBOL (type); | 1473 CHECK_SYMBOL (type); |
1462 | 1474 |
1463 Dynarr_reset (name_Extbyte_dynarr); | 1475 Dynarr_reset (name_Extbyte_dynarr); |
1464 Dynarr_reset (class_Extbyte_dynarr); | 1476 Dynarr_reset (class_Extbyte_dynarr); |
1465 | 1477 |
1471 db = XtDatabase (display); | 1483 db = XtDatabase (display); |
1472 codesys = coding_system_of_xrm_database (db); | 1484 codesys = coding_system_of_xrm_database (db); |
1473 Dynarr_add (name_Extbyte_dynarr, '.'); | 1485 Dynarr_add (name_Extbyte_dynarr, '.'); |
1474 Dynarr_add_lisp_string (name_Extbyte_dynarr, name, Qbinary); | 1486 Dynarr_add_lisp_string (name_Extbyte_dynarr, name, Qbinary); |
1475 Dynarr_add (class_Extbyte_dynarr, '.'); | 1487 Dynarr_add (class_Extbyte_dynarr, '.'); |
1476 Dynarr_add_lisp_string (class_Extbyte_dynarr, class, Qbinary); | 1488 Dynarr_add_lisp_string (class_Extbyte_dynarr, class_, Qbinary); |
1477 Dynarr_add (name_Extbyte_dynarr, '\0'); | 1489 Dynarr_add (name_Extbyte_dynarr, '\0'); |
1478 Dynarr_add (class_Extbyte_dynarr, '\0'); | 1490 Dynarr_add (class_Extbyte_dynarr, '\0'); |
1479 | 1491 |
1480 name_string = Dynarr_atp (name_Extbyte_dynarr, 0); | 1492 name_string = Dynarr_atp (name_Extbyte_dynarr, 0); |
1481 class_string = Dynarr_atp (class_Extbyte_dynarr, 0); | 1493 class_string = Dynarr_atp (class_Extbyte_dynarr, 0); |
1498 namerest++, classrest++; | 1510 namerest++, classrest++; |
1499 if (namerest[0] || classrest[0]) | 1511 if (namerest[0] || classrest[0]) |
1500 { | 1512 { |
1501 maybe_signal_error_2 | 1513 maybe_signal_error_2 |
1502 (Qstructure_formation_error, | 1514 (Qstructure_formation_error, |
1503 "class list and name list must be the same length", name, class, | 1515 "class list and name list must be the same length", name, class_, |
1504 Qresource, errb); | 1516 Qresource, errb); |
1505 return Qnil; | 1517 return Qnil; |
1506 } | 1518 } |
1507 result = XrmQGetResource (db, namelist, classlist, &xrm_type, &xrm_value); | 1519 result = XrmQGetResource (db, namelist, classlist, &xrm_type, &xrm_value); |
1508 | 1520 |
1639 `static-color', `pseudo-color', `true-color', or `direct-color'. | 1651 `static-color', `pseudo-color', `true-color', or `direct-color'. |
1640 */ | 1652 */ |
1641 (device)) | 1653 (device)) |
1642 { | 1654 { |
1643 Visual *vis = DEVICE_X_VISUAL (decode_x_device (device)); | 1655 Visual *vis = DEVICE_X_VISUAL (decode_x_device (device)); |
1644 switch (vis->class) | 1656 switch (vis->X_CLASSFIELD) |
1645 { | 1657 { |
1646 case StaticGray: return intern ("static-gray"); | 1658 case StaticGray: return intern ("static-gray"); |
1647 case GrayScale: return intern ("gray-scale"); | 1659 case GrayScale: return intern ("gray-scale"); |
1648 case StaticColor: return intern ("static-color"); | 1660 case StaticColor: return intern ("static-color"); |
1649 case PseudoColor: return intern ("pseudo-color"); | 1661 case PseudoColor: return intern ("pseudo-color"); |