[9front] [PATH] drawterm: fix Haiku build for 32-bit x86 and application close

[9front] [PATH] drawterm: fix Haiku build for 32-bit x86 and application close

[宋文武]

[-- Attachment #1: Type: text/plain, Size: 63 bytes --]


Hello, here are 2 small patches for the drawterm Haiku port:


[-- Attachment #2.1: Type: text/plain, Size: 309 bytes --]

from postmaster@9front:
The following attachment had content that we can't
prove to be harmless.  To avoid possible automatic
execution, we changed the content headers.
The original header was:

	Content-Type: text/x-patch
	Content-Disposition: inline;
 filename=0001-haiku-fix-build-for-32-bit-x86-BePC.patch

[-- Attachment #2.2: 0001-haiku-fix-build-for-32-bit-x86-BePC.patch.suspect --]
[-- Type: application/octet-stream, Size: 693 bytes --]

 From 72160fda0eb16c9e19826e823e7d06ddd237bfda Mon Sep 17 00:00:00 2001
From: iyzsong <iyzsong@envs.net>
Date: Fri, 5 Apr 2024 18:50:02 +0800
Subject: [PATCH 1/2] haiku: fix build for 32-bit x86 (BePC)

---
 Make.haiku | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Make.haiku b/Make.haiku
index 707752d..542b2e4 100644
--- a/Make.haiku
+++ b/Make.haiku
@@ -17,5 +17,5 @@ TARG=drawterm
 all: default
 
 libmachdep.a:
-	arch=`uname -m|sed 's/i.86/386/;s/Power Macintosh/power/; s/x86_64/amd64/; s/armv[567].*/arm/; s/aarch64/arm64/'`; \
+	arch=`uname -m|sed 's/BePC/386/; s/x86_64/amd64/; s/armv[567].*/arm/; s/aarch64/arm64/'`; \
 	(cd posix-$$arch &&  make)
-- 
2.41.0



[-- Attachment #3.1: Type: text/plain, Size: 311 bytes --]

from postmaster@9front:
The following attachment had content that we can't
prove to be harmless.  To avoid possible automatic
execution, we changed the content headers.
The original header was:

	Content-Type: text/x-patch
	Content-Disposition: inline;
 filename=0002-haiku-fix-application-close-via-ALT-Q.patch

[-- Attachment #3.2: 0002-haiku-fix-application-close-via-ALT-Q.patch.suspect --]
[-- Type: application/octet-stream, Size: 690 bytes --]

 From 646451e4a9122eca3964ff72df5df20ac8a5bd68 Mon Sep 17 00:00:00 2001
From: iyzsong <iyzsong@envs.net>
Date: Fri, 5 Apr 2024 18:54:09 +0800
Subject: [PATCH 2/2] haiku: fix application close (via ALT+Q)

---
 gui-haiku/screen.cpp | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/gui-haiku/screen.cpp b/gui-haiku/screen.cpp
index 55980da..a99d83d 100644
--- a/gui-haiku/screen.cpp
+++ b/gui-haiku/screen.cpp
@@ -251,6 +251,12 @@ public:
     view->MakeFocus();
     window->Show();
   }
+
+  bool QuitRequested() override {
+    BMessage message(B_QUIT_REQUESTED);
+    window->PostMessage(&message);
+    return true;
+  }
 };
 #define sApp ((Application *)be_app)
 
-- 
2.41.0



[-- Attachment #4: Type: text/plain, Size: 10 bytes --]



Thanks!

Re: [9front] [PATH] drawterm: fix Haiku build for 32-bit x86 and application close

[Jacob Moody]

Both have been applied, thank you.