Skip to content

V
vlc-2-2
Commit 13ee24b3 authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont
Browse files
Options

XCB/X11: implement pf_control: handle zoom and stay-on-top

parent e24d1c8d
Show whitespace changes
Inline Side-by-side
Showing with 7 additions and 0 deletions
modules/video_output/xcb/x11.c
View file @ 13ee24b3
...@@ -83,6 +83,7 @@ static int Init (vout_thread_t *); ...@@ -83,6 +83,7 @@ static int Init (vout_thread_t *);
static void Deinit (vout_thread_t *); static void Deinit (vout_thread_t *);
static void Display (vout_thread_t *, picture_t *); static void Display (vout_thread_t *, picture_t *);
static int Manage (vout_thread_t *); static int Manage (vout_thread_t *);
static int Control (vout_thread_t *, int, va_list);
int CheckError (vout_thread_t *vout, const char *str, xcb_void_cookie_t ck) int CheckError (vout_thread_t *vout, const char *str, xcb_void_cookie_t ck)
{ {
...@@ -274,6 +275,7 @@ static int Open (vlc_object_t *obj) ...@@ -274,6 +275,7 @@ static int Open (vlc_object_t *obj)
vout->pf_end = Deinit; vout->pf_end = Deinit;
vout->pf_display = Display; vout->pf_display = Display;
vout->pf_manage = Manage; vout->pf_manage = Manage;
vout->pf_control = Control;
return VLC_SUCCESS; return VLC_SUCCESS;
error: error:
...@@ -429,3 +431,8 @@ HandleParentStructure (vout_thread_t *vout, xcb_connection_t *conn, ...@@ -429,3 +431,8 @@ HandleParentStructure (vout_thread_t *vout, xcb_connection_t *conn,
XCB_CONFIG_WINDOW_X | XCB_CONFIG_WINDOW_Y, XCB_CONFIG_WINDOW_X | XCB_CONFIG_WINDOW_Y,
values); values);
} }
static int Control (vout_thread_t *vout, int query, va_list ap)
{
return vout_ControlWindow (vout->p_sys->embed, query, ap);
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment