dorkbox/SystemTray
2
1
Fork 1
Code Issues Pull Requests Releases 5 Wiki Activity

Fixed issue with GTK enter/leave thread and the main loop

Browse Source
This commit is contained in:
nathan 2015-01-22 03:24:18 +01:00
parent bf1776ed89
commit 0065cb259a
2 changed files with 2 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/dorkbox/util/tray/linux/AppIndicatorTray.java
View File

@ -19,14 +19,12 @@ import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.concurrent.CountDownLatch;
import com.sun.jna.Pointer;
import dorkbox.util.jna.linux.AppIndicator;
import dorkbox.util.jna.linux.Gobject;
import dorkbox.util.jna.linux.Gtk;
import dorkbox.util.jna.linux.GtkSupport;
import dorkbox.util.tray.SystemTray;
import dorkbox.util.tray.SystemTrayMenuAction;
@ -40,13 +38,10 @@ import dorkbox.util.tray.SystemTrayMenuAction;
* Lantern: https://github.com/getlantern/lantern/ Apache 2.0 License Copyright 2010 Brave New Software Project, Inc.
*/
public class AppIndicatorTray extends SystemTray {
private static final boolean useSWT = GtkSupport.usesSwtMainLoop;
private static final AppIndicator libappindicator = AppIndicator.INSTANCE;
private static final Gobject libgobject = Gobject.INSTANCE;
private static final Gtk libgtk = Gtk.INSTANCE;
private final CountDownLatch blockUntilStarted = new CountDownLatch(1);
private final Map<String, MenuEntry> menuEntries = new HashMap<String, MenuEntry>(2);
private volatile AppIndicator.AppIndicatorInstanceStruct appIndicator;
@ -101,25 +96,7 @@ public class AppIndicatorTray extends SystemTray {
libgtk.gdk_threads_leave();
if (!useSWT) {
Thread gtkUpdateThread = new Thread() {
@Override
public void run() {
// notify our main thread to continue
AppIndicatorTray.this.blockUntilStarted.countDown();
libgtk.gtk_main();
}
};
gtkUpdateThread.setName("GTK event loop");
gtkUpdateThread.start();
}
// we CANNOT continue until the GTK thread has started! (ignored if SWT is used)
try {
this.blockUntilStarted.await();
this.active = true;
} catch (InterruptedException ignored) {
}
this.active = true;
}
@Override

24
src/dorkbox/util/tray/linux/GtkSystemTray.java
View File

@ -22,7 +22,6 @@ import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.concurrent.CountDownLatch;
import javax.swing.JMenuItem;
@ -32,7 +31,6 @@ import dorkbox.util.SwingUtil;
import dorkbox.util.jna.linux.Gobject;
import dorkbox.util.jna.linux.Gtk;
import dorkbox.util.jna.linux.Gtk.GdkEventButton;
import dorkbox.util.jna.linux.GtkSupport;
import dorkbox.util.tray.SystemTray;
import dorkbox.util.tray.SystemTrayMenuAction;
import dorkbox.util.tray.SystemTrayMenuPopup;
@ -43,11 +41,9 @@ import dorkbox.util.tray.SystemTrayMenuPopup;
* This is the "old" way to do it, and does not work with some desktop environments.
*/
public class GtkSystemTray extends SystemTray {
private static final boolean useSWT = GtkSupport.usesSwtMainLoop;
private static final Gobject libgobject = Gobject.INSTANCE;
private static final Gtk libgtk = Gtk.INSTANCE;
private final CountDownLatch blockUntilStarted = new CountDownLatch(1);
private final Map<String, JMenuItem> menuEntries = new HashMap<String, JMenuItem>(2);
private volatile SystemTrayMenuPopup jmenu;
@ -122,25 +118,7 @@ public class GtkSystemTray extends SystemTray {
}
});
if (!useSWT) {
Thread gtkUpdateThread = new Thread() {
@Override
public void run() {
// notify our main thread to continue
GtkSystemTray.this.blockUntilStarted.countDown();
libgtk.gtk_main();
}
};
gtkUpdateThread.setName("GTK event loop");
gtkUpdateThread.start();
}
// we CANNOT continue until the GTK thread has started! (ignored if SWT is used)
try {
this.blockUntilStarted.await();
this.active = true;
} catch (InterruptedException ignored) {
}
this.active = true;
}
@Override