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

unsigned->signed to fix drawing garbage in empty tiles

Browse source
This commit is contained in:
Eric House 2021-02-16 16:15:13 -08:00
parent 07d5bd9883
commit 23cb7bb85d
5 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
xwords4/android/jni/drawwrapper.c
View file

@ -489,7 +489,7 @@ and_draw_trayBegin( DrawCtx* dctx, XWEnv xwe, const XP_Rect* rect, XP_U16 owner,
static XP_Bool static XP_Bool
and_draw_drawTile( DrawCtx* dctx, XWEnv xwe, const XP_Rect* rect, and_draw_drawTile( DrawCtx* dctx, XWEnv xwe, const XP_Rect* rect,
const XP_UCHAR* text, const XP_Bitmaps* bitmaps, const XP_UCHAR* text, const XP_Bitmaps* bitmaps,
XP_U16 val, CellFlags flags ) XP_S16 val, CellFlags flags )
{ {
XP_Bool result; XP_Bool result;
DRAW_CBK_HEADER( "drawTile", DRAW_CBK_HEADER( "drawTile",

2
xwords4/common/draw.h
View file

@ -191,7 +191,7 @@ typedef struct DrawCtxVTable {
null*/ null*/
const XP_UCHAR* text, const XP_UCHAR* text,
const XP_Bitmaps* bitmaps, const XP_Bitmaps* bitmaps,
XP_U16 val, CellFlags flags ); XP_S16 val, CellFlags flags );
#ifdef POINTER_SUPPORT #ifdef POINTER_SUPPORT
XP_Bool DRAW_VTABLE_NAME(drawTileMidDrag) ( DrawCtx* dctx, XWEnv xwe, XP_Bool DRAW_VTABLE_NAME(drawTileMidDrag) ( DrawCtx* dctx, XWEnv xwe,
const XP_Rect* rect, const XP_Rect* rect,

2
xwords4/linux/cursesdraw.c
View file

@ -494,7 +494,7 @@ curses_stringInTile( CursesDrawCtx* dctx, const XP_Rect* rect,
static XP_Bool static XP_Bool
curses_draw_drawTile( DrawCtx* p_dctx, XWEnv XP_UNUSED(xwe), const XP_Rect* rect, curses_draw_drawTile( DrawCtx* p_dctx, XWEnv XP_UNUSED(xwe), const XP_Rect* rect,
const XP_UCHAR* textP, const XP_Bitmaps* XP_UNUSED(bitmaps), const XP_UCHAR* textP, const XP_Bitmaps* XP_UNUSED(bitmaps),
XP_U16 val, CellFlags flags ) XP_S16 val, CellFlags flags )
{ {
char numbuf[5]; char numbuf[5];
XP_UCHAR letterbuf[5]; XP_UCHAR letterbuf[5];

4
xwords4/linux/gtkdraw.c
View file

@ -788,7 +788,7 @@ gtk_draw_trayBegin( DrawCtx* p_dctx, XWEnv XP_UNUSED(xwe), const XP_Rect* XP_UNU
static XP_Bool static XP_Bool
gtkDrawTileImpl( DrawCtx* p_dctx, XWEnv XP_UNUSED(xwe), const XP_Rect* rect, const XP_UCHAR* textP, gtkDrawTileImpl( DrawCtx* p_dctx, XWEnv XP_UNUSED(xwe), const XP_Rect* rect, const XP_UCHAR* textP,
const XP_Bitmaps* bitmaps, XP_U16 val, CellFlags flags, const XP_Bitmaps* bitmaps, XP_S16 val, CellFlags flags,
XP_Bool clearBack ) XP_Bool clearBack )
{ {
GtkDrawCtx* dctx = (GtkDrawCtx*)(void*)p_dctx; GtkDrawCtx* dctx = (GtkDrawCtx*)(void*)p_dctx;
@ -854,7 +854,7 @@ gtkDrawTileImpl( DrawCtx* p_dctx, XWEnv XP_UNUSED(xwe), const XP_Rect* rect, con
static XP_Bool static XP_Bool
gtk_draw_drawTile( DrawCtx* p_dctx, XWEnv xwe, const XP_Rect* rect, const XP_UCHAR* textP, gtk_draw_drawTile( DrawCtx* p_dctx, XWEnv xwe, const XP_Rect* rect, const XP_UCHAR* textP,
const XP_Bitmaps* bitmaps, XP_U16 val, CellFlags flags ) const XP_Bitmaps* bitmaps, XP_S16 val, CellFlags flags )
{ {
return gtkDrawTileImpl( p_dctx, xwe, rect, textP, bitmaps, val, flags, XP_TRUE ); return gtkDrawTileImpl( p_dctx, xwe, rect, textP, bitmaps, val, flags, XP_TRUE );
} }

4
xwords4/wasm/wasmdraw.c
View file

@ -1,4 +1,4 @@
/* -*- compile-command: "cd ../wasm && make main.html -j3"; -*- */ /* -*- compile-command: "cd ../wasm && make MEMDEBUG=TRUE install"; -*- */
/* /*
* Copyright 2021 by Eric House (xwords@eehouse.org). All rights reserved. * Copyright 2021 by Eric House (xwords@eehouse.org). All rights reserved.
* *
@ -556,7 +556,7 @@ wasm_draw_drawTile( DrawCtx* dctx, XWEnv xwe, const XP_Rect* rect,
null*/ null*/
const XP_UCHAR* text, const XP_UCHAR* text,
const XP_Bitmaps* bitmaps, const XP_Bitmaps* bitmaps,
XP_U16 val, CellFlags flags ) XP_S16 val, CellFlags flags )
{ {
WasmDrawCtx* wdctx = (WasmDrawCtx*)dctx; WasmDrawCtx* wdctx = (WasmDrawCtx*)dctx;
drawTile( wdctx, text, val, wdctx->trayOwner, rect, flags ); drawTile( wdctx, text, val, wdctx->trayOwner, rect, flags );