andreacavalli/xserver-multidpi
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

xkb: remove random broken vendor workarounds

Browse Source
This commit is contained in:
Daniel Stone 2006-10-08 23:21:12 +03:00 committed by Daniel Stone
parent 33406da096
commit bd3d93be82
3 changed files with 2 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
xkb/ddxBeep.c
View File

@ -39,12 +39,6 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
#include <X11/extensions/XKBsrv.h> #include <X11/extensions/XKBsrv.h>
#include <X11/extensions/XI.h> #include <X11/extensions/XI.h>
#if (defined(__osf__) && defined(__alpha))
#include <sys/sysinfo.h>
#include <alpha/hal_sysinfo.h>
#include <alpha/prom.h>
#endif
/*#define FALLING_TONE 1*/ /*#define FALLING_TONE 1*/
/*#define RISING_TONE 1*/ /*#define RISING_TONE 1*/
#define FALLING_TONE 10 #define FALLING_TONE 10
@ -116,32 +110,6 @@ _XkbDDXBeepInitAtoms(void)
stickyLock= MAKE_ATOM(STICKY_LOCK); stickyLock= MAKE_ATOM(STICKY_LOCK);
stickyUnlock= MAKE_ATOM(STICKY_UNLOCK); stickyUnlock= MAKE_ATOM(STICKY_UNLOCK);
bounceReject= MAKE_ATOM(BOUNCE_REJECT); bounceReject= MAKE_ATOM(BOUNCE_REJECT);
#if (defined(__osf__) && defined(__alpha))
/* [[[ WDW - Some bells do not allow for pitch changes.
* Maybe this could become part of the keymap? ]]]
*/
{
char keyboard[8];
/* Find the class of keyboard being used.
*/
keyboard[0] = '\0';
if (-1 == getsysinfo(GSI_KEYBOARD,
keyboard, sizeof(keyboard),
0, NULL))
keyboard[0] = '\0';
if ((strcmp(keyboard,"LK201") == 0) ||
(strcmp(keyboard,"LK401") == 0) ||
(strcmp(keyboard,"LK421") == 0) ||
(strcmp(keyboard,"LK443") == 0))
doesPitch = 0;
}
#else
#if defined(sun)
doesPitch = 0;
#endif
#endif
return; return;
} }

10
xkb/xkbAccessX.c
View File

@ -361,10 +361,7 @@ XkbControlsPtr ctrls;
if (keybd->kbdfeed->ctrl.autoRepeat && if (keybd->kbdfeed->ctrl.autoRepeat &&
((xkbi->slowKey != xkbi->mouseKey) || (!xkbi->mouseKeysAccel)) && ((xkbi->slowKey != xkbi->mouseKey) || (!xkbi->mouseKeysAccel)) &&
(ctrls->enabled_ctrls&XkbRepeatKeysMask)) { (ctrls->enabled_ctrls&XkbRepeatKeysMask)) {
#ifndef AIXV3 if (BitIsOn(keybd->kbdfeed->ctrl.autoRepeats,xkbi->slowKey)) {
if (BitIsOn(keybd->kbdfeed->ctrl.autoRepeats,xkbi->slowKey))
#endif
{
xkbi->repeatKey = xkbi->slowKey; xkbi->repeatKey = xkbi->slowKey;
xkbi->repeatKeyTimer= TimerSet(xkbi->repeatKeyTimer, xkbi->repeatKeyTimer= TimerSet(xkbi->repeatKeyTimer,
0, ctrls->repeat_delay, 0, ctrls->repeat_delay,
@ -530,10 +527,7 @@ KeySym * sym = XkbKeySymsPtr(xkbi->desc,key);
if ((keybd->kbdfeed->ctrl.autoRepeat) && if ((keybd->kbdfeed->ctrl.autoRepeat) &&
((ctrls->enabled_ctrls&(XkbSlowKeysMask|XkbRepeatKeysMask))== ((ctrls->enabled_ctrls&(XkbSlowKeysMask|XkbRepeatKeysMask))==
XkbRepeatKeysMask)) { XkbRepeatKeysMask)) {
#ifndef AIXV3 if (BitIsOn(keybd->kbdfeed->ctrl.autoRepeats,key)) {
if (BitIsOn(keybd->kbdfeed->ctrl.autoRepeats,key))
#endif
{
#ifdef DEBUG #ifdef DEBUG
if (xkbDebugFlags&0x10) if (xkbDebugFlags&0x10)
ErrorF("Starting software autorepeat...\n"); ErrorF("Starting software autorepeat...\n");

20
xkb/xkbUtils.c
View File

@ -45,24 +45,10 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
#include <X11/extensions/XKBgeom.h> #include <X11/extensions/XKBgeom.h>
#include "xkb.h" #include "xkb.h"
#ifdef MODE_SWITCH
extern Bool noKME; /* defined in os/utils.c */
#endif
int XkbDisableLockActions = 0; int XkbDisableLockActions = 0;
/***====================================================================***/ /***====================================================================***/
#ifndef RETURN_SHOULD_REPEAT
#if (defined(__osf__) && defined(__alpha))
#define RETURN_SHOULD_REPEAT 1
#else
#define RETURN_SHOULD_REPEAT 0
#endif
#endif
/***====================================================================***/
DeviceIntPtr DeviceIntPtr
_XkbLookupAnyDevice(int id,int *why_rtrn) _XkbLookupAnyDevice(int id,int *why_rtrn)
{ {
@ -560,12 +546,6 @@ CARD8 keysPerMod[XkbNumModifiers];
} }
} }
} }
#ifdef MODE_SWITCH
/* Fix up any of the KME stuff if we changed the core description.
*/
if (!noKME)
HandleKeyBinding(keyc, &keyc->curKeySyms);
#endif
return; return;
} }