diff options
author | reimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2008-11-19 20:19:25 +0000 |
---|---|---|
committer | reimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2008-11-19 20:19:25 +0000 |
commit | c351d29392df4d69c7beae0ba41878e6335e3614 (patch) | |
tree | 3ddfa5ab9beca381a36da9384c750eb0832a5983 /libvo/vo_xv.c | |
parent | 928e4433aa62badaa8578cf8247ea0cbf06e3204 (diff) | |
download | mpv-c351d29392df4d69c7beae0ba41878e6335e3614.tar.bz2 mpv-c351d29392df4d69c7beae0ba41878e6335e3614.tar.xz |
Factor common code like -wid handling, vo_gc creation etc. out into
x11_common.c
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27961 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libvo/vo_xv.c')
-rw-r--r-- | libvo/vo_xv.c | 31 |
1 files changed, 0 insertions, 31 deletions
diff --git a/libvo/vo_xv.c b/libvo/vo_xv.c index 67ec61b485..dcb0e95026 100644 --- a/libvo/vo_xv.c +++ b/libvo/vo_xv.c @@ -166,7 +166,6 @@ static int config(uint32_t width, uint32_t height, uint32_t d_width, uint32_t format) { XVisualInfo vinfo; - XGCValues xgcv; XSetWindowAttributes xswa; XWindowAttributes attribs; unsigned long xswamask; @@ -188,8 +187,6 @@ static int config(uint32_t width, uint32_t height, uint32_t d_width, return -1; } - vo_mouse_autohide = 1; - int_pause = 0; visible_buf = -1; @@ -246,38 +243,10 @@ static int config(uint32_t width, uint32_t height, uint32_t d_width, xswa.border_pixel = 0; xswamask = CWBackPixel | CWBorderPixel; - if (WinID >= 0) - { - vo_window = WinID ? ((Window) WinID) : mRootWin; - if (WinID) - { - XUnmapWindow(mDisplay, vo_window); - XChangeWindowAttributes(mDisplay, vo_window, xswamask, - &xswa); - vo_x11_selectinput_witherr(mDisplay, vo_window, - StructureNotifyMask | - KeyPressMask | - PropertyChangeMask | - PointerMotionMask | - ButtonPressMask | - ButtonReleaseMask | - ExposureMask); - XMapWindow(mDisplay, vo_window); - vo_x11_update_geometry(); - aspect_save_prescale(vo_dwidth, vo_dheight); - } else - XSelectInput(mDisplay, vo_window, ExposureMask); - } else - { vo_x11_create_vo_window(&vinfo, vo_dx, vo_dy, vo_dwidth, vo_dheight, flags, CopyFromParent, "xv", title); XChangeWindowAttributes(mDisplay, vo_window, xswamask, &xswa); - } - if (vo_gc != None) - XFreeGC(mDisplay, vo_gc); - vo_gc = XCreateGC(mDisplay, vo_window, 0L, &xgcv); - XSync(mDisplay, False); #ifdef CONFIG_XF86VM if (vm) { |