 @@ -129,26 +129,27 @@ usage(void)
            "      --left-of <output>\n"
            "      --right-of <output>\n"
            "      --above <output>\n"
            "      --below <output>\n"
            "      --same-as <output>\n"
            "      --set <property> <value>\n"
            "      --scale <x>x<y>\n"
            "      --scale-from <w>x<h>\n"
            "      --transform <a>,<b>,<c>,<d>,<e>,<f>,<g>,<h>,<i>\n"
            "      --off\n"
            "      --crtc <crtc>\n"
            "      --panning <w>x<h>[+<x>+<y>[/<track:w>x<h>+<x>+<y>[/<border:l>/<t>/<r>/<b>]]]\n"
            "      --gamma <r>:<g>:<b>\n"
            "      --brightness <value>\n"
            "      --primary\n"
            "  --noprimary\n"
            "  --newmode <name> <clock MHz>\n"
            "            <hdisp> <hsync-start> <hsync-end> <htotal>\n"
            "            <vdisp> <vsync-start> <vsync-end> <vtotal>\n"
            "            [flags...]\n"
            "            Valid flags: +HSync -HSync +VSync -VSync\n"
            "                         +CSync -CSync CSync Interlace DoubleScan\n"
            "  --rmmode <name>\n"
            "  --addmode <output> <name>\n"
            "  --delmode <output> <name>\n"
            "  --listproviders\n"
            "  --setprovideroutputsource <prov-xid> <source-xid>\n"
 @@ -1384,27 +1385,27 @@ set_panning (void)
 	if (! output->crtc_info->panning_info)
 	    output->crtc_info->panning_info = malloc (sizeof(XRRPanning));
 	memcpy (output->crtc_info->panning_info, &output->panning, sizeof(XRRPanning));
 	output->crtc_info->changing = 1;
+    }
+}
 static void
 set_gamma(void)
+{
     output_t	*output;
     for (output = all_outputs; output; output = output->next) {
-	int i, size, shift;
+	int i, size;
 	crtc_t *crtc;
 	XRRCrtcGamma *crtc_gamma;
 	float gammaRed;
 	float gammaGreen;
 	float gammaBlue;
 	if (!(output->changes & changes_gamma))
 	    continue;
 	if (!output->crtc_info) {
 	    fatal("Need crtc to set gamma on.\n");
 	    continue;
+	}
 @@ -1419,75 +1420,64 @@ set_gamma(void)
+	}
 	/*
 	 * The gamma-correction lookup table managed through XRR[GS]etCrtcGamma
 	 * is 2^n in size, where 'n' is the number of significant bits in
 	 * the X Color.  Because an X Color is 16 bits, size cannot be larger
 	 * than 2^16.
 	 */
 	if (size > 65536) {
 	    fatal("Gamma correction table is impossibly large.\n");
 	    continue;
+	}
 	/*
 	 * The hardware color lookup table has a number of significant
 	 * bits equal to ffs(size) - 1; compute all values so that
 	 * they are in the range [0,size) then shift the values so
 	 * that they occupy the MSBs of the 16-bit X Color.
 	 */
 	shift = 16 - (ffs(size) - 1);
 	crtc_gamma = XRRAllocGamma(size);
 	if (!crtc_gamma) {
 	    fatal("Gamma allocation failed.\n");
 	    continue;
+	}
 	if (output->gamma.red == 0.0)
 	    output->gamma.red = 1.0;
 	if (output->gamma.green == 0.0)
 	    output->gamma.green = 1.0;
 	if (output->gamma.blue == 0.0)
 	    output->gamma.blue = 1.0;
 	gammaRed = 1.0 / output->gamma.red;
 	gammaGreen = 1.0 / output->gamma.green;
 	gammaBlue = 1.0 / output->gamma.blue;
 	for (i = 0; i < size; i++) {
 	    if (gammaRed == 1.0 && output->brightness == 1.0)
-		crtc_gamma->red[i] = i;
+		crtc_gamma->red[i] = (double)i / (double)(size - 1) * 65535.0;
 	    else
 		crtc_gamma->red[i] = dmin(pow((double)i/(double)(size - 1),
 					      gammaRed) * output->brightness,
-.0) * (double)(size - 1);
+.0) * 65535.0;
 	    crtc_gamma->red[i] <<= shift;
 	    if (gammaGreen == 1.0 && output->brightness == 1.0)
-		crtc_gamma->green[i] = i;
+		crtc_gamma->green[i] = (double)i / (double)(size - 1) * 65535.0;
 	    else
 		crtc_gamma->green[i] = dmin(pow((double)i/(double)(size - 1),
 						gammaGreen) * output->brightness,
-.0) * (double)(size - 1);
+.0) * 65535.0;
 	    crtc_gamma->green[i] <<= shift;
 	    if (gammaBlue == 1.0 && output->brightness == 1.0)
-		crtc_gamma->blue[i] = i;
+		crtc_gamma->blue[i] = (double)i / (double)(size - 1) * 65535.0;
 	    else
 		crtc_gamma->blue[i] = dmin(pow((double)i/(double)(size - 1),
 					       gammaBlue) * output->brightness,
-.0) * (double)(size - 1);
+.0) * 65535.0;
 	    crtc_gamma->blue[i] <<= shift;
+	}
 	XRRSetCrtcGamma(dpy, crtc->crtc.xid, crtc_gamma);
 	free(crtc_gamma);
+    }
+}
 static void
 set_primary(void)
