diff options
| author | Keith Packard <keithp@keithp.com> | 2012-03-21 12:55:09 -0700 |
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2012-03-21 13:54:42 -0700 |
| commit | 9838b7032ea9792bec21af424c53c07078636d21 (patch) | |
| tree | b72d0827dac50f0f3b8eab29b3b7639546d735d7 /xkb/ddxCtrls.c | |
| parent | 75199129c603fc8567185ac31866c9518193cb78 (diff) | |
Introduce a consistent coding style
This is strictly the application of the script 'x-indent-all.sh'
from util/modular. Compared to the patch that Daniel posted in
January, I've added a few indent flags:
-bap
-psl
-T PrivatePtr
-T pmWait
-T _XFUNCPROTOBEGIN
-T _XFUNCPROTOEND
-T _X_EXPORT
The typedefs were needed to make the output of sdksyms.sh match the
previous output, otherwise, the code is formatted badly enough that
sdksyms.sh generates incorrect output.
The generated code was compared with the previous version and found to
be essentially identical -- "assert" line numbers and BUILD_TIME were
the only differences found.
The comparison was done with this script:
dir1=$1
dir2=$2
for dir in $dir1 $dir2; do
(cd $dir && find . -name '*.o' | while read file; do
dir=`dirname $file`
base=`basename $file .o`
dump=$dir/$base.dump
objdump -d $file > $dump
done)
done
find $dir1 -name '*.dump' | while read dump; do
otherdump=`echo $dump | sed "s;$dir1;$dir2;"`
diff -u $dump $otherdump
done
Signed-off-by: Keith Packard <keithp@keithp.com>
Acked-by: Daniel Stone <daniel@fooishbar.org>
Acked-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Diffstat (limited to 'xkb/ddxCtrls.c')
| -rw-r--r-- | xkb/ddxCtrls.c | 32 |
1 files changed, 15 insertions, 17 deletions
diff --git a/xkb/ddxCtrls.c b/xkb/ddxCtrls.c index 04de608df..0805fb208 100644 --- a/xkb/ddxCtrls.c +++ b/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; } - |