Merge lp:~kyleb/sakura/custom-palette into lp:~dabisu/sakura/sakura

[Kyle Brady]

This branch adds the ability to use a custom palette in sakura. This is done by adding a new section in the config file that stores the options color0-color15, similar to .Xdefaults. The default values for this are pulled from the Linux palette.

[David Gómez (dabisu)]

Palette customization is something i don't want to be in sakura. But if you have a custom palette to propose, please submit it. And sorry for the long long time to answer this.

[David Gómez (dabisu)]

review: Disapprove

Unmerged revisions

357. By Kyle Brady on 2011-09-03

Add the ability to use a custom palette.

=== modified file 'src/sakura.c'
--- src/sakura.c	2011-07-31 00:45:30 +0000
+++ src/sakura.c	2011-09-03 21:24:23 +0000
@@ -136,6 +136,8 @@
 	{ 0, 0xffff, 0xffff, 0xffff }
 };
 
+static GdkColor custom_palette[PALETTE_SIZE];
+
 static struct {
 	GtkWidget *main_window;
 	GtkWidget *notebook;
@@ -236,6 +238,7 @@
 #define DEFAULT_FULLSCREEN_KEY  GDK_F11
 #define ERROR_BUFFER_LENGTH 256
 const char cfg_group[] = "sakura";
+const char palette_cfg_group[] = "custom palette";
 
 static GQuark term_data_id = 0;
 #define  sakura_get_page_term( sakura, page_idx )  \
@@ -247,18 +250,18 @@
             G_OBJECT( gtk_notebook_get_nth_page( (GtkNotebook*)sakura.notebook, page_idx) ), \
             term_data_id, term, (GDestroyNotify)g_free);
 
-#define  sakura_set_config_integer(key, value) do {\
-	g_key_file_set_integer(sakura.cfg, cfg_group, key, value);\
-	sakura.config_modified=TRUE;\
-	} while(0);
-
-#define  sakura_set_config_string(key, value) do {\
-	g_key_file_set_value(sakura.cfg, cfg_group, key, value);\
-	sakura.config_modified=TRUE;\
-	} while(0);
-
-#define  sakura_set_config_boolean(key, value) do {\
-	g_key_file_set_boolean(sakura.cfg, cfg_group, key, value);\
+#define  sakura_set_config_integer(key, value, group) do {\
+	g_key_file_set_integer(sakura.cfg, group, key, value);\
+	sakura.config_modified=TRUE;\
+	} while(0);
+
+#define  sakura_set_config_string(key, value, group) do {\
+	g_key_file_set_value(sakura.cfg, group, key, value);\
+	sakura.config_modified=TRUE;\
+	} while(0);
+
+#define  sakura_set_config_boolean(key, value, group) do {\
+	g_key_file_set_boolean(sakura.cfg, group, key, value);\
 	sakura.config_modified=TRUE;\
 	} while(0);
 
@@ -743,7 +746,7 @@
 		sakura.font=pango_font_description_from_string(gtk_font_selection_dialog_get_font_name(GTK_FONT_SELECTION_DIALOG(font_dialog)));
 		sakura_set_font();
 		sakura_set_size(sakura.columns, sakura.rows);
-		sakura_set_config_string("font", pango_font_description_to_string(sakura.font));
+		sakura_set_config_string("font", pango_font_description_to_string(sakura.font), cfg_group);
 	}
 
 	gtk_widget_destroy(font_dialog);
@@ -874,15 +877,15 @@
 		gchar *cfgtmp;
 		cfgtmp = g_strdup_printf("#%02x%02x%02x", sakura.forecolor.red >>8,
 		                         sakura.forecolor.green>>8, sakura.forecolor.blue>>8);
-		sakura_set_config_string("forecolor", cfgtmp);
+		sakura_set_config_string("forecolor", cfgtmp, cfg_group);
 		g_free(cfgtmp);
 
 		cfgtmp = g_strdup_printf("#%02x%02x%02x", sakura.backcolor.red >>8,
 		                         sakura.backcolor.green>>8, sakura.backcolor.blue>>8);
