diff --git a/ChangeLog b/ChangeLog index 3db0fc3f..e26f678c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -45,6 +45,7 @@ Changes since version 0.70.0: and further changes in the global domain file for those merged values was ignored making a system admin unable to set global defaults for all users using the global domains. +- Fixed bug with improper setting of root/titlebar cursor (definable cursors). Changes since version 0.65.1: diff --git a/src/defaults.c b/src/defaults.c index 31e43136..eeace2ee 100644 --- a/src/defaults.c +++ b/src/defaults.c @@ -791,18 +791,18 @@ WDefaultEntry optionList[] = { }, {"ScreenSwitchKey", "None", (void*)WKBD_SWITCH_SCREEN, NULL, getKeybind, setKeyGrab - } + }, #ifdef KEEP_XKB_LOCK_STATUS - ,{"ToggleKbdModeKey", "None", (void*)WKBD_TOGGLE, + {"ToggleKbdModeKey", "None", (void*)WKBD_TOGGLE, NULL, getKeybind, setKeyGrab }, {"KbdModeLock", "NO", NULL, &wPreferences.modelock, getBool, NULL - } + }, #endif /* KEEP_XKB_LOCK_STATUS */ - ,{"NormalCursor", "(builtin, left_ptr)", (void*)WCUR_ROOT, + {"NormalCursor", "(builtin, left_ptr)", (void*)WCUR_ROOT, NULL, getCursor, setCursor }, {"ArrowCursor", "(builtin, top_left_arrow)", (void*)WCUR_ARROW, diff --git a/src/startup.c b/src/startup.c index d8d2ad45..30a966d6 100644 --- a/src/startup.c +++ b/src/startup.c @@ -805,8 +805,8 @@ StartUp(Bool defaultScreenOnly) /* cursors */ - /*wCursor[WCUR_NORMAL] = None;*/ - wCursor[WCUR_NORMAL] = XCreateFontCursor(dpy, XC_left_ptr); + wCursor[WCUR_NORMAL] = None; + /*wCursor[WCUR_NORMAL] = XCreateFontCursor(dpy, XC_left_ptr);*/ wCursor[WCUR_ROOT] = XCreateFontCursor(dpy, XC_left_ptr); wCursor[WCUR_ARROW] = XCreateFontCursor(dpy, XC_top_left_arrow); wCursor[WCUR_MOVE] = XCreateFontCursor(dpy, XC_fleur);