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
ff283ead
Commit
ff283ead
authored
Jan 25, 2009
by
Rémi Denis-Courmont
Browse files
Options
Browse Files
Download
Plain Diff
Merge commit 'videolan/master'
parents
72218fb9
3e97bc6e
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
21 additions
and
5 deletions
+21
-5
modules/control/globalhotkeys/x11.c
modules/control/globalhotkeys/x11.c
+19
-2
src/libvlc.c
src/libvlc.c
+2
-3
No files found.
modules/control/globalhotkeys/x11.c
View file @
ff283ead
...
...
@@ -72,6 +72,7 @@ static void Mapping( intf_thread_t *p_intf );
static
void
Register
(
intf_thread_t
*
p_intf
);
static
void
Unregister
(
intf_thread_t
*
p_intf
);
static
void
*
Thread
(
void
*
p_data
);
static
int
X11ErrorHandler
(
Display
*
,
XErrorEvent
*
);
/*****************************************************************************
* Open:
...
...
@@ -84,6 +85,7 @@ static int Open( vlc_object_t *p_this )
Display
*
p_display
=
XOpenDisplay
(
NULL
);
if
(
!
p_display
)
return
VLC_EGENERIC
;
XSetErrorHandler
(
X11ErrorHandler
);
p_intf
->
p_sys
=
p_sys
=
malloc
(
sizeof
(
*
p_sys
)
);
if
(
!
p_sys
)
...
...
@@ -125,8 +127,24 @@ static void Close( vlc_object_t *p_this )
}
/*****************************************************************************
*
Thread:
*
*****************************************************************************/
static
int
X11ErrorHandler
(
Display
*
p_display
,
XErrorEvent
*
p_event
)
{
#if 0
char psz_txt[1024];
XGetErrorText( p_display, p_event->error_code, psz_txt, sizeof(psz_txt) );
fprintf( stderr,
"[????????] globalhotkeys interface error: X11 request %u.%u failed "
"with error code %u:\n %s\n",
p_event->request_code, p_event->minor_code, p_event->error_code, psz_txt );
#else
VLC_UNUSED
(
p_display
);
VLC_UNUSED
(
p_event
);
#endif
/* Ignore them */
return
0
;
}
static
unsigned
GetModifier
(
Display
*
p_display
,
KeySym
sym
)
{
static
const
unsigned
pi_mask
[
8
]
=
{
...
...
@@ -357,7 +375,6 @@ static void *Thread( void *p_data )
}
}
vlc_restorecancel
(
canc
);
return
NULL
;
}
src/libvlc.c
View file @
ff283ead
...
...
@@ -898,9 +898,8 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc,
* Always load the hotkeys interface if it exists
*/
libvlc_InternalAddIntf
(
p_libvlc
,
"hotkeys,none"
);
#ifdef WIN32
libvlc_InternalAddIntf
(
p_libvlc
,
"globalhotkeys,none"
);
#endif
if
(
module_exists
(
"globalhotkeys"
)
)
libvlc_InternalAddIntf
(
p_libvlc
,
"globalhotkeys,none"
);
#ifdef HAVE_DBUS
/* loads dbus control interface if in one-instance mode
...
...
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