Mercurial > hg > xemacs-beta
view lisp/symbols.el @ 5090:0ca81354c4c7
Further frame-geometry cleanups
-------------------- ChangeLog entries follow: --------------------
man/ChangeLog addition:
2010-03-03 Ben Wing <ben@xemacs.org>
* internals/internals.texi (Intro to Window and Frame Geometry):
* internals/internals.texi (The Paned Area):
* internals/internals.texi (The Displayable Area):
Update to make note of e.g. the fact that the bottom gutter is
actually above the minibuffer.
src/ChangeLog addition:
2010-03-03 Ben Wing <ben@xemacs.org>
* emacs.c:
* emacs.c (assert_equal_failed):
* lisp.h:
* lisp.h (assert_equal):
New fun assert_equal, asserting that two values == each other, and
printing out both values upon failure.
* frame-gtk.c (gtk_initialize_frame_size):
* frame-impl.h:
* frame-impl.h (FRAME_TOP_INTERNAL_BORDER_START):
* frame-impl.h (FRAME_BOTTOM_INTERNAL_BORDER_START):
* frame-impl.h (FRAME_LEFT_INTERNAL_BORDER_START):
* frame-impl.h (FRAME_PANED_TOP_EDGE):
* frame-impl.h (FRAME_NONPANED_SIZE):
* frame-x.c (x_initialize_frame_size):
* frame.c:
* gutter.c (get_gutter_coords):
* gutter.c (calculate_gutter_size):
* gutter.h:
* gutter.h (WINDOW_REAL_TOP_GUTTER_BOUNDS):
* gutter.h (FRAME_TOP_GUTTER_BOUNDS):
* input-method-xlib.c:
* input-method-xlib.c (XIM_SetGeometry):
* redisplay-output.c (clear_left_border):
* redisplay-output.c (clear_right_border):
* redisplay-output.c (redisplay_output_pixmap):
* redisplay-output.c (redisplay_clear_region):
* redisplay-output.c (redisplay_clear_top_of_window):
* redisplay-output.c (redisplay_clear_to_window_end):
* redisplay-xlike-inc.c (XLIKE_clear_frame):
* redisplay.c:
* redisplay.c (UPDATE_CACHE_RETURN):
* redisplay.c (pixel_to_glyph_translation):
* toolbar.c (update_frame_toolbars_geometry):
* window.c (Fwindow_pixel_edges):
Get rid of some redundant macros. Consistently use the
FRAME_TOP_*_START, FRAME_RIGHT_*_END, etc. format. Rename
FRAME_*_BORDER_* to FRAME_*_INTERNAL_BORDER_*. Comment out
FRAME_BOTTOM_* for gutters and the paned area due to the
uncertainty over where the paned area actually begins. (Eventually
we should probably move the gutters outside the minibuffer so that
the paned area is contiguous.) Use FRAME_PANED_* more often in the
code to make things clearer.
Update the diagram to show that the bottom gutter is inside the
minibuffer (!) and that there are "junk boxes" when you have left
and/or right gutters (dead boxes that are mistakenly left uncleared,
unlike the corresponding scrollbar dead boxes). Update the text
appropriately to cover the bottom gutter position, etc.
Rewrite gutter-geometry code to use the FRAME_*_GUTTER_* in place of
equivalent expressions referencing other frame elements, to make the
code more portable in case we move around the gutter location.
Cleanup FRAME_*_GUTTER_BOUNDS() in gutter.h.
Add some #### GEOM! comments where I think code is incorrect --
typically, it wasn't fixed up properly when the gutter was added.
Some cosmetic changes.
author | Ben Wing <ben@xemacs.org> |
---|---|
date | Wed, 03 Mar 2010 05:07:47 -0600 |
parents | 7039e6323819 |
children | 308d34e9f07d |
line wrap: on
line source
;;; symbols.el --- functions for working with symbols and symbol values ;; Copyright (C) 1996 Ben Wing. ;; Maintainer: XEmacs Development Team ;; Keywords: internal ;; 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: ;; Not yet dumped into XEmacs. ;; The idea behind magic variables is that you can specify arbitrary ;; behavior to happen when setting or retrieving a variable's value. The ;; purpose of this is to make it possible to cleanly provide support for ;; obsolete variables (e.g. unread-command-event, which is obsolete for ;; unread-command-events) and variable compatibility ;; (e.g. suggest-key-bindings, the FSF equivalent of ;; teach-extended-commands-p and teach-extended-commands-timeout). ;; There are a large number of functions pertaining to a variable's ;; value: ;; boundp ;; globally-boundp ;; makunbound ;; symbol-value ;; set / setq ;; default-boundp ;; default-value ;; set-default / setq-default ;; make-variable-buffer-local ;; make-local-variable ;; kill-local-variable ;; kill-console-local-variable ;; symbol-value-in-buffer ;; symbol-value-in-console ;; local-variable-p / local-variable-if-set-p ;; Plus some "meta-functions": ;; defvaralias ;; variable-alias ;; indirect-variable ;; I wanted an implementation that: ;; -- would work with all the above functions, but (a) didn't require ;; a separate handler for every function, and (b) would work OK ;; even if more functions are added (e.g. `set-symbol-value-in-buffer' ;; or `makunbound-default') or if more arguments are added to a ;; function. ;; -- avoided consing if at all possible. ;; -- didn't slow down operations on non-magic variables (therefore, ;; storing the magic information using `put' is ruled out). ;; ;;; Code: ;; perhaps this should check whether the functions are bound, so that ;; some handlers can be unspecified. That requires that all functions ;; are defined before `define-magic-variable-handlers' is called, ;; though. ;; perhaps there should be something that combines ;; `define-magic-variable-handlers' with `defvaralias'. (globally-declare-fboundp '(set-magic-variable-handler)) (defun define-magic-variable-handlers (variable handler-class harg) "Set the magic variable handles for VARIABLE to those in HANDLER-CLASS. HANDLER-CLASS should be a symbol. The handlers are constructed by adding the handler type to HANDLER-CLASS. HARG is passed as the HARG value for each of the handlers." (mapcar #'(lambda (htype) (set-magic-variable-handler variable htype (intern (concat (symbol-value handler-class) "-" (symbol-value htype))) harg)) '(get-value set-value other-predicate other-action))) ;; unread-command-event (defun mvh-first-of-list-get-value (sym fun args harg) (car (apply fun harg args))) (defun mvh-first-of-list-set-value (sym value setfun getfun args harg) (apply setfun harg (cons value (apply getfun harg args)) args)) (defun mvh-first-of-list-other-predicate (sym fun args harg) (apply fun harg args)) (defun mvh-first-of-list-other-action (sym fun args harg) (apply fun harg args)) (define-magic-variable-handlers 'unread-command-event 'mvh-first-of-list 'unread-command-events) ;; last-command-char, last-input-char, unread-command-char (defun mvh-char-to-event-get-value (sym fun args harg) (event-to-character (apply fun harg args))) (defun mvh-char-to-event-set-value (sym value setfun getfun args harg) (let ((event (apply getfun harg args))) (if (event-live-p event) nil (setq event (make-event)) (apply setfun harg event args)) (character-to-event value event))) (defun mvh-char-to-event-other-predicate (sym fun args harg) (apply fun harg args)) (defun mvh-char-to-event-other-action (sym fun args harg) (apply fun harg args)) (define-magic-variable-handlers 'last-command-char 'mvh-char-to-event 'last-command-event) (define-magic-variable-handlers 'last-input-char 'mvh-char-to-event 'last-input-event) (define-magic-variable-handlers 'unread-command-char 'mvh-char-to-event 'unread-command-event) ;; suggest-key-bindings (set-magic-variable-handler 'suggest-key-bindings 'get-value #'(lambda (sym fun args harg) (and (apply fun 'teach-extended-commands-p args) (apply fun 'teach-extended-commands-timeout args)))) (set-magic-variable-handler 'suggest-key-bindings 'set-value #'(lambda (sym value setfun getfun args harg) (apply setfun 'teach-extended-commands-p (not (null value)) args) (if value (apply 'teach-extended-commands-timeout (if (numberp value) value 2) args)))) (set-magic-variable-handler 'suggest-key-bindings 'other-action #'(lambda (sym fun args harg) (apply fun 'teach-extended-commands-p args) (apply fun 'teach-extended-commands-timeout args))) (set-magic-variable-handler 'suggest-key-bindings 'other-predicate #'(lambda (sym fun args harg) (and (apply fun 'teach-extended-commands-p args) (apply fun 'teach-extended-commands-timeout args)))) ;;; symbols.el ends here