 @@ -533,27 +533,27 @@ mode_geometry (XRRModeInfo *mode_info, R
     rect[1].y = 0;
     rect[2].x = width;
     rect[2].y = height;
     rect[3].x = 0;
     rect[3].y = height;
     path_bounds (transform, rect, 4, bounds);
+}
 /* v refresh frequency in Hz */
 static double
 mode_refresh (XRRModeInfo *mode_info)
+{
     double rate;
-    unsigned int vTotal = mode_info->vTotal;
+    double vTotal = mode_info->vTotal;
     if (mode_info->modeFlags & RR_DoubleScan) {
 	/* doublescan doubles the number of lines */
 	vTotal *= 2;
+    }
     if (mode_info->modeFlags & RR_Interlace) {
 	/* interlace splits the frame into two fields */
 	/* the field rate is what is typically reported by monitors */
 	vTotal /= 2;
+    }
     if (mode_info->hTotal && vTotal)
 @@ -1556,27 +1556,27 @@ crtc_apply (crtc_t *crtc)
     Status	s;
     RRMode	mode = None;
     if (!crtc->changing || !crtc->mode_info)
 	return RRSetConfigSuccess;
     rr_outputs = calloc (crtc->noutput, sizeof (RROutput));
     if (!rr_outputs)
 	return BadAlloc;
     for (o = 0; o < crtc->noutput; o++)
 	rr_outputs[o] = crtc->outputs[o]->output.xid;
     mode = crtc->mode_info->id;
     if (verbose) {
-	printf ("crtc %d: %12s %6.1f +%d+%d", crtc->crtc.index,
+	printf ("crtc %d: %12s %6.2f +%d+%d", crtc->crtc.index,
 		crtc->mode_info->name, mode_refresh (crtc->mode_info),
 		crtc->x, crtc->y);
 	for (o = 0; o < crtc->noutput; o++)
 	    printf (" \"%s\"", crtc->outputs[o]->output.string);
 	printf ("\n");
+    }
     if (dryrun)
 	s = RRSetConfigSuccess;
     else
+    {
 	if (!equal_transform (&crtc->current_transform, &crtc->pending_transform))
 	    crtc_set_transform (crtc, &crtc->pending_transform);
 @@ -2332,39 +2332,30 @@ property_values_from_string(const char *
+	}
 	nitems++;
+    }
     free (tmp);
     *returned_nitems = nitems;
     return returned_bytes;
+}
 static void
-print_output_property_value(Bool is_edid,
+print_output_property_value(int value_format, /* 8, 16, 32 */
                             int value_format, /* 8, 16, 32 */
                             Atom value_type,  /* XA_{ATOM,INTEGER,CARDINAL} */
                             const void *value_bytes)
+{
     /* special-case the EDID */
     if (is_edid && value_format == 8)
 	const uint8_t *val = value_bytes;
 	printf ("%02" PRIx8, *val);
 	return;
     if (value_type == XA_ATOM && value_format == 32)
+    {
 	const Atom *val = value_bytes;
 	char *str = XGetAtomName (dpy, *val);
 	if (str != NULL)
+	{
 	    printf ("%s", str);
 	    XFree (str);
 	    return;
+	}
+    }
     if (value_type == XA_INTEGER)
 @@ -2405,26 +2396,108 @@ print_output_property_value(Bool is_edid
+	}
 	if (value_format == 32)
+	{
 	    const uint32_t *val = value_bytes;
 	    printf ("%" PRIu32, *val);
 	    return;
+	}
+    }
     printf ("?");
+}
 static void
 print_edid(int nitems, const unsigned char *prop)
+{
     int k;
     printf ("\n\t\t");
     for (k = 0; k < nitems; k++)
+    {
 	if (k != 0 && (k % 16) == 0)
+	{
 	    printf ("\n\t\t");
+	}
 	printf("%02" PRIx8, prop[k]);
+    }
     printf("\n");
+}
 static void
 print_guid(const unsigned char *prop)
+{
     int k;
     printf("{");
     for (k = 0; k < 16; k++)
+    {
 	printf("%02" PRIX8, prop[k]);
 	if (k == 3 || k == 5 || k == 7 || k == 9)
+	{
 	    printf("-");
+	}
+    }
     printf("}\n");
+}
 static void
 print_output_property(const char *atom_name,
                       int value_format,
                       Atom value_type,
                       int nitems,
                       const unsigned char *prop)
+{
     int bytes_per_item = value_format / 8;
     int k;
     /*
      * Check for properties that need special formatting.
      */
     if (strcmp (atom_name, "EDID") == 0 && value_format == 8 &&
 	value_type == XA_INTEGER)
+    {
 	print_edid (nitems, prop);
 	return;
+    }
     else if (strcmp (atom_name, "GUID") == 0 && value_format == 8 &&
 	     value_type == XA_INTEGER && nitems == 16)
+    {
 	print_guid (prop);
 	return;
+    }
     for (k = 0; k < nitems; k++)
+    {
 	if (k != 0)
+	{
 	    if ((k % 16) == 0)
+	    {
 		printf ("\n\t\t");
+	    }
+	}
 	print_output_property_value (value_format, value_type,
 				     prop + (k * bytes_per_item));
 	printf (" ");
+    }
     printf ("\n");
+}
 static void
 get_providers (void)
+{
     XRRProviderResources *pr;
     int i;
     if (!has_1_4 || providers)
 	return;
     pr = XRRGetProviderResources(dpy, root);
     num_providers = pr->nproviders;
     providers = calloc (num_providers, sizeof (provider_t));
     if (!providers)
 	fatal ("out of memory\n");
 @@ -2438,26 +2511,28 @@ get_providers (void)
 	set_name_xid (name, pr->providers[i]);
 	set_name_index (name, i);
 	set_name_string (name, info->name);
+   }
    XRRFreeProviderResources(pr);
+}
 static provider_t *
 find_provider (name_t *name)
