annotate lisp/glade.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 7039e6323819
children 308d34e9f07d
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
462
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
1 ;;; glade.el --- Import libglade functions into XEmacs
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
2
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
3 ;; Copyright (C) 2000 Free Software Foundation
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
4
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
5 ;; Maintainer: William Perry <wmperry@gnu.org>
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
6 ;; Keywords: extensions, dumped
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
7
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
8 ;; This file is part of XEmacs.
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
9
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
10 ;; XEmacs is free software; you can redistribute it and/or modify it
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
11 ;; under the terms of the GNU General Public License as published by
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
12 ;; the Free Software Foundation; either version 2, or (at your option)
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
13 ;; any later version.
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
14
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
15 ;; XEmacs is distributed in the hope that it will be useful, but
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
16 ;; WITHOUT ANY WARRANTY; without even the implied warranty of
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
17 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
18 ;; General Public License for more details.
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
19
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
20 ;; You should have received a copy of the GNU General Public License
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
21 ;; along with XEmacs; see the file COPYING. If not, write to the Free
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
22 ;; Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
23 ;; 02111-1307, USA.
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
24
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
25 ;;; Synched up with: Not in FSF
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
26
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
27 ;;; Commentary:
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
28
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
29 ;; This file is dumped with XEmacs (if glade was detected)
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
30
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
31 (eval-and-compile
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
32 (require 'gtk-ffi))
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
33
502
7039e6323819 [xemacs-hg @ 2001-05-04 22:41:46 by ben]
ben
parents: 462
diff changeset
34 (globally-declare-fboundp
7039e6323819 [xemacs-hg @ 2001-05-04 22:41:46 by ben]
ben
parents: 462
diff changeset
35 '(gtk-import-function-internal gtk-call-function))
7039e6323819 [xemacs-hg @ 2001-05-04 22:41:46 by ben]
ben
parents: 462
diff changeset
36
462
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
37 (gtk-import-function none glade_init)
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
38 (gtk-import-function none glade_gnome_init)
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
39 (gtk-import-function none glade_bonobo_init)
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
40 (gtk-import-function none glade_load_module (GtkString . module))
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
41 (gtk-import-function GtkType glade_xml_get_type)
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
42 (gtk-import-function GtkObject glade_xml_new
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
43 (GtkString . filename)
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
44 (GtkString . root))
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
45 (gtk-import-function GladeXML glade_xml_new_with_domain
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
46 (GtkString . filename)
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
47 (GtkString . root)
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
48 (GtkString . domain))
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
49 (gtk-import-function GladeXML glade_xml_new_from_memory
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
50 (GtkString . buffer)
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
51 (gint . size)
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
52 (GtkString . root)
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
53 (GtkString . domain))
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
54 (gtk-import-function gboolean glade_xml_construct
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
55 (GladeXML . self)
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
56 (GtkString . filename)
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
57 (GtkString . root)
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
58 (GtkString . domain))
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
59 (gtk-import-function GtkWidget glade_xml_get_widget
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
60 (GladeXML . xml)
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
61 (GtkString . name))
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
62 (gtk-import-function GtkWidget glade_xml_get_widget_by_long_name
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
63 (GladeXML . xml)
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
64 (GtkString . longname))
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
65
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
66 (gtk-import-function GtkString glade_get_widget_name (GtkWidget . widget))
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
67 (gtk-import-function GtkString glade_get_widget_long_name (GtkWidget . widget))
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
68 (gtk-import-function GladeXML glade_get_widget_tree (GtkWidget . widget))