Mercurial > hg > xemacs-beta
view lisp/gui.el @ 5015:d95c102a96d3
cleanups for specifier font stages, from ben-unicode-internal (preparation for eliminating shadowed warnings)
-------------------- ChangeLog entries follow: --------------------
src/ChangeLog addition:
2010-02-08 Ben Wing <ben@xemacs.org>
* faces.c:
* faces.c (face_property_matching_instance):
* faces.c (ensure_face_cachel_contains_charset):
* faces.h (FACE_FONT):
* lisp.h:
* lisp.h (enum font_specifier_matchspec_stages):
* objects-msw.c:
* objects-msw.c (mswindows_font_spec_matches_charset):
* objects-msw.c (mswindows_find_charset_font):
* objects-tty.c:
* objects-tty.c (tty_font_spec_matches_charset):
* objects-tty.c (tty_find_charset_font):
* objects-xlike-inc.c:
* objects-xlike-inc.c (XFUN):
* objects-xlike-inc.c (xft_find_charset_font):
* objects.c:
* objects.c (font_instantiate):
* objects.c (FROB):
* specifier.c:
* specifier.c (charset_matches_specifier_tag_set_p):
* specifier.c (call_charset_predicate):
* specifier.c (define_specifier_tag):
* specifier.c (Fdefine_specifier_tag):
* specifier.c (setup_charset_initial_specifier_tags):
* specifier.c (specifier_instance_from_inst_list):
* specifier.c (FROB):
* specifier.c (vars_of_specifier):
* specifier.h:
Rename the specifier-font-matching stages in preparation for
eliminating shadowed warnings, some other related fixes from
ben-unicode-internal.
1. Rename raw enums:
initial -> STAGE_INITIAL
final -> STAGE_FINAL
impossible -> NUM_MATCHSPEC_STAGES
2. Move `enum font_specifier_matchspec_stages' from
specifier.h to lisp.h.
3. Whitespace changes to match coding standards.
4. Eliminate unused second argument STAGE in charset predicates
that don't use it -- the code that calls the charset predicates
is now smart enough to supply the right number of arguments
automatically.
5. Add some long(ish) comments and authorial notices, esp. in
objects.c.
6. In specifier.c, change Vcharset_tag_lists from a vector over
leading bytes to a hash table over charsets. This change is
unnecessary currently but doesn't hurt and will be required
when we merge in Unicode-internal.
7. In specifier.c, extract out the code that calls charset predicates
into a function call_charset_predicate().
author | Ben Wing <ben@xemacs.org> |
---|---|
date | Mon, 08 Feb 2010 16:51:25 -0600 |
parents | 79940b592197 |
children | 308d34e9f07d |
line wrap: on
line source
;;; gui.el --- Basic GUI functions for XEmacs. ;; Copyright (C) 1997 Free Software Foundation, Inc. ;; Copyright (C) 1996 Ben Wing ;; Maintainer: XEmacs Development Team ;; Keywords: internal, 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: (defcustom dialog-frame-plist '(width 60 height 20) "Plist of frame properties for initially creating a dialog frame. Properties specified here supersede the values given in `default-frame-plist'." :type 'plist :group 'frames) (defun make-dialog-frame (&optional props parent) "Create a frame suitable for use as a dialog box. The frame is made a child of PARENT (defaults to the selected frame), and has additional properties PROPS, as well as `dialog-frame-plist'. Normally it also has no modelines, menubars, or toolbars." (or parent (setq parent (selected-frame))) (let* ((ftop (frame-property parent 'top)) (fleft (frame-property parent 'left)) (fwidth (frame-pixel-width parent)) (fheight (frame-pixel-height parent)) (fonth (font-height (face-font 'default))) (fontw (font-width (face-font 'default))) (props (append props dialog-frame-plist)) (dfheight (plist-get props 'height)) (dfwidth (plist-get props 'width)) ;; under FVWM at least, if I don't specify the initial position, ;; it ends up always at (0, 0). xwininfo doesn't tell me ;; that there are any program-specified position hints, so ;; it must be an FVWM bug. So just be smashing and position ;; in the center of the selected frame. (frame (make-frame (append props `(popup ,parent initially-unmapped t menubar-visible-p nil has-modeline-p nil default-toolbar-visible-p nil default-gutter-visible-p nil modeline-shadow-thickness 0 left ,(+ fleft (- (/ fwidth 2) (/ (* dfwidth fontw) 2))) top ,(+ ftop (- (/ fheight 2) (/ (* dfheight fonth) 2)))))))) (set-face-foreground 'modeline [default foreground] frame) (set-face-background 'modeline [default background] frame) (make-frame-visible frame) frame)) (defvar gui-button-shadow-thickness 2) (defun gui-button-p (object) "True if OBJECT is a GUI button." (and (vectorp object) (> (length object) 0) (eq 'button (aref object 0)))) (make-face 'gui-button-face "Face used for gui buttons") (if (not (face-differs-from-default-p 'gui-button-face)) (progn (set-face-reverse-p 'gui-button-face t) (set-face-background 'gui-button-face '(((win color) . "grey75"))) (set-face-foreground 'gui-button-face '(((win color) . "black"))))) (defun gui-button-action (instance action user-data) (let ((domain (image-instance-domain instance))) (with-current-buffer (if (windowp domain) (window-buffer domain) nil) (funcall action user-data)))) (defun make-gui-button (string &optional action user-data) "Make a GUI button whose label is STRING and whose action is ACTION. If the button is inserted in a buffer and then clicked on, and ACTION is non-nil, ACTION will be called with one argument, USER-DATA. When ACTION is called, the buffer containing the button is made current." (vector 'button :descriptor string :face 'gui-button-face :callback-ex `(lambda (image-instance event) (gui-button-action image-instance (quote ,action) (quote ,user-data))))) (defun insert-gui-button (button &optional pos buffer) "Insert GUI button BUTTON at POS in BUFFER." (check-argument-type 'gui-button-p button) (if-fboundp 'make-annotation (make-annotation (make-glyph button) pos 'text buffer nil) (error 'unimplemented "insert-gui-button requires `annotations' package"))) ;;; gui.el ends here