Skip to content

fix issue #42 #43

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

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

fix issue #42 #43

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
037b5ab
fix zombie
c-xk Jun 1, 2025
95ec8a9
remove comments
c-xk Jun 1, 2025
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
82 changes: 56 additions & 26 deletions src/main/java/com/jthemedetecor/GnomeThemeDetector.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,15 @@ class GnomeThemeDetector extends OsThemeDetector {

private volatile DetectorThread detectorThread;

GnomeThemeDetector() {
Runtime.getRuntime().addShutdownHook(new Thread(() -> {
if (detectorThread != null) {
detectorThread.destroyProcess();
detectorThread.interrupt();
}
}));
}

@Override
public boolean isDark() {
try {
Expand Down Expand Up @@ -91,8 +100,9 @@ public synchronized void registerListener(@NotNull Consumer<Boolean> darkThemeLi
@Override
public synchronized void removeListener(@Nullable Consumer<Boolean> darkThemeListener) {
listeners.remove(darkThemeListener);
if (listeners.isEmpty()) {
this.detectorThread.interrupt();
if (listeners.isEmpty() && detectorThread != null) {
detectorThread.destroyProcess();
detectorThread.interrupt();
this.detectorThread = null;
}
}
Expand All @@ -105,6 +115,7 @@ private static final class DetectorThread extends Thread {
private final GnomeThemeDetector detector;
private final Pattern outputPattern = Pattern.compile("(gtk-theme|color-scheme).*", Pattern.CASE_INSENSITIVE);
private boolean lastValue;
private volatile Process monitoringProcess;

DetectorThread(@NotNull GnomeThemeDetector detector) {
this.detector = detector;
Expand All @@ -114,41 +125,60 @@ private static final class DetectorThread extends Thread {
this.setPriority(Thread.NORM_PRIORITY - 1);
}

public void destroyProcess() {
Process process = monitoringProcess;
if (process != null && process.isAlive()) {
process.destroy();
logger.debug("Monitoring process destroyed by external call");
}
}

@Override
public void run() {
try {
Runtime runtime = Runtime.getRuntime();
Process monitoringProcess = runtime.exec(MONITORING_CMD);
monitoringProcess = runtime.exec(MONITORING_CMD);
try (BufferedReader reader = new BufferedReader(new InputStreamReader(monitoringProcess.getInputStream()))) {
while (!this.isInterrupted()) {
//Expected input = gtk-theme: '$GtkThemeName'
String readLine = reader.readLine();

// reader.readLine sometimes returns null on application shutdown.
if (readLine == null) {
continue;
}

if (!outputPattern.matcher(readLine).matches()) {
continue;
}
String[] keyValue = readLine.split("\\s");
String value = keyValue[1];
boolean currentDetection = detector.isDarkTheme(value);
logger.debug("Theme changed detection, dark: {}", currentDetection);
if (currentDetection != lastValue) {
lastValue = currentDetection;
for (Consumer<Boolean> listener : detector.listeners) {
try {
listener.accept(currentDetection);
} catch (RuntimeException e) {
logger.error("Caught exception during listener notifying ", e);
try {
//Expected input = gtk-theme: '$GtkThemeName'
String readLine = reader.readLine();

// reader.readLine sometimes returns null on application shutdown.
if (readLine == null) {
if (monitoringProcess.isAlive()) {
continue;
} else {
break;
}
}

if (!outputPattern.matcher(readLine).matches()) {
continue;
}
String[] keyValue = readLine.split("\\s");
String value = keyValue[1];
boolean currentDetection = detector.isDarkTheme(value);
logger.debug("Theme changed detection, dark: {}", currentDetection);
if (currentDetection != lastValue) {
lastValue = currentDetection;
for (Consumer<Boolean> listener : detector.listeners) {
try {
listener.accept(currentDetection);
} catch (RuntimeException e) {
logger.error("Caught exception during listener notifying ", e);
}
}
}
} catch (IOException e) {
if (this.isInterrupted() || monitoringProcess == null || !monitoringProcess.isAlive()) {
break;
}
logger.error("Error reading from monitoring process: ", e);
}
}
logger.debug("ThemeDetectorThread has been interrupted!");
if (monitoringProcess.isAlive()) {
if (monitoringProcess != null && monitoringProcess.isAlive()) {
monitoringProcess.destroy();
logger.debug("Monitoring process has been destroyed!");
}
Expand Down