-		sakura_set_config_string("backcolor", cfgtmp);
+		sakura_set_config_string("backcolor", cfgtmp, cfg_group);
 		g_free(cfgtmp);
 
-		sakura_set_config_integer("backalpha", sakura.backalpha);
+		sakura_set_config_integer("backalpha", sakura.backalpha, cfg_group);
 
 	}
 
@@ -981,7 +984,7 @@
 					vte_terminal_set_opacity(VTE_TERMINAL (term->vte), sakura.backalpha);
 					vte_terminal_set_colors(VTE_TERMINAL(term->vte), &sakura.forecolor, &sakura.backcolor,
 					                        sakura.palette, PALETTE_SIZE);
-					sakura_set_config_integer("backalpha", sakura.backalpha);
+					sakura_set_config_integer("backalpha", sakura.backalpha, cfg_group);
 					sakura.fake_transparency = TRUE;
 				} else {
 					/* Fake transparency, there is no composite manager */
@@ -989,7 +992,7 @@
 					vte_terminal_set_background_saturation(VTE_TERMINAL(term->vte), sakura.opacity_level);
 					vte_terminal_set_background_tint_color(VTE_TERMINAL(term->vte), &sakura.backcolor);
 					sakura.fake_transparency = TRUE;
-					sakura_set_config_string("fake_transparency", "Yes");
+					sakura_set_config_string("fake_transparency", "Yes", cfg_group);
 				}
 			}
 
@@ -1000,12 +1003,12 @@
 				term = sakura_get_page_term(sakura, i);
 				vte_terminal_set_background_transparent(VTE_TERMINAL(term->vte), FALSE);
 				sakura.fake_transparency = FALSE;
-				sakura_set_config_string("fake_transparency", "No");
+				sakura_set_config_string("fake_transparency", "No", cfg_group);
 			}
 
 		}
 
-		sakura_set_config_string("opacity_level", sakura.opacity_level_percent);
+		sakura_set_config_string("opacity_level", sakura.opacity_level_percent, cfg_group);
 	}
 
 	gtk_widget_destroy(opacity_dialog);
@@ -1141,7 +1144,7 @@
 
 	// FIXME: is this really needed? IMHO, this should be done just before
 	// dumping the config to the config file.
-	sakura_set_config_string("background", "none");
+	sakura_set_config_string("background", "none", cfg_group);
 
 	g_free(sakura.background);
 	sakura.background=NULL;
@@ -1159,13 +1162,13 @@
 
 	if (gtk_check_menu_item_get_active(GTK_CHECK_MENU_ITEM(widget))) {
 		gtk_notebook_set_show_tabs(GTK_NOTEBOOK(sakura.notebook), TRUE);
-		sakura_set_config_string("show_always_first_tab", "Yes");
+		sakura_set_config_string("show_always_first_tab", "Yes", cfg_group);
 	} else {
 		/* Only hide tabs if the notebook has one page */
 		if (gtk_notebook_get_n_pages(GTK_NOTEBOOK(sakura.notebook)) == 1) {
 			gtk_notebook_set_show_tabs(GTK_NOTEBOOK(sakura.notebook), FALSE);
 		}
-		sakura_set_config_string("show_always_first_tab", "No");
+		sakura_set_config_string("show_always_first_tab", "No", cfg_group);
 	}
 }
 
@@ -1180,9 +1183,9 @@
 	term = sakura_get_page_term(sakura, page);
 
 	if (gtk_check_menu_item_get_active(GTK_CHECK_MENU_ITEM(widget))) {
-		sakura_set_config_boolean("closebutton", TRUE);
+		sakura_set_config_boolean("closebutton", TRUE, cfg_group);
 	} else {
-		sakura_set_config_boolean("closebutton", FALSE);
+		sakura_set_config_boolean("closebutton", FALSE, cfg_group);
 	}
 }
 
