[gtk-cffi-cvs] CVS gtk-cffi/gtk
CVS User rklochkov
rklochkov at common-lisp.net
Sun Aug 19 15:45:26 UTC 2012
Update of /project/gtk-cffi/cvsroot/gtk-cffi/gtk
In directory tiger.common-lisp.net:/tmp/cvs-serv30347
Modified Files:
entry.lisp gtk-cffi.asd package.lisp status-icon.lisp
Log Message:
Summary: GtkScale
--- /project/gtk-cffi/cvsroot/gtk-cffi/gtk/entry.lisp 2012/08/18 13:55:28 1.6
+++ /project/gtk-cffi/cvsroot/gtk-cffi/gtk/entry.lisp 2012/08/19 15:45:26 1.7
@@ -59,8 +59,8 @@
(defslots entry-completion
model pobject
minimum-key-length :int
- text-columns :int
- inline-complection :boolean
+ text-column :int
+ inline-completion :boolean
inline-selection :boolean
popup-completion :boolean
popup-set-width :boolean
@@ -122,6 +122,8 @@
progress-fraction :double
progress-pulse-step :double)
+(defcenum entry-icon-position :primary :secondary)
+
(deffuns entry
(:get text :string &key)
(:set text :string &key)
@@ -133,10 +135,14 @@
(text-index-to-layout-index :int (layout-index :int))
(progress-pulse :void)
(im-context-filter-keypress :boolean (event pobject))
- (reset-im-context :void))
-
-
-
+ (reset-im-context :void)
+ (:get icon-storage-type image-type (icon-pos entry-icon-position))
+ (set-icon-drag-source :void (icon-pos entry-icon-position)
+ (target-list (object target-list))
+ (actions drag-action))
+ (:get current-icon-drag-source :int)
+ (:get icon-at-pos :int (x :int) (y :int)))
+
(defcfun gtk-entry-get-text-area :void (entry pobject)
(area (struct rectangle :out t)))
@@ -147,6 +153,16 @@
(gtk-entry-get-text-area entry r)
r)))
+(defcfun gtk-entry-get-icon-area :void (entry pobject)
+ (icon-pos entry-icon-position) (area (struct rectangle :out t)))
+
+(defgeneric icon-area (entry icon-pos)
+ (:method ((entry entry) icon-pos)
+ (let ((r (make-instance 'rectangle)))
+ (gtk-entry-get-icon-area entry icon-pos r)
+ r)))
+
+
(defcfun gtk-entry-get-layout-offsets :void (entry pobject)
(x :pointer) (y :pointer))
@@ -155,3 +171,35 @@
(gtk-entry-get-layout-offsets entry x y)))
+(template (item type from) ((pixbuf pobject t)
+ (stock :string t)
+ (icon-name :string t)
+ (gicon pobject t)
+ (activatable :boolean nil)
+ (sensitive :boolean nil)
+ (tooltip-text :string nil)
+ (tooltip-markup :string nil))
+ (let ((set-name (if from
+ (symbolicate 'gtk-entry-set-icon-from- item)
+ (symbolicate 'gtk-entry-set-icon- item)))
+ (get-name (symbolicate 'gtk-entry-get-icon-
+ (if (eq item 'icon-name) 'name item)))
+ (lisp-name (symbolicate 'icon- item)))
+ `(progn
+ (defcfun ,set-name :void
+ (entry pobject) (icon-pos entry-icon-position) (,item ,type))
+
+ (defgeneric (setf ,lisp-name) (value entry icon-pos)
+ (:method (value (entry entry) icon-pos)
+ (,set-name entry icon-pos value)))
+
+ (defcfun ,get-name ,type
+ (entry pobject) (icon-pos entry-icon-position))
+
+ (defgeneric ,lisp-name (entry icon-pos)
+ (:method ((entry entry) icon-pos)
+ (,get-name entry icon-pos))))))
+
+(init-slots entry)
+
+
--- /project/gtk-cffi/cvsroot/gtk-cffi/gtk/gtk-cffi.asd 2012/08/18 13:55:28 1.24
+++ /project/gtk-cffi/cvsroot/gtk-cffi/gtk/gtk-cffi.asd 2012/08/19 15:45:26 1.25
@@ -109,9 +109,9 @@
(defsystem gtk-cffi-entry
:description "Interface to GTK/Glib via CFFI"
:author "Roman Klochkov <kalimehtar at mail.ru>"
- :version "0.1"
+ :version "0.99"
:license "LLGPL"
- :depends-on (gtk-cffi-widget)
+ :depends-on (gtk-cffi-image)
:components
((:file entry)))
@@ -516,6 +516,15 @@
:components
((:file color-button)))
+(defsystem gtk-cffi-scale
+ :description "Interface to GTK/Glib via CFFI"
+ :author "Roman Klochkov <kalimehtar at mail.ru>"
+ :version "0.99"
+ :license "LLGPL"
+ :depends-on (gtk-cffi-range)
+ :components
+ ((:file scale)))
+
(defsystem gtk-cffi
:description "Interface to GTK/Glib via CFFI"
@@ -548,5 +557,6 @@
gtk-cffi-image
gtk-cffi-combo-box
gtk-cffi-status-icon
+ gtk-cffi-scale
gtk-cffi-text-view))
--- /project/gtk-cffi/cvsroot/gtk-cffi/gtk/package.lisp 2012/08/18 13:55:28 1.25
+++ /project/gtk-cffi/cvsroot/gtk-cffi/gtk/package.lisp 2012/08/19 15:45:26 1.26
@@ -50,6 +50,11 @@
#:changed
#:value-changed
#:minimum-increment
+
+ #:style-context
+ #:add-provider
+ #:load-css
+ #:junction-sides
#:widget
;; widget slots
@@ -129,6 +134,8 @@
#:preferred-height
#:preferred-width
#:preferred-size
+ #:request-mode
+ #:support-multidevice
;; methods
#:activate
#:show
@@ -179,6 +186,9 @@
#:reset-style
#:queue-compute-expand
#:compute-expand
+ #:add-device-events
+ #:reparent
+ #:unparent
#:pop-composite-child
#:push-composite-child
@@ -203,10 +213,18 @@
;; container slots
#:border-width
#:child-property
+ #:focus-child
+ #:focus-vadjustment
+ #:resize-mode
;; methods
#:add
#:propagate-draw
+ #:accel-group
+ ;; methods
+ #:connect
+ #:disconnect
+
#:window
;; window slots
#:default-size
@@ -242,6 +260,7 @@
#:has-resize-grip
#:application
#:window-size
+ #:has-group
;; methods
#:position-type
#:add-accel-group
@@ -294,7 +313,7 @@
#:remove-page
#:add-action-widget
#:remove-action-widget
- #:update-button-state
+ #:update-buttons-state
#:commit
#:next-page
#:previous-page
@@ -310,7 +329,13 @@
#:list-windows
#:current-grab
#:current-device-grab
-
+
+ #:icon
+ ;; slots
+ #:state-wildcarded
+ #:size-wildcarded
+ #:direction-wildcarded
+
#:dialog
;;methods
#:run
@@ -324,6 +349,7 @@
#:content-area
#:alternative-button-order
#:alternative-dialog-button-order
+ #:widget-for-response
#:about-dialog
;;slots
@@ -342,6 +368,28 @@
#:logo
#:logo-icon-name
+ #:entry-completion
+ ;; slots
+ #:text-column
+ #:minimum-key-length
+ #:inline-completion
+ ;; methods
+ #:insert-action-markup
+ #:insert-action-text
+ #:popup-single-match
+ #:complete
+ #:insert-prefix
+ #:compute-prefix
+ #:completion-prefix
+ #:delete-action
+
+ #:entry-buffer
+ ;; slots
+ #:entry-buffer-length
+ #:bytes
+ ;; methods
+ #:emit-deleted-text
+
#:entry
;; entry slots
#:text
@@ -358,7 +406,23 @@
#:cursor-hadjustment
#:progress-fraction
#:progress-pulse-step
-
+ #:text-length
+ #:placeholder-text
+ #:focus-hadjustment
+ #:inline-selection
+ #:popup-completion
+ #:popup-set-width
+ #:invisible-char
+ #:unset-invisible-char
+ ;; methods
+ #:icon-storage-type
+ #:progress-pulse
+ #:delete-text
+ #:set-icon-drag-source
+ #:layout-index-to-text-index
+ #:text-index-to-layout-index
+ #:current-icon-drag-source
+ #:icon-at-pos
#:button
;; slots
@@ -471,6 +535,7 @@
#:paned
#:h-paned
#:v-paned
+ #:paned-position
#:frame
;; frame slots
@@ -518,6 +583,7 @@
#:column
#:get-cursor
#:with-get-cursor-path
+ #:remove-column
#:tree-view-column
;; tree-view-column slots
@@ -544,12 +610,19 @@
#:add-with-viewport
#:tree-selection
- ;; tree-selection methods
+ ;; slots
+ #:user-data
+ ;; methods
#:mode
#:select-function
#:with-selection
#:get-selected
+ #:text-mark
+ ;; slots
+ #:left-gravity
+ #:deleted
+
#:text-iter
;; slots
#:line
@@ -690,6 +763,7 @@
#:serialize-formats
#:register-serialize-format
#:register-deserialize-format
+ #:lookup
#:text-view
;; slots
@@ -735,7 +809,16 @@
#:text-tag
#:priority
#:event
+ #:ref
+ #:unref
+
+ #:text-appearance
+
+ #:text-tag-table
+ #:text-tag-table-remove
+ #:text-attributes
+
#:appearance
#:direction
#:text-attributes-font
@@ -877,10 +960,17 @@
#:child-pack-direction
#:menu-item
+ ;; slots
#:right-justified
+ #:reserve-indicator
#:use-underline
#:submenu
#:accel-path
+ ;; methods
+ #:toggle-size-request
+ #:toggle-size-allocate
+ #:select
+ #:deselect
#:tool-shell
@@ -898,8 +988,15 @@
#:icon-source
#:image
+ ;; slots
+ #:pixel-size
+ #:animation
#:expander
+ ;; slots
+ #:expanded
+ #:label-fill
+ #:label-widget
#:application
@@ -923,6 +1020,8 @@
#:storage-type
#:info-bar
+
+ #:message-type
#:spinner
@@ -944,6 +1043,7 @@
#:color-button
#:rgba
#:color
+ #:alpha
#:use-alpha
#:title
))
--- /project/gtk-cffi/cvsroot/gtk-cffi/gtk/status-icon.lisp 2012/07/31 17:57:12 1.1
+++ /project/gtk-cffi/cvsroot/gtk-cffi/gtk/status-icon.lisp 2012/08/19 15:45:26 1.2
@@ -67,7 +67,7 @@
(defgeneric geometry (status-icon)
(:method ((status-icon status-icon))
(let ((area (make-instance 'rectangle)))
- (with-foreign-objects ((screen :pointer) (orientation orientation))
+ (with-foreign-objects ((screen :pointer) (orientation 'orientation))
(when (gtk-status-icon-get-geometry status-icon screen area orientation)
(list (make-instance 'screen :pointer (mem-ref screen :pointer))
area (mem-ref orientation 'orientation)))))))
More information about the gtk-cffi-cvs
mailing list