diff options
author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2017-02-16 20:18:42 +0000 |
---|---|---|
committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2018-07-03 16:29:17 +0200 |
commit | e734ca2175ffeafcce0e1435d304880cebe7561c (patch) | |
tree | 481cebd16244a32359c8d9cf3ee161bfb53b7ff8 /nx-X11/programs/Xserver/xkb/xkbUtils.c | |
parent | ec0cfcecf31dbb504e8a09e59dd877f883a1c030 (diff) | |
download | nx-libs-e734ca2175ffeafcce0e1435d304880cebe7561c.tar.gz nx-libs-e734ca2175ffeafcce0e1435d304880cebe7561c.tar.bz2 nx-libs-e734ca2175ffeafcce0e1435d304880cebe7561c.zip |
Removal of dead code in Xserver/xkb. Follow-up commit for 3739a9b.
Spotted in and backported from X.org:
commit 021fc5cb2cb4a7972b4a6fcb570c1da92787d68d
Author: Adam Jackson <ajax@benzedrine.nwnk.net>
Date: Sun Mar 18 16:31:19 2007 -0400
Static markup and dead code cull over xkb/.
The former <X11/extensions/XKBsrv.h> has been pulled into the server now as
include/xkbsrv.h, and the world updated to look for it in the new place,
since it made no sense to define server API in an extension header. Any
further work along this line will need to do similar things with XKBgeom.h
and friends.
Backported-to-NX-by: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
Diffstat (limited to 'nx-X11/programs/Xserver/xkb/xkbUtils.c')
-rw-r--r-- | nx-X11/programs/Xserver/xkb/xkbUtils.c | 53 |
1 files changed, 0 insertions, 53 deletions
diff --git a/nx-X11/programs/Xserver/xkb/xkbUtils.c b/nx-X11/programs/Xserver/xkb/xkbUtils.c index fa252b10b..bf88458be 100644 --- a/nx-X11/programs/Xserver/xkb/xkbUtils.c +++ b/nx-X11/programs/Xserver/xkb/xkbUtils.c @@ -175,44 +175,6 @@ register unsigned mask; return mask; } - -Bool -XkbApplyVModChanges( XkbSrvInfoPtr xkbi, - unsigned changed, - XkbChangesPtr changes, - unsigned * needChecksRtrn, - XkbEventCausePtr cause) -{ -XkbDescPtr xkb; -Bool check; - - xkb= xkbi->desc; -#ifdef DEBUG -{ -register unsigned i,bit; - for (i=0,bit=1;i<XkbNumVirtualMods;i++,bit<<=1) { - if ((changed&bit)==0) - continue; - if (xkbDebugFlags) - ErrorF("Should be applying: change vmod %d to 0x%x\n",i, - xkb->server->vmods[i]); - } -} -#endif - check= XkbApplyVirtualModChanges(xkb,changed,changes); - XkbApplyVModChangesToAllDevices(xkbi->device,xkb,changed,cause); - - if (needChecksRtrn!=NULL) { - if (check) - *needChecksRtrn= XkbStateNotifyMask|XkbIndicatorStateNotifyMask; - else *needChecksRtrn= 0; - } - else if (check) { - /* 7/12/95 (ef) -- XXX check compatibility and/or indicator state */ - } - return 1; -} - /***====================================================================***/ void @@ -781,21 +743,6 @@ XkbCheckSecondaryEffects( XkbSrvInfoPtr xkbi, /***====================================================================***/ -void -XkbSetPhysicalLockingKey(DeviceIntPtr dev,unsigned key) -{ -XkbDescPtr xkb; - - xkb= dev->key->xkbInfo->desc; - if ((key>=xkb->min_key_code) && (key<=xkb->max_key_code)) { - xkb->server->behaviors[key].type= XkbKB_Lock|XkbKB_Permanent; - } - else ErrorF("Internal Error! Bad XKB info in SetPhysicalLockingKey\n"); - return; -} - -/***====================================================================***/ - Bool XkbEnableDisableControls( XkbSrvInfoPtr xkbi, unsigned long change, |