$NetBSD: patch-bg,v 1.2 2011/07/05 03:27:22 dholland Exp $ Handle always-on-top. Fix LP64 problems. --- tv.c.orig 2001-02-12 19:03:09.000000000 +0000 +++ tv.c @@ -285,7 +285,7 @@ static void TVStationListStrToList( TVUTILOutOfMemory(); for ( i = 0; i < TV_MAX_CHANNELS; i++ ) { - sprintf( (*station)[i].id, "%ld", i+TV_CHAN_MIN ); + sprintf( (*station)[i].id, "%d", i+TV_CHAN_MIN ); (*station)[i].set_via_channel = TRUE; (*station)[i].channel = i+TV_CHAN_MIN; } @@ -328,13 +328,13 @@ static void TVStationListStrToList( if (( sscanf( tok, "%[^()](f%f)", new.id, &new.freq ) == 2 ) || ( sscanf( tok, "%[^()](F%f)", new.id, &new.freq ) == 2 )) new.set_via_channel = FALSE; - else if ( sscanf( tok, "%[^()](%ld)", new.id, &tmp_int ) == 2 ) { + else if ( sscanf( tok, "%[^()](%d)", new.id, &tmp_int ) == 2 ) { new.set_via_channel = TRUE; new.channel = tmp_int; } - else if ( sscanf( tok, "%ld-%ld", &chan1, &chan2 ) == 2 ) + else if ( sscanf( tok, "%d-%d", &chan1, &chan2 ) == 2 ) chan_range = TRUE; - else if ( sscanf( tok, "%ld", &tmp_int ) == 1 ) { + else if ( sscanf( tok, "%d", &tmp_int ) == 1 ) { new.set_via_channel = TRUE; new.channel = tmp_int; sprintf( new.id, "%d", new.channel ); @@ -371,7 +371,7 @@ static void TVStationListStrToList( memcpy( &(*station)[i++], &new, sizeof(new) ); else for ( ; chan1 <= chan2; chan1++ ) { - sprintf( new.id, "%ld", chan1 ); + sprintf( new.id, "%d", chan1 ); new.set_via_channel = TRUE; new.channel = chan1; new.freq = 0.0; @@ -873,6 +873,9 @@ int main( int argc, char *argv[] ) S_wm_delete_window = XInternAtom( TVDISPLAY, "WM_DELETE_WINDOW", False ); XSetWMProtocols( TVDISPLAY, XtWindow( top_level ), &S_wm_delete_window, 1); + p->aot_mode = (App_res.aot_mode != FALSE); + XUTILSetAlwaysOnTop( p->aot_mode ); + TVSCREENUpdateShellRsrcs( top_level, d->video_wgt ); TVMENUResync();