Miroirs/xwords
1
0
Fork 0
mirror of git://xwords.git.sourceforge.net/gitroot/xwords/xwords synced 2025-01-22 07:28:16 +01:00
Code Issues Projects Releases Packages Wiki Activity

gtk version fixes: blanks, scores, buttons

Browse source
This commit is contained in:
Eric House 2024-02-18 20:04:57 -08:00
parent bc9ced7b58
commit 3537975514
3 changed files with 69 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
xwords4/common/draw.h
View file

@ -82,9 +82,8 @@ typedef XP_UCHAR HintAtts;
* *
* As to how to choose, static linking makes the binary a tiny bit smaller, * As to how to choose, static linking makes the binary a tiny bit smaller,
* but vtables give more flexibilty. For example, Palm uses them to support * but vtables give more flexibilty. For example, Palm uses them to support
* both black-and-white and color screens, while linux on linux separate * both black-and-white and color screens, while on linux separate vtables are
* vtable are created to allow a runtime choice between gtk and ncurses * created to allow a runtime choice between gtk and ncurses drawing.
* drawing.
*/ */
#ifdef DRAW_LINK_DIRECT #ifdef DRAW_LINK_DIRECT
# define DRAW_FUNC_NAME(name) linked##_draw_##name # define DRAW_FUNC_NAME(name) linked##_draw_##name

88
xwords4/linux/gtkdraw.c
View file

