Mercurial > hg > xemacs-beta
view src/redisplay-gtk.c @ 2720:6fa9919a9a0b
[xemacs-hg @ 2005-04-08 23:10:01 by crestani]
ChangeLog addition:
2005-04-01 Marcus Crestani <crestani@xemacs.org>
The new allocator.
New configure flag: `MC_ALLOC':
* configure.ac (XE_COMPLEX_ARG_ENABLE): Add `--enable-mc-alloc' as
a new configure flag.
* configure.in (AC_INIT_PARSE_ARGS): Add `--mc-alloc' as a new
configure flag.
* configure.usage: Add description for `mc-alloc'.
DUMP_IN_EXEC:
* Makefile.in.in: Condition the installation of a separate dump
file on !DUMP_ON_EXEC.
* configure.ac (XE_COMPLEX_ARG_ENABLE): Add
`--enable-dump-in-exec' as a new configure flag.
* configure.ac: DUMP_IN_EXEC is define as default for PDUMP but
not default for MC_ALLOC.
* configure.in (AC_INIT_PARSE_ARGS): Add `--dump-in-exec' as a
new configure flag.
* configure.in: DUMP_IN_EXEC is define as default for PDUMP but
not default for MC_ALLOC.
* configure.usage: Add description for `dump-in-exec'.
lib-src/ChangeLog addition:
2005-04-01 Marcus Crestani <crestani@xemacs.org>
The new allocator.
DUMP_IN_EXEC:
* Makefile.in.in: Only compile insert-data-in-exec if
DUMP_IN_EXEC is defined.
lisp/ChangeLog addition:
2005-04-01 Marcus Crestani <crestani@xemacs.org>
The new allocator.
MEMORY_USAGE_STATS
* diagnose.el: Add new lisp function to pretty print statistics
about the new allocator.
* diagnose.el (show-mc-alloc-memory-usage): New.
modules/ChangeLog addition:
2005-04-01 Marcus Crestani <crestani@xemacs.org>
The new allocator.
Remove Lcrecords:
* postgresql/postgresql.c (allocate_pgconn): Allocate with new
allocator.
* postgresql/postgresql.c (allocate_pgresult): Allocate PGresult
with new allocator.
* postgresql/postgresql.h (struct Lisp_PGconn): Add
lrecord_header.
* postgresql/postgresql.h (struct Lisp_PGresult): Add
lrecord_header.
* ldap/eldap.c (allocate_ldap): Allocate with new allocator.
* ldap/eldap.h (struct Lisp_LDAP): Add lrecord_header.
nt/ChangeLog addition:
2005-04-01 Marcus Crestani <crestani@xemacs.org>
The new allocator.
New configure flag: `MC_ALLOC':
* config.inc.samp: Add new flag `MC_ALLOC'.
* xemacs.mak: Add flag and configuration output for `MC_ALLOC'.
New files:
* xemacs.dsp: Add source files mc-alloc.c and mc-alloc.h.
* xemacs.mak: Add new object file mc-alloc.obj to dependencies.
src/ChangeLog addition:
2005-04-01 Marcus Crestani <crestani@xemacs.org>
The new allocator.
New configure flag: `MC_ALLOC':
* config.h.in: Add new flag `MC_ALLOC'.
New files:
* Makefile.in.in: Add new object file mc-alloc.o.
* depend: Add new files to dependencies.
* mc-alloc.c: New.
* mc-alloc.h: New.
Running the new allocator from XEmacs:
* alloc.c (deadbeef_memory): Moved to mc-alloc.c.
* emacs.c (main_1): Initialize the new allocator and add
syms_of_mc_alloc.
* symsinit.h: Add syms_of_mc_alloc.
New lrecord allocation and free functions:
* alloc.c (alloc_lrecord): New. Allocates an lrecord, includes
type checking and initializing of the lrecord_header.
* alloc.c (noseeum_alloc_lrecord): Same as above, but increments
the NOSEEUM cons counter.
* alloc.c (free_lrecord): New. Calls the finalizer and frees the
lrecord.
* lrecord.h: Add lrecord allocation prototypes and comments.
Remove old lrecord FROB block allocation:
* alloc.c (allocate_lisp_storage): Former function to expand
heap. Not needed anymore, remove.
* alloc.c: Completely remove `Fixed-size type macros'
* alloc.c (release_breathing_space): Remove.
* alloc.c (memory_full): Remove release_breathing_space.
* alloc.c (refill_memory_reserve): Remove.
* alloc.c (TYPE_ALLOC_SIZE): Remove.
* alloc.c (DECLARE_FIXED_TYPE_ALLOC): Remove.
* alloc.c (ALLOCATE_FIXED_TYPE_FROM_BLOCK): Remove.
* alloc.c (ALLOCATE_FIXED_TYPE_1): Remove.
* alloc.c (ALLOCATE_FIXED_TYPE): Remove.
* alloc.c (NOSEEUM_ALLOCATE_FIXED_TYPE): Remove.
* alloc.c (struct Lisp_Free): Remove.
* alloc.c (LRECORD_FREE_P): Remove.
* alloc.c (MARK_LRECORD_AS_FREE): Remove.
* alloc.c (MARK_LRECORD_AS_NOT_FREE): Remove.
* alloc.c (PUT_FIXED_TYPE_ON_FREE_LIST): Remove.
* alloc.c (FREE_FIXED_TYPE): Remove.
* alloc.c (FREE_FIXED_TYPE_WHEN_NOT_IN_GC): Remove.
Allocate old lrecords with new allocator:
* alloc.c: DECLARE_FIXED_TYPE_ALLOC removed for all lrecords
defined in alloc.c.
* alloc.c (Fcons): Allocate with new allocator.
* alloc.c (noseeum_cons): Allocate with new allocator.
* alloc.c (make_float): Allocate with new allocator.
* alloc.c (make_bignum): Allocate with new allocator.
* alloc.c (make_bignum_bg): Allocate with new allocator.
* alloc.c (make_ratio): Allocate with new allocator.
* alloc.c (make_ratio_bg): Allocate with new allocator.
* alloc.c (make_ratio_rt): Allocate with new allocator.
* alloc.c (make_bigfloat): Allocate with new allocator.
* alloc.c (make_bigfloat_bf): Allocate with new allocator.
* alloc.c (make_compiled_function): Allocate with new allocator.
* alloc.c (Fmake_symbol): Allocate with new allocator.
* alloc.c (allocate_extent): Allocate with new allocator.
* alloc.c (allocate_event): Allocate with new allocator.
* alloc.c (make_key_data): Allocate with new allocator.
* alloc.c (make_button_data): Allocate with new allocator.
* alloc.c (make_motion_data): Allocate with new allocator.
* alloc.c (make_process_data): Allocate with new allocator.
* alloc.c (make_timeout_data): Allocate with new allocator.
* alloc.c (make_magic_data): Allocate with new allocator.
* alloc.c (make_magic_eval_data): Allocate with new allocator.
* alloc.c (make_eval_data): Allocate with new allocator.
* alloc.c (make_misc_user_data): Allocate with new allocator.
* alloc.c (Fmake_marker): Allocate with new allocator.
* alloc.c (noseeum_make_marker): Allocate with new allocator.
* alloc.c (make_uninit_string): Allocate with new allocator.
* alloc.c (resize_string): Allocate with new allocator.
* alloc.c (make_string_nocopy): Allocate with new allocator.
Garbage Collection:
* alloc.c (GC_CHECK_NOT_FREE): Remove obsolete assertions.
* alloc.c (SWEEP_FIXED_TYPE_BLOCK): Remove.
* alloc.c (SWEEP_FIXED_TYPE_BLOCK_1): Remove.
* alloc.c (sweep_conses): Remove.
* alloc.c (free_cons): Use new allocator to free.
* alloc.c (sweep_compiled_functions): Remove.
* alloc.c (sweep_floats): Remove.
* alloc.c (sweep_bignums): Remove.
* alloc.c (sweep_ratios): Remove.
* alloc.c (sweep_bigfloats): Remove.
* alloc.c (sweep_symbols): Remove.
* alloc.c (sweep_extents): Remove.
* alloc.c (sweep_events): Remove.
* alloc.c (sweep_key_data): Remove.
* alloc.c (free_key_data): Use new allocator to free.
* alloc.c (sweep_button_data): Remove.
* alloc.c (free_button_data): Use new allocator to free.
* alloc.c (sweep_motion_data): Remove.
* alloc.c (free_motion_data): Use new allocator to free.
* alloc.c (sweep_process_data): Remove.
* alloc.c (free_process_data): Use new allocator to free.
* alloc.c (sweep_timeout_data): Remove.
* alloc.c (free_timeout_data): Use new allocator to free.
* alloc.c (sweep_magic_data): Remove.
* alloc.c (free_magic_data): Use new allocator to free.
* alloc.c (sweep_magic_eval_data): Remove.
* alloc.c (free_magic_eval_data): Use new allocator to free.
* alloc.c (sweep_eval_data): Remove.
* alloc.c (free_eval_data): Use new allocator to free.
* alloc.c (sweep_misc_user_data): Remove.
* alloc.c (free_misc_user_data): Use new allocator to free.
* alloc.c (sweep_markers): Remove.
* alloc.c (free_marker): Use new allocator to free.
* alloc.c (garbage_collect_1): Remove release_breathing_space.
* alloc.c (gc_sweep): Remove all the old lcrecord and lrecord
related stuff. Sweeping now works like this: compact string
chars, finalize, sweep.
* alloc.c (common_init_alloc_early): Remove old lrecord
initializations, remove breathing_space.
* emacs.c (Fdump_emacs): Remove release_breathing_space.
* lisp.h: Remove prototype for release_breathing_space.
* lisp.h: Adjust the special cons mark makros.
Lrecord Finalizer:
* alloc.c: Add finalizer to lrecord definition.
* alloc.c (finalize_string): Add finalizer for string.
* bytecode.c: Add finalizer to lrecord definition.
* bytecode.c (finalize_compiled_function): Add finalizer for
compiled function.
* marker.c: Add finalizer to lrecord definition.
* marker.c (finalize_marker): Add finalizer for marker.
These changes build the interface to mc-alloc:
* lrecord.h (MC_ALLOC_CALL_FINALIZER): Tell mc-alloc how to
finalize lrecords.
* lrecord.h (MC_ALLOC_CALL_FINALIZER_FOR_DISKSAVE): Tell
mc-alloc how to finalize for disksave.
Unify lrecords and lcrecords:
* lisp.h (struct Lisp_String): Adjust string union hack to
new lrecord header.
* lrecord.h: Adjust comments.
* lrecord.h (struct lrecord_header): The new lrecord header
includes type, lisp-readonly, free, and uid.
* lrecord.h (set_lheader_implementation): Adjust to new
lrecord_header.
* lrecord.h (struct lrecord_implementation): The field basic_p
for indication of an old lrecord is not needed anymore, remove.
* lrecord.h (MAKE_LRECORD_IMPLEMENTATION): Remove basic_p.
* lrecord.h (MAKE_EXTERNAL_LRECORD_IMPLEMENTATION): Remove
basic_p.
* lrecord.h (copy_sized_lrecord): Remove distinction between
old lrecords and lcrecords.
* lrecord.h (copy_lrecord): Remove distinction between old
lrecords and lcrecords.
* lrecord.h (zero_sized_lrecord): Remove distinction between
old lrecords and lcrecords.
* lrecord.h (zero_lrecord): Remove distinction between old
lrecords and lcrecords.
Remove lcrecords and lcrecord lists:
* alloc.c (basic_alloc_lcrecord): Not needed anymore, remove.
* alloc.c (very_old_free_lcrecord): Not needed anymore, remove.
* alloc.c (copy_lisp_object): No more distinction between
lrecords and lcrecords.
* alloc.c (all_lcrecords): Not needed anymore, remove.
* alloc.c (make_vector_internal): Allocate as lrecord.
* alloc.c (make_bit_vector_internal): Allocate as lrecord.
* alloc.c: Completely remove `lcrecord lists'.
* alloc.c (free_description): Remove.
* alloc.c (lcrecord_list_description): Remove.
* alloc.c (mark_lcrecord_list): Remove.
* alloc.c (make_lcrecord_list): Remove.
* alloc.c (alloc_managed_lcrecord): Remove.
* alloc.c (free_managed_lcrecord): Remove.
* alloc.c (alloc_automanaged_lcrecord): Remove.
* alloc.c (free_lcrecord): Remove.
* alloc.c (lcrecord_stats): Remove.
* alloc.c (tick_lcrecord_stats): Remove.
* alloc.c (disksave_object_finalization_1): Add call to
mc_finalize_for_disksave. Remove the lcrecord way to visit all
objects.
* alloc.c (kkcc_marking): Remove XD_FLAG_FREE_LISP_OBJECT
* alloc.c (sweep_lcrecords_1): Remove.
* alloc.c (common_init_alloc_early): Remove everything related
to lcrecords, remove old lrecord initializations,
* alloc.c (init_lcrecord_lists): Not needed anymore, remove.
* alloc.c (reinit_alloc_early): Remove everything related to
lcrecords.
* alloc.c (init_alloc_once_early): Remove everything related to
lcrecords.
* buffer.c (allocate_buffer): Allocate as lrecord.
* buffer.c (nuke_all_buffer_slots): Use lrecord functions.
* buffer.c (common_init_complex_vars_of_buffer): Allocate as
lrecord.
* buffer.h (struct buffer): Add lrecord_header.
* casetab.c (allocate_case_table): Allocate as lrecord.
* casetab.h (struct Lisp_Case_Table): Add lrecord_header.
* charset.h (struct Lisp_Charset): Add lrecord_header.
* chartab.c (fill_char_table): Use lrecord functions.
* chartab.c (Fmake_char_table): Allocate as lrecord.
* chartab.c (make_char_table_entry): Allocate as lrecord.
* chartab.c (copy_char_table_entry): Allocate as lrecord.
* chartab.c (Fcopy_char_table): Allocate as lrecord.
* chartab.c (put_char_table): Use lrecord functions.
* chartab.h (struct Lisp_Char_Table_Entry): Add lrecord_header.
* chartab.h (struct Lisp_Char_Table): Add lrecord_header.
* console-impl.h (struct console): Add lrecord_header.
* console-msw-impl.h (struct Lisp_Devmode): Add lrecord_header.
* console-msw-impl.h (struct mswindows_dialog_id): Add
lrecord_header.
* console.c (allocate_console): Allocate as lrecord.
* console.c (nuke_all_console_slots): Use lrecord functions.
* console.c (common_init_complex_vars_of_console): Allocate as
lrecord.
* data.c (make_weak_list): Allocate as lrecord.
* data.c (make_weak_box): Allocate as lrecord.
* data.c (make_ephemeron): Allocate as lrecord.
* database.c (struct Lisp_Database): Add lrecord_header.
* database.c (allocate_database): Allocate as lrecord.
* device-impl.h (struct device): Add lrecord_header.
* device-msw.c (allocate_devmode): Allocate as lrecord.
* device.c (nuke_all_device_slots): Use lrecord functions.
* device.c (allocate_device): Allocate as lrecord.
* dialog-msw.c (handle_question_dialog_box): Allocate as lrecord.
* elhash.c (struct Lisp_Hash_Table): Add lrecord_header.
* elhash.c (make_general_lisp_hash_table): Allocate as lrecord.
* elhash.c (Fcopy_hash_table): Allocate as lrecord.
* event-stream.c: Lcrecord lists Vcommand_builder_free_list and
Vtimeout_free_list are no longer needed. Remove.
* event-stream.c (allocate_command_builder): Allocate as lrecord.
* event-stream.c (free_command_builder): Use lrecord functions.
* event-stream.c (event_stream_generate_wakeup): Allocate as
lrecord.
* event-stream.c (event_stream_resignal_wakeup): Use lrecord
functions.
* event-stream.c (event_stream_disable_wakeup): Use lrecord
functions.
* event-stream.c (reinit_vars_of_event_stream): Lcrecord lists
remove.
* events.h (struct Lisp_Timeout): Add lrecord_header.
* events.h (struct command_builder): Add lrecord_header.
* extents-impl.h (struct extent_auxiliary): Add lrecord_header.
* extents-impl.h (struct extent_info): Add lrecord_header.
* extents.c (allocate_extent_auxiliary): Allocate as lrecord.
* extents.c (allocate_extent_info): Allocate as lrecord.
* extents.c (copy_extent): Allocate as lrecord.
* faces.c (allocate_face): Allocate as lrecord.
* faces.h (struct Lisp_Face): Add lrecord_header.
* file-coding.c (allocate_coding_system): Allocate as lrecord.
* file-coding.c (Fcopy_coding_system): Allocate as lrecord.
* file-coding.h (struct Lisp_Coding_System): Add lrecord_header.
* fns.c (Ffillarray): Allocate as lrecord.
* frame-impl.h (struct frame): Add lrecord_header.
* frame.c (nuke_all_frame_slots): Use lrecord functions.
* frame.c (allocate_frame_core): Allocate as lrecord.
* glyphs.c (allocate_image_instance): Allocate as lrecord.
* glyphs.c (Fcolorize_image_instance): Allocate as lrecord.
* glyphs.c (allocate_glyph): Allocate as lrecord.
* glyphs.h (struct Lisp_Image_Instance): Add lrecord_header.
* glyphs.h (struct Lisp_Glyph): Add lrecord_header.
* gui.c (allocate_gui_item): Allocate as lrecord.
* gui.h (struct Lisp_Gui_Item): Add lrecord_header.
* keymap.c (struct Lisp_Keymap): Add lrecord_header.
* keymap.c (make_keymap): Allocate as lrecord.
* lisp.h (struct Lisp_Vector): Add lrecord_header.
* lisp.h (struct Lisp_Bit_Vector): Add lrecord_header.
* lisp.h (struct weak_box): Add lrecord_header.
* lisp.h (struct ephemeron): Add lrecord_header.
* lisp.h (struct weak_list): Add lrecord_header.
* lrecord.h (struct lcrecord_header): Not used, remove.
* lrecord.h (struct free_lcrecord_header): Not used, remove.
* lrecord.h (struct lcrecord_list): Not needed anymore, remove.
* lrecord.h (lcrecord_list): Not needed anymore, remove.
* lrecord.h: (enum data_description_entry_flags): Remove
XD_FLAG_FREE_LISP_OBJECT.
* lstream.c: Lrecord list Vlstream_free_list remove.
* lstream.c (Lstream_new): Allocate as lrecord.
* lstream.c (Lstream_delete): Use lrecod functions.
* lstream.c (reinit_vars_of_lstream): Vlstream_free_list
initialization remove.
* lstream.h (struct lstream): Add lrecord_header.
* emacs.c (main_1): Remove lstream initialization.
* mule-charset.c (make_charset): Allocate as lrecord.
* objects-impl.h (struct Lisp_Color_Instance): Add
lrecord_header.
* objects-impl.h (struct Lisp_Font_Instance): Add lrecord_header.
* objects.c (Fmake_color_instance): Allocate as lrecord.
* objects.c (Fmake_font_instance): Allocate as lrecord.
* objects.c (reinit_vars_of_objects): Allocate as lrecord.
* opaque.c: Lcreord list Vopaque_ptr_list remove.
* opaque.c (make_opaque): Allocate as lrecord.
* opaque.c (make_opaque_ptr): Allocate as lrecord.
* opaque.c (free_opaque_ptr): Use lrecord functions.
* opaque.c (reinit_opaque_early):
* opaque.c (init_opaque_once_early): Vopaque_ptr_list
initialization remove.
* opaque.h (Lisp_Opaque): Add lrecord_header.
* opaque.h (Lisp_Opaque_Ptr): Add lrecord_header.
* emacs.c (main_1): Remove opaque variable initialization.
* print.c (default_object_printer): Use new lrecord_header.
* print.c (print_internal): Use new lrecord_header.
* print.c (debug_p4): Use new lrecord_header.
* process.c (make_process_internal): Allocate as lrecord.
* procimpl.h (struct Lisp_Process): Add lrecord_header.
* rangetab.c (Fmake_range_table): Allocate as lrecord.
* rangetab.c (Fcopy_range_table): Allocate as lrecord.
* rangetab.h (struct Lisp_Range_Table): Add lrecord_header.
* scrollbar.c (create_scrollbar_instance): Allocate as lrecord.
* scrollbar.h (struct scrollbar_instance): Add lrecord_header.
* specifier.c (make_specifier_internal): Allocate as lrecord.
* specifier.h (struct Lisp_Specifier): Add lrecord_header.
* symbols.c:
* symbols.c (Fmake_variable_buffer_local): Allocate as lrecord.
* symbols.c (Fdontusethis_set_symbol_value_handler): Allocate
as lrecord.
* symbols.c (Fdefvaralias): Allocate as lrecord.
* symeval.h (struct symbol_value_magic): Add lrecord_header.
* toolbar.c (update_toolbar_button): Allocate as lrecord.
* toolbar.h (struct toolbar_button): Add lrecord_header.
* tooltalk.c (struct Lisp_Tooltalk_Message): Add lrecord_header.
* tooltalk.c (make_tooltalk_message): Allocate as lrecord.
* tooltalk.c (struct Lisp_Tooltalk_Pattern): Add lrecord_header.
* tooltalk.c (make_tooltalk_pattern): Allocate as lrecord.
* ui-gtk.c (allocate_ffi_data): Allocate as lrecord.
* ui-gtk.c (allocate_emacs_gtk_object_data): Allocate as lrecord.
* ui-gtk.c (allocate_emacs_gtk_boxed_data): Allocate as lrecord.
* ui-gtk.h (structs): Add lrecord_header.
* window-impl.h (struct window): Add lrecord_header.
* window-impl.h (struct window_mirror): Add lrecord_header.
* window.c (allocate_window): Allocate as lrecord.
* window.c (new_window_mirror): Allocate as lrecord.
* window.c (make_dummy_parent): Allocate as lrecord.
MEMORY_USAGE_STATS
* alloc.c (fixed_type_block_overhead): Not used anymore, remove.
* buffer.c (compute_buffer_usage): Get storage size from new
allocator.
* marker.c (compute_buffer_marker_usage): Get storage size from
new allocator.
* mule-charset.c (compute_charset_usage): Get storage size from
new allocator.
* scrollbar-gtk.c (gtk_compute_scrollbar_instance_usage): Get
storage size from new allocator.
* scrollbar-msw.c (mswindows_compute_scrollbar_instance_usage):
Get storage size from new allocator.
* scrollbar-x.c (x_compute_scrollbar_instance_usage): Get
storage size from new allocator.
* scrollbar.c (compute_scrollbar_instance_usage): Get storage
size from new allocator.
* unicode.c (compute_from_unicode_table_size_1): Get storage
size from new allocator.
* unicode.c (compute_to_unicode_table_size_1): Get storage size
from new allocator.
* window.c (compute_window_mirror_usage): Get storage size from
new allocator.
* window.c (compute_window_usage): Get storage size from new
allocator.
MC_ALLOC_TYPE_STATS:
* alloc.c (alloc_lrecord): Bump lrecord count.
* alloc.c (noseeum_alloc_lrecord): Bump lrecord count.
* alloc.c (struct lrecord_stats): Storage for counts.
* alloc.c (init_lrecord_stats): Zero statistics.
* alloc.c (inc_lrecord_stats): Increase the statistic.
* alloc.c (dec_lrecord_stats): Decrease the statistic.
* alloc.c (gc_plist_hack): Used to print the information.
* alloc.c (Fgarbage_collect): Return the collected information.
* mc-alloc.c (remove_cell): Decrease lrecord count.
* mc-alloc.h: Set flag MC_ALLOC_TYPE_STATS.
* emacs.c (main_1): Init lrecord statistics.
* lrecord.h: Add prototypes for *_lrecord_stats.
Strings:
* alloc.c (Fmake_string): Initialize ascii_begin to zero.
* alloc.c (gc_count_num_short_string_in_use): Remove.
* alloc.c (gc_count_string_total_size): Remove.
* alloc.c (gc_count_short_string_total_size): Remove.
* alloc.c (debug_string_purity): Remove.
* alloc.c (debug_string_purity_print): Remove.
* alloc.c (sweep_strings): Remove.
Remove static C-readonly Lisp objects:
* alloc.c (c_readonly): Not needed anymore, remove.
* alloc.c (GC_CHECK_LHEADER_INVARIANTS): Remove some obsolete
lheader invariants assertions.
* buffer.c (DEFVAR_BUFFER_LOCAL_1): Allocate dynamically.
* console.c (DEFVAR_CONSOLE_LOCAL_1): Allocate dynamically.
* gpmevent.c: Indirection via MC_ALLOC_Freceive_gpm_event.
* gpmevent.c (Fgpm_enable): Allocate dynamically.
* gpmevent.c (syms_of_gpmevent): Allocate dynamically.
* lisp.h (C_READONLY): Not needed anymore, remove.
* lisp.h (DEFUN): Allocate dynamically.
* lrecord.h (C_READONLY_RECORD_HEADER_P): Not needed anymore,
remove.
* lrecord.h (SET_C_READONLY_RECORD_HEADER): Not needed anymore,
remove.
* symbols.c (guts_of_unbound_marker):
* symeval.h (defsubr): Allocate dynamically.
* symeval.h (DEFSUBR_MACRO): Allocate dynamically.
* symeval.h (DEFVAR_ SYMVAL_FWD): Allocate dynamically.
* tests.c (TESTS_DEFSUBR): Allocate dynamically.
Definition of mcpro:
* lisp.h: Add mcpro prototypes.
* alloc.c (common_init_alloc_early): Add initialization for
mcpros.
* alloc.c (mcpro_description_1): New.
* alloc.c (mcpro_description): New.
* alloc.c (mcpros_description_1): New.
* alloc.c (mcpros_description): New.
* alloc.c (mcpro_one_name_description_1): New.
* alloc.c (mcpro_one_name_description): New.
* alloc.c (mcpro_names_description_1): New.
* alloc.c (mcpro_names_description): New.
* alloc.c (mcpros): New.
* alloc.c (mcpro_names): New.
* alloc.c (mcpro_1): New.
* alloc.c (mc_pro): New.
* alloc.c (garbage_collect_1): Add mcpros to root set.
Usage of mcpro:
* alloc.c (make_string_nocopy): Add string to root set.
* symbols.c (init_symbols_once_early): Add Qunbound to root set.
Changes to the Portable Dumper:
* alloc.c (FREE_OR_REALLOC_BEGIN): Since dumped objects can be
freed with the new allocator, remove assertion for !DUMPEDP.
* dumper.c: Adjust comments, increase PDUMP_HASHSIZE.
* dumper.c (pdump_make_hash): Shift address only 2 bytes, to
avoid collisions.
* dumper.c (pdump_objects_unmark): No more mark bits within
the object, remove.
* dumper.c (mc_addr_elt): New. Element data structure for mc
hash table.
* dumper.c (pdump_mc_hash): New hash table: `lookup table'.
* dumper.c (pdump_get_mc_addr): New. Lookup for hash table.
* dumper.c (pdump_get_indirect_mc_addr): New. Lookup for
convertibles.
* dumper.c (pdump_put_mc_addr): New. Putter for hash table.
* dumper.c (pdump_dump_mc_data): New. Writes the table for
relocation at load time to the dump file.
* dumper.c (pdump_scan_lisp_objects_by_alignment): New.
Visits all dumped Lisp objects.
* dumper.c (pdump_scan_non_lisp_objects_by_alignment): New.
Visits all other dumped objects.
* dumper.c (pdump_reloc_one_mc): New. Updates all pointers
of an object by using the hash table pdump_mc_hash.
* dumper.c (pdump_reloc_one): Replaced by pdump_reloc_one_mc.
* dumper.c (pdump): Change the structure of the dump file, add
the mc post dump relocation table to dump file.
* dumper.c (pdump_load_finish): Hand all dumped objects to the
new allocator and use the mc post dump relocation table for
relocating the dumped objects at dump file load time, free not
longer used data structures.
* dumper.c (pdump_load): Free the dump file.
* dumper.h: Remove pdump_objects_unmark.
* lrecord.h (DUMPEDP): Dumped objects can be freed, remove.
DUMP_IN_EXEC:
* Makefile.in.in: Linking for and with dump in executable only if
DUMP_IN_EXEC is defined.
* config.h.in: Add new flag `DUMP_IN_EXEC'
* emacs.c: Condition dump-data.h on DUMP_IN_EXEC.
* emacs.c (main_1): Flag `-si' only works if dump image is
written into executable.
Miscellanious
* lrecord.h (enum lrecord_type): Added numbers to all types,
very handy for debugging.
* xemacs.def.in.in: Add mc-alloc functions to make them visible
to the modules.
| author | crestani |
|---|---|
| date | Fri, 08 Apr 2005 23:11:35 +0000 |
| parents | 3d8143fc88e1 |
| children | dbd2a866e38a |
line wrap: on
line source
/* GTK output and frame manipulation routines. Copyright (C) 1994, 1995 Board of Trustees, University of Illinois. Copyright (C) 1994 Lucid, Inc. Copyright (C) 1995 Sun Microsystems, Inc. Copyright (C) 2002, 2003 Ben Wing. This file is part of XEmacs. XEmacs is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. XEmacs is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with XEmacs; see the file COPYING. If not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /* Synched up with: Not in FSF. */ /* Author: Chuck Thompson */ /* Gtk flavor by William Perry */ /* Lots of work done by Ben Wing for Mule */ #include <config.h> #include "lisp.h" #include "buffer.h" #include "debug.h" #include "device-impl.h" #include "faces.h" #include "file-coding.h" #include "frame-impl.h" #include "gutter.h" #include "redisplay.h" #include "sysdep.h" #include "window.h" #include "console-gtk-impl.h" #include "gccache-gtk.h" #include "glyphs-gtk.h" #include "objects-gtk-impl.h" #include "sysproc.h" /* for select() */ #ifdef MULE #include "mule-ccl.h" #endif #define CONST const #define EOL_CURSOR_WIDTH 5 static void gtk_output_pixmap (struct window *w, Lisp_Object image_instance, struct display_box *db, struct display_glyph_area *dga, face_index findex, int cursor_start, int cursor_width, int cursor_height, int bgpixmap); static void gtk_output_vertical_divider (struct window *w, int clear); static void gtk_output_blank (struct window *w, struct display_line *dl, struct rune *rb, int start_pixpos, int cursor_start, int cursor_width); static void gtk_output_horizontal_line (struct window *w, struct display_line *dl, struct rune *rb); static void gtk_clear_region (Lisp_Object locale, struct device* d, struct frame* f, face_index findex, int x, int y, int width, int height, Lisp_Object fcolor, Lisp_Object bcolor, Lisp_Object background_pixmap); static void gtk_output_eol_cursor (struct window *w, struct display_line *dl, int xpos, face_index findex); static void gtk_clear_frame (struct frame *f); static void gtk_clear_frame_windows (Lisp_Object window); static void gtk_bevel_modeline (struct window *w, struct display_line *dl); #if 0 static void __describe_gc (GdkGC *); #endif struct textual_run { Lisp_Object charset; unsigned char *ptr; int len; int dimension; }; /* Separate out the text in DYN into a series of textual runs of a particular charset. Also convert the characters as necessary into the format needed by XDrawImageString(), XDrawImageString16(), et al. (This means converting to one or two byte format, possibly tweaking the high bits, and possibly running a CCL program.) You must pre-allocate the space used and pass it in. (This is done so you can ALLOCA () the space.) You need to allocate (2 * len) bytes of TEXT_STORAGE and (len * sizeof (struct textual_run)) bytes of RUN_STORAGE, where LEN is the length of the dynarr. Returns the number of runs actually used. */ static int separate_textual_runs (unsigned char *text_storage, struct textual_run *run_storage, CONST Ichar *str, Charcount len) { Lisp_Object prev_charset = Qunbound; /* not Qnil because that is a possible valid charset when MULE is not defined */ int runs_so_far = 0; int i; #ifdef MULE struct ccl_program char_converter; int need_ccl_conversion = 0; #endif for (i = 0; i < len; i++) { Ichar ch = str[i]; Lisp_Object charset; int byte1, byte2; int dimension; int graphic; BREAKUP_ICHAR (ch, charset, byte1, byte2); dimension = XCHARSET_DIMENSION (charset); graphic = XCHARSET_GRAPHIC (charset); if (!EQ (charset, prev_charset)) { run_storage[runs_so_far].ptr = text_storage; run_storage[runs_so_far].charset = charset; run_storage[runs_so_far].dimension = dimension; if (runs_so_far) { run_storage[runs_so_far - 1].len = text_storage - run_storage[runs_so_far - 1].ptr; if (run_storage[runs_so_far - 1].dimension == 2) run_storage[runs_so_far - 1].len >>= 1; } runs_so_far++; prev_charset = charset; #ifdef MULE { Lisp_Object ccl_prog = XCHARSET_CCL_PROGRAM (charset); need_ccl_conversion = !NILP (ccl_prog); if (need_ccl_conversion) setup_ccl_program (&char_converter, ccl_prog); } #endif } if (graphic == 0) { byte1 &= 0x7F; byte2 &= 0x7F; } else if (graphic == 1) { byte1 |= 0x80; byte2 |= 0x80; } #ifdef MULE if (need_ccl_conversion) { char_converter.reg[0] = XCHARSET_ID (charset); char_converter.reg[1] = byte1; char_converter.reg[2] = byte2; ccl_driver (&char_converter, 0, 0, 0, 0, CCL_MODE_ENCODING); byte1 = char_converter.reg[1]; byte2 = char_converter.reg[2]; } #endif *text_storage++ = (unsigned char) byte1; if (dimension == 2) *text_storage++ = (unsigned char) byte2; } if (runs_so_far) { run_storage[runs_so_far - 1].len = text_storage - run_storage[runs_so_far - 1].ptr; if (run_storage[runs_so_far - 1].dimension == 2) run_storage[runs_so_far - 1].len >>= 1; } return runs_so_far; } /****************************************************************************/ /* */ /* Gtk output routines */ /* */ /****************************************************************************/ static int gtk_text_width_single_run (struct face_cachel *cachel, struct textual_run *run) { Lisp_Object font_inst = FACE_CACHEL_FONT (cachel, run->charset); struct Lisp_Font_Instance *fi = XFONT_INSTANCE (font_inst); if (!fi->proportional_p) { return fi->width * run->len; } else { if (run->dimension == 2) { stderr_out ("Measuring wide characters\n"); return gdk_text_width_wc (FONT_INSTANCE_GTK_FONT (fi), (GdkWChar *) run->ptr, run->len); } else { return gdk_text_width (FONT_INSTANCE_GTK_FONT (fi), (char *) run->ptr, run->len); } } } /* gtk_text_width Given a string and a face, return the string's length in pixels when displayed in the font associated with the face. */ static int gtk_text_width (struct frame *UNUSED (f), struct face_cachel *cachel, CONST Ichar *str, Charcount len) { /* !!#### */ int width_so_far = 0; unsigned char *text_storage = (unsigned char *) ALLOCA (2 * len); struct textual_run *runs = alloca_array (struct textual_run, len); int nruns; int i; nruns = separate_textual_runs (text_storage, runs, str, len); for (i = 0; i < nruns; i++) width_so_far += gtk_text_width_single_run (cachel, runs + i); return width_so_far; } /***************************************************************************** gtk_divider_height Return the height of the horizontal divider. This is a function because divider_height is a device method. #### If we add etched horizontal divider lines this will have to get smarter. ****************************************************************************/ static int gtk_divider_height (void) { return 2; } /***************************************************************************** gtk_eol_cursor_width Return the width of the end-of-line cursor. This is a function because eol_cursor_width is a device method. ****************************************************************************/ static int gtk_eol_cursor_width (void) { return EOL_CURSOR_WIDTH; } /***************************************************************************** gtk_output_display_block Given a display line, a block number for that start line, output all runes between start and end in the specified display block. ****************************************************************************/ static void gtk_output_display_block (struct window *w, struct display_line *dl, int block, int start, int end, int start_pixpos, int cursor_start, int cursor_width, int cursor_height) { struct frame *f = XFRAME (w->frame); Ichar_dynarr *buf = Dynarr_new (Ichar); Lisp_Object window; struct display_block *db = Dynarr_atp (dl->display_blocks, block); rune_dynarr *rba = db->runes; struct rune *rb; int elt = start; face_index findex; int xpos, width; Lisp_Object charset = Qunbound; /* Qnil is a valid charset when MULE is not defined */ window = wrap_window (w); rb = Dynarr_atp (rba, start); if (!rb) { /* Nothing to do so don't do anything. */ return; } else { findex = rb->findex; xpos = rb->xpos; width = 0; if (rb->type == RUNE_CHAR) charset = ichar_charset (rb->object.chr.ch); } if (end < 0) end = Dynarr_length (rba); Dynarr_reset (buf); while (elt < end) { rb = Dynarr_atp (rba, elt); if (rb->findex == findex && rb->type == RUNE_CHAR && rb->object.chr.ch != '\n' && rb->cursor_type != CURSOR_ON && EQ (charset, ichar_charset (rb->object.chr.ch))) { Dynarr_add (buf, rb->object.chr.ch); width += rb->width; elt++; } else { if (Dynarr_length (buf)) { gtk_output_string (w, dl, buf, xpos, 0, start_pixpos, width, findex, 0, cursor_start, cursor_width, cursor_height); xpos = rb->xpos; width = 0; } Dynarr_reset (buf); width = 0; if (rb->type == RUNE_CHAR) { findex = rb->findex; xpos = rb->xpos; charset = ichar_charset (rb->object.chr.ch); if (rb->cursor_type == CURSOR_ON) { if (rb->object.chr.ch == '\n') { gtk_output_eol_cursor (w, dl, xpos, findex); } else { Dynarr_add (buf, rb->object.chr.ch); gtk_output_string (w, dl, buf, xpos, 0, start_pixpos, rb->width, findex, 1, cursor_start, cursor_width, cursor_height); Dynarr_reset (buf); } xpos += rb->width; elt++; } else if (rb->object.chr.ch == '\n') { /* Clear in case a cursor was formerly here. */ int height = dl->ascent + dl->descent - dl->clip; redisplay_clear_region (window, findex, xpos, dl->ypos - dl->ascent, rb->width, height); elt++; } } else if (rb->type == RUNE_BLANK || rb->type == RUNE_HLINE) { if (rb->type == RUNE_BLANK) gtk_output_blank (w, dl, rb, start_pixpos, cursor_start, cursor_width); else { /* #### Our flagging of when we need to redraw the modeline shadows sucks. Since RUNE_HLINE is only used by the modeline at the moment it is a good bet that if it gets redrawn then we should also redraw the shadows. This won't be true forever. We borrow the shadow_thickness_changed flag for now. */ w->shadow_thickness_changed = 1; gtk_output_horizontal_line (w, dl, rb); } elt++; if (elt < end) { rb = Dynarr_atp (rba, elt); findex = rb->findex; xpos = rb->xpos; } } else if (rb->type == RUNE_DGLYPH) { Lisp_Object instance; struct display_box dbox; struct display_glyph_area dga; redisplay_calculate_display_boxes (dl, rb->xpos, rb->object.dglyph.xoffset, rb->object.dglyph.yoffset ,start_pixpos, rb->width, &dbox, &dga); window = wrap_window (w); instance = glyph_image_instance (rb->object.dglyph.glyph, window, ERROR_ME_DEBUG_WARN, 1); findex = rb->findex; if (IMAGE_INSTANCEP (instance)) switch (XIMAGE_INSTANCE_TYPE (instance)) { case IMAGE_TEXT: { /* #### This is way losing. See the comment in add_glyph_rune(). */ Lisp_Object string = XIMAGE_INSTANCE_TEXT_STRING (instance); convert_ibyte_string_into_ichar_dynarr (XSTRING_DATA (string), XSTRING_LENGTH (string), buf); gtk_output_string (w, dl, buf, xpos, rb->object.dglyph.xoffset, start_pixpos, -1, findex, (rb->cursor_type == CURSOR_ON), cursor_start, cursor_width, cursor_height); Dynarr_reset (buf); } break; case IMAGE_MONO_PIXMAP: case IMAGE_COLOR_PIXMAP: redisplay_output_pixmap (w, instance, &dbox, &dga, findex,cursor_start, cursor_width, cursor_height, 0); break; case IMAGE_POINTER: ABORT (); case IMAGE_WIDGET: if (EQ (XIMAGE_INSTANCE_WIDGET_TYPE (instance), Qlayout)) { redisplay_output_layout (window, instance, &dbox, &dga, findex, cursor_start, cursor_width, cursor_height); break; } case IMAGE_SUBWINDOW: redisplay_output_subwindow (w, instance, &dbox, &dga, findex, cursor_start, cursor_width, cursor_height); break; case IMAGE_NOTHING: /* nothing is as nothing does */ break; default: ABORT (); } xpos += rb->width; elt++; } else ABORT (); } } if (Dynarr_length (buf)) gtk_output_string (w, dl, buf, xpos, 0, start_pixpos, width, findex, 0, cursor_start, cursor_width, cursor_height); /* #### This is really conditionalized well for optimized performance. */ if (dl->modeline && !EQ (Qzero, w->modeline_shadow_thickness) && (f->clear || f->windows_structure_changed || w->shadow_thickness_changed)) gtk_bevel_modeline (w, dl); Dynarr_free (buf); } /***************************************************************************** gtk_bevel_modeline Draw a 3d border around the modeline on window W. ****************************************************************************/ static void gtk_bevel_modeline (struct window *w, struct display_line *dl) { struct frame *f = XFRAME (w->frame); int shadow_thickness = MODELINE_SHADOW_THICKNESS (w); int x,y, width, height; x = WINDOW_MODELINE_LEFT (w); width = WINDOW_MODELINE_RIGHT (w) - x; y = dl->ypos - dl->ascent - shadow_thickness; height = dl->ascent + dl->descent + 2 * shadow_thickness; gtk_output_shadows (f, x, y, width, height, shadow_thickness); } /***************************************************************************** gtk_get_gc Given a number of parameters return a GC with those properties. ****************************************************************************/ GdkGC * gtk_get_gc (struct device *d, Lisp_Object font, Lisp_Object fg, Lisp_Object bg, Lisp_Object bg_pmap, Lisp_Object lwidth) { GdkGCValues gcv; unsigned long mask; memset (&gcv, ~0, sizeof (gcv)); gcv.graphics_exposures = FALSE; /* Make absolutely sure that we don't pick up a clipping region in the GC returned by this function. */ gcv.clip_mask = 0; gcv.clip_x_origin = 0; gcv.clip_y_origin = 0; gcv.fill = GDK_SOLID; mask = GDK_GC_EXPOSURES | GDK_GC_CLIP_MASK | GDK_GC_CLIP_X_ORIGIN | GDK_GC_CLIP_Y_ORIGIN; mask |= GDK_GC_FILL; if (!NILP (font)) { gcv.font = FONT_INSTANCE_GTK_FONT (XFONT_INSTANCE (font)); mask |= GDK_GC_FONT; } /* evil kludge! */ if (!NILP (fg) && !COLOR_INSTANCEP (fg) && !INTP (fg)) { /* #### I fixed once case where this was getting it. It was a bad macro expansion (compiler bug). */ fprintf (stderr, "Help! gtk_get_gc got a bogus fg value! fg = "); debug_print (fg); fg = Qnil; } if (!NILP (fg)) { if (COLOR_INSTANCEP (fg)) gcv.foreground = * COLOR_INSTANCE_GTK_COLOR (XCOLOR_INSTANCE (fg)); else gcv.foreground.pixel = XINT (fg); mask |= GDK_GC_FOREGROUND; } if (!NILP (bg)) { if (COLOR_INSTANCEP (bg)) gcv.background = * COLOR_INSTANCE_GTK_COLOR (XCOLOR_INSTANCE (bg)); else gcv.background.pixel = XINT (fg); mask |= GDK_GC_BACKGROUND; } if (IMAGE_INSTANCEP (bg_pmap) && IMAGE_INSTANCE_PIXMAP_TYPE_P (XIMAGE_INSTANCE (bg_pmap))) { if (XIMAGE_INSTANCE_PIXMAP_DEPTH (bg_pmap) == 0) { gcv.fill = GDK_OPAQUE_STIPPLED; gcv.stipple = XIMAGE_INSTANCE_GTK_PIXMAP (bg_pmap); mask |= (GDK_GC_STIPPLE | GDK_GC_FILL); } else { gcv.fill = GDK_TILED; gcv.tile = XIMAGE_INSTANCE_GTK_PIXMAP (bg_pmap); mask |= (GDK_GC_TILE | GDK_GC_FILL); } } if (!NILP (lwidth)) { gcv.line_width = XINT (lwidth); mask |= GDK_GC_LINE_WIDTH; } return gc_cache_lookup (DEVICE_GTK_GC_CACHE (d), &gcv, (GdkGCValuesMask) mask); } /***************************************************************************** gtk_output_string Given a string and a starting position, output that string in the given face. If cursor is true, draw a cursor around the string. Correctly handles multiple charsets in the string. The meaning of the parameters is something like this: W Window that the text is to be displayed in. DL Display line that this text is on. The values in the structure are used to determine the vertical position and clipping range of the text. BUF Dynamic array of Ichars specifying what is actually to be drawn. XPOS X position in pixels where the text should start being drawn. XOFFSET Number of pixels to be chopped off the left side of the text. The effect is as if the text were shifted to the left this many pixels and clipped at XPOS. CLIP_START Clip everything left of this X position. WIDTH Clip everything right of XPOS + WIDTH. FINDEX Index for the face cache element describing how to display the text. CURSOR #### I don't understand this. There's something strange and overcomplexified with this variable. Chuck, explain please? CURSOR_START Starting X position of cursor. CURSOR_WIDTH Width of cursor in pixels. CURSOR_HEIGHT Height of cursor in pixels. Starting Y position of cursor is the top of the text line. The cursor is drawn sometimes whether or not CURSOR is set. ??? ****************************************************************************/ static void gdk_draw_text_image (GdkDrawable *drawable, GdkFont *font, GdkGC *gc, gint x, gint y, const gchar *text, gint text_length); void gtk_output_string (struct window *w, struct display_line *dl, Ichar_dynarr *buf, int xpos, int xoffset, int clip_start, int width, face_index findex, int cursor, int cursor_start, int cursor_width, int cursor_height) { /* !!#### Needs review */ /* General variables */ struct frame *f = XFRAME (w->frame); struct device *d = XDEVICE (f->device); Lisp_Object device; Lisp_Object window; GdkWindow *x_win = GET_GTK_WIDGET_WINDOW (FRAME_GTK_TEXT_WIDGET (f)); int clip_end; /* Cursor-related variables */ int focus = EQ (w->frame, DEVICE_FRAME_WITH_FOCUS_REAL (d)); int cursor_clip; Lisp_Object bar_cursor_value = symbol_value_in_buffer (Qbar_cursor, WINDOW_BUFFER (w)); struct face_cachel *cursor_cachel = 0; /* Text-related variables */ Lisp_Object bg_pmap; GdkGC *bgc, *gc; int height; int len = Dynarr_length (buf); unsigned char *text_storage = (unsigned char *) ALLOCA (2 * len); struct textual_run *runs = alloca_array (struct textual_run, len); int nruns; int i; struct face_cachel *cachel = WINDOW_FACE_CACHEL (w, findex); device = wrap_device (d); window = wrap_window (w); if (width < 0) width = gtk_text_width (f, cachel, Dynarr_atp (buf, 0), Dynarr_length (buf)); height = dl->ascent + dl->descent - dl->clip; /* Regularize the variables passed in. */ if (clip_start < xpos) clip_start = xpos; clip_end = xpos + width; if (clip_start >= clip_end) /* It's all clipped out. */ return; xpos -= xoffset; nruns = separate_textual_runs (text_storage, runs, Dynarr_atp (buf, 0), Dynarr_length (buf)); cursor_clip = (cursor_start >= clip_start && cursor_start < clip_end); /* This cursor code is really a mess. */ if (!NILP (w->text_cursor_visible_p) && (cursor || cursor_clip || (cursor_width && (cursor_start + cursor_width >= clip_start) && !NILP (bar_cursor_value)))) { /* These have to be in separate statements in order to avoid a compiler bug. */ face_index sucks = get_builtin_face_cache_index (w, Vtext_cursor_face); cursor_cachel = WINDOW_FACE_CACHEL (w, sucks); /* We have to reset this since any call to WINDOW_FACE_CACHEL may cause the cache to resize and any pointers to it to become invalid. */ cachel = WINDOW_FACE_CACHEL (w, findex); } bg_pmap = cachel->background_pixmap; if (!IMAGE_INSTANCEP (bg_pmap) || !IMAGE_INSTANCE_PIXMAP_TYPE_P (XIMAGE_INSTANCE (bg_pmap))) bg_pmap = Qnil; if ((cursor && focus && NILP (bar_cursor_value) && !NILP (w->text_cursor_visible_p)) || NILP (bg_pmap)) bgc = 0; else bgc = gtk_get_gc (d, Qnil, cachel->foreground, cachel->background, bg_pmap, Qnil); if (bgc) gdk_draw_rectangle (GDK_DRAWABLE (x_win), bgc, TRUE, clip_start, dl->ypos - dl->ascent, clip_end - clip_start, height); for (i = 0; i < nruns; i++) { Lisp_Object font = FACE_CACHEL_FONT (cachel, runs[i].charset); struct Lisp_Font_Instance *fi = XFONT_INSTANCE (font); GdkFont *gdk_font = FONT_INSTANCE_GTK_FONT (fi); int this_width; int need_clipping; if (EQ (font, Vthe_null_font_instance)) continue; this_width = gtk_text_width_single_run (cachel, runs + i); need_clipping = (dl->clip || clip_start > xpos || clip_end < xpos + this_width); /* XDrawImageString only clears the area equal to the height of the given font. It is possible that a font is being displayed on a line taller than it is, so this would cause us to fail to clear some areas. */ if ((int) fi->height < (int) (height + dl->clip)) { int clear_start = max (xpos, clip_start); int clear_end = min (xpos + this_width, clip_end); if (cursor) { int ypos1_line, ypos1_string, ypos2_line, ypos2_string; ypos1_string = dl->ypos - fi->ascent; ypos2_string = dl->ypos + fi->descent; ypos1_line = dl->ypos - dl->ascent; ypos2_line = dl->ypos + dl->descent - dl->clip; /* Make sure we don't clear below the real bottom of the line. */ if (ypos1_string > ypos2_line) ypos1_string = ypos2_line; if (ypos2_string > ypos2_line) ypos2_string = ypos2_line; if (ypos1_line < ypos1_string) { redisplay_clear_region (window, findex, clear_start, ypos1_line, clear_end - clear_start, ypos1_string - ypos1_line); } if (ypos2_line > ypos2_string) { redisplay_clear_region (window, findex, clear_start, ypos2_string, clear_end - clear_start, ypos2_line - ypos2_string); } } else { redisplay_clear_region (window, findex, clear_start, dl->ypos - dl->ascent, clear_end - clear_start, height); } } if (cursor && cursor_cachel && focus && NILP (bar_cursor_value)) { gc = gtk_get_gc (d, font, cursor_cachel->foreground, cursor_cachel->background, Qnil, Qnil); } else { gc = gtk_get_gc (d, font, cachel->foreground, cachel->background, Qnil, Qnil); } if (need_clipping) { GdkRectangle clip_box; clip_box.x = 0; clip_box.y = 0; clip_box.width = clip_end - clip_start; clip_box.height = height; gdk_gc_set_clip_rectangle (gc, &clip_box); gdk_gc_set_clip_origin (gc, clip_start, dl->ypos - dl->ascent); } /* The X specific called different functions (XDraw*String vs. XDraw*String16), but apparently gdk_draw_text takes care of that for us. BUT, gdk_draw_text also does too much, by dividing the length by 2. So we fake them out my multiplying the length by the dimension of the text. This will do the right thing for single-dimension runs as well of course. */ (bgc ? gdk_draw_text : gdk_draw_text_image) (GDK_DRAWABLE (x_win), gdk_font, gc, xpos, dl->ypos, (char *) runs[i].ptr, runs[i].len * runs[i].dimension); /* We draw underlines in the same color as the text. */ if (cachel->underline) { int upos, uthick; /* Cannot get at font properties in Gtk, so we resort to guessing */ upos = dl->descent / 2; uthick = 1; if ((dl->ypos + upos) < (dl->ypos + dl->descent - dl->clip)) { if (dl->ypos + upos + uthick > dl->ypos + dl->descent - dl->clip) uthick = dl->descent - dl->clip - upos; if (uthick == 1) { gdk_draw_line (GDK_DRAWABLE (x_win), gc, xpos, dl->ypos + upos, xpos + this_width, dl->ypos + upos); } else if (uthick > 1) { gdk_draw_rectangle (GDK_DRAWABLE (x_win), gc, TRUE, xpos, dl->ypos + upos, this_width, uthick); } } } if (cachel->strikethru) { gint ascent,descent,upos, uthick; GdkFont *gfont = FONT_INSTANCE_GTK_FONT (XFONT_INSTANCE (font)); /* Cannot get at font properties in Gtk, so we resort to guessing */ ascent = gfont->ascent; descent = gfont->descent; uthick = 1; upos = ascent - ((ascent + descent) / 2) + 1; /* Generally, upos will be positive (above the baseline),so subtract */ if (dl->ypos - upos < dl->ypos + dl->descent - dl->clip) { if (dl->ypos - upos + uthick > dl->ypos + dl->descent - dl->clip) uthick = dl->descent - dl->clip + upos; if (uthick == 1) { gdk_draw_line (GDK_DRAWABLE (x_win), gc, xpos, dl->ypos - upos, xpos + this_width, dl->ypos - upos); } else if (uthick > 1) { gdk_draw_rectangle (GDK_DRAWABLE (x_win), gc, TRUE, xpos, dl->ypos + upos, this_width, uthick); } } } /* Restore the GC */ if (need_clipping) { gdk_gc_set_clip_rectangle (gc, NULL); gdk_gc_set_clip_origin (gc, 0, 0); } /* If we are actually superimposing the cursor then redraw with just the appropriate section highlighted. */ if (cursor_clip && !cursor && focus && cursor_cachel) { GdkGC *cgc; GdkRectangle clip_box; cgc = gtk_get_gc (d, font, cursor_cachel->foreground, cursor_cachel->background, Qnil, Qnil); clip_box.x = 0; clip_box.y = 0; clip_box.width = cursor_width; clip_box.height = height; gdk_gc_set_clip_rectangle (cgc, &clip_box); gdk_gc_set_clip_origin (cgc, cursor_start, dl->ypos - dl->ascent); /* The X specific called different functions (XDraw*String vs. XDraw*String16), but apparently gdk_draw_text takes care of that for us. BUT, gdk_draw_text also does too much, by dividing the length by 2. So we fake them out my multiplying the length by the dimension of the text. This will do the right thing for single-dimension runs as well of course. */ gdk_draw_text_image (GDK_DRAWABLE (x_win), gdk_font, cgc, xpos, dl->ypos, (char *) runs[i].ptr, runs[i].len * runs[i].dimension); gdk_gc_set_clip_rectangle (cgc, NULL); gdk_gc_set_clip_origin (cgc, 0, 0); } xpos += this_width; } /* Draw the non-focus box or bar-cursor as needed. */ /* Can't this logic be simplified? */ if (cursor_cachel && ((cursor && !focus && NILP (bar_cursor_value)) || (cursor_width && (cursor_start + cursor_width >= clip_start) && !NILP (bar_cursor_value)))) { int tmp_height, tmp_y; int bar_width = EQ (bar_cursor_value, Qt) ? 1 : 2; int need_clipping = (cursor_start < clip_start || clip_end < cursor_start + cursor_width); /* #### This value is correct (as far as I know) because all of the times we need to draw this cursor, we will be called with exactly one character, so we know we can always use runs[0]. This is bogus as all hell, however. The cursor handling in this function is way bogus and desperately needs to be cleaned up. (In particular, the drawing of the cursor should really really be separated out of this function. This may be a bit tricky now because this function itself does way too much stuff, a lot of which needs to be moved into redisplay.c) This is the only way to be able to easily add new cursor types or (e.g.) make the bar cursor be able to span two characters instead of overlaying just one. */ int bogusly_obtained_ascent_value = XFONT_INSTANCE (FACE_CACHEL_FONT (cachel, runs[0].charset))->ascent; if (!NILP (bar_cursor_value)) { gc = gtk_get_gc (d, Qnil, cursor_cachel->background, Qnil, Qnil, make_int (bar_width)); } else { gc = gtk_get_gc (d, Qnil, cursor_cachel->background, Qnil, Qnil, Qnil); } tmp_y = dl->ypos - bogusly_obtained_ascent_value; tmp_height = cursor_height; if (tmp_y + tmp_height > (int) (dl->ypos - dl->ascent + height)) { tmp_y = dl->ypos - dl->ascent + height - tmp_height; if (tmp_y < (int) (dl->ypos - dl->ascent)) tmp_y = dl->ypos - dl->ascent; tmp_height = dl->ypos - dl->ascent + height - tmp_y; } if (need_clipping) { GdkRectangle clip_box; clip_box.x = 0; clip_box.y = 0; clip_box.width = clip_end - clip_start; clip_box.height = tmp_height; gdk_gc_set_clip_rectangle (gc, &clip_box); gdk_gc_set_clip_origin (gc, clip_start, tmp_y); } if (!focus && NILP (bar_cursor_value)) { gdk_draw_rectangle (GDK_DRAWABLE (x_win), gc, FALSE, cursor_start, tmp_y, cursor_width - 1, tmp_height - 1); } else if (focus && !NILP (bar_cursor_value)) { gdk_draw_line (GDK_DRAWABLE (x_win), gc, cursor_start + bar_width - 1, tmp_y, cursor_start + bar_width - 1, tmp_y + tmp_height - 1); } /* Restore the GC */ if (need_clipping) { gdk_gc_set_clip_rectangle (gc, NULL); gdk_gc_set_clip_origin (gc, 0, 0); } } } static void our_draw_bitmap (GdkDrawable *drawable, GdkGC *gc, GdkPixmap *src, gint xsrc, gint ysrc, gint xdest, gint ydest, gint width, gint height); static void gtk_output_gdk_pixmap (struct frame *f, struct Lisp_Image_Instance *p, int x, int y, int xoffset, int yoffset, int width, int height, GdkColor *fg, GdkColor *bg, GdkGC *override_gc) { struct device *d = XDEVICE (f->device); GdkWindow *x_win = GET_GTK_WIDGET_WINDOW (FRAME_GTK_TEXT_WIDGET (f)); GdkGC *gc; GdkGCValues gcv; unsigned long pixmap_mask; if (!override_gc) { memset (&gcv, ~0, sizeof (gcv)); gcv.graphics_exposures = FALSE; gcv.foreground = *fg; gcv.background = *bg; pixmap_mask = GDK_GC_FOREGROUND | GDK_GC_BACKGROUND | GDK_GC_EXPOSURES; if (IMAGE_INSTANCE_GTK_MASK (p)) { gcv.function = GDK_COPY; gcv.clip_mask = IMAGE_INSTANCE_GTK_MASK (p); gcv.clip_x_origin = x - xoffset; gcv.clip_y_origin = y - yoffset; pixmap_mask |= (GDK_GC_FUNCTION | GDK_GC_CLIP_MASK | GDK_GC_CLIP_X_ORIGIN | GDK_GC_CLIP_Y_ORIGIN); /* Can't set a clip rectangle below because we already have a mask. We could conceivably create a new clipmask by zeroing out everything outside the clip region. Is it worth it? Is it possible to get an equivalent effect by changing the args to XCopyArea below rather than messing with a clip box? - dkindred@cs.cmu.edu Yes. We don't clip at all now - andy@xemacs.org */ } gc = gc_cache_lookup (DEVICE_GTK_GC_CACHE (d), &gcv, pixmap_mask); } else { gc = override_gc; /* override_gc might have a mask already--we don't want to nuke it. Maybe we can insist that override_gc have no mask, or use one of the suggestions above. */ } if (IMAGE_INSTANCE_PIXMAP_DEPTH (p) > 0) { gdk_draw_pixmap (GDK_DRAWABLE (x_win), gc, IMAGE_INSTANCE_GTK_PIXMAP (p), xoffset, yoffset, x, y, width, height); } else { our_draw_bitmap (GDK_DRAWABLE (x_win), gc, IMAGE_INSTANCE_GTK_PIXMAP (p), xoffset, yoffset, x, y, width, height); } } static void gtk_output_pixmap (struct window *w, Lisp_Object image_instance, struct display_box *db, struct display_glyph_area *dga, face_index findex, int cursor_start, int cursor_width, int cursor_height, int UNUSED (bg_pixmap)) { struct frame *f = XFRAME (w->frame); struct device *d = XDEVICE (f->device); struct Lisp_Image_Instance *p = XIMAGE_INSTANCE (image_instance); Lisp_Object window; GdkWindow *x_win = GET_GTK_WIDGET_WINDOW (FRAME_GTK_TEXT_WIDGET (f)); window = wrap_window (w); /* Output the pixmap. */ { Lisp_Object tmp_pixel; GdkColor *tmp_bcolor, *tmp_fcolor; tmp_pixel = WINDOW_FACE_CACHEL_FOREGROUND (w, findex); tmp_fcolor = COLOR_INSTANCE_GTK_COLOR (XCOLOR_INSTANCE (tmp_pixel)); tmp_pixel = WINDOW_FACE_CACHEL_BACKGROUND (w, findex); tmp_bcolor = COLOR_INSTANCE_GTK_COLOR (XCOLOR_INSTANCE (tmp_pixel)); gtk_output_gdk_pixmap (f, p, db->xpos, db->ypos, dga->xoffset, dga->yoffset, dga->width, dga->height, tmp_fcolor, tmp_bcolor, NULL); } /* Draw a cursor over top of the pixmap. */ if (cursor_width && cursor_height && (cursor_start >= db->xpos) && !NILP (w->text_cursor_visible_p) && (cursor_start < (db->xpos + dga->width))) { GdkGC *gc; int focus = EQ (w->frame, DEVICE_FRAME_WITH_FOCUS_REAL (d)); struct face_cachel *cursor_cachel = WINDOW_FACE_CACHEL (w, get_builtin_face_cache_index (w, Vtext_cursor_face)); gc = gtk_get_gc (d, Qnil, cursor_cachel->background, Qnil, Qnil, Qnil); if (cursor_width > db->xpos + dga->width - cursor_start) cursor_width = db->xpos + dga->width - cursor_start; gdk_draw_rectangle (GDK_DRAWABLE (x_win), gc, focus ? TRUE : FALSE, cursor_start, db->ypos, cursor_width, cursor_height); } } /***************************************************************************** gtk_output_vertical_divider Draw a vertical divider down the right side of the given window. ****************************************************************************/ static void gtk_output_vertical_divider (struct window *w, int clear) { struct frame *f = XFRAME (w->frame); struct device *d = XDEVICE (f->device); GdkWindow *x_win = GET_GTK_WIDGET_WINDOW (FRAME_GTK_TEXT_WIDGET (f)); GdkGC *background_gc; Lisp_Object tmp_pixel; GdkGCValues gcv; unsigned long mask; int x, y1, y2, width, shadow_thickness, spacing, line_width; face_index div_face = get_builtin_face_cache_index (w, Vvertical_divider_face); width = window_divider_width (w); shadow_thickness = XINT (w->vertical_divider_shadow_thickness); spacing = XINT (w->vertical_divider_spacing); line_width = XINT (w->vertical_divider_line_width); x = WINDOW_RIGHT (w) - width; y1 = WINDOW_TOP (w); y2 = WINDOW_BOTTOM (w); memset (&gcv, ~0, sizeof (gcv)); tmp_pixel = WINDOW_FACE_CACHEL_BACKGROUND (w, div_face); gcv.background = * COLOR_INSTANCE_GTK_COLOR (XCOLOR_INSTANCE (tmp_pixel)); gcv.foreground = gcv.background; gcv.graphics_exposures = FALSE; mask = GDK_GC_FOREGROUND | GDK_GC_BACKGROUND | GDK_GC_EXPOSURES; background_gc = gc_cache_lookup (DEVICE_GTK_GC_CACHE (d), &gcv, mask); /* Clear the divider area first. This needs to be done when a window split occurs. */ /* if (clear) */ gdk_draw_rectangle (GDK_DRAWABLE (x_win), background_gc, TRUE, x, y1, width, y2 - y1); #if 0 /* Draw the divider line. */ gdk_draw_rectangle (GDK_DRAWABLE (x_win), background_gc, TRUE, x + spacing + shadow_thickness, y1, line_width, y2 - y1); #endif /* Draw the shadows around the divider line */ gtk_output_shadows (f, x + spacing, y1, width - 2 * spacing, y2 - y1, shadow_thickness); } /***************************************************************************** gtk_output_blank Output a blank by clearing the area it covers in the foreground color of its face. ****************************************************************************/ static void gtk_output_blank (struct window *w, struct display_line *dl, struct rune *rb, int start_pixpos, int cursor_start, int cursor_width) { struct frame *f = XFRAME (w->frame); struct device *d = XDEVICE (f->device); GdkWindow *x_win = GET_GTK_WIDGET_WINDOW (FRAME_GTK_TEXT_WIDGET (f)); GdkGC *gc; struct face_cachel *cursor_cachel = WINDOW_FACE_CACHEL (w, get_builtin_face_cache_index (w, Vtext_cursor_face)); Lisp_Object bg_pmap; Lisp_Object buffer = WINDOW_BUFFER (w); Lisp_Object bar_cursor_value = symbol_value_in_buffer (Qbar_cursor, buffer); int x = rb->xpos; int y = dl->ypos - dl->ascent; int width = rb->width; int height = dl->ascent + dl->descent - dl->clip; if (start_pixpos > x) { if (start_pixpos >= (x + width)) return; else { width -= (start_pixpos - x); x = start_pixpos; } } bg_pmap = WINDOW_FACE_CACHEL_BACKGROUND_PIXMAP (w, rb->findex); if (!IMAGE_INSTANCEP (bg_pmap) || !IMAGE_INSTANCE_PIXMAP_TYPE_P (XIMAGE_INSTANCE (bg_pmap))) bg_pmap = Qnil; if (NILP (bg_pmap)) gc = gtk_get_gc (d, Qnil, WINDOW_FACE_CACHEL_BACKGROUND (w, rb->findex), Qnil, Qnil, Qnil); else gc = gtk_get_gc (d, Qnil, WINDOW_FACE_CACHEL_FOREGROUND (w, rb->findex), WINDOW_FACE_CACHEL_BACKGROUND (w, rb->findex), bg_pmap, Qnil); gdk_draw_rectangle (GDK_DRAWABLE (x_win), gc, TRUE, x, y, width, height); /* If this rune is marked as having the cursor, then it is actually representing a tab. */ if (!NILP (w->text_cursor_visible_p) && (rb->cursor_type == CURSOR_ON || (cursor_width && (cursor_start + cursor_width > x) && cursor_start < (x + width)))) { int cursor_height, cursor_y; int focus = EQ (w->frame, DEVICE_FRAME_WITH_FOCUS_REAL (d)); struct Lisp_Font_Instance *fi; fi = XFONT_INSTANCE (FACE_CACHEL_FONT (WINDOW_FACE_CACHEL (w, rb->findex), Vcharset_ascii)); gc = gtk_get_gc (d, Qnil, cursor_cachel->background, Qnil, Qnil, Qnil); cursor_y = dl->ypos - fi->ascent; cursor_height = fi->height; if (cursor_y + cursor_height > y + height) cursor_height = y + height - cursor_y; if (focus) { if (NILP (bar_cursor_value)) { gdk_draw_rectangle (GDK_DRAWABLE (x_win), gc, TRUE, cursor_start, cursor_y, fi->width, cursor_height); } else { int bar_width = EQ (bar_cursor_value, Qt) ? 1 : 2; gc = gtk_get_gc (d, Qnil, cursor_cachel->background, Qnil, Qnil, make_int (bar_width)); gdk_draw_line (GDK_DRAWABLE (x_win), gc, cursor_start + bar_width - 1, cursor_y, cursor_start + bar_width - 1, cursor_y + cursor_height - 1); } } else if (NILP (bar_cursor_value)) { gdk_draw_rectangle (GDK_DRAWABLE (x_win), gc, FALSE, cursor_start, cursor_y, fi->width - 1, cursor_height - 1); } } } /***************************************************************************** gtk_output_horizontal_line Output a horizontal line in the foreground of its face. ****************************************************************************/ static void gtk_output_horizontal_line (struct window *w, struct display_line *dl, struct rune *rb) { struct frame *f = XFRAME (w->frame); struct device *d = XDEVICE (f->device); GtkStyle *style = FRAME_GTK_TEXT_WIDGET (f)->style; GdkWindow *x_win = GET_GTK_WIDGET_WINDOW (FRAME_GTK_TEXT_WIDGET (f)); GdkGC *gc; int x = rb->xpos; int width = rb->width; int height = dl->ascent + dl->descent - dl->clip; int ypos1, ypos2, ypos3, ypos4; ypos1 = dl->ypos - dl->ascent; ypos2 = ypos1 + rb->object.hline.yoffset; ypos3 = ypos2 + rb->object.hline.thickness; ypos4 = dl->ypos + dl->descent - dl->clip; /* First clear the area not covered by the line. */ if (height - rb->object.hline.thickness > 0) { gc = gtk_get_gc (d, Qnil, WINDOW_FACE_CACHEL_FOREGROUND (w, rb->findex), Qnil, Qnil, Qnil); if (ypos2 - ypos1 > 0) gdk_draw_rectangle (GDK_DRAWABLE (x_win), gc, TRUE, x, ypos1, width, ypos2 - ypos1); if (ypos4 - ypos3 > 0) gdk_draw_rectangle (GDK_DRAWABLE (x_win), gc, TRUE, x, ypos1, width, ypos2 - ypos1); } gtk_paint_hline (style, x_win, GTK_STATE_NORMAL, NULL, FRAME_GTK_TEXT_WIDGET (f), "hline", x, x + width, ypos2); #if 0 /* Now draw the line. */ gc = gtk_get_gc (d, Qnil, WINDOW_FACE_CACHEL_BACKGROUND (w, rb->findex), Qnil, Qnil, Qnil); if (ypos2 < ypos1) ypos2 = ypos1; if (ypos3 > ypos4) ypos3 = ypos4; if (ypos3 - ypos2 > 0) gdk_draw_rectangle (GDK_DRAWABLE (x_win), gc, TRUE, x, ypos2, width, ypos3 - ypos2); #endif } /***************************************************************************** gtk_output_shadows Draw a shadow around the given area using the standard theme engine routines. ****************************************************************************/ void gtk_output_shadows (struct frame *f, int x, int y, int width, int height, int shadow_thickness) { GdkWindow *x_win = GET_GTK_WIDGET_WINDOW (FRAME_GTK_TEXT_WIDGET (f)); GtkStyle *style = FRAME_GTK_TEXT_WIDGET (f)->style; GtkShadowType stype = GTK_SHADOW_OUT; if (shadow_thickness < 0) { stype = GTK_SHADOW_IN; } else if (shadow_thickness == 0) { stype = GTK_SHADOW_NONE; } /* Do we want to have some magic constants to set GTK_SHADOW_ETCHED_IN or GTK_SHADOW_ETCHED_OUT? */ gtk_paint_shadow (style, x_win, GTK_STATE_NORMAL, stype, NULL, FRAME_GTK_TEXT_WIDGET (f), "modeline", x, y, width, height); } /***************************************************************************** gtk_clear_to_window_end Clear the area between ypos1 and ypos2. Each margin area and the text area is handled separately since they may each have their own background color. ****************************************************************************/ static void gtk_clear_to_window_end (struct window *w, int ypos1, int ypos2) { int height = ypos2 - ypos1; if (height) { struct frame *f = XFRAME (w->frame); Lisp_Object window; int bflag = (window_needs_vertical_divider (w) ? 0 : 1); layout_bounds bounds; bounds = calculate_display_line_boundaries (w, bflag); window = wrap_window (w); if (window_is_leftmost (w)) redisplay_clear_region (window, DEFAULT_INDEX, FRAME_LEFT_BORDER_START (f), ypos1, FRAME_BORDER_WIDTH (f), height); if (bounds.left_in - bounds.left_out > 0) redisplay_clear_region (window, get_builtin_face_cache_index (w, Vleft_margin_face), bounds.left_out, ypos1, bounds.left_in - bounds.left_out, height); if (bounds.right_in - bounds.left_in > 0) redisplay_clear_region (window, DEFAULT_INDEX, bounds.left_in, ypos1, bounds.right_in - bounds.left_in, height); if (bounds.right_out - bounds.right_in > 0) redisplay_clear_region (window, get_builtin_face_cache_index (w, Vright_margin_face), bounds.right_in, ypos1, bounds.right_out - bounds.right_in, height); if (window_is_rightmost (w)) redisplay_clear_region (window, DEFAULT_INDEX, FRAME_RIGHT_BORDER_START (f), ypos1, FRAME_BORDER_WIDTH (f), height); } } /**************************************************************************** gtk_clear_region Clear the area in the box defined by the given parameters using the given face. ****************************************************************************/ static void gtk_clear_region (Lisp_Object UNUSED (locale), struct device* d, struct frame* f, face_index UNUSED (findex), int x, int y, int width, int height, Lisp_Object fcolor, Lisp_Object bcolor, Lisp_Object background_pixmap) { GdkWindow *x_win; GdkGC *gc = NULL; x_win = GET_GTK_WIDGET_WINDOW (FRAME_GTK_TEXT_WIDGET (f)); if (!UNBOUNDP (background_pixmap)) { gc = gtk_get_gc (d, Qnil, fcolor, bcolor, background_pixmap, Qnil); } if (gc) { gdk_draw_rectangle (GDK_DRAWABLE (x_win), gc,TRUE, x, y, width, height); } else { gdk_window_clear_area (x_win, x, y, width, height); } } /***************************************************************************** gtk_output_eol_cursor Draw a cursor at the end of a line. The end-of-line cursor is narrower than the normal cursor. ****************************************************************************/ static void gtk_output_eol_cursor (struct window *w, struct display_line *dl, int xpos, face_index findex) { struct frame *f = XFRAME (w->frame); struct device *d = XDEVICE (f->device); Lisp_Object window; GdkWindow *x_win = GET_GTK_WIDGET_WINDOW (FRAME_GTK_TEXT_WIDGET (f)); GdkGC *gc; face_index elt = get_builtin_face_cache_index (w, Vtext_cursor_face); struct face_cachel *cursor_cachel = WINDOW_FACE_CACHEL (w, elt); int focus = EQ (w->frame, DEVICE_FRAME_WITH_FOCUS_REAL (d)); Lisp_Object bar_cursor_value = symbol_value_in_buffer (Qbar_cursor, WINDOW_BUFFER (w)); int x = xpos; int y = dl->ypos - dl->ascent; int width = EOL_CURSOR_WIDTH; int height = dl->ascent + dl->descent - dl->clip; int cursor_height, cursor_y; int defheight, defascent; window = wrap_window (w); redisplay_clear_region (window, findex, x, y, width, height); if (NILP (w->text_cursor_visible_p)) return; gc = gtk_get_gc (d, Qnil, cursor_cachel->background, Qnil, Qnil, Qnil); default_face_font_info (window, &defascent, 0, &defheight, 0, 0); /* make sure the cursor is entirely contained between y and y+height */ cursor_height = min (defheight, height); cursor_y = max (y, min (y + height - cursor_height, dl->ypos - defascent)); if (focus) { if (NILP (bar_cursor_value)) { gdk_draw_rectangle (GDK_DRAWABLE (x_win), gc, TRUE, x, cursor_y, width, cursor_height); } else { int bar_width = EQ (bar_cursor_value, Qt) ? 1 : 2; gc = gtk_get_gc (d, Qnil, cursor_cachel->background, Qnil, Qnil, make_int (bar_width)); gdk_draw_line (GDK_DRAWABLE (x_win), gc, x + bar_width - 1, cursor_y, x + bar_width - 1, cursor_y + cursor_height - 1); } } else if (NILP (bar_cursor_value)) { gdk_draw_rectangle (GDK_DRAWABLE (x_win), gc, FALSE, x, cursor_y, width - 1, cursor_height - 1); } } static void gtk_clear_frame_window (Lisp_Object window) { struct window *w = XWINDOW (window); if (!NILP (w->vchild)) { gtk_clear_frame_windows (w->vchild); return; } if (!NILP (w->hchild)) { gtk_clear_frame_windows (w->hchild); return; } gtk_clear_to_window_end (w, WINDOW_TEXT_TOP (w), WINDOW_TEXT_BOTTOM (w)); } static void gtk_clear_frame_windows (Lisp_Object window) { for (; !NILP (window); window = XWINDOW (window)->next) gtk_clear_frame_window (window); } static void gtk_clear_frame (struct frame *f) { GdkWindow *x_win = GET_GTK_WIDGET_WINDOW (FRAME_GTK_TEXT_WIDGET (f)); int x, y, width, height; Lisp_Object frame; x = FRAME_LEFT_BORDER_START (f); width = (FRAME_PIXWIDTH (f) - FRAME_REAL_LEFT_TOOLBAR_WIDTH (f) - FRAME_REAL_RIGHT_TOOLBAR_WIDTH (f) - 2 * FRAME_REAL_LEFT_TOOLBAR_BORDER_WIDTH (f) - 2 * FRAME_REAL_RIGHT_TOOLBAR_BORDER_WIDTH (f)); /* #### This adjustment by 1 should be being done in the macros. There is some small differences between when the menubar is on and off that we still need to deal with. */ y = FRAME_TOP_BORDER_START (f) - 1; height = (FRAME_PIXHEIGHT (f) - FRAME_REAL_TOP_TOOLBAR_HEIGHT (f) - FRAME_REAL_BOTTOM_TOOLBAR_HEIGHT (f) - 2 * FRAME_REAL_TOP_TOOLBAR_BORDER_WIDTH (f) - 2 * FRAME_REAL_BOTTOM_TOOLBAR_BORDER_WIDTH (f)) + 1; gdk_window_clear_area (x_win, x, y, width, height); frame = wrap_frame (f); if (!UNBOUNDP (FACE_BACKGROUND_PIXMAP (Vdefault_face, frame)) || !UNBOUNDP (FACE_BACKGROUND_PIXMAP (Vleft_margin_face, frame)) || !UNBOUNDP (FACE_BACKGROUND_PIXMAP (Vright_margin_face, frame))) { gtk_clear_frame_windows (f->root_window); } } static int gtk_flash (struct device *d) { GdkGCValues gcv; GdkGC *gc; GdkColor tmp_fcolor, tmp_bcolor; Lisp_Object tmp_pixel, frame; struct frame *f = device_selected_frame (d); struct window *w = XWINDOW (FRAME_ROOT_WINDOW (f)); frame = wrap_frame (f); tmp_pixel = FACE_FOREGROUND (Vdefault_face, frame); tmp_fcolor = * (COLOR_INSTANCE_GTK_COLOR (XCOLOR_INSTANCE (tmp_pixel))); tmp_pixel = FACE_BACKGROUND (Vdefault_face, frame); tmp_bcolor = * (COLOR_INSTANCE_GTK_COLOR (XCOLOR_INSTANCE (tmp_pixel))); memset (&gcv, ~0, sizeof (gcv)); /* initialize all slots to ~0 */ gcv.foreground.pixel = (tmp_fcolor.pixel ^ tmp_bcolor.pixel); gcv.function = GDK_XOR; gcv.graphics_exposures = FALSE; gc = gc_cache_lookup (DEVICE_GTK_GC_CACHE (XDEVICE (f->device)), &gcv, GDK_GC_FOREGROUND | GDK_GC_FUNCTION | GDK_GC_EXPOSURES); gdk_draw_rectangle (GDK_DRAWABLE (GET_GTK_WIDGET_WINDOW (FRAME_GTK_SHELL_WIDGET (f))), gc, TRUE, w->pixel_left, w->pixel_top, w->pixel_width, w->pixel_height); gdk_flush (); #ifdef HAVE_SELECT { int usecs = 100000; struct timeval tv; tv.tv_sec = usecs / 1000000L; tv.tv_usec = usecs % 1000000L; /* I'm sure someone is going to complain about this... */ select (0, 0, 0, 0, &tv); } #else #ifdef HAVE_POLL poll (0, 0, 100); #else bite me #endif #endif gdk_draw_rectangle (GDK_DRAWABLE (GET_GTK_WIDGET_WINDOW (FRAME_GTK_SHELL_WIDGET (f))), gc, TRUE, w->pixel_left, w->pixel_top, w->pixel_width, w->pixel_height); gdk_flush (); return 1; } static void gtk_bevel_area (struct window *w, face_index UNUSED (findex), int x, int y, int width, int height, int shadow_thickness, int UNUSED (edges), enum edge_style UNUSED (style)) { struct frame *f = XFRAME (w->frame); gtk_output_shadows (f, x, y, width, height, shadow_thickness); } /* Make audible bell. */ static void gtk_ring_bell (struct device *UNUSED (d), int volume, int UNUSED (pitch), int UNUSED (duration)) { /* Gdk does not allow us to control the duration / pitch / volume */ if (volume > 0) { gdk_beep (); } } /************************************************************************/ /* initialization */ /************************************************************************/ void console_type_create_redisplay_gtk (void) { /* redisplay methods */ CONSOLE_HAS_METHOD (gtk, text_width); CONSOLE_HAS_METHOD (gtk, output_display_block); CONSOLE_HAS_METHOD (gtk, divider_height); CONSOLE_HAS_METHOD (gtk, eol_cursor_width); CONSOLE_HAS_METHOD (gtk, output_vertical_divider); CONSOLE_HAS_METHOD (gtk, clear_to_window_end); CONSOLE_HAS_METHOD (gtk, clear_region); CONSOLE_HAS_METHOD (gtk, clear_frame); CONSOLE_HAS_METHOD (gtk, flash); CONSOLE_HAS_METHOD (gtk, ring_bell); CONSOLE_HAS_METHOD (gtk, bevel_area); CONSOLE_HAS_METHOD (gtk, output_string); CONSOLE_HAS_METHOD (gtk, output_pixmap); } /* This makes me feel incredibly dirty... but there is no other way to get this done right other than calling clear_area before every single $#!%@ing piece of text, which I do NOT want to do. */ #define USE_X_SPECIFIC_DRAW_ROUTINES 1 #include <gdk/gdkx.h> static void gdk_draw_text_image (GdkDrawable *drawable, GdkFont *font, GdkGC *gc, gint x, gint y, const gchar *text, gint text_length) { #if !USE_X_SPECIFIC_DRAW_ROUTINES int width = gdk_text_measure (font, text, text_length); int height = gdk_text_height (font, text, text_length); gdk_draw_rectangle (drawable, gc, TRUE, x, y, width, height); gdk_draw_text (drawable, font, gc, x, y, text, text_length); #else GdkWindowPrivate *drawable_private; GdkFontPrivate *font_private; GdkGCPrivate *gc_private; g_return_if_fail (drawable != NULL); g_return_if_fail (font != NULL); g_return_if_fail (gc != NULL); g_return_if_fail (text != NULL); drawable_private = (GdkWindowPrivate*) drawable; if (drawable_private->destroyed) return; gc_private = (GdkGCPrivate*) gc; font_private = (GdkFontPrivate*) font; if (font->type == GDK_FONT_FONT) { XFontStruct *xfont = (XFontStruct *) font_private->xfont; XSetFont(drawable_private->xdisplay, gc_private->xgc, xfont->fid); if ((xfont->min_byte1 == 0) && (xfont->max_byte1 == 0)) { XDrawImageString (drawable_private->xdisplay, drawable_private->xwindow, gc_private->xgc, x, y, text, text_length); } else { XDrawImageString16 (drawable_private->xdisplay, drawable_private->xwindow, gc_private->xgc, x, y, (XChar2b *) text, text_length / 2); } } else if (font->type == GDK_FONT_FONTSET) { XFontSet fontset = (XFontSet) font_private->xfont; XmbDrawImageString (drawable_private->xdisplay, drawable_private->xwindow, fontset, gc_private->xgc, x, y, text, text_length); } else g_error("undefined font type\n"); #endif } static void our_draw_bitmap (GdkDrawable *drawable, GdkGC *gc, GdkPixmap *src, gint xsrc, gint ysrc, gint xdest, gint ydest, gint width, gint height) { GdkWindowPrivate *drawable_private; GdkWindowPrivate *src_private; GdkGCPrivate *gc_private; g_return_if_fail (drawable != NULL); g_return_if_fail (src != NULL); g_return_if_fail (gc != NULL); drawable_private = (GdkWindowPrivate*) drawable; src_private = (GdkWindowPrivate*) src; if (drawable_private->destroyed || src_private->destroyed) return; gc_private = (GdkGCPrivate*) gc; if (width == -1) width = src_private->width; if (height == -1) height = src_private->height; XCopyPlane (drawable_private->xdisplay, src_private->xwindow, drawable_private->xwindow, gc_private->xgc, xsrc, ysrc, width, height, xdest, ydest, 1L); }
