Skip to contentSkip to conversation

kconfig: improve gconfig

PATCH Superseded Masahiro Yamada 2 participants 18 messages Jun 29, 2025 – Jun 30, 2025

Subsystems (2)

v2 of 3 Superseded Latest is v3 →

lore
Share & tools
lore
#0 lore raw

v2 cover kconfig: improve gconfig

- Code refactoring
- Migrate GTK 2 to GTK3
- Fix all compile warnings

Masahiro Yamada (9):
kconfig: gconf: fix behavior of a menu under a symbol in split view
kconfig: gconf: use configure-event handler to adjust pane separator
kconfig: gconf: rename display_tree_part()
kconfig: gconf: rename gconf.glade to gconf.ui
kconfig: gconf: migrate to GTK 3
kconfig: gconf: replace GtkVbox with GtkBox
kconfig: gconf: replace GdkColor with GdkRGBA
kconfig: gconf: replace GtkHPaned and GtkVPaned with GtkPaned
kconfig: gconf: show GTK version in About dialog

 scripts/kconfig/gconf-cfg.sh              |  11 +-
 scripts/kconfig/gconf.c                   | 146 ++++++++--------
 scripts/kconfig/{gconf.glade => gconf.ui} | 202 +++++++++++-----------
 3 files changed, 171 insertions(+), 188 deletions(-)
 rename scripts/kconfig/{gconf.glade => gconf.ui} (83%)
Signature · 1 line
2.43.0
#1 lore raw

PATCH v2 1/9 kconfig: gconf: fix behavior of a menu under a symbol in split view

A menu can be created under a symbol.

[Example]

menu "outer menu"

config A
bool "A"

menu "inner menu"
depends on A

config B
bool "B"

endmenu

endmenu

After being re-parented by menu_finalize(), the menu tree is structured like follows:

menu "outer menu"
\-- A
\-- menu "inner menu"
\-- B

In split view, the symbol A is shown in the right pane, so all of its descendants must also be shown there. This has never worked correctly.

---

Changes in v2:
- A new patch

 scripts/kconfig/gconf.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)
