Miroirs/xwords
1
0
Fork 0
mirror of git://xwords.git.sourceforge.net/gitroot/xwords/xwords synced 2025-01-04 23:02:02 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Instead of three fixed-sized fonts, choose fonts (lazily) based on the size of the rect into which it's to be drawn.

Browse source
This commit is contained in:
ehouse 2007-10-23 03:08:47 +00:00
parent 6e8a1922eb
commit d929af49ad
2 changed files with 97 additions and 58 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

151
linux/gtkdraw.c
View file

@ -35,6 +35,12 @@ typedef enum {
,XP_GTK_JUST_BOTTOMRIGHT ,XP_GTK_JUST_BOTTOMRIGHT
} XP_GTK_JUST; } XP_GTK_JUST;
typedef struct FontPerSize {
unsigned int ht;
PangoFontDescription* fontdesc;
PangoLayout* layout;
} FontPerSize;
/* static GdkGC* newGCForColor( GdkWindow* window, XP_Color* newC ); */ /* static GdkGC* newGCForColor( GdkWindow* window, XP_Color* newC ); */
static void static void
insetRect( XP_Rect* r, short i ) insetRect( XP_Rect* r, short i )
@ -53,6 +59,7 @@ insetRect( XP_Rect* r, short i )
#define DRAW_WHAT(dc) ((dc)->drawing_area->window) #define DRAW_WHAT(dc) ((dc)->drawing_area->window)
#endif #endif
#define GTKMIN_W_HT 8
static void static void
eraseRect( GtkDrawCtx* dctx, const XP_Rect* rect ) eraseRect( GtkDrawCtx* dctx, const XP_Rect* rect )
@ -128,14 +135,62 @@ gtk_prim_draw_measureText( DrawCtx* p_dctx, XP_UCHAR* str,
#endif /* DRAW_WITH_PRIMITIVES */ #endif /* DRAW_WITH_PRIMITIVES */
static gint
compForHt( gconstpointer a,
gconstpointer b )
{
FontPerSize* fps1 = (FontPerSize*)a;
FontPerSize* fps2 = (FontPerSize*)b;
return fps1->ht - fps2->ht;
}
static PangoLayout*
layout_for_ht( GtkDrawCtx* dctx, XP_U16 ht )
{
PangoLayout* result = NULL;
/* Try to find a cached layout. Otherwise create a new one. */
FontPerSize fps = { .ht = ht };
GList* gl = g_list_find_custom( dctx->fontsPerSize, &fps,
compForHt );
if ( NULL != gl ) {
result = ((FontPerSize*)gl->data)->layout;
}
if ( NULL == result ) {
FontPerSize* fps = g_malloc( sizeof(*fps) );
dctx->fontsPerSize = g_list_insert( dctx->fontsPerSize,
fps, 0 );
char font[32];
snprintf( font, sizeof(font), "helvetica normal %d", ht );
fps->layout = pango_layout_new( dctx->pangoContext );
fps->fontdesc = pango_font_description_from_string( font );
pango_layout_set_font_description( fps->layout, fps->fontdesc );
/* This only happens first time??? */
pango_layout_set_alignment( fps->layout, PANGO_ALIGN_CENTER );
fps->ht = ht;
result = fps->layout;
XP_LOGF( "There are %d fonts now", g_list_length( dctx->fontsPerSize ) );
}
/* FontPerSize* fps = g_list_nth_data( dctx->fontsPerSize, 0 ); */
return result;
}
static void static void
draw_string_at( GtkDrawCtx* dctx, PangoLayout* layout, const char* str, draw_string_at( GtkDrawCtx* dctx, const char* str, XP_U16 fontHt,
const XP_Rect* where, XP_GTK_JUST just, const XP_Rect* where, XP_GTK_JUST just,
const GdkColor* frground, const GdkColor* bkgrnd ) const GdkColor* frground, const GdkColor* bkgrnd )
{ {
PangoLayout* layout;
gint x = where->left; gint x = where->left;
gint y = where->top; gint y = where->top;
layout = layout_for_ht( dctx, fontHt );
pango_layout_set_text( layout, str, strlen(str) ); pango_layout_set_text( layout, str, strlen(str) );
if ( just != XP_GTK_JUST_NONE ) { if ( just != XP_GTK_JUST_NONE ) {
@ -217,22 +272,29 @@ drawBitmapFromLBS( GtkDrawCtx* dctx, XP_Bitmap bm, const XP_Rect* rect )
g_object_unref( pm ); g_object_unref( pm );
} /* drawBitmapFromLBS */ } /* drawBitmapFromLBS */
static void
freer( gpointer data, gpointer XP_UNUSED(user_data) )
{
FontPerSize* fps = (FontPerSize*)data;
pango_font_description_free( fps->fontdesc );
g_object_unref( fps->layout );
g_free( fps );
}
static void static void
gtk_draw_destroyCtxt( DrawCtx* p_dctx ) gtk_draw_destroyCtxt( DrawCtx* p_dctx )
{ {
GtkDrawCtx* dctx = (GtkDrawCtx*)p_dctx; GtkDrawCtx* dctx = (GtkDrawCtx*)p_dctx;
GtkAllocation* alloc = &dctx->drawing_area->allocation; GtkAllocation* alloc = &dctx->drawing_area->allocation;
XP_U16 i;
gdk_draw_rectangle( DRAW_WHAT(dctx), gdk_draw_rectangle( DRAW_WHAT(dctx),
dctx->drawing_area->style->white_gc, dctx->drawing_area->style->white_gc,
TRUE, TRUE,
0, 0, alloc->width, alloc->height ); 0, 0, alloc->width, alloc->height );
for ( i = LAYOUT_BOARD; i < LAYOUT_NLAYOUTS; ++i ) { g_list_foreach( dctx->fontsPerSize, freer, NULL );
pango_font_description_free( dctx->fontdesc[i] ); g_list_free( dctx->fontsPerSize );
g_object_unref( dctx->layout[i] );
}
g_object_unref( dctx->pangoContext ); g_object_unref( dctx->pangoContext );
} /* gtk_draw_destroyCtxt */ } /* gtk_draw_destroyCtxt */
@ -397,8 +459,8 @@ gtk_draw_drawCell( DrawCtx* p_dctx, const XP_Rect* rect, const XP_UCHAR* letter,
foreground = &dctx->playerColors[owner]; foreground = &dctx->playerColors[owner];
} }
draw_string_at( dctx, dctx->layout[LAYOUT_BOARD], letter, draw_string_at( dctx, letter, rectInset.height,
&rectInset, XP_GTK_JUST_CENTER, &rectInset, XP_GTK_JUST_CENTER,
foreground, NULL ); foreground, NULL );
if ( (flags & CELL_ISBLANK) != 0 ) { if ( (flags & CELL_ISBLANK) != 0 ) {
@ -416,7 +478,7 @@ gtk_draw_drawCell( DrawCtx* p_dctx, const XP_Rect* rect, const XP_UCHAR* letter,
} }
if ( (flags & CELL_ISSTAR) != 0 ) { if ( (flags & CELL_ISSTAR) != 0 ) {
draw_string_at( dctx, dctx->layout[LAYOUT_SMALL], "*", draw_string_at( dctx, "*", rect->height,
rect, XP_GTK_JUST_CENTER, rect, XP_GTK_JUST_CENTER,
&dctx->black, NULL ); &dctx->black, NULL );
} }
@ -495,7 +557,7 @@ gtk_draw_drawTile( DrawCtx* p_dctx, const XP_Rect* rect, const XP_UCHAR* textP,
if ( !!textP ) { if ( !!textP ) {
if ( *textP != LETTER_NONE ) { /* blank */ if ( *textP != LETTER_NONE ) { /* blank */
draw_string_at( dctx, dctx->layout[LAYOUT_LARGE], textP, draw_string_at( dctx, textP, formatRect.height>>1,
&formatRect, XP_GTK_JUST_TOPLEFT, &formatRect, XP_GTK_JUST_TOPLEFT,
foreground, NULL ); foreground, NULL );
@ -507,7 +569,7 @@ gtk_draw_drawTile( DrawCtx* p_dctx, const XP_Rect* rect, const XP_UCHAR* textP,
sprintf( numbuf, "%d", val ); sprintf( numbuf, "%d", val );
len = strlen( numbuf ); len = strlen( numbuf );
draw_string_at( dctx, dctx->layout[LAYOUT_SMALL], numbuf, draw_string_at( dctx, numbuf, formatRect.height>>2,
&formatRect, XP_GTK_JUST_BOTTOMRIGHT, &formatRect, XP_GTK_JUST_BOTTOMRIGHT,
foreground, NULL ); foreground, NULL );
@ -555,7 +617,7 @@ gtk_draw_drawTileBack( DrawCtx* p_dctx, const XP_Rect* rect,
dctx->drawGC, TRUE, dctx->drawGC, TRUE,
r.left, r.top, r.width, r.height ); r.left, r.top, r.width, r.height );
draw_string_at( dctx, dctx->layout[LAYOUT_LARGE], "?", draw_string_at( dctx, "?", r.height,
&r, XP_GTK_JUST_CENTER, &r, XP_GTK_JUST_CENTER,
&dctx->playerColors[dctx->trayOwner], NULL ); &dctx->playerColors[dctx->trayOwner], NULL );
@ -628,7 +690,7 @@ gtk_draw_drawBoardArrow( DrawCtx* p_dctx, const XP_Rect* rectP,
GtkDrawCtx* dctx = (GtkDrawCtx*)p_dctx; GtkDrawCtx* dctx = (GtkDrawCtx*)p_dctx;
const char* curs = vertical? "|":"-"; const char* curs = vertical? "|":"-";
draw_string_at( dctx, dctx->layout[LAYOUT_BOARD], curs, draw_string_at( dctx, curs, rectP->height,
rectP, XP_GTK_JUST_CENTER, rectP, XP_GTK_JUST_CENTER,
&dctx->black, NULL ); &dctx->black, NULL );
drawHintBorders( dctx, rectP, hintAtts ); drawHintBorders( dctx, rectP, hintAtts );
@ -655,7 +717,7 @@ gtkDrawDrawRemText( DrawCtx* p_dctx, const XP_Rect* r, XP_U16 nTilesLeft,
gint left = r->left; gint left = r->left;
gint top = r->top; gint top = r->top;
XP_Bool draw = !widthP; XP_Bool draw = !widthP;
PangoLayout* layout = dctx->layout[LAYOUT_SMALL]; PangoLayout* layout = layout_for_ht( dctx, r->height );
sprintf( buf, "rem:%d", nTilesLeft ); sprintf( buf, "rem:%d", nTilesLeft );
pango_layout_set_text( layout, buf, strlen(buf) ); pango_layout_set_text( layout, buf, strlen(buf) );
@ -728,14 +790,14 @@ scoreWidthAndText( GtkDrawCtx* XP_UNUSED(dctx), PangoLayout* layout, char* buf,
} /* scoreWidthAndText */ } /* scoreWidthAndText */
static void static void
gtk_draw_measureScoreText( DrawCtx* p_dctx, const XP_Rect* XP_UNUSED(r), gtk_draw_measureScoreText( DrawCtx* p_dctx, const XP_Rect* r,
const DrawScoreInfo* dsi, const DrawScoreInfo* dsi,
XP_U16* width, XP_U16* height ) XP_U16* width, XP_U16* height )
{ {
GtkDrawCtx* dctx = (GtkDrawCtx*)p_dctx; GtkDrawCtx* dctx = (GtkDrawCtx*)p_dctx;
char buf[20]; char buf[20];
scoreWidthAndText( dctx, dctx->layout[LAYOUT_SMALL], buf, dsi, PangoLayout* layout = layout_for_ht( dctx, r->height );
width, height ); scoreWidthAndText( dctx, layout, buf, dsi, width, height );
} /* gtk_draw_measureScoreText */ } /* gtk_draw_measureScoreText */
static void static void
@ -747,7 +809,8 @@ gtk_draw_score_drawPlayer( DrawCtx* p_dctx, const XP_Rect* rInner,
XP_U16 x; XP_U16 x;
XP_U16 width; XP_U16 width;
scoreWidthAndText( dctx, dctx->layout[LAYOUT_SMALL], scoreBuf, dsi, PangoLayout* layout = layout_for_ht( dctx, rInner->height );
scoreWidthAndText( dctx, layout, scoreBuf, dsi,
&width, NULL ); &width, NULL );
x = rInner->left + ((rInner->width - width) /2); x = rInner->left + ((rInner->width - width) /2);
@ -760,7 +823,7 @@ gtk_draw_score_drawPlayer( DrawCtx* p_dctx, const XP_Rect* rInner,
eraseRect( dctx, rInner ); eraseRect( dctx, rInner );
} }
draw_string_at( dctx, dctx->layout[LAYOUT_SMALL], scoreBuf, draw_string_at( dctx, scoreBuf, rInner->height - 1,
rInner, XP_GTK_JUST_CENTER, rInner, XP_GTK_JUST_CENTER,
&dctx->playerColors[dsi->playerNum], NULL ); &dctx->playerColors[dsi->playerNum], NULL );
@ -776,13 +839,13 @@ gtk_draw_score_pendingScore( DrawCtx* p_dctx, const XP_Rect* rect,
{ {
GtkDrawCtx* dctx = (GtkDrawCtx*)p_dctx; GtkDrawCtx* dctx = (GtkDrawCtx*)p_dctx;
char buf[5]; char buf[5];
XP_U16 left; XP_U16 ht;
XP_Rect localR; XP_Rect localR;
if ( score >= 0 ) { if ( score >= 0 ) {
sprintf( buf, "%.3d", score ); sprintf( buf, "%.3d", score );
} else { } else {
strcpy( buf, "???" ); strcpy( buf, "???" );
} }
/* gdk_gc_set_clip_rectangle( dctx->drawGC, (GdkRectangle*)rect ); */ /* gdk_gc_set_clip_rectangle( dctx->drawGC, (GdkRectangle*)rect ); */
@ -791,11 +854,11 @@ gtk_draw_score_pendingScore( DrawCtx* p_dctx, const XP_Rect* rect,
insetRect( &localR, 1 ); insetRect( &localR, 1 );
eraseRect( dctx, &localR ); eraseRect( dctx, &localR );
left = localR.left + 1; ht = localR.height >> 2;
draw_string_at( dctx, dctx->layout[LAYOUT_SMALL], "Pts:", draw_string_at( dctx, "Pts:", ht,
&localR, XP_GTK_JUST_TOPLEFT, &localR, XP_GTK_JUST_TOPLEFT,
&dctx->black, NULL ); &dctx->black, NULL );
draw_string_at( dctx, dctx->layout[LAYOUT_SMALL], buf, draw_string_at( dctx, buf, ht,
&localR, XP_GTK_JUST_BOTTOMRIGHT, &localR, XP_GTK_JUST_BOTTOMRIGHT,
&dctx->black, NULL ); &dctx->black, NULL );
@ -831,7 +894,7 @@ gtk_draw_drawTimer( DrawCtx* p_dctx, const XP_Rect* rInner,
/* gdk_gc_set_clip_rectangle( dctx->drawGC, (GdkRectangle*)rInner ); */ /* gdk_gc_set_clip_rectangle( dctx->drawGC, (GdkRectangle*)rInner ); */
eraseRect( dctx, rInner ); eraseRect( dctx, rInner );
draw_string_at( dctx, dctx->layout[LAYOUT_SMALL], buf, draw_string_at( dctx, buf, rInner->height-1,
rInner, XP_GTK_JUST_CENTER, rInner, XP_GTK_JUST_CENTER,
&dctx->black, NULL ); &dctx->black, NULL );
} /* gtk_draw_drawTimer */ } /* gtk_draw_drawTimer */
@ -870,8 +933,9 @@ gtk_draw_measureMiniWText( DrawCtx* p_dctx, const XP_UCHAR* str,
GtkDrawCtx* dctx = (GtkDrawCtx*)p_dctx; GtkDrawCtx* dctx = (GtkDrawCtx*)p_dctx;
int height, width; int height, width;
pango_layout_set_text( dctx->layout[LAYOUT_SMALL], str, strlen(str) ); PangoLayout* layout = layout_for_ht( dctx, GTKMIN_W_HT );
pango_layout_get_pixel_size( dctx->layout[LAYOUT_SMALL], &width, &height ); pango_layout_set_text( layout, str, strlen(str) );
pango_layout_get_pixel_size( layout, &width, &height );
*heightP = height; *heightP = height;
*widthP = width + 6; *widthP = width + 6;
} /* gtk_draw_measureMiniWText */ } /* gtk_draw_measureMiniWText */
@ -900,7 +964,7 @@ gtk_draw_drawMiniWindow( DrawCtx* p_dctx, const XP_UCHAR* text,
eraseRect( dctx, &localR ); eraseRect( dctx, &localR );
frameRect( dctx, &localR ); frameRect( dctx, &localR );
draw_string_at( dctx, dctx->layout[LAYOUT_SMALL], text, draw_string_at( dctx, text, localR.height-2,
&localR, XP_GTK_JUST_CENTER, &localR, XP_GTK_JUST_CENTER,
&dctx->black, NULL ); &dctx->black, NULL );
} /* gtk_draw_drawMiniWindow */ } /* gtk_draw_drawMiniWindow */
@ -933,34 +997,10 @@ allocAndSet( GdkColormap* map, GdkColor* color, unsigned short red,
XP_ASSERT( success ); XP_ASSERT( success );
} /* allocAndSet */ } /* allocAndSet */
static void
setupLayouts( GtkDrawCtx* dctx, GtkWidget* drawing_area )
{
XP_U16 i;
const char* fonts[] = {
/* "Luxi Mono 12", */
"helvetica normal 10",
"helvetica normal 8",
"helvetica bold 14",
};
PangoContext* pangoContext = gtk_widget_get_pango_context( drawing_area );
dctx->pangoContext = pangoContext;
for ( i = LAYOUT_BOARD; i < LAYOUT_NLAYOUTS; ++i ) {
dctx->layout[i] = pango_layout_new( pangoContext );
dctx->fontdesc[i] = pango_font_description_from_string( fonts[i] );
pango_layout_set_font_description( dctx->layout[i],
dctx->fontdesc[i] );
}
pango_layout_set_alignment( dctx->layout[LAYOUT_BOARD],
PANGO_ALIGN_CENTER );
}
DrawCtx* DrawCtx*
gtkDrawCtxtMake( GtkWidget* drawing_area, GtkAppGlobals* globals ) gtkDrawCtxtMake( GtkWidget* drawing_area, GtkAppGlobals* globals )
{ {
GtkDrawCtx* dctx = g_malloc( sizeof(GtkDrawCtx) ); GtkDrawCtx* dctx = g_malloc0( sizeof(GtkDrawCtx) );
GdkColormap* map; GdkColormap* map;
short i; short i;
@ -1015,6 +1055,7 @@ gtkDrawCtxtMake( GtkWidget* drawing_area, GtkAppGlobals* globals )
/* SET_VTABLE_ENTRY( dctx, draw_frameBoard, gtk_ ); */ /* SET_VTABLE_ENTRY( dctx, draw_frameBoard, gtk_ ); */
/* SET_VTABLE_ENTRY( dctx, draw_frameTray, gtk_ ); */ /* SET_VTABLE_ENTRY( dctx, draw_frameTray, gtk_ ); */
dctx->pangoContext = gtk_widget_get_pango_context( drawing_area );
dctx->drawing_area = drawing_area; dctx->drawing_area = drawing_area;
dctx->globals = globals; dctx->globals = globals;
@ -1054,8 +1095,6 @@ gtkDrawCtxtMake( GtkWidget* drawing_area, GtkAppGlobals* globals )
allocAndSet( map, &dctx->tileBack, 0xFFFF, 0xFFFF, 0x9999 ); allocAndSet( map, &dctx->tileBack, 0xFFFF, 0xFFFF, 0x9999 );
allocAndSet( map, &dctx->red, 0xFFFF, 0x0000, 0x0000 ); allocAndSet( map, &dctx->red, 0xFFFF, 0x0000, 0x0000 );
setupLayouts( dctx, drawing_area );
return (DrawCtx*)dctx; return (DrawCtx*)dctx;
} /* gtkDrawCtxtMake */ } /* gtkDrawCtxtMake */

4
linux/gtkmain.h
View file

@ -22,6 +22,7 @@
#include <gtk/gtk.h> #include <gtk/gtk.h>
#include <sys/time.h> #include <sys/time.h>
#include <pango/pango-font.h> #include <pango/pango-font.h>
#include <glib.h>
#include "draw.h" #include "draw.h"
#include "main.h" #include "main.h"
@ -53,8 +54,7 @@ typedef struct GtkDrawCtx {
/* new for gtk 2.0 */ /* new for gtk 2.0 */
PangoContext* pangoContext; PangoContext* pangoContext;
PangoFontDescription* fontdesc[LAYOUT_NLAYOUTS]; GList* fontsPerSize;
PangoLayout* layout[LAYOUT_NLAYOUTS];
XP_U16 trayOwner; XP_U16 trayOwner;
XP_Bool topFocus; XP_Bool topFocus;