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

use new glib datetime api (replaces deprecated)

Browse source
This commit is contained in:
Eric House 2020-08-31 17:16:14 -07:00
parent 53563236e4
commit 58dfc32a6e
4 changed files with 25 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
xwords4/linux/curgamlistwin.c
View file

@ -26,6 +26,7 @@
#include "linuxmain.h" #include "linuxmain.h"
#include "device.h" #include "device.h"
#include "strutils.h" #include "strutils.h"
#include "linuxutl.h"
struct CursGameList { struct CursGameList {
WINDOW* window; WINDOW* window;
@ -265,8 +266,9 @@ cgl_draw( CursGameList* cgl )
data[line][col++] = g_strdup_printf( "%d", gi->nMoves ); data[line][col++] = g_strdup_printf( "%d", gi->nMoves );
data[line][col++] = g_strdup_printf( "%d", gi->turn ); data[line][col++] = g_strdup_printf( "%d", gi->turn );
data[line][col++] = g_strdup_printf( "%d", gi->nPending ); data[line][col++] = g_strdup_printf( "%d", gi->nPending );
GTimeVal timerVal = { tv_sec: gi->dupTimerExpires, tv_usec: 0 }; gchar buf[64];
data[line][col++] = g_time_val_to_iso8601( &timerVal ); formatSeconds( gi->dupTimerExpires, buf, VSIZE(buf) );
data[line][col++] = g_strdup( buf );
XP_ASSERT( col == VSIZE(data[line]) ); XP_ASSERT( col == VSIZE(data[line]) );
++line; ++line;

10
xwords4/linux/gtkmain.c
View file

@ -244,10 +244,11 @@ add_to_list( GtkWidget* list, sqlite3_int64 rowid, XP_Bool isNew,
gchar* localString = 0 <= gib->turn ? gib->turnLocal ? "YES" gchar* localString = 0 <= gib->turn ? gib->turnLocal ? "YES"
: "NO" : ""; : "NO" : "";
GTimeVal timeval = { tv_sec: gib->lastMoveTime, tv_usec: 0 }; gchar timeStr[64];
gchar* timeStr = g_time_val_to_iso8601( &timeval ); formatSeconds( gib->lastMoveTime, timeStr, VSIZE(timeStr) );
GTimeVal timerVal = { tv_sec: gib->dupTimerExpires, tv_usec: 0 }; gchar timerStr[64];
gchar* timerStr = g_time_val_to_iso8601( &timerVal ); formatSeconds( gib->dupTimerExpires, timerStr, VSIZE(timeStr) );
gtk_list_store_set( store, &iter, gtk_list_store_set( store, &iter,
ROW_ITEM, rowid, ROW_ITEM, rowid,
ROW_THUMB, gib->snap, ROW_THUMB, gib->snap,
@ -267,7 +268,6 @@ add_to_list( GtkWidget* list, sqlite3_int64 rowid, XP_Bool isNew,
LASTTURN_ITEM, timeStr, LASTTURN_ITEM, timeStr,
DUPTIMER_ITEM, timerStr, DUPTIMER_ITEM, timerStr,
-1 ); -1 );
g_free( timeStr );
XP_LOGF( "DONE adding" ); XP_LOGF( "DONE adding" );
} }

15
xwords4/linux/linuxutl.c
View file

@ -603,7 +603,20 @@ formatTimerText( gchar* buf, int bufLen, int secondsLeft )
int minutes = secondsLeft / 60; int minutes = secondsLeft / 60;
int seconds = secondsLeft % 60; int seconds = secondsLeft % 60;
XP_SNPRINTF( buf, bufLen, "% 1d:%02d", minutes, seconds ); XP_SNPRINTF( buf, bufLen, "% 1d:%02d", minutes, seconds );
} /* gtkFormatTimerText */ }
void
formatSeconds( int unixSeconds, gchar* buf, int bufLen )
{
GDateTime* timeval = g_date_time_new_from_unix_local( unixSeconds );
gchar* str = g_date_time_format_iso8601 ( timeval );
int len = strlen( str );
if ( len < bufLen ) {
XP_MEMCPY( buf, str, len + 1 );
}
g_date_time_unref( timeval );
g_free( str );
}
#ifdef TEXT_MODEL #ifdef TEXT_MODEL
/* This is broken for UTF-8, even Spanish */ /* This is broken for UTF-8, even Spanish */

2
xwords4/linux/linuxutl.h
View file

@ -59,4 +59,6 @@ XP_U32 linux_getCurSeconds();
void formatTimerText( gchar* buf, int bufLen, int secondsLeft ); void formatTimerText( gchar* buf, int bufLen, int secondsLeft );
void formatSeconds( int unixSeconds, gchar* buf, int bufLen );
#endif #endif