diff options
author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2017-04-03 21:44:05 +0200 |
---|---|---|
committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2017-04-03 21:44:05 +0200 |
commit | 25d38bf360db8f02cb5d6f7c6861dcf9cc5fb206 (patch) | |
tree | c54c8522db340ff5984483a7530011a7bb23c079 /nx-X11/programs/Xserver/hw/nxagent/Events.c | |
parent | 147371a28bb23b4dd383ceccff0e279e9dba3bbe (diff) | |
parent | ee18cd43d873bc814ca40faabd29cc486061969f (diff) | |
download | nx-libs-25d38bf360db8f02cb5d6f7c6861dcf9cc5fb206.tar.gz nx-libs-25d38bf360db8f02cb5d6f7c6861dcf9cc5fb206.tar.bz2 nx-libs-25d38bf360db8f02cb5d6f7c6861dcf9cc5fb206.zip |
Merge branch 'uli42-pr/cleanup_keystroke' into 3.6.x
Attributes GH PR #404: https://github.com/ArcticaProject/nx-libs/pull/404
Diffstat (limited to 'nx-X11/programs/Xserver/hw/nxagent/Events.c')
-rw-r--r-- | nx-X11/programs/Xserver/hw/nxagent/Events.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Events.c b/nx-X11/programs/Xserver/hw/nxagent/Events.c index d8512b548..e4d031e06 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Events.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Events.c @@ -180,6 +180,10 @@ static int viewportLastX; static int viewportLastY; static Cursor viewportCursor; +#define MAX_INC 200 +#define INC_STEP 5 +#define nextinc(x) ((x) < MAX_INC ? (x) += INC_STEP : (x)) + /* * Keyboard and pointer are handled as they were real devices by * Xnest and we inherit this behaviour. The following mask will @@ -193,10 +197,6 @@ static Mask defaultEventMask; static int lastEventSerial = 0; -#define MAX_INC 200 -#define INC_STEP 5 -#define nextinc(x) ((x) < MAX_INC ? (x) += INC_STEP : (x)) - /* * Used to mask the appropriate bits in * the state reported by XkbStateNotify |