nhyatt/putty-source
1
0
Fork 0
mirror of https://git.tartarus.org/simon/putty.git synced 2025-03-16 12:03:03 -05:00
Code Issues Projects Releases Wiki Activity

Add the rest of ASCII to the font preview window.

Browse Source 
[originally from svn r7948]
This commit is contained in:
Simon Tatham 2008-03-29 10:25:45 +00:00
parent 6e6eae2506
commit 115898b2a5
1 changed files with 38 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
unix/gtkfont.c
View File

@ -27,8 +27,6 @@
* TODO on fontsel * TODO on fontsel
* --------------- * ---------------
* *
* - add a third line of sample text containing digits and punct
*
* - start drawing X fonts one character at a time, at least if * - start drawing X fonts one character at a time, at least if
* they're not fixed-width? Now we have that helpful pangram, * they're not fixed-width? Now we have that helpful pangram,
* we should make it work for everyone. * we should make it work for everyone.
@ -40,6 +38,7 @@
* might be worth considering * might be worth considering
* + work out why the list boxes don't go all the way to the * + work out why the list boxes don't go all the way to the
* RHS of the dialog box * RHS of the dialog box
* + sort out the behaviour when resizing the dialog box
* *
* - big testing and shakedown! * - big testing and shakedown!
*/ */
@ -1450,27 +1449,28 @@ static void unifontsel_draw_preview_text(unifontsel_internal *fs)
gdk_draw_rectangle(fs->preview_pixmap, gc, 1, 0, 0, gdk_draw_rectangle(fs->preview_pixmap, gc, 1, 0, 0,
fs->preview_width, fs->preview_height); fs->preview_width, fs->preview_height);
gdk_gc_set_foreground(gc, &fs->preview_fg); gdk_gc_set_foreground(gc, &fs->preview_fg);
if (font) {
/* /*
* The pangram used here is rather carefully constructed: * The pangram used here is rather carefully
* it contains a sequence of very narrow letters (`jil') * constructed: it contains a sequence of very narrow
* and a pair of adjacent very wide letters (`wm'). * letters (`jil') and a pair of adjacent very wide
* letters (`wm').
* *
* If the user selects a proportional font, it will be * If the user selects a proportional font, it will be
* coerced into fixed-width character cells when used in * coerced into fixed-width character cells when used
* the actual terminal window. We therefore display it the * in the actual terminal window. We therefore display
* same way in the preview pane, so as to show it the way * it the same way in the preview pane, so as to show
* it will actually be displayed - and we deliberately * it the way it will actually be displayed - and we
* pick a pangram which will show the resulting miskerning * deliberately pick a pangram which will show the
* at its worst. * resulting miskerning at its worst.
* *
* We aren't trying to sell people these fonts; we're * We aren't trying to sell people these fonts; we're
* trying to let them make an informed choice. Better that * trying to let them make an informed choice. Better
* they find out the problems with using proportional * that they find out the problems with using
* fonts in terminal windows here than that they go to the * proportional fonts in terminal windows here than
* effort of selecting their font and _then_ realise it * that they go to the effort of selecting their font
* was a mistake. * and _then_ realise it was a mistake.
*/ */
if (font) {
info->fontclass->draw_text(fs->preview_pixmap, gc, font, info->fontclass->draw_text(fs->preview_pixmap, gc, font,
0, font->ascent, 0, font->ascent,
"bankrupt jilted showmen quiz convex fogey", "bankrupt jilted showmen quiz convex fogey",
@ -1479,6 +1479,22 @@ static void unifontsel_draw_preview_text(unifontsel_internal *fs)
0, font->ascent + font->height, 0, font->ascent + font->height,
"BANKRUPT JILTED SHOWMEN QUIZ CONVEX FOGEY", "BANKRUPT JILTED SHOWMEN QUIZ CONVEX FOGEY",
41, FALSE, FALSE, font->width); 41, FALSE, FALSE, font->width);
/*
* The ordering of punctuation here is also selected
* with some specific aims in mind. I put ` and '
* together because some software (and people) still
* use them as matched quotes no matter what Unicode
* might say on the matter, so people can quickly
* check whether they look silly in a candidate font.
* The sequence #_@ is there to let people judge the
* suitability of the underscore as an effectively
* alphabetic character (since that's how it's often
* used in practice, at least by programmers).
*/
info->fontclass->draw_text(fs->preview_pixmap, gc, font,
0, font->ascent + font->height * 2,
"0123456789!?,.:;<>()[]{}\\/`'\"+*-=~#_@|%&^$",
42, FALSE, FALSE, font->width);
} }
gdk_gc_unref(gc); gdk_gc_unref(gc);
gdk_window_invalidate_rect(fs->preview_area->window, NULL, FALSE); gdk_window_invalidate_rect(fs->preview_area->window, NULL, FALSE);