49f77fff14
Save in a few special cases, _X_EXPORT should not be used in C source files. Instead, it should be used in headers, and the proper C source include that header. Some special cases are symbols that need to be shared between modules, but not expected to be used by external drivers, and symbols that are accessible via LoaderSymbol/dlopen. This patch also adds conditionally some new sdk header files, depending on extensions enabled. These files were added to match pattern for other extensions/modules, that is, have the headers "deciding" symbol visibility in the sdk. These headers are: o Xext/panoramiXsrv.h, Xext/panoramiX.h o fbpict.h (unconditionally) o vidmodeproc.h o mioverlay.h (unconditionally, used only by xaa) o xfixes.h (unconditionally, symbols required by dri2) LoaderSymbol and similar functions now don't have different prototypes, in loaderProcs.h and xf86Module.h, so that both headers can be included, without the need of defining IN_LOADER. xf86NewInputDevice() device prototype readded to xf86Xinput.h, but not exported (and with a comment about it).
107 lines
3.1 KiB
C
107 lines
3.1 KiB
C
/************************************************************
|
|
Copyright (c) 1993 by Silicon Graphics Computer Systems, Inc.
|
|
|
|
Permission to use, copy, modify, and distribute this
|
|
software and its documentation for any purpose and without
|
|
fee is hereby granted, provided that the above copyright
|
|
notice appear in all copies and that both that copyright
|
|
notice and this permission notice appear in supporting
|
|
documentation, and that the name of Silicon Graphics not be
|
|
used in advertising or publicity pertaining to distribution
|
|
of the software without specific prior written permission.
|
|
Silicon Graphics makes no representation about the suitability
|
|
of this software for any purpose. It is provided "as is"
|
|
without any express or implied warranty.
|
|
|
|
SILICON GRAPHICS DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS
|
|
SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
|
|
AND FITNESS FOR A PARTICULAR PURPOSE. IN NO EVENT SHALL SILICON
|
|
GRAPHICS BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL
|
|
DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
|
|
DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
|
|
OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH
|
|
THE USE OR PERFORMANCE OF THIS SOFTWARE.
|
|
|
|
********************************************************/
|
|
|
|
#ifdef HAVE_DIX_CONFIG_H
|
|
#include <dix-config.h>
|
|
#endif
|
|
|
|
#include <stdio.h>
|
|
#define NEED_EVENTS 1
|
|
#include <X11/X.h>
|
|
#include <X11/Xproto.h>
|
|
#include <X11/keysym.h>
|
|
#include "inputstr.h"
|
|
#include "scrnintstr.h"
|
|
#include "windowstr.h"
|
|
#include <xkbsrv.h>
|
|
#include <X11/extensions/XI.h>
|
|
|
|
void
|
|
XkbDDXKeybdCtrlProc(DeviceIntPtr dev,KeybdCtrl *ctrl)
|
|
{
|
|
int realRepeat;
|
|
|
|
realRepeat= ctrl->autoRepeat;
|
|
if ((dev->kbdfeed)&&(XkbDDXUsesSoftRepeat(dev)))
|
|
ctrl->autoRepeat= 0;
|
|
if (dev->key && dev->key->xkbInfo && dev->key->xkbInfo->kbdProc)
|
|
(*dev->key->xkbInfo->kbdProc)(dev,ctrl);
|
|
ctrl->autoRepeat= realRepeat;
|
|
return;
|
|
}
|
|
|
|
|
|
int
|
|
XkbDDXUsesSoftRepeat(DeviceIntPtr pXDev)
|
|
{
|
|
#ifndef XKB_ALWAYS_USES_SOFT_REPEAT
|
|
if (pXDev && pXDev->kbdfeed ) {
|
|
if (pXDev->kbdfeed->ctrl.autoRepeat) {
|
|
if (pXDev->key && pXDev->key->xkbInfo) {
|
|
XkbDescPtr xkb;
|
|
xkb= pXDev->key->xkbInfo->desc;
|
|
if ((xkb->ctrls->repeat_delay == 660) &&
|
|
(xkb->ctrls->repeat_interval == 40) &&
|
|
((xkb->ctrls->enabled_ctrls&(XkbSlowKeysMask|
|
|
XkbBounceKeysMask|
|
|
XkbMouseKeysMask))==0)) {
|
|
return 0;
|
|
}
|
|
return ((xkb->ctrls->enabled_ctrls&XkbRepeatKeysMask)!=0);
|
|
}
|
|
}
|
|
}
|
|
return 0;
|
|
#else
|
|
return 1;
|
|
#endif
|
|
}
|
|
|
|
void
|
|
XkbDDXChangeControls(DeviceIntPtr dev,XkbControlsPtr old,XkbControlsPtr new)
|
|
{
|
|
unsigned changed, i;
|
|
unsigned char *rep_old, *rep_new, *rep_fb;
|
|
|
|
changed= new->enabled_ctrls^old->enabled_ctrls;
|
|
for (rep_old = old->per_key_repeat,
|
|
rep_new = new->per_key_repeat,
|
|
rep_fb = dev->kbdfeed->ctrl.autoRepeats,
|
|
i = 0; i < XkbPerKeyBitArraySize; i++) {
|
|
if (rep_old[i] != rep_new[i]) {
|
|
rep_fb[i] = rep_new[i];
|
|
changed &= XkbPerKeyRepeatMask;
|
|
}
|
|
}
|
|
|
|
if (changed&XkbPerKeyRepeatMask) {
|
|
if (dev->kbdfeed->CtrlProc)
|
|
(*dev->kbdfeed->CtrlProc)(dev,&dev->kbdfeed->ctrl);
|
|
}
|
|
return;
|
|
}
|
|
|