@@ -1203,10 +1206,10 @@
 
 	if (!g_key_file_get_boolean(sakura.cfg, cfg_group, "scrollbar", NULL)) {
 		sakura.show_scrollbar=true;
-		sakura_set_config_boolean("scrollbar", TRUE);
+		sakura_set_config_boolean("scrollbar", TRUE, cfg_group);
 	} else {
 		sakura.show_scrollbar=false;
-		sakura_set_config_boolean("scrollbar", FALSE);
+		sakura_set_config_boolean("scrollbar", FALSE, cfg_group);
 	}
 
 	/* Toggle/Untoggle the scrollbar for all tabs */
@@ -1231,10 +1234,10 @@
 
 	if (gtk_check_menu_item_get_active(GTK_CHECK_MENU_ITEM(widget))) {
 		vte_terminal_set_audible_bell (VTE_TERMINAL(term->vte), TRUE);
-		sakura_set_config_string("audible_bell", "Yes");
+		sakura_set_config_string("audible_bell", "Yes", cfg_group);
 	} else {
 		vte_terminal_set_audible_bell (VTE_TERMINAL(term->vte), FALSE);
-		sakura_set_config_string("audible_bell", "No");
+		sakura_set_config_string("audible_bell", "No", cfg_group);
 	}
 }
 
@@ -1250,10 +1253,10 @@
 
 	if (gtk_check_menu_item_get_active(GTK_CHECK_MENU_ITEM(widget))) {
 		vte_terminal_set_visible_bell (VTE_TERMINAL(term->vte), TRUE);
-		sakura_set_config_string("visible_bell", "Yes");
+		sakura_set_config_string("visible_bell", "Yes", cfg_group);
 	} else {
 		vte_terminal_set_visible_bell (VTE_TERMINAL(term->vte), FALSE);
-		sakura_set_config_string("visible_bell", "No");
+		sakura_set_config_string("visible_bell", "No", cfg_group);
 	}
 }
 
@@ -1269,10 +1272,10 @@
 
 	if (gtk_check_menu_item_get_active(GTK_CHECK_MENU_ITEM(widget))) {
 		vte_terminal_set_cursor_blink_mode (VTE_TERMINAL(term->vte), VTE_CURSOR_BLINK_ON);
-		sakura_set_config_string("blinking_cursor", "Yes");
+		sakura_set_config_string("blinking_cursor", "Yes", cfg_group);
 	} else {
 		vte_terminal_set_cursor_blink_mode (VTE_TERMINAL(term->vte), VTE_CURSOR_BLINK_OFF);
-		sakura_set_config_string("blinking_cursor", "No");
+		sakura_set_config_string("blinking_cursor", "No", cfg_group);
 	}
 }
 
@@ -1282,10 +1285,10 @@
 {
 	if (gtk_check_menu_item_get_active(GTK_CHECK_MENU_ITEM(widget))) {
 		gtk_window_set_decorated (GTK_WINDOW(sakura.main_window), FALSE);
-		sakura_set_config_string("borderless", "Yes");
+		sakura_set_config_string("borderless", "Yes", cfg_group);
 	} else {
 		gtk_window_set_decorated (GTK_WINDOW(sakura.main_window), TRUE);
-		sakura_set_config_string("borderless", "No");
+		sakura_set_config_string("borderless", "No", cfg_group);
 	}
 }
 
@@ -1295,10 +1298,10 @@
 {
 	if (gtk_check_menu_item_get_active(GTK_CHECK_MENU_ITEM(widget))) {
 		gtk_window_maximize (GTK_WINDOW(sakura.main_window));
-		sakura_set_config_string("maximized", "Yes");
+		sakura_set_config_string("maximized", "Yes", cfg_group);
 	} else {
 		gtk_window_unmaximize (GTK_WINDOW(sakura.main_window));
-		sakura_set_config_string("maximized", "No");
+		sakura_set_config_string("maximized", "No", cfg_group);
 	}
 }
 
