[gnome-themes] Use large cursors with large print themes. Fixes bug #490176.

[Calum Benson <calum src gnome org>]

commit 0026d67f1b0ea0d4a82da0f316f257e87ec7f4ba
Author: Calum Benson <calum benson oracle com>
Date:   Fri May 7 13:34:40 2010 +0100

    Use large cursors with large print themes.  Fixes bug #490176.
    
    Patch adds three new configuration options:
    
    --with-lp-cursor-theme=THEME
    --with-hclp-cursor-theme=THEME
    --with-hclpi-cursor-theme=THEME
    
    These allow you to specify which cursor theme to use with the LargePrint,
    HighContrastLargePrint, and HighContrastLargePrintInverse desktop themes
    by default, so that distros that ship (for example) DMZ-White and DMZ-Black
    can (and probably should) specify those instead.
    
    The defaults are whiteglass for LP and HCLPI, and redglass for HCLP, since
    these are usually available on any new-ish, X.org-based desktop. Unfortunately,
    their translucency and shadow makes them less-than-great choices, but the
    Default cursor theme isn't resizable, so it's probably the best we can
    do until it is.
    
    The cursor size for all large print themes is set to 48px. The LargePrint
    setting is also used for the LowContrastLargePrint theme, since that theme
    is really so rarely-used as to be not really worth its own setting.

 configure.in                                       |   42 +++++++++++++++++--
 .../HighContrastLargePrint/index.theme.in.in       |    2 +
 .../index.theme.in.in                              |    3 +-
 desktop-themes/LargePrint/index.theme.in.in        |    2 +
 .../LowContrastLargePrint/index.theme.in.in        |    3 +-
 5 files changed, 45 insertions(+), 7 deletions(-)
---
diff --git a/configure.in b/configure.in
index 58e4f79..e3f2c76 100644
--- a/configure.in
+++ b/configure.in
@@ -109,6 +109,33 @@ else
 fi
 AC_SUBST(TEST_THEMES)
 
+### Cursor theme to use for large print desktop themes.
+### TODO: Should probably check whether specified/default themes are
+### installed too, and do something appropriate if not.
+AC_ARG_WITH(lp-cursor-theme,
+[AS_HELP_STRING([--with-lp-cursor-theme=THEME],
+ [cursor theme for Large Print desktop theme [default=whiteglass]])],
+[LARGEPRINT_CURSOR_THEME="$withval"],
+[LARGEPRINT_CURSOR_THEME="whiteglass"],
+)
+AC_SUBST(LARGEPRINT_CURSOR_THEME)
+
+AC_ARG_WITH(hclp-cursor-theme,
+[AS_HELP_STRING([--with-hclp-cursor-theme=THEME],
+ [cursor theme for High Contrast Large Print desktop theme [default=redglass]])],
+[LARGEPRINT_HC_CURSOR_THEME="$withval"],
+[LARGEPRINT_HC_CURSOR_THEME="redglass"],
+)
+AC_SUBST(LARGEPRINT_HC_CURSOR_THEME)
+
+AC_ARG_WITH(hclpi-cursor-theme,
+[AS_HELP_STRING([--with-hclpi-cursor-theme=THEME],
+ [cursor theme for High Contrast Large Print Inverse desktop theme [default=whiteglass]])],
+[LARGEPRINT_HCI_CURSOR_THEME="$withval"],
+[LARGEPRINT_HCI_CURSOR_THEME="whiteglass"],
+)
+AC_SUBST(LARGEPRINT_HCI_CURSOR_THEME)
+
 ### Icon sizes for all large print themes
 
 LARGEPRINT_DND="48,48"
@@ -127,7 +154,7 @@ LARGEPRINT_DOCUMENTS_FONT="sans 18"
 LARGEPRINT_DESKTOP_FONT="sans 18"
 LARGEPRINT_WINDOW_FONT="sans 18"
 LARGEPRINT_MONOSPACE_FONT="monospace 18"
-
+LARGEPRINT_CURSOR_SIZE="48"
 
 AC_SUBST(LARGEPRINT_ICON_SIZES)
 AC_SUBST(LARGEPRINT_FONT)
@@ -135,6 +162,7 @@ AC_SUBST(LARGEPRINT_DOCUMENTS_FONT)
 AC_SUBST(LARGEPRINT_DESKTOP_FONT)
 AC_SUBST(LARGEPRINT_WINDOW_FONT)
 AC_SUBST(LARGEPRINT_MONOSPACE_FONT)
