diff options
| author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2009-02-13 03:52:51 +0200 |
|---|---|---|
| committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2009-02-13 03:52:51 +0200 |
| commit | 738f66b1bc98073d74af7031c4454322157a15ec (patch) | |
| tree | 25d69a5d92ea4440f7e08e3c82cc5bb3a1d4598e /libvo/x11_common.c | |
| parent | 1e869638280f962fb80f372d152234f21246c2af (diff) | |
| parent | 9f8792e639fee0b706dc5ec83e9b9fa0cf432e61 (diff) | |
| download | mpv-738f66b1bc98073d74af7031c4454322157a15ec.tar.bz2 mpv-738f66b1bc98073d74af7031c4454322157a15ec.tar.xz | |
Merge svn changes up to r28549
Diffstat (limited to 'libvo/x11_common.c')
| -rw-r--r-- | libvo/x11_common.c | 26 |
1 files changed, 6 insertions, 20 deletions
diff --git a/libvo/x11_common.c b/libvo/x11_common.c index c7864b14dd..0b070a868b 100644 --- a/libvo/x11_common.c +++ b/libvo/x11_common.c @@ -811,8 +811,12 @@ int vo_x11_check_events(struct vo *vo) // if (vo_fs && Event.xconfigure.width != opts->vo_screenwidth && Event.xconfigure.height != opts->vo_screenheight) break; if (x11->window == None) break; - vo_x11_update_geometry(vo); - ret |= VO_EVENT_RESIZE; + { + int old_w = vo->dwidth, old_h = vo->dheight; + vo_x11_update_geometry(vo); + if (vo->dwidth != old_w || vo->dheight != old_h) + ret |= VO_EVENT_RESIZE; + } break; case KeyPress: { @@ -1868,24 +1872,6 @@ uint32_t vo_x11_get_equalizer(char *name, int *value) return VO_TRUE; } -void vo_calc_drwXY(struct vo *vo, uint32_t *drwX, uint32_t *drwY) -{ - struct MPOpts *opts = vo->opts; - *drwX = *drwY = 0; - if (vo_fs) { - aspect(vo, &vo->dwidth, &vo->dheight, A_ZOOM); - vo->dwidth = FFMIN(vo->dwidth, opts->vo_screenwidth); - vo->dheight = FFMIN(vo->dheight, opts->vo_screenheight); - *drwX = (opts->vo_screenwidth - vo->dwidth) / 2; - *drwY = (opts->vo_screenheight - vo->dheight) / 2; - mp_msg(MSGT_VO, MSGL_V, "[xv-fs] dx: %d dy: %d dw: %d dh: %d\n", *drwX, - *drwY, vo->dwidth, vo->dheight); - } else if (WinID == 0) { - *drwX = vo->dx; - *drwY = vo->dy; - } -} - #ifdef CONFIG_XV int vo_xv_set_eq(struct vo *vo, uint32_t xv_port, char *name, int value) { |