From nobody Wed Oct 8 10:56:55 2025 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 62F66238D56; Sun, 29 Jun 2025 18:46:00 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1751222760; cv=none; b=KDkPT/KB3w23zJCXpHbJfCMuudroAeO0NYRzXvC+nJ41qxEks7YUXysuh44QyQthn1u9eT2u1QL6GCniNM95osl9vmzT2clhTRAIWkRteiU6OOGaZNzDMMdyawEZIT1LNc9ZtowRrY7eTvOhpfD6g3yIuhrJOj6AENPIHEn3v5Q= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1751222760; c=relaxed/simple; bh=7DyXO+EX3WfxelWY4pMDsRbHT+kgdvu4B85zzjnLvjI=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=m4Wo4LyQFx7DXqqnGGTU5BfJN8UcpGqq3v7tMiIXRZzkxisFTuJcTsty/nLPSh+NhKV6XG9PBSrt6QGH7fK2DkYnJj3ZkMmEncbVF8Aicz7m7JE0iPjz0UoeJhK0Zmu6HnuU0wB1fct4TrW3TbKai9681RVTXXAk4bdLIt39SuU= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=ojAeSwWZ; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="ojAeSwWZ" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 1CD86C4CEEB; Sun, 29 Jun 2025 18:45:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1751222760; bh=7DyXO+EX3WfxelWY4pMDsRbHT+kgdvu4B85zzjnLvjI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ojAeSwWZ6jWGW1wc12yhd8wJ9KsUJweqL+v/ykTSeS8/np8lmSoykw1a2afXW9usR wGWX791AyCn/FQj5fgQrdb1vVXB6Q+vLspBdi9SkCfzzuycKg45Vc48TTuWxNc+mh6 ki0lTAgw8l38iLVPMlJ1WTuArG6rASJRsxiAPmJ6FdzdgIHBk1C6YMk9CgZOkrhKq8 HivK/5jtxlsTwb7iM+GJ9naqsw1FeP/cG6aV+p+dGR3SqTgfog0mg27x5uPA4rCxHx HcHMwH20TwQFc3SJUVgqCI63deZ+whDuIT9mLav0lYNv5Kroj6rB9FyQwsZXjx/9bp Q8erXTJ26BAJQ== From: Masahiro Yamada To: linux-kbuild@vger.kernel.org Cc: Masahiro Yamada , linux-kernel@vger.kernel.org Subject: [PATCH v2 1/9] kconfig: gconf: fix behavior of a menu under a symbol in split view Date: Mon, 30 Jun 2025 03:43:27 +0900 Message-ID: <20250629184554.407497-2-masahiroy@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250629184554.407497-1-masahiroy@kernel.org> References: <20250629184554.407497-1-masahiroy@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" 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. Signed-off-by: Masahiro Yamada --- Changes in v2: - A new patch scripts/kconfig/gconf.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/scripts/kconfig/gconf.c b/scripts/kconfig/gconf.c index 529a836ed5da..22badd2f710e 100644 --- a/scripts/kconfig/gconf.c +++ b/scripts/kconfig/gconf.c @@ -801,7 +801,7 @@ static gboolean on_treeview2_button_press_event(GtkWidg= et *widget, enum prop_type ptype; ptype =3D menu->prompt ? menu->prompt->type : P_UNKNOWN; =20 - if (ptype =3D=3D P_MENU && view_mode !=3D FULL_VIEW && col =3D=3D COL_OP= TION) { + if (ptype =3D=3D P_MENU && view_mode =3D=3D SINGLE_VIEW && col =3D=3D CO= L_OPTION) { // goes down into menu browsed =3D menu; display_tree_part(); @@ -951,8 +951,7 @@ static void _display_tree(GtkTreeStore *tree, struct me= nu *menu, gtk_tree_store_append(tree, &iter, parent); set_node(tree, &iter, child); =20 - if ((view_mode !=3D FULL_VIEW) && (ptype =3D=3D P_MENU) - && (tree =3D=3D tree2)) + if ((view_mode =3D=3D SINGLE_VIEW) && (ptype =3D=3D P_MENU)) continue; /* if (((menu !=3D &rootmenu) && !(menu->flags & MENU_ROOT)) --=20 2.43.0 From nobody Wed Oct 8 10:56:55 2025 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id C360C23AB87; Sun, 29 Jun 2025 18:46:01 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1751222761; cv=none; b=LeE+DYnvQb0UvL7dvJtZUc55A6F3laskigdo/EiIZUxqs3hdw9SnzKU6edDn8blKfrv0/d26p4ia2KpkEt+ODgF0GnVdOsnI6OnXgZJVYuW2SUjhm5Yfb3na6hX6IctE8Laipbhanvl0hVMs+P3qDXxHvdNgKHBak78sBsMofHI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1751222761; c=relaxed/simple; bh=Jg24bE5ko6KBIoUhz455cbr/+I0a8Ft1cMfIhIylQdU=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=iWDe2WZEw/c1XUENsk6qYgwU7QTe/+kE3rQ+cwH0d8cyqotiuRj87ajssX6NHbPetzZebVrCv9sl5/xfWBbeXk1sshGtBUgjeV+bcS5UmiVQVLAv7SEi35L3iN7AyCqYsg6NtF9I9njUo2HewiD8Llg8tNH9kIyNkj1F3sdMFBI= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=YMheCPcj; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="YMheCPcj" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 89708C4CEF1; Sun, 29 Jun 2025 18:46:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1751222761; bh=Jg24bE5ko6KBIoUhz455cbr/+I0a8Ft1cMfIhIylQdU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=YMheCPcj2a39tFCrBC1nIgjM11OOC+dAOZt95AS6hFJ5DNMT6x6wPxSd1ECLs6pDH BUK7fLDsBxi4Vf/WJo2iGeUcm+iXV6VRcs2b6vy8RT6jiUATHinijb2W5IwFc4lLGd oYQYmaIeJJEYuO4twch3Rj6ncov311Ew5SJfKGXZgr4kgcuDr7+cR7tX1oKYVOal8D MPqjDPsZDepV/DkzVtR9jd52/FXNmX4174nqHC0XPHcjqFgNVukftmIKId/TjVTx7W 0TI+PKrxEDRoZxvRdT7LGqqkZzjQKbD2nEvm9q4VnLSyIEuq1FB/ef9c/UzokW7XHq 3Li5YVwfcW9Vw== From: Masahiro Yamada To: linux-kbuild@vger.kernel.org Cc: Masahiro Yamada , linux-kernel@vger.kernel.org Subject: [PATCH v2 2/9] kconfig: gconf: use configure-event handler to adjust pane separator Date: Mon, 30 Jun 2025 03:43:28 +0900 Message-ID: <20250629184554.407497-3-masahiroy@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250629184554.407497-1-masahiroy@kernel.org> References: <20250629184554.407497-1-masahiroy@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" 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. Signed-off-by: Masahiro Yamada Tested-by: Randy Dunlap --- 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(-) diff --git a/scripts/kconfig/gconf.c b/scripts/kconfig/gconf.c index 22badd2f710e..8b19298eef61 100644 --- a/scripts/kconfig/gconf.c +++ b/scripts/kconfig/gconf.c @@ -604,23 +604,12 @@ static void on_window1_destroy(GtkObject *object, gpo= inter user_data) gtk_main_quit(); } =20 -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 =3D=3D NULL) - gtk_window_get_default_size(GTK_WINDOW(main_wnd), &w, &h); - else - gdk_window_get_size(widget->window, &w, &h); - - if (h =3D=3D old_h) - return; - old_h =3D h; - - gtk_paned_set_position(GTK_PANED(vpaned), 2 * h / 3); + gtk_paned_set_position(GTK_PANED(vpaned), 2 * event->height / 3); + return FALSE; } =20 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 =3D 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); =20 --=20 2.43.0 From nobody Wed Oct 8 10:56:55 2025 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id DAAB523ABB0; Sun, 29 Jun 2025 18:46:02 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1751222763; cv=none; b=R8xqT/+qavRV0ymMG5LDYFlaQfjx6d9dIPeJYmAAojEUWsFEa6R8+pYVvg7ysPLSVPstOLUm7qgRksydwQHChZ94RyUD84OtKTSgTGRDFWL2o97Zy7bdRd52z6GPzfsqbpFg5LfZi8fgMFB8oPbh9lC5Y8+aCcOoV/LOwrp1Lk8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1751222763; c=relaxed/simple; bh=WdrN3yT3caKcROu27pF5IqWbxdrO1B5dCUQziQ/YDyY=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=fiXiYrAaZyuadRH7V94diVVybaCfb3ZNgSL940/5S4eCIhLqFL+b6qdqgqRdvUaXqf+uELuoBodktMWHuFSVdHhZFSZ5+QOwbfU84MfZpw2G8T5xmVJwvAECwxm4W4E2UPVHNMIEK783cCvIHpQggq37vSZAxSo0OB2cyz+SsYg= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=sMuoX0lX; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="sMuoX0lX" Received: by smtp.kernel.org (Postfix) with ESMTPSA id F0963C4CEEF; Sun, 29 Jun 2025 18:46:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1751222762; bh=WdrN3yT3caKcROu27pF5IqWbxdrO1B5dCUQziQ/YDyY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=sMuoX0lXdTNQauFlJWa9XrnGGbz2zK2e/qR82d1WNfGUaFYn++C5y4r5H5vlVc7wh yN0B2Mg3IOPaxt4DQGkTlxLsamDb+Uyj+VvdvQJI7Pp3384TA/p4W3ZBumjbDYfMwq LrUgauve5mgXJBaVTvKRxkoebJIltDManNIHijaFRXcabNYWIFDhOc2b88RGmVF1bN F8qMWA+iLs97p1aqV1aMIeoU1uLs/0L0Tm2MRdlQ68NNDFx6Fz3Y1kbf0oCQbkvvBw hZ7LzV3dGHyWnf84BIGAjncQ1NFRfTxZuj87dN1ytsO1xxIgvdW4T8ScjNT9zBR1rJ H1NkmUFtCY8Uw== From: Masahiro Yamada To: linux-kbuild@vger.kernel.org Cc: Masahiro Yamada , linux-kernel@vger.kernel.org Subject: [PATCH v2 3/9] kconfig: gconf: rename display_tree_part() Date: Mon, 30 Jun 2025 03:43:29 +0900 Message-ID: <20250629184554.407497-4-masahiroy@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250629184554.407497-1-masahiroy@kernel.org> References: <20250629184554.407497-1-masahiroy@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" This function recreates the tree store to update the menu content. Rename it to recreate_tree() to better reflect its purpose. Signed-off-by: Masahiro Yamada --- Changes in v2: - Rename to recreate_tree() scripts/kconfig/gconf.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/scripts/kconfig/gconf.c b/scripts/kconfig/gconf.c index 8b19298eef61..bc25924a1adf 100644 --- a/scripts/kconfig/gconf.c +++ b/scripts/kconfig/gconf.c @@ -57,7 +57,7 @@ enum { }; =20 static void display_tree(GtkTreeStore *store, struct menu *menu); -static void display_tree_part(void); +static void recreate_tree(void); =20 static void conf_changed(bool dirty) { @@ -279,7 +279,7 @@ static void set_view_mode(enum view_mode mode) browsed =3D menu_get_parent_menu(selected) ?: &rootmenu; else browsed =3D &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 =3D browsed->prompt ? browsed->prompt->type : P_UNKNOWN; if (ptype !=3D P_MENU) browsed =3D browsed->parent; - display_tree_part(); + recreate_tree(); =20 if (browsed =3D=3D &rootmenu) gtk_widget_set_sensitive(back_btn, FALSE); @@ -793,7 +793,7 @@ static gboolean on_treeview2_button_press_event(GtkWidg= et *widget, if (ptype =3D=3D P_MENU && view_mode =3D=3D SINGLE_VIEW && col =3D=3D CO= L_OPTION) { // goes down into menu browsed =3D menu; - display_tree_part(); + recreate_tree(); gtk_widget_set_sensitive(back_btn, TRUE); } else if (col =3D=3D COL_OPTION) { toggle_sym_value(menu); @@ -898,7 +898,7 @@ static gboolean on_treeview1_button_press_event(GtkWidg= et *widget, =20 if (menu->type =3D=3D M_MENU) { browsed =3D menu; - display_tree_part(); + recreate_tree(); } =20 gtk_tree_view_set_cursor(view, path, NULL, FALSE); @@ -960,7 +960,7 @@ static void display_tree(GtkTreeStore *store, struct me= nu *menu) } =20 /* 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); --=20 2.43.0 From nobody Wed Oct 8 10:56:55 2025 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id E593F23B63D; Sun, 29 Jun 2025 18:46:04 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1751222765; cv=none; b=RPZqj1G4oYIhG+XX60LBHItkrkyeZvSqmKM3InjfbQWPCtFzRMI0gUedlpizS9IiEklPoQajajJygUowd49GeFQ4nFBEH+z8zqDZu8sfGhXhju9/xw/979qMRqGGSDoIxrjJxSDVm6DC5p8jVoTkWrDEi4+JiU14gEaQP2dAVNo= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1751222765; c=relaxed/simple; bh=6qmI+Su7XzuajmCFhroeUQcivTIBTD9Q5REVTanqpXw=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Vjkf2nZE7IL1JFTcViHW5VUH6RI2qXbuSGqT4kMDkK2fVvyTV4EI1amrNERDzasX/EsFsoKNfU8dGjRtxnVIIrwwidbHN37yfSpvpgBtEgL8io1Buac+yB+kzoYJcMNY8WqJYVSLpyWkQ7gJW/cVa7RQaLR1zDRNwBB2ZWOi/Zc= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=tcvFFW57; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="tcvFFW57" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 60947C4CEFC; Sun, 29 Jun 2025 18:46:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1751222764; bh=6qmI+Su7XzuajmCFhroeUQcivTIBTD9Q5REVTanqpXw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=tcvFFW57QuRqg7Gi33lGRu/JtXXym49iSKLF4VMjriFGYeQSWB0i2pF88AJkSBNWj EJ9lA3UTYpMIDpZfWXbp7LE34aPFj1skYQnwAmAJOyJ23nocGrxzoTPz1G76D5JHxQ rjCOY1VCD0SGQtFaXI+kUhmeAj6OJe5xv4ubPbu368QFH1A3nGhOXKYpbupPLrdKgG mbxaFrIJsp4O7f+a/VBRY3Qg6XeQohILJRnna7Ci7x9uaqw/00uFCrIbdABASHtXA5 ZP+36vqNCgTxS0m6ytW7LSsUZASESa8RQ9YLu3TzrnB8/yQABISVAsHQjYeOQm5EKP lFeEZeRL8mbZg== From: Masahiro Yamada To: linux-kbuild@vger.kernel.org Cc: Masahiro Yamada , linux-kernel@vger.kernel.org Subject: [PATCH v2 4/9] kconfig: gconf: rename gconf.glade to gconf.ui Date: Mon, 30 Jun 2025 03:43:30 +0900 Message-ID: <20250629184554.407497-5-masahiroy@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250629184554.407497-1-masahiroy@kernel.org> References: <20250629184554.407497-1-masahiroy@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" The next commit will convert this file to GtkBuilder format. Rename it in advance to reflect the intended format. Signed-off-by: Masahiro Yamada Acked-by: Randy Dunlap Tested-by: Randy Dunlap --- (no changes since v1) scripts/kconfig/gconf.c | 6 +++--- scripts/kconfig/{gconf.glade =3D> gconf.ui} | 0 2 files changed, 3 insertions(+), 3 deletions(-) rename scripts/kconfig/{gconf.glade =3D> gconf.ui} (100%) diff --git a/scripts/kconfig/gconf.c b/scripts/kconfig/gconf.c index bc25924a1adf..6cf58fe5bcfe 100644 --- a/scripts/kconfig/gconf.c +++ b/scripts/kconfig/gconf.c @@ -1325,11 +1325,11 @@ int main(int ac, char *av[]) /* Determine GUI path */ env =3D getenv(SRCTREE); if (env) - glade_file =3D g_strconcat(env, "/scripts/kconfig/gconf.glade", NULL); + glade_file =3D g_strconcat(env, "/scripts/kconfig/gconf.ui", NULL); else if (av[0][0] =3D=3D '/') - glade_file =3D g_strconcat(av[0], ".glade", NULL); + glade_file =3D g_strconcat(av[0], ".ui", NULL); else - glade_file =3D g_strconcat(g_get_current_dir(), "/", av[0], ".glade", NU= LL); + glade_file =3D g_strconcat(g_get_current_dir(), "/", av[0], ".ui", NULL); =20 /* Conf stuffs */ if (ac > 1 && av[1][0] =3D=3D '-') { diff --git a/scripts/kconfig/gconf.glade b/scripts/kconfig/gconf.ui similarity index 100% rename from scripts/kconfig/gconf.glade rename to scripts/kconfig/gconf.ui --=20 2.43.0 From nobody Wed Oct 8 10:56:55 2025 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 1A80B23504D; Sun, 29 Jun 2025 18:46:06 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1751222766; cv=none; b=uH32FPV8+7OBBgYNrLIaR1rwwJhJOV3DbjIdkGSnlmmkFpaxM8JwUCcc+yVTUDZtoczar66JcUHJfbjCI2dTk1L/G5127GO7CGhy9bW4EfggqQa4OXDKo5NTGWa7nvu8idADjtfRp705xCCV+V4YGBakqz8jtIAO5fbsUb/jFHE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1751222766; c=relaxed/simple; bh=I3dcuAHNmTDdneB+tDus2seE/hobOwzqn4rfPGLFWqs=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=AFARmJTb76RsuF+1wmRJpuCq8FV2bKVqh4OLpf9VU2Rdy3Xq4WF5BZziZkPFs4cGtlgmLq8tNsZ5LXAYchaFacSJpERy3u3rn+nHQSkuYwvdhONbUIG3WwUeTTW9vPBL+1AdBtt7eAzmpy8oTSixnI/71JNLwhiCD478u8IV3ww= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=kX/WQsKa; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="kX/WQsKa" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 0E11AC4CEEB; Sun, 29 Jun 2025 18:46:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1751222765; bh=I3dcuAHNmTDdneB+tDus2seE/hobOwzqn4rfPGLFWqs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=kX/WQsKaQ9wsqEn8bYxaGLC89hZ8vOXYKSLrTodaGTgxHQUAEab9LCna7EJxzyQo5 5qndSAUFG8kc1VkDfMV8Xlzf4I5giEpzD8qTc5AmpF32ujDGSBRDi8f5XPXHdtHvNS 5F0t83Wae0f9Jcv/XJnhl2x2/uUMPaIiXcia6H5ebtvf6Z0fqZs7hWLIR5xeeamhyX 6Qu8smhGU1p93sAov8wG2LuuVFxechMN05srK9Oq9fnxigAY4aEROKZA6b0D69S2Xx H+jsrYRy7IlYd7Jy6VATI7h+W982lMrInJqirOM8KoSOU0gimc95Wz1M7qeNAqlkfu l4F3DOgUZ5S8Q== From: Masahiro Yamada To: linux-kbuild@vger.kernel.org Cc: Masahiro Yamada , linux-kernel@vger.kernel.org Subject: [PATCH v2 5/9] kconfig: gconf: migrate to GTK 3 Date: Mon, 30 Jun 2025 03:43:31 +0900 Message-ID: <20250629184554.407497-6-masahiroy@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250629184554.407497-1-masahiroy@kernel.org> References: <20250629184554.407497-1-masahiroy@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" 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 Signed-off-by: Masahiro Yamada Acked-by: Randy Dunlap Tested-by: Randy Dunlap --- (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(-) diff --git a/scripts/kconfig/gconf-cfg.sh b/scripts/kconfig/gconf-cfg.sh index fc954c0538fa..856c692f480c 100755 --- a/scripts/kconfig/gconf-cfg.sh +++ b/scripts/kconfig/gconf-cfg.sh @@ -6,7 +6,7 @@ set -eu cflags=3D$1 libs=3D$2 =20 -PKG=3D"gtk+-2.0 gmodule-2.0 libglade-2.0" +PKG=3Dgtk+-3.0 =20 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 =20 -if ! ${HOSTPKG_CONFIG} --atleast-version=3D2.0.0 gtk+-2.0; then - echo >&2 "*" - echo >&2 "* GTK+ is present but version >=3D 2.0.0 is required." - echo >&2 "*" - exit 1 -fi - ${HOSTPKG_CONFIG} --cflags ${PKG} > ${cflags} ${HOSTPKG_CONFIG} --libs ${PKG} > ${libs} diff --git a/scripts/kconfig/gconf.c b/scripts/kconfig/gconf.c index 6cf58fe5bcfe..a751ab6a98f0 100644 --- a/scripts/kconfig/gconf.c +++ b/scripts/kconfig/gconf.c @@ -7,10 +7,7 @@ #include "lkc.h" #include "images.h" =20 -#include #include -#include -#include =20 #include #include @@ -599,7 +596,7 @@ static void on_expand_clicked(GtkButton *button, gpoint= er user_data) =20 /* Main Windows Callbacks */ =20 -static void on_window1_destroy(GtkObject *object, gpointer user_data) +static void on_window1_destroy(GtkWidget *widget, gpointer user_data) { gtk_main_quit(); } @@ -999,15 +996,15 @@ static void replace_button_icon(GtkWidget *widget, co= nst char * const xpm[]) =20 static void init_main_window(const gchar *glade_file) { - GladeXML *xml; + GtkBuilder *builder; GtkWidget *widget; GtkTextBuffer *txtbuf; =20 - xml =3D glade_xml_new(glade_file, "window1", NULL); - if (!xml) + builder =3D gtk_builder_new_from_file(glade_file); + if (!builder) g_error("GUI loading failed !\n"); =20 - main_wnd =3D glade_xml_get_widget(xml, "window1"); + main_wnd =3D GTK_WIDGET(gtk_builder_get_object(builder, "window1")); g_signal_connect(main_wnd, "destroy", G_CALLBACK(on_window1_destroy), NULL); g_signal_connect(main_wnd, "configure-event", @@ -1015,9 +1012,9 @@ static void init_main_window(const gchar *glade_file) g_signal_connect(main_wnd, "delete_event", G_CALLBACK(on_window1_delete_event), NULL); =20 - hpaned =3D glade_xml_get_widget(xml, "hpaned1"); - vpaned =3D glade_xml_get_widget(xml, "vpaned1"); - tree1_w =3D glade_xml_get_widget(xml, "treeview1"); + hpaned =3D GTK_WIDGET(gtk_builder_get_object(builder, "hpaned1")); + vpaned =3D GTK_WIDGET(gtk_builder_get_object(builder, "vpaned1")); + tree1_w =3D GTK_WIDGET(gtk_builder_get_object(builder, "treeview1")); g_signal_connect(tree1_w, "cursor_changed", G_CALLBACK(on_treeview2_cursor_changed), NULL); g_signal_connect(tree1_w, "button_press_event", @@ -1025,7 +1022,7 @@ static void init_main_window(const gchar *glade_file) g_signal_connect(tree1_w, "key_press_event", G_CALLBACK(on_treeview2_key_press_event), NULL); =20 - tree2_w =3D glade_xml_get_widget(xml, "treeview2"); + tree2_w =3D GTK_WIDGET(gtk_builder_get_object(builder, "treeview2")); g_signal_connect(tree2_w, "cursor_changed", G_CALLBACK(on_treeview2_cursor_changed), NULL); g_signal_connect(tree2_w, "button_press_event", @@ -1033,101 +1030,101 @@ static void init_main_window(const gchar *glade_f= ile) g_signal_connect(tree2_w, "key_press_event", G_CALLBACK(on_treeview2_key_press_event), NULL); =20 - text_w =3D glade_xml_get_widget(xml, "textview3"); + text_w =3D GTK_WIDGET(gtk_builder_get_object(builder, "textview3")); =20 /* menubar */ - widget =3D glade_xml_get_widget(xml, "load1"); + widget =3D GTK_WIDGET(gtk_builder_get_object(builder, "load1")); g_signal_connect(widget, "activate", G_CALLBACK(on_load1_activate), NULL); =20 - save_menu_item =3D glade_xml_get_widget(xml, "save1"); + save_menu_item =3D GTK_WIDGET(gtk_builder_get_object(builder, "save1")); g_signal_connect(save_menu_item, "activate", G_CALLBACK(on_save_activate), NULL); =20 - widget =3D glade_xml_get_widget(xml, "save_as1"); + widget =3D GTK_WIDGET(gtk_builder_get_object(builder, "save_as1")); g_signal_connect(widget, "activate", G_CALLBACK(on_save_as1_activate), NULL); =20 - widget =3D glade_xml_get_widget(xml, "quit1"); + widget =3D GTK_WIDGET(gtk_builder_get_object(builder, "quit1")); g_signal_connect(widget, "activate", G_CALLBACK(on_quit1_activate), NULL); =20 - widget =3D glade_xml_get_widget(xml, "show_name1"); + widget =3D GTK_WIDGET(gtk_builder_get_object(builder, "show_name1")); g_signal_connect(widget, "activate", G_CALLBACK(on_show_name1_activate), NULL); gtk_check_menu_item_set_active((GtkCheckMenuItem *) widget, show_name); =20 - widget =3D glade_xml_get_widget(xml, "show_range1"); + widget =3D GTK_WIDGET(gtk_builder_get_object(builder, "show_range1")); g_signal_connect(widget, "activate", G_CALLBACK(on_show_range1_activate), NULL); gtk_check_menu_item_set_active((GtkCheckMenuItem *) widget, show_range); =20 - widget =3D glade_xml_get_widget(xml, "show_data1"); + widget =3D GTK_WIDGET(gtk_builder_get_object(builder, "show_data1")); g_signal_connect(widget, "activate", G_CALLBACK(on_show_data1_activate), NULL); gtk_check_menu_item_set_active((GtkCheckMenuItem *) widget, show_value); =20 - widget =3D glade_xml_get_widget(xml, "set_option_mode1"); + widget =3D GTK_WIDGET(gtk_builder_get_object(builder, "set_option_mode1")= ); g_signal_connect(widget, "activate", G_CALLBACK(on_set_option_mode1_activate), NULL); =20 - widget =3D glade_xml_get_widget(xml, "set_option_mode2"); + widget =3D GTK_WIDGET(gtk_builder_get_object(builder, "set_option_mode2")= ); g_signal_connect(widget, "activate", G_CALLBACK(on_set_option_mode2_activate), NULL); =20 - widget =3D glade_xml_get_widget(xml, "set_option_mode3"); + widget =3D GTK_WIDGET(gtk_builder_get_object(builder, "set_option_mode3")= ); g_signal_connect(widget, "activate", G_CALLBACK(on_set_option_mode3_activate), NULL); =20 - widget =3D glade_xml_get_widget(xml, "introduction1"); + widget =3D GTK_WIDGET(gtk_builder_get_object(builder, "introduction1")); g_signal_connect(widget, "activate", G_CALLBACK(on_introduction1_activate), NULL); =20 - widget =3D glade_xml_get_widget(xml, "about1"); + widget =3D GTK_WIDGET(gtk_builder_get_object(builder, "about1")); g_signal_connect(widget, "activate", G_CALLBACK(on_about1_activate), NULL); =20 - widget =3D glade_xml_get_widget(xml, "license1"); + widget =3D GTK_WIDGET(gtk_builder_get_object(builder, "license1")); g_signal_connect(widget, "activate", G_CALLBACK(on_license1_activate), NULL); =20 /* toolbar */ - back_btn =3D glade_xml_get_widget(xml, "button1"); + back_btn =3D GTK_WIDGET(gtk_builder_get_object(builder, "button1")); g_signal_connect(back_btn, "clicked", G_CALLBACK(on_back_clicked), NULL); gtk_widget_set_sensitive(back_btn, FALSE); =20 - widget =3D glade_xml_get_widget(xml, "button2"); + widget =3D GTK_WIDGET(gtk_builder_get_object(builder, "button2")); g_signal_connect(widget, "clicked", G_CALLBACK(on_load_clicked), NULL); =20 - save_btn =3D glade_xml_get_widget(xml, "button3"); + save_btn =3D GTK_WIDGET(gtk_builder_get_object(builder, "button3")); g_signal_connect(save_btn, "clicked", G_CALLBACK(on_save_clicked), NULL); =20 - single_btn =3D glade_xml_get_widget(xml, "button4"); + single_btn =3D GTK_WIDGET(gtk_builder_get_object(builder, "button4")); g_signal_connect(single_btn, "clicked", G_CALLBACK(on_single_clicked), NULL); replace_button_icon(single_btn, xpm_single_view); =20 - split_btn =3D glade_xml_get_widget(xml, "button5"); + split_btn =3D GTK_WIDGET(gtk_builder_get_object(builder, "button5")); g_signal_connect(split_btn, "clicked", G_CALLBACK(on_split_clicked), NULL); replace_button_icon(split_btn, xpm_split_view); =20 - full_btn =3D glade_xml_get_widget(xml, "button6"); + full_btn =3D GTK_WIDGET(gtk_builder_get_object(builder, "button6")); g_signal_connect(full_btn, "clicked", G_CALLBACK(on_full_clicked), NULL); replace_button_icon(full_btn, xpm_tree_view); =20 - widget =3D glade_xml_get_widget(xml, "button7"); + widget =3D GTK_WIDGET(gtk_builder_get_object(builder, "button7")); g_signal_connect(widget, "clicked", G_CALLBACK(on_collapse_clicked), NULL); =20 - widget =3D glade_xml_get_widget(xml, "button8"); + widget =3D GTK_WIDGET(gtk_builder_get_object(builder, "button8")); g_signal_connect(widget, "clicked", G_CALLBACK(on_expand_clicked), NULL); =20 @@ -1142,7 +1139,9 @@ static void init_main_window(const gchar *glade_file) =20 gtk_window_set_title(GTK_WINDOW(main_wnd), rootmenu.prompt->text); =20 - gtk_widget_show(main_wnd); + gtk_widget_show_all(main_wnd); + + g_object_unref(builder); =20 conf_set_changed_callback(conf_changed); } @@ -1320,7 +1319,6 @@ int main(int ac, char *av[]) =20 /* GTK stuffs */ gtk_init(&ac, &av); - glade_init(); =20 /* Determine GUI path */ env =3D getenv(SRCTREE); diff --git a/scripts/kconfig/gconf.ui b/scripts/kconfig/gconf.ui index f0c572c7f47c..e5dad2b06502 100644 --- a/scripts/kconfig/gconf.ui +++ b/scripts/kconfig/gconf.ui @@ -1,8 +1,8 @@ =20 - + =20 - + True Gtk Kernel Configurator GTK_WINDOW_TOPLEVEL @@ -19,193 +19,193 @@ GDK_GRAVITY_NORTH_WEST =20 - + True False 0 =20 - + True =20 - + True _File True =20 - - + + =20 - + True Load a config= file _Load True - + =20 - + True Save the conf= ig in .config _Save True - + =20 - + True Save the conf= ig in a file Save _as True - + =20 - + True - + =20 - + True _Quit True - + - + - + =20 - + True _Options True =20 - - + + =20 - + True Show name Show _name True False - + =20 - + True Show range (Y= /M/N) Show _range True False - + =20 - + True Show value of= the option Show _data True False - + =20 - + True - + =20 - + True Show normal o= ptions Show normal options<= /property> True True - + =20 - + True Show all opti= ons Show all _options True False set_option_mode1 - + =20 - + True Show all opti= ons with prompts Show all prompt opti= ons True False set_option_mode1 - + =20 - + - + =20 - + True _Help True =20 - - + + =20 - + True _Introduction True - + =20 - + True _About True - + =20 - + True _License True - + - + - + - + 0 False @@ -214,14 +214,14 @@ =20 - + True GTK_ORIENTATION_HORIZONTAL GTK_TOOLBAR_BOTH True =20 - + True Goes up of one le= vel (single view) Back @@ -230,7 +230,7 @@ True True False - + False True @@ -238,18 +238,18 @@ =20 - + True True True False =20 - + True - + - + False False @@ -257,7 +257,7 @@ =20 - + True Load a config fil= e Load @@ -266,7 +266,7 @@ True True False - + False True @@ -274,7 +274,7 @@ =20 - + True Save a config fil= e Save @@ -283,7 +283,7 @@ True True False - + False True @@ -291,18 +291,18 @@ =20 - + True True True False =20 - + True - + - + False False @@ -310,7 +310,7 @@ =20 - + True Single view Single @@ -319,7 +319,7 @@ True True False - + False True @@ -327,7 +327,7 @@ =20 - + True Split view Split @@ -336,7 +336,7 @@ True True False - + False True @@ -344,7 +344,7 @@ =20 - + True Full view Full @@ -353,7 +353,7 @@ True True False - + False True @@ -361,18 +361,18 @@ =20 - + True True True False =20 - + True - + - + False False @@ -380,7 +380,7 @@ =20 - + True Collapse the whol= e tree in the right frame Collapse @@ -389,7 +389,7 @@ True True False - + False True @@ -397,7 +397,7 @@ =20 - + True Expand the whole = tree in the right frame Expand @@ -406,13 +406,13 @@ True True False - + False True - + 0 False @@ -421,14 +421,13 @@ =20 - + 1 True True - 0 =20 - + True GTK_POLICY_AUTOMATIC GTK_POLICY_AUTOMATIC @@ -436,16 +435,16 @@ GTK_CORNER_TOP_LEFT =20 - + True True True False False False - + - + True False @@ -453,13 +452,12 @@ =20 - + True True - 0 =20 - + True GTK_POLICY_AUTOMATIC GTK_POLICY_AUTOMATIC @@ -467,7 +465,7 @@ GTK_CORNER_TOP_LEFT =20 - + True True True @@ -475,9 +473,9 @@ False False False - + - + True False @@ -485,7 +483,7 @@ =20 - + True GTK_POLICY_NEVER GTK_POLICY_AUTOMATIC @@ -493,7 +491,7 @@ GTK_CORNER_TOP_LEFT =20 - + True True False @@ -508,29 +506,29 @@ 0 0 0 - + - + True True - + True True - + 0 True True - + - + =20 - + --=20 2.43.0 From nobody Wed Oct 8 10:56:55 2025 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 97F9D23C513; Sun, 29 Jun 2025 18:46:07 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1751222767; cv=none; b=Vf71RolgrGMl/t8P2xN160V3fsHapZ7Pg3BQbiX9P70Ykz38wztBOQvyYHJ9a2DNX8+KGYCt+E3Z3fLV8MNPQM30etCBOQFypt1/1mLrd2hpH4IYrOw+WIOdBRU8HLJXW8H/6UugURhEYiy9MUm1FxQ0JihDV4m+EVKIXtnFCpg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1751222767; c=relaxed/simple; bh=WRwJMae1CgHGHcw4S5uertPs20kNlqueT5mDIQq5Ics=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=lKVctiwoOCTCxnA9jsR05re7xxgtPNEE7R2rIxSDIFJ8DoO+VD/nbP7q0/xNGRhOoDTQZwBFc4NtGLj8kwp+Z2t0CPbCWEp8ZD/n5G7C0fq3iIhtVzNxwHbK+KNmIRS/jlG7BSKb2JX3YrSSJImk03CeOJGjrv2+S3sdqE9up9w= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=B0P0tE9l; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="B0P0tE9l" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 77D88C4CEF0; Sun, 29 Jun 2025 18:46:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1751222767; bh=WRwJMae1CgHGHcw4S5uertPs20kNlqueT5mDIQq5Ics=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=B0P0tE9lL6ruBTjHj75e8bYVJxkG0gRUZ0lXkXgL+jl9LGXqR9nr7Byl8lBothrPv VrHCxq6jsb/l4NhjNFO01ma26YDj8czc+7GLyEVwRAHFu9G5Bz9oeLUZSnlWKzGCpf 7E1PFdc0z2rD/68tnsTOkl577RnRHfRCcekXEAhuSAtT5N9ecfVhzfA4Uo/9EJ3fp4 zyZnmYv68TmuJJcHdYOgbBJKd09BGlZFJGlmOXpA87jR6Yb+SEsu7lTVQbeD8J6NSS EwOQDo3xmpI7rLRtexnSlQAT1ga5OIoP/8onsHSebQTdlS/aA5RI4SO3FlDT3MmNbl G+jMF7VoGIJWQ== From: Masahiro Yamada To: linux-kbuild@vger.kernel.org Cc: Masahiro Yamada , linux-kernel@vger.kernel.org Subject: [PATCH v2 6/9] kconfig: gconf: replace GtkVbox with GtkBox Date: Mon, 30 Jun 2025 03:43:32 +0900 Message-ID: <20250629184554.407497-7-masahiroy@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250629184554.407497-1-masahiroy@kernel.org> References: <20250629184554.407497-1-masahiroy@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" 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 Signed-off-by: Masahiro Yamada --- (no changes since v1) scripts/kconfig/gconf.ui | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/scripts/kconfig/gconf.ui b/scripts/kconfig/gconf.ui index e5dad2b06502..378a3eadf9f8 100644 --- a/scripts/kconfig/gconf.ui +++ b/scripts/kconfig/gconf.ui @@ -19,7 +19,8 @@ GDK_GRAVITY_NORTH_WEST =20 - + + vertical True False 0 --=20 2.43.0 From nobody Wed Oct 8 10:56:55 2025 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 1EE9423D28E; Sun, 29 Jun 2025 18:46:08 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1751222769; cv=none; b=cQNamQpc7EJsJ3hzqp58wAeJuouRMPBB9Xvccct1Bkl4iqYiQAg13kYIgSGbIlmwNkG3dRHAbeXULmBUhWo//ULlMVTZrwUwBrALECl30lIoMCFvnpTF7asLVnsR/Www+DAcWlwoOddQHxMJL8Qh+XRxjvN2NSoTwbih8iDhJt4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1751222769; c=relaxed/simple; bh=7qVJT7FJI6PQRv2Xm5iu7ZR0RM8RF5vD5PyKw0Y0lx8=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=cEI2Mi77hwVFspY/AyoUdw8pVYtEWGjWTI5wgx8h/bL+Cxl7avhDmn8CuxuyP69ZoXVB7z4gGQX2Kw+Xw1kAGo9lePCN5t9hEW6fKjH9bCfApsoMnFWxFAPRvyFbmwzTaX52/86S3LmMY2OrHN/F6zWzhlHQAYU8aYqZJlqb9z0= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=MQjwXlSM; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="MQjwXlSM" Received: by smtp.kernel.org (Postfix) with ESMTPSA id C87E5C4CEF0; Sun, 29 Jun 2025 18:46:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1751222768; bh=7qVJT7FJI6PQRv2Xm5iu7ZR0RM8RF5vD5PyKw0Y0lx8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=MQjwXlSMDf+DMuCsFH2gJ520V/dWrUIZIFzzlO0iUT+aZZdwshOsw8s/aUB7Q/94G xziCMbjRiR6z3cGSypA6bCzQ+a9gohJTTSk0CJqj3VpSzFyhsZ7skST6oGKUMvXCPh sskZ094Gl0GVuSWteWEVHy1AQo6uXaDgEGLG8FDOHkXz3QCa92F3JRnhhtnnzDqd2g Cpp+gizZmxoCvzquN4vDq984xnvp8zkeDqbmzH/UXzJbbsINYRy1ht3sWIY3XCuH0j +oP//OwRJRiCKREJxPo7M2JimuTNv+ePTcq0Yj4TXsqUsFs2tNwTta2gu/pneTpbCu BhJFKDcswNDvA== From: Masahiro Yamada To: linux-kbuild@vger.kernel.org Cc: Masahiro Yamada , linux-kernel@vger.kernel.org Subject: [PATCH v2 7/9] kconfig: gconf: replace GdkColor with GdkRGBA Date: Mon, 30 Jun 2025 03:43:33 +0900 Message-ID: <20250629184554.407497-8-masahiroy@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250629184554.407497-1-masahiroy@kernel.org> References: <20250629184554.407497-1-masahiroy@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable GdkColor is deprecated with GTK 3.14. [1] Use GdkRGBA instead. This fixes warnings such as: scripts/kconfig/gconf.c: In function =E2=80=98set_node=E2=80=99: scripts/kconfig/gconf.c:138:9: warning: =E2=80=98gdk_color_parse=E2=80=99 i= s 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/gdkcol= or.h#L52 Signed-off-by: Masahiro Yamada Tested-by: Randy Dunlap --- (no changes since v1) scripts/kconfig/gconf.c | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/scripts/kconfig/gconf.c b/scripts/kconfig/gconf.c index a751ab6a98f0..2a4481b4b523 100644 --- a/scripts/kconfig/gconf.c +++ b/scripts/kconfig/gconf.c @@ -128,7 +128,7 @@ static void set_node(GtkTreeStore *tree, GtkTreeIter *n= ode, struct menu *menu) const gchar *_mod =3D ""; const gchar *_yes =3D ""; const gchar *value =3D ""; - GdkColor color; + GdkRGBA color; gboolean editable =3D FALSE; gboolean btnvis =3D FALSE; =20 @@ -138,7 +138,7 @@ static void set_node(GtkTreeStore *tree, GtkTreeIter *n= ode, struct menu *menu) menu->type =3D=3D M_COMMENT ? "***" : "", sym && !sym_has_value(sym) ? "(NEW)" : ""); =20 - gdk_color_parse(menu_is_visible(menu) ? "Black" : "DarkGray", &color); + gdk_rgba_parse(&color, menu_is_visible(menu) ? "Black" : "DarkGray"); =20 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); =20 sel =3D 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); =20 renderer =3D 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 =3D 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 =3D 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 =3D 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 =3D 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); --=20 2.43.0 From nobody Wed Oct 8 10:56:55 2025 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id A168223C513; Sun, 29 Jun 2025 18:46:10 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1751222770; cv=none; b=C+zKkEnvI5IfatqfZHKomt5lZwvRaZS6jZvsl9xWG/nKCZJlIuBtTuB6DTx8R6AtcpyjL1jgQGbbfNs5qc6/WlyqeUM6qqyJwwmfORHK8wrM3JM47+Xaoasn53aKq439o+FKgQqWCvWnNFZrK50DPfCkvXociKri3OqX7KKFjMo= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1751222770; c=relaxed/simple; bh=lYu52VM5uS+Ph+Ha2DQtFx4Adw8Wdn2qoTB8CKvd3gM=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=LMv5bG8jw7+Bw47ynLMQpPCL6X6F6I9YtbRrCkb7DRE+aHXjeR3JDoGNIedZnfOYlXg9f6nPN2He2QRu6YUpE9qHTyNusRa1RBfClJYKbgE/naBRJQCaQqTLIUqdFgIHGQLnN3iQYQTbcb+lVCukhefwH1nrNQnf0MuPe5Yyr4E= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=JdZ+xAfj; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="JdZ+xAfj" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 5787DC4CEF1; Sun, 29 Jun 2025 18:46:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1751222770; bh=lYu52VM5uS+Ph+Ha2DQtFx4Adw8Wdn2qoTB8CKvd3gM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=JdZ+xAfj5BSk8AFfldhQftBLEKnw6nbJkQY0TSWy5SuyuxfvwrIjOATSNjPB4KUcY qEKTBqezJFLylMNiKB7M3o/iDJ/lvHnojwOvI20X3KxJJaC9cGfJaIuiCe1ASjZR60 F721KPhehYXQ/l9yKne9aCdjEDIwHlAT3slCm9/BKNOagkjQT0q1NuiQQXLFFrGLmF vzhtnPMfENMrNzq0IzYYr/0zY6OiPydYAEAjrGBNuUxjCWUficVVfzy3zVCRmEwLX4 uO6k21QVoOdQOmQ7eRXM+iitsSmGLazWIuKNMeEDswe8NqYOl8o28zxhuJbLjW2IFn kYuL9wAXEl88A== From: Masahiro Yamada To: linux-kbuild@vger.kernel.org Cc: Masahiro Yamada , linux-kernel@vger.kernel.org Subject: [PATCH v2 8/9] kconfig: gconf: replace GtkHPaned and GtkVPaned with GtkPaned Date: Mon, 30 Jun 2025 03:43:34 +0900 Message-ID: <20250629184554.407497-9-masahiroy@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250629184554.407497-1-masahiroy@kernel.org> References: <20250629184554.407497-1-masahiroy@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" 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 Signed-off-by: Masahiro Yamada --- Changes in v2: - A new patch scripts/kconfig/gconf.ui | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/scripts/kconfig/gconf.ui b/scripts/kconfig/gconf.ui index 378a3eadf9f8..f2c8342f1103 100644 --- a/scripts/kconfig/gconf.ui +++ b/scripts/kconfig/gconf.ui @@ -422,7 +422,7 @@ =20 - + 1 True True @@ -453,7 +453,8 @@ =20 - + + vertical True True =20 --=20 2.43.0 From nobody Wed Oct 8 10:56:55 2025 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id C1DCA23F40D; Sun, 29 Jun 2025 18:46:11 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1751222771; cv=none; b=Z4zFnIDEdSeSBBg/OOhEjtVvuFKKzqSiaB7jfujE/Wo84uPzNJQ/rKwLqWRA2bTy1lY0IZlxzQ9XagKq2QNrIFHjB+E/m+TZnV5k2pMCV7+g9i7HpG44SZs2elFi5SJvAKaJYiiwQMMOACLkmj4agZep6gPvvA5zA9rgdIsL4aI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1751222771; c=relaxed/simple; bh=X3jgJT8VNir8prle5lakX6QW3Re155CrCoep6yrae3w=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=f0yxhOn3E4XOfz8SoR2TFoIsp5Obxmlv0ZohYO3LwEMo6SBsL2Dp+biufxYYVuhATDLq8alUH6gJC5iNw0MzzQRkjTV1cGv7phl3hCqZgK5FsuuR0HisvfgPgWvtfotfbV8Oq+1QUJHQCtVR8qU21Pbg5fllRYATLKbcLV5XR4E= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=mKLeb3r9; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="mKLeb3r9" Received: by smtp.kernel.org (Postfix) with ESMTPSA id CEC3DC4CEF0; Sun, 29 Jun 2025 18:46:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1751222771; bh=X3jgJT8VNir8prle5lakX6QW3Re155CrCoep6yrae3w=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=mKLeb3r95XOHP9Mugoh6sagddoFYt41QDu3DLr7c7t0ThAuR2d8D12uKLsFXz/7cn SeliyoEJ3kDLrAkz8vE+T1Y22qruCIVyH5n2W0vDDL4DQu9UA3Ct+UWaG3jTlctKqo mukYq7YxdS/nk8KssDGwA5mIPAWDJ2BdrcRjvDR0AnlU1Oz6+TIzY+yFCuug2MndtF CT1+qWfosPmDjsvaPnDyX0JThw99tyj3a/AB6WmdQikuNiBeKxAcT4XvushtXeVQEZ wnLf0NeicF9Y1tYP9q7vds6BSR18vRfbRtywYy5RcYN+qPa58NLDU8VvL0j2TWcGWR kaVXXDITtdSBg== From: Masahiro Yamada To: linux-kbuild@vger.kernel.org Cc: Masahiro Yamada , linux-kernel@vger.kernel.org Subject: [PATCH v2 9/9] kconfig: gconf: show GTK version in About dialog Date: Mon, 30 Jun 2025 03:43:35 +0900 Message-ID: <20250629184554.407497-10-masahiroy@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250629184554.407497-1-masahiroy@kernel.org> References: <20250629184554.407497-1-masahiroy@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Likewise xconfig, it is useful to display the GTK version in the About dialog. Signed-off-by: Masahiro Yamada Acked-by: Randy Dunlap Tested-by: Randy Dunlap --- (no changes since v1) scripts/kconfig/gconf.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/scripts/kconfig/gconf.c b/scripts/kconfig/gconf.c index 2a4481b4b523..e43d83dcdfb8 100644 --- a/scripts/kconfig/gconf.c +++ b/scripts/kconfig/gconf.c @@ -523,7 +523,11 @@ static void on_about1_activate(GtkMenuItem *menuitem, = gpointer user_data) dialog =3D 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); } --=20 2.43.0