@@ -1320,8 +1323,10 @@
 			sakura.palette=tango_palette;
 		} else if (strcmp(palette, "xterm")==0) {
 			sakura.palette=xterm_palette;
+		} else if (strcmp(palette, "rxvt")==0) {
+			sakura.palette=xterm_palette;
 		} else {
-			sakura.palette=rxvt_palette;
+			sakura.palette=custom_palette;
 		}
 
 		for (i = (n_pages - 1); i >= 0; i--) {
@@ -1330,7 +1335,7 @@
 			                        sakura.palette, PALETTE_SIZE);
 		}
 
-		sakura_set_config_string("palette", palette);
+		sakura_set_config_string("palette", palette, cfg_group);
 	}
 }
 
@@ -1600,7 +1605,7 @@
 	 */
 
 	if (!g_key_file_has_key(sakura.cfg, cfg_group, "forecolor", NULL)) {
-		sakura_set_config_string("forecolor", "#c0c0c0");
+		sakura_set_config_string("forecolor", "#c0c0c0", cfg_group);
 	}
 	cfgtmp = g_key_file_get_value(sakura.cfg, cfg_group, "forecolor", NULL);
 	gdk_color_parse(cfgtmp, &sakura.forecolor);
@@ -1608,7 +1613,7 @@
 
 
 	if (!g_key_file_has_key(sakura.cfg, cfg_group, "backcolor", NULL)) {
-		sakura_set_config_string("backcolor", "#000000");
+		sakura_set_config_string("backcolor", "#000000", cfg_group);
 	}
 	cfgtmp = g_key_file_get_value(sakura.cfg, cfg_group, "backcolor", NULL);
 	gdk_color_parse(cfgtmp, &sakura.backcolor);
@@ -1616,13 +1621,13 @@
 
 
 	if (!g_key_file_has_key(sakura.cfg, cfg_group, "backalpha", NULL)) {
-		sakura_set_config_integer("backalpha", 65535);
+		sakura_set_config_integer("backalpha", 65535, cfg_group);
 	}
 	sakura.backalpha = g_key_file_get_integer(sakura.cfg, cfg_group, "backalpha", NULL);
 
 
 	if (!g_key_file_has_key(sakura.cfg, cfg_group, "opacity_level", NULL)) {
-		sakura_set_config_string("opacity_level", "80");
+		sakura_set_config_string("opacity_level", "80", cfg_group);
 	}
 	cfgtmp = g_key_file_get_value(sakura.cfg, cfg_group, "opacity_level", NULL);
 	sakura.opacity_level_percent=cfgtmp;