+{
     output_t *output;
 @@ -2572,26 +2562,28 @@ main (int argc, char **argv)
     Bool    	have_pixel_size = False;
     int		ret = 0;
     output_t	*config_output = NULL;
     Bool    	setit_1_2 = False;
     Bool    	query_1_2 = False;
     Bool	modeit = False;
     Bool	propit = False;
     Bool	query_1 = False;
     Bool	list_providers = False;
     Bool        provsetoutsource = False;
     Bool        provsetoffsink = False;
     int		major, minor;
     Bool	current = False;
     Bool	toggle_x = False;
     Bool	toggle_y = False;
     program_name = argv[0];
     for (i = 1; i < argc; i++) {
 	if (!strcmp ("-display", argv[i]) || !strcmp ("--display", argv[i]) ||
 	    !strcmp ("-d", argv[i])) {
 	    if (++i >= argc) argerr ("%s requires an argument\n", argv[i-1]);
 	    display_name = argv[i];
 	    continue;
+	}
 	if (!strcmp("-help", argv[i]) || !strcmp("--help", argv[i])) {
 	    usage();
 	    exit(0);
+	}
 @@ -2640,33 +2632,33 @@ main (int argc, char **argv)
 		setit_1_2 = True;
+	    }
 	    action_requested = True;
 	    continue;
+	}
 	if (!strcmp ("-v", argv[i]) || !strcmp ("--version", argv[i])) {
 	    version = True;
 	    action_requested = True;
 	    continue;
+	}
 	if (!strcmp ("-x", argv[i])) {
-	    reflection |= RR_Reflect_X;
+	    toggle_x = True;
 	    setit = True;
 	    action_requested = True;
 	    continue;
+	}
 	if (!strcmp ("-y", argv[i])) {
-	    reflection |= RR_Reflect_Y;
+	    toggle_y = True;
 	    setit = True;
 	    action_requested = True;
 	    continue;
+	}
 	if (!strcmp ("--screen", argv[i])) {
 	    if (++i >= argc) argerr ("%s requires an argument\n", argv[i-1]);
 	    screen = check_strtol(argv[i]);
 	    if (screen < 0) argerr ("--screen argument must be nonnegative\n");
 	    continue;
+	}
 	if (!strcmp ("-q", argv[i]) || !strcmp ("--query", argv[i])) {
 	    query = True;
 	    continue;
 @@ -3256,33 +3248,33 @@ main (int argc, char **argv)
 		    type = actual_type;
 		    format = actual_format;
+		}
 		else if (type == AnyPropertyType &&
 		    (sscanf (prop->value, "%d", &int_value) == 1 ||
 		     sscanf (prop->value, "0x%x", &int_value) == 1))
+		{
 		    type = XA_INTEGER;
 		    ulong_value = int_value;
 		    data = (unsigned char *) &ulong_value;
 		    nelements = 1;
 		    format = 32;
+		}
-		else if ((type == XA_ATOM))
+		else if (type == XA_ATOM)
+		{
 		    ulong_value = XInternAtom (dpy, prop->value, False);
 		    data = (unsigned char *) &ulong_value;
 		    nelements = 1;
+		}
-		else if ((type == XA_STRING || type == AnyPropertyType))
+		else if (type == XA_STRING || type == AnyPropertyType)
+		{
 		    type = XA_STRING;
 		    data = (unsigned char *) prop->value;
 		    nelements = strlen (prop->value);
 		    format = 8;
+		}
 		else
 		    continue;
 		XRRChangeOutputProperty (dpy, output->output.xid,
 					 name, type, format, PropModeReplace,
 					 data, nelements);
 		free (malloced_data);
+	    }
 @@ -3825,26 +3817,29 @@ main (int argc, char **argv)
 	    rates = XRRConfigRates (sc, i, &nrate);
 	    if (nrate) printf ("  ");
 	    for (j = 0; j < nrate; j++)
 		printf ("%c%-4d",
 			i == current_size && rates[j] == current_rate ? '*' : ' ',
 			rates[j]);
 	    printf ("\n");
+	}
+    }
+    {
 	Rotation rotations = XRRConfigRotations(sc, &current_rotation);
 	if (toggle_x && !(current_rotation & RR_Reflect_X)) reflection |= RR_Reflect_X;
 	if (toggle_y && !(current_rotation & RR_Reflect_Y)) reflection |= RR_Reflect_Y;
 	if (query) {
 	    printf("Current rotation - %s\n",
 		   rotation_name (current_rotation));
 	    printf("Current reflection - %s\n",
 		   reflection_name (current_rotation));
 	    printf ("Rotations possible - ");
 	    for (i = 0; i < 4; i ++) {
 		if ((rotations >> i) & 1)  printf("%s ", direction[i]);
+	    }
 	    printf ("\n");
 @@ -3862,30 +3857,26 @@ main (int argc, char **argv)
     if (verbose) {
 	printf("Setting size to %d, rotation to %s\n",  size, direction[rot]);
 	printf ("Setting reflection on ");
 	if (reflection)
+	{
 	    if (reflection & RR_Reflect_X) printf ("X Axis ");
 	    if (reflection & RR_Reflect_Y) printf ("Y Axis");
+	}
 	else
 	    printf ("neither axis");
 	printf ("\n");
 	if (reflection & RR_Reflect_X) printf("Setting reflection on X axis\n");
 	if (reflection & RR_Reflect_Y) printf("Setting reflection on Y axis\n");
+    }
     /* we should test configureNotify on the root window */
     XSelectInput (dpy, root, StructureNotifyMask);
     if (setit && !dryrun) XRRSelectInput (dpy, root,
 			       RRScreenChangeNotifyMask);
     if (setit && !dryrun) {
 	Rotation rotation = 1 << rot;
 	status = XRRSetScreenConfigAndRate (dpy, sc, root, (SizeID) size,
 					    (Rotation) (rotation | reflection),
 					    rate, CurrentTime);
+    }