@ -158,9 +158,11 @@ static void
draw_circle( const GtkDrawCtx* dctx, const XP_Rect* rect ) draw_circle( const GtkDrawCtx* dctx, const XP_Rect* rect )
{ {
cairo_t* cr = getCairo( dctx ); cairo_t* cr = getCairo( dctx );
cairo_save( cr );
cairo_translate( cr, rect->left + (rect->width/2), rect->top + (rect->height/2)); cairo_translate( cr, rect->left + (rect->width/2), rect->top + (rect->height/2));
int diameter = XP_MAX(rect->width, rect->height); int diameter = XP_MAX(rect->width, rect->height);
cairo_arc( cr, 0, 0, diameter/2, 0, 2 * M_PI); cairo_arc( cr, 0, 0, diameter/2, 0, 2 * M_PI);
cairo_restore( cr );
cairo_stroke( cr ); cairo_stroke( cr );
} }
@ -304,7 +306,7 @@ draw_string_at( GtkDrawCtx* dctx, PangoLayout* layout,
const XP_UCHAR* 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 GdkRGBA* frground, const GdkRGBA* frground,
const GdkRGBA* bkgrnd ) const GdkRGBA* bkgrnd, const char* attr )
{ {
// XP_LOGFF( "(%s, %d, %d)", str, where->left, where->top ); // XP_LOGFF( "(%s, %d, %d)", str, where->left, where->top );
gint xx = where->left; gint xx = where->left;
@ -318,7 +320,36 @@ draw_string_at( GtkDrawCtx* dctx, PangoLayout* layout,
layout = layout_for_ht( dctx, fontHt ); layout = layout_for_ht( dctx, fontHt );
} }
pango_layout_set_text( layout, (char*)str, XP_STRLEN(str) ); pango_layout_set_text( layout, str, -1 );
if ( !!attr ) {
PangoAttrList* attr_list = NULL;
char* text = NULL;
char buf[256];
char fmt[32];
sprintf( fmt, "<%s>%%s</%s>", attr, attr );
GError* error = NULL;
int len = snprintf( buf, sizeof(buf), fmt, str );
gboolean success = pango_parse_markup( buf, len, 0,
&attr_list,
&text, NULL, &error );
if ( !!error ) {
XP_LOGFF( "pango_parse_markup()=>%s", error->message );
g_error_free( error );
XP_ASSERT(0);
} else {
XP_ASSERT( success);
XP_ASSERT( 0 == strcmp(text, str) );
}
pango_layout_set_attributes( layout, attr_list );
pango_attr_list_unref( attr_list );
g_free( text );
} else {
pango_layout_set_attributes( layout, NULL );
}
if ( just != XP_GTK_JUST_NONE ) { if ( just != XP_GTK_JUST_NONE ) {
int width, height; int width, height;
@ -605,7 +636,7 @@ gtk_draw_drawCell( DrawCtx* p_dctx, XWEnv XP_UNUSED(xwe), const XP_Rect* rect,
} }
if ( (flags & CELL_ISSTAR) != 0 ) { if ( (flags & CELL_ISSTAR) != 0 ) {
draw_string_at( dctx, NULL, "*", dctx->cellHeight, rect, draw_string_at( dctx, NULL, "*", dctx->cellHeight, rect,
XP_GTK_JUST_CENTER, &dctx->black, NULL ); XP_GTK_JUST_CENTER, &dctx->black, NULL, NULL );
} }
} else if ( !!bitmaps && !!bitmaps->bmps[0] ) { } else if ( !!bitmaps && !!bitmaps->bmps[0] ) {
XP_ASSERT(0); /* we don't handle this now */ XP_ASSERT(0); /* we don't handle this now */
@ -624,7 +655,6 @@ gtk_draw_drawCell( DrawCtx* p_dctx, XWEnv XP_UNUSED(xwe), const XP_Rect* rect,
if ( TVT_FACES == useTyp ) { if ( TVT_FACES == useTyp ) {
value = NULL; value = NULL;
} }
XP_Bool isBlank = (flags & CELL_ISBLANK) != 0;
if ( cursor ) { if ( cursor ) {
gtkSetForeground( dctx, cursor ); gtkSetForeground( dctx, cursor );
} else if ( !recent && !pending ) { } else if ( !recent && !pending ) {
@ -633,6 +663,7 @@ gtk_draw_drawCell( DrawCtx* p_dctx, XWEnv XP_UNUSED(xwe), const XP_Rect* rect,
draw_rectangle( dctx, TRUE, rectInset.left, rectInset.top, draw_rectangle( dctx, TRUE, rectInset.left, rectInset.top,
rectInset.width+1, rectInset.height+1 ); rectInset.width+1, rectInset.height+1 );
XP_Bool isBlank = (flags & CELL_ISBLANK) != 0;
if ( isBlank && 0 == strcmp("_",letter ) ) { if ( isBlank && 0 == strcmp("_",letter ) ) {
letter = "?"; letter = "?";
isBlank = XP_FALSE; isBlank = XP_FALSE;
@ -654,7 +685,7 @@ gtk_draw_drawCell( DrawCtx* p_dctx, XWEnv XP_UNUSED(xwe), const XP_Rect* rect,
} }
draw_string_at( dctx, NULL, letter, fontHt, &tmpRect, draw_string_at( dctx, NULL, letter, fontHt, &tmpRect,
XP_GTK_JUST_CENTER, foreground, cursor ); XP_GTK_JUST_CENTER, foreground, cursor, NULL );
if ( isBlank ) { if ( isBlank ) {
draw_circle( dctx, &tmpRect ); draw_circle( dctx, &tmpRect );
} }
@ -668,7 +699,7 @@ gtk_draw_drawCell( DrawCtx* p_dctx, XWEnv XP_UNUSED(xwe), const XP_Rect* rect,
tmpRect.top += tmpRect.height * (fraction-1) / fraction; tmpRect.top += tmpRect.height * (fraction-1) / fraction;
tmpRect.height /= fraction; tmpRect.height /= fraction;
draw_string_at( dctx, NULL, value, dctx->cellHeight/fraction, &tmpRect, draw_string_at( dctx, NULL, value, dctx->cellHeight/fraction, &tmpRect,
XP_GTK_JUST_CENTER, foreground, cursor ); XP_GTK_JUST_CENTER, foreground, cursor, NULL );
} }
drawHintBorders( dctx, rect, hintAtts ); drawHintBorders( dctx, rect, hintAtts );
@ -748,7 +779,7 @@ gtkDrawTileImpl( DrawCtx* p_dctx, XWEnv XP_UNUSED(xwe), const XP_Rect* rect, con
if ( *textP != LETTER_NONE ) { /* blank */ if ( *textP != LETTER_NONE ) { /* blank */
draw_string_at( dctx, NULL, textP, formatRect.height>>1, draw_string_at( dctx, NULL, textP, formatRect.height>>1,
&formatRect, XP_GTK_JUST_TOPLEFT, &formatRect, XP_GTK_JUST_TOPLEFT,
foreground, NULL ); foreground, NULL, NULL );
} }
} }
@ -758,7 +789,7 @@ gtkDrawTileImpl( DrawCtx* p_dctx, XWEnv XP_UNUSED(xwe), const XP_Rect* rect, con
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,
foreground, NULL ); foreground, NULL, NULL );
} }
} }
@ -813,7 +844,7 @@ gtk_draw_drawTileBack( DrawCtx* p_dctx, XWEnv XP_UNUSED(xwe), const XP_Rect* rec
draw_string_at( dctx, NULL, "?", r.height, draw_string_at( dctx, NULL, "?", r.height,
&r, XP_GTK_JUST_CENTER, &r, XP_GTK_JUST_CENTER,
&dctx->playerColors[dctx->trayOwner], NULL ); &dctx->playerColors[dctx->trayOwner], NULL, NULL );
return XP_TRUE; return XP_TRUE;
} /* gtk_draw_drawTileBack */ } /* gtk_draw_drawTileBack */
@ -865,7 +896,7 @@ gtk_draw_drawBoardArrow( DrawCtx* p_dctx, XWEnv XP_UNUSED(xwe), const XP_Rect* r
/* 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,
rectP, XP_GTK_JUST_CENTER, rectP, XP_GTK_JUST_CENTER,
&dctx->black, NULL ); &dctx->black, NULL, NULL );
drawHintBorders( dctx, rectP, hintAtts ); drawHintBorders( dctx, rectP, hintAtts );
} /* gtk_draw_drawBoardCursor */ } /* gtk_draw_drawBoardCursor */
@ -889,13 +920,12 @@ static PangoLayout*
getLayoutToFitRect( GtkDrawCtx* dctx, const XP_UCHAR* str, const XP_Rect* rect, getLayoutToFitRect( GtkDrawCtx* dctx, const XP_UCHAR* str, const XP_Rect* rect,
int* heightP ) int* heightP )
{ {
PangoLayout* layout;
float ratio, ratioH; float ratio, ratioH;
int width, height; int width, height;
XP_U16 len = XP_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 ); PangoLayout* layout = layout_for_ht( dctx, 24 );
pango_layout_set_text( layout, (char*)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 );
g_object_unref( layout ); g_object_unref( layout );
@ -922,7 +952,8 @@ getLayoutToFitRect( GtkDrawCtx* dctx, const XP_UCHAR* str, const XP_Rect* rect,
static void static void
gtkDrawDrawRemText( DrawCtx* p_dctx, XWEnv XP_UNUSED(xwe), const XP_Rect* rect, gtkDrawDrawRemText( DrawCtx* p_dctx, XWEnv XP_UNUSED(xwe), const XP_Rect* rect,
XP_S16 nTilesLeft, XP_U16* widthP, XP_U16* heightP, XP_Bool focussed ) XP_S16 nTilesLeft, XP_U16* widthP, XP_U16* heightP,
XP_Bool focussed )
{ {
GtkDrawCtx* dctx = (GtkDrawCtx*)(void*)p_dctx; GtkDrawCtx* dctx = (GtkDrawCtx*)(void*)p_dctx;
XP_UCHAR buf[16]; XP_UCHAR buf[16];
@ -948,14 +979,14 @@ gtkDrawDrawRemText( DrawCtx* p_dctx, XWEnv XP_UNUSED(xwe), const XP_Rect* rect,
} }
draw_string_at( dctx, layout, buf, rect->height, draw_string_at( dctx, layout, buf, rect->height,
rect, XP_GTK_JUST_TOPLEFT, rect, XP_GTK_JUST_TOPLEFT,
&dctx->black, NULL ); &dctx->black, NULL, NULL );
} }
g_object_unref( layout ); g_object_unref( layout );
} /* gtkDrawDrawRemText */ } /* gtkDrawDrawRemText */
static void static void
gtk_draw_score_drawPlayer( DrawCtx* p_dctx, XWEnv XP_UNUSED(xwe), const XP_Rect* rInner, gtk_draw_score_drawPlayer( DrawCtx* p_dctx, XWEnv XP_UNUSED(xwe),
const XP_Rect* rOuter, const XP_Rect* rInner, const XP_Rect* rOuter,
XP_U16 XP_UNUSED(gotPct), const DrawScoreInfo* dsi ) XP_U16 XP_UNUSED(gotPct), const DrawScoreInfo* dsi )
{ {
GtkDrawCtx* dctx = (GtkDrawCtx*)(void*)p_dctx; GtkDrawCtx* dctx = (GtkDrawCtx*)(void*)p_dctx;
@ -1004,9 +1035,10 @@ gtk_draw_score_drawPlayer( DrawCtx* p_dctx, XWEnv XP_UNUSED(xwe), const XP_Rect*
/* fontHt >>= 1; */ /* fontHt >>= 1; */
/* } */ /* } */
const char* attr = dsi->isTurn ? "u" : NULL;
draw_string_at( dctx, NULL, scoreBuf, fontHt/*-1*/, draw_string_at( dctx, NULL, scoreBuf, fontHt/*-1*/,
rInner, XP_GTK_JUST_CENTER, rInner, XP_GTK_JUST_CENTER,
&dctx->playerColors[playerNum], cursor ); &dctx->playerColors[playerNum], cursor, attr );
} /* gtk_draw_score_drawPlayer */ } /* gtk_draw_score_drawPlayer */
@ -1148,16 +1180,16 @@ formatScoreText( PangoLayout* layout, XP_UCHAR* buf, XP_U16 bufLen,
} /* formatScoreText */ } /* formatScoreText */
static void static void
gtk_draw_measureScoreText( DrawCtx* p_dctx, XWEnv XP_UNUSED(xwe), const XP_Rect* bounds, gtk_draw_measureScoreText( DrawCtx* p_dctx, XWEnv XP_UNUSED(xwe),
const DrawScoreInfo* dsi, const XP_Rect* bounds, const DrawScoreInfo* dsi,
XP_U16* widthP, XP_U16* heightP ) XP_U16* widthP, XP_U16* heightP )
{ {
GtkDrawCtx* dctx = (GtkDrawCtx*)(void*)p_dctx; GtkDrawCtx* dctx = (GtkDrawCtx*)(void*)p_dctx;
XP_UCHAR buf[VSIZE(dctx->scoreCache[0].str)]; XP_UCHAR buf[VSIZE(dctx->scoreCache[0].str)];
PangoLayout* layout;
int lineHeight = GTK_HOR_SCORE_HEIGHT, nLines; int lineHeight = GTK_HOR_SCORE_HEIGHT, nLines;
layout = getLayoutToFitRect( dctx, "M", bounds, &lineHeight ); PangoLayout* layout = getLayoutToFitRect( dctx, "M", bounds, &lineHeight );
formatScoreText( layout, buf, VSIZE(buf), dsi, bounds, formatScoreText( layout, buf, VSIZE(buf), dsi, bounds,
dctx->scoreIsVertical, widthP, &nLines ); dctx->scoreIsVertical, widthP, &nLines );
*heightP = nLines * lineHeight; *heightP = nLines * lineHeight;
@ -1201,10 +1233,10 @@ gtk_draw_score_pendingScore( DrawCtx* p_dctx, XWEnv XP_UNUSED(xwe), const XP_Rec
ht = localR.height >> 2; ht = localR.height >> 2;
txtColor = curTurn ? &dctx->black : &dctx->grey; txtColor = curTurn ? &dctx->black : &dctx->grey;
draw_string_at( dctx, NULL, "Pts:", ht, draw_string_at( dctx, NULL, "Pts:", ht, &localR, XP_GTK_JUST_TOPLEFT,
&localR, XP_GTK_JUST_TOPLEFT, txtColor, cursor ); txtColor, cursor, NULL );
draw_string_at( dctx, NULL, buf, ht, draw_string_at( dctx, NULL, buf, ht, &localR, XP_GTK_JUST_BOTTOMRIGHT,
&localR, XP_GTK_JUST_BOTTOMRIGHT, txtColor, cursor ); txtColor, cursor, NULL );
} /* gtk_draw_score_pendingScore */ } /* gtk_draw_score_pendingScore */
@ -1225,7 +1257,7 @@ gtk_draw_drawTimer( DrawCtx* p_dctx, XWEnv XP_UNUSED(xwe), const XP_Rect* rInner
formatTimerText( buf, VSIZE(buf), secondsLeft ); formatTimerText( buf, VSIZE(buf), secondsLeft );
draw_string_at( dctx, NULL, buf, rInner->height-1, draw_string_at( dctx, NULL, buf, rInner->height-1,
rInner, XP_GTK_JUST_CENTER, color, NULL ); rInner, XP_GTK_JUST_CENTER, color, NULL, NULL );
if ( !hadCairo ) { if ( !hadCairo ) {
destroyCairo( dctx ); destroyCairo( dctx );
} }
@ -1311,7 +1343,7 @@ gtk_draw_drawMiniWindow( DrawCtx* p_dctx, XWEnv XP_UNUSED(xwe), const XP_UCHAR*
draw_string_at( dctx, NULL, text, GTKMIN_W_HT, draw_string_at( dctx, NULL, text, GTKMIN_W_HT,
&localR, XP_GTK_JUST_CENTER, &localR, XP_GTK_JUST_CENTER,
&dctx->black, NULL ); &dctx->black, NULL, NULL );
} /* gtk_draw_drawMiniWindow */ } /* gtk_draw_drawMiniWindow */
#endif #endif
@ -1493,7 +1525,7 @@ draw_gtk_status( GtkDrawCtx* dctx, char ch )
const XP_UCHAR str[2] = { ch, '\0' }; const XP_UCHAR str[2] = { ch, '\0' };
draw_string_at( dctx, NULL, str, GTKMIN_W_HT, draw_string_at( dctx, NULL, str, GTKMIN_W_HT,
&rect, XP_GTK_JUST_CENTER, &rect, XP_GTK_JUST_CENTER,
&dctx->black, NULL ); &dctx->black, NULL, NULL );
destroyCairo( dctx ); destroyCairo( dctx );
} }

