Mercurial > hg > xemacs-beta
view lisp/widgets-gtk.el @ 5574:d4f334808463
Support inlining labels, bytecomp.el.
lisp/ChangeLog addition:
2011-10-02 Aidan Kehoe <kehoea@parhasard.net>
* bytecomp.el (byte-compile-initial-macro-environment):
Add #'declare to this, so it doesn't need to rely on
#'cl-compiling file to determine when we're byte-compiling.
Update #'labels to support declaring labels inline, as Common Lisp
requires.
* bytecomp.el (byte-compile-function-form):
Don't error if FUNCTION is quoting a non-lambda, non-symbol, just
return it.
* cl-extra.el (cl-macroexpand-all):
If a label name has been quoted, expand to the label placeholder
quoted with 'function. This allows the byte compiler to
distinguish between uses of the placeholder as data and uses in
contexts where it should be inlined.
* cl-macs.el:
* cl-macs.el (cl-do-proclaim):
When proclaming something as inline, if it is bound as a label,
don't modify the symbol's plist; instead, treat the first element
of its placeholder constant vector as a place to store compile
information.
* cl-macs.el (declare):
Leave processing declarations while compiling to the
implementation of #'declare in
byte-compile-initial-macro-environment.
tests/ChangeLog addition:
2011-10-02 Aidan Kehoe <kehoea@parhasard.net>
* automated/lisp-tests.el:
* automated/lisp-tests.el (+):
Test #'labels and inlining.
| author | Aidan Kehoe <kehoea@parhasard.net> |
|---|---|
| date | Sun, 02 Oct 2011 15:32:16 +0100 |
| parents | 308d34e9f07d |
| children |
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 3 of the License, 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. If not, see <http://www.gnu.org/licenses/>. ;;; 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)
