From e1f1f35edbae7ed2b1dbff07c74b610d9e6ec316 Mon Sep 17 00:00:00 2001
From: Colin Watson <cjwatson@canonical.com>
Date: Tue, 22 Mar 2011 14:08:37 +0000
Subject: [PATCH] Add an "access-options-v1" option to gfxboot.cfg, which
 overrides the default "access=v1" kernel options used in High Contrast mode
 (LP: #739445).

---
 common.inc       |  3 +++
 debian/changelog |  8 ++++++++
 dia_access.inc   | 12 ++++++++++--
 3 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/common.inc b/common.inc
index 7629607..dc312ae 100644
--- a/common.inc
+++ b/common.inc
@@ -487,6 +487,9 @@
     ] def
     pop
   } { pop } ifelse
+  "access-options-v1" getgfxconfig dup .undef ne {
+    /access.options.v1 exch def
+  } { pop } ifelse
   "hidden-timeout" getgfxconfig dup .undef ne {
     % If >= 1, display just the main and access logos and wait for a
     % keypress; if timeout expires, boot without showing the menu.
diff --git a/debian/changelog b/debian/changelog
index e826e9c..43425e4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+gfxboot-theme-ubuntu (0.11.1) UNRELEASED; urgency=low
+
+  * Add an "access-options-v1" option to gfxboot.cfg, which overrides the
+    default "access=v1" kernel options used in High Contrast mode
+    (LP: #739445).
+
+ -- Colin Watson <cjwatson@ubuntu.com>  Tue, 22 Mar 2011 14:07:15 +0000
+
 gfxboot-theme-ubuntu (0.11.0) natty; urgency=low
 
   * Update translations from Launchpad (LP: #657984).
diff --git a/dia_access.inc b/dia_access.inc
index 2f4c836..0796d64 100644
--- a/dia_access.inc
+++ b/dia_access.inc
@@ -23,6 +23,10 @@
 
 /access.optionnames [ access.alloptionnames { } forall ] def
 
+% Custom kernel options.  Feel free to extend as needed.  Keep this in sync
+% with MenuInit.
+/access.options.v1 "access=v1" def
+
 /access.alltexts [
   /txt_access_none
   /txt_access_v1 /txt_access_v2 /txt_access_v3 /txt_access_brltty
@@ -97,8 +101,12 @@
     dup "brltty" eq {
       pop /access.option "braille=ask" def
     } {
-      dup length 7 add string /access.option exch def
-      "access=%s" access.option sprintf
+      dup "v1" eq {
+        pop /access.option access.options.v1 def
+      } {
+        dup length 7 add string /access.option exch def
+        "access=%s" access.option sprintf
+      } ifelse
     } ifelse
   } ifelse