Mercurial > hg > xemacs-beta
annotate tests/gtk/statusbar-test.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 | db7068430402 |
| children | ba07c880114a |
| rev | line source |
|---|---|
|
4709
db7068430402
Add explicit GPL v2 or later notices to Bill Perry's code, where such notices
Jerry James <james@xemacs.org>
parents:
462
diff
changeset
|
1 ;; This file is part of XEmacs. |
|
db7068430402
Add explicit GPL v2 or later notices to Bill Perry's code, where such notices
Jerry James <james@xemacs.org>
parents:
462
diff
changeset
|
2 ;; |
|
db7068430402
Add explicit GPL v2 or later notices to Bill Perry's code, where such notices
Jerry James <james@xemacs.org>
parents:
462
diff
changeset
|
3 ;; XEmacs is free software; you can redistribute it and/or modify it |
|
db7068430402
Add explicit GPL v2 or later notices to Bill Perry's code, where such notices
Jerry James <james@xemacs.org>
parents:
462
diff
changeset
|
4 ;; under the terms of the GNU General Public License as published by the |
|
db7068430402
Add explicit GPL v2 or later notices to Bill Perry's code, where such notices
Jerry James <james@xemacs.org>
parents:
462
diff
changeset
|
5 ;; Free Software Foundation; either version 2, or (at your option) any |
|
db7068430402
Add explicit GPL v2 or later notices to Bill Perry's code, where such notices
Jerry James <james@xemacs.org>
parents:
462
diff
changeset
|
6 ;; later version. |
|
db7068430402
Add explicit GPL v2 or later notices to Bill Perry's code, where such notices
Jerry James <james@xemacs.org>
parents:
462
diff
changeset
|
7 ;; |
|
db7068430402
Add explicit GPL v2 or later notices to Bill Perry's code, where such notices
Jerry James <james@xemacs.org>
parents:
462
diff
changeset
|
8 ;; XEmacs is distributed in the hope that it will be useful, but WITHOUT |
|
db7068430402
Add explicit GPL v2 or later notices to Bill Perry's code, where such notices
Jerry James <james@xemacs.org>
parents:
462
diff
changeset
|
9 ;; ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or |
|
db7068430402
Add explicit GPL v2 or later notices to Bill Perry's code, where such notices
Jerry James <james@xemacs.org>
parents:
462
diff
changeset
|
10 ;; FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License |
|
db7068430402
Add explicit GPL v2 or later notices to Bill Perry's code, where such notices
Jerry James <james@xemacs.org>
parents:
462
diff
changeset
|
11 ;; for more details. |
|
db7068430402
Add explicit GPL v2 or later notices to Bill Perry's code, where such notices
Jerry James <james@xemacs.org>
parents:
462
diff
changeset
|
12 ;; |
|
db7068430402
Add explicit GPL v2 or later notices to Bill Perry's code, where such notices
Jerry James <james@xemacs.org>
parents:
462
diff
changeset
|
13 ;; You should have received a copy of the GNU General Public License |
|
db7068430402
Add explicit GPL v2 or later notices to Bill Perry's code, where such notices
Jerry James <james@xemacs.org>
parents:
462
diff
changeset
|
14 ;; along with XEmacs; see the file COPYING. If not, write to |
|
db7068430402
Add explicit GPL v2 or later notices to Bill Perry's code, where such notices
Jerry James <james@xemacs.org>
parents:
462
diff
changeset
|
15 ;; the Free Software Foundation, Inc., 51 Franklin Street - Fifth Floor, |
|
db7068430402
Add explicit GPL v2 or later notices to Bill Perry's code, where such notices
Jerry James <james@xemacs.org>
parents:
462
diff
changeset
|
16 ;; Boston, MA 02111-1301, USA. */ |
|
db7068430402
Add explicit GPL v2 or later notices to Bill Perry's code, where such notices
Jerry James <james@xemacs.org>
parents:
462
diff
changeset
|
17 |
| 462 | 18 (defvar statusbar-hashtable (make-hashtable 29)) |
| 19 (defvar statusbar-gnome-p nil) | |
| 20 | |
| 21 (defmacro get-frame-statusbar (frame) | |
| 22 `(gethash (or ,frame (selected-frame)) statusbar-hashtable)) | |
| 23 | |
| 24 (defun add-frame-statusbar (frame) | |
| 25 "Stick a GTK (or GNOME) statusbar at the bottom of the frame." | |
| 26 (if (windowp (frame-property frame 'minibuffer)) | |
| 27 (puthash frame (get-frame-statusbar (window-frame (frame-property frame 'minibuffer))) | |
| 28 statusbar-hashtable) | |
| 29 (let ((sbar nil) | |
| 30 (shell (frame-property frame 'shell-widget))) | |
| 31 (if (string-match "Gnome" (gtk-type-name (gtk-object-type shell))) | |
| 32 (progn | |
| 33 (require 'gnome-widgets) | |
| 34 (setq sbar (gnome-appbar-new t t 0) | |
| 35 statusbar-gnome-p t) | |
| 36 (gtk-progress-set-format-string sbar "%p%%") | |
| 37 (gnome-app-set-statusbar shell sbar)) | |
| 38 (setq sbar (gtk-statusbar-new)) | |
| 39 (gtk-box-pack-end (frame-property frame 'container-widget) | |
| 40 sbar nil nil 0)) | |
| 41 (puthash frame sbar statusbar-hashtable)))) | |
| 42 | |
| 43 (add-hook 'create-frame-hook 'add-frame-statusbar) | |
| 44 (add-hook 'delete-frame-hook (lambda (f) | |
| 45 (remhash f statusbar-hashtable))) | |
| 46 | |
| 47 | |
| 48 (defun clear-message (&optional label frame stdout-p no-restore) | |
| 49 (let ((sbar (get-frame-statusbar frame))) | |
| 50 (if sbar | |
| 51 (if statusbar-gnome-p | |
| 52 (gnome-appbar-pop sbar) | |
| 53 (gtk-statusbar-pop sbar 1))))) | |
| 54 | |
| 55 (defun append-message (label message &optional frame stdout-p) | |
| 56 (let ((sbar (get-frame-statusbar frame))) | |
| 57 (if sbar | |
| 58 (if statusbar-gnome-p | |
| 59 (gnome-appbar-push sbar message) | |
| 60 (gtk-statusbar-push sbar 1 message))))) | |
| 61 | |
| 62 (defun progress-display (fmt &optional value &rest args) | |
| 63 "Print a progress gauge and message in the bottom gutter area of the frame. | |
| 64 The arguments are the same as to `format'. | |
| 65 | |
| 66 If the only argument is nil, clear any existing progress gauge." | |
| 67 (let ((sbar (get-frame-statusbar nil))) | |
| 68 (apply 'message fmt args) | |
| 69 (if statusbar-gnome-p | |
| 70 (progn | |
| 71 (gtk-progress-set-show-text (gnome-appbar-get-progress sbar) t) | |
| 72 (gnome-appbar-set-progress sbar (/ value 100.0)) | |
| 73 (gdk-flush))))) | |
| 74 | |
| 75 (defun lprogress-display (label fmt &optional value &rest args) | |
| 76 "Print a progress gauge and message in the bottom gutter area of the frame. | |
| 77 First argument LABEL is an identifier for this progress gauge. The rest of the | |
| 78 arguments are the same as to `format'." | |
| 79 (if (and (null fmt) (null args)) | |
| 80 (prog1 nil | |
| 81 (clear-progress-display label nil)) | |
| 82 (let ((str (apply 'format fmt args))) | |
| 83 (progress-display str value) | |
| 84 str))) | |
| 85 | |
| 86 (defun clear-progress-display (&rest ignored) | |
| 87 (if statusbar-gnome-p | |
| 88 (let* ((sbar (get-frame-statusbar nil)) | |
| 89 (progress (gnome-appbar-get-progress sbar))) | |
| 90 (gnome-appbar-set-progress sbar 0) | |
| 91 (gtk-progress-set-show-text progress nil)))) |