这是indexloc提供的服务，不要输入任何密码
Skip to content

Fixed termux-x11 hanging after closing the X11 session and enabled fullscreen as fallback. #204

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 3 commits into from
Closed

Fixed termux-x11 hanging after closing the X11 session and enabled fullscreen as fallback. #204

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ff8a2d6
Added dirty patch to enable true fullscreen on the device display.
Jan 30, 2023
87aa223
Fixed the app hanging after exiting an X11 session.
Jan 31, 2023
89b399f
Merge branch 'termux:master' into master
Jan 31, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions app/src/main/java/com/termux/x11/MainActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
7 changes: 6 additions & 1 deletion app/src/main/java/com/termux/x11/TermuxX11StarterReceiver.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}

/**
Expand Down Expand Up @@ -150,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();
}
Expand Down
18 changes: 7 additions & 11 deletions app/src/main/res/values/styles.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,20 +2,16 @@

<!-- Base application theme. -->
<style name="AppTheme" parent="Theme.AppCompat.Light.NoActionBar">
<!-- Customize your theme here. -->
<item name="colorPrimary">@color/colorPrimary</item>
<item name="colorPrimaryDark">@color/colorPrimaryDark</item>
<item name="colorAccent">@color/colorAccent</item>
<item name="android:windowTranslucentStatus">true</item>
<item name="android:windowTranslucentNavigation">true</item>
<item name="android:fitsSystemWindows">true</item>
<item name="android:windowNoTitle">true</item>
<item name="android:windowActionBar">false</item>
<item name="android:windowFullscreen">true</item>
<item name="android:windowContentOverlay">@null</item>
</style>
<style name="NoActionBar" parent="Theme.AppCompat.DayNight.NoActionBar">
<item name="android:windowActionBar">false</item>
<item name="android:windowNoTitle">true</item>
<item name="android:windowTranslucentStatus">true</item>
<item name="android:windowTranslucentNavigation">true</item>
<item name="android:fitsSystemWindows">true</item>
<item name="android:windowActionBar">false</item>
<item name="android:windowFullscreen">true</item>
<item name="android:windowContentOverlay">@null</item>
</style>

<!-- For use w/ external displays to be able to use entire display surface area -->
Expand Down