1
0
mirror of https://github.com/gryf/wmaker.git synced 2026-01-30 12:15:50 +01:00

- Fixed a flickering problem with the scrollview.

- Use of uppercase letters when getting keysyms
This commit is contained in:
dan
2000-11-16 18:07:12 +00:00
parent 2d20abd00e
commit 899226207d
3 changed files with 13 additions and 7 deletions

View File

@@ -73,8 +73,12 @@ WMCreateScrollView(WMWidget *parent)
sPtr->view->delegate = &_ScrollViewViewDelegate; sPtr->view->delegate = &_ScrollViewViewDelegate;
W_SetViewBackgroundColor(sPtr->viewport, /* This has a very bad effect when the scrollview is mapped, making it
WMBlackColor(WMWidgetScreen(parent))); * 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; sPtr->viewport->flags.mapWhenRealized = 1;
WMCreateEventHandler(sPtr->view, StructureNotifyMask|ExposureMask, WMCreateEventHandler(sPtr->view, StructureNotifyMask|ExposureMask,

View File

@@ -122,7 +122,7 @@ static char*
captureShortcut(Display *dpy, _Panel *panel) captureShortcut(Display *dpy, _Panel *panel)
{ {
XEvent ev; XEvent ev;
KeySym ksym; KeySym ksym, lksym, uksym;
char buffer[64]; char buffer[64];
char *key = NULL; char *key = NULL;
@@ -131,9 +131,10 @@ captureShortcut(Display *dpy, _Panel *panel)
WMNextEvent(dpy, &ev); WMNextEvent(dpy, &ev);
if (ev.type==KeyPress && ev.xkey.keycode!=0) { if (ev.type==KeyPress && ev.xkey.keycode!=0) {
ksym = XKeycodeToKeysym(dpy, ev.xkey.keycode, 0); ksym = XKeycodeToKeysym(dpy, ev.xkey.keycode, 0);
if (!IsModifierKey(ksym)) { if (!IsModifierKey(ksym)) {
key=XKeysymToString(ksym); XConvertCase(ksym, &lksym, &uksym);
panel->capturing = 0; key=XKeysymToString(uksym);
panel->capturing = 0;
break; break;
} }
} }

View File

@@ -426,7 +426,8 @@ fillModifierPopUp(WMPopUpButton *pop)
ptr = strstr(tmp, "_R"); ptr = strstr(tmp, "_R");
if (ptr) if (ptr)
*ptr = 0; *ptr = 0;
sprintf(buffer, "%s (%s)", modifierNames[j], tmp); sprintf(buffer, "%s (%s)", modifierNames[j], tmp);
/*sprintf(buffer, "%s", tmp);*/
WMAddPopUpButtonItem(pop, buffer); WMAddPopUpButtonItem(pop, buffer);
for (i=k+1; i<a; i++) { for (i=k+1; i<a; i++) {
if (array[i] == NULL) if (array[i] == NULL)