aboutsummaryrefslogtreecommitdiff
path: root/nx-X11
diff options
context:
space:
mode:
authorUlrich Sibiller <uli42@gmx.de>2017-03-21 22:32:00 +0100
committerUlrich Sibiller <uli42@gmx.de>2017-04-03 21:28:10 +0200
commit40f03399c706bbf00f2055a10c4b1bb3b49063a8 (patch)
treea12e09987b479727aba4f39ba01417eb6bfab160 /nx-X11
parent51782cb25433a9518754338369b2f374b3070b4a (diff)
downloadnx-libs-40f03399c706bbf00f2055a10c4b1bb3b49063a8.tar.gz
nx-libs-40f03399c706bbf00f2055a10c4b1bb3b49063a8.tar.bz2
nx-libs-40f03399c706bbf00f2055a10c4b1bb3b49063a8.zip
Keystroke.c: use KEYSTROKE_NOTHING
instead of KEYSTROKE_END_MARKER. This is cleaner since KEYSTROKE_END_MARKER really marks the end of the list.
Diffstat (limited to 'nx-X11')
-rw-r--r--nx-X11/programs/Xserver/hw/nxagent/Keystroke.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Keystroke.c b/nx-X11/programs/Xserver/hw/nxagent/Keystroke.c
index 69b07dfe5..136f53542 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Keystroke.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Keystroke.c
@@ -171,7 +171,7 @@ static Bool read_binding_from_xmlnode(xmlNode *node, struct nxagentSpecialKeystr
{
/* init the struct to have proper values in case not all attributes are found */
struct nxagentSpecialKeystrokeMap newkm = {
- .stroke = KEYSTROKE_END_MARKER,
+ .stroke = KEYSTROKE_NOTHING,
.modifierMask = 0,
.modifierAltMeta = False,
.keysym = NoSymbol
@@ -192,7 +192,7 @@ static Bool read_binding_from_xmlnode(xmlNode *node, struct nxagentSpecialKeystr
if (strcmp((char *)attr->name, "action") == 0)
{
- newkm.stroke = KEYSTROKE_END_MARKER;
+ newkm.stroke = KEYSTROKE_NOTHING;
for (int i = 0; nxagentSpecialKeystrokeNames[i] != NULL; i++)
{
if (strcmp(nxagentSpecialKeystrokeNames[i], (char *)attr->children->content) == 0)
@@ -228,7 +228,7 @@ static Bool read_binding_from_xmlnode(xmlNode *node, struct nxagentSpecialKeystr
}
}
- if (newkm.stroke != KEYSTROKE_END_MARKER && newkm.keysym != NoSymbol)
+ if (newkm.stroke != KEYSTROKE_NOTHING && newkm.keysym != NoSymbol)
{
/* keysym and stroke are required, everything else is optional */
memcpy(ret, &newkm, sizeof(struct nxagentSpecialKeystrokeMap));