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
58415b56
Commit
58415b56
authored
Sep 06, 2019
by
Ulrich Sibiller
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Keyboard.c: reformat comments
parent
e3b44054
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
20 additions
and
23 deletions
+20
-23
Keyboard.c
nx-X11/programs/Xserver/hw/nxagent/Keyboard.c
+20
-23
No files found.
nx-X11/programs/Xserver/hw/nxagent/Keyboard.c
View file @
58415b56
...
@@ -104,10 +104,9 @@ static void nxagentWriteKeyboardFile(char *rules, char *model, char *layout, cha
...
@@ -104,10 +104,9 @@ static void nxagentWriteKeyboardFile(char *rules, char *model, char *layout, cha
#endif
#endif
/*
/*
* Unfortunately we cannot just include XKBlib.h.
* Unfortunately we cannot just include XKBlib.h. It conflicts with
* It conflicts with the server side definitions
* the server side definitions of the same symbols. This is more a X
* of the same symbols. This is more a X problem
* problem than our.
* than our.
*/
*/
#ifdef XKB
#ifdef XKB
...
@@ -158,8 +157,7 @@ static char *nxagentRemoteOptions = NULL;
...
@@ -158,8 +157,7 @@ static char *nxagentRemoteOptions = NULL;
XkbAgentInfoRec
nxagentXkbInfo
=
{
-
1
,
-
1
,
-
1
,
-
1
,
-
1
};
XkbAgentInfoRec
nxagentXkbInfo
=
{
-
1
,
-
1
,
-
1
,
-
1
,
-
1
};
/*
/*
* Keyboard status, updated through XKB
* Keyboard status, updated through XKB events.
* events.
*/
*/
XkbAgentStateRec
nxagentXkbState
=
{
0
,
0
,
0
,
0
,
0
};
XkbAgentStateRec
nxagentXkbState
=
{
0
,
0
,
0
,
0
,
0
};
...
@@ -283,9 +281,8 @@ void nxagentChangeKeyboardControl(DeviceIntPtr pDev, KeybdCtrl *ctrl)
...
@@ -283,9 +281,8 @@ void nxagentChangeKeyboardControl(DeviceIntPtr pDev, KeybdCtrl *ctrl)
/*
/*
* We want to prevent agent generating auto-repeated
* We want to prevent agent generating auto-repeated
* keystrokes. Let's intercept any attempt by appli-
* keystrokes. Let's intercept any attempt by appli- cations to
* cations to change the default timeouts on the
* change the default timeouts on the nxagent device.
* nxagent device.
*/
*/
#ifdef TEST
#ifdef TEST
...
@@ -305,8 +302,8 @@ void nxagentChangeKeyboardControl(DeviceIntPtr pDev, KeybdCtrl *ctrl)
...
@@ -305,8 +302,8 @@ void nxagentChangeKeyboardControl(DeviceIntPtr pDev, KeybdCtrl *ctrl)
#endif
#endif
/*
/*
* If enabled, propagate the changes to the
* If enabled, propagate the changes to the
devices attached to the
*
devices attached to the
real X server.
* real X server.
*/
*/
if
(
nxagentOption
(
DeviceControl
))
if
(
nxagentOption
(
DeviceControl
))
...
@@ -328,8 +325,8 @@ void nxagentChangeKeyboardControl(DeviceIntPtr pDev, KeybdCtrl *ctrl)
...
@@ -328,8 +325,8 @@ void nxagentChangeKeyboardControl(DeviceIntPtr pDev, KeybdCtrl *ctrl)
};
};
/*
/*
* Don't propagate the auto repeat mode. It is forced to be
* Don't propagate the auto repeat mode. It is forced to be
off in
*
off in
the agent server.
* the agent server.
*
*
* value_mask |= KBAutoRepeatMode;
* value_mask |= KBAutoRepeatMode;
* values.auto_repeat_mode = ctrl->autoRepeat ?
* values.auto_repeat_mode = ctrl->autoRepeat ?
...
@@ -339,9 +336,9 @@ void nxagentChangeKeyboardControl(DeviceIntPtr pDev, KeybdCtrl *ctrl)
...
@@ -339,9 +336,9 @@ void nxagentChangeKeyboardControl(DeviceIntPtr pDev, KeybdCtrl *ctrl)
XChangeKeyboardControl
(
nxagentDisplay
,
value_mask
,
&
values
);
XChangeKeyboardControl
(
nxagentDisplay
,
value_mask
,
&
values
);
/*
/*
* At this point, we need to walk through the vector and
* At this point, we need to walk through the vector and
compare
*
compare it to the current server vector. If there are
*
it to the current server vector. If there are differences,
*
differences,
report them.
* report them.
*/
*/
value_mask
=
KBLed
|
KBLedMode
;
value_mask
=
KBLed
|
KBLedMode
;
...
@@ -403,11 +400,11 @@ N/A
...
@@ -403,11 +400,11 @@ N/A
#endif
#endif
/*
/*
* Prevent agent from generating auto-repeat keystroke.
* Prevent agent from generating auto-repeat keystroke.
Note
*
Note that this is working only if XKB is enabled.
*
that this is working only if XKB is enabled. A better
*
A better solution should account cases where XKB is
*
solution should account cases where XKB is not
*
not available. Check also the behaviour of the
*
available. Check also the behaviour of the DeviceControl
*
DeviceControl
nxagent option.
* nxagent option.
*/
*/
XkbDfltRepeatDelay
=
~
0
;
XkbDfltRepeatDelay
=
~
0
;
...
@@ -607,8 +604,8 @@ XkbError:
...
@@ -607,8 +604,8 @@ XkbError:
}
}
/*
/*
* There is no description for pc105 on Solaris.
* There is no description for pc105 on Solaris.
Need to
*
Need to
revert to the closest approximation.
* revert to the closest approximation.
*/
*/
#ifdef TEST
#ifdef TEST
...
...
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