X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=gtk%2Fgtk.demo.lisp;h=d0c3645ec4b97c58c593f2c9d225abe945b1956f;hb=ef06e5aa777920b2f5ad8f8c69a43f5c5c6f50e8;hp=c55d37c093b75e338c206a411e723452b382e79b;hpb=0ff51b71441ef2265a4a0eb54f14204932c1ba04;p=cl-gtk2.git

diff --git a/gtk/gtk.demo.lisp b/gtk/gtk.demo.lisp
index c55d37c..d0c3645 100644
--- a/gtk/gtk.demo.lisp
+++ b/gtk/gtk.demo.lisp
@@ -1,6 +1,7 @@
 (defpackage :gtk-demo
   (:use :cl :gtk :gdk :gobject :iter)
-  (:export #:test
+  (:export #:demo-all
+           #:test
            #:test-entry
            #:table-packing
            #:test-pixbuf
@@ -26,13 +27,18 @@
            #:demo-treeview-tree
            #:test-custom-window
            #:test-assistant
-           #:test-entry-completion))
+           #:test-entry-completion
+           #:test-ui-markup
+           #:test-list-store
+           #:test-tree-store
+           #:test-gdk))
 
 (in-package :gtk-demo)
 
 (defparameter *src-location* (asdf:component-pathname (asdf:find-system :cl-gtk2-gtk)))
 
 (defun test ()
+  "A simple test of 'on-expose' event"
   (within-main-loop
     (let ((window (make-instance 'gtk-window :type :toplevel :app-paintable t))
           x y)
@@ -48,12 +54,12 @@
                         (lambda (widget event)
                           (declare (ignore widget event))
                           (let* ((gdk-window (widget-window window))
-                                 (gc (gdk-gc-new gdk-window))
+                                 (gc (graphics-context-new gdk-window))
                                  (layout (widget-create-pango-layout window (format nil "X: ~F~%Y: ~F" x y))))
-                            (gdk-draw-layout gdk-window gc 0 0 layout)
-                            (gdk-gc-set-rgb-fg-color gc (make-color :red 65535 :green 0 :blue 0))
+                            (draw-layout gdk-window gc 0 0 layout)
+                            (setf (graphics-context-rgb-fg-color gc) (make-color :red 65535 :green 0 :blue 0))
                             (multiple-value-bind (x y) (drawable-get-size gdk-window)
-                              (gdk-draw-line gdk-window gc 0 0 x y)))))
+                              (draw-line gdk-window gc 0 0 x y)))))
       (g-signal-connect window "configure-event"
                         (lambda (widget event)
                           (declare (ignore widget event))
@@ -62,6 +68,7 @@
       (push :pointer-motion-mask (gdk-window-events (widget-window window))))))
   
 (defun test-entry ()
+  "Testing GtkTextEntry"
   (within-main-loop
     (let* ((window (make-instance 'gtk-window :type :toplevel :title "Testing entry" :border-width 10))
            (box (make-instance 'v-box))
@@ -103,6 +110,7 @@
       (widget-show window))))
 
 (defun table-packing ()
+  "Simple test of packing widgets into GtkTable"
   (within-main-loop
     (let* ((window (make-instance 'gtk-window :type :toplevel :title "Table packing" :border-width 20))
            (table (make-instance 'table :n-rows 2 :n-columns 2 :homogeneous t))
@@ -118,6 +126,7 @@
       (widget-show window))))
 
 (defun test-pixbuf ()
+  "(not completed)"
   (within-main-loop
     (let* ((window (make-instance 'gtk-window :title "Test pixbuf" :request-width 600 :request-height 240))
           (vbox (make-instance 'v-box))
@@ -133,6 +142,7 @@
      (widget-show window))))
 
 (defun test-image ()
+  "Using GtkImage with stock icon"
   (within-main-loop
     (let* ((window (make-instance 'gtk-window :title "Test images"))
            (image (make-instance 'image :icon-name "applications-development" :icon-size 6)))
@@ -141,6 +151,7 @@
       (widget-show window))))
 
 (defun test-progress-bar ()
+  "Testing progress-bar"
   (within-main-loop
     (let* ((window (make-instance 'gtk-window :title "Test progress bar"))
            (v-box (make-instance 'v-box))
@@ -162,6 +173,7 @@
       (widget-show window))))
 
 (defun test-statusbar ()
+  "Test of GtkStatusbar"
   (within-main-loop
     (let* ((window (make-instance 'gtk-window :title "Text status bar"))
            (v-box (make-instance 'v-box))
@@ -201,6 +213,7 @@
       (setf (status-icon-screen icon) (gtk-window-screen window)))))
 
 (defun test-scale-button ()
+  "Test of scale button with icons"
   (within-main-loop
     (let* ((window (make-instance 'gtk-window :type :toplevel :title "Testing scale button"))
            (button (make-instance 'scale-button :icons (list "media-seek-backward" "media-seek-forward" "media-playback-stop" "media-playback-start") :adjustment (make-instance 'adjustment :lower -40 :upper 50 :value 20))))
@@ -209,6 +222,7 @@
       (widget-show window))))
 
 (defun test-text-view ()
+  "Test of GtkTextView"
   (within-main-loop
     (let* ((window (make-instance 'gtk-window :type :toplevel :title "Testing text view" :width-request 400 :height-request 300))
            (button (make-instance 'button :label "Do"))
@@ -266,6 +280,7 @@
       (widget-show window))))
 
 (defun demo-code-editor ()
+  "(unfinished)"
   (within-main-loop
     (let* ((window (make-instance 'gtk-window :type :toplevel :title "Code editor" :width-request 400 :height-request 400 :window-position :center))
            (scrolled (make-instance 'scrolled-window :hscrollbar-policy :automatic :vscrollbar-policy :automatic))
@@ -283,6 +298,7 @@
 (defstruct tvi title value)
 
 (defun test-treeview-list ()
+  "Test of treeview with CL-GTK2-GTK:ARRAY-LIST-STORE"
   (within-main-loop
     (let* ((window (make-instance 'gtk-window :type :toplevel :title "Treeview (list)"))
            (model (make-instance 'array-list-store))
@@ -337,6 +353,7 @@
       (widget-show window))))
 
 (defun test-combo-box ()
+  "Testing GtkComboBox"
   (within-main-loop
     (let* ((window (make-instance 'gtk-window :type :toplevel :title "Treeview (list)"))
            (model (make-instance 'array-list-store))
@@ -380,6 +397,7 @@
       (widget-show window))))
 
 (defun test-ui-manager ()
+  "Testing GtkUIManager"
   (within-main-loop
     (let* ((window (make-instance 'gtk-window :type :toplevel :title "UI Manager" :default-width 200 :default-height 100 :window-position :center))
            (ui-manager (make-instance 'ui-manager))
@@ -417,6 +435,7 @@
       (widget-show window))))
 
 (defun test-color-button ()
+  "Test of GtkColorButton"
   (within-main-loop
     (let ((window (make-instance 'gtk-window :title "Color button" :type :toplevel :window-position :center :width-request 100 :height-request 100))
           (button (make-instance 'color-button :title "Color button")))
@@ -428,6 +447,7 @@
       (widget-show window))))
 
 (defun test-color-selection ()
+  "Test of GtkColorSelection"
   (within-main-loop
     (let ((window (make-instance 'gtk-window :title "Color selection" :type :toplevel :window-position :center))
           (selection (make-instance 'color-selection :has-opacity-control t)))
@@ -437,6 +457,7 @@
       (widget-show window))))
 
 (defun test-file-chooser ()
+  "Test of GtkFileChooser"
   (within-main-loop
     (let ((window (make-instance 'gtk-window :title "file chooser" :type :toplevel :window-position :center :default-width 100 :default-height 100))
           (v-box (make-instance 'v-box))
@@ -458,6 +479,7 @@
       (widget-show window))))
 
 (defun test-font-chooser ()
+  "GtkFontChooser"
   (within-main-loop
     (let ((window (make-instance 'gtk-window :title "fonts" :type :toplevel :window-position :center :default-width 100 :default-height 100))
           (v-box (make-instance 'v-box))
@@ -469,6 +491,7 @@
       (widget-show window))))
 
 (defun test-notebook ()
+  "Test GtkNotebook"
   (within-main-loop
     (let ((window (make-instance 'gtk-window :title "Notebook" :type :toplevel :window-position :center :default-width 100 :default-height 100))
           (expander (make-instance 'expander :expanded t :label "notebook"))
@@ -501,6 +524,7 @@
     "!"))
 
 (defun test-calendar ()
+  "Test of GtkCalendar"
   (within-main-loop
     (let ((window (make-instance 'gtk-window :title "Calendar" :type :toplevel :window-position :center :default-width 100 :default-height 100))
           (calendar (make-instance 'calendar :detail-function #'calendar-detail)))
@@ -513,6 +537,7 @@
       (widget-show window))))
 
 (defun test-box-child-property ()
+  "Test of child-property usage"
   (within-main-loop
     (let ((window (make-instance 'gtk-window :title "Text box child property" :type :toplevel :window-position :center :width-request 200 :height-request 200))
           (box (make-instance 'h-box))
@@ -524,6 +549,7 @@
       (widget-show window))))
 
 (defun test-builder ()
+  "Test of GtkBuilder"
   (within-main-loop
     (let ((builder (make-instance 'builder)))
       (builder-add-from-file builder (namestring (merge-pathnames "demo/demo1.ui" *src-location*)))
@@ -565,6 +591,7 @@
          do (write-string line str)))))
 
 (defun demo-text-editor ()
+  "More advanced example: text editor with ability to evaluate lisp expressions"
   (within-main-loop
     (let* ((builder (let ((builder (make-instance 'builder)))
                       (builder-add-from-file builder (namestring (merge-pathnames "demo/text-editor.ui" *src-location*)))
@@ -614,7 +641,7 @@
                                 (save))
                               (object-destroy d))))
                (cut (&rest args) (declare (ignore args))
-                    (text-buffer-cut-clipboard (text-view-buffer text-view) (get-clipboard "CLIPBOARD")))
+                    (text-buffer-cut-clipboard (text-view-buffer text-view) (get-clipboard "CLIPBOARD") t))
                (copy (&rest args) (declare (ignore args))
                      (text-buffer-copy-clipboard (text-view-buffer text-view) (get-clipboard "CLIPBOARD")))
                (paste (&rest args) (declare (ignore args))
@@ -662,6 +689,7 @@
         (widget-show window)))))
 
 (defun demo-class-browser ()
+  "Show slots of a given class"
   (let ((output *standard-output*))
     (with-main-loop
         (let* ((window (make-instance 'gtk-window
@@ -719,6 +747,7 @@
     node))
 
 (defun demo-treeview-tree ()
+  "Advanced demo: show s-expression tree structure"
   (within-main-loop
     (let* ((window (make-instance 'gtk-window :type :toplevel :title "Treeview (tree)"))
            (model (make-instance 'tree-lisp-store))
@@ -795,11 +824,13 @@
         (format nil "Now is: ~A~%" (get-internal-run-time))))
 
 (defun test-custom-window ()
+  "Simple test of non-GObject subclass of GtkWindow"
   (within-main-loop
     (let ((w (make-instance 'custom-window)))
       (widget-show w))))
 
 (defun test-assistant ()
+  "Simple test of GtkAssistant wizard"
   (let ((output *standard-output*))
     (within-main-loop
       (let ((d (make-instance 'assistant :title "Username wizard"))
@@ -843,6 +874,7 @@
         (widget-show d)))))
 
 (defun test-entry-completion ()
+  "Not working example of GtkEntryCompletion"
   (within-main-loop
     (let* ((w (make-instance 'gtk-window))
            (model (make-instance 'tree-lisp-store)))
@@ -858,4 +890,223 @@
              (e (make-instance 'entry :completion completion)))
         (setf (entry-completion-text-column completion) 0)
         (container-add w e))
-      (widget-show w))))
\ No newline at end of file
+      (widget-show w))))
+
+(defun demo-all ()
+  (within-main-loop
+    (let* ((window (make-instance 'gtk-window
+                                  :title "cl-gtk2-gtk demo"
+                                  :window-position :center
+                                  :default-width 500
+                                  :default-height 500))
+           (scrolled (make-instance 'scrolled-window
+                                    :hscrollbar-policy :automatic
+                                    :vscrollbar-policy :automatic))
+           (viewport (make-instance 'viewport))
+           (v-box-buttons (make-instance 'v-box))
+           (v-box-top (make-instance 'v-box)))
+      (container-add window v-box-top)
+      (box-pack-start v-box-top (make-instance 'label :label "These are the demos of cl-gtk2-gtk:") :expand nil)
+      (box-pack-start v-box-top scrolled)
+      (container-add scrolled viewport)
+      (container-add viewport v-box-buttons)
+      (iter (for s in-package :gtk-demo :external-only t)
+            (for fn = (fdefinition s))
+            (unless fn (next-iteration))
+            (when (eq s 'gtk-demo:demo-all) (next-iteration))
+            (for docstring = (documentation fn t))
+            (for description = (format nil "~A~@[~%~A~]" (string-downcase (symbol-name s)) docstring))
+            (for label = (make-instance 'label :label description :justify :center))
+            (for button = (make-instance 'button))
+            (container-add button label)
+            (connect-signal button "clicked"
+                            (let ((fn fn))
+                              (lambda (b)
+                                (declare (ignore b))
+                                (funcall fn))))
+            (box-pack-start v-box-buttons button :expand nil))
+      (widget-show window))))
+
+(defun test-ui-markup ()
+  (within-main-loop
+    (let ((label (make-instance 'label :label "Hello!")))
+      (let-ui (gtk-window :type :toplevel
+                          :position :center
+                          :title "Hello, world!"
+                          :default-width 300
+                          :default-height 400
+                          :var w
+                          (v-box
+                           (:expr label) :expand nil
+                           (scrolled-window
+                            :hscrollbar-policy :automatic
+                            :vscrollbar-policy :automatic
+                            :shadow-type :etched-in
+                            (text-view :var tv))
+                           (h-box
+                            (label :label "Insert:") :expand nil
+                            (entry :var entry)
+                            (button :label "gtk-ok" :use-stock t :var btn) :expand nil)
+                           :expand nil
+                           (label :label "Table packing")
+                           :expand nil
+                           (table
+                            :n-columns 2
+                            :n-rows 2
+                            (label :label "2 x 1") :left 0 :right 2 :top 0 :bottom 1
+                            (label :label "1 x 1") :left 0 :right 1 :top 1 :bottom 2
+                            (label :label "1 x 1") :left 1 :right 2 :top 1 :bottom 2)))
+        (connect-signal btn "clicked"
+                        (lambda (b)
+                          (declare (ignore b))
+                          (text-buffer-insert (text-view-buffer tv)
+                                              (entry-text entry))))
+        (widget-show w)))))
+
+(defun test-list-store ()
+  "Demonstrates usage of list store"
+  (within-main-loop
+    (let-ui (gtk-window
+             :type :toplevel
+             :title "GtkListStore"
+             :default-width 600
+             :default-height 400
+             :var w
+             (v-box
+              (label :label "A GtkListStore") :expand nil
+              (scrolled-window
+               :hscrollbar-policy :automatic
+               :vscrollbar-policy :automatic
+               (tree-view :var tv))))
+      (let ((l (make-instance 'list-store :column-types '("gint" "gchararray"))))
+        (iter (for i from 0 below 100)
+              (for n = (random 10000000))
+              (for s = (format nil "~R" n))
+              (list-store-insert-with-values l i n s))
+        (setf (tree-view-model tv) l)
+        (let ((column (make-instance 'tree-view-column :title "Number" :sort-column-id 0))
+              (renderer (make-instance 'cell-renderer-text :text "A text")))
+          (tree-view-column-pack-start column renderer)
+          (tree-view-column-add-attribute column renderer "text" 0)
+          (tree-view-append-column tv column))
+        (let ((column (make-instance 'tree-view-column :title "As string" :sort-column-id 1))
+              (renderer (make-instance 'cell-renderer-text :text "A text")))
+          (tree-view-column-pack-start column renderer)
+          (tree-view-column-add-attribute column renderer "text" 1)
+          (tree-view-append-column tv column))
+        (connect-signal tv "row-activated"
+                        (lambda (w path column)
+                          (declare (ignore w column))
+                          (let* ((iter (tree-model-iter-by-path l path))
+                                 (n (tree-model-value l iter 0))
+                                 (dialog (make-instance 'message-dialog
+                                                        :title "Clicked"
+                                                        :text (format nil "Number ~A was clicked" n)
+                                                        :buttons :ok)))
+                            (dialog-run dialog)
+                            (object-destroy dialog)))))
+      (widget-show w))))
+
+(defun test-tree-store ()
+  "Demonstrates usage of tree store"
+  (within-main-loop
+    (let-ui (gtk-window
+             :type :toplevel
+             :title "GtkListStore"
+             :default-width 600
+             :default-height 400
+             :var w
+             (v-box
+              (label :label "A GtkListStore") :expand nil
+              (scrolled-window
+               :hscrollbar-policy :automatic
+               :vscrollbar-policy :automatic
+               (tree-view :var tv))))
+      (let ((l (make-instance 'tree-store :column-types '("gint" "gchararray"))))
+        (iter (for i from 0 below 100)
+              (for n = (random 10000000))
+              (for s = (format nil "~R" n))
+              (for it = (tree-store-insert-with-values l nil i n s))
+              (iter (for j from 0 below 10)
+                    (for n2 = (random 10000000))
+                    (for s2 = (format nil "~R" n2))
+                    (tree-store-insert-with-values l it j n2 s2)))
+        (setf (tree-view-model tv) l)
+        (let ((column (make-instance 'tree-view-column :title "Number" :sort-column-id 0))
+              (renderer (make-instance 'cell-renderer-text :text "A text")))
+          (tree-view-column-pack-start column renderer)
+          (tree-view-column-add-attribute column renderer "text" 0)
+          (tree-view-append-column tv column))
+        (let ((column (make-instance 'tree-view-column :title "As string" :sort-column-id 1))
+              (renderer (make-instance 'cell-renderer-text :text "A text")))
+          (tree-view-column-pack-start column renderer)
+          (tree-view-column-add-attribute column renderer "text" 1)
+          (tree-view-append-column tv column))
+        (connect-signal tv "row-activated"
+                        (lambda (w path column)
+                          (declare (ignore w column))
+                          (let* ((iter (tree-model-iter-by-path l path))
+                                 (n (tree-model-value l iter 0))
+                                 (dialog (make-instance 'message-dialog
+                                                        :title "Clicked"
+                                                        :text (format nil "Number ~A was clicked" n)
+                                                        :buttons :ok)))
+                            (dialog-run dialog)
+                            (object-destroy dialog)))))
+      (widget-show w))))
+
+(defun test-gdk-expose (gdk-window)
+  (let* ((gc (graphics-context-new gdk-window)))
+    (multiple-value-bind (w h) (drawable-get-size gdk-window)
+      (setf (graphics-context-rgb-bg-color gc) (make-color :red 0 :green 0 :blue 0))
+      (draw-polygon gdk-window gc t (list (make-point :x 0 :y 0)
+                                          (make-point :x (truncate w 2) :y 0)
+                                          (make-point :x w :y (truncate h 2))
+                                          (make-point :x w :y h)
+                                          (make-point :x (truncate w 2) :y h)
+                                          (make-point :x 0 :y (truncate h 2))))
+      (setf (graphics-context-rgb-fg-color gc) (make-color :red 65535 :green 0 :blue 0))
+      (draw-point gdk-window gc 20 10)
+      (setf (graphics-context-rgb-fg-color gc) (make-color :red 0 :green 65535 :blue 0))
+      (draw-points gdk-window gc (list (make-point :x 15 :y 20) (make-point :x 35 :y 40)))
+      (setf (graphics-context-rgb-fg-color gc) (make-color :red 0 :green 0 :blue 65535))
+      (draw-line gdk-window gc 60 30 40 50)
+      (setf (graphics-context-rgb-fg-color gc) (make-color :red 65535 :green 65535 :blue 0))
+      (draw-lines gdk-window gc (list (make-point :x 10 :y 30) (make-point :x 15 :y 40)
+                                      (make-point :x 15 :y 50) (make-point :x 10 :y 56)))
+      (setf (graphics-context-rgb-fg-color gc) (make-color :red 0 :green 65535 :blue 65535))
+      (draw-segments gdk-window gc (list (make-segment :x1 35 :y1 35 :x2 55 :y2 35)
+                                         (make-segment :x1 65 :y1 35 :x2 43 :y2 17)))
+      (setf (graphics-context-rgb-fg-color gc) (make-color :red 65535 :green 0 :blue 65535)
+            (graphics-context-rgb-bg-color gc) (make-color :red 32767 :green 0 :blue 32767))
+      (draw-arc gdk-window gc nil 70 30 75 50 (* 64 75) (* 64 200))
+      (draw-polygon gdk-window gc nil (list (make-point :x 20 :y 40)
+                                            (make-point :x 30 :y 50)
+                                            (make-point :x 40 :y 70)
+                                            (make-point :x 30 :y 80)
+                                            (make-point :x 10 :y 55)))
+      (setf (graphics-context-rgb-fg-color gc) (make-color :red 16384 :green 16384 :blue 65535))
+      (draw-trapezoids gdk-window gc (list (make-trapezoid :y1 50.0d0 :y2 70.0d0
+                                                           :x11 30.0d0 :x12 45.0d0
+                                                           :x21 70.0d0 :x22 50.0d0))))))
+
+(defun test-gdk ()
+  "Test various gdk primitives"
+  (within-main-loop
+    (let ((window (make-instance 'gtk-window :type :toplevel :app-paintable t)))
+      (g-signal-connect window "destroy" (lambda (widget)
+                                           (declare (ignore widget))
+                                           (leave-gtk-main)))
+      (g-signal-connect window "destroy" (lambda (widget)
+                                           (declare (ignore widget))
+                                           (leave-gtk-main)))
+      (g-signal-connect window "expose-event"
+                        (lambda (widget event)
+                          (declare (ignore widget event))
+                          (test-gdk-expose (widget-window window))))
+      (g-signal-connect window "configure-event"
+                        (lambda (widget event)
+                          (declare (ignore widget event))
+                          (widget-queue-draw window)))
+      (widget-show window)
+      (push :pointer-motion-mask (gdk-window-events (widget-window window))))))