Mercurial > hg > toolkit / changeset

--- a/ui/motif/toolkit.c	Sun Nov 23 10:12:42 2025 +0100
+++ b/ui/motif/toolkit.c	Sun Nov 23 10:23:10 2025 +0100
@@ -84,13 +84,15 @@
 	NULL
 };
 
+static String *fallback_resources = fallback;
+
 void input_proc(XtPointer data, int *source, XtInputId *iid) {
     void *ptr;
     read(event_pipe[0], &ptr, sizeof(void*));
 }
 
-void ui_motif_set_fallback_resources(String fallbackres[]) {
-    fallback = fallbackres;
+void ui_motif_set_fallback_resources(String *fallbackres) {
+    fallback_resources = fallbackres;
 }
 
 void ui_init(const char *appname, int argc, char **argv) { 
@@ -100,7 +102,7 @@
     XtToolkitInitialize();
     XtSetLanguageProc(NULL, NULL, NULL);
     app = XtCreateApplicationContext();
-    XtAppSetFallbackResources(app, fallback);
+    XtAppSetFallbackResources(app, fallback_resources);
     
     display =  XtOpenDisplay(app, NULL, appname, appname, NULL, 0, &argc, argv);
     
@@ -224,6 +226,15 @@
     return TRUE;
 }
 
+static Boolean ui_mainthread_job(void *data) {
+    UiJob *job = data;
+    if(job->job_func) {
+        job->job_func(job->job_data);
+    }
+    free(job);
+    return TRUE;
+}
+
 static void* ui_jobthread(void *data) {
     UiJob *job = data;
     int result = job->job_func(job->job_data);
@@ -235,6 +246,15 @@
     return NULL;
 }
 
+void ui_call_mainthread(ui_threadfunc tf, void* td) {
+    UiJob *job = malloc(sizeof(UiJob));
+    memset(job, 0, sizeof(UiJob));
+    job->job_func = tf;
+    job->job_data = td;
+    write(event_pipe[1], &job, sizeof(void*)); // hack
+    XtAppAddWorkProc(app, ui_mainthread_job, job);
+}
+
 void ui_job(UiObject *obj, ui_threadfunc tf, void *td, ui_callback f, void *fd) {
     UiJob *job = malloc(sizeof(UiJob));
     job->obj = obj;

--- a/ui/motif/toolkit.h	Sun Nov 23 10:12:42 2025 +0100
+++ b/ui/motif/toolkit.h	Sun Nov 23 10:23:10 2025 +0100
@@ -84,7 +84,7 @@
 
 XtAppContext ui_motif_get_app(void);
 Display* ui_motif_get_display(void);
-void ui_motif_set_fallback_resources(String fallback[]);
+void ui_motif_set_fallback_resources(String *fallback);
 
 void ui_set_active_window(Widget w);
 Widget ui_get_active_window();