From 2d9d9498b036092736bc61c891250200ad767bc1 Mon Sep 17 00:00:00 2001 From: Holger Schemel Date: Thu, 11 Sep 2014 11:18:46 +0200 Subject: [PATCH] added key shortcuts for window scaling and toggling fullscreen mode --- ChangeLog | 5 +++++ src/conftime.h | 2 +- src/events.c | 14 ++++++++++---- 3 files changed, 16 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 3711c4ce..c6749843 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2014-09-11 + * added key shortcuts for window scaling and toggling fullscreen mode: + - Ctrl-'+', Ctrl-'-' and Ctrl-'0' for up/downscaling and normal size + - "F11" key for toggling fullscreen mode (in addition to Alt-Enter) + 2014-09-10 * fixed some drawing bugs when scaling graphics due to "game.tile_size" * added some performance improvements when handling SDL surface scaling diff --git a/src/conftime.h b/src/conftime.h index 6e813d9b..f0217f9f 100644 --- a/src/conftime.h +++ b/src/conftime.h @@ -1 +1 @@ -#define COMPILE_DATE_STRING "2014-09-10 22:28" +#define COMPILE_DATE_STRING "2014-09-11 11:11" diff --git a/src/events.c b/src/events.c index d91a7c46..ffded62a 100644 --- a/src/events.c +++ b/src/events.c @@ -1491,8 +1491,10 @@ void HandleKey(Key key, int key_status) if (key_status == KEY_RELEASED) return; - if ((key == KSYM_Return || key == KSYM_KP_Enter) && - (GetKeyModState() & KMOD_Alt) && video.fullscreen_available) + if ((key == KSYM_F11 || + ((key == KSYM_Return || + key == KSYM_KP_Enter) && (GetKeyModState() & KMOD_Alt))) && + video.fullscreen_available) { setup.fullscreen = !setup.fullscreen; @@ -1508,8 +1510,12 @@ void HandleKey(Key key, int key_status) return; } - if ((key == KSYM_minus || key == KSYM_plus || key == KSYM_0) && - (GetKeyModState() & KMOD_Alt) && video.window_scaling_available && + if ((key == KSYM_minus || + key == KSYM_plus || + key == KSYM_0) && + ((GetKeyModState() & KMOD_Control) || + (GetKeyModState() & KMOD_Alt)) && + video.window_scaling_available && !video.fullscreen_enabled) { if (key == KSYM_0) -- 2.34.1