Mercurial > hg > xemacs-beta
view lisp/mode-motion.el @ 5124:623d57b7fbe8 ben-lisp-object
separate regular and disksave finalization, print method fixes.
Create separate disksave method and make the finalize method only be for
actual object finalization, not disksave finalization.
Fix places where 0 was given in place of a printer -- print methods are
mandatory, and internal objects formerly without a print method now must
explicitly specify internal_object_printer().
Change the defn of CONSOLE_LIVE_P to avoid problems in some weird situations.
-------------------- ChangeLog entries follow: --------------------
src/ChangeLog addition:
2010-01-20 Ben Wing <ben@xemacs.org>
* alloc.c:
* alloc.c (very_old_free_lcrecord):
* alloc.c (disksave_object_finalization_1):
* alloc.c (make_lcrecord_list):
* alloc.c (alloc_managed_lcrecord):
* alloc.c (free_managed_lcrecord):
* alloc.c (sweep_lcrecords_1):
* buffer.c:
* bytecode.c:
* bytecode.c (Fcompiled_function_p):
* chartab.c:
* console-impl.h:
* console-impl.h (CONSOLE_TYPE_P):
* console.c:
* console.c (set_quit_events):
* data.c:
* data.c (Fmake_ephemeron):
* database.c:
* database.c (finalize_database):
* database.c (Fclose_database):
* device-msw.c:
* device-msw.c (finalize_devmode):
* device-msw.c (allocate_devmode):
* device.c:
* elhash.c:
* elhash.c (finalize_hash_table):
* eval.c:
* eval.c (bind_multiple_value_limits):
* event-stream.c:
* event-stream.c (finalize_command_builder):
* events.c:
* events.c (mark_event):
* extents.c:
* extents.c (finalize_extent_info):
* extents.c (uninit_buffer_extents):
* faces.c:
* file-coding.c:
* file-coding.c (finalize_coding_system):
* file-coding.h:
* file-coding.h (struct coding_system_methods):
* file-coding.h (struct detector):
* floatfns.c:
* floatfns.c (extract_float):
* fns.c:
* fns.c (Fidentity):
* font-mgr.c (finalize_fc_pattern):
* font-mgr.c (finalize_fc_config):
* frame.c:
* glyphs.c:
* glyphs.c (finalize_image_instance):
* glyphs.c (unmap_subwindow_instance_cache_mapper):
* gui.c:
* gui.c (gui_error):
* keymap.c:
* lisp.h (struct Lisp_Symbol):
* lrecord.h:
* lrecord.h (struct lrecord_implementation):
* lrecord.h (MC_ALLOC_CALL_FINALIZER):
* lrecord.h (MC_ALLOC_CALL_FINALIZER_FOR_DISKSAVE):
* lrecord.h (DEFINE_DUMPABLE_LISP_OBJECT):
* lrecord.h (DEFINE_DUMPABLE_GENERAL_LISP_OBJECT):
* lrecord.h (DEFINE_DUMPABLE_SIZABLE_LISP_OBJECT):
* lrecord.h (DEFINE_DUMPABLE_SIZABLE_GENERAL_LISP_OBJECT):
* lrecord.h (DEFINE_DUMPABLE_FROB_BLOCK_LISP_OBJECT):
* lrecord.h (DEFINE_DUMPABLE_FROB_BLOCK_GENERAL_LISP_OBJECT):
* lrecord.h (DEFINE_DUMPABLE_FROB_BLOCK_SIZABLE_LISP_OBJECT):
* lrecord.h (DEFINE_DUMPABLE_INTERNAL_LISP_OBJECT):
* lrecord.h (DEFINE_DUMPABLE_SIZABLE_INTERNAL_LISP_OBJECT):
* lrecord.h (DEFINE_NODUMP_LISP_OBJECT):
* lrecord.h (DEFINE_NODUMP_GENERAL_LISP_OBJECT):
* lrecord.h (DEFINE_NODUMP_SIZABLE_LISP_OBJECT):
* lrecord.h (DEFINE_NODUMP_SIZABLE_GENERAL_LISP_OBJECT):
* lrecord.h (DEFINE_NODUMP_FROB_BLOCK_LISP_OBJECT):
* lrecord.h (DEFINE_NODUMP_FROB_BLOCK_GENERAL_LISP_OBJECT):
* lrecord.h (DEFINE_NODUMP_FROB_BLOCK_SIZABLE_LISP_OBJECT):
* lrecord.h (DEFINE_NODUMP_INTERNAL_LISP_OBJECT):
* lrecord.h (DEFINE_NODUMP_SIZABLE_INTERNAL_LISP_OBJECT):
* lrecord.h (MAKE_LISP_OBJECT):
* lrecord.h (DEFINE_DUMPABLE_MODULE_LISP_OBJECT):
* lrecord.h (DEFINE_DUMPABLE_MODULE_GENERAL_LISP_OBJECT):
* lrecord.h (DEFINE_DUMPABLE_MODULE_SIZABLE_LISP_OBJECT):
* lrecord.h (DEFINE_DUMPABLE_MODULE_SIZABLE_GENERAL_LISP_OBJECT):
* lrecord.h (DEFINE_NODUMP_MODULE_LISP_OBJECT):
* lrecord.h (DEFINE_NODUMP_MODULE_GENERAL_LISP_OBJECT):
* lrecord.h (DEFINE_NODUMP_MODULE_SIZABLE_LISP_OBJECT):
* lrecord.h (DEFINE_NODUMP_MODULE_SIZABLE_GENERAL_LISP_OBJECT):
* lrecord.h (MAKE_MODULE_LISP_OBJECT):
* lstream.c:
* lstream.c (finalize_lstream):
* lstream.c (disksave_lstream):
* marker.c:
* marker.c (finalize_marker):
* mule-charset.c (make_charset):
* number.c:
* objects.c:
* objects.c (finalize_color_instance):
* objects.c (finalize_font_instance):
* opaque.c:
* opaque.c (make_opaque_ptr):
* process-nt.c:
* process-nt.c (nt_finalize_process_data):
* process-nt.c (nt_deactivate_process):
* process.c:
* process.c (finalize_process):
* procimpl.h (struct process_methods):
* scrollbar.c:
* scrollbar.c (free_scrollbar_instance):
* specifier.c (finalize_specifier):
* symbols.c:
* toolbar.c:
* toolbar.c (Ftoolbar_button_p):
* tooltalk.c:
* ui-gtk.c:
* ui-gtk.c (emacs_gtk_object_finalizer):
* ui-gtk.c (allocate_emacs_gtk_boxed_data):
* window.c:
* window.c (finalize_window):
* window.c (mark_window_as_deleted):
Separate out regular and disksave finalization. Instead of a
FOR_DISKSAVE argument to the finalizer, create a separate object
method `disksaver'. Make `finalizer' have only one argument.
Go through and separate out all finalize methods into finalize
and disksave. Delete lots of thereby redundant disksave checking.
Delete places that signal an error if we attempt to disksave --
all of these objects are non-dumpable and we will get an error
from pdump anyway if we attempt to dump them. After this is done,
only one object remains that has a disksave method -- lstream.
Change DEFINE_*_LISP_OBJECT_WITH_PROPS to DEFINE_*_GENERAL_LISP_OBJECT,
which is used for specifying either property methods or disksave
methods (or in the future, any other less-used methods).
Remove the for_disksave argument to finalize_process_data. Don't
provide a disksaver for processes because no one currently needs
it.
Clean up various places where objects didn't provide a print method.
It was made mandatory in previous changes, and all methods now
either provide their own print method or use internal_object_printer
or external_object_printer.
Change the definition of CONSOLE_LIVE_P to use the contype enum
rather than looking into the conmeths structure -- in some weird
situations with dead objects, the conmeths structure is NULL,
and printing such objects from debug_print() will crash if we try
to look into the conmeths structure.
author | Ben Wing <ben@xemacs.org> |
---|---|
date | Wed, 20 Jan 2010 07:05:57 -0600 |
parents | 3ecd8885ac67 |
children | 308d34e9f07d |
line wrap: on
line source
;;; mode-motion.el --- Mode-specific mouse-highlighting of text. ;; Copyright (C) 1992, 1993, 1997 Free Software Foundation, Inc. ;; Maintainer: XEmacs Development Team ;; Keywords: internal, mouse, 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 (when window system support is compiled in). ;;; Code: (defvar mode-motion-hook nil "Function or functions which are called whenever the mouse moves. Each function must take a single argument of the motion event. You should normally use this rather than `mouse-motion-handler', which does some additional window-system-dependent things. This hook is local to every buffer, and should normally be set up by major-modes which want to use special highlighting. Every time the mouse moves over a window, the mode-motion-hook of the buffer of that window is run.") (make-variable-buffer-local 'mode-motion-hook) (defvar mode-motion-extent nil) (make-variable-buffer-local 'mode-motion-extent) (defvar mode-motion-help-echo-string nil "String to be added as the 'help-echo property of the mode-motion extent. In order for this to work, you need to add the hook function `mode-motion-add-help-echo' to the mode-motion hook. If this is a function, it will be called with one argument (the event) and should return a string to be added. This variable is local to every buffer.") (make-variable-buffer-local 'mode-motion-help-echo-string) (defun mode-motion-ensure-extent-ok (event) (let ((buffer (event-buffer event))) (if (and (extent-live-p mode-motion-extent) (eq buffer (extent-object mode-motion-extent))) nil (setq mode-motion-extent (make-extent nil nil buffer)) (set-extent-property mode-motion-extent 'mouse-face 'highlight)))) (defun mode-motion-highlight-internal (event backward forward) (let* ((buffer (event-buffer event)) (point (and buffer (event-point event)))) (if (and buffer (not (eq buffer mouse-grabbed-buffer))) ;; #### ack!! Too many calls to save-window-excursion / ;; save-excursion (x-track-pointer calls, so does ;; minibuf-mouse-tracker ...) This needs to be looked ;; into. It's complicated by the fact that sometimes ;; a mode-motion-hook might really want to change ;; the point. ;; ;; #### The save-excursion must come before the ;; save-window-excursion in order to function properly. I ;; haven't given this much thought. Is it a bug that this ;; ordering is necessary or is it correct behavior? (save-excursion (save-window-excursion (set-buffer buffer) (mode-motion-ensure-extent-ok event) (if point ;; Use save-excursion here to avoid ;; save-window-excursion seeing a change in ;; window point's value which would make the ;; display code do a whole lot of useless work ;; and making the display flicker horribly. (save-excursion (goto-char point) (condition-case nil (funcall backward) (error nil)) (setq point (point)) (condition-case nil (funcall forward) (error nil)) (if (eq point (point)) (detach-extent mode-motion-extent) (set-extent-endpoints mode-motion-extent point (point)))) ;; not over text; zero the extent. (detach-extent mode-motion-extent))))))) (defun mode-motion-highlight-line (event) "For use as the value of `mode-motion-hook' -- highlight line under mouse." (mode-motion-highlight-internal event 'beginning-of-line 'end-of-line)) (defun mode-motion-highlight-word (event) "For use as the value of `mode-motion-hook' -- highlight word under mouse." (mode-motion-highlight-internal event #'(lambda () (default-mouse-track-beginning-of-word nil)) #'(lambda () (default-mouse-track-end-of-word nil)))) (defun mode-motion-highlight-symbol (event) "For use as the value of `mode-motion-hook' -- highlight symbol under mouse." (mode-motion-highlight-internal event #'(lambda () (default-mouse-track-beginning-of-word t)) #'(lambda () (default-mouse-track-end-of-word t)))) (defun mode-motion-highlight-sexp (event) "For use as the value of `mode-motion-hook' -- highlight form under mouse." (mode-motion-highlight-internal event #'(lambda () (if (= (char-syntax (following-char)) ?\() nil (goto-char (scan-sexps (point) -1)))) #'(lambda () (if (= (char-syntax (following-char)) ?\)) (forward-char 1)) (goto-char (scan-sexps (point) 1))))) (defun mode-motion-add-help-echo (event) "For use as the value of `mode-motion-hook' -- add a 'help-echo property. This causes the string in the 'help-echo property to be displayed when the mouse moves over the extent. See `mode-motion-help-echo-string' for documentation on how to control the string that is added." (mode-motion-ensure-extent-ok event) (let ((string (cond ((null mode-motion-help-echo-string) nil) ((stringp mode-motion-help-echo-string) mode-motion-help-echo-string) (t (funcall mode-motion-help-echo-string event))))) (if (stringp string) (set-extent-property mode-motion-extent 'help-echo string)))) (provide 'mode-motion) ;;; mode-motion.el ends here