Mercurial > hg > xemacs-beta
view lisp/wid-browse.el @ 5043:d0c14ea98592
various frame-geometry fixes
-------------------- ChangeLog entries follow: --------------------
src/ChangeLog addition:
2010-02-15 Ben Wing <ben@xemacs.org>
* EmacsFrame.c:
* EmacsFrame.c (EmacsFrameResize):
* console-msw-impl.h:
* console-msw-impl.h (struct mswindows_frame):
* console-msw-impl.h (FRAME_MSWINDOWS_TARGET_RECT):
* device-tty.c:
* device-tty.c (tty_asynch_device_change):
* event-msw.c:
* event-msw.c (mswindows_wnd_proc):
* faces.c (Fface_list):
* faces.h:
* frame-gtk.c:
* frame-gtk.c (gtk_set_initial_frame_size):
* frame-gtk.c (gtk_set_frame_size):
* frame-msw.c:
* frame-msw.c (mswindows_init_frame_1):
* frame-msw.c (mswindows_set_frame_size):
* frame-msw.c (mswindows_size_frame_internal):
* frame-msw.c (msprinter_init_frame_3):
* frame.c:
* frame.c (enum):
* frame.c (Fmake_frame):
* frame.c (adjust_frame_size):
* frame.c (store_minibuf_frame_prop):
* frame.c (Fframe_property):
* frame.c (Fframe_properties):
* frame.c (Fframe_displayable_pixel_height):
* frame.c (Fframe_displayable_pixel_width):
* frame.c (internal_set_frame_size):
* frame.c (Fset_frame_height):
* frame.c (Fset_frame_pixel_height):
* frame.c (Fset_frame_displayable_pixel_height):
* frame.c (Fset_frame_width):
* frame.c (Fset_frame_pixel_width):
* frame.c (Fset_frame_displayable_pixel_width):
* frame.c (Fset_frame_size):
* frame.c (Fset_frame_pixel_size):
* frame.c (Fset_frame_displayable_pixel_size):
* frame.c (frame_conversion_internal_1):
* frame.c (get_frame_displayable_pixel_size):
* frame.c (change_frame_size_1):
* frame.c (change_frame_size):
* frame.c (generate_title_string):
* frame.h:
* gtk-xemacs.c:
* gtk-xemacs.c (gtk_xemacs_size_request):
* gtk-xemacs.c (gtk_xemacs_size_allocate):
* gtk-xemacs.c (gtk_xemacs_paint):
* gutter.c:
* gutter.c (update_gutter_geometry):
* redisplay.c (end_hold_frame_size_changes):
* redisplay.c (redisplay_frame):
* toolbar.c:
* toolbar.c (update_frame_toolbars_geometry):
* window.c:
* window.c (frame_pixsize_valid_p):
* window.c (check_frame_size):
Various fixes to frame geometry to make it a bit easier to understand
and fix some bugs.
1. IMPORTANT: Some renamings. Will need to be applied carefully to
the carbon repository, in the following order:
-- pixel_to_char_size -> pixel_to_frame_unit_size
-- char_to_pixel_size -> frame_unit_to_pixel_size
-- pixel_to_real_char_size -> pixel_to_char_size
-- char_to_real_pixel_size -> char_to_pixel_size
-- Reverse second and third arguments of change_frame_size() and
change_frame_size_1() to try to make functions consistent in
putting width before height.
-- Eliminate old round_size_to_char, because it didn't really
do anything differently from round_size_to_real_char()
-- round_size_to_real_char -> round_size_to_char; any places that
called the old round_size_to_char should just call the new one.
2. IMPORTANT FOR CARBON: The set_frame_size() method is now passed
sizes in "frame units", like all other frame-sizing functions,
rather than some hacked-up combination of char-cell units and
total pixel size. This only affects window systems that use
"pixelated geometry", and I'm not sure if Carbon is one of them.
MS Windows is pixelated, X and GTK are not. For pixelated-geometry
systems, the size in set_frame_size() is in displayable pixels
rather than total pixels and needs to be converted appropriately;
take a look at the changes made to mswindows_set_frame_size()
method if necessary.
3. Add a big long comment in frame.c describing how frame geometry
works.
4. Remove MS Windows-specific character height and width fields,
duplicative and unused.
5. frame-displayable-pixel-* and set-frame-displayable-pixel-*
didn't use to work on MS Windows, but they do now.
6. In general, clean up the handling of "pixelated geometry" so
that fewer functions have to worry about this. This is really
an abomination that should be removed entirely but that will
have to happen later. Fix some buggy code in
frame_conversion_internal() that happened to "work" because it
was countered by oppositely buggy code in change_frame_size().
7. Clean up some frame-size code in toolbar.c and use functions
already provided in frame.c instead of rolling its own.
8. Fix check_frame_size() in window.c, which formerly didn't take
pixelated geometry into account.
author | Ben Wing <ben@xemacs.org> |
---|---|
date | Mon, 15 Feb 2010 22:14:11 -0600 |
parents | 023b83f4e54b |
children | 308d34e9f07d |
line wrap: on
line source
;;; wid-browse.el --- Functions for browsing widgets. ;; ;; Copyright (C) 1997 Free Software Foundation, Inc. ;; ;; Author: Per Abrahamsen <abraham@dina.kvl.dk> ;; Keywords: extensions ;; Version: 1.9960 ;; X-URL: http://www.dina.kvl.dk/~abraham/custom/ ;; 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. ;;; Commentary: ;; ;; Widget browser. See `widget.el'. ;;; Code: (require 'easymenu) (require 'custom) (require 'wid-edit) (eval-when-compile (require 'cl)) (defgroup widget-browse nil "Customization support for browsing widgets." :group 'widgets) ;;; The Mode. (defvar widget-browse-mode-map nil "Keymap for `widget-browse-mode'.") (unless widget-browse-mode-map (setq widget-browse-mode-map (make-sparse-keymap)) (set-keymap-parent widget-browse-mode-map widget-keymap) (define-key widget-browse-mode-map "q" 'bury-buffer)) (easy-menu-define widget-browse-mode-customize-menu widget-browse-mode-map "Menu used in widget browser buffers." (customize-menu-create 'widgets)) (easy-menu-define widget-browse-mode-menu widget-browse-mode-map "Menu used in widget browser buffers." '("Widget" ["Browse" widget-browse t] ["Browse At" widget-browse-at t])) (defcustom widget-browse-mode-hook nil "Hook called when entering widget-browse-mode." :type 'hook :group 'widget-browse) (defun widget-browse-mode () "Major mode for widget browser buffers. The following commands are available: \\[widget-forward] Move to next button or editable field. \\[widget-backward] Move to previous button or editable field. \\[widget-button-click] Activate button under the mouse pointer. \\[widget-button-press] Activate button under point. Entry to this mode calls the value of `widget-browse-mode-hook' if that value is non-nil." (kill-all-local-variables) (setq major-mode 'widget-browse-mode mode-name "Widget") (use-local-map widget-browse-mode-map) (easy-menu-add widget-browse-mode-customize-menu) (easy-menu-add widget-browse-mode-menu) (run-hooks 'widget-browse-mode-hook)) ;;; Commands. ;;;###autoload (defun widget-browse-at (pos) "Browse the widget under point." (interactive "d") (let* ((field (get-char-property pos 'field)) (button (get-char-property pos 'button)) (doc (get-char-property pos 'widget-doc)) (text (cond (field "This is an editable text area.") (button "This is an active area.") (doc "This is documentation text.") (t "This is unidentified text."))) (widget (or field button doc))) (when widget (widget-browse widget)) (message text))) (defvar widget-browse-history nil) ;;;###autoload (defun widget-browse (widget) "Create a widget browser for WIDGET." (interactive (list (completing-read "Widget: " obarray (lambda (symbol) (get symbol 'widget-type)) t nil 'widget-browse-history))) (if (stringp widget) (setq widget (intern widget))) (unless (if (symbolp widget) (get widget 'widget-type) (and (consp widget) (get (widget-type widget) 'widget-type))) (error "Not a widget.")) ;; Create the buffer. (if (symbolp widget) (let ((buffer (format "*Browse %s Widget*" widget))) (kill-buffer (get-buffer-create buffer)) (switch-to-buffer (get-buffer-create buffer))) (kill-buffer (get-buffer-create "*Browse Widget*")) (switch-to-buffer (get-buffer-create "*Browse Widget*"))) (widget-browse-mode) ;; Quick way to get out. ;; (widget-create 'push-button ;; :action (lambda (widget &optional event) ;; (bury-buffer)) ;; "Quit") ;; (widget-insert "\n") ;; Top text indicating whether it is a class or object browser. (if (listp widget) (widget-insert "Widget object browser.\n\nClass: ") (widget-insert "Widget class browser.\n\n") (widget-create 'widget-browse :format "%[%v%]\n%d" :doc (get widget 'widget-documentation) widget) (unless (eq (preceding-char) ?\n) (widget-insert "\n")) (widget-insert "\nSuper: ") (setq widget (get widget 'widget-type))) ;; Now show the attributes. (let ((name (car widget)) (items (cdr widget)) key value printer) (widget-create 'widget-browse :format "%[%v%]" name) (widget-insert "\n") (while items (setq key (nth 0 items) value (nth 1 items) printer (or (get key 'widget-keyword-printer) 'widget-browse-sexp) items (cdr (cdr items))) (widget-insert "\n" (symbol-name key) "\n\t") (funcall printer widget key value) (widget-insert "\n"))) (widget-setup) (goto-char (point-min))) ;;;###autoload (defun widget-browse-other-window (&optional widget) "Show widget browser for WIDGET in other window." (interactive) (let ((window (selected-window))) (switch-to-buffer-other-window "*Browse Widget*") (if widget (widget-browse widget) (call-interactively 'widget-browse)) (select-window window))) ;;; The `widget-browse' Widget. (define-widget 'widget-browse 'push-button "Button for creating a widget browser. The :value of the widget shuld be the widget to be browsed." :format "%[[%v]%]" :value-create 'widget-browse-value-create :action 'widget-browse-action) (defun widget-browse-action (widget &optional event) ;; Create widget browser for WIDGET's :value. (widget-browse (widget-get widget :value))) (defun widget-browse-value-create (widget) ;; Insert type name. (let ((value (widget-get widget :value))) (cond ((symbolp value) (insert (symbol-name value))) ((consp value) (insert (symbol-name (widget-type value)))) (t (insert "strange"))))) ;;; Keyword Printer Functions. (defun widget-browse-widget (widget key value) "Insert description of WIDGET's KEY VALUE. VALUE is assumed to be a widget." (widget-create 'widget-browse value)) (defun widget-browse-widgets (widget key value) "Insert description of WIDGET's KEY VALUE. VALUE is assumed to be a list of widgets." (while value (widget-create 'widget-browse (car value)) (setq value (cdr value)) (when value (widget-insert " ")))) (defun widget-browse-sexp (widget key value) "Insert description of WIDGET's KEY VALUE. Nothing is assumed about value." (let ((pp (condition-case signal (declare-fboundp (pp-to-string value)) (error (prin1-to-string signal))))) (when (string-match "\n\\'" pp) (setq pp (substring pp 0 (1- (length pp))))) (if (cond ((string-match "\n" pp) nil) ((> (length pp) (- (window-width) (current-column))) nil) (t t)) (widget-insert pp) (widget-create 'push-button :tag "show" :action (lambda (widget &optional event) (with-output-to-temp-buffer "*Pp Eval Output*" (princ (widget-get widget :value)))) pp)))) (defun widget-browse-sexps (widget key value) "Insert description of WIDGET's KEY VALUE. VALUE is assumed to be a list of widgets." (let ((target (current-column))) (while value (widget-browse-sexp widget key (car value)) (setq value (cdr value)) (when value (widget-insert "\n" (make-string target ?\ )))))) ;;; Keyword Printers. (put :parent 'widget-keyword-printer 'widget-browse-widget) (put :children 'widget-keyword-printer 'widget-browse-widgets) (put :buttons 'widget-keyword-printer 'widget-browse-widgets) (put :button 'widget-keyword-printer 'widget-browse-widget) (put :args 'widget-keyword-printer 'widget-browse-sexps) ;;; Widget Minor Mode. (defvar widget-minor-mode nil "I non-nil, we are in Widget Minor Mode.") (make-variable-buffer-local 'widget-minor-mode) (defvar widget-minor-mode-map nil "Keymap used in Widget Minor Mode.") (unless widget-minor-mode-map (setq widget-minor-mode-map (make-sparse-keymap)) (set-keymap-parent widget-minor-mode-map widget-keymap)) ;;;###autoload (defun widget-minor-mode (&optional arg) "Togle minor mode for traversing widgets. With arg, turn widget mode on if and only if arg is positive." (interactive "P") (cond ((null arg) (setq widget-minor-mode (not widget-minor-mode))) ((<= arg 0) (setq widget-minor-mode nil)) (t (setq widget-minor-mode t))) (force-mode-line-update)) (add-to-list 'minor-mode-alist '(widget-minor-mode " Widget")) (add-to-list 'minor-mode-map-alist (cons 'widget-minor-mode widget-minor-mode-map)) ;;; The End: (provide 'wid-browse) ;; wid-browse.el ends here