summaryrefslogtreecommitdiffstats
path: root/windows.c
diff options
context:
space:
mode:
authorGravatar Lubomir I. Ivanov <neolit123@gmail.com>2012-10-04 03:44:47 +0300
committerGravatar Dirk Hohndel <dirk@hohndel.org>2012-10-04 03:12:19 -0700
commitf928be5061744bb38c3aff8ea41dbd0c42851cbc (patch)
tree6aee4fbbf194fa699fcd3b36a298f6831c912e73 /windows.c
parent3917e7b2f77048be01bc90ed5bc0bf6803bd8c59 (diff)
downloadsubsurface-f928be5061744bb38c3aff8ea41dbd0c42851cbc.tar.gz
Provide a method to use unicode command line arguments on Windows
For unicode command line characters Windows uses UTF-16, while Glib and GTK use UTF-8. To solve that we retrieve the command line via __wgetmainargs() and use g_utf16_to_utf8() to convert each argument. The used method should support wildcards passed as arguments (e.g. *.xml). Two new, OS abstracted functions appear in linux.c (NOP), macos.c (NOP), windows.c: subsurface_command_line_init(...) subsurface_command_line_exit(...) which are being called in main() Signed-off-by: Lubomir I. Ivanov <neolit123@gmail.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
Diffstat (limited to 'windows.c')
-rw-r--r--windows.c54
1 files changed, 54 insertions, 0 deletions
diff --git a/windows.c b/windows.c
index b6e10bb71..f2f06f9a0 100644
--- a/windows.c
+++ b/windows.c
@@ -124,3 +124,57 @@ void subsurface_ui_setup(GtkSettings *settings, GtkWidget *menubar,
divelist_font = DIVELIST_DEFAULT_FONT;
gtk_box_pack_start(GTK_BOX(vbox), menubar, FALSE, FALSE, 0);
}
+
+/* barely documented API */
+extern int __wgetmainargs(int *, wchar_t ***, wchar_t ***, int, int *);
+
+/* expand-convert the UTF-16 argument list to a list of UTF-8 strings */
+void subsurface_command_line_init(gint *argc, gchar ***argv)
+{
+ wchar_t **wargv, **wenviron;
+ gchar **argv_new;
+ gchar *s;
+ /* for si we assume that a struct address will equal the address
+ * of its first and only int member */
+ gint i, n, ret, si;
+
+ /* memory leak tools may reports a potential issue here at a call
+ * to strcpy_s in msvcrt, wich should be a false positive. but even if there
+ * is some kind of a leak, it should be unique and have the same
+ * lifespan as the process heap. */
+ ret = __wgetmainargs(&n, &wargv, &wenviron, TRUE, &si);
+ if (ret < 0) {
+ g_warning("Cannot convert command line");
+ return;
+ }
+ argv_new = g_malloc(sizeof(gchar *) * (n + 1));
+
+ for (i = 0; i < n; ++i) {
+ s = g_utf16_to_utf8((gunichar2 *)wargv[i], -1, NULL, NULL, NULL);
+ if (!s) {
+ g_warning("Cannot convert command line argument (%d) to UTF-8", (i + 1));
+ s = "\0";
+ } else if (!g_utf8_validate(s, -1, NULL)) {
+ g_warning("Cannot validate command line argument '%s' (%d)", s, (i + 1));
+ g_free(s);
+ s = "\0";
+ }
+ argv_new[i] = s;
+ }
+ argv_new[n] = NULL;
+
+ /* update the argument list and count */
+ if (argv && argc) {
+ *argv = argv_new;
+ *argc = n;
+ }
+}
+
+/* once done, free the argument list */
+void subsurface_command_line_exit(gint *argc, gchar ***argv)
+{
+ int i;
+ for (i = 0; i < *argc; i++)
+ g_free((*argv)[i]);
+ g_free(*argv);
+}