Changeset 9831 in project

Timestamp:

03/16/08 23:06:44 (13 years ago)

Author:

hans

Message:

dfb-struct: printer writes slot values with (write)
dfbid-key-symbol is now mapped to a scheme character
added enum definition for dfbid-key-identifier

Location:

release/2/directfb/trunk

Files:

• dfb-struct.scm (modified) (1 diff)
• directfb-base.scm (modified) (2 diffs)

release/2/directfb/trunk/dfb-struct.scm

@@ -136 +136 @@
                              (display ,(slot-keyword slot) ,g-port)
                              (display #\space ,g-port)
-                             (display ,g-val ,g-port)))))
+                             (write ,g-val ,g-port)))))
                   opt-slots)
            (display #\> ,g-port))))

release/2/directfb/trunk/directfb-base.scm

@@ -163 +163 @@
 (define-foreign-type dfb-window-id unsigned-int)
 (define-foreign-type dfb-text-encoding-id unsigned-int)
-(define-foreign-type dfbid-key-identifier int)
-(define-foreign-type dfbid-key-symbol int)
+(define-foreign-type dfbid-key-symbol int char->integer integer->char)
 (define-foreign-type dfbid-key-state bool)
 (define-foreign-type dfbid-button-identifier int)
@@ -170 +169 @@
 (define-foreign-type dfbid-button-state bool)
 (define-foreign-type dfbid-axis-identifier int)
+
+(define-foreign-open-enum (dfbid-key-identifier int) (strip-prefix: DIKI_)
+  DIKI_UNKNOWN DIKI_A DIKI_B DIKI_C DIKI_D DIKI_E DIKI_F DIKI_G DIKI_H
+  DIKI_I DIKI_J DIKI_K DIKI_L DIKI_M DIKI_N DIKI_O DIKI_P DIKI_Q DIKI_R
+  DIKI_S DIKI_T DIKI_U DIKI_V DIKI_W DIKI_X DIKI_Y DIKI_Z
+
+  DIKI_0 DIKI_1 DIKI_2 DIKI_3 DIKI_4 DIKI_5 DIKI_6 DIKI_7 DIKI_8 DIKI_9
+
+  DIKI_F1 DIKI_F2 DIKI_F3 DIKI_F4 DIKI_F5 DIKI_F6 DIKI_F7 DIKI_F8 DIKI_F9
+  DIKI_F10 DIKI_F11 DIKI_F12
+
+  DIKI_SHIFT_L DIKI_SHIFT_R DIKI_CONTROL_L DIKI_CONTROL_R DIKI_ALT_L DIKI_ALT_R
+  DIKI_META_L DIKI_META_R DIKI_SUPER_L DIKI_SUPER_R DIKI_HYPER_L DIKI_HYPER_R
+
+  DIKI_CAPS_LOCK DIKI_NUM_LOCK DIKI_SCROLL_LOCK
+
+  DIKI_ESCAPE DIKI_LEFT DIKI_RIGHT DIKI_UP DIKI_DOWN DIKI_TAB DIKI_ENTER
+  DIKI_SPACE DIKI_BACKSPACE DIKI_INSERT DIKI_DELETE DIKI_HOME DIKI_END
+  DIKI_PAGE_UP DIKI_PAGE_DOWN DIKI_PRINT DIKI_PAUSE
+
+  DIKI_QUOTE_LEFT DIKI_MINUS_SIGN DIKI_EQUALS_SIGN DIKI_BRACKET_LEFT
+  DIKI_BRACKET_RIGHT DIKI_BACKSLASH DIKI_SEMICOLON DIKI_QUOTE_RIGHT
+  DIKI_COMMA DIKI_PERIOD DIKI_SLASH DIKI_LESS_SIGN
+
+  DIKI_KP_DIV DIKI_KP_MULT DIKI_KP_MINUS DIKI_KP_PLUS DIKI_KP_ENTER
+  DIKI_KP_SPACE DIKI_KP_TAB DIKI_KP_F1 DIKI_KP_F2 DIKI_KP_F3
+  DIKI_KP_F4 DIKI_KP_EQUAL DIKI_KP_SEPARATOR
+
+  DIKI_KP_DECIMAL DIKI_KP_0 DIKI_KP_1 DIKI_KP_2 DIKI_KP_3 DIKI_KP_4
+  DIKI_KP_5 DIKI_KP_6 DIKI_KP_7 DIKI_KP_8 DIKI_KP_9)
 
 (define-foreign-bitfield (dfbdl-type-flags int) (strip-prefix: DLTF_)