Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc-gpu
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Redmine
Redmine
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Metrics
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
videolan
vlc-gpu
Commits
d70eac52
Commit
d70eac52
authored
Apr 25, 2013
by
Rémi Denis-Courmont
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
xcb: fix X11 key table ordering
(cherry picked from commit 711e7b044cd0d49010117c543c8c60c30fca6b71)
parent
62e9da14
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
18 additions
and
1 deletion
+18
-1
modules/video_output/xcb/keys.c
modules/video_output/xcb/keys.c
+17
-0
modules/video_output/xcb/xcb_keysym.h
modules/video_output/xcb/xcb_keysym.h
+1
-1
No files found.
modules/video_output/xcb/keys.c
View file @
d70eac52
...
@@ -97,6 +97,23 @@ static uint_fast32_t ConvertKeySym (xcb_keysym_t sym)
...
@@ -97,6 +97,23 @@ static uint_fast32_t ConvertKeySym (xcb_keysym_t sym)
if
(
sym
>=
0x1000100
&&
sym
<=
0x110ffff
)
if
(
sym
>=
0x1000100
&&
sym
<=
0x110ffff
)
return
sym
-
0x1000000
;
return
sym
-
0x1000000
;
#if 0
for (size_t i = 0; i < sizeof (tab) / sizeof (tab[0]); i++)
if (i > 0 && tab[i-1].x11 >= tab[i].x11)
{
fprintf (stderr, "key %x and %x are not ordered properly\n",
tab[i-1].x11, tab[i].x11);
abort ();
}
for (size_t i = 0; i < sizeof (old) / sizeof (old[0]); i++)
if (i > 0 && old[i-1].x11 >= old[i].x11)
{
fprintf (stderr, "key %x and %x are not ordered properly\n",
old[i-1].x11, old[i].x11);
abort ();
}
#endif
/* Special keys */
/* Special keys */
res
=
bsearch
(
&
sym
,
tab
,
sizeof
(
tab
)
/
sizeof
(
tab
[
0
]),
sizeof
(
tab
[
0
]),
res
=
bsearch
(
&
sym
,
tab
,
sizeof
(
tab
)
/
sizeof
(
tab
[
0
]),
sizeof
(
tab
[
0
]),
keysymcmp
);
keysymcmp
);
...
...
modules/video_output/xcb/xcb_keysym.h
View file @
d70eac52
...
@@ -37,7 +37,6 @@
...
@@ -37,7 +37,6 @@
{
XK_KP_Begin
,
KEY_HOME
,
},
/* KP middle (5 without numlock) */
{
XK_KP_Begin
,
KEY_HOME
,
},
/* KP middle (5 without numlock) */
{
XK_KP_Insert
,
KEY_INSERT
,
},
{
XK_KP_Insert
,
KEY_INSERT
,
},
{
XK_KP_Delete
,
KEY_DELETE
,
},
{
XK_KP_Delete
,
KEY_DELETE
,
},
{
XK_KP_Equal
,
'='
,
},
{
XK_KP_Multiply
,
'*'
,
},
{
XK_KP_Multiply
,
'*'
,
},
{
XK_KP_Add
,
'+'
,
},
{
XK_KP_Add
,
'+'
,
},
{
XK_KP_Separator
,
','
,
},
{
XK_KP_Separator
,
','
,
},
...
@@ -54,6 +53,7 @@
...
@@ -54,6 +53,7 @@
{
XK_KP_7
,
'7'
,
},
{
XK_KP_7
,
'7'
,
},
{
XK_KP_8
,
'8'
,
},
{
XK_KP_8
,
'8'
,
},
{
XK_KP_9
,
'9'
,
},
{
XK_KP_9
,
'9'
,
},
{
XK_KP_Equal
,
'='
,
},
{
XK_F1
,
KEY_F1
,
},
{
XK_F1
,
KEY_F1
,
},
{
XK_F2
,
KEY_F2
,
},
{
XK_F2
,
KEY_F2
,
},
...
...
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