mirror of
https://code.videolan.org/videolan/vlc
synced 2024-10-07 03:56:28 +02:00
Merge branch 1.0-bugfix
This commit is contained in:
commit
2151d6fe01
@ -4086,7 +4086,6 @@ AS_IF([test "${enable_xcb}" != "no"], [
|
||||
])
|
||||
|
||||
dnl xcb-utils
|
||||
PKG_CHECK_MODULES(XCB_AUX, [xcb-aux])
|
||||
PKG_CHECK_MODULES(XCB_KEYSYMS, [xcb-keysyms])
|
||||
|
||||
VLC_ADD_PLUGIN([xcb])
|
||||
|
@ -193,6 +193,8 @@ static int CreateVout( vlc_object_t *p_this )
|
||||
p_sys->p_vout->b_autoscale = p_vout->b_autoscale;
|
||||
p_sys->p_vout->i_zoom = p_vout->i_zoom;
|
||||
p_sys->p_vout->i_alignment = p_vout->i_alignment;
|
||||
var_Create( p_sys->p_vout, "video-deco",
|
||||
VLC_VAR_BOOL | VLC_VAR_DOINHERIT );
|
||||
|
||||
psz = var_CreateGetString( p_vout, "opengl-provider" );
|
||||
p_sys->p_vout->p_module =
|
||||
|
@ -31,7 +31,6 @@
|
||||
#include <limits.h> /* HOST_NAME_MAX */
|
||||
|
||||
#include <xcb/xcb.h>
|
||||
#include <xcb/xcb_aux.h>
|
||||
typedef xcb_atom_t Atom;
|
||||
#include <X11/Xatom.h> /* XA_WM_NAME */
|
||||
|
||||
@ -140,8 +139,26 @@ static int Open (vlc_object_t *obj)
|
||||
if (xcb_connection_has_error (conn) /*== NULL*/)
|
||||
goto error;
|
||||
|
||||
/* Find configured screen */
|
||||
const xcb_setup_t *setup = xcb_get_setup (conn);
|
||||
xcb_screen_t *scr = NULL;
|
||||
for (xcb_screen_iterator_t i = xcb_setup_roots_iterator (setup);
|
||||
i.rem > 0; xcb_screen_next (&i))
|
||||
{
|
||||
if (snum == 0)
|
||||
{
|
||||
scr = i.data;
|
||||
break;
|
||||
}
|
||||
snum--;
|
||||
}
|
||||
if (scr == NULL)
|
||||
{
|
||||
msg_Err (wnd, "bad X11 screen number");
|
||||
goto error;
|
||||
}
|
||||
|
||||
/* Create window */
|
||||
xcb_screen_t *scr = xcb_aux_get_screen (conn, snum);
|
||||
const uint32_t mask = XCB_CW_BACK_PIXEL | XCB_CW_EVENT_MASK;
|
||||
uint32_t values[2] = {
|
||||
/* XCB_CW_BACK_PIXEL */
|
||||
|
Loading…
Reference in New Issue
Block a user