Skip to content
This repository was archived by the owner on Jul 26, 2021. It is now read-only.
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 3 additions & 4 deletions gdk/gdk.color.lisp
Original file line number Diff line number Diff line change
Expand Up @@ -208,7 +208,7 @@
(spec :string)
(color (g-boxed-foreign gdk-color)))

(defun gdk-color-parse (color-spec)
(defun gdk-color-parse (color-spec &optional (color (make-gdk-color)))
#+cl-cffi-gtk-documentation
"@version{2016-1-2}
@argument[spec]{the string specifying the color}
Expand All @@ -232,9 +232,8 @@
@see-class{gdk-color}
@see-class{gdk-rgba}
@see-function{gdk-color-to-string}"
(let ((color (make-gdk-color)))
(when (%gdk-color-parse color-spec color)
color)))
(when (%gdk-color-parse color-spec color)
color))

(export 'gdk-color-parse)

Expand Down
14 changes: 6 additions & 8 deletions gdk/gdk.monitor.lisp
Original file line number Diff line number Diff line change
Expand Up @@ -101,10 +101,9 @@
(geometry (g-boxed-foreign gdk-rectangle)))

#+gdk-3-22
(defun gdk-monitor-get-geometry (monitor)
(let ((geometry (make-gdk-rectangle)))
(%gdk-monitor-get-geometry monitor geometry)
geometry))
(defun gdk-monitor-get-geometry (monitor &optional (geometry (make-gdk-rectangle)))
(%gdk-monitor-get-geometry monitor geometry)
geometry)

#+gdk-3-22
(export 'gdk-monitor-get-geometry)
Expand All @@ -115,10 +114,9 @@
(workarea (g-boxed-foreign gdk-rectangle)))

#+gdk-3-22
(defun gdk-monitor-get-workarea (monitor)
(let ((workarea (make-gdk-rectangle)))
(%gdk-monitor-get-workarea monitor workarea)
workarea))
(defun gdk-monitor-get-workarea (monitor &optional (workarea (make-gdk-rectangle)))
(%gdk-monitor-get-workarea monitor workarea)
workarea)

#+gdk-3-22
(export 'gdk-monitor-get-workarea)
Expand Down
15 changes: 7 additions & 8 deletions gdk/gdk.rectangle.lisp
Original file line number Diff line number Diff line change
Expand Up @@ -224,7 +224,7 @@
(src-2 (g-boxed-foreign gdk-rectangle))
(dest (g-boxed-foreign gdk-rectangle)))

(defun gdk-rectangle-intersect (src-1 src-2)
(defun gdk-rectangle-intersect (src-1 src-2 &optional (dest (make-gdk-rectangle)))
#+cl-cffi-gtk-documentation
"@version{2013-7-3}
@argument[src1]{a @class{gdk-rectangle} structure}
Expand All @@ -235,9 +235,9 @@
@end{short}
If the rectangles do not intersect, the intersection @arg{width} and
@arg{height} is set to 0 and its @arg{x} and @arg{y} values are undefined."
(let ((dest (make-gdk-rectangle)))
(when (%gdk-rectangle-intersect src-1 src-2 dest)
dest)))
(if (%gdk-rectangle-intersect src-1 src-2 dest)
(values dest T)
(values NIL NIL)))

(export 'gdk-rectangle-intersect)

Expand All @@ -250,7 +250,7 @@
(src-2 (g-boxed-foreign gdk-rectangle))
(dest (g-boxed-foreign gdk-rectangle)))

(defun gdk-rectangle-union (src-1 src-2)
(defun gdk-rectangle-union (src-1 src-2 &optional (dest (make-gdk-rectangle)))
#+cl-cffi-gtk-documentation
"@version{2013-7-3}
@argument[src1]{a @class{gdk-rectangle} structure}
Expand All @@ -261,9 +261,8 @@
@end{short}
The union of rectangles @arg{src1} and @arg{src2} is the smallest rectangle
which includes both @arg{src1} and @arg{src2} within it."
(let ((dest (make-gdk-rectangle)))
(%gdk-rectangle-union src-1 src-2 dest)
dest))
(%gdk-rectangle-union src-1 src-2 dest)
dest)

(export 'gdk-rectangle-union)

Expand Down
7 changes: 3 additions & 4 deletions gdk/gdk.rgba.lisp
Original file line number Diff line number Diff line change
Expand Up @@ -219,7 +219,7 @@
(rgba (g-boxed-foreign gdk-rgba))
(spec :string))

(defun gdk-rgba-parse (spec)
(defun gdk-rgba-parse (spec &optional (rgba (make-gdk-rgba)))
#+cl-cffi-gtk-documentation
"@version{2013-8-17}
@argument[spec]{the string specifying the color}
Expand Down Expand Up @@ -247,9 +247,8 @@
Since 3.0
@see-class{gdk-rgba}
@see-function{gdk-rgba-to-string}"
(let ((rgba (make-gdk-rgba)))
(when (%gdk-rgba-parse rgba spec)
rgba)))
(when (%gdk-rgba-parse rgba spec)
rgba))

(export 'gdk-rgba-parse)

Expand Down
14 changes: 6 additions & 8 deletions gdk/gdk.screen.lisp
Original file line number Diff line number Diff line change
Expand Up @@ -608,7 +608,7 @@
(monitor-num :int)
(dest (g-boxed-foreign gdk-rectangle)))

(defun gdk-screen-get-monitor-geometry (screen monitor-num)
(defun gdk-screen-get-monitor-geometry (screen monitor-num &optional (dest (make-gdk-rectangle)))
#+cl-cffi-gtk-documentation
"@version{2013-6-17}
@argument[screen]{a @class{gdk-screen} object}
Expand All @@ -630,9 +630,8 @@
@see-function{gdk-screen-get-n-monitors}
@see-function{gdk-screen-get-width}
@see-function{gdk-screen-get-height}"
(let ((dest (make-gdk-rectangle)))
(%gdk-screen-get-monitor-geometry screen monitor-num dest)
dest))
(%gdk-screen-get-monitor-geometry screen monitor-num dest)
dest)

(export 'gdk-screen-get-monitor-geometry)

Expand All @@ -647,7 +646,7 @@
(monitor-num :int)
(dest (g-boxed-foreign gdk-rectangle)))

(defun gdk-screen-get-monitor-workarea (screen monitor-num)
(defun gdk-screen-get-monitor-workarea (screen monitor-num &optional (dest (make-gdk-rectangle)))
#+cl-cffi-gtk-documentation
"@version{2013-6-17}
@argument[screen]{a @class{gdk-screen} object}
Expand All @@ -668,9 +667,8 @@
Since 3.4
@see-class{gdk-screen}
@see-function{gdk-screen-get-n-monitors}"
(let ((dest (make-gdk-rectangle)))
(%gdk-screen-get-monitor-workarea screen monitor-num dest)
dest))
(%gdk-screen-get-monitor-workarea screen monitor-num dest)
dest)

(export 'gdk-screen-get-monitor-workarea)

Expand Down
7 changes: 3 additions & 4 deletions gdk/gdk.window.lisp
Original file line number Diff line number Diff line change
Expand Up @@ -4690,7 +4690,7 @@
(window (g-object gdk-window))
(rectangle (g-boxed-foreign gdk-rectangle)))

(defun gdk-window-get-frame-extents (window)
(defun gdk-window-get-frame-extents (window &optional (rectangle (make-gdk-rectangle)))
#+cl-cffi-gtk-documentation
"@version{2013-9-1}
@argument[window]{a toplevel @class{gdk-window} object}
Expand All @@ -4706,9 +4706,8 @@
the function @fun{gdk-window-get-origin}.
@see-class{gdk-window}
@see-function{gdk-window-get-origin}"
(let ((rectangle (make-gdk-rectangle)))
(%gdk-window-get-frame-extents window rectangle)
rectangle))
(%gdk-window-get-frame-extents window rectangle)
rectangle)

