RepoMirrors
/
mpv
mirror of https://github.com/mpv-player/mpv
1
0
Fork 0
Code Issues Releases Wiki Activity

x11: inline a function 

Keeping it separate seems less readable.
This commit is contained in:
wm4 2014-05-16 23:17:02 +02:00
parent 4ac4269389
commit 7c2cf7cdf1
1 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
video/out/x11_common.c
View File

@ -1125,14 +1125,6 @@ static void vo_x11_set_wm_icon(struct vo_x11_state *x11)
talloc_free(uncompressed.start); talloc_free(uncompressed.start);
} }
static void find_default_visual(struct vo_x11_state *x11, XVisualInfo *vis)
{
Display *display = x11->display;
XWindowAttributes attribs;
XGetWindowAttributes(display, DefaultRootWindow(display), &attribs);
XMatchVisualInfo(display, x11->screen, attribs.depth, TrueColor, vis);
}
static void vo_x11_create_window(struct vo *vo, XVisualInfo *vis, int x, int y, static void vo_x11_create_window(struct vo *vo, XVisualInfo *vis, int x, int y,
unsigned int w, unsigned int h) unsigned int w, unsigned int h)
{ {
@ -1144,7 +1136,9 @@ static void vo_x11_create_window(struct vo *vo, XVisualInfo *vis, int x, int y,
XVisualInfo vinfo_storage; XVisualInfo vinfo_storage;
if (!vis) { if (!vis) {
vis = &vinfo_storage; vis = &vinfo_storage;
find_default_visual(x11, vis); XWindowAttributes att;
XGetWindowAttributes(x11->display, x11->rootwin, &att);
XMatchVisualInfo(x11->display, x11->screen, att.depth, TrueColor, vis);
} }
if (x11->colormap == None) { if (x11->colormap == None) {