Blame xserver-1.5.99.902-xkb-colors.patch
|
 |
b94867c |
From 97b23d4a932a493c5f6dc470925a67ad684e4f0f Mon Sep 17 00:00:00 2001
|
|
|
b94867c |
From: Peter Hutterer <peter.hutterer@who-t.net>
|
|
|
b94867c |
Date: Fri, 13 Feb 2009 09:56:22 +1000
|
|
|
b94867c |
Subject: [PATCH] xkb: Fix wrong colour reference in XKB geometry copying. #20081
|
|
|
b94867c |
|
|
|
b94867c |
base_color and label_color need to reference the color in the destination, not
|
|
|
b94867c |
in the source.
|
|
|
b94867c |
|
|
|
b94867c |
X.Org Bug 20081 <http://bugs.freedesktop.org/show_bug.cgi?id=20081>
|
|
|
b94867c |
|
|
|
b94867c |
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
|
|
|
b94867c |
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
|
|
|
b94867c |
---
|
|
|
b94867c |
xkb/xkbUtils.c | 4 ++--
|
|
|
b94867c |
1 files changed, 2 insertions(+), 2 deletions(-)
|
|
|
b94867c |
|
|
|
b94867c |
diff --git a/xkb/xkbUtils.c b/xkb/xkbUtils.c
|
|
|
b94867c |
index aa63b35..9a1edc9 100644
|
|
|
b94867c |
--- a/xkb/xkbUtils.c
|
|
|
b94867c |
+++ b/xkb/xkbUtils.c
|
|
|
b94867c |
@@ -1955,9 +1955,9 @@ _XkbCopyGeom(XkbDescPtr src, XkbDescPtr dst)
|
|
|
b94867c |
|
|
|
b94867c |
strcpy(dst->geom->label_font, src->geom->label_font);
|
|
|
b94867c |
i = XkbGeomColorIndex(src->geom, src->geom->label_color);
|
|
|
b94867c |
- dst->geom->label_color = &(src->geom->colors[i]);
|
|
|
b94867c |
+ dst->geom->label_color = &(dst->geom->colors[i]);
|
|
|
b94867c |
i = XkbGeomColorIndex(src->geom, src->geom->base_color);
|
|
|
b94867c |
- dst->geom->base_color = &(src->geom->colors[i]);
|
|
|
b94867c |
+ dst->geom->base_color = &(dst->geom->colors[i]);
|
|
|
b94867c |
}
|
|
|
b94867c |
else {
|
|
|
b94867c |
if (dst->geom->label_font) {
|
|
|
b94867c |
--
|
|
|
b94867c |
1.6.0.6
|
|
|
b94867c |
|