flywithu/ntel-gpu-tools
1
0
Fork 0
mirror of https://github.com/tiagovignatti/intel-gpu-tools.git synced 2025-06-11 18:06:13 +00:00
Code Issues Releases Wiki Activity

overlay: Allow simple positioning and resizing

Browse Source 
Using window.size=<width>x<height> or window.size=<scale>% in
the config file, or --size=<scale>% or --size=<width>x<height>

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
This commit is contained in:
Chris Wilson 2013-08-25 23:37:58 +01:00
parent c9f0173764
commit 1e65d5ac2f
2 changed files with 45 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
overlay/overlay.c
View File

@ -740,6 +740,7 @@ int main(int argc, char **argv)
{"config", 1, 0, 'c'}, {"config", 1, 0, 'c'},
{"geometry", 1, 0, 'G'}, {"geometry", 1, 0, 'G'},
{"position", 1, 0, 'P'}, {"position", 1, 0, 'P'},
{"size", 1, 0, 'S'},
{NULL, 0, 0, 0,} {NULL, 0, 0, 0,}
}; };
struct overlay_context ctx; struct overlay_context ctx;
@ -751,7 +752,7 @@ int main(int argc, char **argv)
config_init(&config); config_init(&config);
opterr = 0; opterr = 0;
while ((i = getopt_long(argc, argv, "c:f", long_options, &index)) != -1) { while ((i = getopt_long(argc, argv, "c:f:", long_options, &index)) != -1) {
switch (i) { switch (i) {
case 'c': case 'c':
config_parse_string(&config, optarg); config_parse_string(&config, optarg);
@ -762,6 +763,9 @@ int main(int argc, char **argv)
case 'P': case 'P':
config_set_value(&config, "window", "position", optarg); config_set_value(&config, "window", "position", optarg);
break; break;
case 'S':
config_set_value(&config, "window", "size", optarg);
break;
case 'f': case 'f':
daemonize = 0; daemonize = 0;
break; break;

52
overlay/x11/position.c
View File

@ -80,12 +80,13 @@ x11_position(Screen *scr, int width, int height,
geometry = config_get_value(config, "window", "geometry"); geometry = config_get_value(config, "window", "geometry");
if (geometry) { if (geometry) {
sscanf(geometry, "%dx%d+%d+%d", w, h, x, y); sscanf(geometry, "%dx%d+%d+%d", w, h, x, y);
if (*w < width) if (*w < width/2)
*w = width; *w = width/2;
if (*h < height) if (*h < height/2)
*h = height; *h = height/2;
} else { } else {
position = get_position(config); position = get_position(config);
if (position != POS_UNSET) { if (position != POS_UNSET) {
if (width == -1) { if (width == -1) {
*w = scr->width; *w = scr->width;
@ -94,10 +95,7 @@ x11_position(Screen *scr, int width, int height,
case 0: case 0:
case 2: *w >>= 1; break; case 2: *w >>= 1; break;
} }
} else if (width > scr->width) { }
*w = scr->width;
} else
*w = width;
if (height == -1) { if (height == -1) {
*h = scr->height; *h = scr->height;
@ -106,11 +104,41 @@ x11_position(Screen *scr, int width, int height,
case 0: case 0:
case 2: *h >>= 1; break; case 2: *h >>= 1; break;
} }
} else if (height > scr->height) }
*h = scr->height; }
else
*h = height;
geometry = config_get_value(config, "window", "size");
if (geometry) {
int size_w, size_h;
float scale_x, scale_y;
if (sscanf(geometry, "%dx%d", &size_w, &size_h) == 2) {
*w = size_w;
*h = size_h;
} else if (sscanf(geometry, "%f%%x%f%%", &scale_x, &scale_y) == 2) {
if (*w != -1)
*w = (*w * scale_x) / 100.;
if (*h != -1)
*h = (*h * scale_y) / 100.;
} else if (sscanf(geometry, "%f%%", &scale_x) == 1) {
if (*w != -1)
*w = (*w * scale_x) / 100.;
if (*h != -1)
*h = (*h * scale_x) / 100.;
}
if ((unsigned)*w < width/2)
*w = width/2;
if ((unsigned)*h < height/2)
*h = height/2;
}
if ((unsigned)*w > scr->width)
*w = scr->width;
if ((unsigned)*h > scr->height)
*h = scr->height;
if (position != POS_UNSET) {
switch (position & 7) { switch (position & 7) {
default: default:
case 0: *x = 0; break; case 0: *x = 0; break;