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
b0b0efc9
Commit
b0b0efc9
authored
Apr 09, 2020
by
Ulrich Sibiller
Committed by
Mike Gabriel
May 07, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Keyboard.c: free remote keybord names once no longer needed
parent
13536693
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
9 additions
and
5 deletions
+9
-5
Keyboard.c
nx-X11/programs/Xserver/hw/nxagent/Keyboard.c
+9
-5
No files found.
nx-X11/programs/Xserver/hw/nxagent/Keyboard.c
View file @
b0b0efc9
...
...
@@ -80,7 +80,8 @@ is" without express or implied warranty.
#include <errno.h>
static
void
nxagentXkbGetNames
(
void
);
static
void
nxagentXkbGetRemoteNames
(
void
);
static
void
nxagentXkbClearRemoteNames
(
void
);
void
nxagentKeycodeConversionSetup
(
void
);
...
...
@@ -696,6 +697,9 @@ XkbError:
}
#endif
/* we don't need the remote keyboard information anymore */
nxagentXkbClearRemoteNames
();
xkb
=
XkbGetKeyboard
(
nxagentDisplay
,
XkbGBN_AllComponentsMask
,
XkbUseCoreKbd
);
if
(
xkb
&&
xkb
->
geom
)
...
...
@@ -1341,7 +1345,7 @@ void nxagentTuneXkbWrapper(void)
}
}
void
nxagentXkbClearNames
(
void
)
void
nxagentXkbClear
Remote
Names
(
void
)
{
SAFE_free
(
nxagentRemoteRules
);
SAFE_free
(
nxagentRemoteModel
);
...
...
@@ -1350,7 +1354,7 @@ void nxagentXkbClearNames(void)
SAFE_free
(
nxagentRemoteOptions
);
}
static
void
nxagentXkbGetNames
(
void
)
static
void
nxagentXkbGet
Remote
Names
(
void
)
{
if
(
nxagentRemoteRules
)
return
;
...
...
@@ -1554,7 +1558,7 @@ void nxagentKeycodeConversionSetup(void)
Bool
nxagentGetRemoteXkbExtension
(
void
)
{
nxagentXkbInfo
.
Opcode
=
nxagentXkbInfo
.
EventBase
=
nxagentXkbInfo
.
ErrorBase
=
nxagentXkbInfo
.
MajorVersion
=
nxagentXkbInfo
.
MinorVersion
=
-
1
;
nxagentXkbClearNames
();
nxagentXkbClear
Remote
Names
();
Bool
result
=
XkbQueryExtension
(
nxagentDisplay
,
&
nxagentXkbInfo
.
Opcode
,
...
...
@@ -1565,7 +1569,7 @@ Bool nxagentGetRemoteXkbExtension(void)
if
(
result
)
{
nxagentXkbGetNames
();
nxagentXkbGet
Remote
Names
();
}
#ifdef WARNING
else
...
...
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