diff options
Diffstat (limited to 'libvo')
-rw-r--r-- | libvo/gl_common.c | 8 | ||||
-rw-r--r-- | libvo/vo_x11.c | 4 | ||||
-rw-r--r-- | libvo/vo_xv.c | 6 | ||||
-rw-r--r-- | libvo/x11_common.c | 36 | ||||
-rw-r--r-- | libvo/x11_common.h | 1 |
5 files changed, 21 insertions, 34 deletions
diff --git a/libvo/gl_common.c b/libvo/gl_common.c index 192906285c..369556b96a 100644 --- a/libvo/gl_common.c +++ b/libvo/gl_common.c @@ -1607,13 +1607,7 @@ int setGlWindow(XVisualInfo **vinfo, GLXContext *context, Window win) // set new values vo_window = win; - { - Window root; - int tmp; - unsigned utmp; - XGetGeometry(mDisplay, vo_window, &root, &tmp, &tmp, - (unsigned *)&vo_dwidth, (unsigned *)&vo_dheight, &utmp, &utmp); - } + vo_x11_update_geometry(); if (!keep_context) { void *(*getProcAddress)(const GLubyte *); const char *(*glXExtStr)(Display *, int); diff --git a/libvo/vo_x11.c b/libvo/vo_x11.c index a384c6f3f3..0bf0877179 100644 --- a/libvo/vo_x11.c +++ b/libvo/vo_x11.c @@ -430,9 +430,7 @@ static int config(uint32_t width, uint32_t height, uint32_t d_width, ButtonReleaseMask | ExposureMask); XMapWindow(mDisplay, vo_window); - XGetGeometry(mDisplay, vo_window, &mRootWin, - &vo_dx, &vo_dy, &vo_dwidth, &vo_dheight, - &border, &depth); + depth = vo_x11_update_geometry(); } else XSelectInput(mDisplay, vo_window, ExposureMask); } else diff --git a/libvo/vo_xv.c b/libvo/vo_xv.c index 6949c00f0a..8b6cfda146 100644 --- a/libvo/vo_xv.c +++ b/libvo/vo_xv.c @@ -290,11 +290,7 @@ static int config(uint32_t width, uint32_t height, uint32_t d_width, ButtonReleaseMask | ExposureMask); XMapWindow(mDisplay, vo_window); - XGetGeometry(mDisplay, vo_window, &mRoot, - &drwX, &drwY, &vo_dwidth, &vo_dheight, - &drwBorderWidth, &drwDepth); - if (vo_dwidth <= 0) vo_dwidth = d_width; - if (vo_dheight <= 0) vo_dheight = d_height; + vo_x11_update_geometry(); aspect_save_prescale(vo_dwidth, vo_dheight); } } else diff --git a/libvo/x11_common.c b/libvo/x11_common.c index ed58a6134c..c70e83352f 100644 --- a/libvo/x11_common.c +++ b/libvo/x11_common.c @@ -1040,25 +1040,7 @@ int vo_x11_check_events(Display * mydisplay) // if (vo_fs && Event.xconfigure.width != vo_screenwidth && Event.xconfigure.height != vo_screenheight) break; if (vo_window == None) break; - vo_dwidth = Event.xconfigure.width; - vo_dheight = Event.xconfigure.height; -#if 0 - /* when resizing, x and y are zero :( */ - vo_dx = Event.xconfigure.x; - vo_dy = Event.xconfigure.y; -#else - { - Window root; - int foo; - Window win; - - XGetGeometry(mydisplay, vo_window, &root, &foo, &foo, - &foo /*width */ , &foo /*height */ , &foo, - &foo); - XTranslateCoordinates(mydisplay, vo_window, root, 0, 0, - &vo_dx, &vo_dy, &win); - } -#endif + vo_x11_update_geometry(); ret |= VO_EVENT_RESIZE; break; case KeyPress: @@ -1496,6 +1478,22 @@ static int vo_x11_get_fs_type(int supported) return type; } +/** + * \brief update vo_dx, vo_dy, vo_dwidth and vo_dheight with current values of vo_window + * \return returns current color depth of vo_window + */ +int vo_x11_update_geometry(void) { + unsigned depth, w, h; + int dummy_int; + Window dummy_win; + XGetGeometry(mDisplay, vo_window, &dummy_win, &dummy_int, &dummy_int, + &w, &h, &dummy_int, &depth); + if (w <= INT_MAX && h <= INT_MAX) { vo_dwidth = w; vo_dheight = h; } + XTranslateCoordinates(mDisplay, vo_window, mRootWin, 0, 0, &vo_dx, &vo_dy, + &dummy_win); + return depth <= INT_MAX ? depth : 0; +} + void vo_x11_fullscreen(void) { int x, y, w, h; diff --git a/libvo/x11_common.h b/libvo/x11_common.h index 50bed0f599..b004f21820 100644 --- a/libvo/x11_common.h +++ b/libvo/x11_common.h @@ -50,6 +50,7 @@ extern void vo_x11_nofs_sizepos(int x, int y, int width, int height); extern void vo_x11_sizehint( int x, int y, int width, int height, int max ); extern int vo_x11_check_events(Display *mydisplay); extern void vo_x11_selectinput_witherr(Display *display, Window w, long event_mask); +int vo_x11_update_geometry(void); extern void vo_x11_fullscreen( void ); extern void vo_x11_setlayer( Display * mDisplay,Window vo_window,int layer ); extern void vo_x11_uninit(void); |