(export 'gdk-window-get-frame-extents)

Expand Down
15 changes: 6 additions & 9 deletions gtk/gtk.array-list-store.lisp
Original file line number Diff line number Diff line change
Expand Up @@ -32,10 +32,9 @@

(export 'store-item)

(defun store-add-item (store item)
(defun store-add-item (store item &optional (iter (make-gtk-tree-iter)))
(vector-push-extend item (store-items store))
(let* ((path (apply #'gtk-tree-path-new-from-indices (list (1- (length (store-items store))))))
(iter (make-gtk-tree-iter)))
(let ((path (apply #'gtk-tree-path-new-from-indices (list (1- (length (store-items store)))))))
(setf (gtk-tree-iter-stamp iter)
0
(gtk-tree-iter-user-data iter)
Expand Down Expand Up @@ -372,25 +371,23 @@

;;; ----------------------------------------------------------------------------

(defun notice-tree-node-insertion (tree node child index)
(defun notice-tree-node-insertion (tree node child index &optional (iter (make-gtk-tree-iter)))
(declare (ignore node index))
(when tree
(let* ((path (apply #'gtk-tree-path-new-from-indices (get-node-path child)))
(iter (make-gtk-tree-iter)))
(let ((path (apply #'gtk-tree-path-new-from-indices (get-node-path child))))
(setf (gtk-tree-iter-stamp iter) 0
(gtk-tree-iter-user-data iter) (get-assigned-id tree child))
(g-signal-emit tree "row-inserted" path iter)
(when (plusp (length (tree-node-children child)))
(g-signal-emit tree "row-has-child-toggled" path iter)))))

(defun notice-tree-node-removal (tree node child index)
(defun notice-tree-node-removal (tree node child index &optional (iter (make-gtk-tree-iter)))
(declare (ignore child))
(when tree
(let ((path (apply #'gtk-tree-path-new-from-indices (nconc (get-node-path node) (list index)))))
(g-signal-emit tree "row-deleted" path))
(when (zerop (length (tree-node-children node)))
(let* ((path (apply #'gtk-tree-path-new-from-indices (get-node-path node)))
(iter (make-gtk-tree-iter)))
(let ((path (apply #'gtk-tree-path-new-from-indices (get-node-path node))))
(setf (gtk-tree-iter-stamp iter)
0
(gtk-tree-iter-user-data iter)
Expand Down
7 changes: 3 additions & 4 deletions gtk/gtk.cell-view.lisp
Original file line number Diff line number Diff line change
Expand Up @@ -506,7 +506,7 @@
(path (g-boxed-foreign gtk-tree-path))
(requisition (g-boxed-foreign gtk-requisition)))

(defun gtk-cell-view-get-size-of-row (cell-view path)
(defun gtk-cell-view-get-size-of-row (cell-view path &optional (requisition (make-gtk-requisition)))
#+cl-cffi-gtk-documentation
"@version{2013-6-19}
@argument[cell-view]{a @class{gtk-cell-view}}
Expand All @@ -527,9 +527,8 @@

Since 2.6
@see-function{gtk-widget-get-preferred-size}"
(let ((requisition (make-gtk-requisition)))
(%gtk-cell-view-get-size-of-row cell-view path requisition)
requisition))
(%gtk-cell-view-get-size-of-row cell-view path requisition)
requisition)

(export 'gtk-cell-view-get-size-of-row)

Expand Down
7 changes: 3 additions & 4 deletions gtk/gtk.combo-box.lisp
Original file line number Diff line number Diff line change
Expand Up @@ -1041,7 +1041,7 @@
(combo-box g-object)
(iter (g-boxed-foreign gtk-tree-iter)))

(defun gtk-combo-box-get-active-iter (combo-box)
(defun gtk-combo-box-get-active-iter (combo-box &optional (iter (make-gtk-tree-iter)))
#+cl-cffi-gtk-documentation
"@version{2013-8-3}
@argument[combo-box]{a @class{gtk-combo-box} widget}
Expand All @@ -1053,9 +1053,8 @@
Since 2.4
@see-class{gtk-combo-box}
@see-function{gtk-combo-box-set-active-iter}"
(let ((iter (make-gtk-tree-iter)))
(when (%gtk-combo-box-get-active-iter combo-box iter)
iter)))
(when (%gtk-combo-box-get-active-iter combo-box iter)
iter))

(export 'gtk-combo-box-get-active-iter)

Expand Down
14 changes: 6 additions & 8 deletions gtk/gtk.entry.lisp
Original file line number Diff line number Diff line change
Expand Up @@ -1994,7 +1994,7 @@
(entry (g-object gtk-entry))
(text-area (g-boxed-foreign gdk-rectangle)))

(defun gtk-entry-get-text-area (entry)
(defun gtk-entry-get-text-area (entry &optional (text-area (make-gdk-rectangle)))
#+cl-cffi-gtk-documentation
"@version{2014-6-8}
@argument[entry]{a @class{gtk-entry} widget}
Expand All @@ -2011,9 +2011,8 @@
Since 3.0
@see-class{gtk-entry}
@see-function{gtk-entry-get-icon-area}"
(let ((text-area (make-gdk-rectangle)))
(%gtk-entry-get-text-area entry text-area)
text-area))
(%gtk-entry-get-text-area entry text-area)
text-area)

(export 'gtk-entry-get-text-area)

Expand Down Expand Up @@ -2966,7 +2965,7 @@
(icon-pos gtk-entry-icon-position)
(icon-area (g-boxed-foreign gdk-rectangle)))

(defun gtk-entry-get-icon-area (entry icon-pos)
(defun gtk-entry-get-icon-area (entry icon-pos &optional (icon-area (make-gdk-rectangle)))
#+cl-cffi-gtk-documentation
"@version{2014-11-9}
@argument[entry]{a @class{gtk-entry} widget}
Expand All @@ -2986,9 +2985,8 @@
Since 3.0
@see-class{gtk-entry}
@see-function{gtk-entry-get-text-area}"
(let ((icon-area (make-gdk-rectangle)))
(%gtk-entry-get-icon-area entry icon-pos icon-area)
icon-area))
(%gtk-entry-get-icon-area entry icon-pos icon-area)
icon-area)

(export 'gtk-entry-get-icon-area)

Expand Down
36 changes: 17 additions & 19 deletions gtk/gtk.icon-view.lisp
Original file line number Diff line number Diff line change
Expand Up @@ -1588,7 +1588,7 @@
(rect (g-boxed-foreign gdk-rectangle)))

#+gtk-3-6
(defun gtk-icon-view-get-cell-rect (icon-view path cell)
(defun gtk-icon-view-get-cell-rect (icon-view path cell &optional (rect (make-gdk-rectangle)))
#+cl-cffi-gtk-documentation
"@version{2013-9-27}
@argument[icon-view]{a @class{gtk-icon-view} widget}
Expand All @@ -1604,9 +1604,8 @@

Since 3.6
@see-class{gtk-icon-view}"
(let ((rect (make-gdk-rectangle)))
(when (%gtk-icon-view-get-cell-rect icon-view path cell rect)
rect)))
(when (%gtk-icon-view-get-cell-rect icon-view path cell rect)
rect))

#+gtk-3-6
(export 'gtk-icon-view-get-cell-rect)
Expand Down Expand Up @@ -1899,7 +1898,7 @@
(path (:pointer (g-boxed-foreign gtk-tree-path)))
(iter (g-boxed-foreign gtk-tree-iter)))

(defun gtk-icon-view-get-tooltip-context (icon-view x y keyboard-tip)
(defun gtk-icon-view-get-tooltip-context (icon-view x y keyboard-tip &optional (iter (make-gtk-tree-iter)))
#+cl-cffi-gtk-documentation
"@version{2013-6-20}
@argument[icon-view]{a @class{gtk-icon-view} widget}
Expand Down Expand Up @@ -1935,20 +1934,19 @@
(path-ptr :pointer))
(setf (mem-ref xx :int) x
(mem-ref yy :int) y)
(let ((iter (make-gtk-tree-iter)))
(when (%gtk-icon-view-get-tooltip-context icon-view
xx
yy
keyboard-tip
model-ptr
path-ptr
iter)
(values (mem-ref xx :int) (mem-ref yy :int)
(convert-from-foreign (mem-ref model-ptr :pointer)
'(g-object gtk-tree-model))
(convert-from-foreign (mem-ref path-ptr :pointer)
'(g-boxed-foreign gtk-tree-path :return))
iter)))))
(when (%gtk-icon-view-get-tooltip-context icon-view
xx
yy
keyboard-tip
model-ptr
path-ptr
iter)
(values (mem-ref xx :int) (mem-ref yy :int)
(convert-from-foreign (mem-ref model-ptr :pointer)
'(g-object gtk-tree-model))
(convert-from-foreign (mem-ref path-ptr :pointer)
'(g-boxed-foreign gtk-tree-path :return))
iter))))

(export 'gtk-icon-view-get-tooltip-context)

Expand Down
Loading