Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
N
nx-libs
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
1
Issues
1
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
dimbor
nx-libs
Commits
25db7413
Commit
25db7413
authored
Mar 10, 2017
by
Ulrich Sibiller
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Keystroke.c: Simplify read_binding_from_xmlnode
parent
13a7c4a7
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
3 deletions
+4
-3
Keystroke.c
nx-X11/programs/Xserver/hw/nxagent/Keystroke.c
+4
-3
No files found.
nx-X11/programs/Xserver/hw/nxagent/Keystroke.c
View file @
25db7413
...
...
@@ -167,6 +167,7 @@ static Bool modifier_matches(unsigned int mask, int compare_alt_meta, unsigned i
static
Bool
read_binding_from_xmlnode
(
xmlNode
*
node
,
struct
nxagentSpecialKeystrokeMap
*
ret
)
{
/* init the struct to have proper values in case not all attributes are found */
struct
nxagentSpecialKeystrokeMap
newkm
=
{
.
stroke
=
KEYSTROKE_END_MARKER
,
.
modifierMask
=
0
,
...
...
@@ -204,12 +205,11 @@ static Bool read_binding_from_xmlnode(xmlNode *node, struct nxagentSpecialKeystr
}
else
if
(
strcmp
((
char
*
)
attr
->
name
,
"key"
)
==
0
)
{
if
(
strcmp
((
char
*
)
attr
->
children
->
content
,
"0"
)
!=
0
&&
strcmp
((
char
*
)
attr
->
children
->
content
,
"false"
)
!=
0
)
newkm
.
keysym
=
XStringToKeysym
((
char
*
)
attr
->
children
->
content
);
continue
;
}
else
{
/* ignore attributes with value="0" or "false", everything else is interpreted as true */
if
(
strcmp
((
char
*
)
attr
->
children
->
content
,
"0"
)
==
0
||
strcmp
((
char
*
)
attr
->
children
->
content
,
"false"
)
==
0
)
continue
;
...
...
@@ -223,6 +223,7 @@ static Bool read_binding_from_xmlnode(xmlNode *node, struct nxagentSpecialKeystr
else
if
(
strcmp
((
char
*
)
attr
->
name
,
"Lock"
)
==
0
)
{
newkm
.
modifierMask
|=
LockMask
;
}
else
if
(
strcmp
((
char
*
)
attr
->
name
,
"AltMeta"
)
==
0
)
{
newkm
.
modifierAltMeta
=
True
;
}
}
}
if
(
newkm
.
stroke
!=
KEYSTROKE_END_MARKER
&&
newkm
.
keysym
!=
NoSymbol
)
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment