From 27f887a70138299200fff92325b7dc1f8f82cf2e Mon Sep 17 00:00:00 2001 From: Bradley Bell Date: Wed, 13 Feb 2002 10:45:05 +0000 Subject: [PATCH] Fullscreen toggle stuff --- include/gr.h | 7 +++++++ main/game.c | 18 +++++++++++++++++- 2 files changed, 24 insertions(+), 1 deletion(-) diff --git a/include/gr.h b/include/gr.h index 3efa29ae..49d5032b 100644 --- a/include/gr.h +++ b/include/gr.h @@ -327,6 +327,8 @@ int gr_uaaline(fix x0,fix y0,fix x1,fix y1); // Draw the bitmap into the current canvas at the specified location. void gr_bitmap(int x,int y,grs_bitmap *bm); void gr_ubitmap(int x,int y,grs_bitmap *bm); +void gr_bitmap_scale_to(grs_bitmap *src, grs_bitmap *dst); + // bitmap function with transparency void gr_bitmapm( int x, int y, grs_bitmap *bm ); void gr_ubitmapm( int x, int y, grs_bitmap *bm ); @@ -482,4 +484,9 @@ int gr_toggle_fullscreen(void); #endif +int gr_toggle_fullscreen_menu(void);//returns state after toggling (ie, same as if you had called check_fullscreen immediatly after) + +//make this a define, since its used in several places +#define KEYS_GR_TOGGLE_FULLSCREEN KEY_CTRLED+KEY_SHIFTED+KEY_PADENTER: case KEY_ALTED+KEY_CTRLED+KEY_PADENTER: case KEY_ALTED+KEY_SHIFTED+KEY_PADENTER + #endif diff --git a/main/game.c b/main/game.c index a188dbaf..67403ded 100644 --- a/main/game.c +++ b/main/game.c @@ -16,7 +16,7 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #endif #ifdef RCS -char game_rcsid[] = "$Id: game.c,v 1.8 2001-10-25 02:19:31 bradleyb Exp $"; +char game_rcsid[] = "$Id: game.c,v 1.9 2002-02-13 10:45:05 bradleyb Exp $"; #endif #ifdef WINDOWS @@ -1080,6 +1080,22 @@ WIN(static int saved_window_h); return 1; } +int arch_toggle_fullscreen_menu(void); + +int gr_toggle_fullscreen_menu(void){ +#ifdef GR_SUPPORTS_FULLSCREEN_MENU_TOGGLE + int i; + i=arch_toggle_fullscreen_menu(); + + generic_key_handler(KEY_PADENTER,0); + key_flush(); + + return i; +#else + return -1; +#endif +} + static int timer_paused=0; void stop_time() -- 2.39.2