scripts/kconfig/gconf.c +2 -3
index 529a836ed5da..22badd2f710e 100644
@@ -801,7 +801,7 @@ static gboolean on_treeview2_button_press_event(GtkWidget *widget,
 		enum prop_type ptype;
 		ptype = menu->prompt ? menu->prompt->type : P_UNKNOWN;
 
-		if (ptype == P_MENU && view_mode != FULL_VIEW && col == COL_OPTION) {
+		if (ptype == P_MENU && view_mode == SINGLE_VIEW && col == COL_OPTION) {
 			// goes down into menu
 			browsed = menu;
 			display_tree_part();
@@ -951,8 +951,7 @@ static void _display_tree(GtkTreeStore *tree, struct menu *menu,
 		gtk_tree_store_append(tree, &iter, parent);
 		set_node(tree, &iter, child);
 
-		if ((view_mode != FULL_VIEW) && (ptype == P_MENU)
-		    && (tree == tree2))
+		if ((view_mode == SINGLE_VIEW) && (ptype == P_MENU))
 			continue;
 /*
 		if (((menu != &rootmenu) && !(menu->flags & MENU_ROOT))
Signature · 1 line
2.43.0
#2 lore raw

PATCH v2 2/9 kconfig: gconf: use configure-event handler to adjust pane separator

In reply to Masahiro Yamada

The size_request event handler is currently used to adjust the position of the horizontal separator in the right pane.

However, the size_request signal is not available in GTK 3. Use the configure-event signal instead.

---

Changes in v2:
- Use the "configure-event" instead of "size-allocate" signal. This fixes the problem where we cannot move the horizontal separator in the right pane.

 scripts/kconfig/gconf.c | 25 +++++++------------------
 1 file changed, 7 insertions(+), 18 deletions(-)
scripts/kconfig/gconf.c +7 -18
index 22badd2f710e..8b19298eef61 100644
@@ -604,23 +604,12 @@ static void on_window1_destroy(GtkObject *object, gpointer user_data)
 	gtk_main_quit();
 }
 
-static void on_window1_size_request(GtkWidget *widget,
-				    GtkRequisition *requisition,
-				    gpointer user_data)
+static gboolean on_window1_configure(GtkWidget *self,
+				     GdkEventConfigure *event,
+				     gpointer user_data)
 {
-	static gint old_h;
-	gint w, h;
-
-	if (widget->window == NULL)
-		gtk_window_get_default_size(GTK_WINDOW(main_wnd), &w, &h);
-	else
-		gdk_window_get_size(widget->window, &w, &h);
-
-	if (h == old_h)
-		return;
-	old_h = h;
-
-	gtk_paned_set_position(GTK_PANED(vpaned), 2 * h / 3);
+	gtk_paned_set_position(GTK_PANED(vpaned), 2 * event->height / 3);
+	return FALSE;
 }
 
 static gboolean on_window1_delete_event(GtkWidget *widget, GdkEvent *event,
@@ -1021,8 +1010,8 @@ static void init_main_window(const gchar *glade_file)
 	main_wnd = glade_xml_get_widget(xml, "window1");
 	g_signal_connect(main_wnd, "destroy",
 			 G_CALLBACK(on_window1_destroy), NULL);
-	g_signal_connect(main_wnd, "size_request",
-			 G_CALLBACK(on_window1_size_request), NULL);
+	g_signal_connect(main_wnd, "configure-event",
+			 G_CALLBACK(on_window1_configure), NULL);
 	g_signal_connect(main_wnd, "delete_event",
 			 G_CALLBACK(on_window1_delete_event), NULL);
 
Signature · 1 line
2.43.0
Tested-by on v2 2/9
#3 lore raw

Re: [PATCH v2 2/9] kconfig: gconf: use configure-event handler to adjust pane separator

Quoted 7 lines · Masahiro Yamada

The size_request event handler is currently used to adjust the position of the horizontal separator in the right pane.

However, the size_request signal is not available in GTK 3. Use the configure-event signal instead.

Thanks.

Quoted 54 lines

---

Changes in v2:
- Use the "configure-event" instead of "size-allocate" signal. This fixes the problem where we cannot move the horizontal separator in the right pane.

 scripts/kconfig/gconf.c | 25 +++++++------------------
 1 file changed, 7 insertions(+), 18 deletions(-)
scripts/kconfig/gconf.c +7 -18
index 22badd2f710e..8b19298eef61 100644
@@ -604,23 +604,12 @@ static void on_window1_destroy(GtkObject *object, gpointer user_data)
 	gtk_main_quit();
 }
 
-static void on_window1_size_request(GtkWidget *widget,
-				    GtkRequisition *requisition,
-				    gpointer user_data)
+static gboolean on_window1_configure(GtkWidget *self,
+				     GdkEventConfigure *event,
+				     gpointer user_data)
 {
-	static gint old_h;
-	gint w, h;
-
-	if (widget->window == NULL)
-		gtk_window_get_default_size(GTK_WINDOW(main_wnd), &w, &h);
-	else
-		gdk_window_get_size(widget->window, &w, &h);
-
-	if (h == old_h)
-		return;
-	old_h = h;
-
-	gtk_paned_set_position(GTK_PANED(vpaned), 2 * h / 3);
+	gtk_paned_set_position(GTK_PANED(vpaned), 2 * event->height / 3);
+	return FALSE;
 }
 
 static gboolean on_window1_delete_event(GtkWidget *widget, GdkEvent *event,
@@ -1021,8 +1010,8 @@ static void init_main_window(const gchar *glade_file)
 	main_wnd = glade_xml_get_widget(xml, "window1");
 	g_signal_connect(main_wnd, "destroy",
 			 G_CALLBACK(on_window1_destroy), NULL);
-	g_signal_connect(main_wnd, "size_request",
-			 G_CALLBACK(on_window1_size_request), NULL);
+	g_signal_connect(main_wnd, "configure-event",
+			 G_CALLBACK(on_window1_configure), NULL);
 	g_signal_connect(main_wnd, "delete_event",
 			 G_CALLBACK(on_window1_delete_event), NULL);
 
Signature · 1 line
~Randy
#4 lore raw

PATCH v2 3/9 kconfig: gconf: rename display_tree_part()

In reply to Masahiro Yamada

This function recreates the tree store to update the menu content. Rename it to recreate_tree() to better reflect its purpose.

---

Changes in v2:
- Rename to recreate_tree()

 scripts/kconfig/gconf.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)
scripts/kconfig/gconf.c +6 -6
index 8b19298eef61..bc25924a1adf 100644
@@ -57,7 +57,7 @@ enum {
 };
 
 static void display_tree(GtkTreeStore *store, struct menu *menu);
-static void display_tree_part(void);
+static void recreate_tree(void);
 
 static void conf_changed(bool dirty)
 {
@@ -279,7 +279,7 @@ static void set_view_mode(enum view_mode mode)
 			browsed = menu_get_parent_menu(selected) ?: &rootmenu;
 		else
 			browsed = &rootmenu;
-		display_tree_part();
+		recreate_tree();
 		select_menu(GTK_TREE_VIEW(tree2_w), selected);
 		gtk_widget_set_sensitive(single_btn, FALSE);
 		break;
@@ -556,7 +556,7 @@ static void on_back_clicked(GtkButton *button, gpointer user_data)
 	ptype = browsed->prompt ? browsed->prompt->type : P_UNKNOWN;
 	if (ptype != P_MENU)
 		browsed = browsed->parent;
-	display_tree_part();
+	recreate_tree();
 
 	if (browsed == &rootmenu)
 		gtk_widget_set_sensitive(back_btn, FALSE);
@@ -793,7 +793,7 @@ static gboolean on_treeview2_button_press_event(GtkWidget *widget,
 		if (ptype == P_MENU && view_mode == SINGLE_VIEW && col == COL_OPTION) {
 			// goes down into menu
 			browsed = menu;
-			display_tree_part();
+			recreate_tree();
 			gtk_widget_set_sensitive(back_btn, TRUE);
 		} else if (col == COL_OPTION) {
 			toggle_sym_value(menu);
@@ -898,7 +898,7 @@ static gboolean on_treeview1_button_press_event(GtkWidget *widget,
 
 	if (menu->type == M_MENU) {
 		browsed = menu;
-		display_tree_part();
+		recreate_tree();
 	}
 
 	gtk_tree_view_set_cursor(view, path, NULL, FALSE);
@@ -960,7 +960,7 @@ static void display_tree(GtkTreeStore *store, struct menu *menu)
 }
 
 /* Display a part of the tree starting at current node (single/split view) */
-static void display_tree_part(void)
+static void recreate_tree(void)
 {
 	gtk_tree_store_clear(tree2);
 	display_tree(tree2, browsed);
Signature · 1 line
2.43.0
#5 lore raw

PATCH v2 4/9 kconfig: gconf: rename gconf.glade to gconf.ui

In reply to Masahiro Yamada

The next commit will convert this file to GtkBuilder format. Rename it in advance to reflect the intended format.

---

(no changes since v1)

 scripts/kconfig/gconf.c                   | 6 +++---
 scripts/kconfig/{gconf.glade => gconf.ui} | 0
 2 files changed, 3 insertions(+), 3 deletions(-)
 rename scripts/kconfig/{gconf.glade => gconf.ui} (100%)
scripts/kconfig/gconf.c +3 -3
index bc25924a1adf..6cf58fe5bcfe 100644
@@ -1325,11 +1325,11 @@ int main(int ac, char *av[])
 	/* Determine GUI path */
 	env = getenv(SRCTREE);
 	if (env)
-		glade_file = g_strconcat(env, "/scripts/kconfig/gconf.glade", NULL);
+		glade_file = g_strconcat(env, "/scripts/kconfig/gconf.ui", NULL);
 	else if (av[0][0] == '/')
-		glade_file = g_strconcat(av[0], ".glade", NULL);
+		glade_file = g_strconcat(av[0], ".ui", NULL);
 	else
-		glade_file = g_strconcat(g_get_current_dir(), "/", av[0], ".glade", NULL);
+		glade_file = g_strconcat(g_get_current_dir(), "/", av[0], ".ui", NULL);
 
 	/* Conf stuffs */
 	if (ac > 1 && av[1][0] == '-') {
scripts/kconfig/gconf.ui renamed from scripts/kconfig/gconf.glade +0 -0
similarity index 100%
rename from scripts/kconfig/gconf.glade
rename to scripts/kconfig/gconf.ui
Signature · 1 line
2.43.0
Acked-by Tested-by on v2 4/9
#6 lore raw

Re: [PATCH v2 4/9] kconfig: gconf: rename gconf.glade to gconf.ui

Quoted 4 lines · Masahiro Yamada

The next commit will convert this file to GtkBuilder format. Rename it in advance to reflect the intended format.

Quoted 32 lines

---

(no changes since v1)

 scripts/kconfig/gconf.c                   | 6 +++---
 scripts/kconfig/{gconf.glade => gconf.ui} | 0
 2 files changed, 3 insertions(+), 3 deletions(-)
 rename scripts/kconfig/{gconf.glade => gconf.ui} (100%)
scripts/kconfig/gconf.c +3 -3
index bc25924a1adf..6cf58fe5bcfe 100644
@@ -1325,11 +1325,11 @@ int main(int ac, char *av[])
 	/* Determine GUI path */
 	env = getenv(SRCTREE);
 	if (env)
-		glade_file = g_strconcat(env, "/scripts/kconfig/gconf.glade", NULL);
+		glade_file = g_strconcat(env, "/scripts/kconfig/gconf.ui", NULL);
 	else if (av[0][0] == '/')
-		glade_file = g_strconcat(av[0], ".glade", NULL);
+		glade_file = g_strconcat(av[0], ".ui", NULL);
 	else
-		glade_file = g_strconcat(g_get_current_dir(), "/", av[0], ".glade", NULL);
+		glade_file = g_strconcat(g_get_current_dir(), "/", av[0], ".ui", NULL);
 
 	/* Conf stuffs */
 	if (ac > 1 && av[1][0] == '-') {
scripts/kconfig/gconf.ui renamed from scripts/kconfig/gconf.glade +0 -0
similarity index 100%
rename from scripts/kconfig/gconf.glade
rename to scripts/kconfig/gconf.ui
Signature · 1 line
~Randy
#7 lore raw

PATCH v2 5/9 kconfig: gconf: migrate to GTK 3

In reply to Masahiro Yamada

This commit switches from GTK 2.x to GTK 3, applying the following necessary changes:

- Do not include invidual headers
- GtkObject is gone
- Convert glade to GtkBuilder

[1]: https://docs.gtk.org/gtk3/migrating-2to3.html

---

(no changes since v1)

 scripts/kconfig/gconf-cfg.sh |  11 +-
 scripts/kconfig/gconf.c      |  70 ++++++------
 scripts/kconfig/gconf.ui     | 200 +++++++++++++++++------------------
 3 files changed, 135 insertions(+), 146 deletions(-)
scripts/kconfig/gconf-cfg.sh +2 -9
index fc954c0538fa..856c692f480c 100755
@@ -6,7 +6,7 @@ set -eu
 cflags=$1
 libs=$2
 
-PKG="gtk+-2.0 gmodule-2.0 libglade-2.0"
+PKG=gtk+-3.0
 
 if [ -z "$(command -v ${HOSTPKG_CONFIG})" ]; then
 	echo >&2 "*"
@@ -18,18 +18,11 @@ fi
 if ! ${HOSTPKG_CONFIG} --exists $PKG; then
 	echo >&2 "*"
 	echo >&2 "* Unable to find the GTK+ installation. Please make sure that"
-	echo >&2 "* the GTK+ 2.0 development package is correctly installed."
+	echo >&2 "* the GTK 3 development package is correctly installed."
 	echo >&2 "* You need $PKG"
 	echo >&2 "*"
 	exit 1
 fi
 
-if ! ${HOSTPKG_CONFIG} --atleast-version=2.0.0 gtk+-2.0; then
-	echo >&2 "*"
-	echo >&2 "* GTK+ is present but version >= 2.0.0 is required."
-	echo >&2 "*"
-	exit 1
-fi
-
 ${HOSTPKG_CONFIG} --cflags ${PKG} > ${cflags}
 ${HOSTPKG_CONFIG} --libs ${PKG} > ${libs}
scripts/kconfig/gconf.c +34 -36

197 lines not on this page · raw message

scripts/kconfig/gconf.ui +99 -101

581 lines not on this page · raw message

Signature · 1 line
2.43.0
#8 lore raw

Re: [PATCH v2 5/9] kconfig: gconf: migrate to GTK 3

Quoted 5 lines · Masahiro Yamada

This commit switches from GTK 2.x to GTK 3, applying the following necessary changes:

- Do not include invidual headers

This is a typo.

I will fix it to "individual".

Quoted 8 lines

- GtkObject is gone
- Convert glade to GtkBuilder

[1]: https://docs.gtk.org/gtk3/migrating-2to3.html

---

Signature · 2 lines
Best Regards
Masahiro Yamada
Acked-by Tested-by on v2 5/9
#9 lore raw

Re: [PATCH v2 5/9] kconfig: gconf: migrate to GTK 3

In reply to Masahiro Yamada
Quoted 10 lines · Masahiro Yamada

This commit switches from GTK 2.x to GTK 3, applying the following necessary changes:

- Do not include invidual headers
- GtkObject is gone
- Convert glade to GtkBuilder

[1]: https://docs.gtk.org/gtk3/migrating-2to3.html

Quoted 8 lines

---

(no changes since v1)

 scripts/kconfig/gconf-cfg.sh |  11 +-
 scripts/kconfig/gconf.c      |  70 ++++++------
 scripts/kconfig/gconf.ui     | 200 +++++++++++++++++------------------
 3 files changed, 135 insertions(+), 146 deletions(-)
Signature · 1 line
~Randy
#10 lore raw

PATCH v2 6/9 kconfig: gconf: replace GtkVbox with GtkBox

In reply to Masahiro Yamada

GtkVBox is deprecated with GTK 3.2. [1]

Use GtkBox instead.

[1]: https://gitlab.gnome.org/GNOME/gtk/-/blob/3.2.0/gtk/gtkvbox.c#L47

---

(no changes since v1)

 scripts/kconfig/gconf.ui | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
scripts/kconfig/gconf.ui +2 -1
index e5dad2b06502..378a3eadf9f8 100644
@@ -19,7 +19,8 @@
   <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
 
   <child>
-    <object class="GtkVBox" id="vbox1">
+    <object class="GtkBox" id="vbox1">
+      <property name="orientation">vertical</property>
       <property name="visible">True</property>
       <property name="homogeneous">False</property>
       <property name="spacing">0</property>
Signature · 1 line
2.43.0
#11 lore raw

PATCH v2 7/9 kconfig: gconf: replace GdkColor with GdkRGBA

In reply to Masahiro Yamada

GdkColor is deprecated with GTK 3.14. [1]

Use GdkRGBA instead.

This fixes warnings such as:

scripts/kconfig/gconf.c: In function ‘set_node’:
scripts/kconfig/gconf.c:138:9: warning: ‘gdk_color_parse’ is deprecated: Use 'gdk_rgba_parse' instead [-Wdeprecated-declarations]

  138 |         gdk_color_parse(menu_is_visible(menu) ? "Black" : "DarkGray", &color);
      |         ^~~~~~~~~~~~~~~

[1]: https://gitlab.gnome.org/GNOME/gtk/-/blob/3.14.0/gdk/deprecated/gdkcolor.h#L52

---

(no changes since v1)

 scripts/kconfig/gconf.c | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)
scripts/kconfig/gconf.c +11 -11
index a751ab6a98f0..2a4481b4b523 100644
@@ -128,7 +128,7 @@ static void set_node(GtkTreeStore *tree, GtkTreeIter *node, struct menu *menu)
 	const gchar *_mod = "";
 	const gchar *_yes = "";
 	const gchar *value = "";
-	GdkColor color;
+	GdkRGBA color;
 	gboolean editable = FALSE;
 	gboolean btnvis = FALSE;
 
@@ -138,7 +138,7 @@ static void set_node(GtkTreeStore *tree, GtkTreeIter *node, struct menu *menu)
 				 menu->type == M_COMMENT ? "***" : "",
 				 sym && !sym_has_value(sym) ? "(NEW)" : "");
 
-	gdk_color_parse(menu_is_visible(menu) ? "Black" : "DarkGray", &color);
+	gdk_rgba_parse(&color, menu_is_visible(menu) ? "Black" : "DarkGray");
 
 	if (!sym)
 		goto set;
@@ -1172,7 +1172,7 @@ static void init_left_tree(void)
 				   G_TYPE_STRING, G_TYPE_STRING,
 				   G_TYPE_STRING, G_TYPE_STRING,
 				   G_TYPE_STRING, G_TYPE_STRING,
-				   G_TYPE_POINTER, GDK_TYPE_COLOR,
+				   G_TYPE_POINTER, GDK_TYPE_RGBA,
 				   G_TYPE_BOOLEAN, GDK_TYPE_PIXBUF,
 				   G_TYPE_BOOLEAN, G_TYPE_BOOLEAN,
 				   G_TYPE_BOOLEAN, G_TYPE_BOOLEAN,
@@ -1203,7 +1203,7 @@ static void init_left_tree(void)
 	gtk_tree_view_column_set_attributes(GTK_TREE_VIEW_COLUMN(column),
 					    renderer,
 					    "text", COL_OPTION,
-					    "foreground-gdk",
+					    "foreground-rgba",
 					    COL_COLOR, NULL);
 
 	sel = gtk_tree_view_get_selection(view);
@@ -1223,7 +1223,7 @@ static void init_right_tree(void)
 				   G_TYPE_STRING, G_TYPE_STRING,
 				   G_TYPE_STRING, G_TYPE_STRING,
 				   G_TYPE_STRING, G_TYPE_STRING,
-				   G_TYPE_POINTER, GDK_TYPE_COLOR,
+				   G_TYPE_POINTER, GDK_TYPE_RGBA,
 				   G_TYPE_BOOLEAN, GDK_TYPE_PIXBUF,
 				   G_TYPE_BOOLEAN, G_TYPE_BOOLEAN,
 				   G_TYPE_BOOLEAN, G_TYPE_BOOLEAN,
@@ -1261,32 +1261,32 @@ static void init_right_tree(void)
 	gtk_tree_view_column_set_attributes(GTK_TREE_VIEW_COLUMN(column),
 					    renderer,
 					    "text", COL_OPTION,
-					    "foreground-gdk",
+					    "foreground-rgba",
 					    COL_COLOR, NULL);
 
 	renderer = gtk_cell_renderer_text_new();
 	gtk_tree_view_insert_column_with_attributes(view, -1,
 						    "Name", renderer,
 						    "text", COL_NAME,
-						    "foreground-gdk",
+						    "foreground-rgba",
 						    COL_COLOR, NULL);
 	renderer = gtk_cell_renderer_text_new();
 	gtk_tree_view_insert_column_with_attributes(view, -1,
 						    "N", renderer,
 						    "text", COL_NO,
-						    "foreground-gdk",
+						    "foreground-rgba",
 						    COL_COLOR, NULL);
 	renderer = gtk_cell_renderer_text_new();
 	gtk_tree_view_insert_column_with_attributes(view, -1,
 						    "M", renderer,
 						    "text", COL_MOD,
-						    "foreground-gdk",
+						    "foreground-rgba",
 						    COL_COLOR, NULL);
 	renderer = gtk_cell_renderer_text_new();
 	gtk_tree_view_insert_column_with_attributes(view, -1,
 						    "Y", renderer,
 						    "text", COL_YES,
-						    "foreground-gdk",
+						    "foreground-rgba",
 						    COL_COLOR, NULL);
 	renderer = gtk_cell_renderer_text_new();
 	gtk_tree_view_insert_column_with_attributes(view, -1,
@@ -1294,7 +1294,7 @@ static void init_right_tree(void)
 						    "text", COL_VALUE,
 						    "editable",
 						    COL_EDIT,
-						    "foreground-gdk",
+						    "foreground-rgba",
 						    COL_COLOR, NULL);
 	g_signal_connect(G_OBJECT(renderer), "edited",
 			 G_CALLBACK(renderer_edited), tree2_w);
Signature · 1 line
2.43.0
Tested-by on v2 7/9
#12 lore raw

Re: [PATCH v2 7/9] kconfig: gconf: replace GdkColor with GdkRGBA

Quoted 6 lines · Masahiro Yamada

GdkColor is deprecated with GTK 3.14. [1]

Use GdkRGBA instead.

This fixes warnings such as:

Quoted 8 lines

scripts/kconfig/gconf.c: In function ‘set_node’:
scripts/kconfig/gconf.c:138:9: warning: ‘gdk_color_parse’ is deprecated: Use 'gdk_rgba_parse' instead [-Wdeprecated-declarations]

  138 |         gdk_color_parse(menu_is_visible(menu) ? "Black" : "DarkGray", &color);
      |         ^~~~~~~~~~~~~~~

[1]: https://gitlab.gnome.org/GNOME/gtk/-/blob/3.14.0/gdk/deprecated/gdkcolor.h#L52

Quoted 7 lines

---

(no changes since v1)

 scripts/kconfig/gconf.c | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)
Signature · 1 line
~Randy
#13 lore raw

PATCH v2 8/9 kconfig: gconf: replace GtkHPaned and GtkVPaned with GtkPaned

In reply to Masahiro Yamada

GtkHPaned and GtkVPaned are deprecated with GTK 3.2. [1] [2]

Use GtkPaned instead.

[1]: https://gitlab.gnome.org/GNOME/gtk/-/blob/3.2.0/gtk/gtkhpaned.c#L44
[2]: https://gitlab.gnome.org/GNOME/gtk/-/blob/3.2.0/gtk/gtkvpaned.c#L44

---

Changes in v2:
- A new patch

 scripts/kconfig/gconf.ui | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
scripts/kconfig/gconf.ui +3 -2
index 378a3eadf9f8..f2c8342f1103 100644
@@ -422,7 +422,7 @@
       </child>
 
       <child>
-	<object class="GtkHPaned" id="hpaned1">
+	<object class="GtkPaned" id="hpaned1">
 	  <property name="width_request">1</property>
 	  <property name="visible">True</property>
 	  <property name="can_focus">True</property>
@@ -453,7 +453,8 @@
 	  </child>
 
 	  <child>
-	    <object class="GtkVPaned" id="vpaned1">
+	    <object class="GtkPaned" id="vpaned1">
+	      <property name="orientation">vertical</property>
 	      <property name="visible">True</property>
 	      <property name="can_focus">True</property>
 
Signature · 1 line
2.43.0
#14 lore raw

PATCH v2 9/9 kconfig: gconf: show GTK version in About dialog

In reply to Masahiro Yamada

Likewise xconfig, it is useful to display the GTK version in the About dialog.

---

(no changes since v1)

 scripts/kconfig/gconf.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)
scripts/kconfig/gconf.c +5 -1
index 2a4481b4b523..e43d83dcdfb8 100644
@@ -523,7 +523,11 @@ static void on_about1_activate(GtkMenuItem *menuitem, gpointer user_data)
 	dialog = gtk_message_dialog_new(GTK_WINDOW(main_wnd),
 					GTK_DIALOG_DESTROY_WITH_PARENT,
 					GTK_MESSAGE_INFO,
-					GTK_BUTTONS_CLOSE, "%s", about_text);
+					GTK_BUTTONS_CLOSE, "%s\nGTK version: %d.%d.%d",
+					about_text,
+					gtk_get_major_version(),
+					gtk_get_minor_version(),
+					gtk_get_micro_version());
 	gtk_dialog_run(GTK_DIALOG(dialog));
 	gtk_widget_destroy(dialog);
 }
Signature · 1 line
2.43.0
Acked-by Tested-by on v2 9/9
#15 lore raw

Re: [PATCH v2 9/9] kconfig: gconf: show GTK version in About dialog

Quoted 4 lines · Masahiro Yamada

Likewise xconfig, it is useful to display the GTK version in the About dialog.

Quoted 7 lines

---

(no changes since v1)

 scripts/kconfig/gconf.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)