+AC_SUBST(LARGEPRINT_CURSOR_SIZE)
 
 dnl used to substitute in common sections of theme gtkrc files
 gtk_stock_icons_rc=${srcdir}/common/gtk-stock-icons.rc
@@ -298,8 +326,12 @@ gnome-themes-$VERSION:
 
         Installation prefix:	${prefix}
 
-	Enable placeholders: ${enable_placeholders}
-	Enable legacy icons: ${enable_mapping}
-	Enable all themes:   ${enable_all_themes}
-	Enable test themes:  ${enable_test_themes}
+	Enable placeholders:         ${enable_placeholders}
+	Enable legacy icons:         ${enable_mapping}
+	Enable all themes:           ${enable_all_themes}
+	Enable test themes:          ${enable_test_themes}
+        LargePrint cursor theme:     ${LARGEPRINT_CURSOR_THEME}
+	HC LargePrint cursor theme:  ${LARGEPRINT_HC_CURSOR_THEME}
+	HCI LargePrint cursor theme: ${LARGEPRINT_HCI_CURSOR_THEME}
+
 "
diff --git a/desktop-themes/HighContrastLargePrint/index.theme.in.in b/desktop-themes/HighContrastLargePrint/index.theme.in.in
index e17cbc7..1a5c55a 100644
--- a/desktop-themes/HighContrastLargePrint/index.theme.in.in
+++ b/desktop-themes/HighContrastLargePrint/index.theme.in.in
@@ -13,4 +13,6 @@ DocumentsFont= LARGEPRINT_DOCUMENTS_FONT@
 DesktopFont= LARGEPRINT_DESKTOP_FONT@
 WindowTitleFont= LARGEPRINT_WINDOW_FONT@
 MonospaceFont= LARGEPRINT_MONOSPACE_FONT@
+CursorTheme= LARGEPRINT_HC_CURSOR_THEME@
+CursorSize= LARGEPRINT_CURSOR_SIZE@
 
diff --git a/desktop-themes/HighContrastLargePrintInverse/index.theme.in.in b/desktop-themes/HighContrastLargePrintInverse/index.theme.in.in
index 9556a48..e54a48d 100644
--- a/desktop-themes/HighContrastLargePrintInverse/index.theme.in.in
+++ b/desktop-themes/HighContrastLargePrintInverse/index.theme.in.in
@@ -13,4 +13,5 @@ DocumentsFont= LARGEPRINT_DOCUMENTS_FONT@
 DesktopFont= LARGEPRINT_DESKTOP_FONT@
 WindowTitleFont= LARGEPRINT_WINDOW_FONT@
 MonospaceFont= LARGEPRINT_MONOSPACE_FONT@
-
+CursorTheme= LARGEPRINT_HCI_CURSOR_THEME@
+CursorSize= LARGEPRINT_CURSOR_SIZE@
diff --git a/desktop-themes/LargePrint/index.theme.in.in b/desktop-themes/LargePrint/index.theme.in.in
index c61cc9f..d0c9034 100644
--- a/desktop-themes/LargePrint/index.theme.in.in
+++ b/desktop-themes/LargePrint/index.theme.in.in
@@ -13,3 +13,5 @@ DocumentsFont= LARGEPRINT_DOCUMENTS_FONT@
 DesktopFont= LARGEPRINT_DESKTOP_FONT@
 WindowTitleFont= LARGEPRINT_WINDOW_FONT@
 MonospaceFont= LARGEPRINT_MONOSPACE_FONT@
+CursorTheme= LARGEPRINT_CURSOR_THEME@
+CursorSize= LARGEPRINT_CURSOR_SIZE@
diff --git a/desktop-themes/LowContrastLargePrint/index.theme.in.in b/desktop-themes/LowContrastLargePrint/index.theme.in.in
index 7d60647..769fb48 100644
--- a/desktop-themes/LowContrastLargePrint/index.theme.in.in
+++ b/desktop-themes/LowContrastLargePrint/index.theme.in.in
@@ -11,4 +11,5 @@ MetacityTheme=Atlanta
 ApplicationFont= LARGEPRINT_FONT@
 DesktopFont= LARGEPRINT_DESKTOP_FONT@
 MonospaceFont= LARGEPRINT_MONOSPACE_FONT@
-
+CursorTheme= LARGEPRINT_CURSOR_THEME@
+CursorSize= LARGEPRINT_CURSOR_SIZE@