Mercurial > hg > xemacs-beta
view lisp/modeline.el @ 5127:a9c41067dd88 ben-lisp-object
more cleanups, terminology clarification, lots of doc work
-------------------- ChangeLog entries follow: --------------------
man/ChangeLog addition:
2010-03-05 Ben Wing <ben@xemacs.org>
* internals/internals.texi (Introduction to Allocation):
* internals/internals.texi (Integers and Characters):
* internals/internals.texi (Allocation from Frob Blocks):
* internals/internals.texi (lrecords):
* internals/internals.texi (Low-level allocation):
Rewrite section on allocation of Lisp objects to reflect the new
reality. Remove references to nonexistent XSETINT and XSETCHAR.
modules/ChangeLog addition:
2010-03-05 Ben Wing <ben@xemacs.org>
* postgresql/postgresql.c (allocate_pgconn):
* postgresql/postgresql.c (allocate_pgresult):
* postgresql/postgresql.h (struct Lisp_PGconn):
* postgresql/postgresql.h (struct Lisp_PGresult):
* ldap/eldap.c (allocate_ldap):
* ldap/eldap.h (struct Lisp_LDAP):
Same changes as in src/ dir. See large log there in ChangeLog,
but basically:
ALLOC_LISP_OBJECT -> ALLOC_NORMAL_LISP_OBJECT
LISP_OBJECT_HEADER -> NORMAL_LISP_OBJECT_HEADER
../hlo/src/ChangeLog addition:
2010-03-05 Ben Wing <ben@xemacs.org>
* alloc.c:
* alloc.c (old_alloc_sized_lcrecord):
* alloc.c (very_old_free_lcrecord):
* alloc.c (copy_lisp_object):
* alloc.c (zero_sized_lisp_object):
* alloc.c (zero_nonsized_lisp_object):
* alloc.c (lisp_object_storage_size):
* alloc.c (free_normal_lisp_object):
* alloc.c (FREE_FIXED_TYPE_WHEN_NOT_IN_GC):
* alloc.c (ALLOC_FROB_BLOCK_LISP_OBJECT):
* alloc.c (Fcons):
* alloc.c (noseeum_cons):
* alloc.c (make_float):
* alloc.c (make_bignum):
* alloc.c (make_bignum_bg):
* alloc.c (make_ratio):
* alloc.c (make_ratio_bg):
* alloc.c (make_ratio_rt):
* alloc.c (make_bigfloat):
* alloc.c (make_bigfloat_bf):
* alloc.c (size_vector):
* alloc.c (make_compiled_function):
* alloc.c (Fmake_symbol):
* alloc.c (allocate_extent):
* alloc.c (allocate_event):
* 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 (Fmake_marker):
* alloc.c (noseeum_make_marker):
* alloc.c (size_string_direct_data):
* alloc.c (make_uninit_string):
* alloc.c (make_string_nocopy):
* alloc.c (mark_lcrecord_list):
* alloc.c (alloc_managed_lcrecord):
* alloc.c (free_managed_lcrecord):
* alloc.c (sweep_lcrecords_1):
* alloc.c (malloced_storage_size):
* buffer.c (allocate_buffer):
* buffer.c (compute_buffer_usage):
* buffer.c (DEFVAR_BUFFER_LOCAL_1):
* buffer.c (nuke_all_buffer_slots):
* buffer.c (common_init_complex_vars_of_buffer):
* buffer.h (struct buffer_text):
* buffer.h (struct buffer):
* bytecode.c:
* bytecode.c (make_compiled_function_args):
* bytecode.c (size_compiled_function_args):
* bytecode.h (struct compiled_function_args):
* casetab.c (allocate_case_table):
* casetab.h (struct Lisp_Case_Table):
* charset.h (struct Lisp_Charset):
* chartab.c (fill_char_table):
* chartab.c (Fmake_char_table):
* chartab.c (make_char_table_entry):
* chartab.c (copy_char_table_entry):
* chartab.c (Fcopy_char_table):
* chartab.c (put_char_table):
* chartab.h (struct Lisp_Char_Table_Entry):
* chartab.h (struct Lisp_Char_Table):
* console-gtk-impl.h (struct gtk_device):
* console-gtk-impl.h (struct gtk_frame):
* console-impl.h (struct console):
* console-msw-impl.h (struct Lisp_Devmode):
* console-msw-impl.h (struct mswindows_device):
* console-msw-impl.h (struct msprinter_device):
* console-msw-impl.h (struct mswindows_frame):
* console-msw-impl.h (struct mswindows_dialog_id):
* console-stream-impl.h (struct stream_console):
* console-stream.c (stream_init_console):
* console-tty-impl.h (struct tty_console):
* console-tty-impl.h (struct tty_device):
* console-tty.c (allocate_tty_console_struct):
* console-x-impl.h (struct x_device):
* console-x-impl.h (struct x_frame):
* console.c (allocate_console):
* console.c (nuke_all_console_slots):
* console.c (DEFVAR_CONSOLE_LOCAL_1):
* console.c (common_init_complex_vars_of_console):
* data.c (make_weak_list):
* data.c (make_weak_box):
* data.c (make_ephemeron):
* database.c:
* database.c (struct Lisp_Database):
* database.c (allocate_database):
* database.c (finalize_database):
* device-gtk.c (allocate_gtk_device_struct):
* device-impl.h (struct device):
* device-msw.c:
* device-msw.c (mswindows_init_device):
* device-msw.c (msprinter_init_device):
* device-msw.c (finalize_devmode):
* device-msw.c (allocate_devmode):
* device-tty.c (allocate_tty_device_struct):
* device-x.c (allocate_x_device_struct):
* device.c:
* device.c (nuke_all_device_slots):
* device.c (allocate_device):
* dialog-msw.c (handle_question_dialog_box):
* elhash.c:
* elhash.c (struct Lisp_Hash_Table):
* elhash.c (finalize_hash_table):
* elhash.c (make_general_lisp_hash_table):
* elhash.c (Fcopy_hash_table):
* elhash.h (htentry):
* emacs.c (main_1):
* eval.c:
* eval.c (size_multiple_value):
* event-stream.c (finalize_command_builder):
* event-stream.c (allocate_command_builder):
* event-stream.c (free_command_builder):
* event-stream.c (event_stream_generate_wakeup):
* event-stream.c (event_stream_resignal_wakeup):
* event-stream.c (event_stream_disable_wakeup):
* event-stream.c (event_stream_wakeup_pending_p):
* events.h (struct Lisp_Timeout):
* events.h (struct command_builder):
* extents-impl.h:
* extents-impl.h (struct extent_auxiliary):
* extents-impl.h (struct extent_info):
* extents-impl.h (set_extent_no_chase_aux_field):
* extents-impl.h (set_extent_no_chase_normal_field):
* extents.c:
* extents.c (gap_array_marker):
* extents.c (gap_array):
* extents.c (extent_list_marker):
* extents.c (extent_list):
* extents.c (stack_of_extents):
* extents.c (gap_array_make_marker):
* extents.c (extent_list_make_marker):
* extents.c (allocate_extent_list):
* extents.c (SLOT):
* extents.c (mark_extent_auxiliary):
* extents.c (allocate_extent_auxiliary):
* extents.c (attach_extent_auxiliary):
* extents.c (size_gap_array):
* extents.c (finalize_extent_info):
* extents.c (allocate_extent_info):
* extents.c (uninit_buffer_extents):
* extents.c (allocate_soe):
* extents.c (copy_extent):
* extents.c (vars_of_extents):
* extents.h:
* faces.c (allocate_face):
* faces.h (struct Lisp_Face):
* faces.h (struct face_cachel):
* file-coding.c:
* file-coding.c (finalize_coding_system):
* file-coding.c (sizeof_coding_system):
* file-coding.c (Fcopy_coding_system):
* file-coding.h (struct Lisp_Coding_System):
* file-coding.h (MARKED_SLOT):
* fns.c (size_bit_vector):
* font-mgr.c:
* font-mgr.c (finalize_fc_pattern):
* font-mgr.c (print_fc_pattern):
* font-mgr.c (Ffc_pattern_p):
* font-mgr.c (Ffc_pattern_create):
* font-mgr.c (Ffc_name_parse):
* font-mgr.c (Ffc_name_unparse):
* font-mgr.c (Ffc_pattern_duplicate):
* font-mgr.c (Ffc_pattern_add):
* font-mgr.c (Ffc_pattern_del):
* font-mgr.c (Ffc_pattern_get):
* font-mgr.c (fc_config_create_using):
* font-mgr.c (fc_strlist_to_lisp_using):
* font-mgr.c (fontset_to_list):
* font-mgr.c (Ffc_config_p):
* font-mgr.c (Ffc_config_up_to_date):
* font-mgr.c (Ffc_config_build_fonts):
* font-mgr.c (Ffc_config_get_cache):
* font-mgr.c (Ffc_config_get_fonts):
* font-mgr.c (Ffc_config_set_current):
* font-mgr.c (Ffc_config_get_blanks):
* font-mgr.c (Ffc_config_get_rescan_interval):
* font-mgr.c (Ffc_config_set_rescan_interval):
* font-mgr.c (Ffc_config_app_font_add_file):
* font-mgr.c (Ffc_config_app_font_add_dir):
* font-mgr.c (Ffc_config_app_font_clear):
* font-mgr.c (size):
* font-mgr.c (Ffc_config_substitute):
* font-mgr.c (Ffc_font_render_prepare):
* font-mgr.c (Ffc_font_match):
* font-mgr.c (Ffc_font_sort):
* font-mgr.c (finalize_fc_config):
* font-mgr.c (print_fc_config):
* font-mgr.h:
* font-mgr.h (struct fc_pattern):
* font-mgr.h (XFC_PATTERN):
* font-mgr.h (struct fc_config):
* font-mgr.h (XFC_CONFIG):
* frame-gtk.c (allocate_gtk_frame_struct):
* frame-impl.h (struct frame):
* frame-msw.c (mswindows_init_frame_1):
* frame-x.c (allocate_x_frame_struct):
* frame.c (nuke_all_frame_slots):
* frame.c (allocate_frame_core):
* gc.c:
* gc.c (GC_CHECK_NOT_FREE):
* glyphs.c (finalize_image_instance):
* glyphs.c (allocate_image_instance):
* glyphs.c (Fcolorize_image_instance):
* glyphs.c (allocate_glyph):
* glyphs.c (unmap_subwindow_instance_cache_mapper):
* glyphs.c (register_ignored_expose):
* glyphs.h (struct Lisp_Image_Instance):
* glyphs.h (struct Lisp_Glyph):
* glyphs.h (struct glyph_cachel):
* glyphs.h (struct expose_ignore):
* gui.c (allocate_gui_item):
* gui.h (struct Lisp_Gui_Item):
* keymap.c (struct Lisp_Keymap):
* keymap.c (make_keymap):
* lisp.h:
* lisp.h (struct Lisp_String_Direct_Data):
* lisp.h (struct Lisp_String_Indirect_Data):
* lisp.h (struct Lisp_Vector):
* lisp.h (struct Lisp_Bit_Vector):
* lisp.h (DECLARE_INLINE_LISP_BIT_VECTOR):
* lisp.h (struct weak_box):
* lisp.h (struct ephemeron):
* lisp.h (struct weak_list):
* lrecord.h:
* lrecord.h (struct lrecord_implementation):
* lrecord.h (MC_ALLOC_CALL_FINALIZER):
* lrecord.h (struct lcrecord_list):
* lstream.c (finalize_lstream):
* lstream.c (sizeof_lstream):
* lstream.c (Lstream_new):
* lstream.c (Lstream_delete):
* lstream.h (struct lstream):
* marker.c:
* marker.c (finalize_marker):
* marker.c (compute_buffer_marker_usage):
* mule-charset.c:
* mule-charset.c (make_charset):
* mule-charset.c (compute_charset_usage):
* objects-impl.h (struct Lisp_Color_Instance):
* objects-impl.h (struct Lisp_Font_Instance):
* objects-tty-impl.h (struct tty_color_instance_data):
* objects-tty-impl.h (struct tty_font_instance_data):
* objects-tty.c (tty_initialize_color_instance):
* objects-tty.c (tty_initialize_font_instance):
* objects.c (finalize_color_instance):
* objects.c (Fmake_color_instance):
* objects.c (finalize_font_instance):
* objects.c (Fmake_font_instance):
* objects.c (reinit_vars_of_objects):
* opaque.c:
* opaque.c (sizeof_opaque):
* opaque.c (make_opaque_ptr):
* opaque.c (free_opaque_ptr):
* opaque.h:
* opaque.h (Lisp_Opaque):
* opaque.h (Lisp_Opaque_Ptr):
* print.c (printing_unreadable_lcrecord):
* print.c (external_object_printer):
* print.c (debug_p4):
* process.c (finalize_process):
* process.c (make_process_internal):
* procimpl.h (struct Lisp_Process):
* rangetab.c (Fmake_range_table):
* rangetab.c (Fcopy_range_table):
* rangetab.h (struct Lisp_Range_Table):
* scrollbar.c:
* scrollbar.c (create_scrollbar_instance):
* scrollbar.c (compute_scrollbar_instance_usage):
* scrollbar.h (struct scrollbar_instance):
* specifier.c (finalize_specifier):
* specifier.c (sizeof_specifier):
* specifier.c (set_specifier_caching):
* specifier.h (struct Lisp_Specifier):
* specifier.h (struct specifier_caching):
* symeval.h:
* symeval.h (SYMBOL_VALUE_MAGIC_P):
* symeval.h (DEFVAR_SYMVAL_FWD):
* symsinit.h:
* syntax.c (init_buffer_syntax_cache):
* syntax.h (struct syntax_cache):
* toolbar.c:
* toolbar.c (allocate_toolbar_button):
* toolbar.c (update_toolbar_button):
* toolbar.h (struct toolbar_button):
* tooltalk.c (struct Lisp_Tooltalk_Message):
* tooltalk.c (make_tooltalk_message):
* tooltalk.c (struct Lisp_Tooltalk_Pattern):
* tooltalk.c (make_tooltalk_pattern):
* ui-gtk.c:
* ui-gtk.c (allocate_ffi_data):
* ui-gtk.c (emacs_gtk_object_finalizer):
* ui-gtk.c (allocate_emacs_gtk_object_data):
* ui-gtk.c (allocate_emacs_gtk_boxed_data):
* ui-gtk.h:
* window-impl.h (struct window):
* window-impl.h (struct window_mirror):
* window.c (finalize_window):
* window.c (allocate_window):
* window.c (new_window_mirror):
* window.c (mark_window_as_deleted):
* window.c (make_dummy_parent):
* window.c (compute_window_mirror_usage):
* window.c (compute_window_usage):
Overall point of this change and previous ones in this repository:
(1) Introduce new, clearer terminology: everything other than int
or char is a "record" object, which comes in two types: "normal
objects" and "frob-block objects". Fix up all places that
referred to frob-block objects as "simple", "basic", etc.
(2) Provide an advertised interface for doing operations on Lisp
objects, including creating new types, that is clean and
consistent in its naming, uses the above-referenced terms and
avoids referencing "lrecords", "old lcrecords", etc., which should
hide under the surface.
(3) Make the size_in_bytes and finalizer methods take a
Lisp_Object rather than a void * for consistency with other methods.
(4) Separate finalizer method into finalizer and disksaver, so
that normal finalize methods don't have to worry about disksaving.
Other specifics:
(1) Renaming:
LISP_OBJECT_HEADER -> NORMAL_LISP_OBJECT_HEADER
ALLOC_LISP_OBJECT -> ALLOC_NORMAL_LISP_OBJECT
implementation->basic_p -> implementation->frob_block_p
ALLOCATE_FIXED_TYPE_AND_SET_IMPL -> ALLOC_FROB_BLOCK_LISP_OBJECT
*FCCONFIG*, wrap_fcconfig -> *FC_CONFIG*, wrap_fc_config
*FCPATTERN*, wrap_fcpattern -> *FC_PATTERN*, wrap_fc_pattern
(the last two changes make the naming of these macros consistent
with the naming of all other macros, since the objects are named
fc-config and fc-pattern with a hyphen)
(2) Lots of documentation fixes in lrecord.h.
(3) Eliminate macros for copying, freeing, zeroing objects, getting
their storage size. Instead, new functions:
zero_sized_lisp_object()
zero_nonsized_lisp_object()
lisp_object_storage_size()
free_normal_lisp_object()
(copy_lisp_object() already exists)
LISP_OBJECT_FROB_BLOCK_P() (actually a macro)
Eliminated:
free_lrecord()
zero_lrecord()
copy_lrecord()
copy_sized_lrecord()
old_copy_lcrecord()
old_copy_sized_lcrecord()
old_zero_lcrecord()
old_zero_sized_lcrecord()
LISP_OBJECT_STORAGE_SIZE()
COPY_SIZED_LISP_OBJECT()
COPY_SIZED_LCRECORD()
COPY_LISP_OBJECT()
ZERO_LISP_OBJECT()
FREE_LISP_OBJECT()
(4) Catch the remaining places where lrecord stuff was used directly
and use the advertised interface, e.g. alloc_sized_lrecord() ->
ALLOC_SIZED_LISP_OBJECT().
(5) Make certain statically-declared pseudo-objects
(buffer_local_flags, console_local_flags) have their lheader
initialized correctly, so things like copy_lisp_object() can work
on them. Make extent_auxiliary_defaults a proper heap object
Vextent_auxiliary_defaults, and make extent auxiliaries dumpable
so that this object can be dumped. allocate_extent_auxiliary()
now just creates the object, and attach_extent_auxiliary()
creates an extent auxiliary and attaches to an extent, like the
old allocate_extent_auxiliary().
(6) Create EXTENT_AUXILIARY_SLOTS macro, similar to the foo-slots.h
files but in a macro instead of a file. The purpose is to avoid
duplication when iterating over all the slots in an extent auxiliary.
Use it.
(7) In lstream.c, don't zero out object after allocation because
allocation routines take care of this.
(8) In marker.c, fix a mistake in computing marker overhead.
(9) In print.c, clean up printing_unreadable_lcrecord(),
external_object_printer() to avoid lots of ifdef NEW_GC's.
(10) Separate toolbar-button allocation into a separate
allocate_toolbar_button() function for use in the example code
in lrecord.h.
author | Ben Wing <ben@xemacs.org> |
---|---|
date | Fri, 05 Mar 2010 04:08:17 -0600 |
parents | 49e17f7182f5 |
children | 668c73e222fd |
line wrap: on
line source
;;; modeline.el --- modeline hackery. ;; Copyright (C) 1988, 1992-1994, 1997 Free Software Foundation, Inc. ;; Copyright (C) 1995, 1996, 2002 Ben Wing. ;; Maintainer: XEmacs Development Team ;; Keywords: extensions, dumped ;; 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, 59 Temple Place - Suite 330, ;; Boston, MA 02111-1307, USA. ;;; Synched up with: Not in FSF. ;;; Commentary: ;; This file is dumped with XEmacs. ;;; Code: ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;;; General mouse modeline stuff ;;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; (defgroup modeline nil "Modeline customizations." :group 'environment) (defcustom modeline-3d-p ;; added for the options menu (let ((thickness (specifier-instance modeline-shadow-thickness))) (and (integerp thickness) (> thickness 0))) "Whether the modeline is displayed with raised, 3-d appearance. This option only has an effect when set using `customize-set-variable', or through the Options menu." :group 'display :type 'boolean :set #'(lambda (var val) (if val (set-specifier modeline-shadow-thickness 2) (set-specifier modeline-shadow-thickness 0)) (redraw-modeline t) (setq modeline-3d-p val)) ) (defcustom drag-divider-event-lag 150 "*The pause (in msecs) between divider drag events before redisplaying. If this value is too small, dragging will be choppy because redisplay cannot keep up. If it is too large, dragging will be choppy because of the explicit redisplay delay specified." :type 'integer ;; #### Fix group. :group 'modeline) (define-obsolete-variable-alias 'drag-modeline-event-lag 'drag-divider-event-lag) (defcustom modeline-click-swaps-buffers nil "*If non-nil, clicking on the modeline changes the current buffer. Click on the left half of the modeline cycles forward through the buffer list and clicking on the right half cycles backward." :type 'boolean :group 'modeline) (defcustom modeline-scrolling-method nil "*If non-nil, dragging the modeline with the mouse may also scroll its text horizontally (vertical motion controls window resizing and horizontal motion controls modeline scrolling). With a value of t, the modeline text is scrolled in the same direction as the mouse motion. With a value of 'scrollbar, the modeline is considered as a scrollbar for its own text, which then moves in the opposite direction. This option should be set using `customize-set-variable'." :type '(choice (const :tag "none" nil) (const :tag "text" t) (const :tag "scrollbar" scrollbar)) :set (lambda (sym val) (set-default sym val) (when (featurep 'x) (cond ((eq val t) (set-glyph-image modeline-pointer-glyph "hand2" 'global 'x)) ((eq val 'scrollbar) (set-glyph-image modeline-pointer-glyph "fleur" 'global 'x)) (t (set-glyph-image modeline-pointer-glyph "sb_v_double_arrow" 'global 'x)))) (when (featurep 'mswindows) (cond ((eq val t) (set-glyph-image modeline-pointer-glyph [mswindows-resource :resource-type cursor :resource-id "SizeAll"] 'global 'mswindows)) ((eq val 'scrollbar) (set-glyph-image modeline-pointer-glyph [mswindows-resource :resource-type cursor :resource-id "Normal"] 'global 'mswindows)) (t (set-glyph-image modeline-pointer-glyph [mswindows-resource :resource-type cursor :resource-id "SizeNS"] 'global 'mswindows))))) :group 'modeline) (defun mouse-drag-modeline (event) "Resize a window by dragging its modeline. This command should be bound to a button-press event in modeline-map. Holding down a mouse button and moving the mouse up and down will make the clicked-on window taller or shorter. See also the variable `modeline-scrolling-method'." (interactive "e") (or (button-press-event-p event) (error "%s must be invoked by a mouse-press" this-command)) (or (event-over-modeline-p event) (error "not over a modeline")) ;; Give the modeline a "pressed" look. --hniksic (let-specifier ((modeline-shadow-thickness (- (specifier-instance modeline-shadow-thickness (event-window event))) (event-window event))) (let ((done nil) (depress-line (event-y event)) (start-event-frame (event-frame event)) (start-event-window (event-window event)) (start-nwindows (count-windows t)) (hscroll-delta (face-width 'modeline)) (start-hscroll (modeline-hscroll (event-window event))) (start-x-pixel (event-x-pixel event)) (last-timestamp 0) default-line-height modeline-height should-enlarge-minibuffer event min-height minibuffer y top bot edges wconfig growth) (setq minibuffer (minibuffer-window start-event-frame) default-line-height (face-height 'default start-event-window) min-height (+ (* window-min-height default-line-height) ;; Don't let the window shrink by a ;; non-multiple of the default line ;; height. (enlarge-window -1) will do ;; this if the difference between the ;; current window height and the minimum ;; window height is less than the height ;; of the default font. These extra ;; lost pixels of height don't come back ;; if you grow the window again. This ;; can make it impossible to drag back ;; to the exact original size, which is ;; disconcerting. (% (window-pixel-height start-event-window) default-line-height)) modeline-height (if (specifier-instance has-modeline-p start-event-window) (+ (face-height 'modeline start-event-window) (* 2 (specifier-instance modeline-shadow-thickness start-event-window))) (* 2 (specifier-instance modeline-shadow-thickness start-event-window)))) (if (not (eq (window-frame minibuffer) start-event-frame)) (setq minibuffer nil)) (if (and (null minibuffer) (one-window-p t)) (error "Attempt to resize sole window")) ;; if this is the bottommost ordinary window, then to ;; move its modeline the minibuffer must be enlarged. (setq should-enlarge-minibuffer (and minibuffer (window-lowest-p start-event-window))) ;; loop reading events (while (not done) (setq event (next-event event)) ;; requeue event and quit if this is a misc-user, eval or ;; keypress event. ;; quit if this is a button press or release event, or if the event ;; occurred in some other frame. ;; drag if this is a mouse motion event and the time ;; between this event and the last event is greater than ;; drag-divider-event-lag. ;; do nothing if this is any other kind of event. (cond ((or (misc-user-event-p event) (key-press-event-p event)) (setq unread-command-events (nconc unread-command-events (list event)) done t)) ((button-release-event-p event) (setq done t) ;; Consider we have a mouse click neither X pos (modeline ;; scroll) nore Y pos (modeline drag) have changed. (and modeline-click-swaps-buffers (= depress-line (event-y event)) (or (not modeline-scrolling-method) (= start-hscroll (modeline-hscroll start-event-window))) (modeline-swap-buffers event))) ((button-event-p event) (setq done t)) ((not (motion-event-p event)) (dispatch-event event)) ((not (eq start-event-frame (event-frame event))) (setq done t)) ((< (abs (- (event-timestamp event) last-timestamp)) drag-divider-event-lag) nil) (t (when modeline-scrolling-method (let ((delta (/ (- (event-x-pixel event) start-x-pixel) hscroll-delta))) (set-modeline-hscroll start-event-window (if (eq modeline-scrolling-method t) (- start-hscroll delta) (+ start-hscroll delta))) )) (setq last-timestamp (event-timestamp event) y (event-y-pixel event) edges (window-pixel-edges start-event-window) top (nth 1 edges) bot (nth 3 edges)) ;; scale back a move that would make the ;; window too short. (cond ((< (- y top (- modeline-height)) min-height) (setq y (+ top min-height (- modeline-height))))) ;; compute size change needed (setq growth (- y bot (/ (- modeline-height) 2)) wconfig (current-window-configuration)) ;; grow/shrink minibuffer? (if should-enlarge-minibuffer (progn ;; yes. scale back shrinkage if it ;; would make the minibuffer less than 1 ;; line tall. ;; ;; also flip the sign of the computed growth, ;; since if we want to grow the window with the ;; modeline we need to shrink the minibuffer ;; and vice versa. (if (and (> growth 0) (< (- (window-pixel-height minibuffer) growth) default-line-height)) (setq growth (- (window-pixel-height minibuffer) default-line-height))) (setq growth (- growth)))) ;; window grow and shrink by lines not pixels, so ;; divide the pixel height by the height of the ;; default face. (setq growth (/ growth default-line-height)) ;; grow/shrink the window (enlarge-window growth nil (if should-enlarge-minibuffer minibuffer start-event-window)) ;; if this window's growth caused another ;; window to be deleted because it was too ;; short, rescind the change. ;; ;; if size change caused space to be stolen ;; from a window above this one, rescind the ;; change, but only if we didn't grow/shrink ;; the minibuffer. minibuffer size changes ;; can cause all windows to shrink... no way ;; around it. (if (or (/= start-nwindows (count-windows t)) (and (not should-enlarge-minibuffer) (/= top (nth 1 (window-pixel-edges start-event-window))))) (set-window-configuration wconfig)))))))) ;; from Bob Weiner (bob_weiner@pts.mot.com) ;; Whether this function should be called is now decided in ;; mouse-drag-modeline - dverna feb. 98 (defun modeline-swap-buffers (event) "Handle mouse clicks on modeline by switching buffers. If click on left half of a frame's modeline, bury current buffer. If click on right half of a frame's modeline, raise bottommost buffer. Arg EVENT is the button release event that occurred on the modeline." (or (event-over-modeline-p event) (error "not over a modeline")) (or (button-release-event-p event) (error "not a button release event")) (if (< (event-x event) (/ (window-width (event-window event)) 2)) ;; On left half of modeline, bury current buffer, ;; displaying second buffer on list. (mouse-bury-buffer event) ;; On right half of modeline, raise and display bottommost ;; buffer in buffer list. (mouse-unbury-buffer event))) (defconst modeline-menu '("Window Commands" ["Delete Window Above" delete-window t] ["Delete Other Windows" delete-other-windows t] ["Split Window Above" split-window-vertically t] ["Split Window Horizontally" split-window-horizontally t] ["Balance Windows" balance-windows t] )) (defun modeline-menu (event) (interactive "e") (popup-menu-and-execute-in-window (cons (format "Window Commands for %S:" (buffer-name (event-buffer event))) (cdr modeline-menu)) event)) (defvar modeline-map (make-sparse-keymap 'modeline-map) "Keymap consulted for mouse-clicks on the modeline of a window. This variable may be buffer-local; its value will be looked up in the buffer of the window whose modeline was clicked upon.") (define-key modeline-map 'button1 'mouse-drag-modeline) ;; button2 selects the window without setting point (define-key modeline-map 'button2 (lambda () (interactive "@"))) (define-key modeline-map 'button3 'modeline-menu) (make-face 'modeline-mousable "Face for mousable portions of the modeline.") (set-face-parent 'modeline-mousable 'modeline nil '(default)) (when (featurep 'window-system) (set-face-foreground 'modeline-mousable "firebrick" nil '(default color win)) (set-face-font 'modeline-mousable [bold] nil '(default mono win)) (set-face-font 'modeline-mousable [bold] nil '(default grayscale win))) (defmacro make-modeline-command-wrapper (command) `#'(lambda (event) (interactive "e") (save-selected-window (select-window (event-window event)) (call-interactively ',(eval command))))) ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;;; Minor modes ;;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; (defvar minor-mode-alist nil "Alist saying how to show minor modes in the modeline. Each element looks like (VARIABLE STRING); STRING is included in the modeline iff VARIABLE's value is non-nil. Actually, STRING need not be a string; any possible modeline element is okay. See `modeline-format'.") ;; Used by C code (lookup-key and friends) but defined here. (defvar minor-mode-map-alist nil "Alist of keymaps to use for minor modes. Each element looks like (VARIABLE . KEYMAP); KEYMAP is used to read key sequences and look up bindings iff VARIABLE's value is non-nil. If two active keymaps bind the same key, the keymap appearing earlier in the list takes precedence.") (make-face 'modeline-mousable-minor-mode "Face for mousable minor-mode strings in the modeline.") (set-face-parent 'modeline-mousable-minor-mode 'modeline-mousable nil '(default)) (when (featurep 'window-system) (set-face-foreground 'modeline-mousable-minor-mode '("green4" "forestgreen") nil '(default color win))) (defvar modeline-mousable-minor-mode-extent (make-extent nil nil) ;; alliteration at its finest. "Extent managing the mousable minor mode modeline strings.") (set-extent-face modeline-mousable-minor-mode-extent 'modeline-mousable-minor-mode) ;; This replaces the idiom ;; ;; (or (assq 'isearch-mode minor-mode-alist) ;; (setq minor-mode-alist ;; (purecopy ;; (append minor-mode-alist ;; '((isearch-mode isearch-mode)))))) (defun add-minor-mode (toggle name &optional keymap after toggle-fun) "Add a minor mode to `minor-mode-alist' and `minor-mode-map-alist'. TOGGLE is a symbol whose value as a variable specifies whether the minor mode is active. NAME is the name that should appear in the modeline. It should either be a string beginning with a space, or a symbol with a similar string as its value. KEYMAP is a keymap to make active when the minor mode is active. AFTER is the toggling symbol used for another minor mode. If AFTER is non-nil, then it is used to position the new mode in the minor-mode alists. TOGGLE-FUN specifies an interactive function that is called to toggle the mode on and off; this affects what happens when button2 is pressed on the mode, and when button3 is pressed somewhere in the list of modes. If TOGGLE-FUN is nil and TOGGLE names an interactive function, TOGGLE is used as the toggle function. Example: (add-minor-mode 'view-minor-mode \" View\" view-mode-map)" (let* ((add-elt #'(lambda (elt sym) (let (place) (cond ((null after) ; add to front (push elt (symbol-value sym))) ((and (not (eq after t)) (setq place (memq (assq after (symbol-value sym)) (symbol-value sym)))) (push elt (cdr place))) (t (set sym (append (symbol-value sym) (list elt)))))) (symbol-value sym))) el toggle-keymap) (if toggle-fun (check-argument-type 'commandp toggle-fun) (when (commandp toggle) (setq toggle-fun toggle))) (when (and toggle-fun name) (setq toggle-keymap (make-sparse-keymap (intern (concat "modeline-minor-" (symbol-name toggle) "-map")))) (define-key toggle-keymap 'button2 ;; defeat the DUMB-ASS byte-compiler, which tries to ;; expand the macro at compile time and fucks up. (eval '(make-modeline-command-wrapper toggle-fun))) (put toggle 'modeline-toggle-function toggle-fun)) (when name (let ((hacked-name (if toggle-keymap (cons (let ((extent (make-extent nil nil))) (set-extent-keymap extent toggle-keymap) (set-extent-property extent 'help-echo (concat "button2 turns off " (if (symbolp toggle-fun) (symbol-name toggle-fun) (symbol-name toggle)))) extent) (cons modeline-mousable-minor-mode-extent name)) name))) (if (setq el (assq toggle minor-mode-alist)) (setcdr el (list hacked-name)) (funcall add-elt (list toggle hacked-name) 'minor-mode-alist)))) (when keymap (if (setq el (assq toggle minor-mode-map-alist)) (setcdr el keymap) (funcall add-elt (cons toggle keymap) 'minor-mode-map-alist))))) (defcustom abbrev-mode-line-string " Abbrev" "*String to display in the modeline when `abbrev-mode' is active. Set this to nil if you don't want a modeline indicator." :type '(choice string (const :tag "none" nil)) :group 'abbrev-mode) (defcustom overwrite-mode-line-string " Ovwrt" "*String to display in the modeline when `overwrite-mode' is active. Set this to nil if you don't want a modeline indicator." :type '(choice string (const :tag "none" nil)) :group 'editing-basics) (defcustom auto-fill-mode-line-string " Fill" "*String to display in the modeline when `auto-fill-mode' is active. Set this to nil if you don't want a modeline indicator." :type '(choice string (const :tag "none" nil)) :group 'fill) (defcustom defining-kbd-macro-mode-line-string " Def" "*String to display in the modeline when `defining-kbd-macro' is active. Set this to nil if you don't want a modeline indicator." :type '(choice string (const :tag "none" nil)) :group 'keyboard) ;; #### TODO: Add `:menu-tag' keyword to add-minor-mode. Or create a ;; separate function to manage the minor mode menu. ;(put 'abbrev-mode :menu-tag "Abbreviation Expansion") (add-minor-mode 'abbrev-mode 'abbrev-mode-line-string) ;; only when visiting a file... (add-minor-mode 'overwrite-mode 'overwrite-mode-line-string) ;(put 'auto-fill-function :menu-tag "Auto Fill") (add-minor-mode 'auto-fill-function 'auto-fill-mode-line-string nil nil 'auto-fill-mode) ;(put 'defining-kbd-macro :menu-tag "Keyboard Macro") (add-minor-mode 'defining-kbd-macro 'defining-kbd-macro-mode-line-string nil nil (lambda () (interactive) (if defining-kbd-macro (progn ;; #### This means to disregard the last event. ;; It is needed because the last recorded ;; event is usually the mouse event that ;; invoked the menu item (and this function), ;; and having it in the macro causes problems. (zap-last-kbd-macro-event) (end-kbd-macro nil)) (start-kbd-macro nil)))) (defun modeline-minor-mode-menu (event) "The menu that pops up when you press `button3' inside the parentheses on the modeline." (interactive "e") (save-excursion (set-buffer (event-buffer event)) (popup-menu-and-execute-in-window (cons "Minor Mode Toggles" (sort (delq nil (mapcar #'(lambda (x) (let* ((toggle-sym (car x)) (toggle-fun (or (get toggle-sym 'modeline-toggle-function) (and (commandp toggle-sym) toggle-sym))) (menu-tag (symbol-name (if (symbolp toggle-fun) toggle-fun toggle-sym)) ;; Here a function should ;; maybe be invoked to ;; beautify the symbol's ;; menu appearance. )) (and toggle-fun (vector menu-tag toggle-fun ;; The following two are wrong ;; because of possible name ;; clashes. ;:active (get toggle-sym :active t) ;:included (get toggle-sym :included t) :style 'toggle :selected (and (boundp toggle-sym) toggle-sym))))) minor-mode-alist)) (lambda (e1 e2) (string< (aref e1 0) (aref e2 0))))) event))) (defvar modeline-minor-mode-map (make-sparse-keymap 'modeline-minor-mode-map) "Keymap consulted for mouse-clicks on the minor-mode modeline list.") (define-key modeline-minor-mode-map 'button3 'modeline-minor-mode-menu) (defvar modeline-minor-mode-extent (make-extent nil nil) "Extent covering the minor mode modeline strings.") (set-extent-face modeline-minor-mode-extent 'modeline-mousable) (set-extent-keymap modeline-minor-mode-extent modeline-minor-mode-map) ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;;; Modeline definition ;;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; (defmacro define-modeline-control (name contents doc-string &optional face help-echo) "Define a modeline control named NAME, a symbol. A modeline control is a section of the modeline whose contents can easily be changed independently of the rest of the modeline, which can have its own color, and which can have its own mouse commands, which apply when the mouse is over the control. Logically, a modeline control should be an object; but we have terrible object support in XEmacs, and so history has given us a series of related variables, which [hopefully] all follow the same conventions. Three variables are created: 1. The variable holding the control specification is called `modeline-NAME', and is automatically buffer-local. 2. The variable holding the extent that covers the control area in the modeline is called `modeline-NAME-extent'. Onto this extent, colors and keymaps (and possibly glyphs?) can be added, and will be noticed by the modeline redisplay code. The attachment of the extent and its control is done somewhere in the modeline specification: either in the main spec in `modeline-format', or in some other control, like this: (cons modeline-NAME-extent 'modeline-NAME) 3. The keymap holding the mousable commands for the control is called `modeline-NAME-map'. This is automatically attached to the extent by this macro. Initial contents of the control are CONTENTS (see `modeline-format' for information about the structure of this contents). DOC-STRING specifies help text that will be placed in the control variable's documentation, indicating what's supposed to be in the control. Optional argument FACE specifies the face of the control's extent. (`modeline-mousable' is a good choice if your control is, in fact, mousable (i.e. it has some mouse commands defined for it). Optional argument HELP-ECHO specifies some help-echo to be displayed when the mouse moves over the control, indicating what mouse strokes are available. " (let ((control-var (intern (format "modeline-%s" name))) (extent-var (intern (format "modeline-%s-extent" name))) (map-var (intern (format "modeline-%s-map" name))) ) `(progn (defconst ,control-var ,contents ,(format "%s The format of the contents of this variable is documented in `modeline-format'. The way the control is displayed can be changed by setting the face of `%s'. Mouse commands for the control can be set using `%s'." doc-string extent-var map-var)) (make-variable-buffer-local ',control-var) (defvar ,extent-var (make-extent nil nil) ,(format "Extent covering the `%s' control." control-var)) (defvar ,map-var (make-sparse-keymap 'modeline-narrowed-map) ,(format "Keymap consulted for mouse-clicks on the `%s' control." control-var)) (set-extent-face ,extent-var ,face) (set-extent-keymap ,extent-var ,map-var) (set-extent-property ,extent-var 'help-echo ,help-echo)))) (put 'define-modeline-control 'lisp-indent-function 2) ;; ------------------------ modeline buffer id ------------------- (defun modeline-buffers-menu (event) (interactive "e") (popup-menu-and-execute-in-window '("Buffers Popup Menu" :filter buffers-menu-filter ["List All Buffers" list-buffers t] "--" ) event)) (define-modeline-control buffer-id-left 'modeline-modified-buffer-highlighted-name ;; "XEmacs:" "Modeline control for left half of buffer ID." 'modeline-mousable "button2 cycles to the previous buffer") (define-modeline-control buffer-id-right 'modeline-modified-buffer-non-highlighted-name ;; " %17b" "Modeline control for right half of buffer ID." nil "button2 cycles to the next buffer") (define-key modeline-buffer-id-left-map 'button2 'mouse-unbury-buffer) (define-key modeline-buffer-id-right-map 'button2 'mouse-bury-buffer) (define-key modeline-buffer-id-left-map 'button3 'modeline-buffers-menu) (define-key modeline-buffer-id-right-map 'button3 'modeline-buffers-menu) (make-face 'modeline-buffer-id "Face for the buffer ID string in the modeline.") (set-face-parent 'modeline-buffer-id 'modeline nil '(default)) (when (featurep 'window-system) (set-face-foreground 'modeline-buffer-id "blue4" nil '(default color win)) (set-face-font 'modeline-buffer-id [bold-italic] nil '(default mono win)) (set-face-font 'modeline-buffer-id [bold-italic] nil '(default grayscale win))) (when (featurep 'tty) (set-face-font 'modeline-buffer-id [bold-italic] nil '(default tty))) (define-modeline-control buffer-id (list (cons modeline-buffer-id-left-extent 'modeline-buffer-id-left) (cons modeline-buffer-id-right-extent 'modeline-buffer-id-right)) "Modeline control for identifying the buffer being displayed. Its default value is (list (cons modeline-buffer-id-left-extent 'modeline-buffer-id-left) (cons modeline-buffer-id-right-extent 'modeline-buffer-id-right)) Major modes that edit things other than ordinary files may change this (e.g. Info, Dired,...)." 'modeline-buffer-id) (defvaralias 'modeline-buffer-identification 'modeline-buffer-id) (defvar modeline-modified-buffer-non-highlighted-name nil) (make-variable-buffer-local 'modeline-modified-buffer-non-highlighted-name) (put 'modeline-modified-buffer-non-highlighted-name 'permanent-local t) (defvar modeline-modified-buffer-highlighted-name nil) (make-variable-buffer-local 'modeline-modified-buffer-highlighted-name) (put 'modeline-modified-buffer-highlighted-name 'permanent-local t) (defvar modeline-recorded-buffer-name nil) (make-variable-buffer-local 'modeline-recorded-buffer-name) (put 'modeline-recorded-buffer-name 'permanent-local t) (defvar modeline-recorded-buffer-file-name nil) (make-variable-buffer-local 'modeline-recorded-buffer-file-name) (put 'modeline-recorded-buffer-file-name 'permanent-local t) (add-hook 'buffer-list-changed-hook 'modeline-update-buffer-names) (defvar modeline-max-buffer-name-size 30) (defun modeline-update-buffer-names (frame) (mapc #'(lambda (buf) (when (or (not (eq (buffer-name buf) (symbol-value-in-buffer 'modeline-recorded-buffer-name buf))) (not (eq (buffer-file-name buf) (symbol-value-in-buffer 'modeline-recorded-buffer-file-name buf)))) ;(dp "processing %s" buf) (with-current-buffer buf (setq modeline-recorded-buffer-name (buffer-name)) (setq modeline-recorded-buffer-file-name (buffer-file-name)) (if (not modeline-recorded-buffer-file-name) (setq modeline-modified-buffer-non-highlighted-name modeline-recorded-buffer-name modeline-modified-buffer-highlighted-name nil) (let ((fn (if (<= (length modeline-recorded-buffer-file-name) modeline-max-buffer-name-size) modeline-recorded-buffer-file-name (concat "..." (substring modeline-recorded-buffer-file-name (- modeline-max-buffer-name-size)))))) (setq modeline-modified-buffer-non-highlighted-name ;; if the filename is very long, the entire ;; directory will get truncated to ;; non-existence. (let ((dir (file-name-directory fn))) (if dir (concat " (" (directory-file-name (file-name-directory fn)) ")") "")) modeline-modified-buffer-highlighted-name (file-name-nondirectory fn)))) (redraw-modeline)))) (buffer-list))) (defcustom modeline-new-buffer-id-format t "Whether the new format for the modeline buffer ID (with directory) is used. This option only has an effect when set using `customize-set-variable', or through the Options menu." :group 'modeline :type 'boolean :set #'(lambda (var val) (if val (progn (setq-default modeline-buffer-id-left 'modeline-modified-buffer-highlighted-name modeline-buffer-id-right 'modeline-modified-buffer-non-highlighted-name) (set-extent-face modeline-buffer-id-left-extent 'modeline-mousable)) (setq-default modeline-buffer-id-left "XEmacs:" modeline-buffer-id-right '(" %17b")) (set-extent-face modeline-buffer-id-left-extent nil)))) ;; ------------------------ other modeline controls ------------------- ;; These are for the sake of minor mode menu. #### All of this is ;; kind of dirty. `add-minor-mode' started out as a simple substitute ;; for (or (assq ...) ...) FSF stuff, but now is used for all kind of ;; stuff. There should perhaps be a separate function to add toggles ;; to the minor-mode-menu. (add-minor-mode 'line-number-mode "") (add-minor-mode 'column-number-mode "") (define-modeline-control coding-system '("%C") "Modeline control for showing current coding system.") ;; added March 7, 2002 (define-obsolete-variable-alias 'modeline-multibyte-status 'modeline-coding-system) (define-modeline-control modified '("--%1*%1+-") "Modeline control for displaying whether current buffer is modified." 'modeline-mousable "button2 toggles the buffer's read-only status") (define-key modeline-modified-map 'button2 (make-modeline-command-wrapper 'modeline-toggle-read-only)) ;;; Added for XEmacs 20.3. Provide wrapper for vc since it may not always be ;;; present, and its symbols are not visible this early in the dump if it ;;; is. (defun modeline-toggle-read-only () "Change whether this buffer is visiting its file read-only. With arg, set read-only iff arg is positive. This function is designed to be called when the read-only indicator on the modeline is clicked. It will call `vc-toggle-read-only' if available, otherwise it will call the usual `toggle-read-only'." (interactive) (if-fboundp 'vc-toggle-read-only (vc-toggle-read-only) (toggle-read-only))) (define-modeline-control line-number (list 'line-number-mode "L%l ") "Modeline control for displaying the line number of point.") (define-modeline-control column-number (list 'column-number-mode "C%c ") "Modeline control for displaying the column number of point.") (define-modeline-control percentage (cons -3 "%p") "Modeline control for displaying percentage of file above point.") (define-modeline-control position-status (cons 15 (list (cons modeline-line-number-extent 'modeline-line-number) (cons modeline-column-number-extent 'modeline-column-number) (cons modeline-percentage-extent 'modeline-percentage))) "Modeline control for providing status about the location of point. Generally includes the line number of point, its column number, and the percentage of the file above point." 'modeline-buffer-id) (defconst modeline-tty-frame-specifier (make-specifier 'boolean)) (add-hook 'create-frame-hook 'modeline-update-tty-frame-specifier) (defun modeline-update-tty-frame-specifier (f) (if (and (eq (frame-type f) 'tty) (> (frame-property f 'frame-number) 1)) (set-specifier modeline-tty-frame-specifier t f))) (define-modeline-control tty-frame-id (list modeline-tty-frame-specifier " [%S]" ) "Modeline control for showing which TTY frame is selected.") (define-modeline-control narrowed '("%n") "Modeline control for displaying whether current buffer is narrowed." 'modeline-mousable "button2 widens the buffer") (define-key modeline-narrowed-map 'button2 (make-modeline-command-wrapper 'widen)) (define-modeline-control process nil "Modeline control for displaying info on process status. Normally nil in most modes, since there is no process to display.") (setq-default modeline-format (list "" (cons modeline-coding-system-extent 'modeline-coding-system) (cons modeline-modified-extent 'modeline-modified) (cons modeline-position-status-extent 'modeline-position-status) (cons modeline-tty-frame-id-extent 'modeline-tty-frame-id) (cons modeline-buffer-id-extent 'modeline-buffer-id) " " 'global-mode-string " %[(" (cons modeline-minor-mode-extent (list "" 'mode-name 'minor-mode-alist)) (cons modeline-narrowed-extent 'modeline-narrowed) (cons modeline-process-extent 'modeline-process) ")%]%-")) ;;; modeline.el ends here