Raymond Toy pushed to branch rtoy-update-clx-with-cmucl-fixes at cmucl / cmucl

Commits: 60bde987 by Raymond Toy at 2018-12-16T23:58:32Z Import upstream clx version 0.7.5-19-g623c339

Straight copy of sharplispers/clx commit 623c339

- - - - - 48bc44d6 by Raymond Toy at 2018-12-17T00:00:09Z Merge branch 'upstream-clx' into rtoy-update-clx-with-cmucl-fixes

- - - - - 6c18cc63 by Raymond Toy at 2018-12-17T00:45:58Z Compile clx files in the same order as in clx.asd

Ran contrib-demos as a test of clx and everything appears to work correctly.

- - - - -

3 changed files:

- src/clx/depdefs.lisp - src/clx/manual/clx.texinfo - src/tools/clxcom.lisp

Changes:

===================================== src/clx/depdefs.lisp ===================================== @@ -387,9 +387,7 @@ ;; FIXME: maybe we should reevaluate this? (defvar *def-clx-class-use-defclass* #+(or Genera allegro) t - #+(and cmu pcl) '(XLIB:DRAWABLE XLIB:WINDOW XLIB:PIXMAP) - #+(and cmu (not pcl)) nil - #-(or Genera cmu allegro) nil + #-(or Genera allegro) nil "Controls whether DEF-CLX-CLASS uses DEFCLASS.

If it is a list, it is interpreted by DEF-CLX-CLASS to be a list of

===================================== src/clx/manual/clx.texinfo ===================================== @@ -15162,11 +15162,11 @@ a keycode.

@item Convert the keycode into its corresponding keysym, based on the -current keyboard mapping. See @var{keycode->keysym}. +current keyboard mapping. See @var{keycode->keysym}.

@item Convert the keysym into the corresponding Common Lisp character. See -@var{keysym->character}. +@var{keysym->character}. @end enumerate

@menu

===================================== src/tools/clxcom.lisp ===================================== @@ -75,9 +75,15 @@ (comf "target:clx/extensions/glx" :load t) (comf "target:clx/extensions/gl" :load t) (comf "target:clx/extensions/dpms" :load t) + (comf "target:clx/extensions/xtest" :load t) (comf "target:clx/extensions/screensaver" :load t) + (comf "target:clx/extensions/randr" :load t) (comf "target:clx/extensions/xinerama" :load t) - (comf "target:clx/extensions/xtest" :load t)) + (comf "target:clx/extensions/dbe" :load t) + (comf "target:clx/extensions/xc-misc" :load t) + (comf "target:clx/extensions/dri2" :load t) + (comf "target:clx/extensions/composite" :load t) + ) (comf "target:code/clx-ext") (comf "target:hemlock/charmacs" :load t) (comf "target:hemlock/key-event" :load t)

View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/compare/81e08b4c44f842db6e07cf648...