diff options
| author | Kaleb Keithley <kaleb@freedesktop.org> | 2003-11-30 16:47:13 +0000 |
|---|---|---|
| committer | Kaleb Keithley <kaleb@freedesktop.org> | 2003-11-30 16:47:13 +0000 |
| commit | 5fd7f82390d78621a8aad959eb216b8fb7e1a97f (patch) | |
| tree | c3fa80365a29d6da9aa6b17cf7261f5ca7c908f6 /xkb | |
| parent | 77836ebda2a47e04c56c5842f62fab5992909712 (diff) | |
xfree86 merge
Diffstat (limited to 'xkb')
| -rw-r--r-- | xkb/ddxFakeMtn.c | 8 | ||||
| -rw-r--r-- | xkb/xkbUtils.c | 4 |
2 files changed, 2 insertions, 10 deletions
diff --git a/xkb/ddxFakeMtn.c b/xkb/ddxFakeMtn.c index 8d6079d09..289fa3bfb 100644 --- a/xkb/ddxFakeMtn.c +++ b/xkb/ddxFakeMtn.c @@ -45,14 +45,6 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. #include "mipointer.h" #include "mipointrst.h" -extern void NewCurrentScreen( -#if NeedFunctionPrototypes - ScreenPtr /* newScreen */, - int /* x */, - int /* y */ -#endif -); - void XkbDDXFakePointerMotion(unsigned flags,int x,int y) { diff --git a/xkb/xkbUtils.c b/xkb/xkbUtils.c index 208dcb1eb..f3ba6bc17 100644 --- a/xkb/xkbUtils.c +++ b/xkb/xkbUtils.c @@ -746,11 +746,11 @@ unsigned char grp; grp= state->locked_group; - if ((grp>=ctrls->num_groups) || (grp<0)) + if (grp>=ctrls->num_groups) state->locked_group= XkbAdjustGroup(grp,ctrls); grp= state->locked_group+state->base_group+state->latched_group; - if ((grp>=ctrls->num_groups) || (grp<0)) + if (grp>=ctrls->num_groups) state->group= XkbAdjustGroup(grp,ctrls); else state->group= grp; XkbComputeCompatState(xkbi); |