mirror of
https://github.com/yann64/haikuports.git
synced 2026-04-22 03:30:05 +02:00
SDLPoP: enable window resize flag and fullscreen mode
This commit is contained in:
@@ -1,24 +1,11 @@
|
||||
From 4f80596d6192cda368d228aaca7fa95840c6eb9b Mon Sep 17 00:00:00 2001
|
||||
From 7920812ef10c49277568618b5be0bab8d119efd9 Mon Sep 17 00:00:00 2001
|
||||
From: Gerasim Troeglazov <3dEyes@gmail.com>
|
||||
Date: Tue, 4 Sep 2018 12:47:13 +1000
|
||||
Subject: Fix build for Haiku
|
||||
Date: Thu, 27 Sep 2018 19:26:28 +1000
|
||||
Subject: Disable haptic init
|
||||
|
||||
|
||||
diff --git a/src/menu.c b/src/menu.c
|
||||
index 3f0e5f9..3720e45 100644
|
||||
--- a/src/menu.c
|
||||
+++ b/src/menu.c
|
||||
@@ -1181,7 +1181,7 @@ void turn_setting_on_off(int setting_id, byte new_state, void* linked) {
|
||||
break;
|
||||
case SETTING_FULLSCREEN:
|
||||
start_fullscreen = new_state;
|
||||
- SDL_SetWindowFullscreen(window_, (new_state != 0) * SDL_WINDOW_FULLSCREEN_DESKTOP);
|
||||
+// SDL_SetWindowFullscreen(window_, (new_state != 0) * SDL_WINDOW_FULLSCREEN_DESKTOP);
|
||||
break;
|
||||
case SETTING_USE_CORRECT_ASPECT_RATIO:
|
||||
use_correct_aspect_ratio = new_state;
|
||||
diff --git a/src/seg009.c b/src/seg009.c
|
||||
index 691954e..e641ba5 100644
|
||||
index 691954e..d5551b0 100644
|
||||
--- a/src/seg009.c
|
||||
+++ b/src/seg009.c
|
||||
@@ -2108,7 +2108,7 @@ void __pascal far set_gr_mode(byte grmode) {
|
||||
@@ -26,35 +13,10 @@ index 691954e..e641ba5 100644
|
||||
#endif
|
||||
if (SDL_Init(SDL_INIT_VIDEO | SDL_INIT_TIMER | SDL_INIT_NOPARACHUTE |
|
||||
- SDL_INIT_GAMECONTROLLER | SDL_INIT_HAPTIC ) != 0) {
|
||||
+ SDL_INIT_GAMECONTROLLER) != 0) {
|
||||
+ SDL_INIT_GAMECONTROLLER ) != 0) {
|
||||
sdlperror("SDL_Init");
|
||||
quit(1);
|
||||
}
|
||||
@@ -2117,7 +2117,7 @@ void __pascal far set_gr_mode(byte grmode) {
|
||||
Uint32 flags = 0;
|
||||
if (!start_fullscreen) start_fullscreen = check_param("full") != NULL;
|
||||
if (start_fullscreen) flags |= SDL_WINDOW_FULLSCREEN_DESKTOP;
|
||||
- flags |= SDL_WINDOW_RESIZABLE;
|
||||
+// flags |= SDL_WINDOW_RESIZABLE;
|
||||
|
||||
// Should use different default window dimensions when using 4:3 aspect ratio
|
||||
if (use_correct_aspect_ratio && pop_window_width == 640 && pop_window_height == 400) {
|
||||
@@ -2788,6 +2788,7 @@ void __pascal start_timer(int timer_index, int length) {
|
||||
}
|
||||
|
||||
void toggle_fullscreen() {
|
||||
+#ifndef __HAIKU__
|
||||
uint32_t flags = SDL_GetWindowFlags(window_);
|
||||
if (flags & SDL_WINDOW_FULLSCREEN_DESKTOP) {
|
||||
SDL_SetWindowFullscreen(window_, 0);
|
||||
@@ -2797,6 +2798,7 @@ void toggle_fullscreen() {
|
||||
SDL_SetWindowFullscreen(window_, SDL_WINDOW_FULLSCREEN_DESKTOP);
|
||||
SDL_ShowCursor(SDL_DISABLE);
|
||||
}
|
||||
+#endif
|
||||
}
|
||||
|
||||
bool ignore_tab = false;
|
||||
--
|
||||
2.16.4
|
||||
2.19.0
|
||||
|
||||
|
||||
@@ -4,7 +4,7 @@ It is based on a disassembly of the DOS version, and uses SDL."
|
||||
HOMEPAGE="http://www.princed.org/"
|
||||
COPYRIGHT="Dávid Nagy"
|
||||
LICENSE="GNU GPL v3"
|
||||
REVISION="2"
|
||||
REVISION="3"
|
||||
SOURCE_URI="https://github.com/NagyD/SDLPoP/archive/v$portVersion.tar.gz"
|
||||
CHECKSUM_SHA256="8032c47fad4b73021d636ead510bbc1ab5106cff77103e331ad0f32a49a13946"
|
||||
SOURCE_DIR="SDLPoP-$portVersion"
|
||||
|
||||
Reference in New Issue
Block a user