[Sugar-devel] [PATCH sugar] Bring back the Sugar cursor onto the intro screen, OLPC #10712

[Simon Schampijer]

This issue has a long history outlined in detail
in [1]. We once moved the xsetroot around to compensate
for SL #1476 but Daniel fixed this in Metacity in
OLPC #10693.

The proposed patch does work for me in Jhbuild and
the latest 0.94 based OLPC build. Both the cursor in
the intro screen and under Sugar are the correct
ones.

[1] http://dev.laptop.org/ticket/10712#comment:3

Signed-off-by: Simon Schampijer <simon at laptop.org>
---
 bin/sugar-session |    9 +++++----
 1 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/bin/sugar-session b/bin/sugar-session
index 8ea195f..d4ccd74 100755
--- a/bin/sugar-session
+++ b/bin/sugar-session
@@ -173,10 +173,6 @@ def setup_keyboard_cb():
 def setup_window_manager():
     logging.debug('STARTUP: window_manager')
 
-    # have to reset cursor(metacity sets it on startup)
-    if subprocess.call('echo $DISPLAY; xsetroot -cursor_name left_ptr', shell=True):
-        logging.warning('Can not reset cursor')
-
     if subprocess.call('metacity-message disable-keybindings',
             shell=True):
         logging.warning('Can not disable metacity keybindings')
@@ -204,6 +200,10 @@ def set_fonts():
     settings = gtk.settings_get_default()
     settings.set_property("gtk-font-name", "%s %f" % (face, size))
 
+def set_cursor():
+    if subprocess.call('echo $DISPLAY; xsetroot -cursor_name left_ptr', shell=True):
+        logging.warning('Can not set cursor')
+
 def main():
     try:
         from sugar import env
@@ -240,6 +240,7 @@ def main():
         os.environ['TZ'] = timezone
 
     set_fonts()
+    set_cursor()
 
     # this must be added early, so that it executes and unfreezes the screen
     # even when we initially get blocked on the intro screen
-- 
1.7.4.4