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/xkb.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/xkb.c')
-rw-r--r-- | nx-X11/programs/Xserver/xkb/xkb.c | 61 |
1 files changed, 7 insertions, 54 deletions
diff --git a/nx-X11/programs/Xserver/xkb/xkb.c b/nx-X11/programs/Xserver/xkb/xkb.c index 987ebcd7b..2138497b7 100644 --- a/nx-X11/programs/Xserver/xkb/xkb.c +++ b/nx-X11/programs/Xserver/xkb/xkb.c @@ -41,14 +41,12 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. #include <nx-X11/extensions/XI.h> int XkbEventBase; - int XkbErrorBase; +static int XkbErrorBase; int XkbReqCode; - int XkbKeyboardErrorCode; -Atom xkbONE_LEVEL; -Atom xkbTWO_LEVEL; -Atom xkbKEYPAD; +static int XkbKeyboardErrorCode; CARD32 xkbDebugFlags = 0; -CARD32 xkbDebugCtrls = 0; +static CARD32 xkbDebugCtrls = 0; + #ifndef XKB_SRV_UNSUPPORTED_XI_FEATURES #define XKB_SRV_UNSUPPORTED_XI_FEATURES XkbXI_KeyboardsMask @@ -56,7 +54,7 @@ CARD32 xkbDebugCtrls = 0; unsigned XkbXIUnsupported= XKB_SRV_UNSUPPORTED_XI_FEATURES; -RESTYPE RT_XKBCLIENT; +static RESTYPE RT_XKBCLIENT; /***====================================================================***/ @@ -837,51 +835,6 @@ ProcXkbSetControls(ClientPtr client) return client->noClientException; } -int -XkbSetRepeatRate(DeviceIntPtr dev,int timeout,int interval,int major,int minor) -{ -int changed= 0; -XkbControlsRec old,*xkb; - - if ((!dev)||(!dev->key)||(!dev->key->xkbInfo)) - return 0; - xkb= dev->key->xkbInfo->desc->ctrls; - old= *xkb; - if ((timeout!=0) && (xkb->repeat_delay!=timeout)) { - xkb->repeat_delay= timeout; - changed++; - } - if ((interval!=0) && (xkb->repeat_interval!=interval)) { - xkb->repeat_interval= interval; - changed++; - } - if (changed) { - xkbControlsNotify cn; - XkbDDXChangeControls(dev,&old,xkb); - if (XkbComputeControlsNotify(dev,&old,xkb,&cn,False)) { - cn.keycode= 0; - cn.eventType = 0; - cn.requestMajor = major; - cn.requestMinor = minor; - XkbSendControlsNotify(dev,&cn); - } - } - return 1; -} - -int -XkbGetRepeatRate(DeviceIntPtr dev,int *timeout,int *interval) -{ -XkbControlsPtr xkb; - - if ((!dev)||(!dev->key)||(!dev->key->xkbInfo)) - return 0; - xkb= dev->key->xkbInfo->desc->ctrls; - if (timeout) *timeout= xkb->repeat_delay; - if (interval) *interval= xkb->repeat_interval; - return 1; -} - /***====================================================================***/ static int @@ -2748,7 +2701,7 @@ ProcXkbGetIndicatorState(ClientPtr client) /***====================================================================***/ -Status +static Status XkbComputeGetIndicatorMapReplySize( XkbIndicatorPtr indicators, xkbGetIndicatorMapReply *rep) @@ -2765,7 +2718,7 @@ int nIndicators; return Success; } -int +static int XkbSendIndicatorMap( ClientPtr client, XkbIndicatorPtr indicators, xkbGetIndicatorMapReply * rep) |