@@ -1631,7 +1636,7 @@
 
 
 	if (!g_key_file_has_key(sakura.cfg, cfg_group, "fake_transparency", NULL)) {
-		sakura_set_config_string("fake_transparency", "No");
+		sakura_set_config_string("fake_transparency", "No", cfg_group);
 	}
 	cfgtmp = g_key_file_get_value(sakura.cfg, cfg_group, "fake_transparency", NULL);
 	if (strcmp(cfgtmp, "Yes")==0) {
@@ -1643,7 +1648,7 @@
 
 
 	if (!g_key_file_has_key(sakura.cfg, cfg_group, "background", NULL)) {
-		sakura_set_config_string("background", "none");
+		sakura_set_config_string("background", "none", cfg_group);
 	}
 	cfgtmp = g_key_file_get_value(sakura.cfg, cfg_group, "background", NULL);
 	if (strcmp(cfgtmp, "none")==0) {
@@ -1655,65 +1660,78 @@
 
 
 	if (!g_key_file_has_key(sakura.cfg, cfg_group, "font", NULL)) {
-		sakura_set_config_string("font", DEFAULT_FONT);
+		sakura_set_config_string("font", DEFAULT_FONT, cfg_group);
 	}
 
 	if (!g_key_file_has_key(sakura.cfg, cfg_group, "show_always_first_tab", NULL)) {
-		sakura_set_config_string("show_always_first_tab", "No");
+		sakura_set_config_string("show_always_first_tab", "No", cfg_group);
 	}
 
 	if (!g_key_file_has_key(sakura.cfg, cfg_group, "scrollbar", NULL)) {
-		sakura_set_config_boolean("scrollbar", FALSE);
+		sakura_set_config_boolean("scrollbar", FALSE, cfg_group);
 	}
 	sakura.show_scrollbar = g_key_file_get_boolean(sakura.cfg, cfg_group, "scrollbar", NULL);
 
 	if (!g_key_file_has_key(sakura.cfg, cfg_group, "closebutton", NULL)) {
-		sakura_set_config_boolean("closebutton", FALSE);
+		sakura_set_config_boolean("closebutton", FALSE, cfg_group);
 	}
 	sakura.show_closebutton = g_key_file_get_boolean(sakura.cfg, cfg_group, "closebutton", NULL);
 
 	if (!g_key_file_has_key(sakura.cfg, cfg_group, "audible_bell", NULL)) {
-		sakura_set_config_string("audible_bell", "Yes");
+		sakura_set_config_string("audible_bell", "Yes", cfg_group);
 	}
 	cfgtmp = g_key_file_get_value(sakura.cfg, cfg_group, "audible_bell", NULL);
 	sakura.audible_bell= (strcmp(cfgtmp, "Yes")==0) ? 1 : 0;
 	g_free(cfgtmp);
 
 	if (!g_key_file_has_key(sakura.cfg, cfg_group, "visible_bell", NULL)) {
-		sakura_set_config_string("visible_bell", "No");
+		sakura_set_config_string("visible_bell", "No", cfg_group);
 	}
 	cfgtmp = g_key_file_get_value(sakura.cfg, cfg_group, "visible_bell", NULL);
 	sakura.visible_bell= (strcmp(cfgtmp, "Yes")==0) ? 1 : 0;
 	g_free(cfgtmp);
 
 	if (!g_key_file_has_key(sakura.cfg, cfg_group, "blinking_cursor", NULL)) {
-		sakura_set_config_string("blinking_cursor", "No");
+		sakura_set_config_string("blinking_cursor", "No", cfg_group);
 	}
 	cfgtmp = g_key_file_get_value(sakura.cfg, cfg_group, "blinking_cursor", NULL);
 	sakura.blinking_cursor= (strcmp(cfgtmp, "Yes")==0) ? 1 : 0;
 	g_free(cfgtmp);
 
 	if (!g_key_file_has_key(sakura.cfg, cfg_group, "borderless", NULL)) {
-		sakura_set_config_string("borderless", "No");
+		sakura_set_config_string("borderless", "No", cfg_group);
 	}
 	cfgtmp = g_key_file_get_value(sakura.cfg, cfg_group, "borderless", NULL);
 	sakura.borderless= (strcmp(cfgtmp, "Yes")==0) ? 1 : 0;
 	g_free(cfgtmp);
 
 	if (!g_key_file_has_key(sakura.cfg, cfg_group, "maximized", NULL)) {
-		sakura_set_config_string("maximized", "No");
+		sakura_set_config_string("maximized", "No", cfg_group);
 	}
 	cfgtmp = g_key_file_get_value(sakura.cfg, cfg_group, "maximized", NULL);
 	sakura.maximized= (strcmp(cfgtmp, "Yes")==0) ? 1 : 0;
 	g_free(cfgtmp);
 
 	if (!g_key_file_has_key(sakura.cfg, cfg_group, "word_chars", NULL)) {
-		sakura_set_config_string("word_chars", DEFAULT_WORD_CHARS);
+		sakura_set_config_string("word_chars", DEFAULT_WORD_CHARS, cfg_group);
 	}
 	sakura.word_chars = g_key_file_get_value(sakura.cfg, cfg_group, "word_chars", NULL);
 
+	gchar *paltmp = NULL;
+	for(int i=0; i<PALETTE_SIZE; i++)
+	{
+		paltmp = g_strdup_printf("color%i", i);
+		if (!g_key_file_has_key(sakura.cfg, palette_cfg_group, paltmp, NULL)) {
+			sakura_set_config_string(paltmp, gdk_color_to_string(&linux_palette[i]), palette_cfg_group);
+		}
+		cfgtmp = g_key_file_get_value(sakura.cfg, palette_cfg_group, paltmp, NULL);
+		gdk_color_parse(cfgtmp, &custom_palette[i]);
+		g_free(paltmp);
+		g_free(cfgtmp);
+	}
+
 	if (!g_key_file_has_key(sakura.cfg, cfg_group, "palette", NULL)) {
-		sakura_set_config_string("palette", DEFAULT_PALETTE);
+		sakura_set_config_string("palette", DEFAULT_PALETTE, cfg_group);
 	}
 	cfgtmp = g_key_file_get_string(sakura.cfg, cfg_group, "palette", NULL);
 	if (strcmp(cfgtmp, "linux")==0) {
@@ -1722,38 +1740,40 @@
 		sakura.palette=tango_palette;
 	} else if (strcmp(cfgtmp, "xterm")==0) {
 		sakura.palette=xterm_palette;
-	} else {
+	} else if (strcmp(cfgtmp, "rxvt")==0) {
 		sakura.palette=rxvt_palette;
+	} else {
+		sakura.palette=custom_palette;
 	}
 	g_free(cfgtmp);
 
 	if (!g_key_file_has_key(sakura.cfg, cfg_group, "add_tab_accelerator", NULL)) {
-		sakura_set_config_integer("add_tab_accelerator", DEFAULT_ADD_TAB_ACCELERATOR);
+		sakura_set_config_integer("add_tab_accelerator", DEFAULT_ADD_TAB_ACCELERATOR, cfg_group);
 	}
 	sakura.add_tab_accelerator = g_key_file_get_integer(sakura.cfg, cfg_group, "add_tab_accelerator", NULL);
 
 	if (!g_key_file_has_key(sakura.cfg, cfg_group, "del_tab_accelerator", NULL)) {
-		sakura_set_config_integer("del_tab_accelerator", DEFAULT_DEL_TAB_ACCELERATOR);
+		sakura_set_config_integer("del_tab_accelerator", DEFAULT_DEL_TAB_ACCELERATOR, cfg_group);
 	}
 	sakura.del_tab_accelerator = g_key_file_get_integer(sakura.cfg, cfg_group, "del_tab_accelerator", NULL);
 
 	if (!g_key_file_has_key(sakura.cfg, cfg_group, "switch_tab_accelerator", NULL)) {
-		sakura_set_config_integer("switch_tab_accelerator", DEFAULT_SWITCH_TAB_ACCELERATOR);
+		sakura_set_config_integer("switch_tab_accelerator", DEFAULT_SWITCH_TAB_ACCELERATOR, cfg_group);
 	}
 	sakura.switch_tab_accelerator = g_key_file_get_integer(sakura.cfg, cfg_group, "switch_tab_accelerator", NULL);
 
 	if (!g_key_file_has_key(sakura.cfg, cfg_group, "copy_accelerator", NULL)) {
-		sakura_set_config_integer("copy_accelerator", DEFAULT_COPY_ACCELERATOR);
+		sakura_set_config_integer("copy_accelerator", DEFAULT_COPY_ACCELERATOR, cfg_group);
 	}
 	sakura.copy_accelerator = g_key_file_get_integer(sakura.cfg, cfg_group, "copy_accelerator", NULL);
 
 	if (!g_key_file_has_key(sakura.cfg, cfg_group, "scrollbar_accelerator", NULL)) {
-		sakura_set_config_integer("scrollbar_accelerator", DEFAULT_SCROLLBAR_ACCELERATOR);
+		sakura_set_config_integer("scrollbar_accelerator", DEFAULT_SCROLLBAR_ACCELERATOR, cfg_group);
 	}
 	sakura.scrollbar_accelerator = g_key_file_get_integer(sakura.cfg, cfg_group, "scrollbar_accelerator", NULL);
 
 	if (!g_key_file_has_key(sakura.cfg, cfg_group, "open_url_accelerator", NULL)) {
-		sakura_set_config_integer("open_url_accelerator", DEFAULT_OPEN_URL_ACCELERATOR);
+		sakura_set_config_integer("open_url_accelerator", DEFAULT_OPEN_URL_ACCELERATOR, cfg_group);
 	}
 	sakura.open_url_accelerator = g_key_file_get_integer(sakura.cfg, cfg_group, "open_url_accelerator", NULL);
 
@@ -1891,7 +1911,7 @@
 	          *item_opacity_menu, *item_show_first_tab, *item_audible_bell, *item_visible_bell,
 	          *item_blinking_cursor, *item_borderless_maximized,
 	          *item_palette, *item_palette_tango, *item_palette_linux, *item_palette_xterm, *item_palette_rxvt,
-	          *item_show_close_button;
+			  *item_palette_custom, *item_show_close_button;
 	GtkAction *action_open_link, *action_copy_link, *action_new_tab, *action_set_name, *action_close_tab,
                   *action_new_window,
 	          *action_copy, *action_paste, *action_select_font, *action_select_colors,
@@ -1945,6 +1965,7 @@
 	item_palette_linux=gtk_radio_menu_item_new_with_label_from_widget(GTK_RADIO_MENU_ITEM(item_palette_tango), "Linux");
 	item_palette_xterm=gtk_radio_menu_item_new_with_label_from_widget(GTK_RADIO_MENU_ITEM(item_palette_tango), "xterm");
 	item_palette_rxvt=gtk_radio_menu_item_new_with_label_from_widget(GTK_RADIO_MENU_ITEM(item_palette_tango), "rxvt");
+	item_palette_custom=gtk_radio_menu_item_new_with_label_from_widget(GTK_RADIO_MENU_ITEM(item_palette_tango), "Custom");
 	item_options=gtk_menu_item_new_with_label(_("Options"));
 	item_palette=gtk_menu_item_new_with_label(_("Set palette"));
 
@@ -1994,8 +2015,10 @@
 		gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(item_palette_tango), TRUE);
 	} else if (strcmp(cfgtmp, "xterm")==0) {
 		gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(item_palette_xterm), TRUE);
