|
 |
f96e0b |
From 22970f8c19587ba78aa36c2370512bf393768d3f Mon Sep 17 00:00:00 2001
|
|
|
f96e0b |
From: Vladimir Testov <vladimir.testov@rosalab.ru>
|
|
|
f96e0b |
Date: Mon, 29 Apr 2013 15:32:56 +0200
|
|
|
f96e0b |
Subject: [PATCH 394/482] =?UTF-8?q?=09*=20grub-core/gfxmenu/circular=5Fpro?=
|
|
|
f96e0b |
=?UTF-8?q?gress.c:=20Set=20start=5Fangle=20in=20degrees=20=09with=20synta?=
|
|
|
f96e0b |
=?UTF-8?q?x=20"XXX=20deg"/"XXX=20=C2=B0".?=
|
|
|
f96e0b |
MIME-Version: 1.0
|
|
|
f96e0b |
Content-Type: text/plain; charset=UTF-8
|
|
|
f96e0b |
Content-Transfer-Encoding: 8bit
|
|
|
f96e0b |
|
|
|
f96e0b |
---
|
|
|
f96e0b |
ChangeLog | 5 +++++
|
|
|
f96e0b |
grub-core/gfxmenu/gui_circular_progress.c | 21 ++++++++++++++++++++-
|
|
|
f96e0b |
2 files changed, 25 insertions(+), 1 deletion(-)
|
|
|
f96e0b |
|
|
|
f96e0b |
diff --git a/ChangeLog b/ChangeLog
|
|
|
f96e0b |
index ece8586..0e6d38a 100644
|
|
|
f96e0b |
--- a/ChangeLog
|
|
|
f96e0b |
+++ b/ChangeLog
|
|
|
f96e0b |
@@ -1,3 +1,8 @@
|
|
|
f96e0b |
+2013-04-29 Vladimir Testov <vladimir.testov@rosalab.ru>
|
|
|
f96e0b |
+
|
|
|
f96e0b |
+ * grub-core/gfxmenu/circular_progress.c: Set start_angle in degrees
|
|
|
f96e0b |
+ with syntax "XXX deg"/"XXX °".
|
|
|
f96e0b |
+
|
|
|
f96e0b |
2013-04-29 Vladimir Serbinenko <phcoder@gmail.com>
|
|
|
f96e0b |
|
|
|
f96e0b |
Make PCI init in i386-qemu port more robust.
|
|
|
f96e0b |
diff --git a/grub-core/gfxmenu/gui_circular_progress.c b/grub-core/gfxmenu/gui_circular_progress.c
|
|
|
f96e0b |
index e06d40c..284a75a 100644
|
|
|
f96e0b |
--- a/grub-core/gfxmenu/gui_circular_progress.c
|
|
|
f96e0b |
+++ b/grub-core/gfxmenu/gui_circular_progress.c
|
|
|
f96e0b |
@@ -223,6 +223,25 @@ circprog_set_state (void *vself, int visible, int start,
|
|
|
f96e0b |
self->end = end;
|
|
|
f96e0b |
}
|
|
|
f96e0b |
|
|
|
f96e0b |
+static int
|
|
|
f96e0b |
+parse_angle (const char *value)
|
|
|
f96e0b |
+{
|
|
|
f96e0b |
+ char *ptr;
|
|
|
f96e0b |
+ int angle;
|
|
|
f96e0b |
+
|
|
|
f96e0b |
+ angle = grub_strtol (value, &ptr, 10);
|
|
|
f96e0b |
+ if (grub_errno)
|
|
|
f96e0b |
+ return 0;
|
|
|
f96e0b |
+ while (grub_isspace (*ptr))
|
|
|
f96e0b |
+ ptr++;
|
|
|
f96e0b |
+ if (grub_strcmp (ptr, "deg") == 0
|
|
|
f96e0b |
+ /* Unicode symbol of degrees (a circle, U+b0). Put here in UTF-8 to
|
|
|
f96e0b |
+ avoid potential problem with text file reesncoding */
|
|
|
f96e0b |
+ || grub_strcmp (ptr, "\xc2\xb0") == 0)
|
|
|
f96e0b |
+ angle = (angle * 64 + 45) / 90;
|
|
|
f96e0b |
+ return angle;
|
|
|
f96e0b |
+}
|
|
|
f96e0b |
+
|
|
|
f96e0b |
static grub_err_t
|
|
|
f96e0b |
circprog_set_property (void *vself, const char *name, const char *value)
|
|
|
f96e0b |
{
|
|
|
f96e0b |
@@ -233,7 +252,7 @@ circprog_set_property (void *vself, const char *name, const char *value)
|
|
|
f96e0b |
}
|
|
|
f96e0b |
else if (grub_strcmp (name, "start_angle") == 0)
|
|
|
f96e0b |
{
|
|
|
f96e0b |
- self->start_angle = grub_strtol (value, 0, 10);
|
|
|
f96e0b |
+ self->start_angle = parse_angle (value);
|
|
|
f96e0b |
}
|
|
|
f96e0b |
else if (grub_strcmp (name, "ticks_disappear") == 0)
|
|
|
f96e0b |
{
|
|
|
f96e0b |
--
|
|
|
f96e0b |
1.8.2.1
|
|
|
f96e0b |
|