Mercurial > hg > xemacs-beta
annotate lisp/gui.el @ 5655:b7ae5f44b950
Remove some redundant functions, change others to labels, lisp/
lisp/ChangeLog addition:
2012-05-05 Aidan Kehoe <kehoea@parhasard.net>
Remove some redundant functions; turn other utility functions into
labels, avoiding visibility in the global namespace, and reducing
the size of the dumped binary.
* auto-save.el (auto-save-unhex): Removed.
* auto-save.el (auto-save-unescape-name): Use #'string-to-number
instead of #'auto-save-unhex.
* files.el (save-some-buffers):
* files.el (save-some-buffers-1): Changed to a label.
* files.el (not-modified):
* gui.el (make-gui-button):
* gui.el (gui-button-action): Changed to a label.
* gui.el (insert-gui-button):
* indent.el (indent-for-tab-command):
* indent.el (insert-tab): Changed to a label.
* indent.el (indent-rigidly):
* isearch-mode.el:
* isearch-mode.el (isearch-ring-adjust):
* isearch-mode.el (isearch-ring-adjust1): Changed to a label.
* isearch-mode.el (isearch-pre-command-hook):
* isearch-mode.el (isearch-maybe-frob-keyboard-macros): Changed to
a label.
* isearch-mode.el (isearch-highlight):
* isearch-mode.el (isearch-make-extent): Changed to a label.
* itimer.el:
* itimer.el (itimer-decrement): Removed, replaced uses with decf.
* itimer.el (itimer-increment): Removed, replaced uses with incf.
* itimer.el (itimer-signum): Removed, replaced uses with minusp, plusp.
* itimer.el (itimer-name):
* itimer.el (check-itimer): Removed, replaced with #'check-type calls.
* itimer.el (itimer-value):
* itimer.el (check-itimer-coerce-string): Removed.
* itimer.el (itimer-restart):
* itimer.el (itimer-function):
* itimer.el (check-nonnegative-number): Removed.
* itimer.el (itimer-uses-arguments):
* itimer.el (check-string): Removed.
* itimer.el (itimer-function-arguments):
* itimer.el (itimer-recorded-run-time):
* itimer.el (set-itimer-name):
* itimer.el (set-itimer-value):
* itimer.el (set-itimer-value-internal):
* itimer.el (set-itimer-restart):
* itimer.el (set-itimer-function):
* itimer.el (set-itimer-is-idle):
* itimer.el (set-itimer-recorded-run-time):
* itimer.el (get-itimer):
* itimer.el (delete-itimer):
* itimer.el (start-itimer):
* itimer.el (activate-itimer):
* itimer.el (itimer-edit-set-field):
* itimer.el (itimer-edit-next-field):
* itimer.el (itimer-edit-previous-field):
Use incf, decf, plusp, minusp and the more general argument type
checking macros.
* lib-complete.el:
* lib-complete.el (lib-complete:better-root): Changed to a label.
* lib-complete.el (lib-complete:get-completion-table): Changed to
a label.
* lib-complete.el (read-library-internal): Include labels.
* lib-complete.el (lib-complete:cache-completions): Changed to a
label.
* minibuf.el (read-buffer): Use #'set-difference, don't reinvent it.
* newcomment.el (comment-padright): Use a label instead of
repeating a lambda expression.
* packages.el (package-get-key):
* packages.el (package-get-key-1): Removed, use #'getf instead.
* simple.el (kill-backward-chars): Removed; this isn't used.
* simple.el (what-cursor-position):
(lambda (arg) (format "%S" arg) -> #'prin1-to-string.
* simple.el (debug-print-1): Renamed to #'debug-print.
* simple.el (debug-print): Removed, #'debug-print-1 was equivalent.
* subr.el (integer-to-bit-vector): check-nonnegative-number no
longer available.
* widget.el (define-widget):
* widget.el (define-widget-keywords): Removed, this was long obsolete.
author | Aidan Kehoe <kehoea@parhasard.net> |
---|---|
date | Sat, 05 May 2012 18:42:00 +0100 |
parents | 308d34e9f07d |
children | e9c3fe82127d |
rev | line source |
---|---|
428 | 1 ;;; gui.el --- Basic GUI functions for XEmacs. |
2 | |
3 ;; Copyright (C) 1997 Free Software Foundation, Inc. | |
4 ;; Copyright (C) 1996 Ben Wing | |
5 | |
6 ;; Maintainer: XEmacs Development Team | |
7 ;; Keywords: internal, dumped | |
8 | |
9 ;; This file is part of XEmacs. | |
10 | |
5402
308d34e9f07d
Changed bulk of GPLv2 or later files identified by script
Mats Lidell <matsl@xemacs.org>
parents:
776
diff
changeset
|
11 ;; XEmacs is free software: you can redistribute it and/or modify it |
308d34e9f07d
Changed bulk of GPLv2 or later files identified by script
Mats Lidell <matsl@xemacs.org>
parents:
776
diff
changeset
|
12 ;; under the terms of the GNU General Public License as published by the |
308d34e9f07d
Changed bulk of GPLv2 or later files identified by script
Mats Lidell <matsl@xemacs.org>
parents:
776
diff
changeset
|
13 ;; Free Software Foundation, either version 3 of the License, or (at your |
308d34e9f07d
Changed bulk of GPLv2 or later files identified by script
Mats Lidell <matsl@xemacs.org>
parents:
776
diff
changeset
|
14 ;; option) any later version. |
428 | 15 |
5402
308d34e9f07d
Changed bulk of GPLv2 or later files identified by script
Mats Lidell <matsl@xemacs.org>
parents:
776
diff
changeset
|
16 ;; XEmacs is distributed in the hope that it will be useful, but WITHOUT |
308d34e9f07d
Changed bulk of GPLv2 or later files identified by script
Mats Lidell <matsl@xemacs.org>
parents:
776
diff
changeset
|
17 ;; ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or |
308d34e9f07d
Changed bulk of GPLv2 or later files identified by script
Mats Lidell <matsl@xemacs.org>
parents:
776
diff
changeset
|
18 ;; FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License |
308d34e9f07d
Changed bulk of GPLv2 or later files identified by script
Mats Lidell <matsl@xemacs.org>
parents:
776
diff
changeset
|
19 ;; for more details. |
428 | 20 |
21 ;; You should have received a copy of the GNU General Public License | |
5402
308d34e9f07d
Changed bulk of GPLv2 or later files identified by script
Mats Lidell <matsl@xemacs.org>
parents:
776
diff
changeset
|
22 ;; along with XEmacs. If not, see <http://www.gnu.org/licenses/>. |
428 | 23 |
24 ;;; Synched up with: Not in FSF | |
25 | |
26 ;;; Commentary: | |
27 | |
28 ;; This file is dumped with XEmacs (when window system support is compiled in). | |
29 | |
30 ;;; Code: | |
31 | |
32 (defcustom dialog-frame-plist '(width 60 height 20) | |
33 "Plist of frame properties for initially creating a dialog frame. | |
34 Properties specified here supersede the values given in | |
35 `default-frame-plist'." | |
36 :type 'plist | |
37 :group 'frames) | |
38 | |
39 (defun make-dialog-frame (&optional props parent) | |
40 "Create a frame suitable for use as a dialog box. | |
41 The frame is made a child of PARENT (defaults to the selected frame), | |
42 and has additional properties PROPS, as well as `dialog-frame-plist'. | |
43 Normally it also has no modelines, menubars, or toolbars." | |
44 (or parent (setq parent (selected-frame))) | |
45 (let* ((ftop (frame-property parent 'top)) | |
46 (fleft (frame-property parent 'left)) | |
47 (fwidth (frame-pixel-width parent)) | |
48 (fheight (frame-pixel-height parent)) | |
49 (fonth (font-height (face-font 'default))) | |
50 (fontw (font-width (face-font 'default))) | |
51 (props (append props dialog-frame-plist)) | |
52 (dfheight (plist-get props 'height)) | |
53 (dfwidth (plist-get props 'width)) | |
54 ;; under FVWM at least, if I don't specify the initial position, | |
55 ;; it ends up always at (0, 0). xwininfo doesn't tell me | |
56 ;; that there are any program-specified position hints, so | |
57 ;; it must be an FVWM bug. So just be smashing and position | |
58 ;; in the center of the selected frame. | |
59 (frame (make-frame | |
60 (append props | |
61 `(popup ,parent initially-unmapped t | |
62 menubar-visible-p nil | |
63 has-modeline-p nil | |
64 default-toolbar-visible-p nil | |
65 default-gutter-visible-p nil | |
66 modeline-shadow-thickness 0 | |
67 left ,(+ fleft (- (/ fwidth 2) | |
68 (/ (* dfwidth fontw) | |
69 2))) | |
70 top ,(+ ftop (- (/ fheight 2) | |
71 (/ (* dfheight fonth) | |
72 2)))))))) | |
73 (set-face-foreground 'modeline [default foreground] frame) | |
74 (set-face-background 'modeline [default background] frame) | |
75 (make-frame-visible frame) | |
76 frame)) | |
77 | |
78 (defvar gui-button-shadow-thickness 2) | |
79 | |
80 (defun gui-button-p (object) | |
81 "True if OBJECT is a GUI button." | |
82 (and (vectorp object) | |
83 (> (length object) 0) | |
84 (eq 'button (aref object 0)))) | |
85 | |
86 (make-face 'gui-button-face "Face used for gui buttons") | |
87 (if (not (face-differs-from-default-p 'gui-button-face)) | |
88 (progn | |
89 (set-face-reverse-p 'gui-button-face t) | |
711 | 90 (set-face-background 'gui-button-face '(((win color) . "grey75"))) |
91 (set-face-foreground 'gui-button-face '(((win color) . "black"))))) | |
428 | 92 |
454 | 93 |
428 | 94 (defun make-gui-button (string &optional action user-data) |
95 "Make a GUI button whose label is STRING and whose action is ACTION. | |
96 If the button is inserted in a buffer and then clicked on, and ACTION | |
454 | 97 is non-nil, ACTION will be called with one argument, USER-DATA. |
98 When ACTION is called, the buffer containing the button is made current." | |
5655
b7ae5f44b950
Remove some redundant functions, change others to labels, lisp/
Aidan Kehoe <kehoea@parhasard.net>
parents:
5402
diff
changeset
|
99 (labels |
b7ae5f44b950
Remove some redundant functions, change others to labels, lisp/
Aidan Kehoe <kehoea@parhasard.net>
parents:
5402
diff
changeset
|
100 ((gui-button-action (instance action user-data) |
b7ae5f44b950
Remove some redundant functions, change others to labels, lisp/
Aidan Kehoe <kehoea@parhasard.net>
parents:
5402
diff
changeset
|
101 (let ((domain (image-instance-domain instance))) |
b7ae5f44b950
Remove some redundant functions, change others to labels, lisp/
Aidan Kehoe <kehoea@parhasard.net>
parents:
5402
diff
changeset
|
102 (with-current-buffer (if (windowp domain) |
b7ae5f44b950
Remove some redundant functions, change others to labels, lisp/
Aidan Kehoe <kehoea@parhasard.net>
parents:
5402
diff
changeset
|
103 (window-buffer domain) nil) |
b7ae5f44b950
Remove some redundant functions, change others to labels, lisp/
Aidan Kehoe <kehoea@parhasard.net>
parents:
5402
diff
changeset
|
104 (funcall action user-data))))) |
b7ae5f44b950
Remove some redundant functions, change others to labels, lisp/
Aidan Kehoe <kehoea@parhasard.net>
parents:
5402
diff
changeset
|
105 (vector 'button |
b7ae5f44b950
Remove some redundant functions, change others to labels, lisp/
Aidan Kehoe <kehoea@parhasard.net>
parents:
5402
diff
changeset
|
106 :descriptor string |
b7ae5f44b950
Remove some redundant functions, change others to labels, lisp/
Aidan Kehoe <kehoea@parhasard.net>
parents:
5402
diff
changeset
|
107 :face 'gui-button-face |
b7ae5f44b950
Remove some redundant functions, change others to labels, lisp/
Aidan Kehoe <kehoea@parhasard.net>
parents:
5402
diff
changeset
|
108 :callback-ex `(lambda (image-instance event) |
b7ae5f44b950
Remove some redundant functions, change others to labels, lisp/
Aidan Kehoe <kehoea@parhasard.net>
parents:
5402
diff
changeset
|
109 (gui-button-action image-instance |
b7ae5f44b950
Remove some redundant functions, change others to labels, lisp/
Aidan Kehoe <kehoea@parhasard.net>
parents:
5402
diff
changeset
|
110 (quote ,action) |
b7ae5f44b950
Remove some redundant functions, change others to labels, lisp/
Aidan Kehoe <kehoea@parhasard.net>
parents:
5402
diff
changeset
|
111 (quote ,user-data)))))) |
428 | 112 |
113 (defun insert-gui-button (button &optional pos buffer) | |
114 "Insert GUI button BUTTON at POS in BUFFER." | |
115 (check-argument-type 'gui-button-p button) | |
776 | 116 (if-fboundp 'make-annotation |
117 (make-annotation (make-glyph button) | |
118 pos 'text buffer nil) | |
119 (error 'unimplemented "insert-gui-button requires `annotations' package"))) | |
120 | |
428 | 121 |
122 ;;; gui.el ends here |