Added some support for adding widget into text view

[cl-gtk2.git] / gtk / gtk.demo.lisp

diff --git a/gtk/gtk.demo.lisp b/gtk/gtk.demo.lisp
index 75f2bcd..f517183 100644 (file)
--- a/gtk/gtk.demo.lisp
+++ b/gtk/gtk.demo.lisp
@@ -198,6 +198,7 @@
 (defun test-text-view ()
   (using* ((window (make-instance 'gtk-window :type :toplevel :title "Testing text view" :width-request 400 :height-request 300))
            (button (make-instance 'button :label "Do"))
+           (button-insert (make-instance 'button :label "Insert a button!"))
            (bold-btn (make-instance 'button :label "Bold"))
            (buffer (make-instance 'text-buffer :text "Some text buffer with some text inside"))
            (v (make-instance 'text-view :buffer buffer :wrap-mode :word))
@@ -225,6 +226,12 @@
                                                  (if (text-iter-has-tag start tag)
                                                      (text-buffer-remove-tag buffer tag start end)
                                                      (text-buffer-apply-tag buffer tag start end)))))))
+    (g-signal-connect button-insert "clicked" (lambda (b) (declare (ignore b))
+                                                (let* ((iter (text-buffer-get-iter-at-mark buffer (text-buffer-get-mark buffer "insert")))
+                                                       (anchor (text-buffer-insert-child-anchor buffer iter))
+                                                       (button (make-instance 'button :label "A button!")))
+                                                  (widget-show button)
+                                                  (text-view-add-child-at-anchor v button anchor))))
     (let ((tag (make-instance 'text-tag :name "bold" :weight 700)))
       (text-tag-table-add (text-buffer-tag-table buffer) tag)
       (g-signal-connect tag "event"
@@ -237,6 +244,7 @@
     (container-add window box)
     (container-add scrolled v)
     (box-pack-start box button :expand nil)
+    (box-pack-start box button-insert :expand nil)
     (box-pack-start box bold-btn :expand nil)
     (box-pack-start box scrolled)
     (widget-show window)
@@ -539,12 +547,12 @@
     (labels ((set-properties ()
                (status-bar-pop status-bar "filename")
                (status-bar-push status-bar "filename" (format nil "~A~:[~; *~]" (or file-name "Untitled") modified-p)))
-             (new (&rest args)
+             (new (&rest args) (declare (ignore args))
                (setf file-name nil
                      modified-p t
                      (text-buffer-text (text-view-buffer text-view)) "")
                (set-properties))
-             (cb-open (&rest args)
+             (cb-open (&rest args) (declare (ignore args))
                (let ((d (make-instance 'file-chooser-dialog :action :open :title "Open file")))
                  (when file-name (setf (file-chooser-filename d) file-name))
                  (dialog-add-button d "gtk-open" :accept)
@@ -555,7 +563,7 @@
                          modified-p nil)
                    (set-properties))
                  (object-destroy d)))
-             (save (&rest args)
+             (save (&rest args) (declare (ignore args))
                (if file-name
                    (progn
                      (with-open-file (file file-name :direction :output :if-exists :supersede)
@@ -563,7 +571,7 @@
                      (setf modified-p nil)
                      (set-properties))
                    (save-as)))
-             (save-as (&rest args)
+             (save-as (&rest args) (declare (ignore args))
                (let ((d (make-instance 'file-chooser-dialog :action :save :title "Save file")))
                  (when file-name (setf (file-chooser-filename d) file-name))
                  (dialog-add-button d "gtk-save" :accept)
@@ -574,18 +582,18 @@
                        (object-destroy d)
                        (save))
                      (object-destroy d))))
-             (cut (&rest args)
+             (cut (&rest args) (declare (ignore args))
                (text-buffer-cut-clipboard (text-view-buffer text-view) (get-clipboard "CLIPBOARD")))
-             (copy (&rest args)
+             (copy (&rest args) (declare (ignore args))
                (text-buffer-copy-clipboard (text-view-buffer text-view) (get-clipboard "CLIPBOARD")))
-             (paste (&rest args)
+             (paste (&rest args) (declare (ignore args))
                (text-buffer-paste-clipboard (text-view-buffer text-view) (get-clipboard "CLIPBOARD")))
-             (cb-delete (&rest args)
+             (cb-delete (&rest args) (declare (ignore args))
                (let ((buffer (text-view-buffer text-view)))
                  (multiple-value-bind (i1 i2) (text-buffer-get-selection-bounds buffer)
                    (when (and i1 i2)
                      (text-buffer-delete buffer i1 i2)))))
-             (about (&rest args)
+             (about (&rest args) (declare (ignore args))
                (let ((d (make-instance 'about-dialog
                                        :program-name "Lisp Gtk+ Binding Demo Text Editor"
                                        :version (format nil "0.0.0.1 ~A" #\GREEK_SMALL_LETTER_ALPHA)
@@ -594,7 +602,19 @@
                                        :logo-icon-name "accessories-text-editor")))
                  (dialog-run d)
                  (object-destroy d)))
-             (quit (&rest args) (object-destroy window)))
+             (quit (&rest args) (declare (ignore args)) (object-destroy window))
+             (cb-eval (&rest args) (declare (ignore args))
+               (let ((buffer (text-view-buffer text-view)))
+                 (multiple-value-bind (i1 i2) (text-buffer-get-selection-bounds buffer)
+                   (when (and i1 i2)
+                     (with-gtk-message-error-handler
+                       (let* ((text (text-buffer-slice buffer i1 i2))
+                              (value (eval (read-from-string text)))
+                              (value-str (format nil "~A" value))
+                              (pos (max (text-iter-offset i1) (text-iter-offset i2))))
+                         (text-buffer-insert buffer " => " :position (text-buffer-get-iter-at-offset buffer pos))
+                         (incf pos (length " => "))
+                         (text-buffer-insert buffer value-str :position (text-buffer-get-iter-at-offset buffer pos)))))))))
       (builder-connect-signals-simple builder `(("new" ,#'new)
                                                 ("open" ,#'cb-open)
                                                 ("save" ,#'save)
@@ -604,7 +624,8 @@
                                                 ("paste" ,#'paste)
                                                 ("delete" ,#'cb-delete)
                                                 ("about" ,#'about)
-                                                ("quit" ,#'quit)))
+                                                ("quit" ,#'quit)
+                                                ("eval" ,#'cb-eval)))
       (g-signal-connect window "destroy" (lambda (w) (declare (ignore w)) (gtk-main-quit)))
       (g-signal-connect (text-view-buffer text-view) "changed" (lambda (b) (declare (ignore b)) (setf modified-p t) (set-properties)))
       (widget-show window)