external/cde
1
0
Fork 0
mirror of git://git.code.sf.net/p/cdesktopenv/code synced 2025-02-13 19:52:20 +00:00
Code Issues Releases Wiki Activity

Merge branch 'master' into autotools-conversion

Browse source
This commit is contained in:
Jon Trulson 2020-03-23 12:55:32 -06:00
commit 11af2add7e
6 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
cde/lib/DtWidget/Editor.c
View file

@ -3736,7 +3736,7 @@ GetModeSwitchModifier(
for (mapIndex = 3*pMap->max_keypermod; mapIndex < mapSize; mapIndex++) { for (mapIndex = 3*pMap->max_keypermod; mapIndex < mapSize; mapIndex++) {
/* look only at the first 4 columns of key map */ /* look only at the first 4 columns of key map */
for (keyCol = 0; keyCol < 4; keyCol++) { for (keyCol = 0; keyCol < 4; keyCol++) {
keySym = XKeycodeToKeysym(dpy, pMap->modifiermap[mapIndex], keyCol); keySym = XkbKeycodeToKeysym(dpy, pMap->modifiermap[mapIndex], keyCol);
if (keySym == XK_Mode_switch) if (keySym == XK_Mode_switch)
modeSwitchModMask |= 1 << (mapIndex / pMap->max_keypermod); modeSwitchModMask |= 1 << (mapIndex / pMap->max_keypermod);
} }

4
cde/programs/dtcalc/motif.c
View file

@ -2122,7 +2122,7 @@ key_init(void)
X->kparray[i - X->kcmin] = 0 ; X->kparray[i - X->kcmin] = 0 ;
for (j = 0; j < X->keysyms_per_key; ++j) for (j = 0; j < X->keysyms_per_key; ++j)
{ {
ks = XKeycodeToKeysym(X->dpy, i, j) ; ks = XkbKeycodeToKeysym(X->dpy, i, j) ;
if (IsKeypadKey(ks)) if (IsKeypadKey(ks))
{ {
X->kparray[i - X->kcmin] = 1 ; X->kparray[i - X->kcmin] = 1 ;
@ -2142,7 +2142,7 @@ keypad_keysym(XEvent *xevent)
for (i = 0; i < X->keysyms_per_key; ++i) for (i = 0; i < X->keysyms_per_key; ++i)
{ {
ks = XKeycodeToKeysym(X->dpy, keycode, i) ; ks = XkbKeycodeToKeysym(X->dpy, keycode, i) ;
if (IsKeypadKey(ks)) if (IsKeypadKey(ks))
{ {
#ifdef sun #ifdef sun

2
cde/programs/dtsession/SmSave.c
View file

@ -1326,7 +1326,7 @@ QueryServerSettings( void )
return(-1); return(-1);
} }
} }
tmpMod = XKeycodeToKeysym(smGD.display, modMap->modifiermap[i], 0); tmpMod = XkbKeycodeToKeysym(smGD.display, modMap->modifiermap[i], 0, 0);
sprintf(tmpChar,"%ld", tmpMod); sprintf(tmpChar,"%ld", tmpMod);
strcat(resSpec, tmpChar); strcat(resSpec, tmpChar);
if(i != numLoops) if(i != numLoops)

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 */ /* 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; control = (pev->state & ControlMask) != 0;
big_inc = DisplayWidth(DISPLAY, ACTIVE_PSD->screen) / 20; 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]) 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); char *nm = XKeysymToString(ks);
/* Compare, ignoring the trailing '_L' or '_R' in keysym */ /* 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++; keyMultiplier++;
} }
keysym = XKeycodeToKeysym (DISPLAY, pev->xkey.keycode, 0); keysym = XkbKeycodeToKeysym (DISPLAY, pev->xkey.keycode, 0, 0);
control = (pev->xkey.state & ControlMask) != 0; control = (pev->xkey.state & ControlMask) != 0;
tmpX = tmpY = 0; tmpX = tmpY = 0;
@ -692,7 +692,7 @@ Boolean HandleResizeKeyPress (ClientData *pcd, XEvent *pev)
keyMult++; keyMult++;
} }
keysym = XKeycodeToKeysym (DISPLAY, pev->xkey.keycode, 0); keysym = XkbKeycodeToKeysym (DISPLAY, pev->xkey.keycode, 0, 0);
control = (pev->xkey.state & ControlMask) != 0; control = (pev->xkey.state & ControlMask) != 0;
switch (keysym) { switch (keysym) {
@ -4328,7 +4328,7 @@ Boolean HandleMarqueeKeyPress (WmScreenData *pSD, XEvent *pev)
keyMult++; keyMult++;
} }
keysym = XKeycodeToKeysym (DISPLAY, pev->xkey.keycode, 0); keysym = XkbKeycodeToKeysym (DISPLAY, pev->xkey.keycode, 0);
control = (pev->xkey.state & ControlMask) != 0; control = (pev->xkey.state & ControlMask) != 0;
switch (keysym) { switch (keysym) {