replace SDL_HINT_ANDROID_SEPARATE_MOUSE_AND_TOUCH with

SDL_HINT_MOUSE_TOUCH_EVENTS and SDL_HINT_TOUCH_MOUSE_EVENTS per sdl2
2.0.10 update instructions.

From thfr@, ok bcallah@
This commit is contained in:
naddy 2019-10-01 17:58:40 +00:00
parent 0301135bd8
commit fc8b95c675
4 changed files with 42 additions and 3 deletions

View File

@ -1,8 +1,8 @@
# $OpenBSD: Makefile,v 1.6 2019/06/06 18:29:47 bcallah Exp $
# $OpenBSD: Makefile,v 1.7 2019/10/01 17:58:40 naddy Exp $
COMMENT = free clone of Dink Smallwood game
DISTNAME = freedink-109.6
REVISION = 2
REVISION = 3
WANTLIB += ${COMPILER_LIBCXX} SDL2 SDL2_gfx-1.0 SDL2_image SDL2_mixer
WANTLIB += SDL2_ttf c fontconfig freetype iconv intl m z

View File

@ -0,0 +1,19 @@
$OpenBSD: patch-src_input_cpp,v 1.1 2019/10/01 17:58:40 naddy Exp $
replace SDL_HINT_ANDROID_SEPARATE_MOUSE_AND_TOUCH with
SDL_HINT_MOUSE_TOUCH_EVENTS and SDL_HINT_TOUCH_MOUSE_EVENTS per sdl2
2.0.10 update instructions.
Index: src/input.cpp
--- src/input.cpp.orig
+++ src/input.cpp
@@ -91,7 +91,8 @@ void input_init(void)
// TODO: don't attempt to simulate mouse events from touch events -
// fake mouse events often are de-centered
- SDL_SetHint(SDL_HINT_ANDROID_SEPARATE_MOUSE_AND_TOUCH, "0");
+ SDL_SetHint(SDL_HINT_MOUSE_TOUCH_EVENTS, "1");
+ SDL_SetHint(SDL_HINT_TOUCH_MOUSE_EVENTS, "1");
/* Touch devices */
{

View File

@ -1,8 +1,9 @@
# $OpenBSD: Makefile,v 1.8 2019/07/12 20:46:20 sthen Exp $
# $OpenBSD: Makefile,v 1.9 2019/10/01 17:58:40 naddy Exp $
V = 1.1.0
COMMENT = open source re-implementation of Caesar III game engine
DISTNAME = julius-${V}
REVISION = 0
EXTRACT_SUFX = -source.tar.gz
CATEGORIES = games x11

View File

@ -0,0 +1,19 @@
$OpenBSD: patch-src_platform_julius_c,v 1.5 2019/10/01 17:58:40 naddy Exp $
replace SDL_HINT_ANDROID_SEPARATE_MOUSE_AND_TOUCH with
SDL_HINT_MOUSE_TOUCH_EVENTS and SDL_HINT_TOUCH_MOUSE_EVENTS per sdl2
2.0.10 update instructions.
Index: src/platform/julius.c
--- src/platform/julius.c.orig
+++ src/platform/julius.c
@@ -369,7 +369,8 @@ static int init_sdl(void)
return 0;
}
#if SDL_VERSION_ATLEAST(2, 0, 4)
- SDL_SetHint(SDL_HINT_ANDROID_SEPARATE_MOUSE_AND_TOUCH, "1");
+ SDL_SetHint(SDL_HINT_MOUSE_TOUCH_EVENTS, "0");
+ SDL_SetHint(SDL_HINT_TOUCH_MOUSE_EVENTS, "0");
#endif
SDL_Log("SDL initialized");
return 1;