Try different patch

This commit is contained in:
Tom Willemse 2013-05-16 20:09:39 +02:00
parent a50a862439
commit b508c40f18
2 changed files with 23 additions and 18 deletions

View file

@ -1,7 +1,8 @@
diff -r 6a36c0456b66 color.lisp
--- a/color.lisp Wed Dec 28 16:09:48 2011 +0100
+++ b/color.lisp Tue Jan 03 18:44:44 2012 +0100
@@ -66,29 +66,38 @@
diff --git a/color.lisp b/color.lisp
index 30396bc..57cebf1 100644
--- a/color.lisp
+++ b/color.lisp
@@ -66,29 +66,38 @@ then call (update-color-map).")
(xlib:alloc-color (xlib:screen-default-colormap (screen-number screen)) color))
(defun lookup-color (screen color)
@ -56,10 +57,11 @@ diff -r 6a36c0456b66 color.lisp
(defun get-bg-color (screen cc color)
(setf *background* color)
diff -r 6a36c0456b66 mode-line.lisp
--- a/mode-line.lisp Wed Dec 28 16:09:48 2011 +0100
+++ b/mode-line.lisp Tue Jan 03 18:44:44 2012 +0100
@@ -307,8 +307,8 @@
diff --git a/mode-line.lisp b/mode-line.lisp
index d30dfb9..42c3bc2 100644
--- a/mode-line.lisp
+++ b/mode-line.lisp
@@ -282,8 +282,8 @@ critical."
(xlib:create-window
:parent parent
:x 0 :y 0 :width 1 :height 1
@ -70,7 +72,7 @@ diff -r 6a36c0456b66 mode-line.lisp
:border-width *mode-line-border-width*
;; You can click the modeline
:event-mask (xlib:make-event-mask :button-press :exposure)
@@ -375,15 +375,16 @@
@@ -350,15 +350,16 @@ critical."
(defun make-mode-line-gc (window screen)
(xlib:create-gcontext :drawable window
:font (screen-font screen)
@ -90,9 +92,10 @@ diff -r 6a36c0456b66 mode-line.lisp
(setf (ccontext-default-bright cc) (alloc-color screen bright))))
(defun make-head-mode-line (screen head format)
diff -r 6a36c0456b66 primitives.lisp
--- a/primitives.lisp Wed Dec 28 16:09:48 2011 +0100
+++ b/primitives.lisp Tue Jan 03 18:44:44 2012 +0100
diff --git a/primitives.lisp b/primitives.lisp
index 50d062e..c37a028 100644
--- a/primitives.lisp
+++ b/primitives.lisp
@@ -109,6 +109,7 @@
*default-group-name*
*window-border-style*
@ -101,7 +104,7 @@ diff -r 6a36c0456b66 primitives.lisp
add-hook
clear-window-placement-rules
concat
@@ -154,6 +155,9 @@
@@ -153,6 +154,9 @@ be an integer.")
(defvar *grab-pointer-count* 0
"The number of times the pointer has been grabbed")
@ -111,10 +114,11 @@ diff -r 6a36c0456b66 primitives.lisp
;;; Hooks
(defvar *command-mode-start-hook* '(command-mode-start-message)
diff -r 6a36c0456b66 screen.lisp
--- a/screen.lisp Wed Dec 28 16:09:48 2011 +0100
+++ b/screen.lisp Tue Jan 03 18:44:44 2012 +0100
@@ -256,7 +256,7 @@
diff --git a/screen.lisp b/screen.lisp
index ab708c3..562dbf4 100644
--- a/screen.lisp
+++ b/screen.lisp
@@ -249,7 +249,7 @@ identity with a range check."
(defmacro set-any-color (val color)
`(progn (dolist (s *screen-list*)
@ -123,3 +127,4 @@ diff -r 6a36c0456b66 screen.lisp
(update-colors-all-screens)))
;; FIXME: I don't like any of this. Isn't there a way to define

View file

@ -28,7 +28,7 @@ DEPENDENCIES="
RESTRICT="strip"
DEFAULT_SRC_PREPARE_PATCHES=( "${FILES}"/stumpwm-printing.patch
"${FILES}"/stumpwm-hex-colours.diff )
"${FILES}"/stumpwm-hex-colours.patch )
DEFAULT_SRC_CONFIGURE_PARAMS=( --with-lisp=sbcl )
DEFAULT_SRC_COMPILE_PARAMS=( -j1 LISP='/usr/bin/sbcl --disable-debugger' )