Browse files

Merge branch 'nixz-master' into devel

  • Loading branch information...
2 parents 0005e9e + 262394b commit 9e7101f5258cbcafaeff3fea0699f6a95c0c2875 @patzy patzy committed May 14, 2016
Showing with 6 additions and 2 deletions.
  1. +2 −2 src/x11/glop-x11.lisp
  2. +1 −0 src/x11/package.lisp
  3. +3 −0 src/x11/xlib.lisp
View
4 src/x11/glop-x11.lisp
@@ -126,8 +126,8 @@
(fb-config x11-window-fb-config)
(win-title window-title))
win
- (setf display (glop-xlib:x-open-display)
- screen 0)
+ (setf display (glop-xlib:x-open-display))
+ (setf screen (glop-xlib:default-screen display))
(multiple-value-bind (glx-major glx-minor)
(glop-glx:glx-get-version display)
(if (and (>= glx-major 1)
View
1 src/x11/package.lisp
@@ -4,6 +4,7 @@
(:use #:cl #:cffi)
(:export #:visual-info #:bool #:drawable
#:x-open-display #:x-create-window #:x-default-root-window
+ #:default-screen
#:x-store-name #:x-flush #:x-map-raised #:x-unmap-window
#:x-destroy-window #:x-close-display #:x-next-event
#:x-free #:x-intern-atom #:x-set-wm-protocols
View
3 src/x11/xlib.lisp
@@ -292,6 +292,9 @@
(display-ptr :pointer)
(screen :int))
+(defcfun ("XDefaultScreen" default-screen) :int
+ (display-ptr :pointer))
+
(defcfun ("XRootWindow" root-window) :int
(display-ptr :pointer)
(screen :int))

0 comments on commit 9e7101f

Please sign in to comment.