diff options
author | wm4 <wm4@nowhere> | 2013-01-27 07:21:10 +0100 |
---|---|---|
committer | wm4 <wm4@nowhere> | 2013-01-27 13:30:54 +0100 |
commit | 0535a14505c367693fe729a3f1348c4ffd516af3 (patch) | |
tree | cd22dd3c63e5f302107ff038b5998930138d4dc9 /video/out/vo_x11.c | |
parent | e4943165c1f1365a5c2d7b0d6924a8f65454ce20 (diff) | |
download | mpv-0535a14505c367693fe729a3f1348c4ffd516af3.tar.bz2 mpv-0535a14505c367693fe729a3f1348c4ffd516af3.tar.xz |
x11: reduce VO mode switching code duplication
Some parts for initiating mode switches were duplicated in every VO
supporting X11 (except vo_opengl/gl_common, which didn't support mode
switching). Move this to x11_common.c.
Note that this might be slightly risky: is it really guaranteed that no
VO needed to do "special" setup that depends on X parameters changing
after a mode switch, such as bit depth, visuals etc.? From what I can
see, this shouldn't be the case (X probably can't even change depth on
the fly). Even if this should be a one-way road, VM switching is in
general very useless, and its implementation buggy, so it can just be
removed should unfixable problems arise.
Diffstat (limited to 'video/out/vo_x11.c')
-rw-r--r-- | video/out/vo_x11.c | 25 |
1 files changed, 0 insertions, 25 deletions
diff --git a/video/out/vo_x11.c b/video/out/vo_x11.c index 9b13ae2893..09055a698d 100644 --- a/video/out/vo_x11.c +++ b/video/out/vo_x11.c @@ -330,9 +330,6 @@ static int config(struct vo *vo, uint32_t width, uint32_t height, mp_image_unrefp(&p->original_image); -#ifdef CONFIG_XF86VM - int vm = flags & VOFLAG_MODESWITCHING; -#endif p->Flip_Flag = flags & VOFLAG_FLIPPING; p->zoomFlag = 1; @@ -369,27 +366,10 @@ static int config(struct vo *vo, uint32_t width, uint32_t height, p->image_height = height; { -#ifdef CONFIG_XF86VM - if (vm) - vo_vm_switch(vo); - -#endif theCmap = vo_x11_create_colormap(vo, &p->vinfo); vo_x11_create_vo_window(vo, &p->vinfo, vo->dx, vo->dy, vo->dwidth, vo->dheight, flags, theCmap, "x11"); - -#ifdef CONFIG_XF86VM - if (vm) { - /* Grab the mouse pointer in our window */ - if (vo_grabpointer) - XGrabPointer(vo->x11->display, vo->x11->window, True, 0, - GrabModeAsync, GrabModeAsync, - vo->x11->window, None, CurrentTime); - XSetInputFocus(vo->x11->display, vo->x11->window, RevertToNone, - CurrentTime); - } -#endif } if (WinID > 0) { @@ -721,11 +701,6 @@ static void uninit(struct vo *vo) talloc_free(p->original_image); -#ifdef CONFIG_XF86VM - vo_vm_close(vo); -#endif - - p->zoomFlag = 0; vo_x11_uninit(vo); sws_freeContext(p->swsContext); |