-	} else {
+	} else if (strcmp(cfgtmp, "rxvt")==0) {
 		gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(item_palette_rxvt), TRUE);
+	} else {
+		gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(item_palette_custom), TRUE);
 	}
 	g_free(cfgtmp);
 
@@ -2045,6 +2068,7 @@
 	gtk_menu_shell_append(GTK_MENU_SHELL(palette_menu), item_palette_linux);
 	gtk_menu_shell_append(GTK_MENU_SHELL(palette_menu), item_palette_xterm);
 	gtk_menu_shell_append(GTK_MENU_SHELL(palette_menu), item_palette_rxvt);
+	gtk_menu_shell_append(GTK_MENU_SHELL(palette_menu), item_palette_custom);
 	gtk_menu_shell_append(GTK_MENU_SHELL(options_menu), gtk_separator_menu_item_new());
 	gtk_menu_shell_append(GTK_MENU_SHELL(options_menu), item_input_methods);
 
@@ -2080,6 +2104,7 @@
 	g_signal_connect(G_OBJECT(item_palette_linux), "activate", G_CALLBACK(sakura_set_palette), "linux");
 	g_signal_connect(G_OBJECT(item_palette_xterm), "activate", G_CALLBACK(sakura_set_palette), "xterm");
 	g_signal_connect(G_OBJECT(item_palette_rxvt), "activate", G_CALLBACK(sakura_set_palette), "rxvt");
+	g_signal_connect(G_OBJECT(item_palette_custom), "activate", G_CALLBACK(sakura_set_palette), "custom");
 
 	g_signal_connect(G_OBJECT(action_open_link), "activate", G_CALLBACK(sakura_open_url), NULL);
 	g_signal_connect(G_OBJECT(action_copy_link), "activate", G_CALLBACK(sakura_copy_url), NULL);
@@ -2501,7 +2526,7 @@
             vte_terminal_set_background_saturation(VTE_TERMINAL(term->vte), TRUE);
             vte_terminal_set_background_transparent(VTE_TERMINAL(term->vte),FALSE);
 
-			sakura_set_config_string("background", infile);
+			sakura_set_config_string("background", infile, cfg_group);
 		}
 	}
 }