From ff8a2d6cca146b669090b5010ddc9ffc56d037a0 Mon Sep 17 00:00:00 2001 From: polkaulfield Date: Tue, 31 Jan 2023 00:24:38 +0100 Subject: [PATCH 1/2] Added dirty patch to enable true fullscreen on the device display. --- .../main/java/com/termux/x11/MainActivity.java | 4 ++++ .../termux/x11/TermuxX11StarterReceiver.java | 5 ++++- app/src/main/res/values/styles.xml | 18 +++++++----------- 3 files changed, 15 insertions(+), 12 deletions(-) diff --git a/app/src/main/java/com/termux/x11/MainActivity.java b/app/src/main/java/com/termux/x11/MainActivity.java index 196024fca..26609982b 100644 --- a/app/src/main/java/com/termux/x11/MainActivity.java +++ b/app/src/main/java/com/termux/x11/MainActivity.java @@ -41,9 +41,13 @@ public class MainActivity extends AppCompatActivity { protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); + /* if (didRequestLaunchExternalDisplay()) { setFullScreenForExternalDisplay(); } + */ + // Do it anyways + setFullScreenForExternalDisplay(); LorieService.setMainActivity(this); LorieService.start(LorieService.ACTION_START_FROM_ACTIVITY); diff --git a/app/src/main/java/com/termux/x11/TermuxX11StarterReceiver.java b/app/src/main/java/com/termux/x11/TermuxX11StarterReceiver.java index a024e8f20..f995738cb 100644 --- a/app/src/main/java/com/termux/x11/TermuxX11StarterReceiver.java +++ b/app/src/main/java/com/termux/x11/TermuxX11StarterReceiver.java @@ -68,13 +68,16 @@ private Bundle createLaunchParams(Intent launchIntent) { @Nullable private Display findExternalDisplay() { DisplayManagerCompat displayManager = DisplayManagerCompat.getInstance(this); + Display fallbackDisplay = null; for (Display display : displayManager.getDisplays()) { // id 0 is built-in screen + fallbackDisplay = display; if (display.getDisplayId() != 0) { return display; } } - return null; + //fallback to + return fallbackDisplay; } /** diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index 3c3429ae4..69c51508e 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -2,20 +2,16 @@ From 87aa223787311ba617b42f066570820b663d5c6e Mon Sep 17 00:00:00 2001 From: polkaulfield Date: Tue, 31 Jan 2023 14:30:10 +0100 Subject: [PATCH 2/2] Fixed the app hanging after exiting an X11 session. --- app/src/main/java/com/termux/x11/TermuxX11StarterReceiver.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/app/src/main/java/com/termux/x11/TermuxX11StarterReceiver.java b/app/src/main/java/com/termux/x11/TermuxX11StarterReceiver.java index f995738cb..c028dff3f 100644 --- a/app/src/main/java/com/termux/x11/TermuxX11StarterReceiver.java +++ b/app/src/main/java/com/termux/x11/TermuxX11StarterReceiver.java @@ -153,6 +153,8 @@ private void handleIntent(Intent intent) { try { svc.finish(); + // Finish activities so the app doesnt get bugged after stopping the service + finishAffinity(); } catch (RemoteException e) { e.printStackTrace(); }