+{
     int i;
     if ((name->kind & name_xid) && name->xid == 0)
 	return NULL;
     for (i = 0; i < num_providers; i++) {
 	provider_t *p = &providers[i];
 	name_kind_t common = name->kind & p->provider.kind;
 	if ((common & name_xid) && name->xid == p->provider.xid)
 	    return p;
 	if ((common & name_string) && !strcmp (name->string, p->provider.string))
 	    return p;
 	if ((common & name_index) && name->index == p->provider.index)
 	    return p;
+    }
     printf ("Could not find provider with ");
 @@ -3221,42 +3296,42 @@ main (int argc, char **argv)
     if (provsetoutsource)
+    {
 	provider_t *provider, *source;
 	if (!has_1_4)
 	    fatal ("--setprovideroutputsource requires RandR 1.4\n");
 	get_screen (current);
 	get_providers ();
 	provider = find_provider (&provider_name);
 	source = find_provider(&output_source_provider_name);
-	XRRSetProviderOutputSource(dpy, provider->provider.xid, source->provider.xid);
+	XRRSetProviderOutputSource(dpy, provider->provider.xid, source ? source->provider.xid : 0);
+    }
     if (provsetoffsink)
+    {
 	provider_t *provider, *sink;
 	if (!has_1_4)
 	    fatal ("--setprovideroffloadsink requires RandR 1.4\n");
 	get_screen (current);
 	get_providers ();
 	provider = find_provider (&provider_name);
 	sink = find_provider(&offload_sink_provider_name);
-	XRRSetProviderOffloadSink(dpy, provider->provider.xid, sink->provider.xid);
+	XRRSetProviderOffloadSink(dpy, provider->provider.xid, sink ? sink->provider.xid : 0);
+    }
     if (setit_1_2)
+    {
 	get_screen (current);
 	get_crtcs ();
 	get_outputs ();
 	set_positions ();
 	set_screen_size ();
 	pick_crtcs ();
 	/*
 	 * Assign outputs to crtcs
 @@ -3500,177 +3575,153 @@ main (int argc, char **argv)
 		printf ("\n");
+	    }
 	    if (verbose || properties)
+	    {
 		props = XRRListOutputProperties (dpy, output->output.xid,
 						 &nprop);
 		for (j = 0; j < nprop; j++) {
 		    unsigned char *prop;
 		    int actual_format;
 		    unsigned long nitems, bytes_after;
 		    Atom actual_type;
 		    XRRPropertyInfo *propinfo;
 		    char *atom_name = XGetAtomName (dpy, props[j]);
-		    Bool is_edid = strcmp (atom_name, "EDID") == 0;
+		    int k;
 		    int bytes_per_item, k;
 		    XRRGetOutputProperty (dpy, output->output.xid, props[j],
 , 100, False, False,
 					  AnyPropertyType,
 					  &actual_type, &actual_format,
 					  &nitems, &bytes_after, &prop);
 		    propinfo = XRRQueryOutputProperty(dpy, output->output.xid,
 						      props[j]);
 		    bytes_per_item = actual_format / 8;
 		    printf ("\t%s: ", atom_name);
-		    if (is_edid)
+		    print_output_property(atom_name, actual_format,
 					  actual_type, nitems, prop);
 			printf ("\n\t\t");
 		    for (k = 0; k < nitems; k++)
 			if (k != 0)
 			    if ((k % 16) == 0)
 				printf ("\n\t\t");
 			print_output_property_value (is_edid, actual_format,
 						     actual_type,
 						     prop + (k * bytes_per_item));
 			if (!is_edid)
 			    printf (" ");
 		    printf ("\n");
 		    if (propinfo->range && propinfo->num_values > 0)
+		    {
 			printf ("\t\trange%s: ",
 			        (propinfo->num_values == 2) ? "" : "s");
 			for (k = 0; k < propinfo->num_values / 2; k++)
+			{
 			    printf ("(");
-			    print_output_property_value (False, 32, actual_type,
+			    print_output_property_value (32, actual_type,
 							 (unsigned char *) &(propinfo->values[k * 2]));
 			    printf (", ");
-			    print_output_property_value (False, 32, actual_type,
+			    print_output_property_value (32, actual_type,
 							 (unsigned char *) &(propinfo->values[k * 2 + 1]));
 			    printf (")");
 			    if (k < propinfo->num_values / 2 - 1)
 				printf (", ");
+			}
 			printf ("\n");
+		    }
 		    if (!propinfo->range && propinfo->num_values > 0)
+		    {
 			printf ("\t\tsupported: ");
 			for (k = 0; k < propinfo->num_values; k++)
+			{
-			    print_output_property_value (False, 32, actual_type,
+			    print_output_property_value (32, actual_type,
 							 (unsigned char *) &(propinfo->values[k]));
 			    if (k < propinfo->num_values - 1)
 				printf (", ");
+			}
 			printf ("\n");
+		    }
 		    free(propinfo);
+		}
+	    }
 	    if (verbose)
+	    {
 		for (j = 0; j < output_info->nmode; j++)
+		{
 		    XRRModeInfo	*mode = find_mode_by_xid (output_info->modes[j]);
 		    int		f;
-		    printf ("  %s (0x%x) %6.1fMHz",
+		    printf ("  %s (0x%x) %6.3fMHz",
 			    mode->name, (int)mode->id,
 			    (double)mode->dotClock / 1000000.0);
 		    for (f = 0; mode_flags[f].flag; f++)
 			if (mode->modeFlags & mode_flags[f].flag)
 			    printf (" %s", mode_flags[f].string);
 		    if (mode == output->mode_info)
 			printf (" *current");
 		    if (j < output_info->npreferred)
 			printf (" +preferred");
 		    printf ("\n");
-		    printf ("        h: width  %4d start %4d end %4d total %4d skew %4d clock %6.1fKHz\n",
+		    printf ("        h: width  %4d start %4d end %4d total %4d skew %4d clock %6.2fKHz\n",
 			    mode->width, mode->hSyncStart, mode->hSyncEnd,
 			    mode->hTotal, mode->hSkew, mode_hsync (mode) / 1000);
-		    printf ("        v: height %4d start %4d end %4d total %4d           clock %6.1fHz\n",
+		    printf ("        v: height %4d start %4d end %4d total %4d           clock %6.2fHz\n",
 			    mode->height, mode->vSyncStart, mode->vSyncEnd, mode->vTotal,
 			    mode_refresh (mode));
 		    mode->modeFlags |= ModeShown;
+		}
+	    }
 	    else
+	    {
 		mode_shown = calloc (output_info->nmode, sizeof (Bool));
 		if (!mode_shown) fatal ("out of memory\n");
 		for (j = 0; j < output_info->nmode; j++)
+		{
 		    XRRModeInfo *jmode, *kmode;
 		    int k;
 		    if (mode_shown[j]) continue;
 		    jmode = find_mode_by_xid (output_info->modes[j]);
 		    printf (" ");
 		    printf ("  %-12s", jmode->name);
 		    for (k = j; k < output_info->nmode; k++)
+		    {
 			if (mode_shown[k]) continue;
 			kmode = find_mode_by_xid (output_info->modes[k]);
 			if (strcmp (jmode->name, kmode->name) != 0) continue;
 			mode_shown[k] = True;
 			kmode->modeFlags |= ModeShown;
-			printf (" %6.1f", mode_refresh (kmode));
+			printf (" %6.2f", mode_refresh (kmode));
 			if (kmode == output->mode_info)
 			    printf ("*");
 			else
 			    printf (" ");
 			if (k < output_info->npreferred)
 			    printf ("+");
 			else
 			    printf (" ");
+		    }
 		    printf ("\n");
+		}
 		free (mode_shown);
+	    }
+	}
 	for (m = 0; m < res->nmode; m++)
+	{
 	    XRRModeInfo	*mode = &res->modes[m];
 	    if (!(mode->modeFlags & ModeShown))
+	    {
-		printf ("  %s (0x%x) %6.1fMHz\n",
+		printf ("  %s (0x%x) %6.3fMHz\n",
 			mode->name, (int)mode->id,
 			(double)mode->dotClock / 1000000.0);
-		printf ("        h: width  %4d start %4d end %4d total %4d skew %4d clock %6.1fKHz\n",
+		printf ("        h: width  %4d start %4d end %4d total %4d skew %4d clock %6.2fKHz\n",
 			mode->width, mode->hSyncStart, mode->hSyncEnd,
 			mode->hTotal, mode->hSkew, mode_hsync (mode) / 1000);
-		printf ("        v: height %4d start %4d end %4d total %4d           clock %6.1fHz\n",
+		printf ("        v: height %4d start %4d end %4d total %4d           clock %6.2fHz\n",
 			mode->height, mode->vSyncStart, mode->vSyncEnd, mode->vTotal,
 			mode_refresh (mode));
+	    }
+	}
 	exit (0);
+    }
     if (list_providers) {
 	int k;
 	if (!has_1_4) {
 	    printf ("RandR 1.4 not supported\n");
 	    exit (0);
+	}
 @@ -3740,27 +3791,27 @@ main (int argc, char **argv)
+    {
 	if (size == current_size)
 	    rate = current_rate;
 	else
 	    rate = 0;
+    }
     else
+    {
 	rates = XRRConfigRates (sc, size, &nrate);
 	for (i = 0; i < nrate; i++)
 	    if (rate == rates[i])
 		break;
 	if (i == nrate) {
-	    fprintf (stderr, "Rate %.1f Hz not available for this size\n", rate);
+	    fprintf (stderr, "Rate %.2f Hz not available for this size\n", rate);
 	    exit (1);
+	}
+    }
     if (version) {
 	int major_version, minor_version;
 	XRRQueryVersion (dpy, &major_version, &minor_version);
 	printf("Server reports RandR version %d.%d\n",
 	       major_version, minor_version);
+    }
     if (query || query_1) {
 	printf(" SZ:    Pixels          Physical       Refresh\n");