diff options
| author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2011-02-03 21:49:12 +0200 |
|---|---|---|
| committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2011-02-03 21:49:12 +0200 |
| commit | 106c5f99895fefaf5386f7a4a8ddf6e3d646f1fa (patch) | |
| tree | 7c5d723ce23dd926ca5dd8d95c58b5f3cb87ce37 /libvo/x11_common.h | |
| parent | c24d4e9ec29cb05d2e5ac557d9a0ed89280151c6 (diff) | |
| download | mpv-106c5f99895fefaf5386f7a4a8ddf6e3d646f1fa.tar.bz2 mpv-106c5f99895fefaf5386f7a4a8ddf6e3d646f1fa.tar.xz | |
x11_common: fix for reconfig with pos/xineramascreen set
vo_x11_create_vo_window() only called vo_x11_update_geometry() if no
window position had been specified by -geometry or -xineramascreen, to
avoid overwriting the specified position with values from the existing
window. However window size should be initialized to the existing
window here, and setting new window title for -use-filename-title is
also done in vo_x11_update_geometry() (for whatever reason, it doesn't
match what else that function does). Change the code in
vo_x11_create_vo_window() to always call vo_x11_update_geometry() for
size variable and window title updates, but add a flag that tells it
not to update position variables.
Diffstat (limited to 'libvo/x11_common.h')
| -rw-r--r-- | libvo/x11_common.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libvo/x11_common.h b/libvo/x11_common.h index 824f55b4c8..32cffbb639 100644 --- a/libvo/x11_common.h +++ b/libvo/x11_common.h @@ -126,7 +126,7 @@ void vo_x11_sizehint(struct vo *vo, int x, int y, int width, int height, int max int vo_x11_check_events(struct vo *vo); void vo_x11_selectinput_witherr(Display *display, Window w, long event_mask); void vo_x11_fullscreen(struct vo *vo); -int vo_x11_update_geometry(struct vo *vo); +int vo_x11_update_geometry(struct vo *vo, bool update_pos); void vo_x11_setlayer(struct vo *vo, Window vo_window, int layer); void vo_x11_uninit(struct vo *vo); Colormap vo_x11_create_colormap(struct vo *vo, XVisualInfo *vinfo); @@ -186,7 +186,7 @@ void xscreensaver_heartbeat(struct vo_x11_state *x11); #ifdef IS_OLD_VO #define vo_x11_create_vo_window(...) vo_x11_create_vo_window(global_vo, __VA_ARGS__) #define vo_x11_fullscreen() vo_x11_fullscreen(global_vo) -#define vo_x11_update_geometry() vo_x11_update_geometry(global_vo) +#define vo_x11_update_geometry() vo_x11_update_geometry(global_vo, 1) #define vo_x11_ontop() vo_x11_ontop(global_vo) #define vo_init() vo_init(global_vo) #define vo_x11_ewmh_fullscreen(action) vo_x11_ewmh_fullscreen(global_vo->x11->display, action) |