debian/cdesktop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Convert uses of XKeycodeToKeysym (deprecated) to XkbKeycodeToKeysym

Browse Source 
patch supplied from Peter G.
This commit is contained in:
Jon Trulson
2020-03-23 12:51:18 -06:00
parent 6f1a110e1d
commit 15a2032626
6 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cde/programs/dtwm/WmCPlace.c
View File

@@ -302,7 +302,7 @@ void HandlePlacementKeyEvent (ClientData *pcd, XKeyEvent *pev)
}
/* convert event data to useful key data */
keysym = XKeycodeToKeysym (DISPLAY, pev->keycode, 0);
keysym = XkbKeycodeToKeysym (DISPLAY, pev->keycode, 0, 0);
control = (pev->state & ControlMask) != 0;
big_inc = DisplayWidth(DISPLAY, ACTIVE_PSD->screen) / 20;

2
cde/programs/dtwm/WmResParse.c
View File

@@ -1554,7 +1554,7 @@ void SyncModifierStrings(void)
{
if (map->modifiermap[k])
{
KeySym ks = XKeycodeToKeysym(DISPLAY, map->modifiermap[k], 0);
KeySym ks = XkbKeycodeToKeysym(DISPLAY, map->modifiermap[k], 0, 0);
char *nm = XKeysymToString(ks);
/* Compare, ignoring the trailing '_L' or '_R' in keysym */

6
cde/programs/dtwm/WmWinConf.c
View File

@@ -279,7 +279,7 @@ void HandleClientFrameMove (ClientData *pcd, XEvent *pev)
keyMultiplier++;
}
keysym = XKeycodeToKeysym (DISPLAY, pev->xkey.keycode, 0);
keysym = XkbKeycodeToKeysym (DISPLAY, pev->xkey.keycode, 0, 0);
control = (pev->xkey.state & ControlMask) != 0;
tmpX = tmpY = 0;
@@ -692,7 +692,7 @@ Boolean HandleResizeKeyPress (ClientData *pcd, XEvent *pev)
keyMult++;
}
keysym = XKeycodeToKeysym (DISPLAY, pev->xkey.keycode, 0);
keysym = XkbKeycodeToKeysym (DISPLAY, pev->xkey.keycode, 0, 0);
control = (pev->xkey.state & ControlMask) != 0;
switch (keysym) {
@@ -4328,7 +4328,7 @@ Boolean HandleMarqueeKeyPress (WmScreenData *pSD, XEvent *pev)
keyMult++;
}
keysym = XKeycodeToKeysym (DISPLAY, pev->xkey.keycode, 0);
keysym = XkbKeycodeToKeysym (DISPLAY, pev->xkey.keycode, 0);
control = (pev->xkey.state & ControlMask) != 0;
switch (keysym) {