Miroirs/xwords
1
0
Fork 0
mirror of git://xwords.git.sourceforge.net/gitroot/xwords/xwords synced 2024-12-28 09:58:30 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Tweak to support non-ascii utf-8 chars from dicts. Seems to display

Browse source 
Catalan and Polish fine (on board.)
This commit is contained in:
ehouse 2009-08-29 16:09:24 +00:00
parent 9ae95366eb
commit d86d2b556a
2 changed files with 32 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
xwords4/linux/Makefile
View file

@ -36,6 +36,11 @@ DO_GTK = -DPLATFORM_GTK
# uncomment for standalone build # uncomment for standalone build
# STANDALONE = -DXWFEATURE_STANDALONE_ONLY # STANDALONE = -DXWFEATURE_STANDALONE_ONLY
UNICODE ?= -DXWFEATURE_UNICODE
ifdef UNICODE
CFLAGS += -std=gnu99
endif
SVN_REV ?= "$(shell svnversion -n .)" SVN_REV ?= "$(shell svnversion -n .)"
SVNDEF = -D'SVN_REV=$(SVN_REV)' SVNDEF = -D'SVN_REV=$(SVN_REV)'
@ -78,6 +83,7 @@ endif
ifdef CURSES_CELL_WIDTH ifdef CURSES_CELL_WIDTH
DEFINES += -DCURSES_CELL_WIDTH=$(CURSES_CELL_WIDTH) DEFINES += -DCURSES_CELL_WIDTH=$(CURSES_CELL_WIDTH)
endif endif
DEFINES += $(UNICODE)
# Networking-related features. Only set these if STANDALONE is not set # Networking-related features. Only set these if STANDALONE is not set
ifeq ($(STANDALONE),) ifeq ($(STANDALONE),)

52
xwords4/linux/gtkdraw.c
View file

