TnSb/wofi
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Async launch is now only used for dbus launching

Browse Source
This commit is contained in:
Scoopta 2020-11-12 17:50:42 -08:00
parent 4c64259b3a
commit 3f0eb0882b
1 changed files with 26 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
modes/drun.c
View File

@ -373,6 +373,21 @@ struct widget* wofi_drun_get_widget(void) {
return NULL; return NULL;
} }
static void launch_done(GObject* obj, GAsyncResult* result, gpointer data) {
GError* err = NULL;
if(g_app_info_launch_uris_finish(G_APP_INFO(obj), result, &err)) {
exit(0);
} else if(err != NULL) {
char* cmd = data;
fprintf(stderr, "%s cannot be executed: %s\n", cmd, err->message);
g_error_free(err);
} else {
char* cmd = data;
fprintf(stderr, "%s cannot be executed\n", cmd);
}
exit(1);
}
static void set_dri_prime(GDesktopAppInfo* info) { static void set_dri_prime(GDesktopAppInfo* info) {
bool dri_prime = g_desktop_app_info_get_boolean(info, "PrefersNonDefaultGPU"); bool dri_prime = g_desktop_app_info_get_boolean(info, "PrefersNonDefaultGPU");
if(dri_prime) { if(dri_prime) {
@ -380,6 +395,10 @@ static void set_dri_prime(GDesktopAppInfo* info) {
} }
} }
static bool uses_dbus(GDesktopAppInfo* info) {
return g_desktop_app_info_get_boolean(info, "DBusActivatable");
}
void wofi_drun_exec(const gchar* cmd) { void wofi_drun_exec(const gchar* cmd) {
GDesktopAppInfo* info = g_desktop_app_info_new_from_filename(cmd); GDesktopAppInfo* info = g_desktop_app_info_new_from_filename(cmd);
if(G_IS_DESKTOP_APP_INFO(info)) { if(G_IS_DESKTOP_APP_INFO(info)) {
@ -389,7 +408,12 @@ void wofi_drun_exec(const gchar* cmd) {
exit(0); exit(0);
} else { } else {
set_dri_prime(info); set_dri_prime(info);
g_app_info_launch_uris(G_APP_INFO(info), NULL, NULL, NULL); if(uses_dbus(info)) {
g_app_info_launch_uris_async(G_APP_INFO(info), NULL, NULL, NULL, launch_done, (gchar*) cmd);
} else {
g_app_info_launch_uris(G_APP_INFO(info), NULL, NULL, NULL);
exit(0);
}
} }
} else if(strrchr(cmd, ' ') != NULL) { } else if(strrchr(cmd, ' ') != NULL) {
char* space = strrchr(cmd, ' '); char* space = strrchr(cmd, ' ');
@ -403,13 +427,12 @@ void wofi_drun_exec(const gchar* cmd) {
} else { } else {
set_dri_prime(info); set_dri_prime(info);
g_desktop_app_info_launch_action(info, action, NULL); g_desktop_app_info_launch_action(info, action, NULL);
exit(0);
} }
} else { } else {
fprintf(stderr, "%s cannot be executed\n", cmd); fprintf(stderr, "%s cannot be executed\n", cmd);
exit(1); exit(1);
} }
utils_sleep_millis(200);
exit(0);
} }
const char** wofi_drun_get_arg_names(void) { const char** wofi_drun_get_arg_names(void) {