diff options
author | Tobias Pape <tobias@netshed.de> | 2013-01-25 16:39:25 +0100 |
---|---|---|
committer | Tobias Pape <tobias@netshed.de> | 2013-01-25 16:39:25 +0100 |
commit | af0d70a77997cdc5819a444f9b494bf5620ba8e2 (patch) | |
tree | 850962eea81c32a78f97bac00e90881852ce12c1 /dotviewer | |
parent | get_printable_location doesn't work w/ autoreds (diff) | |
download | pypy-af0d70a77997cdc5819a444f9b494bf5620ba8e2.tar.gz pypy-af0d70a77997cdc5819a444f9b494bf5620ba8e2.tar.bz2 pypy-af0d70a77997cdc5819a444f9b494bf5620ba8e2.zip |
Enhance the dotviewer.
- include Droid fonts (under Apache license)
- allow for unicode by sending UTF-8 over the wire and force unicode decode on the other end
- Make all text antialiased. It was already enabled unconditionally for the status bar and is now
for the normal text, too.
Diffstat (limited to 'dotviewer')
-rw-r--r-- | dotviewer/VeraMoBd.ttf | bin | 49052 -> 0 bytes | |||
-rw-r--r-- | dotviewer/cyrvetic.ttf | bin | 31972 -> 0 bytes | |||
-rw-r--r-- | dotviewer/drawgraph.py | 24 | ||||
-rw-r--r-- | dotviewer/font/DroidSans-Bold.ttf | bin | 0 -> 194488 bytes | |||
-rw-r--r-- | dotviewer/font/DroidSans.ttf | bin | 0 -> 190776 bytes | |||
-rw-r--r-- | dotviewer/font/DroidSansMono.ttf | bin | 0 -> 119380 bytes | |||
-rw-r--r-- | dotviewer/font/NOTICE | 190 | ||||
-rw-r--r-- | dotviewer/font/README.txt | 18 | ||||
-rw-r--r-- | dotviewer/graphclient.py | 6 | ||||
-rw-r--r-- | dotviewer/graphdisplay.py | 10 | ||||
-rw-r--r-- | dotviewer/graphpage.py | 3 |
11 files changed, 232 insertions, 19 deletions
diff --git a/dotviewer/VeraMoBd.ttf b/dotviewer/VeraMoBd.ttf Binary files differdeleted file mode 100644 index 9be6547ed6..0000000000 --- a/dotviewer/VeraMoBd.ttf +++ /dev/null diff --git a/dotviewer/cyrvetic.ttf b/dotviewer/cyrvetic.ttf Binary files differdeleted file mode 100644 index 2d20d5f082..0000000000 --- a/dotviewer/cyrvetic.ttf +++ /dev/null diff --git a/dotviewer/drawgraph.py b/dotviewer/drawgraph.py index c688688a71..84b86cfa23 100644 --- a/dotviewer/drawgraph.py +++ b/dotviewer/drawgraph.py @@ -10,8 +10,8 @@ from pygame.locals import * this_dir = os.path.dirname(os.path.abspath(__file__)) -FONT = os.path.join(this_dir, 'cyrvetic.ttf') -FIXEDFONT = os.path.join(this_dir, 'VeraMoBd.ttf') +FONT = os.path.join(this_dir, 'font', 'DroidSans.ttf') +FIXEDFONT = os.path.join(this_dir, 'font', 'DroidSansMono.ttf') COLOR = { 'black': (0,0,0), 'white': (255,255,255), @@ -51,6 +51,12 @@ def getcolor(name, default): else: return default +def forceunicode(name): + return name if isinstance(name, unicode) else name.decode("utf-8") + +def forcestr(name): + return name if isinstance(name, str) else name.encode("utf-8") + class GraphLayout: fixedfont = False @@ -106,12 +112,12 @@ def wait_for_async_cmd(): class Node: def __init__(self, name, x, y, w, h, label, style, shape, color, fillcolor): - self.name = name + self.name = forceunicode(name) self.x = float(x) self.y = float(y) self.w = float(w) self.h = float(h) - self.label = label + self.label = forceunicode(label) self.style = style self.shape = shape self.color = color @@ -125,8 +131,8 @@ class Edge: label = None def __init__(self, nodes, tail, head, cnt, *rest): - self.tail = nodes[tail] - self.head = nodes[head] + self.tail = nodes[forceunicode(tail)] + self.head = nodes[forceunicode(head)] cnt = int(cnt) self.points = [(float(rest[i]), float(rest[i+1])) for i in range(0, cnt*2, 2)] @@ -655,11 +661,7 @@ class TextSnippet: part = parts[i] word = part[0] try: - try: - img = font.render(word, False, *part[1:]) - except pygame.error, e: - # Try *with* anti-aliasing to work around a bug in SDL - img = font.render(word, True, *part[1:]) + img = font.render(word, True, *part[1:]) except pygame.error: del parts[i] # Text has zero width else: diff --git a/dotviewer/font/DroidSans-Bold.ttf b/dotviewer/font/DroidSans-Bold.ttf Binary files differnew file mode 100644 index 0000000000..d065b64eb1 --- /dev/null +++ b/dotviewer/font/DroidSans-Bold.ttf diff --git a/dotviewer/font/DroidSans.ttf b/dotviewer/font/DroidSans.ttf Binary files differnew file mode 100644 index 0000000000..ad1efca88a --- /dev/null +++ b/dotviewer/font/DroidSans.ttf diff --git a/dotviewer/font/DroidSansMono.ttf b/dotviewer/font/DroidSansMono.ttf Binary files differnew file mode 100644 index 0000000000..a007071944 --- /dev/null +++ b/dotviewer/font/DroidSansMono.ttf diff --git a/dotviewer/font/NOTICE b/dotviewer/font/NOTICE new file mode 100644 index 0000000000..c5b1efa7aa --- /dev/null +++ b/dotviewer/font/NOTICE @@ -0,0 +1,190 @@ + + Copyright (c) 2005-2008, The Android Open Source Project + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + + + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + diff --git a/dotviewer/font/README.txt b/dotviewer/font/README.txt new file mode 100644 index 0000000000..1a96dfde6c --- /dev/null +++ b/dotviewer/font/README.txt @@ -0,0 +1,18 @@ +Copyright (C) 2008 The Android Open Source Project + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. + +########## + +This directory contains the fonts for the platform. They are licensed +under the Apache 2 license. diff --git a/dotviewer/graphclient.py b/dotviewer/graphclient.py index 20b4607983..6e593500a9 100644 --- a/dotviewer/graphclient.py +++ b/dotviewer/graphclient.py @@ -33,8 +33,9 @@ def display_page(page, wait=True, save_tmp_file=None): def reload(graph_id): page = getpage(graph_id) if save_tmp_file: + from drawgraph import forcestr f = open(save_tmp_file, 'w') - f.write(page.source) + f.write(forcestr(page.source)) f.close() messages.extend(page_messages(page, graph_id)) send_graph_messages(io, messages) @@ -75,7 +76,8 @@ def display_page(page, wait=True, save_tmp_file=None): def page_messages(page, graph_id): import graphparse - return graphparse.parse_dot(graph_id, page.source, page.links, + from drawgraph import forcestr + return graphparse.parse_dot(graph_id, forcestr(page.source), page.links, getattr(page, 'fixedfont', False)) def send_graph_messages(io, messages): diff --git a/dotviewer/graphdisplay.py b/dotviewer/graphdisplay.py index 582ab40c55..410fd96b46 100644 --- a/dotviewer/graphdisplay.py +++ b/dotviewer/graphdisplay.py @@ -4,7 +4,7 @@ import pygame from pygame.locals import * from drawgraph import GraphRenderer, FIXEDFONT from drawgraph import Node, Edge -from drawgraph import EventQueue, wait_for_events +from drawgraph import EventQueue, wait_for_events, forceunicode, forcestr METAKEYS = dict([ @@ -285,7 +285,7 @@ class GraphDisplay(Display): if e.key == K_ESCAPE: return None elif e.key == K_RETURN: - return text.encode('latin-1') # XXX do better + return forcestr(text) # return utf-8 encoded elif e.key == K_BACKSPACE: text = text[:-1] elif e.unicode and ord(e.unicode) >= ord(' '): @@ -423,7 +423,7 @@ class GraphDisplay(Display): self.layout.request_reload() def setstatusbar(self, text, fgcolor=None, bgcolor=None): - info = (text, fgcolor or self.STATUSBAR_FGCOLOR, bgcolor or self.STATUSBAR_BGCOLOR) + info = (forceunicode(text), fgcolor or self.STATUSBAR_FGCOLOR, bgcolor or self.STATUSBAR_BGCOLOR) if info != self.statusbarinfo: self.statusbarinfo = info self.must_redraw = True @@ -711,7 +711,7 @@ def renderline(text, font, fgcolor, width, maxheight=sys.maxint, lines = [] while words: line = words.pop(0) - img = font.render(line or ' ', 1, fgcolor) + img = font.render(line or ' ', True, fgcolor) while words: longerline = line + ' ' + words[0] longerimg = font.render(longerline, 1, fgcolor) @@ -723,7 +723,7 @@ def renderline(text, font, fgcolor, width, maxheight=sys.maxint, img = longerimg w, h = img.get_size() if h > maxheight: - img = font.render('...', 1, overflowcolor) + img = font.render('...', True, overflowcolor) w, h = img.get_size() while lines and h > maxheight: maxheight += lines.pop().get_size()[1] diff --git a/dotviewer/graphpage.py b/dotviewer/graphpage.py index 9e61d65cd5..182e562231 100644 --- a/dotviewer/graphpage.py +++ b/dotviewer/graphpage.py @@ -44,6 +44,7 @@ class GraphPage(object): class DotFileGraphPage(GraphPage): def compute(self, dotfile): + from drawgraph import forceunicode f = open(dotfile, 'r') - self.source = f.read() + self.source = forceunicode(f.read()) f.close() |