X-Git-Url: https://git.distorted.org.uk/~mdw/clg/blobdiff_plain/a457d4721ad77719b72e410a00761d702f73827d..6d0c1491fd35bbf2d9f405d0708d3cbc51fb1d16:/gtk/gtkwidget.lisp diff --git a/gtk/gtkwidget.lisp b/gtk/gtkwidget.lisp index db60efc..0bb3154 100644 --- a/gtk/gtkwidget.lisp +++ b/gtk/gtkwidget.lisp @@ -1,26 +1,42 @@ -;; Common Lisp bindings for GTK+ v2.0 -;; Copyright (C) 2000-2002 Espen S. Johnsen +;; Common Lisp bindings for GTK+ v2.x +;; Copyright 2000-2006 Espen S. Johnsen ;; -;; This library is free software; you can redistribute it and/or -;; modify it under the terms of the GNU Lesser General Public -;; License as published by the Free Software Foundation; either -;; version 2 of the License, or (at your option) any later version. +;; Permission is hereby granted, free of charge, to any person obtaining +;; a copy of this software and associated documentation files (the +;; "Software"), to deal in the Software without restriction, including +;; without limitation the rights to use, copy, modify, merge, publish, +;; distribute, sublicense, and/or sell copies of the Software, and to +;; permit persons to whom the Software is furnished to do so, subject to +;; the following conditions: ;; -;; This library 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 -;; Lesser General Public License for more details. +;; The above copyright notice and this permission notice shall be +;; included in all copies or substantial portions of the Software. ;; -;; You should have received a copy of the GNU Lesser General Public -;; License along with this library; if not, write to the Free Software -;; Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +;; THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +;; EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +;; MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. +;; IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY +;; CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, +;; TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE +;; SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -;; $Id: gtkwidget.lisp,v 1.17 2005-02-27 15:39:18 espen Exp $ +;; $Id: gtkwidget.lisp,v 1.27 2007-02-19 14:29:33 espen Exp $ (in-package "GTK") +#-debug-ref-counting +(defmethod print-object ((widget widget) stream) + (if (and + (proxy-valid-p widget) + (slot-boundp widget 'name) (not (zerop (length (widget-name widget))))) + (print-unreadable-object (widget stream :type t :identity nil) + (format stream "~S at 0x~X" + (widget-name widget) (pointer-address (foreign-location widget)))) + (call-next-method))) + (defmethod shared-initialize ((widget widget) names &key (visible nil visible-p)) + (declare (ignore names)) (when (and visible-p (not visible)) ; widget explicit set as not visible (setf (user-data widget 'hidden-p) t) (signal-connect widget 'show @@ -50,18 +66,14 @@ :parent parent :child object)))) ((call-next-method)))) -(defmethod slot-boundp-using-class ((class gobject-class) (object widget) slot) - (or - (and - (eq (slot-definition-name slot) 'child-properties) - (slot-boundp object 'parent)) - (call-next-method))) -(defmethod compute-signal-function ((widget widget) signal function object) +(defmethod compute-signal-function ((widget widget) signal function object args) + (declare (ignore signal)) (if (eq object :parent) - #'(lambda (&rest args) - (if (slot-boundp widget 'parent) - (apply function (widget-parent widget) (rest args)) + #'(lambda (&rest emission-args) + (let ((all-args (nconc (rest emission-args) args))) + (if (slot-boundp widget 'parent) + (apply function (widget-parent widget) all-args) ;; Delay until parent is set (signal-connect widget 'parent-set #'(lambda (old-parent) @@ -69,10 +81,10 @@ (let ((*signal-stop-emission* #'(lambda () (warn "Ignoring emission stop in delayed signal handler")))) - (apply function (widget-parent widget) (rest args)))) + (apply function (widget-parent widget) all-args))) :remove t) ; (warn "Widget has no parent -- ignoring signal") - )) + ))) (call-next-method))) (defun child-property-value (widget slot) @@ -137,12 +149,12 @@ (defbinding widget-size-request (widget &optional (requisition (make-instance 'requisition))) nil (widget widget) - (requisition requisition :return)) + (requisition requisition :in/return)) (defbinding widget-get-child-requisition (widget &optional (requisition (make-instance 'requisition))) nil (widget widget) - (requisition requisition :return)) + (requisition requisition :in/return)) (defbinding widget-size-allocate () nil (widget widget) @@ -151,7 +163,7 @@ (defbinding widget-add-accelerator (widget signal accel-group key modifiers flags) nil (widget widget) - ((name-to-string signal) string) + ((signal-name-to-string signal) string) (accel-group accel-group) ((gdk:keyval-from-name key) unsigned-int) (modifiers gdk:modifier-type) @@ -285,17 +297,58 @@ received." (x-offset int) (y-offset int)) -(defbinding widget-path () nil - (widget widget) - (path-length int :out) - (path string :out) - (reverse-path string :out)) +(defun widget-path (widget) + (let ((subpath (list (if (and + (slot-boundp widget 'name) + (not (zerop (length (widget-name widget))))) + (widget-name widget) + (type-of widget))))) + (if (slot-boundp widget 'parent) + (nconc (widget-path (widget-parent widget)) subpath) + subpath))) + +(defun widget-class-path (widget) + (let ((subpath (list (type-of widget)))) + (if (slot-boundp widget 'parent) + (nconc (widget-class-path (widget-parent widget)) subpath) + subpath))) + + +(defun widget-path-lookup (path &optional (root (nreverse (window-list-toplevels))) (error-p t)) + (let ((component (first path))) + (loop + for widget in (mklist root) + do (when (or + (and + (stringp component) (slot-boundp widget 'name) + (string= component (widget-name widget))) + (and + (symbolp component) (typep widget component))) + (cond + ((endp (rest path)) (return widget)) + ((typep widget 'container) + (let ((descendant (widget-path-lookup (rest path) (container-children widget) nil))) + (when descendant + (return descendant)))))))) + (when error-p + (error "Widget not found: ~A" path))) + + +(defun widget-find (name &optional (root (nreverse (window-list-toplevels))) (error-p t)) + "Search for a widget with the given name. ROOT should be a container +widget or a list of containers." + (loop + for widget in (mklist root) + do (cond + ((and (slot-boundp widget 'name) (string= name (widget-name widget))) + (return-from widget-find widget)) + ((typep widget 'container) + (let ((descendant (widget-find name (container-children widget) nil))) + (when descendant + (return-from widget-find descendant)))))) + (when error-p + (error "Widget not found: ~A" name))) -(defbinding widget-class-path () nil - (widget widget) - (path-length int :out) - (path string :out) - (reverse-path string :out)) (defbinding widget-modify-style () nil (widget widget) @@ -324,10 +377,12 @@ received." (state state-type) (color gdk:color)) -(defbinding widget-modify-font () nil +(defbinding widget-modify-font (widget font-desc) nil (widget widget) - (state state-type) - (font-desc pango:font-description)) + ((etypecase font-desc + (pango:font-description font-desc) + (string (pango:font-description-from-string font-desc))) + pango:font-description)) (defbinding widget-create-pango-context () pango:context (widget widget)) @@ -357,9 +412,9 @@ received." (defbinding widget-reset-shapes () nil (widget widget)) -;; (defbinding widget-set-double-buffered () nil -;; (widget widget) -;; (double-buffered boolean)) +(defbinding widget-set-double-buffered () nil + (widget widget) + (double-buffered boolean)) ;; (defbinding widget-set-redraw-on-allocate () nil ;; (widget widget) @@ -477,8 +532,12 @@ received." (event gdk:event)) (defun (setf widget-cursor) (cursor-type widget) - (let ((cursor (make-instance 'gdk:cursor :type cursor-type))) - (gdk:window-set-cursor (widget-window widget) cursor))) + (warn "(SETF WIDGET-CURSOR) is deprecated, use WIDGET-SET-CURSOR instead") + (widget-set-cursor widget cursor-type)) + +(defun widget-set-cursor (widget cursor &rest args) + (gdk:window-set-cursor (widget-window widget) + (apply #'gdk:ensure-cursor cursor args))) (defbinding %widget-get-parent-window () gdk:window (widget widget))