Mercurial > hg > xemacs-beta
annotate lisp/x-faces.el @ 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 | 491f8cf78a9c |
rev | line source |
---|---|
428 | 1 ;;; x-faces.el --- X-specific face frobnication, aka black magic. |
2 | |
3 ;; Copyright (C) 1992-4, 1997 Free Software Foundation, Inc. | |
872 | 4 ;; Copyright (C) 1995, 1996, 2002 Ben Wing. |
428 | 5 |
6 ;; Author: Jamie Zawinski <jwz@jwz.org> | |
7 ;; Maintainer: XEmacs Development Team | |
8 ;; Keywords: extensions, internal, dumped | |
9 | |
10 ;; This file is part of XEmacs. | |
11 | |
12 ;; XEmacs is free software; you can redistribute it and/or modify it | |
13 ;; under the terms of the GNU General Public License as published by | |
14 ;; the Free Software Foundation; either version 2, or (at your option) | |
15 ;; any later version. | |
16 | |
17 ;; XEmacs is distributed in the hope that it will be useful, but | |
18 ;; WITHOUT ANY WARRANTY; without even the implied warranty of | |
19 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | |
20 ;; General Public License for more details. | |
21 | |
22 ;; You should have received a copy of the GNU General Public License | |
23 ;; along with XEmacs; see the file COPYING. If not, write to the | |
24 ;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, | |
25 ;; Boston, MA 02111-1307, USA. | |
26 | |
27 ;;; Synched up with: Not synched. | |
28 | |
29 ;;; Commentary: | |
30 | |
31 ;; This file is dumped with XEmacs (when X support is compiled in). | |
32 | |
33 ;; Modified by: Chuck Thompson | |
34 ;; Modified by: Ben Wing | |
35 ;; Modified by: Martin Buchholz | |
36 | |
37 ;; This file does the magic to parse X font names, and make sure that the | |
38 ;; default and modeline attributes of new frames are specified enough. | |
39 | |
40 ;; The resource-manager syntax for faces is | |
41 | |
42 ;; Emacs.bold.attributeFont: font-name | |
43 ;; Emacs.bold.attributeForeground: fg | |
44 ;; Emacs.bold.attributeBackground: bg | |
45 ;; Emacs.bold.attributeBackgroundPixmap: file | |
46 ;; Emacs.bold.attributeUnderline: true/false | |
47 ;; Emacs.bold.attributeStrikethru: true/false | |
48 | |
49 ;; You can specify the properties of a face on a per-frame basis. For | |
50 ;; example, to have the "isearch" face use a red foreground on frames | |
51 ;; named "emacs" (the default) but use a blue foreground on frames that | |
52 ;; you create named "debugger", you could do | |
53 | |
54 ;; Emacs*emacs.isearch.attributeForeground: red | |
55 ;; Emacs*debugger.isearch.attributeForeground: blue | |
56 | |
57 ;; Generally things that make faces won't set any of the face attributes if | |
58 ;; you have already given them values via the resource database. You can | |
59 ;; also change this stuff from your .emacs file, by using the functions | |
60 ;; set-face-foreground, set-face-font, etc. See the code in this file, and | |
61 ;; in faces.el. | |
62 | |
63 ;;; Code: | |
64 | |
502 | 65 (globally-declare-fboundp |
66 '(x-get-resource-and-maybe-bogosity-check | |
67 x-get-resource x-init-pointer-shape)) | |
68 | |
428 | 69 (defconst x-font-regexp nil) |
70 (defconst x-font-regexp-head nil) | |
71 (defconst x-font-regexp-head-2 nil) | |
72 (defconst x-font-regexp-weight nil) | |
73 (defconst x-font-regexp-slant nil) | |
74 (defconst x-font-regexp-pixel nil) | |
75 (defconst x-font-regexp-point nil) | |
76 (defconst x-font-regexp-foundry-and-family nil) | |
77 (defconst x-font-regexp-registry-and-encoding nil) | |
78 (defconst x-font-regexp-spacing nil) | |
79 | |
80 ;;; Regexps matching font names in "Host Portable Character Representation." | |
81 ;;; | |
82 (let ((- "[-?]") | |
83 (foundry "[^-]*") | |
84 (family "[^-]*") | |
85 (weight "\\(bold\\|demibold\\|medium\\|black\\)") ; 1 | |
86 ; (weight\? "\\(\\*\\|bold\\|demibold\\|medium\\|\\)") ; 1 | |
87 (weight\? "\\([^-]*\\)") ; 1 | |
88 (slant "\\([ior]\\)") ; 2 | |
89 ; (slant\? "\\([ior?*]?\\)") ; 2 | |
90 (slant\? "\\([^-]?\\)") ; 2 | |
91 ; (swidth "\\(\\*\\|normal\\|semicondensed\\|\\)") ; 3 | |
92 (swidth "\\([^-]*\\)") ; 3 | |
93 ; (adstyle "\\(\\*\\|sans\\|\\)") ; 4 | |
94 (adstyle "\\([^-]*\\)") ; 4 | |
95 (pixelsize "\\(\\*\\|[0-9]+\\)") ; 5 | |
96 (pointsize "\\(\\*\\|0\\|[0-9][0-9]+\\)") ; 6 | |
97 ; (resx "\\(\\*\\|[0-9][0-9]+\\)") ; 7 | |
98 ; (resy "\\(\\*\\|[0-9][0-9]+\\)") ; 8 | |
99 (resx "\\([*0]\\|[0-9][0-9]+\\)") ; 7 | |
100 (resy "\\([*0]\\|[0-9][0-9]+\\)") ; 8 | |
101 (spacing "[cmp?*]") | |
102 (avgwidth "\\(\\*\\|[0-9]+\\)") ; 9 | |
103 (registry "[^-]*") ; some fonts have omitted registries | |
104 ; (encoding ".+") ; note that encoding may contain "-"... | |
105 (encoding "[^-]+") ; false! | |
106 ) | |
107 (setq x-font-regexp | |
444 | 108 (concat "\\`\\*?[-?*]" |
109 foundry - family - weight\? - slant\? - swidth - adstyle - | |
110 pixelsize - pointsize - resx - resy - spacing - avgwidth - | |
111 registry - encoding "\\'" | |
112 )) | |
428 | 113 (setq x-font-regexp-head |
444 | 114 (concat "\\`[-?*]" foundry - family - weight\? - slant\? |
115 "\\([-*?]\\|\\'\\)")) | |
428 | 116 (setq x-font-regexp-head-2 |
444 | 117 (concat "\\`[-?*]" foundry - family - weight\? - slant\? |
118 - swidth - adstyle - pixelsize - pointsize | |
119 "\\([-*?]\\|\\'\\)")) | |
120 (setq x-font-regexp-slant (concat - slant -)) | |
121 (setq x-font-regexp-weight (concat - weight -)) | |
428 | 122 ;; if we can't match any of the more specific regexps (unfortunate) then |
123 ;; look for digits; assume 2+ digits is 10ths of points, and 1-2 digits | |
124 ;; is pixels. Bogus as hell. | |
444 | 125 (setq x-font-regexp-pixel "[-?*]\\([0-9][0-9]?\\)[-?*]") |
126 (setq x-font-regexp-point "[-?*]\\([0-9][0-9]+\\)[-?*]") | |
428 | 127 ;; the following two are used by x-font-menu.el. |
128 (setq x-font-regexp-foundry-and-family | |
444 | 129 (concat "\\`[-?*]" foundry - "\\(" family "\\)" -)) |
428 | 130 (setq x-font-regexp-registry-and-encoding |
444 | 131 (concat - "\\(" registry "\\)" - "\\(" encoding "\\)\\'")) |
428 | 132 (setq x-font-regexp-spacing |
444 | 133 (concat - "\\(" spacing "\\)" - avgwidth |
134 - registry - encoding "\\'")) | |
428 | 135 ) |
136 | |
137 ;; A "loser font" is something like "8x13" -> "8x13bold". | |
138 ;; These are supported only through extreme generosity. | |
444 | 139 (defconst x-loser-font-regexp "\\`[0-9]+x[0-9]+\\'") |
428 | 140 |
141 (defun x-frob-font-weight (font which) | |
142 (if (font-instance-p font) (setq font (font-instance-name font))) | |
143 (cond ((null font) nil) | |
144 ((or (string-match x-font-regexp font) | |
145 (string-match x-font-regexp-head font) | |
146 (string-match x-font-regexp-weight font)) | |
147 (concat (substring font 0 (match-beginning 1)) which | |
148 (substring font (match-end 1)))) | |
149 ((string-match x-loser-font-regexp font) | |
150 (concat font which)) | |
151 (t nil))) | |
152 | |
153 (defun x-frob-font-slant (font which) | |
154 (if (font-instance-p font) (setq font (font-instance-name font))) | |
155 (cond ((null font) nil) | |
156 ((or (string-match x-font-regexp font) | |
157 (string-match x-font-regexp-head font)) | |
158 (concat (substring font 0 (match-beginning 2)) which | |
159 (substring font (match-end 2)))) | |
160 ((string-match x-font-regexp-slant font) | |
161 (concat (substring font 0 (match-beginning 1)) which | |
162 (substring font (match-end 1)))) | |
163 ((string-match x-loser-font-regexp font) | |
164 (concat font which)) | |
165 (t nil))) | |
166 | |
167 (defun x-make-font-bold (font &optional device) | |
168 "Given an X font specification, this attempts to make a `bold' font. | |
169 If it fails, it returns nil." | |
170 ;; Certain Type1 fonts know "bold" as "black"... | |
171 (or (try-font-name (x-frob-font-weight font "bold") device) | |
172 (try-font-name (x-frob-font-weight font "black") device) | |
173 (try-font-name (x-frob-font-weight font "demibold") device))) | |
174 | |
175 (defun x-make-font-unbold (font &optional device) | |
176 "Given an X font specification, this attempts to make a non-bold font. | |
177 If it fails, it returns nil." | |
178 (try-font-name (x-frob-font-weight font "medium") device)) | |
179 | |
180 (defcustom try-oblique-before-italic-fonts nil | |
181 "*If nil, italic fonts are searched before oblique fonts. | |
182 If non-nil, oblique fonts are tried before italic fonts. This is mostly | |
183 applicable to adobe-courier fonts" | |
184 :type 'boolean | |
185 :group 'x) | |
186 (define-obsolete-variable-alias '*try-oblique-before-italic-fonts* | |
187 'try-oblique-before-italic-fonts) | |
188 | |
189 (defun x-make-font-italic (font &optional device) | |
190 "Given an X font specification, this attempts to make an `italic' font. | |
191 If it fails, it returns nil." | |
192 (if try-oblique-before-italic-fonts | |
193 (or (try-font-name (x-frob-font-slant font "o") device) | |
194 (try-font-name (x-frob-font-slant font "i") device)) | |
195 (or (try-font-name (x-frob-font-slant font "i") device) | |
196 (try-font-name (x-frob-font-slant font "o") device)))) | |
197 | |
198 (defun x-make-font-unitalic (font &optional device) | |
199 "Given an X font specification, this attempts to make a non-italic font. | |
200 If it fails, it returns nil." | |
201 (try-font-name (x-frob-font-slant font "r") device)) | |
202 | |
203 (defun x-make-font-bold-italic (font &optional device) | |
204 "Given an X font specification, this attempts to make a `bold-italic' font. | |
205 If it fails, it returns nil." | |
206 ;; This is haired up to avoid loading the "intermediate" fonts. | |
442 | 207 (if try-oblique-before-italic-fonts |
428 | 208 (or (try-font-name |
209 (x-frob-font-slant (x-frob-font-weight font "bold") "o") device) | |
210 (try-font-name | |
211 (x-frob-font-slant (x-frob-font-weight font "bold") "i") device) | |
212 (try-font-name | |
213 (x-frob-font-slant (x-frob-font-weight font "black") "o") device) | |
214 (try-font-name | |
215 (x-frob-font-slant (x-frob-font-weight font "black") "i") device) | |
216 (try-font-name | |
217 (x-frob-font-slant (x-frob-font-weight font "demibold") "o") device) | |
218 (try-font-name | |
219 (x-frob-font-slant (x-frob-font-weight font "demibold") "i") device)) | |
220 (or (try-font-name | |
221 (x-frob-font-slant (x-frob-font-weight font "bold") "i") device) | |
222 (try-font-name | |
223 (x-frob-font-slant (x-frob-font-weight font "bold") "o") device) | |
224 (try-font-name | |
225 (x-frob-font-slant (x-frob-font-weight font "black") "i") device) | |
226 (try-font-name | |
227 (x-frob-font-slant (x-frob-font-weight font "black") "o") device) | |
228 (try-font-name | |
229 (x-frob-font-slant (x-frob-font-weight font "demibold") "i") device) | |
230 (try-font-name | |
231 (x-frob-font-slant (x-frob-font-weight font "demibold") "o") device)))) | |
232 | |
233 (defun x-font-size (font) | |
234 "Return the nominal size of the given font. | |
235 This is done by parsing its name, so it's likely to lose. | |
236 X fonts can be specified (by the user) in either pixels or 10ths of points, | |
237 and this returns the first one it finds, so you have to decide which units | |
238 the returned value is measured in yourself..." | |
239 (if (font-instance-p font) (setq font (font-instance-name font))) | |
240 (cond ((or (string-match x-font-regexp font) | |
241 (string-match x-font-regexp-head-2 font)) | |
242 (string-to-int (substring font (match-beginning 6) (match-end 6)))) | |
243 ((or (string-match x-font-regexp-pixel font) | |
244 (string-match x-font-regexp-point font)) | |
245 (string-to-int (substring font (match-beginning 1) (match-end 1)))) | |
246 (t nil))) | |
247 | |
248 ;; Given a font name, this function returns a list describing all fonts | |
249 ;; of all sizes that otherwise match the given font spec. Each element | |
250 ;; in the list is a list of three items: the pixel size of the font, | |
251 ;; the point size (in 1/10ths of a point) of the font, and the fully- | |
252 ;; qualified font name. The first two values may be zero; this | |
253 ;; refers to a scalable font. | |
254 | |
255 (defun x-available-font-sizes (font device) | |
256 (if (font-instance-p font) (setq font (font-instance-name font))) | |
257 (cond ((string-match x-font-regexp font) | |
258 ;; turn pixelsize, pointsize, and avgwidth into wildcards | |
259 (setq font | |
260 (concat (substring font 0 (match-beginning 5)) "*" | |
261 (substring font (match-end 5) (match-beginning 6)) "*" | |
262 (substring font (match-end 6) (match-beginning 9)) "*" | |
263 (substring font (match-end 9) (match-end 0))))) | |
264 ((string-match x-font-regexp-head-2 font) | |
265 ;; turn pixelsize and pointsize into wildcards | |
266 (setq font | |
267 (concat (substring font 0 (match-beginning 5)) "*" | |
268 (substring font (match-end 5) (match-beginning 6)) "*" | |
269 (substring font (match-end 6) (match-end 0))))) | |
270 ((string-match "[-?*]\\([0-9]+\\)[-?*]" font) | |
271 ;; Turn the first integer we match into a wildcard. | |
272 ;; This is pretty dubious... | |
273 (setq font | |
274 (concat (substring font 0 (match-beginning 1)) "*" | |
275 (substring font (match-end 1) (match-end 0)))))) | |
276 (sort | |
277 (delq nil | |
278 (mapcar (function | |
279 (lambda (name) | |
280 (and (string-match x-font-regexp name) | |
281 (list | |
282 (string-to-int (substring name (match-beginning 5) | |
283 (match-end 5))) | |
284 (string-to-int (substring name (match-beginning 6) | |
285 (match-end 6))) | |
286 name)))) | |
287 (list-fonts font device))) | |
288 (function (lambda (x y) (if (= (nth 1 x) (nth 1 y)) | |
289 (< (nth 0 x) (nth 0 y)) | |
290 (< (nth 1 x) (nth 1 y))))))) | |
291 | |
292 ;; Given a font name, this attempts to construct a valid font name for | |
293 ;; DEVICE whose size is the next smaller (if UP-P is nil) or larger | |
294 ;; (if UP-P is t) size and whose other characteristics are the same | |
295 ;; as the given font. | |
296 | |
297 (defun x-frob-font-size (font up-p device) | |
298 (if (stringp font) (setq font (make-font-instance font device))) | |
299 (if (font-instance-p font) (setq font (font-instance-truename font))) | |
300 (let ((available (and font | |
301 (x-available-font-sizes font device)))) | |
302 (cond | |
303 ((null available) nil) | |
304 ((or (= 0 (nth 0 (car available))) | |
305 (= 0 (nth 1 (car available)))) | |
306 ;; R5 scalable fonts: change size by 1 point. | |
307 ;; If they're scalable the first font will have pixel or point = 0. | |
308 ;; Sometimes one is 0 and the other isn't (if it's a bitmap font that | |
309 ;; can be scaled), sometimes both are (if it's a true outline font). | |
310 (let ((name (nth 2 (car available))) | |
311 old-size) | |
312 (or (string-match x-font-regexp font) (error "can't parse %S" font)) | |
313 (setq old-size (string-to-int | |
314 (substring font (match-beginning 6) (match-end 6)))) | |
315 (or (> old-size 0) (error "font truename has 0 pointsize?")) | |
316 (or (string-match x-font-regexp name) (error "can't parse %S" name)) | |
317 ;; turn pixelsize into a wildcard, and make pointsize be +/- 10, | |
318 ;; which is +/- 1 point. All other fields stay the same as they | |
319 ;; were in the "template" font returned by x-available-font-sizes. | |
320 ;; | |
321 ;; #### But this might return the same font: for example, if the | |
322 ;; truename of "-*-courier-medium-r-normal--*-230-75-75-m-0-*" | |
323 ;; is "...-240-..." (instead of 230) then this loses, because | |
324 ;; the 230 that was passed in as an arg got turned into 240 | |
325 ;; by the call to font-instance-truename; then we decrement that | |
326 ;; by 10 and return the result which is the same. I think the | |
327 ;; way to fix this is to make this be a loop that keeps trying | |
328 ;; progressively larger pointsize deltas until it finds one | |
329 ;; whose truename differs. Have to be careful to avoid infinite | |
330 ;; loops at the upper end... | |
331 ;; | |
332 (concat (substring name 0 (match-beginning 5)) "*" | |
333 (substring name (match-end 5) (match-beginning 6)) | |
334 (int-to-string (+ old-size (if up-p 10 -10))) | |
335 (substring name (match-end 6) (match-end 0))))) | |
336 (t | |
337 ;; non-scalable fonts: take the next available size. | |
338 (let ((rest available) | |
339 (last nil) | |
340 result) | |
341 (while rest | |
801 | 342 (cond ((and (not up-p) (equalp font (nth 2 (car rest)))) |
428 | 343 (setq result last |
344 rest nil)) | |
801 | 345 ((and up-p (equalp font (and last (nth 2 last)))) |
428 | 346 (setq result (car rest) |
347 rest nil))) | |
348 (setq last (car rest)) | |
349 (setq rest (cdr rest))) | |
350 (nth 2 result)))))) | |
351 | |
352 (defun x-find-smaller-font (font &optional device) | |
353 "Load a new, slightly smaller version of the given font (or font name). | |
354 Returns the font if it succeeds, nil otherwise. | |
355 If scalable fonts are available, this returns a font which is 1 point smaller. | |
356 Otherwise, it returns the next smaller version of this font that is defined." | |
357 (x-frob-font-size font nil device)) | |
358 | |
359 (defun x-find-larger-font (font &optional device) | |
360 "Load a new, slightly larger version of the given font (or font name). | |
361 Returns the font if it succeeds, nil otherwise. | |
362 If scalable fonts are available, this returns a font which is 1 point larger. | |
363 Otherwise, it returns the next larger version of this font that is defined." | |
364 (x-frob-font-size font t device)) | |
365 | |
366 (defalias 'x-make-face-bold 'make-face-bold) | |
367 (defalias 'x-make-face-italic 'make-face-italic) | |
368 (defalias 'x-make-face-bold-italic 'make-face-bold-italic) | |
369 (defalias 'x-make-face-unbold 'make-face-unbold) | |
370 (defalias 'x-make-face-unitalic 'make-face-unitalic) | |
371 | |
372 (make-obsolete 'x-make-face-bold 'make-face-bold) | |
373 (make-obsolete 'x-make-face-italic 'make-face-italic) | |
374 (make-obsolete 'x-make-face-bold-italic 'make-face-bold-italic) | |
375 (make-obsolete 'x-make-face-unbold 'make-face-unbold) | |
376 (make-obsolete 'x-make-face-unitalic 'make-face-unitalic) | |
377 | |
378 | |
379 ;;; internal routines | |
380 | |
381 ;;; x-init-face-from-resources is responsible for initializing a | |
382 ;;; newly-created face from the resource database. | |
383 ;;; | |
384 ;;; When a new frame is created, it is called from `x-init-frame-faces' | |
385 ;;; called from `init-frame-faces' called from init_frame_faces() | |
386 ;;; from Fmake_frame(). In this case it is called once for each existing | |
387 ;;; face, with the newly-created frame as the argument. It then initializes | |
388 ;;; the newly-created faces on that frame. | |
389 ;;; | |
390 ;;; It's also called from `init-device-faces' and | |
391 ;;; `init-global-faces'. | |
392 ;;; | |
393 ;;; This had better not signal an error. The frame is in an intermediate | |
394 ;;; state where signalling an error or entering the debugger would likely | |
395 ;;; result in a crash. | |
396 | |
397 (defun x-init-face-from-resources (face &optional locale set-anyway) | |
398 | |
399 ;; | |
400 ;; These are things like "attributeForeground" instead of simply | |
401 ;; "foreground" because people tend to do things like "*foreground", | |
402 ;; which would cause all faces to be fully qualified, making faces | |
403 ;; inherit attributes in a non-useful way. So we've made them slightly | |
404 ;; less obvious to specify in order to make them work correctly in | |
405 ;; more random environments. | |
406 ;; | |
407 ;; I think these should be called "face.faceForeground" instead of | |
408 ;; "face.attributeForeground", but they're the way they are for | |
409 ;; hysterical reasons. (jwz) | |
410 | |
411 (let* ((append (if set-anyway nil 'append)) | |
412 ;; Some faces are initialized before XEmacs is dumped. | |
413 ;; In order for the X resources to be able to override | |
414 ;; those settings, such initialization always uses the | |
415 ;; `default' tag. We remove all specifier specs | |
416 ;; containing the `default' tag in the locale before | |
417 ;; adding new specs. | |
418 (tag-set '(default)) | |
419 ;; The tag order matters here. The spec removal | |
420 ;; function uses the list cdrs. We want to remove (x | |
421 ;; default) and (default) specs, not (default x) and (x) | |
422 ;; specs. | |
423 (x-tag-set '(x default)) | |
424 (tty-tag-set '(tty default)) | |
425 (device-class nil) | |
426 (face-sym (face-name face)) | |
427 (name (symbol-name face-sym)) | |
428 (fn (x-get-resource-and-maybe-bogosity-check | |
429 (concat name ".attributeFont") | |
430 "Face.AttributeFont" | |
431 'string locale)) | |
432 (fg (x-get-resource-and-maybe-bogosity-check | |
433 (concat name ".attributeForeground") | |
434 "Face.AttributeForeground" | |
435 'string locale)) | |
436 (bg (x-get-resource-and-maybe-bogosity-check | |
437 (concat name ".attributeBackground") | |
438 "Face.AttributeBackground" | |
439 'string locale)) | |
440 (bgp (x-get-resource-and-maybe-bogosity-check | |
441 (concat name ".attributeBackgroundPixmap") | |
442 "Face.AttributeBackgroundPixmap" | |
443 'string locale)) | |
444 (ulp (x-get-resource-and-maybe-bogosity-check | |
445 (concat name ".attributeUnderline") | |
446 "Face.AttributeUnderline" | |
447 'boolean locale)) | |
448 (stp (x-get-resource-and-maybe-bogosity-check | |
449 (concat name ".attributeStrikethru") | |
450 "Face.AttributeStrikethru" | |
451 'boolean locale)) | |
452 ;; we still resource for these TTY-only resources so that | |
453 ;; you can specify resources for TTY frames/devices. This is | |
454 ;; useful when you start up your XEmacs on an X display and later | |
455 ;; open some TTY frames. | |
456 (hp (x-get-resource-and-maybe-bogosity-check | |
457 (concat name ".attributeHighlight") | |
458 "Face.AttributeHighlight" | |
459 'boolean locale)) | |
460 (dp (x-get-resource-and-maybe-bogosity-check | |
461 (concat name ".attributeDim") | |
462 "Face.AttributeDim" | |
463 'boolean locale)) | |
464 (bp (x-get-resource-and-maybe-bogosity-check | |
465 (concat name ".attributeBlinking") | |
466 "Face.AttributeBlinking" | |
467 'boolean locale)) | |
468 (rp (x-get-resource-and-maybe-bogosity-check | |
469 (concat name ".attributeReverse") | |
470 "Face.AttributeReverse" | |
471 'boolean locale)) | |
472 ) | |
473 | |
474 (cond ((framep locale) | |
475 (setq device-class (device-class (frame-device locale)))) | |
476 ((devicep locale) | |
477 (setq device-class (device-class locale)))) | |
478 | |
479 (if device-class | |
480 (setq tag-set (cons device-class tag-set) | |
481 x-tag-set (cons device-class x-tag-set) | |
482 tty-tag-set (cons device-class tty-tag-set))) | |
483 | |
484 ;; | |
485 ;; If this is the default face, then any unspecified properties should | |
486 ;; be defaulted from the global properties. Can't do this for | |
487 ;; frames or devices because then, common resource specs like | |
488 ;; "*Foreground: black" will have unwanted effects. | |
489 ;; | |
490 (if (and (or (eq (face-name face) 'default) | |
491 (eq (face-name face) 'gui-element)) | |
492 (or (null locale) (eq locale 'global))) | |
493 (progn | |
494 (or fn (setq fn (x-get-resource | |
442 | 495 "font" "Font" 'string locale nil 'warn))) |
428 | 496 (or fg (setq fg (x-get-resource |
442 | 497 "foreground" "Foreground" 'string locale nil |
498 'warn))) | |
428 | 499 (or bg (setq bg (x-get-resource |
442 | 500 "background" "Background" 'string locale nil |
501 'warn))))) | |
428 | 502 ;; |
503 ;; "*cursorColor: foo" is equivalent to setting the background of the | |
504 ;; text-cursor face. | |
505 ;; | |
506 (if (and (eq (face-name face) 'text-cursor) | |
507 (or (null locale) (eq locale 'global))) | |
508 (setq bg (or (x-get-resource | |
442 | 509 "cursorColor" "CursorColor" 'string locale nil 'warn) |
510 bg))) | |
428 | 511 ;; #### should issue warnings? I think this should be |
512 ;; done when the instancing actually happens, but I'm not | |
513 ;; sure how it should actually be dealt with. | |
514 (when fn | |
515 (if device-class | |
516 ;; Always use the x-tag-set to remove specs, since we don't | |
517 ;; know whether the predumped face was initialized with an | |
518 ;; 'x tag or not. | |
519 (remove-specifier-specs-matching-tag-set-cdrs (face-font face) | |
520 locale | |
521 x-tag-set) | |
522 ;; If there's no device class then we're initializing | |
523 ;; globally. This means we should override global | |
524 ;; defaults for all X device classes. | |
525 (remove-specifier (face-font face) locale x-tag-set nil)) | |
526 (set-face-font face fn locale 'x append)) | |
527 ;; Kludge-o-rooni. Set the foreground and background resources for | |
528 ;; X devices only -- otherwise things tend to get all messed up | |
529 ;; if you start up an X frame and then later create a TTY frame. | |
530 (when fg | |
531 (if device-class | |
532 (remove-specifier-specs-matching-tag-set-cdrs (face-foreground face) | |
533 locale | |
534 x-tag-set) | |
535 (remove-specifier (face-foreground face) locale x-tag-set nil)) | |
536 (set-face-foreground face fg locale 'x append)) | |
537 (when bg | |
538 (if device-class | |
539 (remove-specifier-specs-matching-tag-set-cdrs (face-background face) | |
540 locale | |
541 x-tag-set) | |
542 (remove-specifier (face-background face) locale x-tag-set nil)) | |
543 (set-face-background face bg locale 'x append)) | |
544 (when bgp | |
545 (if device-class | |
546 (remove-specifier-specs-matching-tag-set-cdrs (face-background-pixmap | |
547 face) | |
548 locale | |
549 x-tag-set) | |
550 (remove-specifier (face-background-pixmap face) locale x-tag-set nil)) | |
551 (set-face-background-pixmap face bgp locale nil append)) | |
552 (when ulp | |
553 (if device-class | |
554 (remove-specifier-specs-matching-tag-set-cdrs (face-property | |
555 face 'underline) | |
556 locale | |
557 tty-tag-set) | |
558 (remove-specifier (face-property face 'underline) locale | |
559 tty-tag-set nil)) | |
560 (set-face-underline-p face ulp locale nil append)) | |
561 (when stp | |
562 (if device-class | |
563 (remove-specifier-specs-matching-tag-set-cdrs (face-property | |
564 face 'strikethru) | |
565 locale | |
566 tty-tag-set) | |
567 (remove-specifier (face-property face 'strikethru) | |
568 locale tty-tag-set nil)) | |
569 (set-face-strikethru-p face stp locale nil append)) | |
570 (when hp | |
571 (if device-class | |
572 (remove-specifier-specs-matching-tag-set-cdrs (face-property | |
573 face 'highlight) | |
574 locale | |
575 tty-tag-set) | |
576 (remove-specifier (face-property face 'highlight) | |
577 locale tty-tag-set nil)) | |
578 (set-face-highlight-p face hp locale nil append)) | |
579 (when dp | |
580 (if device-class | |
581 (remove-specifier-specs-matching-tag-set-cdrs (face-property | |
582 face 'dim) | |
583 locale | |
584 tty-tag-set) | |
585 (remove-specifier (face-property face 'dim) locale tty-tag-set nil)) | |
586 (set-face-dim-p face dp locale nil append)) | |
587 (when bp | |
588 (if device-class | |
589 (remove-specifier-specs-matching-tag-set-cdrs (face-property | |
590 face 'blinking) | |
591 locale | |
592 tty-tag-set) | |
593 (remove-specifier (face-property face 'blinking) locale | |
594 tty-tag-set nil)) | |
595 (set-face-blinking-p face bp locale nil append)) | |
596 (when rp | |
597 (if device-class | |
598 (remove-specifier-specs-matching-tag-set-cdrs (face-property | |
599 face 'reverse) | |
600 locale | |
601 tty-tag-set) | |
602 (remove-specifier (face-property face 'reverse) locale | |
603 tty-tag-set nil)) | |
604 (set-face-reverse-p face rp locale nil append)) | |
605 )) | |
606 | |
607 ;; GNU Emacs compatibility. (move to obsolete.el?) | |
608 (defalias 'make-face-x-resource-internal 'x-init-face-from-resources) | |
609 | |
610 (defun remove-specifier-specs-matching-tag-set-cdrs (specifier locale tag-set) | |
611 (while tag-set | |
612 (remove-specifier specifier locale tag-set t) | |
613 (setq tag-set (cdr tag-set)))) | |
614 | |
615 ;;; x-init-global-faces is responsible for ensuring that the | |
616 ;;; default face has some reasonable fallbacks if nothing else is | |
617 ;;; specified. | |
618 ;;; | |
619 (defun x-init-global-faces () | |
620 (or (face-foreground 'default 'global) | |
621 (set-face-foreground 'default "black" 'global '(x default))) | |
622 (or (face-background 'default 'global) | |
623 (set-face-background 'default "gray80" 'global '(x default)))) | |
624 | |
625 ;;; x-init-device-faces is responsible for initializing default | |
626 ;;; values for faces on a newly created device. | |
627 ;;; | |
628 (defun x-init-device-faces (device) | |
629 ;; | |
630 ;; If the "default" face didn't have a font specified, try to pick one. | |
631 ;; | |
872 | 632 ;; (or |
633 ;; (face-font-instance 'default device) | |
634 ;; | |
635 ;; [[ No font specified in the resource database; try to cope. ]] | |
636 ;; | |
637 ;; NOTE: In reality, this will never happen. The fallbacks will always | |
638 ;; be tried, and the last fallback is "*", which should get any font. No | |
639 ;; need to put the same checks here as in the fallbacks. These comments | |
640 ;; appear to be pre-19.12. --ben | |
428 | 641 |
872 | 642 ;; [[ At first I wanted to do this by just putting a font-spec in the |
643 ;; fallback resources passed to XtAppInitialize(), but that fails | |
644 ;; if there is an Emacs app-defaults file which doesn't specify a | |
645 ;; font: apparently the fallback resources are not consulted when | |
646 ;; there is an app-defaults file, which seems pretty bogus to me. | |
647 ;; | |
648 ;; We should also probably try "*xtDefaultFont", but I think that it | |
649 ;; might be legal to specify that as "xtDefaultFont:", that is, at | |
650 ;; top level, instead of "*xtDefaultFont:", that is, applicable to | |
651 ;; every application. `x-get-resource' can't handle that right now. | |
652 ;; Anyway, xtDefaultFont is probably variable-width. | |
653 ;; | |
654 ;; Some who have LucidaTypewriter think it's a better font than Courier, | |
655 ;; but it has the bug that there are no italic and bold italic versions. | |
656 ;; We could hair this code up to try and mix-and-match fonts to get a | |
657 ;; full complement, but really, why bother. It's just a default. ]] | |
658 ;; | |
659 ;; [[ We default to looking for iso8859 fonts. Using a wildcard for the | |
660 ;; encoding would be bad, because that can cause English speakers to get | |
661 ;; Kanji fonts by default. It is safe to assume that people using a | |
662 ;; language other than English have both set $LANG, and have specified | |
663 ;; their `font' and `fontList' resources. In any event, it's better to | |
664 ;; err on the side of the English speaker in this case because they are | |
665 ;; much less likely to have encountered this problem, and are thus less | |
666 ;; likely to know what to do about it. ]] | |
667 | |
668 | |
428 | 669 ;; |
670 ;; If the "default" face didn't have both colors specified, then pick | |
671 ;; some, taking into account whether one of the colors was specified. | |
672 ;; | |
673 (let ((fg (face-foreground-instance 'default device)) | |
674 (bg (face-background-instance 'default device))) | |
675 (if (not (and fg bg)) | |
801 | 676 (if (or (and fg (equalp (color-instance-name fg) "white")) |
677 (and bg (equalp (color-instance-name bg) "black"))) | |
428 | 678 (progn |
679 (or fg (set-face-foreground 'default "white" device)) | |
680 (or bg (set-face-background 'default "black" device))) | |
681 (or fg (set-face-foreground 'default "white" device)) | |
682 (or bg (set-face-background 'default "black" device))))) | |
683 | |
684 ;; Don't look at reverseVideo now or initialize the modeline. This | |
685 ;; is done on a per-frame basis at the appropriate time. | |
686 | |
687 ;; | |
688 ;; Now let's try to pick some reasonable defaults for a few other faces. | |
689 ;; This kind of stuff should normally go on the create-frame-hook, but | |
690 ;; this way we won't be in danger of the user screwing things up by not | |
691 ;; adding hooks in a safe way. | |
692 ;; | |
693 (x-init-pointer-shape device) ; from x-mouse.el | |
694 ) | |
695 | |
696 ;;; This is called from `init-frame-faces', which is called from | |
697 ;;; init_frame_faces() which is called from Fmake_frame(), to perform | |
698 ;;; any device-specific initialization. | |
699 ;;; | |
700 (defun x-init-frame-faces (frame) | |
701 ;; | |
702 ;; The faces already got initialized (by init-frame-faces) from | |
703 ;; the resource database or global, non-frame faces. The default, | |
704 ;; bold, bold-italic, and italic faces (plus various other random faces) | |
705 ;; got set up then. But modeline didn't so that reverseVideo can be | |
706 ;; frame-specific. | |
707 ;; | |
708 | |
709 ;; | |
710 ;; If reverseVideo was specified, swap the foreground and background | |
711 ;; of the default and modeline faces. | |
712 ;; | |
442 | 713 (cond ((car (x-get-resource "reverseVideo" "ReverseVideo" 'boolean frame |
714 nil 'warn)) | |
428 | 715 ;; First make sure the modeline has fg and bg, inherited from the |
716 ;; current default face - for the case where only one is specified, | |
717 ;; so that invert-face doesn't do something weird. | |
718 (or (face-foreground 'modeline frame) | |
719 (set-face-foreground 'modeline | |
720 (face-foreground-instance 'default frame) | |
721 frame)) | |
722 (or (face-background 'modeline frame) | |
723 (set-face-background 'modeline | |
724 (face-background-instance 'default frame) | |
725 frame)) | |
726 ;; Now invert both of them. If they end up looking the same, | |
727 ;; make-frame-initial-faces will invert the modeline again later. | |
728 (invert-face 'default frame) | |
729 (invert-face 'modeline frame) | |
730 ))) | |
731 | |
732 ;;; x-faces.el ends here |