Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc
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
Commits
a83cf23f
Commit
a83cf23f
authored
Feb 19, 2011
by
Rémi Denis-Courmont
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
XCB/global: no need to keep track of VLC actions
parent
9bf47274
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
6 additions
and
7 deletions
+6
-7
modules/control/globalhotkeys/xcb.c
modules/control/globalhotkeys/xcb.c
+6
-7
No files found.
modules/control/globalhotkeys/xcb.c
View file @
a83cf23f
...
@@ -62,7 +62,7 @@ typedef struct
...
@@ -62,7 +62,7 @@ typedef struct
xcb_keycode_t
*
p_keys
;
xcb_keycode_t
*
p_keys
;
#endif
#endif
unsigned
i_modifier
;
unsigned
i_modifier
;
int
i_action
;
uint32_t
i_vlc
;
}
hotkey_mapping_t
;
}
hotkey_mapping_t
;
struct
intf_sys_t
struct
intf_sys_t
...
@@ -307,7 +307,6 @@ static bool Mapping( intf_thread_t *p_intf )
...
@@ -307,7 +307,6 @@ static bool Mapping( intf_thread_t *p_intf )
p_hotkey
->
psz_action
!=
NULL
;
p_hotkey
->
psz_action
!=
NULL
;
p_hotkey
++
)
p_hotkey
++
)
{
{
const
int
i_vlc_action
=
p_hotkey
->
i_action
;
char
varname
[
12
+
strlen
(
p_hotkey
->
psz_action
)];
char
varname
[
12
+
strlen
(
p_hotkey
->
psz_action
)];
sprintf
(
varname
,
"global-key-%s"
,
p_hotkey
->
psz_action
);
sprintf
(
varname
,
"global-key-%s"
,
p_hotkey
->
psz_action
);
...
@@ -357,7 +356,7 @@ static bool Mapping( intf_thread_t *p_intf )
...
@@ -357,7 +356,7 @@ static bool Mapping( intf_thread_t *p_intf )
p_map
->
p_keys
=
p_keys
;
p_map
->
p_keys
=
p_keys
;
#endif
#endif
p_map
->
i_modifier
=
i_modifier
|
i_ignored
;
p_map
->
i_modifier
=
i_modifier
|
i_ignored
;
p_map
->
i_
action
=
i_vlc_action
;
p_map
->
i_
vlc
=
i_vlc_key
;
active
=
true
;
active
=
true
;
}
}
}
}
...
@@ -432,8 +431,8 @@ static void *Thread( void *p_data )
...
@@ -432,8 +431,8 @@ static void *Thread( void *p_data )
if
(
p_map
->
i_x11
==
e
->
detail
&&
if
(
p_map
->
i_x11
==
e
->
detail
&&
p_map
->
i_modifier
==
e
->
state
)
p_map
->
i_modifier
==
e
->
state
)
{
{
var_SetInteger
(
p_intf
->
p_libvlc
,
"
key-action
"
,
var_SetInteger
(
p_intf
->
p_libvlc
,
"
global-key-pressed
"
,
p_map
->
i_action
);
p_map
->
i_vlc
);
break
;
break
;
}
}
#else
#else
...
@@ -442,8 +441,8 @@ static void *Thread( void *p_data )
...
@@ -442,8 +441,8 @@ static void *Thread( void *p_data )
if
(
p_map
->
p_keys
[
j
]
==
e
->
detail
&&
if
(
p_map
->
p_keys
[
j
]
==
e
->
detail
&&
p_map
->
i_modifier
==
e
->
state
)
p_map
->
i_modifier
==
e
->
state
)
{
{
var_SetInteger
(
p_intf
->
p_libvlc
,
"
key-action
"
,
var_SetInteger
(
p_intf
->
p_libvlc
,
"
global-key-pressed
"
,
p_map
->
i_action
);
p_map
->
i_vlc
);
loop_break
=
true
;
loop_break
=
true
;
break
;
break
;
}
}
...
...
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