Signature · 1 line
~Randy
#16 lore raw
In reply to Masahiro Yamada
Quoted 5 lines · Masahiro Yamada

- Code refactoring
- Migrate GTK 2 to GTK3
- Fix all compile warnings

Hi,

If I am testing your recent *config patches, should I replace all gconf patches from the patch 00/66 series with these patches?

Thanks.

Quoted 17 lines

Masahiro Yamada (9):
kconfig: gconf: fix behavior of a menu under a symbol in split view
kconfig: gconf: use configure-event handler to adjust pane separator
kconfig: gconf: rename display_tree_part()
kconfig: gconf: rename gconf.glade to gconf.ui
kconfig: gconf: migrate to GTK 3
kconfig: gconf: replace GtkVbox with GtkBox
kconfig: gconf: replace GdkColor with GdkRGBA
kconfig: gconf: replace GtkHPaned and GtkVPaned with GtkPaned
kconfig: gconf: show GTK version in About dialog

 scripts/kconfig/gconf-cfg.sh              |  11 +-
 scripts/kconfig/gconf.c                   | 146 ++++++++--------
 scripts/kconfig/{gconf.glade => gconf.ui} | 202 +++++++++++-----------
 3 files changed, 171 insertions(+), 188 deletions(-)
 rename scripts/kconfig/{gconf.glade => gconf.ui} (83%)
Signature · 1 line
~Randy
#17 lore raw
Quoted 10 lines · Randy Dunlap
Quoted 5 lines · Masahiro Yamada

- Code refactoring
- Migrate GTK 2 to GTK3
- Fix all compile warnings

Quoted 5 lines

Hi,

If I am testing your recent *config patches, should I replace all gconf patches from the patch 00/66 series with these patches?

Sorry for the confusion.

To avoid flooding the ML again, I only submitted v2 for some changed patches.

For convenience, I created a topic branch that contains the entire patch set.

git git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild.git
gconfig-v2

Your review and test are appreciated.

--
Best Regards
Masahiro Yamada