Mercurial > hg > xemacs-beta
view lisp/widgets-gtk.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 | ecf1ebac70d8 |
children | 308d34e9f07d |
line wrap: on
line source
;;; widgets-gtk.el --- Embedded widget support for XEmacs w/GTK primitives ;; Copyright (C) 2001 Free Software Foundation, Inc. ;; Maintainer: William M. Perry <wmperry@gnu.org> ;; Keywords: extensions, 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 embedded widgets are compiled in). (globally-declare-fboundp '(gtk-button-new-with-label gtk-signal-connect gtk-radio-button-new-with-label gtk-radio-button-group gtk-toggle-button-set-active gtk-check-button-new-with-label gtk-widget-show-all gtk-notebook-new gtk-notebook-append-page gtk-vbox-new gtk-label-new gtk-adjustment-new gtk-progress-bar-new-with-adjustment gtk-adjustment-set-value gtk-entry-new gtk-entry-set-text gtk-widget-set-style gtk-widget-get-style)) (defun gtk-widget-get-callback (widget plist instance) (let ((cb (plist-get plist :callback)) (ex (plist-get plist :callback-ex)) (real-cb nil)) (cond (ex (gtk-signal-connect widget 'button-release-event (lambda (widget event data) (put widget 'last-event event))) `(lambda (widget &rest ignored) (funcall ,ex ,instance (get widget 'last-event)))) (cb `(lambda (widget &rest ignored) (if (functionp ,real-cb) (funcall ,real-cb) (eval ,real-cb)))) (t nil)))) (defun gtk-widget-instantiate-button-internal (plist instance) (let* ((type (or (plist-get plist :style) 'button)) (label (or (plist-get plist :descriptor) (symbol-name type))) (widget nil)) (case type (button (setq widget (gtk-button-new-with-label label)) (gtk-signal-connect widget 'clicked (gtk-widget-get-callback widget plist instance))) (radio (let ((aux nil) (selected-p (plist-get plist :selected))) (setq widget (gtk-radio-button-new-with-label nil label) aux (gtk-radio-button-new-with-label (gtk-radio-button-group widget) "bogus sibling")) (gtk-toggle-button-set-active widget (eval selected-p)) (gtk-signal-connect widget 'toggled (gtk-widget-get-callback widget plist instance) aux))) (otherwise ;; Check boxes (setq widget (gtk-check-button-new-with-label label)) (gtk-toggle-button-set-active widget (eval (plist-get plist :selected))) (gtk-signal-connect widget 'toggled (gtk-widget-get-callback widget plist instance)))) (gtk-widget-show-all widget) widget)) (defun gtk-widget-instantiate-notebook-internal (plist instance) (let ((widget (gtk-notebook-new)) ;(items (plist-get plist :items)) ) ; (while items ; (gtk-notebook-append-page widget ; (gtk-vbox-new nil 3) ; (gtk-label-new (aref (car items) 0))) ; (setq items (cdr items))) widget)) (defun gtk-widget-instantiate-progress-internal (plist instance) (let* ((adj (gtk-adjustment-new 0.0 0.0 100.0 1.0 5.0 5.0)) (widget (gtk-progress-bar-new-with-adjustment adj))) (gtk-adjustment-set-value adj (or (plist-get plist :value) 0.0)) widget)) (defun gtk-widget-instantiate-entry-internal (plist instance) (let* ((widget (gtk-entry-new)) (default (plist-get plist :descriptor))) (cond ((stringp default) nil) ((sequencep default) (setq default (mapconcat 'identity default ""))) (t (error "Invalid default value: %S" default))) (gtk-entry-set-text widget default) widget)) (put 'button 'instantiator 'gtk-widget-instantiate-button-internal) (put 'tab-control 'instantiator 'gtk-widget-instantiate-notebook-internal) (put 'progress-gauge 'instantiator 'gtk-widget-instantiate-progress-internal) (put 'tree-view 'instantiator 'ignore) (put 'edit-field 'instantiator 'gtk-widget-instantiate-entry-internal) (put 'combo-box 'instantiator 'ignore) (put 'label 'instantiator 'ignore) (put 'layout 'instantiator 'ignore) (defun gtk-widget-instantiate-internal (instance instantiator pointer-fg pointer-bg domain) "The lisp side of widget/glyph instantiation code." (let* ((type (aref instantiator 0)) (plist (cdr (map 'list 'identity instantiator))) (widget (funcall (or (get type 'instantiator) 'ignore) plist instance))) ; (add-timeout 0.1 (lambda (obj) ; (gtk-widget-set-style obj ; (gtk-widget-get-style ; (frame-property nil 'text-widget)))) ; widget) widget)) (defun gtk-widget-property-internal () nil) (defun gtk-widget-redisplay-internal () nil) (provide 'widgets-gtk)