aboutsummaryrefslogtreecommitdiff
path: root/xorg-server/xkb
diff options
context:
space:
mode:
Diffstat (limited to 'xorg-server/xkb')
-rw-r--r--xorg-server/xkb/ddxCtrls.c32
-rw-r--r--xorg-server/xkb/ddxKillSrv.c2
-rw-r--r--xorg-server/xkb/ddxPrivate.c2
-rw-r--r--xorg-server/xkb/ddxVT.c2
4 files changed, 18 insertions, 20 deletions
diff --git a/xorg-server/xkb/ddxCtrls.c b/xorg-server/xkb/ddxCtrls.c
index 04de608df..0805fb208 100644
--- a/xorg-server/xkb/ddxCtrls.c
+++ b/xorg-server/xkb/ddxCtrls.c
@@ -39,20 +39,19 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
#include <X11/extensions/XI.h>
void
-XkbDDXKeybdCtrlProc(DeviceIntPtr dev,KeybdCtrl *ctrl)
+XkbDDXKeybdCtrlProc(DeviceIntPtr dev, KeybdCtrl * ctrl)
{
-int realRepeat;
+ int realRepeat;
- realRepeat= ctrl->autoRepeat;
- if ((dev->kbdfeed)&&(XkbDDXUsesSoftRepeat(dev)))
- ctrl->autoRepeat= 0;
+ 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;
+ (*dev->key->xkbInfo->kbdProc) (dev, ctrl);
+ ctrl->autoRepeat = realRepeat;
return;
}
-
int
XkbDDXUsesSoftRepeat(DeviceIntPtr pXDev)
{
@@ -60,15 +59,15 @@ XkbDDXUsesSoftRepeat(DeviceIntPtr pXDev)
}
void
-XkbDDXChangeControls(DeviceIntPtr dev,XkbControlsPtr old,XkbControlsPtr new)
+XkbDDXChangeControls(DeviceIntPtr dev, XkbControlsPtr old, XkbControlsPtr new)
{
-unsigned changed, i;
-unsigned char *rep_old, *rep_new, *rep_fb;
+ unsigned changed, i;
+ unsigned char *rep_old, *rep_new, *rep_fb;
- changed= new->enabled_ctrls^old->enabled_ctrls;
+ 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,
+ rep_fb = dev->kbdfeed->ctrl.autoRepeats,
i = 0; i < XkbPerKeyBitArraySize; i++) {
if (rep_old[i] != rep_new[i]) {
rep_fb[i] = rep_new[i];
@@ -76,10 +75,9 @@ unsigned char *rep_old, *rep_new, *rep_fb;
}
}
- if (changed&XkbPerKeyRepeatMask) {
- if (dev->kbdfeed->CtrlProc)
- (*dev->kbdfeed->CtrlProc)(dev,&dev->kbdfeed->ctrl);
+ if (changed & XkbPerKeyRepeatMask) {
+ if (dev->kbdfeed->CtrlProc)
+ (*dev->kbdfeed->CtrlProc) (dev, &dev->kbdfeed->ctrl);
}
return;
}
-
diff --git a/xorg-server/xkb/ddxKillSrv.c b/xorg-server/xkb/ddxKillSrv.c
index 106b39587..1cabb1bd7 100644
--- a/xorg-server/xkb/ddxKillSrv.c
+++ b/xorg-server/xkb/ddxKillSrv.c
@@ -38,7 +38,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
#include <xkbsrv.h>
int
-XkbDDXTerminateServer(DeviceIntPtr dev,KeyCode key,XkbAction *act)
+XkbDDXTerminateServer(DeviceIntPtr dev, KeyCode key, XkbAction *act)
{
if (dev != inputInfo.keyboard)
GiveUp(1);
diff --git a/xorg-server/xkb/ddxPrivate.c b/xorg-server/xkb/ddxPrivate.c
index c4bcab437..c4d21cb9c 100644
--- a/xorg-server/xkb/ddxPrivate.c
+++ b/xorg-server/xkb/ddxPrivate.c
@@ -18,7 +18,7 @@
#include "xf86.h"
int
-XkbDDXPrivate(DeviceIntPtr dev,KeyCode key,XkbAction *act)
+XkbDDXPrivate(DeviceIntPtr dev, KeyCode key, XkbAction *act)
{
XkbAnyAction *xf86act = &(act->any);
char msgbuf[XkbAnyActionDataSize+1];
diff --git a/xorg-server/xkb/ddxVT.c b/xorg-server/xkb/ddxVT.c
index cbd453706..65291026a 100644
--- a/xorg-server/xkb/ddxVT.c
+++ b/xorg-server/xkb/ddxVT.c
@@ -38,7 +38,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
#include <xkbsrv.h>
int
-XkbDDXSwitchScreen(DeviceIntPtr dev,KeyCode key,XkbAction *act)
+XkbDDXSwitchScreen(DeviceIntPtr dev, KeyCode key, XkbAction *act)
{
return 1;
}