mcclim-cvs November 2006

mcclim-cvs@common-lisp.net

6 participants
128 discussions

[mcclim-cvs] CVS mcclim/Backends/gtkairo
by dlichteblau 25 Nov '06

25 Nov '06

Update of /project/mcclim/cvsroot/mcclim/Backends/gtkairo In directory clnet:/tmp/cvs-serv29681 Modified Files: BUGS ffi.lisp gadgets.lisp Log Message: Second attempt at label pane layouting. (demodemo beautiful again, but probably not quite there yet, see bug 24) * ffi.lisp: Regenerated. * frame-manager.lisp (MAKE-PANE-2 GENERIC-OPTION-PANE): New. * gadgets.lisp (LABEL-PANE-EXTRA-WIDTH, -HEIGHT): New slots. ((REALIZE-NATIVE-WIDGET GTK-LABEL-PANE)): Set the inner gtk widget size according to our child's space requirements, then retrieve the outer gtk widget's size and save the diferrence. (COMPOSE-SPACE, *USE-FRONTEND-COMPOSE-SPACE*): Removed *u-f-c-s* again. ((COMPOSE-SPACE GTK-LABEL-PANE)): Removed. ((ALLOCATE-SPACE GTK-LABEL-PANE)): New method, takes size difference into account. --- /project/mcclim/cvsroot/mcclim/Backends/gtkairo/BUGS 2006/11/05 18:49:13 1.12 +++ /project/mcclim/cvsroot/mcclim/Backends/gtkairo/BUGS 2006/11/25 21:11:33 1.13 @@ -124,3 +124,9 @@ interactor. Replacing the :min-height 800 in receivers.lisp with :min-height 400 :max-height 400 fixes that, but CLX doesn't have the same problem. + +24. + Weird problem in the text size test with the drei gadget in the label + pane: Resizing ends up resizing the one-line drei gadget, and doesn't + even do it in one step. Instead, it enlarges itself in a smooth + animation, taking several seconds to stabilize. --- /project/mcclim/cvsroot/mcclim/Backends/gtkairo/ffi.lisp 2006/11/20 19:53:44 1.5 +++ /project/mcclim/cvsroot/mcclim/Backends/gtkairo/ffi.lisp 2006/11/25 21:11:33 1.6 @@ -1234,6 +1234,12 @@ (widget :pointer) ;GtkWidget * ) +(defcfun "gtk_widget_get_child_requisition" + :void + (widget :pointer) ;GtkWidget * + (requisition :pointer) ;GtkRequisition * + ) + (defcfun "gtk_widget_get_events" :int (widget :pointer) ;GtkWidget * @@ -1246,6 +1252,13 @@ (y :pointer) ;gint * ) +(defcfun "gtk_widget_get_size_request" + :void + (widget :pointer) ;GtkWidget * + (width :pointer) ;gint * + (height :pointer) ;gint * + ) + (defcfun "gtk_widget_grab_focus" :void (widget :pointer) ;GtkWidget * --- /project/mcclim/cvsroot/mcclim/Backends/gtkairo/gadgets.lisp 2006/11/19 18:08:16 1.12 +++ /project/mcclim/cvsroot/mcclim/Backends/gtkairo/gadgets.lisp 2006/11/25 21:11:33 1.13 @@ -74,7 +74,9 @@ (defclass gtk-hscrollbar (native-scrollbar) ()) (defclass gtk-label-pane (native-widget-mixin label-pane) - ((label-pane-fixed :accessor label-pane-fixed))) + ((label-pane-fixed :accessor label-pane-fixed) + (label-pane-extra-width :accessor label-pane-extra-width) + (label-pane-extra-height :accessor label-pane-extra-height))) ;;;; Constructors @@ -94,9 +96,21 @@ (defmethod realize-native-widget ((sheet gtk-label-pane)) (let ((frame (gtk_frame_new (climi::label-pane-label sheet))) - (fixed (gtk_fixed_new))) - (setf (label-pane-fixed sheet) fixed) + (fixed (gtk_fixed_new)) + (child (car (sheet-children sheet)))) (gtk_container_add frame fixed) + (gtk_widget_show fixed) + (when child + (let* ((q (compose-space child)) + (width1 (space-requirement-width q)) + (height1 (space-requirement-height q))) + (gtk_widget_set_size_request fixed width1 height1) + (cffi:with-foreign-object (r 'gtkrequisition) + (gtk_widget_size_request frame r) + (cffi:with-foreign-slots ((width height) r gtkrequisition) + (setf (label-pane-extra-width sheet) (- width width1)) + (setf (label-pane-extra-height sheet) (- height height1)))))) + (setf (label-pane-fixed sheet) fixed) frame)) (defmethod container-put ((parent gtk-label-pane) parent-widget child x y) @@ -493,25 +507,21 @@ ;;; COMPOSE-SPACE -(defvar *use-frontend-compose-space* nil) - ;; KLUDGE: this is getting called before the sheet has been realized. (defmethod compose-space ((gadget native-widget-mixin) &key width height) (declare (ignore width height)) - (if *use-frontend-compose-space* - (let ((*use-frontend-compose-space* nil)) - (call-next-method)) - (let* ((widget (native-widget gadget)) - (widgetp widget)) - (unless widgetp - (setf widget (realize-native-widget gadget))) - (prog1 - (cffi:with-foreign-object (r 'gtkrequisition) - (gtk_widget_size_request widget r) - (cffi:with-foreign-slots ((width height) r gtkrequisition) - (make-space-requirement :width width :height height))) - (unless widgetp - (gtk_widget_destroy widget)))))) + (let* ((widget (native-widget gadget)) + (widgetp widget)) + (unless widgetp + (setf widget (realize-native-widget gadget))) + (prog1 + (cffi:with-foreign-object (r 'gtkrequisition) + (gtk_widget_size_request widget r) + (cffi:with-foreign-slots ((width height) r gtkrequisition) + (make-space-requirement :width width :height height))) + (unless widgetp + (gtk_widget_destroy widget) + (setf (native-widget gadget) nil))))) (defmethod compose-space ((gadget gtk-menu-bar) &key width height) (declare (ignore width height)) @@ -531,12 +541,15 @@ :min-height height :max-height height))) (unless widgetp - (gtk_widget_destroy widget))))) + (gtk_widget_destroy widget) + (setf (native-widget gadget) nil))))) -(defmethod compose-space ((gadget gtk-label-pane) &key width height) - (declare (ignore width height)) - (let ((*use-frontend-compose-space* t)) - (call-next-method))) +(defmethod allocate-space ((pane label-pane) width height) + (when (sheet-children pane) + (move-sheet (first (sheet-children pane)) 0 0) + (allocate-space (first (sheet-children pane)) + (- width (label-pane-extra-width pane)) + (- height (label-pane-extra-height pane))))) ;;; Vermischtes

1 0

[mcclim-cvs] CVS mcclim
by thenriksen 24 Nov '06

24 Nov '06

Update of /project/mcclim/cvsroot/mcclim In directory clnet:/tmp/cvs-serv17330 Modified Files: text-editor-gadget.lisp Log Message: Added new exported `handle-gesture' generic function and used this to implement the activation-gesture behavior for the text-field gadget, eliminating use of Drei-internal symbols. --- /project/mcclim/cvsroot/mcclim/text-editor-gadget.lisp 2006/11/23 15:48:48 1.4 +++ /project/mcclim/cvsroot/mcclim/text-editor-gadget.lisp 2006/11/24 22:43:03 1.5 @@ -61,13 +61,11 @@ (make-space-requirement :height height :max-height height :min-height height :min-width width :width width))))) -(defmethod handle-event ((gadget text-field-pane) (event key-press-event)) - (unless (and (drei::currently-processing-p gadget) - (drei::directly-processing-p gadget)) - (if (with-activation-gestures ((activation-gestures gadget)) - (activation-gesture-p (convert-to-gesture event))) - (activate-callback gadget (gadget-client gadget) (gadget-id gadget)) - (call-next-method)))) +(defmethod drei:handle-gesture ((drei text-field-pane) gesture) + (if (with-activation-gestures ((activation-gestures drei)) + (activation-gesture-p gesture)) + (activate-callback drei (gadget-client drei) (gadget-id drei)) + (call-next-method))) (defmethod allocate-space ((pane text-field-pane) w h) (resize-sheet pane w h))

1 0

[mcclim-cvs] CVS mcclim/Drei
by thenriksen 24 Nov '06

24 Nov '06

Update of /project/mcclim/cvsroot/mcclim/Drei In directory clnet:/tmp/cvs-serv17330/Drei Modified Files: packages.lisp drei-clim.lisp Log Message: Added new exported `handle-gesture' generic function and used this to implement the activation-gesture behavior for the text-field gadget, eliminating use of Drei-internal symbols. --- /project/mcclim/cvsroot/mcclim/Drei/packages.lisp 2006/11/22 21:23:24 1.7 +++ /project/mcclim/cvsroot/mcclim/Drei/packages.lisp 2006/11/24 22:43:03 1.8 @@ -226,6 +226,9 @@ #:with-bound-drei-special-variables #:accepting-from-user #:invoke-accepting-from-user + ;; Gadget interface stuff. + #:handle-gesture + ;; Input-editor interface stuff. #:drei-input-editing-mixin #:drei-instance #:object #:result-type --- /project/mcclim/cvsroot/mcclim/Drei/drei-clim.lisp 2006/11/23 15:48:48 1.11 +++ /project/mcclim/cvsroot/mcclim/Drei/drei-clim.lisp 2006/11/24 22:43:03 1.12 @@ -262,7 +262,16 @@ (setf (active gadget) nil) (display-drei gadget)) -(defun handle-new-gesture (drei gesture) +(defgeneric handle-gesture (drei gesture) + (:documentation "This generic function is called whenever a +Drei gadget variant has determined that a keyboard event +corresponds to a useful gesture that should be handled. A useful +gesture is, for example, one that is not simply a click on a +modifier key. When this function is called, the Drei special +variables (`*current-window*', `*current-buffer*', etc) are +properly bound.")) + +(defmethod handle-gesture ((drei drei-gadget-pane) gesture) (let ((*command-processor* drei) (*abort-gestures* *esa-abort-gestures*)) ;; It is important that the minibuffer of the Drei object is @@ -281,9 +290,9 @@ (when (modified-p (buffer drei)) (clear-modify (buffer drei)) (value-changed-callback drei - (gadget-client drei) - (gadget-id drei) - (gadget-value drei))))))) + (gadget-client drei) + (gadget-id drei) + (gadget-value drei))))))) (defmethod execute-drei-command :after ((drei drei-gadget-pane) command) (with-accessors ((buffer buffer)) drei @@ -301,7 +310,7 @@ (when (proper-gesture-p gesture) (with-bound-drei-special-variables (gadget :prompt (format nil "~A " (gesture-name gesture))) (let ((*standard-input* (or *minibuffer* *standard-input*))) - (handle-new-gesture gadget gesture)))))))) + (handle-gesture gadget gesture)))))))) (defmethod invoke-accepting-from-user ((drei drei-gadget-pane) (continuation function)) ;; When an `accept' is called during the execution of a command for

1 0

[mcclim-cvs] CVS mcclim/Apps/Listener
by thenriksen 24 Nov '06

24 Nov '06

Update of /project/mcclim/cvsroot/mcclim/Apps/Listener In directory clnet:/tmp/cvs-serv14107 Modified Files: package.lisp Log Message: Patch from Martin Raspaud to make the Listener compile when fasl directory != source directory. --- /project/mcclim/cvsroot/mcclim/Apps/Listener/package.lisp 2005/09/22 11:40:31 1.2 +++ /project/mcclim/cvsroot/mcclim/Apps/Listener/package.lisp 2006/11/24 18:37:54 1.3 @@ -9,4 +9,6 @@ (eval-when (:load-toplevel) ; (format t "~&~%!@#%^!@#!@ ... ~A~%~%" *load-truename*) - (defparameter *icon-path* (merge-pathnames #P"icons/" *load-truename*))) + (defparameter *icon-path* (merge-pathnames + #P"icons/" + (load-time-value (or #.*compile-file-pathname* *load-pathname*)))))

1 0

[mcclim-cvs] CVS mcclim/ESA
by ahefner 23 Nov '06

23 Nov '06

Update of /project/mcclim/cvsroot/mcclim/ESA In directory clnet:/tmp/cvs-serv15618 Modified Files: esa-io.lisp Log Message: Filepath and buffer args were transposed in com-write-buffer. --- /project/mcclim/cvsroot/mcclim/ESA/esa-io.lisp 2006/11/22 14:53:12 1.2 +++ /project/mcclim/cvsroot/mcclim/ESA/esa-io.lisp 2006/11/23 19:53:53 1.3 @@ -258,7 +258,7 @@ "Prompt for a filename and write the current buffer to it. Changes the file visted by the buffer to the given file." (let ((buffer (current-buffer))) - (write-buffer buffer filepath))) + (write-buffer filepath buffer))) (set-key `(com-write-buffer ,*unsupplied-argument-marker*) 'esa-io-table '((#\x :control) (#\w :control)))

1 0

[mcclim-cvs] CVS mcclim
by thenriksen 23 Nov '06

23 Nov '06

Update of /project/mcclim/cvsroot/mcclim In directory clnet:/tmp/cvs-serv27945 Modified Files: NEWS Log Message: Added note of the pathname presentation changes to NEWS. --- /project/mcclim/cvsroot/mcclim/NEWS 2006/11/19 18:09:07 1.8 +++ /project/mcclim/cvsroot/mcclim/NEWS 2006/11/23 17:21:38 1.9 @@ -6,6 +6,7 @@ *** Native implementation of context menus, list panes, label panes, and option panes. ** Improvement: Added new editor substrate ("Drei"). +** Improvement: Improved the pathname presentation methods considerably. * Changes in mcclim-0.9.3 "All Souls' Day" relative to 0.9.2: ** backend improvement: The Null backend now registers itself in the

1 0

[mcclim-cvs] CVS mcclim
by thenriksen 23 Nov '06

23 Nov '06

Update of /project/mcclim/cvsroot/mcclim In directory clnet:/tmp/cvs-serv13683 Modified Files: text-editor-gadget.lisp Log Message: Patch from Thomas Persson - Drei text fields now check whether a gesture is an activation gesture, and they call `value-changed-callback' --- /project/mcclim/cvsroot/mcclim/text-editor-gadget.lisp 2006/11/10 18:40:41 1.3 +++ /project/mcclim/cvsroot/mcclim/text-editor-gadget.lisp 2006/11/23 15:48:48 1.4 @@ -61,6 +61,14 @@ (make-space-requirement :height height :max-height height :min-height height :min-width width :width width))))) +(defmethod handle-event ((gadget text-field-pane) (event key-press-event)) + (unless (and (drei::currently-processing-p gadget) + (drei::directly-processing-p gadget)) + (if (with-activation-gestures ((activation-gestures gadget)) + (activation-gesture-p (convert-to-gesture event))) + (activate-callback gadget (gadget-client gadget) (gadget-id gadget)) + (call-next-method)))) + (defmethod allocate-space ((pane text-field-pane) w h) (resize-sheet pane w h))

1 0

[mcclim-cvs] CVS mcclim/Drei
by thenriksen 23 Nov '06

23 Nov '06

Update of /project/mcclim/cvsroot/mcclim/Drei In directory clnet:/tmp/cvs-serv13683/Drei Modified Files: drei-clim.lisp Log Message: Patch from Thomas Persson - Drei text fields now check whether a gesture is an activation gesture, and they call `value-changed-callback' --- /project/mcclim/cvsroot/mcclim/Drei/drei-clim.lisp 2006/11/22 20:51:32 1.10 +++ /project/mcclim/cvsroot/mcclim/Drei/drei-clim.lisp 2006/11/23 15:48:48 1.11 @@ -279,7 +279,11 @@ (display-message "Aborted"))) (display-drei drei) (when (modified-p (buffer drei)) - (clear-modify (buffer drei))))))) + (clear-modify (buffer drei)) + (value-changed-callback drei + (gadget-client drei) + (gadget-id drei) + (gadget-value drei))))))) (defmethod execute-drei-command :after ((drei drei-gadget-pane) command) (with-accessors ((buffer buffer)) drei

1 0

[mcclim-cvs] CVS mcclim/Drei
by thenriksen 22 Nov '06

22 Nov '06

Update of /project/mcclim/cvsroot/mcclim/Drei In directory clnet:/tmp/cvs-serv28305/Drei Modified Files: packages.lisp buffer.lisp Log Message: Added `region-to-string' function and exported the `condition-offset' accessor. --- /project/mcclim/cvsroot/mcclim/Drei/packages.lisp 2006/11/19 11:39:45 1.6 +++ /project/mcclim/cvsroot/mcclim/Drei/packages.lisp 2006/11/22 21:23:24 1.7 @@ -32,6 +32,7 @@ #:mark #:left-sticky-mark #:right-sticky-mark #:standard-left-sticky-mark #:standard-right-sticky-mark #:clone-mark + #:condition-offset #:no-such-offset #:offset-before-beginning #:offset-after-end #:invalid-motion #:motion-before-beginning #:motion-after-end #:size #:number-of-lines @@ -52,7 +53,7 @@ #:delete-buffer-range #:delete-range #:delete-region #:buffer-object #:buffer-sequence - #:object-before #:object-after #:region-to-sequence + #:object-before #:object-after #:region-to-sequence #:region-to-string #:low-mark #:high-mark #:modified-p #:clear-modify #:binseq-buffer #:obinseq-buffer #:binseq2-buffer #:persistent-left-sticky-mark #:persistent-right-sticky-mark --- /project/mcclim/cvsroot/mcclim/Drei/buffer.lisp 2006/11/18 15:42:43 1.3 +++ /project/mcclim/cvsroot/mcclim/Drei/buffer.lisp 2006/11/22 21:23:24 1.4 @@ -665,6 +665,12 @@ (rotatef offset1 offset2)) (buffer-sequence (buffer mark1) offset1 offset2))) +(defun region-to-string (start end) + "Return a string of the contents of the buffer associated with +the marks, from `start' to `end', of which at least one must be a +mark object." + (coerce (region-to-sequence start end) 'string)) + ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;;; ;;; Buffer modification protocol

1 0

[mcclim-cvs] CVS mcclim/Drei
by thenriksen 22 Nov '06

22 Nov '06

Update of /project/mcclim/cvsroot/mcclim/Drei In directory clnet:/tmp/cvs-serv22753/Drei Modified Files: drei-clim.lisp Log Message: "tompa" at #lisp reported that `gadget-value' snips off the last character, which it does. Fixed. --- /project/mcclim/cvsroot/mcclim/Drei/drei-clim.lisp 2006/11/22 18:52:57 1.9 +++ /project/mcclim/cvsroot/mcclim/Drei/drei-clim.lisp 2006/11/22 20:51:32 1.10 @@ -228,7 +228,7 @@ (defmethod gadget-value ((gadget drei-gadget-pane)) (buffer-substring (buffer gadget) - 0 (max 0 (1- (size (buffer gadget)))))) + 0 (size (buffer gadget)))) (defmethod (setf gadget-value) (new-value (gadget drei-gadget-pane) &key (invoke-callback t))

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

mcclim-cvs November 2006