diff --git a/src/include/internals.h b/src/include/internals.h index d22b4bf..af28b19 100644 --- a/src/include/internals.h +++ b/src/include/internals.h @@ -123,7 +123,7 @@ /*--[ Constants ]------------------------------------------------------------------------------------*/ - G_GNUC_INTERNAL const gchar * v3270_default_colors; + G_GNUC_INTERNAL const gchar * v3270_get_default_colors(); /*--[ Internal methods ]-----------------------------------------------------------------------------*/ diff --git a/src/terminal/colors.c b/src/terminal/colors.c index 6515771..5768789 100644 --- a/src/terminal/colors.c +++ b/src/terminal/colors.c @@ -33,53 +33,52 @@ #include #include -/*--[ Globals ]--------------------------------------------------------------------------------------*/ - -const gchar * v3270_default_colors = - "#000000," // V3270_COLOR_BACKGROUND - "#7890F0," // V3270_COLOR_BLUE - "#FF0000," // V3270_COLOR_RED - "#FF00FF," // V3270_COLOR_PINK - "#00FF00," // V3270_COLOR_GREEN - "#00FFFF," // V3270_COLOR_TURQUOISE - "#FFFF00," // V3270_COLOR_YELLOW - "#FFFFFF," // V3270_COLOR_WHITE - "#000000," // V3270_COLOR_BLACK - "#000080," // V3270_COLOR_DARK_BLUE - "#FFA200," // V3270_COLOR_ORANGE - "#800080," // V3270_COLOR_PURPLE - "#008000," // V3270_COLOR_DARK_GREEN - "#008080," // V3270_COLOR_DARK_TURQUOISE - "#A0A000," // V3270_COLOR_MUSTARD - "#C0C0C0," // V3270_COLOR_GRAY - - "#00FF00," // V3270_COLOR_FIELD_DEFAULT - "#FF0000," // V3270_COLOR_FIELD_INTENSIFIED - "#00FFFF," // V3270_COLOR_FIELD_PROTECTED - "#FFFFFF," // V3270_COLOR_FIELD_PROTECTED_INTENSIFIED - - "#404040," // V3270_COLOR_SELECTED_BG - "#FFFFFF," // V3270_COLOR_SELECTED_FG, - - "#00FF00," // V3270_COLOR_CROSS_HAIR - - "#000000," // V3270_COLOR_OIA_BACKGROUND - "#00FF00," // V3270_COLOR_OIA - "#7890F0," // V3270_COLOR_OIA_SEPARATOR - "#FFFFFF," // V3270_COLOR_OIA_STATUS_OK - "#FFFF00," // V3270_COLOR_OIA_STATUS_WARNING - "#FFFF00"; // V3270_COLOR_OIA_STATUS_INVALID - - /*--[ Implement ]------------------------------------------------------------------------------------*/ +const gchar * v3270_get_default_colors() { + + return "#000000," // V3270_COLOR_BACKGROUND + "#7890F0," // V3270_COLOR_BLUE + "#FF0000," // V3270_COLOR_RED + "#FF00FF," // V3270_COLOR_PINK + "#00FF00," // V3270_COLOR_GREEN + "#00FFFF," // V3270_COLOR_TURQUOISE + "#FFFF00," // V3270_COLOR_YELLOW + "#FFFFFF," // V3270_COLOR_WHITE + "#000000," // V3270_COLOR_BLACK + "#000080," // V3270_COLOR_DARK_BLUE + "#FFA200," // V3270_COLOR_ORANGE + "#800080," // V3270_COLOR_PURPLE + "#008000," // V3270_COLOR_DARK_GREEN + "#008080," // V3270_COLOR_DARK_TURQUOISE + "#A0A000," // V3270_COLOR_MUSTARD + "#C0C0C0," // V3270_COLOR_GRAY + + "#00FF00," // V3270_COLOR_FIELD_DEFAULT + "#FF0000," // V3270_COLOR_FIELD_INTENSIFIED + "#00FFFF," // V3270_COLOR_FIELD_PROTECTED + "#FFFFFF," // V3270_COLOR_FIELD_PROTECTED_INTENSIFIED + + "#404040," // V3270_COLOR_SELECTED_BG + "#FFFFFF," // V3270_COLOR_SELECTED_FG, + + "#00FF00," // V3270_COLOR_CROSS_HAIR + + "#000000," // V3270_COLOR_OIA_BACKGROUND + "#00FF00," // V3270_COLOR_OIA + "#7890F0," // V3270_COLOR_OIA_SEPARATOR + "#FFFFFF," // V3270_COLOR_OIA_STATUS_OK + "#FFFF00," // V3270_COLOR_OIA_STATUS_WARNING + "#FFFF00"; // V3270_COLOR_OIA_STATUS_INVALID +} + LIB3270_EXPORT void v3270_set_colors(GtkWidget *widget, const gchar *colors) { g_return_if_fail(GTK_IS_V3270(widget)); if(!colors) { - colors = v3270_default_colors; + colors = v3270_get_default_colors(); } v3270_set_color_table(GTK_V3270(widget)->color,colors); diff --git a/src/terminal/properties/init.c b/src/terminal/properties/init.c index d58869c..f13db24 100644 --- a/src/terminal/properties/init.c +++ b/src/terminal/properties/init.c @@ -214,7 +214,7 @@ "colors", "colors", _("The terminal colors"), - v3270_default_colors, + v3270_get_default_colors(), G_PARAM_READABLE|G_PARAM_WRITABLE ); diff --git a/src/terminal/widget.c b/src/terminal/widget.c index 12deb0b..1230ec8 100644 --- a/src/terminal/widget.c +++ b/src/terminal/widget.c @@ -532,7 +532,7 @@ static void v3270_init(v3270 *widget) // Set defaults v3270_font_info_init(&widget->font); - v3270_set_color_table(widget->color,v3270_default_colors); + v3270_set_color_table(widget->color,v3270_get_default_colors()); for(ix = 0; ix < G_N_ELEMENTS(widget->responses); ix++) widget->responses[ix] = GTK_RESPONSE_NONE; -- libgit2 0.21.2