diff options
| author | Owen Taylor <owt1@cornell.edu> | 1998-04-04 01:56:54 +0000 |
|---|---|---|
| committer | Owen Taylor <otaylor@src.gnome.org> | 1998-04-04 01:56:54 +0000 |
| commit | e2ae4aec47c3b100d6ffd0cc68ca1f6957977e5b (patch) | |
| tree | 13e54e65266fd46a9158f03e94ecfe3098711fd6 /gdk | |
| parent | 59d586e2ff76aff44eb36c9db9d3038e661948b1 (diff) | |
| download | gdk-pixbuf-e2ae4aec47c3b100d6ffd0cc68ca1f6957977e5b.tar.gz | |
Make debug string parsine case-insensitive
Fri Apr 3 20:36:35 1998 Owen Taylor <owt1@cornell.edu>
* gutils.c (g_parse_debug_string): Make debug string
parsine case-insensitive
Fri Apr 3 20:36:52 1998 Owen Taylor <owt1@cornell.edu>
* gdk/gdk.c gtk/gtkmain.c: Accept debug options
in the form --g[td]k[-no]-debug=xxx as well
Diffstat (limited to 'gdk')
| -rw-r--r-- | gdk/gdk.c | 34 | ||||
| -rw-r--r-- | gdk/x11/gdkmain-x11.c | 34 |
2 files changed, 50 insertions, 18 deletions
@@ -327,31 +327,47 @@ gdk_init (int *argc, for (i = 1; i < *argc;) { #ifdef G_ENABLE_DEBUG - if (strcmp ("--gdk-debug", (*argv)[i]) == 0) + if ((strcmp ("--gdk-debug", (*argv)[i]) == 0) || + (strncmp ("--gdk-debug=", (*argv)[i], 12) == 0)) { - (*argv)[i] = NULL; - - if ((i + 1) < *argc && (*argv)[i + 1]) + gchar *equal_pos = strchr ((*argv)[i], '='); + + if (equal_pos != NULL) + { + gdk_debug_flags |= g_parse_debug_string (equal_pos+1, + gdk_debug_keys, + gdk_ndebug_keys); + } + else if ((i + 1) < *argc && (*argv)[i + 1]) { gdk_debug_flags |= g_parse_debug_string ((*argv)[i+1], gdk_debug_keys, gdk_ndebug_keys); - (*argv)[i + 1] = NULL; + (*argv)[i] = NULL; i += 1; } + (*argv)[i] = NULL; } - else if (strcmp ("--gdk-no-debug", (*argv)[i]) == 0) + else if ((strcmp ("--gdk-no-debug", (*argv)[i]) == 0) || + (strncmp ("--gdk-no-debug=", (*argv)[i], 15) == 0)) { - (*argv)[i] = NULL; + gchar *equal_pos = strchr ((*argv)[i], '='); - if ((i + 1) < *argc && (*argv)[i + 1]) + if (equal_pos != NULL) + { + gdk_debug_flags &= ~g_parse_debug_string (equal_pos+1, + gdk_debug_keys, + gdk_ndebug_keys); + } + else if ((i + 1) < *argc && (*argv)[i + 1]) { gdk_debug_flags &= ~g_parse_debug_string ((*argv)[i+1], gdk_debug_keys, gdk_ndebug_keys); - (*argv)[i + 1] = NULL; + (*argv)[i] = NULL; i += 1; } + (*argv)[i] = NULL; } else #endif /* G_ENABLE_DEBUG */ diff --git a/gdk/x11/gdkmain-x11.c b/gdk/x11/gdkmain-x11.c index 8808b644b..6d5ae500b 100644 --- a/gdk/x11/gdkmain-x11.c +++ b/gdk/x11/gdkmain-x11.c @@ -327,31 +327,47 @@ gdk_init (int *argc, for (i = 1; i < *argc;) { #ifdef G_ENABLE_DEBUG - if (strcmp ("--gdk-debug", (*argv)[i]) == 0) + if ((strcmp ("--gdk-debug", (*argv)[i]) == 0) || + (strncmp ("--gdk-debug=", (*argv)[i], 12) == 0)) { - (*argv)[i] = NULL; - - if ((i + 1) < *argc && (*argv)[i + 1]) + gchar *equal_pos = strchr ((*argv)[i], '='); + + if (equal_pos != NULL) + { + gdk_debug_flags |= g_parse_debug_string (equal_pos+1, + gdk_debug_keys, + gdk_ndebug_keys); + } + else if ((i + 1) < *argc && (*argv)[i + 1]) { gdk_debug_flags |= g_parse_debug_string ((*argv)[i+1], gdk_debug_keys, gdk_ndebug_keys); - (*argv)[i + 1] = NULL; + (*argv)[i] = NULL; i += 1; } + (*argv)[i] = NULL; } - else if (strcmp ("--gdk-no-debug", (*argv)[i]) == 0) + else if ((strcmp ("--gdk-no-debug", (*argv)[i]) == 0) || + (strncmp ("--gdk-no-debug=", (*argv)[i], 15) == 0)) { - (*argv)[i] = NULL; + gchar *equal_pos = strchr ((*argv)[i], '='); - if ((i + 1) < *argc && (*argv)[i + 1]) + if (equal_pos != NULL) + { + gdk_debug_flags &= ~g_parse_debug_string (equal_pos+1, + gdk_debug_keys, + gdk_ndebug_keys); + } + else if ((i + 1) < *argc && (*argv)[i + 1]) { gdk_debug_flags &= ~g_parse_debug_string ((*argv)[i+1], gdk_debug_keys, gdk_ndebug_keys); - (*argv)[i + 1] = NULL; + (*argv)[i] = NULL; i += 1; } + (*argv)[i] = NULL; } else #endif /* G_ENABLE_DEBUG */ |