fa9695
--- control-center-2.15.92/libkbdraw/keyboard-drawing.c.primary	2006-08-24 22:04:09.000000000 -0400
fa9695
+++ control-center-2.15.92/libkbdraw/keyboard-drawing.c	2006-08-24 22:07:38.000000000 -0400
fa9695
@@ -719,9 +719,22 @@
fa9695
   printf ("outlines: %p(%d)\n", shape->outlines, shape->num_outlines);
fa9695
 #endif
fa9695
 
fa9695
-  for (i = 0; i < 1 /* shape->num_outlines */ ; i++)
fa9695
-    draw_outline (drawing, shape->outlines + i, color, key->angle,
fa9695
-                  key->origin_x, key->origin_y);
fa9695
+  /* draw the primary outline */
fa9695
+  draw_outline (drawing, shape->primary ? shape->primary : shape->outlines, 
fa9695
+		color, key->angle, key->origin_x, key->origin_y);
fa9695
+#if 0
fa9695
+  /* don't draw other outlines for now, since
fa9695
+   * the text placement does not take them into account 
fa9695
+   */
fa9695
+  for (i = 0; i < shape->num_outlines; i++)
fa9695
+    {
fa9695
+      if (shape->outlines + i == shape->approx ||
fa9695
+	  shape->outlines + i == shape->primary)
fa9695
+	continue;
fa9695
+      draw_outline (drawing, shape->outlines + i, NULL, 
fa9695
+		    key->angle, key->origin_x, key->origin_y);
fa9695
+    }
fa9695
+#endif
fa9695
 
fa9695
   draw_key_label (drawing, key->keycode, key->angle, key->origin_x,
fa9695
                   key->origin_y, shape->bounds.x2, shape->bounds.y2);
fa9695
@@ -850,10 +863,22 @@
fa9695
   shape = drawing->xkb->geom->shapes + shape_doodad->shape_ndx;
fa9695
   color = drawing->colors + shape_doodad->color_ndx;
fa9695
 
fa9695
+  /* draw the primary outline filled */
fa9695
+  draw_outline (drawing, shape->primary ? shape->primary : shape->outlines, 
fa9695
+		color, doodad->angle,
fa9695
+		doodad->origin_x + shape_doodad->left,
fa9695
+		doodad->origin_y + shape_doodad->top);
fa9695
+
fa9695
+  /* stroke the other outlines */
fa9695
   for (i = 0; i < shape->num_outlines; i++)
fa9695
-    draw_outline (drawing, shape->outlines + i, color, doodad->angle,
fa9695
-                  doodad->origin_x + shape_doodad->left,
fa9695
-                  doodad->origin_y + shape_doodad->top);
fa9695
+    {
fa9695
+      if (shape->outlines + i == shape->approx ||
fa9695
+	  shape->outlines + i == shape->primary) 
fa9695
+	continue;
fa9695
+      draw_outline (drawing, shape->outlines + i, NULL, doodad->angle,
fa9695
+		    doodad->origin_x + shape_doodad->left,
fa9695
+		    doodad->origin_y + shape_doodad->top);
fa9695
+    }
fa9695
 }
fa9695
 
fa9695
 static void