X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fvideo_output%2Fxcb%2Fx11.c;h=d1b3e3b40afecc314dd0e3397221680e0b8ce57a;hb=6f8cdd0f826a12a1dc10c741222c2a6299a01d7f;hp=430b384a78930a020063c83da58aaeca9edf4c37;hpb=949df9e57c06281ff9d8a340d69185a77218f257;p=vlc diff --git a/modules/video_output/xcb/x11.c b/modules/video_output/xcb/x11.c index 430b384a78..d1b3e3b40a 100644 --- a/modules/video_output/xcb/x11.c +++ b/modules/video_output/xcb/x11.c @@ -7,7 +7,7 @@ * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2.0 + * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, @@ -15,7 +15,7 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * You should have received a copy of the GNU Lesser General Public + * You should have received a copy of the GNU General Public * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA ****************************************************************************/ @@ -27,26 +27,16 @@ #include #include -#include -#include - #include #include -#include - #include #include -#include -#include +#include +#include #include "xcb_vlc.h" -#define DISPLAY_TEXT N_("X11 display") -#define DISPLAY_LONGTEXT N_( \ - "X11 hardware display to use. By default VLC will " \ - "use the value of the DISPLAY environment variable.") - #define SHM_TEXT N_("Use shared memory") #define SHM_LONGTEXT N_( \ "Use shared memory to communicate between VLC and the X server.") @@ -58,165 +48,159 @@ static void Close (vlc_object_t *); * Module descriptor */ vlc_module_begin () - set_shortname (N_("XCB")) - set_description (N_("(Experimental) XCB video output")) + set_shortname (N_("X11")) + set_description (N_("X11 video output (XCB)")) set_category (CAT_VIDEO) set_subcategory (SUBCAT_VIDEO_VOUT) - set_capability ("video output", 0) + set_capability ("vout display", 75) set_callbacks (Open, Close) - add_string ("x11-display", NULL, NULL, - DISPLAY_TEXT, DISPLAY_LONGTEXT, true) add_bool ("x11-shm", true, NULL, SHM_TEXT, SHM_LONGTEXT, true) vlc_module_end () -struct vout_sys_t +/* It must be large enough to absorb the server display jitter but it is + * useless to used a too large value, direct rendering cannot be used with + * xcb x11 + */ +#define MAX_PICTURES (3) + +struct vout_display_sys_t { xcb_connection_t *conn; vout_window_t *embed; /* VLC window (when windowed) */ + xcb_cursor_t cursor; /* blank cursor */ xcb_window_t window; /* drawable X window */ xcb_gcontext_t gc; /* context to put images */ bool shm; /* whether to use MIT-SHM */ + bool visible; /* whether to draw */ uint8_t bpp; /* bits per pixel */ uint8_t pad; /* scanline pad */ uint8_t depth; /* useful bits per pixel */ uint8_t byte_order; /* server byte order */ -}; - -static int Init (vout_thread_t *); -static void Deinit (vout_thread_t *); -static void Display (vout_thread_t *, picture_t *); -static int Manage (vout_thread_t *); -int CheckError (vout_thread_t *vout, const char *str, xcb_void_cookie_t ck) -{ - xcb_generic_error_t *err; + picture_pool_t *pool; /* picture pool */ + picture_resource_t resource[MAX_PICTURES]; +}; - err = xcb_request_check (vout->p_sys->conn, ck); - if (err) - { - msg_Err (vout, "%s: X11 error %d", str, err->error_code); - return VLC_EGENERIC; - } - return VLC_SUCCESS; -} +static picture_t *Get (vout_display_t *); +static void Display (vout_display_t *, picture_t *); +static int Control (vout_display_t *, int, va_list); +static void Manage (vout_display_t *); -#define p_vout vout +static void ResetPictures (vout_display_t *); /** * Probe the X server. */ static int Open (vlc_object_t *obj) { - vout_thread_t *vout = (vout_thread_t *)obj; - vout_sys_t *p_sys = malloc (sizeof (*p_sys)); + vout_display_t *vd = (vout_display_t *)obj; + vout_display_sys_t *p_sys = malloc (sizeof (*p_sys)); if (p_sys == NULL) return VLC_ENOMEM; - vout->p_sys = p_sys; - p_sys->conn = NULL; - p_sys->embed = NULL; - - /* Connect to X */ - char *display = var_CreateGetNonEmptyString (vout, "x11-display"); - p_sys->conn = xcb_connect (display, NULL); - if (xcb_connection_has_error (p_sys->conn) /*== NULL*/) - { - msg_Err (vout, "cannot connect to X server %s", - display ? display : ""); - free (display); - goto error; - } - free (display); + vd->sys = p_sys; + p_sys->pool = NULL; - /* Get window */ - p_sys->embed = vout_RequestXWindow (vout, &(int){ 0 }, &(int){ 0 }, - &(unsigned){ 0 }, &(unsigned){ 0 }); + /* Get window, connect to X server */ + const xcb_screen_t *scr; + p_sys->embed = GetWindow (vd, &p_sys->conn, &scr, &p_sys->depth, + &p_sys->shm); if (p_sys->embed == NULL) { - msg_Err (vout, "parent window not available"); - goto error; - } - xcb_window_t root; - { - xcb_get_geometry_reply_t *geo; - xcb_get_geometry_cookie_t ck; - - ck = xcb_get_geometry (p_sys->conn, p_sys->embed->handle.xid); - geo = xcb_get_geometry_reply (p_sys->conn, ck, NULL); - if (geo == NULL) - { - msg_Err (vout, "parent window not valid"); - goto error; - } - root = geo->root; - free (geo); - - /* Subscribe to parent window resize events */ - const uint32_t value = XCB_EVENT_MASK_STRUCTURE_NOTIFY; - xcb_change_window_attributes (p_sys->conn, p_sys->embed->handle.xid, - XCB_CW_EVENT_MASK, &value); + free (p_sys); + return VLC_EGENERIC; } - /* Find the selected screen */ const xcb_setup_t *setup = xcb_get_setup (p_sys->conn); p_sys->byte_order = setup->image_byte_order; - xcb_screen_t *scr = NULL; - for (xcb_screen_iterator_t i = xcb_setup_roots_iterator (setup); - i.rem > 0 && scr == NULL; xcb_screen_next (&i)) + /* */ + video_format_t fmt_pic = vd->fmt; + + /* Check that the selected screen supports this depth */ + xcb_depth_t *d = NULL; + for (xcb_depth_iterator_t it = xcb_screen_allowed_depths_iterator (scr); + it.rem > 0 && d == NULL; + xcb_depth_next (&it)) + if (it.data->depth == p_sys->depth) + d = it.data; + if (d == NULL) { - if (i.data->root == root) - scr = i.data; + msg_Err (obj, "unexpected color depth msimatch"); + goto error; /* WTH? depth not supported on screen */ + } + + /* Find a visual type for the selected depth */ + xcb_visualid_t vid = 0; + bool gray = true; + const xcb_visualtype_t *vt = xcb_depth_visuals (d); + for (int i = xcb_depth_visuals_length (d); i > 0; i--) + { + if (vt->_class == XCB_VISUAL_CLASS_TRUE_COLOR) + { + vid = vt->visual_id; + fmt_pic.i_rmask = vt->red_mask; + fmt_pic.i_gmask = vt->green_mask; + fmt_pic.i_bmask = vt->blue_mask; + gray = false; + break; + } + if (p_sys->depth == 8 && vt->_class == XCB_VISUAL_CLASS_STATIC_GRAY + && vid == 0) + { + vid = vt->visual_id; + } } - if (scr == NULL) + if (!vid) { - msg_Err (vout, "parent window screen not found"); + msg_Err (obj, "unexpected visual type mismatch"); goto error; } - msg_Dbg (vout, "using screen 0x%"PRIx32, scr->root); + msg_Dbg (vd, "using X11 visual ID 0x%"PRIx32" (depth: %"PRIu8")", vid, + p_sys->depth); - /* Determine our video format. Normally, this is done in pf_init(), but - * this plugin always uses the same format for a given X11 screen. */ - xcb_visualid_t vid = 0; - uint8_t depth = 0; - bool gray = true; + /* Determine our pixel format */ + p_sys->bpp = 0; for (const xcb_format_t *fmt = xcb_setup_pixmap_formats (setup), *end = fmt + xcb_setup_pixmap_formats_length (setup); - fmt < end; fmt++) + fmt < end && !p_sys->bpp; fmt++) { - vlc_fourcc_t chroma = 0; - - if (fmt->depth < depth) - continue; /* We already found a better format! */ + if (fmt->depth != p_sys->depth) + continue; /* Wrong depth! */ /* Check that the pixmap format is supported by VLC. */ switch (fmt->depth) { + case 32: + if (fmt->bits_per_pixel != 32) + continue; + fmt_pic.i_chroma = VLC_CODEC_RGBA; + break; case 24: if (fmt->bits_per_pixel == 32) - chroma = VLC_FOURCC ('R', 'V', '3', '2'); + fmt_pic.i_chroma = VLC_CODEC_RGB32; else if (fmt->bits_per_pixel == 24) - chroma = VLC_FOURCC ('R', 'V', '2', '4'); + fmt_pic.i_chroma = VLC_CODEC_RGB24; else continue; break; case 16: if (fmt->bits_per_pixel != 16) continue; - chroma = VLC_FOURCC ('R', 'V', '1', '6'); + fmt_pic.i_chroma = VLC_CODEC_RGB16; break; case 15: if (fmt->bits_per_pixel != 16) continue; - chroma = VLC_FOURCC ('R', 'V', '1', '5'); + fmt_pic.i_chroma = VLC_CODEC_RGB15; break; case 8: if (fmt->bits_per_pixel != 8) continue; - chroma = VLC_FOURCC ('R', 'G', 'B', '2'); + fmt_pic.i_chroma = gray ? VLC_CODEC_GREY : VLC_CODEC_RGB8; break; default: continue; @@ -226,65 +210,21 @@ static int Open (vlc_object_t *obj) /* Byte sex is a non-issue for 8-bits. It can be worked around with * RGB masks for 24-bits. Too bad for 15-bits and 16-bits. */ -#ifdef WORDS_BIGENDIAN -# define ORDER XCB_IMAGE_ORDER_MSB_FIRST -#else -# define ORDER XCB_IMAGE_ORDER_LSB_FIRST -#endif if (fmt->bits_per_pixel == 16 && setup->image_byte_order != ORDER) continue; - /* Check that the selected screen supports this depth */ - xcb_depth_iterator_t it = xcb_screen_allowed_depths_iterator (scr); - while (it.rem > 0 && it.data->depth != fmt->depth) - xcb_depth_next (&it); - if (!it.rem) - continue; /* Depth not supported on this screen */ - - /* Find a visual type for the selected depth */ - const xcb_visualtype_t *vt = xcb_depth_visuals (it.data); - for (int i = xcb_depth_visuals_length (it.data); i > 0; i--) - { - if (vt->_class == XCB_VISUAL_CLASS_TRUE_COLOR) - { - vid = vt->visual_id; - gray = false; - break; - } - if (fmt->depth == 8 && vt->_class == XCB_VISUAL_CLASS_STATIC_GRAY) - { - if (!gray) - continue; /* Prefer color over gray scale */ - vid = vt->visual_id; - chroma = VLC_FOURCC ('G', 'R', 'E', 'Y'); - } - } - - if (!vid) - continue; /* The screen does not *really* support this depth */ - - vout->fmt_out.i_chroma = vout->output.i_chroma = chroma; - if (!gray) - { - vout->output.i_rmask = vt->red_mask; - vout->output.i_gmask = vt->green_mask; - vout->output.i_bmask = vt->blue_mask; - } p_sys->bpp = fmt->bits_per_pixel; p_sys->pad = fmt->scanline_pad; - p_sys->depth = depth = fmt->depth; + msg_Dbg (vd, " %"PRIu8" bits per pixels, %"PRIu8" bits line pad", + p_sys->bpp, p_sys->pad); } - if (depth == 0) + if (!p_sys->bpp) { - msg_Err (vout, "no supported pixmap formats or visual types"); + msg_Err (vd, "no supported pixmap formats"); goto error; } - msg_Dbg (vout, "using X11 visual ID 0x%"PRIx32, vid); - msg_Dbg (vout, " %"PRIu8" bits per pixels, %"PRIu8" bits line pad", - p_sys->bpp, p_sys->pad); - /* Create colormap (needed to select non-default visual) */ xcb_colormap_t cmap; if (vid != scr->root_visual) @@ -297,60 +237,59 @@ static int Open (vlc_object_t *obj) cmap = scr->default_colormap; /* Create window */ + unsigned width, height; + if (GetWindowSize (p_sys->embed, p_sys->conn, &width, &height)) + goto error; + + p_sys->window = xcb_generate_id (p_sys->conn); + p_sys->gc = xcb_generate_id (p_sys->conn); { - const uint32_t mask = XCB_CW_BACK_PIXEL | XCB_CW_EVENT_MASK - | XCB_CW_COLORMAP; + const uint32_t mask = XCB_CW_EVENT_MASK | XCB_CW_COLORMAP; const uint32_t values[] = { - /* XCB_CW_BACK_PIXEL */ - scr->black_pixel, /* XCB_CW_EVENT_MASK */ - XCB_EVENT_MASK_BUTTON_PRESS | XCB_EVENT_MASK_BUTTON_RELEASE | - XCB_EVENT_MASK_POINTER_MOTION, + XCB_EVENT_MASK_VISIBILITY_CHANGE, /* XCB_CW_COLORMAP */ cmap, }; xcb_void_cookie_t c; - xcb_window_t window = xcb_generate_id (p_sys->conn); - c = xcb_create_window_checked (p_sys->conn, depth, window, - p_sys->embed->handle.xid, 0, 0, 1, 1, 0, + c = xcb_create_window_checked (p_sys->conn, p_sys->depth, + p_sys->window, + p_sys->embed->xid, 0, 0, + width, height, 0, XCB_WINDOW_CLASS_INPUT_OUTPUT, vid, mask, values); - if (CheckError (vout, "cannot create X11 window", c)) + xcb_map_window (p_sys->conn, p_sys->window); + /* Create graphic context (I wonder why the heck do we need this) */ + xcb_create_gc (p_sys->conn, p_sys->gc, p_sys->window, 0, NULL); + + if (CheckError (vd, p_sys->conn, "cannot create X11 window", c)) goto error; - p_sys->window = window; - msg_Dbg (vout, "using X11 window %08"PRIx32, p_sys->window); - xcb_map_window (p_sys->conn, window); } + msg_Dbg (vd, "using X11 window %08"PRIx32, p_sys->window); + msg_Dbg (vd, "using X11 graphic context %08"PRIx32, p_sys->gc); + p_sys->cursor = CreateBlankCursor (p_sys->conn, scr); - /* Create graphic context (I wonder why the heck do we need this) */ - p_sys->gc = xcb_generate_id (p_sys->conn); - xcb_create_gc (p_sys->conn, p_sys->gc, p_sys->window, 0, NULL); - msg_Dbg (vout, "using X11 graphic context %08"PRIx32, p_sys->gc); - xcb_flush (p_sys->conn); + p_sys->visible = false; - /* Check shared memory support */ - p_sys->shm = var_CreateGetBool (vout, "x11-shm") > 0; - if (p_sys->shm) - { - xcb_shm_query_version_cookie_t ck; - xcb_shm_query_version_reply_t *r; + /* */ + vout_display_info_t info = vd->info; + info.has_pictures_invalid = true; - ck = xcb_shm_query_version (p_sys->conn); - r = xcb_shm_query_version_reply (p_sys->conn, ck, NULL); - if (!r) - { - msg_Err (vout, "shared memory (MIT-SHM) not available"); - msg_Warn (vout, "display will be slow"); - p_sys->shm = false; - } - free (r); - } + /* Setup vout_display_t once everything is fine */ + vd->fmt = fmt_pic; + vd->info = info; + + vd->get = Get; + vd->prepare = NULL; + vd->display = Display; + vd->control = Control; + vd->manage = Manage; + + /* */ + vout_display_SendEventFullscreen (vd, false); + vout_display_SendEventDisplaySize (vd, width, height, false); - vout->pf_init = Init; - vout->pf_end = Deinit; - vout->pf_display = Display; - vout->pf_manage = Manage; return VLC_SUCCESS; error: @@ -364,247 +303,238 @@ error: */ static void Close (vlc_object_t *obj) { - vout_thread_t *vout = (vout_thread_t *)obj; - vout_sys_t *p_sys = vout->p_sys; - - if (p_sys->embed) - vout_ReleaseWindow (p_sys->embed); - /* colormap and window are garbage-collected by X */ - if (p_sys->conn) - xcb_disconnect (p_sys->conn); + vout_display_t *vd = (vout_display_t *)obj; + vout_display_sys_t *p_sys = vd->sys; + + ResetPictures (vd); + /* colormap, window and context are garbage-collected by X */ + xcb_disconnect (p_sys->conn); + vout_display_DeleteWindow (vd, p_sys->embed); free (p_sys); } -struct picture_sys_t +/** + * Return a direct buffer + */ +static picture_t *Get (vout_display_t *vd) { - xcb_connection_t *conn; /* Shared connection to X server */ - xcb_image_t *image; /* Picture buffer */ - xcb_shm_seg_t segment; /* Shared memory segment X ID */ -}; - -#define SHM_ERR ((void *)(intptr_t)(-1)) + vout_display_sys_t *p_sys = vd->sys; -static int PictureInit (vout_thread_t *vout, picture_t *pic) -{ - vout_sys_t *p_sys = vout->p_sys; - picture_sys_t *priv = malloc (sizeof (*p_sys)); + if (!p_sys->pool) + { + vout_display_place_t place; - if (priv == NULL) - return VLC_ENOMEM; + vout_display_PlacePicture (&place, &vd->source, vd->cfg, false); - assert (pic->i_status == FREE_PICTURE); - vout_InitPicture (vout, pic, vout->output.i_chroma, - vout->output.i_width, vout->output.i_height, - vout->output.i_aspect); + /* */ + const uint32_t values[] = { place.x, place.y, place.width, place.height }; + xcb_configure_window (p_sys->conn, p_sys->window, + XCB_CONFIG_WINDOW_X | XCB_CONFIG_WINDOW_Y | + XCB_CONFIG_WINDOW_WIDTH | XCB_CONFIG_WINDOW_HEIGHT, + values); - void *shm = SHM_ERR; - const size_t size = pic->p->i_pitch * pic->p->i_lines; + picture_t *pic = picture_NewFromFormat (&vd->fmt); + if (!pic) + return NULL; - if (p_sys->shm) - { /* Allocate shared memory segment */ - int id = shmget (IPC_PRIVATE, size, IPC_CREAT | 0700); + assert (pic->i_planes == 1); + memset (p_sys->resource, 0, sizeof(p_sys->resource)); - if (id == -1) + unsigned count; + picture_t *pic_array[MAX_PICTURES]; + for (count = 0; count < MAX_PICTURES; count++) { - msg_Err (vout, "shared memory allocation error: %m"); - goto error; - } + picture_resource_t *res = &p_sys->resource[count]; - /* Attach the segment to VLC */ - shm = shmat (id, NULL, 0 /* read/write */); - if (shm == SHM_ERR) - { - msg_Err (vout, "shared memory attachment error: %m"); - shmctl (id, IPC_RMID, 0); - goto error; + res->p->i_lines = pic->p->i_lines; + res->p->i_pitch = pic->p->i_pitch; + if (PictureResourceAlloc (vd, res, res->p->i_pitch * res->p->i_lines, + p_sys->conn, p_sys->shm)) + break; + pic_array[count] = picture_NewFromResource (&vd->fmt, res); + if (!pic_array[count]) + { + PictureResourceFree (res, p_sys->conn); + memset (res, 0, sizeof(*res)); + break; + } } + picture_Release (pic); - /* Attach the segment to X */ - xcb_void_cookie_t ck; - - priv->segment = xcb_generate_id (p_sys->conn); - ck = xcb_shm_attach_checked (p_sys->conn, priv->segment, id, 1); - shmctl (id, IPC_RMID, 0); + if (count == 0) + return NULL; - if (CheckError (vout, "shared memory server-side error", ck)) + p_sys->pool = picture_pool_New (count, pic_array); + if (!p_sys->pool) { - msg_Info (vout, "using buggy X (remote) server? SSH?"); - shmdt (shm); - shm = SHM_ERR; + /* TODO release picture resources */ + return NULL; } + /* FIXME should also do it in case of error ? */ + xcb_flush (p_sys->conn); } - else - priv->segment = 0; - - const unsigned real_width = pic->p->i_pitch / (p_sys->bpp >> 3); - /* FIXME: anyway to getthing more intuitive than that?? */ - xcb_image_t *img; - img = xcb_image_create (real_width, pic->p->i_lines, - XCB_IMAGE_FORMAT_Z_PIXMAP, p_sys->pad, - p_sys->depth, p_sys->bpp, p_sys->bpp, - p_sys->byte_order, XCB_IMAGE_ORDER_MSB_FIRST, - NULL, - (shm != SHM_ERR) ? size : 0, - (shm != SHM_ERR) ? shm : NULL); + return picture_pool_Get (p_sys->pool); +} - if (img == NULL) +/** + * Sends an image to the X server. + */ +static void Display (vout_display_t *vd, picture_t *pic) +{ + vout_display_sys_t *p_sys = vd->sys; + xcb_shm_seg_t segment = pic->p_sys->segment; + xcb_void_cookie_t ck; + + if (!p_sys->visible) + goto out; + if (segment != 0) + ck = xcb_shm_put_image_checked (p_sys->conn, p_sys->window, p_sys->gc, + /* real width */ pic->p->i_pitch / pic->p->i_pixel_pitch, + /* real height */ pic->p->i_lines, + /* x */ vd->fmt.i_x_offset, + /* y */ vd->fmt.i_y_offset, + /* width */ vd->fmt.i_visible_width, + /* height */ vd->fmt.i_visible_height, + 0, 0, p_sys->depth, XCB_IMAGE_FORMAT_Z_PIXMAP, + 0, segment, 0); + else { - if (shm != SHM_ERR) - xcb_shm_detach (p_sys->conn, priv->segment); - goto error; + const size_t offset = vd->fmt.i_y_offset * pic->p->i_pitch; + const unsigned lines = pic->p->i_lines - vd->fmt.i_y_offset; + + ck = xcb_put_image_checked (p_sys->conn, XCB_IMAGE_FORMAT_Z_PIXMAP, + p_sys->window, p_sys->gc, + pic->p->i_pitch / pic->p->i_pixel_pitch, + lines, -vd->fmt.i_x_offset, 0, 0, p_sys->depth, + pic->p->i_pitch * lines, pic->p->p_pixels + offset); } - priv->conn = p_sys->conn; - priv->image = img; - pic->p_sys = priv; - pic->p->p_pixels = img->data; - pic->i_status = DESTROYED_PICTURE; - pic->i_type = DIRECT_PICTURE; - return VLC_SUCCESS; + /* Wait for reply. This makes sure that the X server gets CPU time to + * display the picture. xcb_flush() is *not* sufficient: especially with + * shared memory the PUT requests are so short that many of them can fit in + * X11 socket output buffer before the kernel preempts VLC. */ + xcb_generic_error_t *e = xcb_request_check (p_sys->conn, ck); + if (e != NULL) + { + msg_Dbg (vd, "%s: X11 error %d", "cannot put image", e->error_code); + free (e); + } -error: - if (shm != SHM_ERR) - shmdt (shm); - free (priv); - return VLC_EGENERIC; + /* FIXME might be WAY better to wait in some case (be carefull with + * VOUT_DISPLAY_RESET_PICTURES if done) + does not work with + * vout_display wrapper. */ +out: + picture_Release (pic); } - -/** - * Release picture private data - */ -static void PictureDeinit (picture_t *pic) +static int Control (vout_display_t *vd, int query, va_list ap) { - struct picture_sys_t *p_sys = pic->p_sys; + vout_display_sys_t *p_sys = vd->sys; - if (p_sys->segment != 0) + switch (query) + { + case VOUT_DISPLAY_CHANGE_FULLSCREEN: { - xcb_shm_detach (p_sys->conn, p_sys->segment); - shmdt (p_sys->image->data); + const vout_display_cfg_t *c = va_arg (ap, const vout_display_cfg_t *); + return vout_window_SetFullScreen (p_sys->embed, c->is_fullscreen); } - xcb_image_destroy (p_sys->image); - free (p_sys); -} -static void get_window_size (xcb_connection_t *conn, xcb_window_t win, - unsigned *width, unsigned *height) -{ - xcb_get_geometry_cookie_t ck = xcb_get_geometry (conn, win); - xcb_get_geometry_reply_t *geo = xcb_get_geometry_reply (conn, ck, NULL); + case VOUT_DISPLAY_CHANGE_DISPLAY_SIZE: + { + const vout_display_cfg_t *p_cfg = + (const vout_display_cfg_t*)va_arg (ap, const vout_display_cfg_t *); + const bool is_forced = (bool)va_arg (ap, int); + + if (is_forced + && vout_window_SetSize (p_sys->embed, + p_cfg->display.width, + p_cfg->display.height)) + return VLC_EGENERIC; + + vout_display_place_t place; + vout_display_PlacePicture (&place, &vd->source, p_cfg, false); - if (geo) + if (place.width != vd->fmt.i_visible_width || + place.height != vd->fmt.i_visible_height) + { + vout_display_SendEventPicturesInvalid (vd); + return VLC_SUCCESS; + } + + /* Move the picture within the window */ + const uint32_t values[] = { place.x, place.y }; + xcb_configure_window (p_sys->conn, p_sys->window, + XCB_CONFIG_WINDOW_X | XCB_CONFIG_WINDOW_Y, + values); + return VLC_SUCCESS; + } + case VOUT_DISPLAY_CHANGE_ON_TOP: { - *width = geo->width; - *height = geo->height; - free (geo); + int b_on_top = (int)va_arg (ap, int); + return vout_window_SetOnTop (p_sys->embed, b_on_top); } - else - *width = *height = 0; -} -/** - * Allocate drawable window and picture buffers. - */ -static int Init (vout_thread_t *vout) -{ - vout_sys_t *p_sys = vout->p_sys; - unsigned x, y, width, height; - - get_window_size (p_sys->conn, p_sys->embed->handle.xid, &width, &height); - vout_PlacePicture (vout, width, height, &x, &y, &width, &height); - - const uint32_t values[] = { x, y, width, height, }; - xcb_configure_window (p_sys->conn, p_sys->window, - XCB_CONFIG_WINDOW_X | XCB_CONFIG_WINDOW_Y | - XCB_CONFIG_WINDOW_WIDTH | XCB_CONFIG_WINDOW_HEIGHT, - values); - - /* FIXME: I don't get the subtlety between output and fmt_out here */ - vout->fmt_out.i_visible_width = width; - vout->fmt_out.i_visible_height = height; - vout->fmt_out.i_sar_num = vout->fmt_out.i_sar_den = 1; - - vout->output.i_width = vout->fmt_out.i_width = - width * vout->fmt_in.i_width / vout->fmt_in.i_visible_width; - vout->output.i_height = vout->fmt_out.i_height = - height * vout->fmt_in.i_height / vout->fmt_in.i_visible_height; - vout->fmt_out.i_x_offset = - width * vout->fmt_in.i_x_offset / vout->fmt_in.i_visible_width; - p_vout->fmt_out.i_y_offset = - height * vout->fmt_in.i_y_offset / vout->fmt_in.i_visible_height; - - assert (height > 0); - vout->output.i_aspect = vout->fmt_out.i_aspect = - width * VOUT_ASPECT_FACTOR / height; - - /* Allocate picture buffers */ - I_OUTPUTPICTURES = 0; - for (size_t index = 0; I_OUTPUTPICTURES < 2; index++) + case VOUT_DISPLAY_CHANGE_ZOOM: + case VOUT_DISPLAY_CHANGE_DISPLAY_FILLED: + case VOUT_DISPLAY_CHANGE_SOURCE_ASPECT: + case VOUT_DISPLAY_CHANGE_SOURCE_CROP: + /* I am not sure it is always necessary, but it is way simpler ... */ + vout_display_SendEventPicturesInvalid (vd); + return VLC_SUCCESS; + + case VOUT_DISPLAY_RESET_PICTURES: { - picture_t *pic = vout->p_picture + index; + ResetPictures (vd); - if (index > sizeof (vout->p_picture) / sizeof (pic)) - break; - if (pic->i_status != FREE_PICTURE) - continue; - if (PictureInit (vout, pic)) - break; - PP_OUTPUTPICTURE[I_OUTPUTPICTURES++] = pic; + vout_display_place_t place; + vout_display_PlacePicture (&place, &vd->source, vd->cfg, false); + + vd->fmt.i_width = vd->source.i_width * place.width / vd->source.i_visible_width; + vd->fmt.i_height = vd->source.i_height * place.height / vd->source.i_visible_height; + + vd->fmt.i_visible_width = place.width; + vd->fmt.i_visible_height = place.height; + vd->fmt.i_x_offset = vd->source.i_x_offset * place.width / vd->source.i_visible_width; + vd->fmt.i_y_offset = vd->source.i_y_offset * place.height / vd->source.i_visible_height; + return VLC_SUCCESS; } - return VLC_SUCCESS; -} + /* Hide the mouse. It will be send when + * vout_display_t::info.b_hide_mouse is false */ + case VOUT_DISPLAY_HIDE_MOUSE: + xcb_change_window_attributes (p_sys->conn, p_sys->embed->xid, + XCB_CW_CURSOR, &(uint32_t){ p_sys->cursor }); + return VLC_SUCCESS; -/** - * Free picture buffers. - */ -static void Deinit (vout_thread_t *vout) -{ - for (int i = 0; i < I_OUTPUTPICTURES; i++) - PictureDeinit (PP_OUTPUTPICTURE[i]); + default: + msg_Err (vd, "Unknown request in XCB vout display"); + return VLC_EGENERIC; + } } -/** - * Sends an image to the X server. - */ -static void Display (vout_thread_t *vout, picture_t *pic) +static void Manage (vout_display_t *vd) { - vout_sys_t *p_sys = vout->p_sys; - picture_sys_t *priv = pic->p_sys; - xcb_image_t *img = priv->image; - - if (img->base == NULL) - { - xcb_shm_segment_info_t info = { - .shmseg = priv->segment, - .shmid = -1, /* lost track of it, unimportant */ - .shmaddr = img->data, - }; + vout_display_sys_t *p_sys = vd->sys; - xcb_image_shm_put (p_sys->conn, p_sys->window, p_sys->gc, img, info, - 0, 0, 0, 0, img->width, img->height, 0); - } - else - xcb_image_put (p_sys->conn, p_sys->window, p_sys->gc, img, 0, 0, 0); - xcb_flush (p_sys->conn); + ManageEvent (vd, p_sys->conn, &p_sys->visible); } -/** - * Process incoming X events. - */ -static int Manage (vout_thread_t *vout) +static void ResetPictures (vout_display_t *vd) { - vout_sys_t *p_sys = vout->p_sys; - xcb_generic_event_t *ev; + vout_display_sys_t *p_sys = vd->sys; - while ((ev = xcb_poll_for_event (p_sys->conn)) != NULL) - ProcessEvent (vout, p_sys->conn, p_sys->window, ev); + if (!p_sys->pool) + return; - if (xcb_connection_has_error (p_sys->conn)) + for (unsigned i = 0; i < MAX_PICTURES; i++) { - msg_Err (vout, "X server failure"); - return VLC_EGENERIC; + picture_resource_t *res = &p_sys->resource[i]; + + if (!res->p->p_pixels) + break; + PictureResourceFree (res, p_sys->conn); } - return VLC_SUCCESS; + picture_pool_Delete (p_sys->pool); + p_sys->pool = NULL; }