From 899226207dc7e68ca9b861a269c579a4a0495d1d Mon Sep 17 00:00:00 2001
From: dan <dan>
Date: Thu, 16 Nov 2000 18:07:12 +0000
Subject: [PATCH] - Fixed a flickering problem with the scrollview. - Use of
 uppercase letters when getting keysyms

---
 WINGs/wscrollview.c            | 8 ++++++--
 WPrefs.app/KeyboardShortcuts.c | 9 +++++----
 WPrefs.app/MouseSettings.c     | 3 ++-
 3 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/WINGs/wscrollview.c b/WINGs/wscrollview.c
index 24560ed2..d392eca5 100644
--- a/WINGs/wscrollview.c
+++ b/WINGs/wscrollview.c
@@ -73,8 +73,12 @@ WMCreateScrollView(WMWidget *parent)
 
     sPtr->view->delegate = &_ScrollViewViewDelegate;
 
-    W_SetViewBackgroundColor(sPtr->viewport, 
-			     WMBlackColor(WMWidgetScreen(parent)));
+    /* This has a very bad effect when the scrollview is mapped, making it
+     * flicker with each item added to it. It also seems to draw slower.
+     * Why should it be black anyway? -Dan
+     */
+    /*W_SetViewBackgroundColor(sPtr->viewport,
+                             WMBlackColor(WMWidgetScreen(parent)));*/
     sPtr->viewport->flags.mapWhenRealized = 1;
 
     WMCreateEventHandler(sPtr->view, StructureNotifyMask|ExposureMask,
diff --git a/WPrefs.app/KeyboardShortcuts.c b/WPrefs.app/KeyboardShortcuts.c
index 19308690..28c0862f 100644
--- a/WPrefs.app/KeyboardShortcuts.c
+++ b/WPrefs.app/KeyboardShortcuts.c
@@ -122,7 +122,7 @@ static char*
 captureShortcut(Display *dpy, _Panel *panel)
 {
     XEvent ev;
-    KeySym ksym;
+    KeySym ksym, lksym, uksym;
     char buffer[64];
     char *key = NULL;
 
@@ -131,9 +131,10 @@ captureShortcut(Display *dpy, _Panel *panel)
 	WMNextEvent(dpy, &ev);
 	if (ev.type==KeyPress && ev.xkey.keycode!=0) {
 	    ksym = XKeycodeToKeysym(dpy, ev.xkey.keycode, 0);
-	    if (!IsModifierKey(ksym)) {
-		key=XKeysymToString(ksym);
-		panel->capturing = 0;
+            if (!IsModifierKey(ksym)) {
+                XConvertCase(ksym, &lksym, &uksym);
+                key=XKeysymToString(uksym);
+                panel->capturing = 0;
 		break;
 	    }
 	}
diff --git a/WPrefs.app/MouseSettings.c b/WPrefs.app/MouseSettings.c
index 37324b6b..b8615852 100644
--- a/WPrefs.app/MouseSettings.c
+++ b/WPrefs.app/MouseSettings.c
@@ -426,7 +426,8 @@ fillModifierPopUp(WMPopUpButton *pop)
 	    ptr = strstr(tmp, "_R");
 	    if (ptr)
 		*ptr = 0;
-	    sprintf(buffer, "%s (%s)", modifierNames[j], tmp);
+            sprintf(buffer, "%s (%s)", modifierNames[j], tmp);
+            /*sprintf(buffer, "%s", tmp);*/
 	    WMAddPopUpButtonItem(pop, buffer);
 	    for (i=k+1; i<a; i++) {
 		if (array[i] == NULL)