aboutsummaryrefslogtreecommitdiff
path: root/nx-X11/programs/Xserver/hw/nxagent/Events.h
diff options
context:
space:
mode:
authorMike Gabriel <mike.gabriel@das-netzwerkteam.de>2017-12-14 00:09:35 +0100
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2017-12-14 00:09:35 +0100
commitabaebb5b1da233b1b5dcab5da9c24e49960a68d3 (patch)
treef4dbab796b4356e865ca573214757b173bb4f873 /nx-X11/programs/Xserver/hw/nxagent/Events.h
parent7610c0f19e01f2815966b1e333d65c8ab748bd1f (diff)
parenta02b645b23c912f064f40b7f06a4447dd0f83e97 (diff)
downloadnx-libs-abaebb5b1da233b1b5dcab5da9c24e49960a68d3.tar.gz
nx-libs-abaebb5b1da233b1b5dcab5da9c24e49960a68d3.tar.bz2
nx-libs-abaebb5b1da233b1b5dcab5da9c24e49960a68d3.zip
Merge branch 'uli42-pr/improve_keyboard_light' into 3.6.x
Attributes GH PR #591: https://github.com/ArcticaProject/nx-libs/pull/591
Diffstat (limited to 'nx-X11/programs/Xserver/hw/nxagent/Events.h')
-rw-r--r--nx-X11/programs/Xserver/hw/nxagent/Events.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Events.h b/nx-X11/programs/Xserver/hw/nxagent/Events.h
index 7d313c331..bf9d10c74 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Events.h
+++ b/nx-X11/programs/Xserver/hw/nxagent/Events.h
@@ -99,7 +99,7 @@ extern void nxagentGetEventMask(WindowPtr pWin, Mask *mask_return);
* the internal state. This is unlikely to happen.
*/
-extern int nxagentInitKeyboardState(void);
+extern int nxagentInitXkbKeyboardState(void);
/*
* Update the keyboard state according
@@ -107,7 +107,7 @@ extern int nxagentInitKeyboardState(void);
* from the remote X server.
*/
-extern int nxagentHandleKeyboardEvent(XEvent *X);
+extern int nxagentHandleXkbKeyboardStateEvent(XEvent *X);
/*
* Handle sync and karma messages and