summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGravatar Tom Willemse2013-05-16 20:15:08 +0200
committerGravatar Tom Willemse2013-05-16 20:15:08 +0200
commitf4ebc8aebb990934a7ee59dde2d951424ab928a8 (patch)
tree11b175f24414a1725b873690e0d936305cccef03
parentb508c40f18ec37d65982d358c73d15a2a4708c82 (diff)
downloadexoni-stumpwm.tar.gz
exoni-stumpwm.zip
Try another patchstumpwm
-rw-r--r--packages/x11-wm/stumpwm/files/stumpwm-hex-colours.patch10
1 files changed, 6 insertions, 4 deletions
diff --git a/packages/x11-wm/stumpwm/files/stumpwm-hex-colours.patch b/packages/x11-wm/stumpwm/files/stumpwm-hex-colours.patch
index 3541645..c1f5929 100644
--- a/packages/x11-wm/stumpwm/files/stumpwm-hex-colours.patch
+++ b/packages/x11-wm/stumpwm/files/stumpwm-hex-colours.patch
@@ -1,12 +1,14 @@
diff --git a/color.lisp b/color.lisp
-index 30396bc..57cebf1 100644
+index 2085fbc..5ada58a 100644
--- a/color.lisp
+++ b/color.lisp
-@@ -66,29 +66,38 @@ then call (update-color-map).")
+@@ -66,31 +66,38 @@ then call (update-color-map).")
(xlib:alloc-color (xlib:screen-default-colormap (screen-number screen)) color))
(defun lookup-color (screen color)
-- (xlib:lookup-color (xlib:screen-default-colormap (screen-number screen)) color))
+- (cond
+- ((typep color 'xlib:color) color)
+- (t (xlib:lookup-color (xlib:screen-default-colormap (screen-number screen)) color))))
+ (flet ((hex ()
+ (apply #'xlib:make-color
+ (loop for (x y) in '((:red 16) (:green 8) (:blue 0))
@@ -23,7 +25,7 @@ index 30396bc..57cebf1 100644
- (let ((scm (xlib:screen-default-colormap (screen-number screen))))
- (labels ((map-colors (amt)
- (loop for c in *colors*
-- as color = (xlib:lookup-color scm c)
+- as color = (lookup-color screen c)
- do (adjust-color color amt)
- collect (xlib:alloc-color scm color))))
- (setf (screen-color-map-normal screen) (apply #'vector (map-colors -0.25))