13
xwords4/linux/gtkmain.c
View file

@ -612,12 +612,8 @@ makeGamesWindow( GtkAppGlobals* apg )
resizeFromSaved( window, params->pDb, KEY_WIN_LOC ); resizeFromSaved( window, params->pDb, KEY_WIN_LOC );
GtkWidget* swin = gtk_scrolled_window_new( NULL, NULL );
gtk_container_add( GTK_CONTAINER(window), swin );
gtk_widget_show( swin );
GtkWidget* vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 0); GtkWidget* vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 0);
gtk_container_add( GTK_CONTAINER(swin), vbox ); gtk_container_add( GTK_CONTAINER(window), vbox );
gtk_widget_show( vbox ); gtk_widget_show( vbox );
// add menubar here // add menubar here
@ -638,8 +634,13 @@ makeGamesWindow( GtkAppGlobals* apg )
gtk_widget_show( menubar ); gtk_widget_show( menubar );
gtk_box_pack_start( GTK_BOX(vbox), menubar, FALSE, TRUE, 0 ); gtk_box_pack_start( GTK_BOX(vbox), menubar, FALSE, TRUE, 0 );
GtkWidget* swin = gtk_scrolled_window_new( NULL, NULL );
gboolean expand = TRUE; // scrollable window gets all extra space
gtk_box_pack_start( GTK_BOX(vbox), swin, expand, TRUE, 0 );
gtk_widget_show( swin );
GtkWidget* list = init_games_list( apg ); GtkWidget* list = init_games_list( apg );
gtk_container_add( GTK_CONTAINER(vbox), list ); gtk_container_add( GTK_CONTAINER(swin), list );
gtk_widget_show( list ); gtk_widget_show( list );