video(wayland): use both --icon and --icon-name for Zenity (#7897) video(wayland): use both --icon and --icon-name for Zenity Many distros ship an older version of Zenity that supports GTK3, while some distros ship newer version of Zenity which uses libadwaita. This command tries to use --icon and fall back to --icon-name when it fails. (cherry picked from commit b90343e512bb7e8a026b3f78947c67693c63ff0c)
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 343 344 345 346 347 348 349 350
diff --git a/src/video/wayland/SDL_waylandmessagebox.c b/src/video/wayland/SDL_waylandmessagebox.c
index f19bf3e..24bc21a 100644
--- a/src/video/wayland/SDL_waylandmessagebox.c
+++ b/src/video/wayland/SDL_waylandmessagebox.c
@@ -33,160 +33,218 @@
#include "SDL_waylandmessagebox.h"
+#define ZENITY_VERSION_LEN 32 /* Number of bytes to read from zenity --version (including NUL)*/
+
#define MAX_BUTTONS 8 /* Maximum number of buttons supported */
-int Wayland_ShowMessageBox(const SDL_MessageBoxData *messageboxdata, int *buttonid)
-{
- int fd_pipe[2]; /* fd_pipe[0]: read end of pipe, fd_pipe[1]: write end of pipe */
+static int run_zenity(const char **args, int fd_pipe[2]) {
+ int status;
pid_t pid1;
+ pid1 = fork();
+ if (pid1 == 0) { /* child process */
+ close(fd_pipe[0]); /* no reading from pipe */
+ /* write stdout in pipe */
+ if (dup2(fd_pipe[1], STDOUT_FILENO) == -1) {
+ _exit(128);
+ }
+
+ /* const casting argv is fine:
+ * https://pubs.opengroup.org/onlinepubs/9699919799/functions/fexecve.html -> rational
+ */
+ execvp("zenity", (char **)args);
+ _exit(129);
+ } else if (pid1 < 0) { /* fork() failed */
+ return SDL_SetError("fork() failed: %s", strerror(errno));
+ } else { /* parent process */
+ close(fd_pipe[1]); /* no writing to the pipe */
+ if (waitpid(pid1, &status, 0) != pid1) {
+ return SDL_SetError("Waiting on zenity failed: %s", strerror(errno));
+ }
+
+ if (!WIFEXITED(status)) {
+ return SDL_SetError("zenity failed for some reason");
+ }
+
+ if (WEXITSTATUS(status) >= 128) {
+ return SDL_SetError("zenity reported error or failed to launch: %d", WEXITSTATUS(status));
+ }
+
+ return 0; /* success! */
+ }
+}
+
+static int get_zenity_version(int *major, int *minor) {
+ int fd_pipe[2]; /* fd_pipe[0]: read end of pipe, fd_pipe[1]: write end of pipe */
+ const char *argv[] = { "zenity", "--version", NULL };
+
+ if (pipe(fd_pipe) != 0) { /* create a pipe */
+ return SDL_SetError("pipe() failed: %s", strerror(errno));
+ }
+
+ if (run_zenity(argv, fd_pipe) == 0) {
+ FILE *outputfp = NULL;
+ char version_str[ZENITY_VERSION_LEN];
+ char *version_ptr = NULL, *end_ptr = NULL;
+ int tmp;
+
+ outputfp = fdopen(fd_pipe[0], "r");
+ if (outputfp == NULL) {
+ close(fd_pipe[0]);
+ return SDL_SetError("failed to open pipe for reading: %s", strerror(errno));
+ }
+
+ version_ptr = fgets(version_str, ZENITY_VERSION_LEN, outputfp);
+ (void)fclose(outputfp); /* will close underlying fd */
+
+ /* we expect the version string is in the form of MAJOR.MINOR.MICRO
+ * as described in meson.build. We'll ignore everything after that.
+ */
+ tmp = (int) SDL_strtol(version_ptr, &end_ptr, 10);
+ if (tmp == 0 && end_ptr == version_ptr) {
+ return SDL_SetError("failed to get zenity major version number");
+ }
+ *major = tmp;
+
+ version_ptr = end_ptr + 1; /* skip the dot */
+ tmp = (int) SDL_strtol(version_ptr, &end_ptr, 10);
+ if (tmp == 0 && end_ptr == version_ptr) {
+ return SDL_SetError("failed to get zenity minor version number");
+ }
+ *minor = tmp;
+
+ return 0; /* success */
+ }
+
+ close(fd_pipe[0]);
+ close(fd_pipe[1]);
+ return -1; /* run_zenity should've called SDL_SetError() */
+}
+
+int Wayland_ShowMessageBox(const SDL_MessageBoxData *messageboxdata, int *buttonid) {
+ int fd_pipe[2]; /* fd_pipe[0]: read end of pipe, fd_pipe[1]: write end of pipe */
+ int zenity_major = 0, zenity_minor = 0, output_len = 0;
+ int argc = 5, i;
+ const char *argv[5 + 2 /* icon name */ + 2 /* title */ + 2 /* message */ + 2 * MAX_BUTTONS + 1 /* NULL */] = {
+ "zenity", "--question", "--switch", "--no-wrap", "--no-markup"
+ };
+
if (messageboxdata->numbuttons > MAX_BUTTONS) {
return SDL_SetError("Too many buttons (%d max allowed)", MAX_BUTTONS);
}
+ /* get zenity version so we know which arg to use */
+ if (get_zenity_version(&zenity_major, &zenity_minor) != 0) {
+ return -1; /* get_zenity_version() calls SDL_SetError(), so message is already set */
+ }
+
if (pipe(fd_pipe) != 0) { /* create a pipe */
return SDL_SetError("pipe() failed: %s", strerror(errno));
}
- pid1 = fork();
- if (pid1 == 0) { /* child process */
- int argc = 5, i;
- const char *argv[5 + 2 /* icon name */ + 2 /* title */ + 2 /* message */ + 2 * MAX_BUTTONS + 1 /* NULL */] = {
- "zenity", "--question", "--switch", "--no-wrap", "--no-markup"
- };
+ /* https://gitlab.gnome.org/GNOME/zenity/-/commit/c686bdb1b45e95acf010efd9ca0c75527fbb4dea
+ * This commit removed --icon-name without adding a deprecation notice.
+ * We need to handle it gracefully, otherwise no message box will be shown.
+ */
+ argv[argc++] = zenity_major > 3 || (zenity_major == 3 && zenity_minor >= 90) ? "--icon" : "--icon-name";
+ switch (messageboxdata->flags) {
+ case SDL_MESSAGEBOX_ERROR:
+ argv[argc++] = "dialog-error";
+ break;
+ case SDL_MESSAGEBOX_WARNING:
+ argv[argc++] = "dialog-warning";
+ break;
+ case SDL_MESSAGEBOX_INFORMATION:
+ default:
+ argv[argc++] = "dialog-information";
+ break;
+ }
- close(fd_pipe[0]); /* no reading from pipe */
- /* write stdout in pipe */
- if (dup2(fd_pipe[1], STDOUT_FILENO) == -1) {
- _exit(128);
+ if (messageboxdata->title && messageboxdata->title[0]) {
+ argv[argc++] = "--title";
+ argv[argc++] = messageboxdata->title;
+ } else {
+ argv[argc++] = "--title=\"\"";
+ }
+
+ if (messageboxdata->message && messageboxdata->message[0]) {
+ argv[argc++] = "--text";
+ argv[argc++] = messageboxdata->message;
+ } else {
+ argv[argc++] = "--text=\"\"";
+ }
+
+ for (i = 0; i < messageboxdata->numbuttons; ++i) {
+ if (messageboxdata->buttons[i].text && messageboxdata->buttons[i].text[0]) {
+ int len = SDL_strlen(messageboxdata->buttons[i].text);
+ if (len > output_len) {
+ output_len = len;
+ }
+
+ argv[argc++] = "--extra-button";
+ argv[argc++] = messageboxdata->buttons[i].text;
+ } else {
+ argv[argc++] = "--extra-button=\"\"";
}
+ }
+ argv[argc] = NULL;
+
+ if (run_zenity(argv, fd_pipe) == 0) {
+ FILE *outputfp = NULL;
+ char *output = NULL;
+ char *tmp = NULL;
- argv[argc++] = "--icon-name";
- switch (messageboxdata->flags) {
- case SDL_MESSAGEBOX_ERROR:
- argv[argc++] = "dialog-error";
- break;
- case SDL_MESSAGEBOX_WARNING:
- argv[argc++] = "dialog-warning";
- break;
- case SDL_MESSAGEBOX_INFORMATION:
- default:
- argv[argc++] = "dialog-information";
- break;
+ if (buttonid == NULL) {
+ /* if we don't need buttonid, we can return immediately */
+ close(fd_pipe[0]);
+ return 0; /* success */
}
+ *buttonid = -1;
- if (messageboxdata->title && messageboxdata->title[0]) {
- argv[argc++] = "--title";
- argv[argc++] = messageboxdata->title;
- } else {
- argv[argc++] = "--title=\"\"";
+ output = SDL_malloc(output_len + 1);
+ if (output == NULL) {
+ close(fd_pipe[0]);
+ return SDL_OutOfMemory();
}
+ output[0] = '\0';
- if (messageboxdata->message && messageboxdata->message[0]) {
- argv[argc++] = "--text";
- argv[argc++] = messageboxdata->message;
- } else {
- argv[argc++] = "--text=\"\"";
+ outputfp = fdopen(fd_pipe[0], "r");
+ if (outputfp == NULL) {
+ SDL_free(output);
+ close(fd_pipe[0]);
+ return SDL_SetError("Couldn't open pipe for reading: %s", strerror(errno));
}
+ tmp = fgets(output, output_len + 1, outputfp);
+ (void)fclose(outputfp);
- for (i = 0; i < messageboxdata->numbuttons; ++i) {
- if (messageboxdata->buttons[i].text && messageboxdata->buttons[i].text[0]) {
- argv[argc++] = "--extra-button";
- argv[argc++] = messageboxdata->buttons[i].text;
- } else {
- argv[argc++] = "--extra-button=\"\"";
- }
+ if ((tmp == NULL) || (*tmp == '\0') || (*tmp == '\n')) {
+ SDL_free(output);
+ return 0; /* User simply closed the dialog */
}
- argv[argc] = NULL;
- /* const casting argv is fine:
- * https://pubs.opengroup.org/onlinepubs/9699919799/functions/fexecve.html -> rational
- */
- execvp("zenity", (char **)argv);
- _exit(129);
- } else if (pid1 < 0) {
- close(fd_pipe[0]);
- close(fd_pipe[1]);
- return SDL_SetError("fork() failed: %s", strerror(errno));
- } else {
- int status;
- if (waitpid(pid1, &status, 0) == pid1) {
- if (WIFEXITED(status)) {
- if (WEXITSTATUS(status) < 128) {
- int i;
- size_t output_len = 1;
- char *output = NULL;
- char *tmp = NULL;
- FILE *outputfp = NULL;
-
- close(fd_pipe[1]); /* no writing to pipe */
- /* At this point, if no button ID is needed, we can just bail as soon as the
- * process has completed.
- */
- if (buttonid == NULL) {
- close(fd_pipe[0]);
- return 0;
- }
- *buttonid = -1;
-
- /* find button with longest text */
- for (i = 0; i < messageboxdata->numbuttons; ++i) {
- if (messageboxdata->buttons[i].text != NULL) {
- const size_t button_len = SDL_strlen(messageboxdata->buttons[i].text);
- if (button_len > output_len) {
- output_len = button_len;
- }
- }
- }
- output = SDL_malloc(output_len + 1);
- if (output == NULL) {
- close(fd_pipe[0]);
- return SDL_OutOfMemory();
- }
- output[0] = '\0';
-
- outputfp = fdopen(fd_pipe[0], "r");
- if (outputfp == NULL) {
- SDL_free(output);
- close(fd_pipe[0]);
- return SDL_SetError("Couldn't open pipe for reading: %s", strerror(errno));
- }
- tmp = fgets(output, output_len + 1, outputfp);
- (void)fclose(outputfp);
-
- if ((tmp == NULL) || (*tmp == '\0') || (*tmp == '\n')) {
- SDL_free(output);
- return 0; /* User simply closed the dialog */
- }
-
- /* It likes to add a newline... */
- tmp = SDL_strrchr(output, '\n');
- if (tmp != NULL) {
- *tmp = '\0';
- }
-
- /* Check which button got pressed */
- for (i = 0; i < messageboxdata->numbuttons; i += 1) {
- if (messageboxdata->buttons[i].text != NULL) {
- if (SDL_strcmp(output, messageboxdata->buttons[i].text) == 0) {
- *buttonid = messageboxdata->buttons[i].buttonid;
- break;
- }
- }
- }
-
- SDL_free(output);
- return 0; /* success! */
- } else {
- return SDL_SetError("zenity reported error or failed to launch: %d", WEXITSTATUS(status));
+ /* It likes to add a newline... */
+ tmp = SDL_strrchr(output, '\n');
+ if (tmp != NULL) {
+ *tmp = '\0';
+ }
+
+ /* Check which button got pressed */
+ for (i = 0; i < messageboxdata->numbuttons; i += 1) {
+ if (messageboxdata->buttons[i].text != NULL) {
+ if (SDL_strcmp(output, messageboxdata->buttons[i].text) == 0) {
+ *buttonid = messageboxdata->buttons[i].buttonid;
+ break;
}
- } else {
- return SDL_SetError("zenity failed for some reason");
}
- } else {
- return SDL_SetError("Waiting on zenity failed: %s", strerror(errno));
}
+
+ SDL_free(output);
+ return 0; /* success! */
}
+
+ close(fd_pipe[0]);
+ close(fd_pipe[1]);
+ return -1; /* run_zenity() calls SDL_SetError(), so message is already set */
}
#endif /* SDL_VIDEO_DRIVER_WAYLAND */