From 2ef9a33102d18b10fc7b5bbbc7c0327ce870a605 Mon Sep 17 00:00:00 2001
From: Walter Bender <walter.bender@gmail.com>
Date: Fri, 26 Oct 2012 15:29:08 +0000
Subject: fix font scaling problem on XO hardware; fix triangle increment of number blocks

---
diff --git a/TurtleArt/tautils.py b/TurtleArt/tautils.py
index c54c65f..daac4fe 100644
--- a/TurtleArt/tautils.py
+++ b/TurtleArt/tautils.py
@@ -25,6 +25,7 @@ import pickle
 import subprocess
 import os
 import string
+from string import find
 from gettext import gettext as _
 
 try:
@@ -718,3 +719,39 @@ def _get_dmi(node):
         return open(path).readline().strip()
     except:
         return None
+
+
+def get_screen_dpi():
+    '''Looking for 'dimensions' line in xdpyinfo
+       dimensions:    1280x800 pixels (339x212 millimeters)'''
+    output = check_output('/usr/bin/xdpyinfo', 'xdpyinfo failed')
+    if output is not None:
+        strings = output[find(output, 'dimensions:'):].split()
+        w = int(strings[1].split('x')[0])  # e.g., 1280x800
+        mm = int(strings[3][1:].split('x')[0])  # e.g., (339x212)
+        return int((w * 25.4 / mm) + 0.5)
+    else:
+        return 96
+
+
+def check_output(command, warning):
+    ''' Workaround for old systems without subprocess.check_output'''
+    if hasattr(subprocess, 'check_output'):
+        try:
+            output = subprocess.check_output(command)
+        except subprocess.CalledProcessError:
+            log.warning(warning)
+            return None
+    else:
+        import commands
+
+        cmd = ''
+        for c in command:
+            cmd += c
+            cmd += ' '
+        (status, output) = commands.getstatusoutput(cmd)
+        if status != 0:
+            log.warning(warning)
+            return None
+    return output
+
diff --git a/TurtleArt/tawindow.py b/TurtleArt/tawindow.py
index aab2a52..e200f59 100644
--- a/TurtleArt/tawindow.py
+++ b/TurtleArt/tawindow.py
@@ -27,6 +27,7 @@ pygtk.require('2.0')
 import gtk
 import gobject
 import pango
+import pangocairo
 from StringIO import StringIO
 
 from gettext import gettext as _
@@ -71,7 +72,7 @@ from tautils import magnitude, get_load_name, get_save_name, data_from_file, \
     find_group, find_blk_below, data_to_string, find_start_stack, \
     get_hardware, debug_output, error_output, data_to_string, convert, \
     find_bot_block, restore_clamp, collapse_clamp, data_from_string, \
-    increment_name
+    increment_name, get_screen_dpi
 from tasprite_factory import SVG, svg_str_to_pixbuf, svg_from_file
 from sprites import Sprites, Sprite
 
@@ -154,7 +155,7 @@ class TurtleArtWindow():
         self.hw = get_hardware()
         self.lead = 1.0
         if self.hw in (XO1, XO15, XO175):
-            self.scale = 1.2  # slight scale-up of fonts on XO
+            self.scale = 133. / 200  # tweak scale of fonts on XO
             if self.hw == XO1:
                 self.color_mode = '565'
             else:
@@ -164,6 +165,7 @@ class TurtleArtWindow():
         else:
             self.scale = 1.0
             self.color_mode = '888'  # TODO: Read visual mode from gtk image
+        self._set_screen_dpi()        
 
         self.block_scale = BLOCK_SCALE[3]
         self.trash_scale = 0.5
@@ -281,6 +283,11 @@ class TurtleArtWindow():
         self.block_operation = ''
         self.window_init_complete = True
 
+    def _set_screen_dpi(self):
+        dpi = get_screen_dpi()
+        font_map_default = pangocairo.cairo_font_map_get_default()
+        font_map_default.set_resolution(dpi)
+
     def _tablet_mode(self):
         return False  # Sugar will autoscroll the window for me
 
@@ -1240,7 +1247,6 @@ class TurtleArtWindow():
         if self.selected_blk is not None:
             if self.selected_blk.name == 'number' and \
                spr in self.triangle_sprs:
-                # increment or decrement a number block
                 nf = float(self.selected_blk.spr.labels[0])
                 ni = int(nf)
                 if ni == nf:
@@ -1252,9 +1258,7 @@ class TurtleArtWindow():
                 else:
                     n -= 1
                 self.selected_blk.spr.set_label(str(n))
-                if hasattr(self, 'text_entry'):
-                    self._text_buffer.set_text(str(n))
-                    self.text_entry.set_buffer(self._text_buffer)
+                self._text_buffer.set_text(str(n))
                 return True
             elif self._action_name(self.selected_blk, hat=True):
                 if self.selected_blk.values[0] == _('action'):
--
cgit v0.9.1