Some package cleanup

src/win32/package.lisp

@@ -10,3 +10,7 @@
            #:destroy-window #:unregister-class #:swap-buffers #:next-event
            #:set-video-mode #:show-cursor
            #:%event%))
+(defpackage :glop-wgl
+  (:use #:cl #:cffi #:glop-win32)
+  (:export #:wgl-get-proc-address #:wgl-create-context #:wgl-delete-context
+           #:wgl-make-current))

src/win32/wgl.lisp

@@ -1,10 +1,6 @@
 ;;;; -*- Mode: Lisp; Syntax: ANSI-Common-Lisp; Base: 10; indent-tabs-mode: nil -*-
 
 ;; WGL bindings
-(defpackage :glop-wgl
-  (:use #:cl #:cffi #:glop-win32)
-  (:export #:wgl-get-proc-address #:wgl-create-context #:wgl-delete-context
-           #:wgl-make-current))
 
 (in-package #:glop-wgl)
 

src/x11/glx.lisp

@@ -1,15 +1,6 @@
 ;;;; -*- Mode: Lisp; Syntax: ANSI-Common-Lisp; Base: 10; indent-tabs-mode: nil -*-
 
 ;;; GLX bindings
-(defpackage :glop-glx
-  (:use #:cl #:cffi #:glop-xlib)
-  (:export #:glx-get-proc-address #:correct-context? #:glx-destroy-context
-           #:glx-create-specific-context #:glx-create-context
-           #:glx-get-version
-           #:glx-make-current #:glx-release-context #:glx-choose-fb-config
-           #:glx-get-visual-from-fb-config #:glx-choose-visual
-           #:glx-wait-gl #:glx-swap-buffers))
-
 (in-package #:glop-glx)
 
 (defcenum (glx-attributes :int)

src/x11/keysymdef.lisp

@@ -1,7 +1,7 @@
 (in-package :glop-xlib)
 
 ;;; Taken from X11's keysymdef.h header, capital- prefixed on redundant symbols, with deprecated entries removed.
-(cffi:defcenum keysym
+(defcenum x-keysym-value
   (:voidsymbol #xffffff)              ; void symbol
   ;; tty function keys, cleverly chosen to map to ascii, for convenience of
   ;; programming, but could have been arbitrary (at the cost of lookup

src/x11/package.lisp

@@ -13,3 +13,12 @@
            #:x-free-cursor
            #:current-mode #:set-mode #:supported-modes
            #:xkb-set-detectable-auto-repeat))
+
+(defpackage :glop-glx
+  (:use #:cl #:cffi #:glop-xlib)
+  (:export #:glx-get-proc-address #:correct-context? #:glx-destroy-context
+           #:glx-create-specific-context #:glx-create-context
+           #:glx-get-version
+           #:glx-make-current #:glx-release-context #:glx-choose-fb-config
+           #:glx-get-visual-from-fb-config #:glx-choose-visual
+           #:glx-wait-gl #:glx-swap-buffers))

src/x11/xlib.lisp

@@ -269,32 +269,6 @@
 (defcstruct x-compose-status
     (compose-ptr :pointer) (chars-matched :int))
 
-;; Only define interesting keysym and just use iso-8859-1 for the remaining ones
-;; too many keysyms exists and I don't want to write so many things right now.
-;; TODO: add keypad support but I don't have it on the laptop here
-(defcenum x-keysym-value
-  ;; cursor control & motion
-  (:key-left #xff51)
-  :key-up
-  :key-right
-  :key-down
-  :key-page-up
-  :key-page-down
-  :key-end
-  :key-begin
-  ;; function keys
-  (:key-f1 #xffbe)
-  :key-f2
-  :key-f3
-  :key-f4
-  :key-f5
-  :key-f6
-  :key-f7
-  :key-f8
-  :key-f9
-  :key-f10
-  :key-f11)
-
 (defctype x-status :int)
 
 (defctype x-queued-mode :int)
@@ -556,12 +530,12 @@
 
 (defun x-lookup-string (key-event)
   "Returns the input string corresponding to a keypress."
-  (with-foreign-objects ((buffer :char 32) (keysym 'keysym))
+  (with-foreign-objects ((buffer :char 32) (keysym 'x-keysym-value))
     #+ccl(loop for i below 32 do (setf (mem-aref buffer :char i) 0)) ;; buffer is not zeroed in cll
     (%x-lookup-string key-event buffer 32 keysym (null-pointer))
     (let ((string (foreign-string-to-lisp buffer)))
       (values (if (zerop (length string)) nil string)
-              (mem-ref keysym 'keysym)))))
+              (mem-ref keysym 'x-keysym-value)))))
 
 (defcfun ("XGetGeometry" %x-get-geometry) x-status
   (display-ptr :pointer) (d drawable) (root-return :pointer)