X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fcontrol.c;h=31ec61cc7617679ce22037abbc0986835fffee12;hb=b38189d375ff492f1b4090efc728770e4900c1e0;hp=533bb8093924de35b995c69ce7e06d2c6e3c82ff;hpb=b3cf076f4ed9c67eb2d03d38382ce7a5c4993dba;p=geometrycompositor.git diff --git a/source/control.c b/source/control.c index 533bb80..31ec61c 100644 --- a/source/control.c +++ b/source/control.c @@ -104,6 +104,15 @@ static const char *flat_fshader_src = "}\n"; +void reset_correction(GeometryCorrection *correction) +{ + correction->keystone_vertical = 0.0f; + correction->curvature_type = 1; + correction->curvature_depth = 0.0f; + correction->vertical_center = 0.5f; + correction->perspective = 1.0f; +} + GeometryCorrection *get_corrections(Display *display) { Window root; @@ -417,6 +426,8 @@ int interactive(Display *display, GeometryCorrection *corrections, GeometryCorre target->perspective -= 1.0f/16; else if(keysym==XK_z) target->curvature_type = target->curvature_type%2+1; + else if(keysym==XK_0) + reset_correction(target); else break; @@ -436,9 +447,6 @@ int interactive(Display *display, GeometryCorrection *corrections, GeometryCorre case Expose: repaint = 1; break; - default: - printf("event %d\n", event.type); - break; } if(repaint) @@ -488,11 +496,7 @@ int main(int argc, char **argv) corrections[i].monitor_name = (char *)malloc(namelen+1); strcpy(corrections[i].monitor_name, argv[1]); corrections[i+1].monitor_name = NULL; - corrections[i].keystone_vertical = 0.0f; - corrections[i].curvature_type = 1; - corrections[i].curvature_depth = 0.0f; - corrections[i].vertical_center = 0.5f; - corrections[i].perspective = 1.0f; + reset_correction(&corrections[i]); } if(argc==2)