~mdw
/
clg
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Initial checkin, parts of the code moved from glib/ffi.lisp
[clg]
/
gdk
/
gdktypes.lisp
diff --git
a/gdk/gdktypes.lisp
b/gdk/gdktypes.lisp
index
01ddf68
..
07a303b
100644
(file)
--- a/
gdk/gdktypes.lisp
+++ b/
gdk/gdktypes.lisp
@@
-20,7
+20,7
@@
;; TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
;; SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
;; TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
;; SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-;; $Id: gdktypes.lisp,v 1.
19 2005-04-23 16:48:50
espen Exp $
+;; $Id: gdktypes.lisp,v 1.
23 2006-04-10 18:16:24
espen Exp $
(in-package "GDK")
(in-package "GDK")
@@
-36,19
+36,19
@@
(defclass color (boxed)
((pixel
:allocation :alien
(defclass color (boxed)
((pixel
:allocation :alien
- :type
unsigned-long
)
+ :type
(unsigned 32)
)
(red
:allocation :alien
:accessor color-red
(red
:allocation :alien
:accessor color-red
- :type
unsigned-short
)
+ :type
(unsigned 16)
)
(green
(green
- :allocation :alien
+ :allocation :alien
:offset 6
:accessor color-green
:accessor color-green
- :type
unsigned-short
)
+ :type
(unsigned 16)
)
(blue
(blue
- :allocation :alien
+ :allocation :alien
:offset 8
:accessor color-blue
:accessor color-blue
- :type
unsigned-short
))
+ :type
(unsigned 16)
))
(:metaclass boxed-class))
(:metaclass boxed-class))
@@
-83,6
+83,8
@@
(:metaclass boxed-class))
(:metaclass boxed-class))
+
+
(define-types-by-introspection "Gdk"
("GdkFunction" :type gc-function)
("GdkWMDecoration" :type wm-decoration)
(define-types-by-introspection "Gdk"
("GdkFunction" :type gc-function)
("GdkWMDecoration" :type wm-decoration)
@@
-96,10
+98,11
@@
("GdkGCX11" :ignore t)
("GdkColor" :ignore t)
("GdkEvent" :ignore t)
("GdkGCX11" :ignore t)
("GdkColor" :ignore t)
("GdkEvent" :ignore t)
- ("GdkRectngle" :ignore t)
+ ("GdkRect
a
ngle" :ignore t)
("GdkCursor" :ignore t)
("GdkFont" :ignore t) ; deprecated
("GdkEventMask" :ignore t) ; manually defined
("GdkCursor" :ignore t)
("GdkFont" :ignore t) ; deprecated
("GdkEventMask" :ignore t) ; manually defined
+ ("GdkModifierType" :ignore t) ; manually defined
("GdkDisplay"
:slots
("GdkDisplay"
:slots
@@
-266,3
+269,10
@@
:initarg :gravity
:type gravity))
(:metaclass struct-class))
:initarg :gravity
:type gravity))
(:metaclass struct-class))
+
+(define-flags-type modifier-type
+ :shift :lock :control :mod1 :mod2 :mod3 :mod4 :mod5
+ :button1 :button2 :button3 :button4 :button5
+ (:release #.(ash 1 30)))
+
+(deftype native-window () '(unsigned 32))