Renamed type VpColor -> VbColor.

diff --git a/src/main.c b/src/main.c
index 1ac51b7..938d9c8 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -264,7 +264,7 @@ gboolean vb_set_mode(Mode mode, gboolean clean)
     return TRUE;
 }
 
-void vb_set_widget_font(GtkWidget* widget, const VpColor* fg, const VpColor* bg, PangoFontDescription* font)
+void vb_set_widget_font(GtkWidget* widget, const VbColor* fg, const VbColor* bg, PangoFontDescription* font)
 {
     VB_WIDGET_OVERRIDE_FONT(widget, font);
     VB_WIDGET_OVERRIDE_TEXT(widget, GTK_STATE_NORMAL, fg);

diff --git a/src/main.h b/src/main.h
index 5631c5e..efb5a78 100644 (file)
--- a/src/main.h
+++ b/src/main.h
@@ -70,7 +70,7 @@
 }
 
 #ifdef HAS_GTK3
-#define VpColor GdkRGBA
+#define VbColor GdkRGBA
 #define VB_COLOR_PARSE(color, string)   (gdk_rgba_parse(color, string))
 #define VB_COLOR_TO_STRING(color)       (gdk_rgba_to_string(color))
 #define VB_WIDGET_OVERRIDE_BACKGROUND   gtk_widget_override_background_color
@@ -85,7 +85,7 @@
 
 #else
 
-#define VpColor GdkColor
+#define VbColor GdkColor
 #define VB_COLOR_PARSE(color, string)   (gdk_color_parse(string, color))
 #define VB_COLOR_TO_STRING(color)       (gdk_color_to_string(color))
 #define VB_WIDGET_OVERRIDE_BACKGROUND   gtk_widget_modify_bg
@@ -276,12 +276,12 @@ typedef struct {
 } Completions;
 
 typedef struct {
-    VpColor               input_fg[VB_MSG_LAST];
-    VpColor               input_bg[VB_MSG_LAST];
+    VbColor               input_fg[VB_MSG_LAST];
+    VbColor               input_bg[VB_MSG_LAST];
     PangoFontDescription* input_font[VB_MSG_LAST];
     /* completion */
-    VpColor               comp_fg[VB_COMP_LAST];
-    VpColor               comp_bg[VB_COMP_LAST];
+    VbColor               comp_fg[VB_COMP_LAST];
+    VbColor               comp_bg[VB_COMP_LAST];
     PangoFontDescription* comp_font;
     /* hint style */
     char*                 hint_bg;
@@ -289,8 +289,8 @@ typedef struct {
     char*                 hint_fg;
     char*                 hint_style;
     /* status bar */
-    VpColor               status_bg[VB_STATUS_LAST];
-    VpColor               status_fg[VB_STATUS_LAST];
+    VbColor               status_bg[VB_STATUS_LAST];
+    VbColor               status_fg[VB_STATUS_LAST];
     PangoFontDescription* status_font[VB_STATUS_LAST];
 } Style;
 
@@ -331,7 +331,7 @@ gboolean vb_eval_script(WebKitWebFrame* frame, char* script, char* file, char**
 gboolean vb_load_uri(const Arg* arg);
 gboolean vb_set_clipboard(const Arg* arg);
 gboolean vb_set_mode(Mode mode, gboolean clean);
-void vb_set_widget_font(GtkWidget* widget, const VpColor* fg, const VpColor* bg, PangoFontDescription* font);
+void vb_set_widget_font(GtkWidget* widget, const VbColor* fg, const VbColor* bg, PangoFontDescription* font);
 void vb_update_statusbar(void);
 void vb_update_status_style(void);
 void vb_update_input_style(MessageType type);

diff --git a/src/setting.c b/src/setting.c
index ac7ccc7..c1dbfc6 100644 (file)
--- a/src/setting.c
+++ b/src/setting.c
@@ -255,7 +255,7 @@ static void setting_print_value(const Setting* s, void* value)
             break;
 
         case TYPE_COLOR:
-            string = VB_COLOR_TO_STRING((VpColor*)value);
+            string = VB_COLOR_TO_STRING((VbColor*)value);
             vb_echo(VB_MSG_NORMAL, FALSE, "  %s=%s", name, string);
             g_free(string);
             break;
@@ -432,7 +432,7 @@ static gboolean setting_input_style(const Setting* s, const SettingType type)
             style->input_font[itype] = pango_font_description_from_string(s->arg.s);
         }
     } else {
-        VpColor* color = NULL;
+        VbColor* color = NULL;
         if (g_str_has_prefix(s->name, "input-bg")) {
             /* background color */
             color = &style->input_bg[itype];
@@ -477,7 +477,7 @@ static gboolean setting_completion_style(const Setting* s, const SettingType typ
             style->comp_font = pango_font_description_from_string(s->arg.s);
         }
     } else {
-        VpColor* color = NULL;
+        VbColor* color = NULL;
         if (g_str_has_prefix(s->name, "completion-bg")) {
             /* completion background color */
             color = &style->comp_bg[ctype];