annotate libvo/geometry.c @ 9999:cf6c97c5c1b6

sync
author nicolas
date Sat, 26 Apr 2003 22:43:15 +0000
parents b552e7939ca2
children b105d7aba10d
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
7866
732a8bfc7681 Added the -geometry option (supports fbdev and tdfxfb drivers)
mark
parents:
diff changeset
1 /* This file (C) Mark Zealey <mark@zealos.org> 2002, released under GPL */
732a8bfc7681 Added the -geometry option (supports fbdev and tdfxfb drivers)
mark
parents:
diff changeset
2
9217
420e2b2f8e5a compiler warning fixes patch by Dominik Mierzejewski <dominik@rangers.eu.org>
arpi
parents: 8768
diff changeset
3 #include <stdio.h>
420e2b2f8e5a compiler warning fixes patch by Dominik Mierzejewski <dominik@rangers.eu.org>
arpi
parents: 8768
diff changeset
4 #include <string.h>
7866
732a8bfc7681 Added the -geometry option (supports fbdev and tdfxfb drivers)
mark
parents:
diff changeset
5 #include "geometry.h"
732a8bfc7681 Added the -geometry option (supports fbdev and tdfxfb drivers)
mark
parents:
diff changeset
6 #include "../mp_msg.h"
8254
772d6d27fd66 warning patch by (Dominik Mierzejewski <dominik at rangers dot eu dot org>)
michael
parents: 8123
diff changeset
7 #include "../mplayer.h" /* exit_player() */
7866
732a8bfc7681 Added the -geometry option (supports fbdev and tdfxfb drivers)
mark
parents:
diff changeset
8
8745
93f78fb709e6 Added support for X style -geometry options (adapted from Henk's patch)
mark
parents: 8254
diff changeset
9 /* A string of the form [WxH][+X+Y] or xpos[%]:ypos[%] */
7866
732a8bfc7681 Added the -geometry option (supports fbdev and tdfxfb drivers)
mark
parents:
diff changeset
10 char *vo_geometry = NULL;
732a8bfc7681 Added the -geometry option (supports fbdev and tdfxfb drivers)
mark
parents:
diff changeset
11
732a8bfc7681 Added the -geometry option (supports fbdev and tdfxfb drivers)
mark
parents:
diff changeset
12 int geometry_error()
732a8bfc7681 Added the -geometry option (supports fbdev and tdfxfb drivers)
mark
parents:
diff changeset
13 {
8745
93f78fb709e6 Added support for X style -geometry options (adapted from Henk's patch)
mark
parents: 8254
diff changeset
14 mp_msg(MSGT_VO, MSGL_ERR, "-geometry must be in [WxH][+X+Y] | [X[%%]:[Y[%%]]] format, incorrect (%s)\n", vo_geometry);
7866
732a8bfc7681 Added the -geometry option (supports fbdev and tdfxfb drivers)
mark
parents:
diff changeset
15 exit_player(NULL); /* ????? what else could we do ? */
732a8bfc7681 Added the -geometry option (supports fbdev and tdfxfb drivers)
mark
parents:
diff changeset
16 return 0;
732a8bfc7681 Added the -geometry option (supports fbdev and tdfxfb drivers)
mark
parents:
diff changeset
17 }
732a8bfc7681 Added the -geometry option (supports fbdev and tdfxfb drivers)
mark
parents:
diff changeset
18
9517
d65ddafbc404 clean up of -geometry code.
attila
parents: 9217
diff changeset
19 #define RESET_GEOMETRY width = height = xoff = yoff = xper = yper = -1;
d65ddafbc404 clean up of -geometry code.
attila
parents: 9217
diff changeset
20
d65ddafbc404 clean up of -geometry code.
attila
parents: 9217
diff changeset
21 // xpos,ypos: position of the left upper corner
d65ddafbc404 clean up of -geometry code.
attila
parents: 9217
diff changeset
22 // widw,widh: width and height of the window
d65ddafbc404 clean up of -geometry code.
attila
parents: 9217
diff changeset
23 // scrw,scrh: width and height of the current screen
d65ddafbc404 clean up of -geometry code.
attila
parents: 9217
diff changeset
24 int geometry(int *xpos, int *ypos, int *widw, int *widh, int scrw, int scrh)
7866
732a8bfc7681 Added the -geometry option (supports fbdev and tdfxfb drivers)
mark
parents:
diff changeset
25 {
8745
93f78fb709e6 Added support for X style -geometry options (adapted from Henk's patch)
mark
parents: 8254
diff changeset
26 int width, height, xoff, yoff, xper, yper;
93f78fb709e6 Added support for X style -geometry options (adapted from Henk's patch)
mark
parents: 8254
diff changeset
27
93f78fb709e6 Added support for X style -geometry options (adapted from Henk's patch)
mark
parents: 8254
diff changeset
28 width = height = xoff = yoff = xper = yper = -1;
7866
732a8bfc7681 Added the -geometry option (supports fbdev and tdfxfb drivers)
mark
parents:
diff changeset
29
8745
93f78fb709e6 Added support for X style -geometry options (adapted from Henk's patch)
mark
parents: 8254
diff changeset
30 if(vo_geometry != NULL) {
9517
d65ddafbc404 clean up of -geometry code.
attila
parents: 9217
diff changeset
31 if(sscanf(vo_geometry, "%ix%i+%i+%i", &width, &height, &xoff, &yoff) != 4 )
d65ddafbc404 clean up of -geometry code.
attila
parents: 9217
diff changeset
32 {
d65ddafbc404 clean up of -geometry code.
attila
parents: 9217
diff changeset
33 RESET_GEOMETRY
d65ddafbc404 clean up of -geometry code.
attila
parents: 9217
diff changeset
34 if(sscanf(vo_geometry, "%ix%i", &width, &height) != 2)
d65ddafbc404 clean up of -geometry code.
attila
parents: 9217
diff changeset
35 {
d65ddafbc404 clean up of -geometry code.
attila
parents: 9217
diff changeset
36 RESET_GEOMETRY
d65ddafbc404 clean up of -geometry code.
attila
parents: 9217
diff changeset
37 if(sscanf(vo_geometry, "+%i+%i", &xoff, &yoff) != 2)
d65ddafbc404 clean up of -geometry code.
attila
parents: 9217
diff changeset
38 {
d65ddafbc404 clean up of -geometry code.
attila
parents: 9217
diff changeset
39 RESET_GEOMETRY
d65ddafbc404 clean up of -geometry code.
attila
parents: 9217
diff changeset
40 if(sscanf(vo_geometry, "%i:%i", &xoff, &yoff) != 2)
d65ddafbc404 clean up of -geometry code.
attila
parents: 9217
diff changeset
41 {
d65ddafbc404 clean up of -geometry code.
attila
parents: 9217
diff changeset
42 RESET_GEOMETRY
d65ddafbc404 clean up of -geometry code.
attila
parents: 9217
diff changeset
43 if(sscanf(vo_geometry, "%i:%i%%", &xper, &yper) != 2)
d65ddafbc404 clean up of -geometry code.
attila
parents: 9217
diff changeset
44 {
d65ddafbc404 clean up of -geometry code.
attila
parents: 9217
diff changeset
45 RESET_GEOMETRY
d65ddafbc404 clean up of -geometry code.
attila
parents: 9217
diff changeset
46 if(sscanf(vo_geometry, "%i%%:%i", &xper, &yper) != 2)
d65ddafbc404 clean up of -geometry code.
attila
parents: 9217
diff changeset
47 {
d65ddafbc404 clean up of -geometry code.
attila
parents: 9217
diff changeset
48 RESET_GEOMETRY
d65ddafbc404 clean up of -geometry code.
attila
parents: 9217
diff changeset
49 if(sscanf(vo_geometry, "%i%%:%i%%", &xper, &yper) != 2)
d65ddafbc404 clean up of -geometry code.
attila
parents: 9217
diff changeset
50 {
d65ddafbc404 clean up of -geometry code.
attila
parents: 9217
diff changeset
51 RESET_GEOMETRY
d65ddafbc404 clean up of -geometry code.
attila
parents: 9217
diff changeset
52 if(sscanf(vo_geometry, "%i%%", &xper) != 1)
8745
93f78fb709e6 Added support for X style -geometry options (adapted from Henk's patch)
mark
parents: 8254
diff changeset
53 return geometry_error();
9517
d65ddafbc404 clean up of -geometry code.
attila
parents: 9217
diff changeset
54 }
d65ddafbc404 clean up of -geometry code.
attila
parents: 9217
diff changeset
55 }
d65ddafbc404 clean up of -geometry code.
attila
parents: 9217
diff changeset
56 }
d65ddafbc404 clean up of -geometry code.
attila
parents: 9217
diff changeset
57 }
d65ddafbc404 clean up of -geometry code.
attila
parents: 9217
diff changeset
58 }
d65ddafbc404 clean up of -geometry code.
attila
parents: 9217
diff changeset
59 }
d65ddafbc404 clean up of -geometry code.
attila
parents: 9217
diff changeset
60 }
7866
732a8bfc7681 Added the -geometry option (supports fbdev and tdfxfb drivers)
mark
parents:
diff changeset
61
9517
d65ddafbc404 clean up of -geometry code.
attila
parents: 9217
diff changeset
62 mp_msg(MSGT_VO, MSGL_V,"geometry set to width: %i,"
9947
b552e7939ca2 adding geometry support for xvidix
attila
parents: 9517
diff changeset
63 "height: %i, xoff: %i, yoff: %i, xper: %i, yper: %i\n",
9517
d65ddafbc404 clean up of -geometry code.
attila
parents: 9217
diff changeset
64 width, height, xoff, yoff, xper, yper);
d65ddafbc404 clean up of -geometry code.
attila
parents: 9217
diff changeset
65
d65ddafbc404 clean up of -geometry code.
attila
parents: 9217
diff changeset
66 if(xper >= 0 && xper <= 100) xoff = (scrw - *widw) * ((float)xper / 100.0);
d65ddafbc404 clean up of -geometry code.
attila
parents: 9217
diff changeset
67 if(yper >= 0 && yper <= 100) yoff = (scrh - *widh) * ((float)yper / 100.0);
7866
732a8bfc7681 Added the -geometry option (supports fbdev and tdfxfb drivers)
mark
parents:
diff changeset
68
9947
b552e7939ca2 adding geometry support for xvidix
attila
parents: 9517
diff changeset
69 mp_msg(MSGT_VO, MSGL_V,"geometry set to width: %i,"
b552e7939ca2 adding geometry support for xvidix
attila
parents: 9517
diff changeset
70 "height: %i, xoff: %i, yoff: %i, xper: %i, yper: %i\n",
b552e7939ca2 adding geometry support for xvidix
attila
parents: 9517
diff changeset
71 width, height, xoff, yoff, xper, yper);
b552e7939ca2 adding geometry support for xvidix
attila
parents: 9517
diff changeset
72 mp_msg(MSGT_VO, MSGL_V,"geometry window parameter: widw: %i,"
b552e7939ca2 adding geometry support for xvidix
attila
parents: 9517
diff changeset
73 " widh: %i, scrw: %i, scrh: %i\n",*widw, *widh, scrw, scrh);
b552e7939ca2 adding geometry support for xvidix
attila
parents: 9517
diff changeset
74
8768
44b7d4c7e61c cosmetics
attila
parents: 8767
diff changeset
75 /* FIXME: better checking of bounds... */
9947
b552e7939ca2 adding geometry support for xvidix
attila
parents: 9517
diff changeset
76 if(width < 0 || width > scrw) width = (scrw < *widw) ? scrw : *widw;
b552e7939ca2 adding geometry support for xvidix
attila
parents: 9517
diff changeset
77 if(height < 0 || height > scrh) height = (scrh < *widh) ? scrh : *widh;
b552e7939ca2 adding geometry support for xvidix
attila
parents: 9517
diff changeset
78 if(xoff < 0 || xoff + width > scrw) xoff = 0;
b552e7939ca2 adding geometry support for xvidix
attila
parents: 9517
diff changeset
79 if(yoff < 0 || yoff + height > scrh) yoff = 0;
8745
93f78fb709e6 Added support for X style -geometry options (adapted from Henk's patch)
mark
parents: 8254
diff changeset
80
8768
44b7d4c7e61c cosmetics
attila
parents: 8767
diff changeset
81 if(xpos) *xpos = xoff;
44b7d4c7e61c cosmetics
attila
parents: 8767
diff changeset
82 if(ypos) *ypos = yoff;
9517
d65ddafbc404 clean up of -geometry code.
attila
parents: 9217
diff changeset
83 if(widw) *widw = width;
d65ddafbc404 clean up of -geometry code.
attila
parents: 9217
diff changeset
84 if(widh) *widh = height;
8767
e497d7e42d8a fix xv window position problem
attila
parents: 8745
diff changeset
85 }
7866
732a8bfc7681 Added the -geometry option (supports fbdev and tdfxfb drivers)
mark
parents:
diff changeset
86 return 1;
732a8bfc7681 Added the -geometry option (supports fbdev and tdfxfb drivers)
mark
parents:
diff changeset
87 }
732a8bfc7681 Added the -geometry option (supports fbdev and tdfxfb drivers)
mark
parents:
diff changeset
88
9517
d65ddafbc404 clean up of -geometry code.
attila
parents: 9217
diff changeset
89 #undef RESET_GEOMETRY