* grub-core/gfxmenu/circular_progress.c: Set start_angle in degrees

	with syntax "XXX deg"/"XXX °".

diff --git a/ChangeLog b/ChangeLog
index ece85869b0af73c7aa6f14098ff15d1a5929da6c..0e6d38a68588697ae3de03a2eab907adfa12a805 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2013-04-29  Vladimir Testov <vladimir.testov@rosalab.ru>
+
+       * grub-core/gfxmenu/circular_progress.c: Set start_angle in degrees
+       with syntax "XXX deg"/"XXX °".
+
 2013-04-29  Vladimir Serbinenko  <phcoder@gmail.com>
 
        Make PCI init in i386-qemu port more robust.

diff --git a/grub-core/gfxmenu/gui_circular_progress.c b/grub-core/gfxmenu/gui_circular_progress.c
index e06d40cdbeb27cbe3ea21ab60c094992e7ea5270..284a75a5e2547b838df6e7fd37be4a983aef1235 100644 (file)
--- a/grub-core/gfxmenu/gui_circular_progress.c
+++ b/grub-core/gfxmenu/gui_circular_progress.c
@@ -223,6 +223,25 @@ circprog_set_state (void *vself, int visible, int start,
   self->end = end;
 }
 
+static int
+parse_angle (const char *value)
+{
+  char *ptr;
+  int angle;
+
+  angle = grub_strtol (value, &ptr, 10);
+  if (grub_errno)
+    return 0;
+  while (grub_isspace (*ptr))
+    ptr++;
+  if (grub_strcmp (ptr, "deg") == 0
+      /* Unicode symbol of degrees (a circle, U+b0). Put here in UTF-8 to
+        avoid potential problem with text file reesncoding  */
+      || grub_strcmp (ptr, "\xc2\xb0") == 0)
+    angle = (angle * 64 + 45) / 90;
+  return angle;
+}
+
 static grub_err_t
 circprog_set_property (void *vself, const char *name, const char *value)
 {
@@ -233,7 +252,7 @@ circprog_set_property (void *vself, const char *name, const char *value)
     }
   else if (grub_strcmp (name, "start_angle") == 0)
     {
-      self->start_angle = grub_strtol (value, 0, 10);
+      self->start_angle = parse_angle (value);
     }
   else if (grub_strcmp (name, "ticks_disappear") == 0)
     {