RepoMirrors
/
mpv
mirror of https://github.com/mpv-player/mpv
1
0
Fork 0
Code Issues Releases Wiki Activity

Get rid of nonsensical limits on -geometry x, y,w and h values, they only 

cause confusion on multi-monitor setups.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29112 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
reimar 2009-03-31 16:16:12 +00:00
parent 87eabf0a5b
commit 6b57f53f6f
1 changed files with 8 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
libvo/geometry.c
View File

@ -20,6 +20,7 @@
#include <stdio.h> #include <stdio.h>
#include <string.h> #include <string.h>
#include <limits.h>
#include "geometry.h" #include "geometry.h"
#include "mp_msg.h" #include "mp_msg.h"
@ -38,7 +39,7 @@ int geometry(int *xpos, int *ypos, int *widw, int *widh, int scrw, int scrh)
{ {
int width, height, xoff, yoff, xper, yper; int width, height, xoff, yoff, xper, yper;
width = height = xoff = yoff = xper = yper = -1; width = height = xoff = yoff = xper = yper = INT_MIN;
if(vo_geometry != NULL) { if(vo_geometry != NULL) {
if(sscanf(vo_geometry, "%ix%i+%i+%i", &width, &height, &xoff, &yoff) != 4 ) if(sscanf(vo_geometry, "%ix%i+%i+%i", &width, &height, &xoff, &yoff) != 4 )
@ -90,22 +91,14 @@ int geometry(int *xpos, int *ypos, int *widw, int *widh, int scrw, int scrh)
mp_msg(MSGT_VO, MSGL_V,"geometry window parameter: widw: %i," mp_msg(MSGT_VO, MSGL_V,"geometry window parameter: widw: %i,"
" widh: %i, scrw: %i, scrh: %i\n",*widw, *widh, scrw, scrh); " widh: %i, scrw: %i, scrh: %i\n",*widw, *widh, scrw, scrh);
/* FIXME: better checking of bounds... */ if (xoff != INT_MIN && xpos) *xpos = xoff;
if( width != -1 && (width < 0 || width > scrw)) if (yoff != INT_MIN && ypos) *ypos = yoff;
width = (scrw < *widw) ? scrw : *widw; if (width > 0 && widw) *widw = width;
if( height != -1 && (height < 0 || height > scrh)) if (height > 0 && widh) *widh = height;
height = (scrh < *widh) ? scrh : *widh;
if(xoff != -1 && (xoff < 0 || xoff + width > scrw)) xoff = 0;
if(yoff != -1 && (yoff < 0 || yoff + height > scrh)) yoff = 0;
if(xoff != -1 && xpos) *xpos = xoff; if (width > 0 || height > 0)
if(yoff != -1 && ypos) *ypos = yoff;
if(width != -1 && widw) *widw = width;
if(height != -1 && widh) *widh = height;
if( width != -1 || height != -1)
geometry_wh_changed = 1; geometry_wh_changed = 1;
if( xoff != -1 || yoff != -1) if (xoff != INT_MIN || yoff != INT_MIN)
geometry_xy_changed = 1; geometry_xy_changed = 1;
} }
return 1; return 1;