dorkbox/Utilities
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Added back threads. They now happen ONLY in GtkSupport

Browse Source
This commit is contained in:
nathan 2016-02-12 14:24:19 +01:00
parent b81995ab2b
commit ebc849f9d0
2 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Dorkbox-Util/src/dorkbox/util/jna/linux/Gtk.java
View File

@ -83,6 +83,8 @@ public interface Gtk extends Library {
void gtk_main_quit();
void gdk_threads_init();
void gdk_threads_enter();
void gdk_threads_leave();
Pointer gtk_menu_new();
Pointer gtk_menu_item_new();

21
Dorkbox-Util/src/dorkbox/util/jna/linux/GtkSupport.java
View File

@ -34,8 +34,8 @@ class GtkSupport {
private static volatile Thread gtkDispatchThread;
@Property
/** Disables the GTK event loop, if you are already creating one in SWT/etc. */
public static boolean DISABLE_EVENT_LOOP = false;
/** Enables/Disables the creation of a native GTK event loop. Useful if you are already creating one via SWT/etc. */
public static boolean CREATE_EVENT_LOOP = true;
static {
boolean hasSupport = false;
@ -59,10 +59,15 @@ class GtkSupport {
@Override
public
void run() {
final Gtk gtk = Gtk.INSTANCE;
while (started) {
try {
final Runnable take = dispatchEvents.take();
gtk.gdk_threads_enter();
take.run();
gtk.gdk_threads_leave();
} catch (InterruptedException e) {
e.printStackTrace();
}
@ -73,7 +78,7 @@ class GtkSupport {
gtkDispatchThread.start();
if (!DISABLE_EVENT_LOOP) {
if (CREATE_EVENT_LOOP) {
// startup the GTK GUI event loop. There can be multiple/nested loops.
final CountDownLatch blockUntilStarted = new CountDownLatch(1);
Thread gtkUpdateThread = new Thread() {
@ -82,15 +87,15 @@ class GtkSupport {
void run() {
Gtk instance = Gtk.INSTANCE;
// notify our main thread to continue
blockUntilStarted.countDown();
// prep for the event loop.
instance.gdk_threads_init();
instance.gtk_init(0, null);
GThread.INSTANCE.g_thread_init(null);
// notify our main thread to continue
blockUntilStarted.countDown();
// blocks unit quit
instance.gtk_main();
}
};
@ -121,7 +126,7 @@ class GtkSupport {
public static
void shutdownGui() {
if (!DISABLE_EVENT_LOOP) {
if (CREATE_EVENT_LOOP) {
Gtk.INSTANCE.gtk_main_quit();
}