@ -191,7 +191,7 @@ layout_for_ht( GtkDrawCtx* dctx, XP_U16 ht )
static void static void
draw_string_at( GtkDrawCtx* dctx, PangoLayout* layout, draw_string_at( GtkDrawCtx* dctx, PangoLayout* layout,
const char* str, XP_U16 fontHt, const XP_UCHAR* 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 )
{ {
@ -202,7 +202,7 @@ draw_string_at( GtkDrawCtx* dctx, PangoLayout* layout,
layout = layout_for_ht( dctx, fontHt ); layout = layout_for_ht( dctx, fontHt );
} }
pango_layout_set_text( layout, str, strlen(str) ); pango_layout_set_text( layout, (char*)str, XP_STRLEN(str) );
if ( just != XP_GTK_JUST_NONE ) { if ( just != XP_GTK_JUST_NONE ) {
int width, height; int width, height;
@ -577,8 +577,8 @@ gtkDrawTileImpl( DrawCtx* p_dctx, const XP_Rect* rect, const XP_UCHAR* textP,
} }
if ( !valHidden ) { if ( !valHidden ) {
sprintf( numbuf, "%d", val ); XP_SNPRINTF( numbuf, VSIZE(numbuf), "%d", val );
len = strlen( numbuf ); len = XP_STRLEN( numbuf );
draw_string_at( dctx, NULL, numbuf, formatRect.height>>2, draw_string_at( dctx, NULL, numbuf, formatRect.height>>2,
&formatRect, XP_GTK_JUST_BOTTOMRIGHT, &formatRect, XP_GTK_JUST_BOTTOMRIGHT,
@ -690,7 +690,7 @@ gtk_draw_drawBoardArrow( DrawCtx* p_dctx, const XP_Rect* rectP,
HintAtts hintAtts, CellFlags XP_UNUSED(flags) ) HintAtts hintAtts, CellFlags XP_UNUSED(flags) )
{ {
GtkDrawCtx* dctx = (GtkDrawCtx*)p_dctx; GtkDrawCtx* dctx = (GtkDrawCtx*)p_dctx;
const char* curs = vertical? "|":"-"; const XP_UCHAR* curs = vertical? "|":"-";
/* font needs to be small enough that "|" doesn't overwrite cell below */ /* font needs to be small enough that "|" doesn't overwrite cell below */
draw_string_at( dctx, NULL, curs, (rectP->height*2)/3, draw_string_at( dctx, NULL, curs, (rectP->height*2)/3,
@ -712,16 +712,16 @@ gtk_draw_scoreBegin( DrawCtx* p_dctx, const XP_Rect* rect,
} /* gtk_draw_scoreBegin */ } /* gtk_draw_scoreBegin */
static PangoLayout* static PangoLayout*
getLayoutToFitRect( GtkDrawCtx* dctx, const char* str, const XP_Rect* rect ) getLayoutToFitRect( GtkDrawCtx* dctx, const XP_UCHAR* str, const XP_Rect* rect )
{ {
PangoLayout* layout; PangoLayout* layout;
float ratio, ratioH; float ratio, ratioH;
int width, height; int width, height;
XP_U16 len = strlen(str); XP_U16 len = XP_STRLEN(str);
/* First measure it using any font at all */ /* First measure it using any font at all */
layout = layout_for_ht( dctx, 24 ); layout = layout_for_ht( dctx, 24 );
pango_layout_set_text( layout, str, len ); pango_layout_set_text( layout, (char*)str, len );
pango_layout_get_pixel_size( layout, &width, &height ); pango_layout_get_pixel_size( layout, &width, &height );
/* Figure the ratio of is to should-be. The smaller of these is the one /* Figure the ratio of is to should-be. The smaller of these is the one
@ -734,7 +734,7 @@ getLayoutToFitRect( GtkDrawCtx* dctx, const char* str, const XP_Rect* rect )
height = 24.0 * ratio; height = 24.0 * ratio;
layout = layout_for_ht( dctx, height ); layout = layout_for_ht( dctx, height );
pango_layout_set_text( layout, str, len ); pango_layout_set_text( layout, (char*)str, len );
return layout; return layout;
} /* getLayoutToFitRect */ } /* getLayoutToFitRect */
@ -743,10 +743,10 @@ gtkDrawDrawRemText( DrawCtx* p_dctx, const XP_Rect* rect, XP_S16 nTilesLeft,
XP_U16* widthP, XP_U16* heightP, XP_Bool focussed ) XP_U16* widthP, XP_U16* heightP, XP_Bool focussed )
{ {
GtkDrawCtx* dctx = (GtkDrawCtx*)p_dctx; GtkDrawCtx* dctx = (GtkDrawCtx*)p_dctx;
char buf[10]; XP_UCHAR buf[10];
PangoLayout* layout; PangoLayout* layout;
snprintf( buf, sizeof(buf), "rem:%d", nTilesLeft ); XP_SNPRINTF( buf, sizeof(buf), "rem:%d", nTilesLeft );
layout = getLayoutToFitRect( dctx, buf, rect ); layout = getLayoutToFitRect( dctx, buf, rect );
if ( !!widthP ) { if ( !!widthP ) {
@ -792,7 +792,7 @@ gtk_draw_drawRemText( DrawCtx* p_dctx, const XP_Rect* rInner,
} /* gtk_draw_drawRemText */ } /* gtk_draw_drawRemText */
static void static void
formatScoreText( char* buf, XP_U16 bufLen, const DrawScoreInfo* dsi ) formatScoreText( XP_UCHAR* buf, XP_U16 bufLen, const DrawScoreInfo* dsi )
{ {
XP_S16 score = dsi->totalScore; XP_S16 score = dsi->totalScore;
XP_U16 nTilesLeft = dsi->nTilesLeft; XP_U16 nTilesLeft = dsi->nTilesLeft;
@ -804,13 +804,13 @@ formatScoreText( char* buf, XP_U16 bufLen, const DrawScoreInfo* dsi )
borders = "*"; borders = "*";
} }
used = snprintf( buf, bufLen, "%s%.3d", borders, score ); used = XP_SNPRINTF( buf, bufLen, "%s%.3d", borders, score );
if ( (nTilesLeft < MAX_TRAY_TILES) && (nTilesLeft > 0) ) { if ( (nTilesLeft < MAX_TRAY_TILES) && (nTilesLeft > 0) ) {
char nbuf[10]; XP_UCHAR nbuf[10];
sprintf( nbuf, ":%d", nTilesLeft ); XP_SNPRINTF( nbuf, VSIZE(nbuf), ":%d", nTilesLeft );
(void)strcat( buf, nbuf ); (void)XP_STRCAT( buf, nbuf );
} }
snprintf( buf+used, bufLen-used, "%s", borders ); XP_SNPRINTF( buf+used, bufLen-used, "%s", borders );
} /* formatScoreText */ } /* formatScoreText */
static void static void
@ -819,11 +819,11 @@ gtk_draw_measureScoreText( DrawCtx* p_dctx, const XP_Rect* bounds,
XP_U16* widthP, XP_U16* heightP ) XP_U16* widthP, XP_U16* heightP )
{ {
GtkDrawCtx* dctx = (GtkDrawCtx*)p_dctx; GtkDrawCtx* dctx = (GtkDrawCtx*)p_dctx;
char buf[20]; XP_UCHAR buf[20];
PangoLayout* layout; PangoLayout* layout;
int height, width; int height, width;
formatScoreText( buf, sizeof(buf), dsi ); formatScoreText( buf, VSIZE(buf), dsi );
layout = getLayoutToFitRect( dctx, buf, bounds ); layout = getLayoutToFitRect( dctx, buf, bounds );
pango_layout_get_pixel_size( layout, &width, &height ); pango_layout_get_pixel_size( layout, &width, &height );
@ -836,11 +836,11 @@ gtk_draw_score_drawPlayer( DrawCtx* p_dctx, const XP_Rect* rInner,
const XP_Rect* rOuter, const DrawScoreInfo* dsi ) const XP_Rect* rOuter, const DrawScoreInfo* dsi )
{ {
GtkDrawCtx* dctx = (GtkDrawCtx*)p_dctx; GtkDrawCtx* dctx = (GtkDrawCtx*)p_dctx;
char scoreBuf[20]; XP_UCHAR scoreBuf[20];
XP_Bool hasCursor = (dsi->flags & CELL_ISCURSOR) != 0; XP_Bool hasCursor = (dsi->flags & CELL_ISCURSOR) != 0;
GdkColor* cursor = NULL; GdkColor* cursor = NULL;
formatScoreText( scoreBuf, sizeof(scoreBuf), dsi ); formatScoreText( scoreBuf, VSIZE(scoreBuf), dsi );
if ( hasCursor ) { if ( hasCursor ) {
cursor = &dctx->cursor; cursor = &dctx->cursor;
@ -874,16 +874,16 @@ gtk_draw_score_pendingScore( DrawCtx* p_dctx, const XP_Rect* rect,
CellFlags flags ) CellFlags flags )
{ {
GtkDrawCtx* dctx = (GtkDrawCtx*)p_dctx; GtkDrawCtx* dctx = (GtkDrawCtx*)p_dctx;
char buf[5]; XP_UCHAR buf[5];
XP_U16 ht; XP_U16 ht;
XP_Rect localR; XP_Rect localR;
GdkColor* cursor = ((flags & CELL_ISCURSOR) != 0) GdkColor* cursor = ((flags & CELL_ISCURSOR) != 0)
? &dctx->cursor : NULL; ? &dctx->cursor : NULL;
if ( score >= 0 ) { if ( score >= 0 ) {
sprintf( buf, "%.3d", score ); XP_SNPRINTF( buf, VSIZE(buf), "%.3d", score );
} else { } else {
strcpy( buf, "???" ); XP_STRNCPY( buf, "???", VSIZE(buf) );
} }
/* gdk_gc_set_clip_rectangle( dctx->drawGC, (GdkRectangle*)rect ); */ /* gdk_gc_set_clip_rectangle( dctx->drawGC, (GdkRectangle*)rect ); */
@ -919,7 +919,7 @@ gtkFormatTimerText( XP_UCHAR* buf, XP_S16 secondsLeft )
minutes = secondsLeft / 60; minutes = secondsLeft / 60;
seconds = secondsLeft % 60; seconds = secondsLeft % 60;
sprintf( buf, "% 1d:%02d", minutes, seconds ); XP_SNPRINTF( buf, VSIZE(buf), "% 1d:%02d", minutes, seconds );
} /* gtkFormatTimerText */ } /* gtkFormatTimerText */
static void static void
@ -974,7 +974,7 @@ gtk_draw_measureMiniWText( DrawCtx* p_dctx, const XP_UCHAR* str,
int height, width; int height, width;
PangoLayout* layout = layout_for_ht( dctx, GTKMIN_W_HT ); PangoLayout* layout = layout_for_ht( dctx, GTKMIN_W_HT );
pango_layout_set_text( layout, str, strlen(str) ); pango_layout_set_text( layout, (char*)str, XP_STRLEN(str) );
pango_layout_get_pixel_size( layout, &width, &height ); pango_layout_get_pixel_size( layout, &width, &height );
*heightP = height; *heightP = height;
*widthP = width + 6; *widthP = width + 6;