From nobody Wed Oct 8 20:53:21 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 BFD712D4B4E; Tue, 24 Jun 2025 15:07:16 +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=1750777636; cv=none; b=NeOh9CIQRvmz8Zatq0d2LtlQNLzuawExoiOS1aRiYaGw89QlJ7JTMEyq64Af2JjuT6f2/Khc4jxgpjT29qFLQQfi9N2JHctzHCGHLCUiA2cxOWk/HzSHnjcav5xNw/RuvkgNB1Ur2Gw3r4Lt4kY9EgHA28q7uB7r0jBx02M9KL4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1750777636; c=relaxed/simple; bh=j1FD4ygSwgRg8KFd13ZX/QlrkSJQunfO6Cp0mPtSoFY=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=u4aja/M92NwG3H/7dj9Bd/rUnhmi7pscLQmpzllQzRIcV9D+KqV7tHZNo0btoXaIYNnwPI0326That/3SwyC4JsbeeT8ANJ5BWtiIeAbfWFU6EE9zZcwIzKutm9i9KpHBARDheOw9ls/+SPITobcCZG2sQP3cdB4sXB70s/ajNc= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=ZoRVcCtQ; 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="ZoRVcCtQ" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 441F0C4CEEE; Tue, 24 Jun 2025 15:07:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1750777636; bh=j1FD4ygSwgRg8KFd13ZX/QlrkSJQunfO6Cp0mPtSoFY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ZoRVcCtQ5FYwXYhtatpS8QhqHc52bvPBkssbtlXDIqPpTR1WeioMG58G9WPJrLmn3 JiUTGR3SIUDoKyrxSCHe8Tgap33cyzPoOJLKc0OipDJWiCQOGdGhbL0QT0+ASZB4PK AmJ/l5Vt4tz2fgvpjRlHPZ3x3n5n24w7ikzuSbWbofDD//jRKib4ZzpvmQSUqzpOxU Gw3JSW183Tk8GTbLJDtw3BqD/cD4xrErkhWQGVInYNJ+bTGjySDzzImAt6fknoHSk0 UvmEEXXXC+ALtAPOFdDpuOZbGfbXfa/ORYqu4MfqznLiIZWE0PzLz08psyOhzWjp1+ 2EQpzreIrc6UA== From: Masahiro Yamada To: linux-kbuild@vger.kernel.org Cc: Masahiro Yamada , linux-kernel@vger.kernel.org Subject: [PATCH 01/66] kconfig: set MENU_CHANGED to choice when the selected member is changed Date: Wed, 25 Jun 2025 00:04:49 +0900 Message-ID: <20250624150645.1107002-2-masahiroy@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250624150645.1107002-1-masahiroy@kernel.org> References: <20250624150645.1107002-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" In gconf, choice entries display the selected symbol in the 'Value' column, but it is not updated when the selected symbol is changed. Set the MENU_CHANGED flag, so it is updated. Signed-off-by: Masahiro Yamada Tested-by: Randy Dunlap --- scripts/kconfig/symbol.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/scripts/kconfig/symbol.c b/scripts/kconfig/symbol.c index d57f8cbba291..26ab10c0fd76 100644 --- a/scripts/kconfig/symbol.c +++ b/scripts/kconfig/symbol.c @@ -195,6 +195,10 @@ static void sym_set_changed(struct symbol *sym) =20 list_for_each_entry(menu, &sym->menus, link) menu->flags |=3D MENU_CHANGED; + + menu =3D sym_get_choice_menu(sym); + if (menu) + menu->flags |=3D MENU_CHANGED; } =20 static void sym_set_all_changed(void) --=20 2.43.0 From nobody Wed Oct 8 20:53:21 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 DE34D2D542A; Tue, 24 Jun 2025 15:07:18 +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=1750777639; cv=none; b=pe7kxYUGnqzFJX/SE9WSS+K97oBEJ5lUMiGsLR26cb1zRxIQ6qRCggryY4Fe1z1QOmQbU60wrnwhthk2TnxcFUv7BwudlFs0gIeXLgkMG+AZVmWUtmKA47AQMBfNHHLWAYKPURrTObo2K8R3xcr+0wZGRg0ZlJFU5Efs/0Nz5mA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1750777639; c=relaxed/simple; bh=k2NOJDd4WyxGkuIsE1HIihZfigsXw8giYrRK/ujwMkM=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=qpMUXBGPUILi2K/k7TANogiAb0XzzPNFbss7EMxpNRoAawR0Sv6k0Td86eLLq4avHWFQ8nVDLBeKGAbsOOtyczkBJUKJNwMnrtN8ZDszA4XxuvuoFVCHUXhZqMqwQqNrtOn9y4AQFEryxDnBk7ziBUkTUsc4OYWBJf4cSDKWt5E= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=SGYfcmXF; 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="SGYfcmXF" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 6B3ACC4CEF9; Tue, 24 Jun 2025 15:07:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1750777638; bh=k2NOJDd4WyxGkuIsE1HIihZfigsXw8giYrRK/ujwMkM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=SGYfcmXFxDnrt450tAXYRzYTCvOtlLunFbJm7zWQUfbDMQuTX5chI4p0Bq4pkYDvZ Dm4PzcjWewoRb9m95XsfPk42PnIiMq5vEg0Gv9JmpbQNlzeh3aAuWgFv34avMX6nXE BO/PF90wF5//AtIiHRekfXRoij9RdXh7zjlN5MOVUPR2my0xFnn02c5AO3ayj3hDP7 FNHg4Rlc7+6MW7qDBDZczfOUYSNA3Tec7j6ti8aeYwaJkJGXaBFIBXGzrMTskovwAJ IJb620rC/lXhxniNF2hjEVtjm/l4HCwsJ9hwNs1CjKeNK7ROTdlTvvj5T62ddc2pla Mngum5E8whVFA== From: Masahiro Yamada To: linux-kbuild@vger.kernel.org Cc: Masahiro Yamada , linux-kernel@vger.kernel.org Subject: [PATCH 02/66] kconfig: qconf: do not show checkbox icon for choice Date: Wed, 25 Jun 2025 00:04:50 +0900 Message-ID: <20250624150645.1107002-3-masahiroy@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250624150645.1107002-1-masahiroy@kernel.org> References: <20250624150645.1107002-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" When you select "Show All Options" or "Show Prompt Options", choice entries display a check box icon, but this has no point because choice is always y since commit Signed-off-by: Masahiro Yamada Acked-by: Randy Dunlap Tested-by: Randy Dunlap --- scripts/kconfig/qconf.cc | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/scripts/kconfig/qconf.cc b/scripts/kconfig/qconf.cc index eaa465b0ccf9..546738a5c3b1 100644 --- a/scripts/kconfig/qconf.cc +++ b/scripts/kconfig/qconf.cc @@ -92,7 +92,6 @@ void ConfigItem::updateMenu(void) { ConfigList* list; struct symbol* sym; - struct property *prop; QString prompt; int type; tristate expr; @@ -105,11 +104,10 @@ void ConfigItem::updateMenu(void) } =20 sym =3D menu->sym; - prop =3D menu->prompt; prompt =3D menu_get_prompt(menu); =20 - if (prop) switch (prop->type) { - case P_MENU: + switch (menu->type) { + case M_MENU: if (list->mode =3D=3D singleMode) { /* a menuconfig entry is displayed differently * depending whether it's at the view root or a child. @@ -123,10 +121,13 @@ void ConfigItem::updateMenu(void) setIcon(promptColIdx, QIcon()); } goto set_prompt; - case P_COMMENT: + case M_COMMENT: setIcon(promptColIdx, QIcon()); prompt =3D "*** " + prompt + " ***"; goto set_prompt; + case M_CHOICE: + setIcon(promptColIdx, QIcon()); + goto set_prompt; default: ; } --=20 2.43.0 From nobody Wed Oct 8 20:53:21 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 59CA22D5C8D; Tue, 24 Jun 2025 15:07:21 +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=1750777641; cv=none; b=tysO0pA4UxkVSzdP9a//RXMuMwMueI/vSAmoDFPmoDsspva+EZH7nRZHx44A2F8exV0Uzm+0cBWkJ6jt2wkUDd85ijomesUvK5oeaOK0aCPW3MauzHjescQFRbLgmveHc8X1Q4VytNgdch621Kh/5BhuLmY/hagz4yfpHFsDZ2U= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1750777641; c=relaxed/simple; bh=vXHWheFK4x7pNBTOmoAzKUemIC8EldPFZ/dufBVbqjY=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=cNl3RwLDeIZEt+1GR4dTDLoks34wyxKZPJaLMuR+cjk2WgK6xCSLEiMS+qsIrrwDaT7xA53PuB6IS+QTx2On0vCTgPof7ICDoTHR9bu/FjCWUIxqU+OtxHbFBzbIqGGa9DD501/mJoqtTJagNJbFrO2XZzsG1E26PIQtsT8cwR8= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=nD5DJe+Q; 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="nD5DJe+Q" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 91CA9C4CEEE; Tue, 24 Jun 2025 15:07:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1750777640; bh=vXHWheFK4x7pNBTOmoAzKUemIC8EldPFZ/dufBVbqjY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=nD5DJe+QLliaJf41q6nnYLfY7Y7woQ5o+bY6XkH+K0yylNvg0UsDityvI/1fr94dl zzEi/fsR3nKFh94BZ+ALY8lSiQRjwpWTrIqUwOxFLqGYj31spt6AEorJ1KguUH27CT S6xGZKOVsRiPUW6il7+DRt62FLOcUSPdclWrWnUgDh5YJcC1aenkugCvGCpxm3Lue8 so4YfCAJfol7f5nv/3FAPNEAlSkFeQQ0HmvbQZMn8XuRrHk06oMeuLeGSWz1EDDGPI CNrjuPuBTbn5n8aEevyezWciRlgbFP+05OiPHEZMGIR+eEMS1co9WnmHsR0xRoM1JH 95s+Xg3Ux0UmQ== From: Masahiro Yamada To: linux-kbuild@vger.kernel.org Cc: Masahiro Yamada , linux-kernel@vger.kernel.org Subject: [PATCH 03/66] kconfig: qconf: show selected choice in the Value column Date: Wed, 25 Jun 2025 00:04:51 +0900 Message-ID: <20250624150645.1107002-4-masahiroy@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250624150645.1107002-1-masahiroy@kernel.org> References: <20250624150645.1107002-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" It is useful to display the selected choice's value in the Value column. Signed-off-by: Masahiro Yamada Acked-by: Randy Dunlap Tested-by: Randy Dunlap --- scripts/kconfig/qconf.cc | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/scripts/kconfig/qconf.cc b/scripts/kconfig/qconf.cc index 546738a5c3b1..68640e507ec4 100644 --- a/scripts/kconfig/qconf.cc +++ b/scripts/kconfig/qconf.cc @@ -127,6 +127,9 @@ void ConfigItem::updateMenu(void) goto set_prompt; case M_CHOICE: setIcon(promptColIdx, QIcon()); + sym =3D sym_calc_choice(menu); + if (sym) + setText(dataColIdx, sym->name); goto set_prompt; default: ; @@ -189,7 +192,11 @@ void ConfigItem::testUpdateMenu(void) if (!menu) return; =20 - sym_calc_value(menu->sym); + if (menu->type =3D=3D M_CHOICE) + sym_calc_choice(menu); + else + sym_calc_value(menu->sym); + if (menu->flags & MENU_CHANGED) { /* the menu entry changed, so update all list items */ menu->flags &=3D ~MENU_CHANGED; --=20 2.43.0 From nobody Wed Oct 8 20:53:21 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 7593A2D6620; Tue, 24 Jun 2025 15:07:23 +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=1750777643; cv=none; b=fTVcJluK9R0rs4Y7CMiA+/fK3o0F65Yu5baObHnFh1a+GL8CCdTAgxuBIeisFCVAYqcP5ZMwPYbgXn0fXZ5pth5M8Kt2tyVjEKTPYlC4dPyRNgfje9pJdHX8nuNK/kCqV7b+QWqsco+Xa5ugMOUQGUoCtpgpC2xz1qpRPh+TeXA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1750777643; c=relaxed/simple; bh=XsP6+V0DTewo004bods7bfikqWbO40qxSasczyigGqc=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=FgzIJFfMrPK+X6BUL1I11Lp1xE/sZuSWFb6gsHAv9Nr7n3CT0wfR0iZnFUWsxqjdBQmdW+AZiAgWxru1Xxo3V2PCO2D/D4OgiKDb4pagZiW9WTtIsv+vSjfHkF6RNUqh7ROT88l/EaY8qhAwyL9bGaLk1FsO14sTg5djl3E50yk= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=CzwSxHsK; 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="CzwSxHsK" Received: by smtp.kernel.org (Postfix) with ESMTPSA id B056CC4CEEE; Tue, 24 Jun 2025 15:07:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1750777643; bh=XsP6+V0DTewo004bods7bfikqWbO40qxSasczyigGqc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=CzwSxHsKfxVv1GRpwt/LbZ4FH0+GFEBcBMlaYL8o7RZjvMuCV1Et23nMn5pCs5l4a vgaXsDObxS9Xu4Akh1izFo+4BTrS9bmd9BlSArwbmigb92fu8OTEe2L6loeMta0BDP tQ7yV70V0ynlQ0FheCAGVHqPIa2uaeRMz1Xq4u0OzsU0zkx0nlVjcVsHFNcSfL64K2 ECPEUVbw6cwGitWgXBy7WgSsd5vf8xc/9eULC0/oYcJqzUoX8Sxw6QtrZwNIDCG0Bx yJ+9ZN5jA1H+K2GgatT+mZVVFOGB/DUxowLRwwlrawuJxZaHU4mJ0zD0EzsKha+4ZC 1fE1l6fZCYodg== From: Masahiro Yamada To: linux-kbuild@vger.kernel.org Cc: Masahiro Yamada , linux-kernel@vger.kernel.org Subject: [PATCH 04/66] kconfig: rename menu_get_parent_menu() to menu_get_menu_or_parent_menu() Date: Wed, 25 Jun 2025 00:04:52 +0900 Message-ID: <20250624150645.1107002-5-masahiroy@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250624150645.1107002-1-masahiroy@kernel.org> References: <20250624150645.1107002-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 current menu_get_parent_menu() does not always return the parent menu; if the given argument is itself a menu, it returns that menu. Rename this function to better reflect this behavior. Signed-off-by: Masahiro Yamada Acked-by: Randy Dunlap Tested-by: Randy Dunlap --- scripts/kconfig/conf.c | 2 +- scripts/kconfig/lkc.h | 2 +- scripts/kconfig/menu.c | 8 +++++++- scripts/kconfig/qconf.cc | 6 +++--- 4 files changed, 12 insertions(+), 6 deletions(-) diff --git a/scripts/kconfig/conf.c b/scripts/kconfig/conf.c index 8abe57041955..a7b44cd8ae14 100644 --- a/scripts/kconfig/conf.c +++ b/scripts/kconfig/conf.c @@ -594,7 +594,7 @@ static void check_conf(struct menu *menu) default: if (!conf_cnt++) printf("*\n* Restart config...\n*\n"); - rootEntry =3D menu_get_parent_menu(menu); + rootEntry =3D menu_get_menu_or_parent_menu(menu); conf(rootEntry); break; } diff --git a/scripts/kconfig/lkc.h b/scripts/kconfig/lkc.h index fbc907f75eac..5cc85c3d4aaa 100644 --- a/scripts/kconfig/lkc.h +++ b/scripts/kconfig/lkc.h @@ -97,7 +97,7 @@ bool menu_is_empty(struct menu *menu); bool menu_is_visible(struct menu *menu); bool menu_has_prompt(const struct menu *menu); const char *menu_get_prompt(const struct menu *menu); -struct menu *menu_get_parent_menu(struct menu *menu); +struct menu *menu_get_menu_or_parent_menu(struct menu *menu); int get_jump_key_char(void); struct gstr get_relations_str(struct symbol **sym_arr, struct list_head *h= ead); void menu_get_ext_help(struct menu *menu, struct gstr *help); diff --git a/scripts/kconfig/menu.c b/scripts/kconfig/menu.c index 7d48a692bd27..ccb690bbf05d 100644 --- a/scripts/kconfig/menu.c +++ b/scripts/kconfig/menu.c @@ -575,7 +575,13 @@ const char *menu_get_prompt(const struct menu *menu) return NULL; } =20 -struct menu *menu_get_parent_menu(struct menu *menu) +/** + * menu_get_menu_or_parent_menu - return the parent menu or the menu itself + * @menu: pointer to the menu + * return: the parent menu. If the given argument is already a menu, return + * itself. + */ +struct menu *menu_get_menu_or_parent_menu(struct menu *menu) { enum prop_type type; =20 diff --git a/scripts/kconfig/qconf.cc b/scripts/kconfig/qconf.cc index 68640e507ec4..dc056b0a8fde 100644 --- a/scripts/kconfig/qconf.cc +++ b/scripts/kconfig/qconf.cc @@ -577,7 +577,7 @@ void ConfigList::setParentMenu(void) oldroot =3D rootEntry; if (rootEntry =3D=3D &rootmenu) return; - setRootMenu(menu_get_parent_menu(rootEntry->parent)); + setRootMenu(menu_get_menu_or_parent_menu(rootEntry->parent)); =20 QTreeWidgetItemIterator it(this); while (*it) { @@ -1540,7 +1540,7 @@ void ConfigMainWindow::setMenuLink(struct menu *menu) switch (configList->mode) { case singleMode: list =3D configList; - parent =3D menu_get_parent_menu(menu); + parent =3D menu_get_menu_or_parent_menu(menu); if (!parent) return; list->setRootMenu(parent); @@ -1551,7 +1551,7 @@ void ConfigMainWindow::setMenuLink(struct menu *menu) configList->clearSelection(); list =3D configList; } else { - parent =3D menu_get_parent_menu(menu->parent); + parent =3D menu_get_menu_or_parent_menu(menu->parent); if (!parent) return; =20 --=20 2.43.0 From nobody Wed Oct 8 20:53:21 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 939132D8767; Tue, 24 Jun 2025 15:07:25 +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=1750777645; cv=none; b=G9Kck/NuigsnZVbfNJy8V+aYVjppDfiyi7rXUBwZ5IlowLTAN6qMWFhIm+KVSV45qKNPqeMdQytp6++tE+93YDlhYsUivFh3HdbnDlPsn8XlRto7veSueSVqGGwUk0nNQoBJfGTdubX3cTAPnqdD1txS5YPn1w2BAkEp/LQ2OHw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1750777645; c=relaxed/simple; bh=vKo/nq5vHH6eHCMGShD9+g/EuhouM/MDhkRb8XCdg64=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=mWntVmqEH6f6GJoB2tmzooYCV7XTFQYN7+rp58G8LTHB8LUrpQddVjgSmZITWPKKEgE5jNsts54J3VLQgZH9d9BZfN2RyNsN5WR6CG1dn889kVQ/pyGjorwjHA9j5kcx7YbzUMgseRPgp0s2svnT0Ld3n7sMVqkGErDuh2Mtnsw= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=JFxYOyvi; 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="JFxYOyvi" Received: by smtp.kernel.org (Postfix) with ESMTPSA id CA1D0C4CEEE; Tue, 24 Jun 2025 15:07:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1750777645; bh=vKo/nq5vHH6eHCMGShD9+g/EuhouM/MDhkRb8XCdg64=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=JFxYOyvik5Yy4kdGWjaNtaPKSepEqz8KY6YFfJTdesprnTKtzfME92gOZs+QzFxE1 O9Nge/dqTciSvykSix1c32icMwFveCfO20hGDezORXfts7J5BGaTx0tm5UqcPmd95/ 6A2a94MdP2C8QmqzHpJkAjF4J5s+70ygBs6+ixawIQ2jIIEAOYVvI+Y1NoIJDUN14R RapyVBUVLu2rX9yhyhYH3tTeHeHpTRaHww/zbiIrpMl9csYGTEQeFjFuhmUvT3LLCU EkiJiM9mgRWAzMc/JinbF/Hs7MjbdayM3xtMTd5tFxi8FKKYh39CQQ6bfmHlKrRATj LCezawCS89qAQ== From: Masahiro Yamada To: linux-kbuild@vger.kernel.org Cc: Masahiro Yamada , linux-kernel@vger.kernel.org Subject: [PATCH 05/66] kconfig: re-add menu_get_parent_menu() that returns parent menu Date: Wed, 25 Jun 2025 00:04:53 +0900 Message-ID: <20250624150645.1107002-6-masahiroy@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250624150645.1107002-1-masahiroy@kernel.org> References: <20250624150645.1107002-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 helper returns the parent menu, or NULL if there is no parent. The main difference from the previous version is that it always returns the parent menu even when the given argument is itself a menu. Signed-off-by: Masahiro Yamada Acked-by: Randy Dunlap Tested-by: Randy Dunlap --- scripts/kconfig/lkc.h | 1 + scripts/kconfig/menu.c | 14 ++++++++++++++ 2 files changed, 15 insertions(+) diff --git a/scripts/kconfig/lkc.h b/scripts/kconfig/lkc.h index 5cc85c3d4aaa..37b606c74bff 100644 --- a/scripts/kconfig/lkc.h +++ b/scripts/kconfig/lkc.h @@ -97,6 +97,7 @@ bool menu_is_empty(struct menu *menu); bool menu_is_visible(struct menu *menu); bool menu_has_prompt(const struct menu *menu); const char *menu_get_prompt(const struct menu *menu); +struct menu *menu_get_parent_menu(struct menu *menu); struct menu *menu_get_menu_or_parent_menu(struct menu *menu); int get_jump_key_char(void); struct gstr get_relations_str(struct symbol **sym_arr, struct list_head *h= ead); diff --git a/scripts/kconfig/menu.c b/scripts/kconfig/menu.c index ccb690bbf05d..a5e5b4fdcd93 100644 --- a/scripts/kconfig/menu.c +++ b/scripts/kconfig/menu.c @@ -575,6 +575,20 @@ const char *menu_get_prompt(const struct menu *menu) return NULL; } =20 +/** + * menu_get_parent_menu - return the parent menu or NULL + * @menu: pointer to the menu + * return: the parent menu, or NULL if there is no parent. + */ +struct menu *menu_get_parent_menu(struct menu *menu) +{ + for (menu =3D menu->parent; menu; menu =3D menu->parent) + if (menu->type =3D=3D M_MENU) + return menu; + + return NULL; +} + /** * menu_get_menu_or_parent_menu - return the parent menu or the menu itself * @menu: pointer to the menu --=20 2.43.0 From nobody Wed Oct 8 20:53:21 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 911472D8DB3; Tue, 24 Jun 2025 15:07:27 +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=1750777647; cv=none; b=VVum4+acZ0Nlrhx+UFgdUpfte5YNCCsqiuBsdngeSKkPLFgFDVk7zBnKArXWiiRLfd/bSacwJS+NPwhEXgSgjduqXqs1P55BT8fvBJAQMpQX11xhEitZ2KC1podDU0bVvlIzgbFSfxu7MW1lhTKj+8acDIHovPZPpRLE6qluOIM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1750777647; c=relaxed/simple; bh=Df7CTgkd1sYa7DgXpsj70h5CzI6BGbH2lgQBkKTKQ9E=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=MRw5puirgTuA8FjVbhkuHtdwGxefP9cSrkbc+z6YFR/1ocf5kLbtjaU3wUfNNBcvy3Itwa1yO+5+UbllLyV2PtLw0//goPSyzcJ2GtXzlTy4NrUpYWYNzZP3HeTN5J61EjNRJBQ+iQbXtImih4PI7vg7m9yvBvkZj1ondpDO0YU= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=S2avx8YD; 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="S2avx8YD" Received: by smtp.kernel.org (Postfix) with ESMTPSA id D01A6C4CEEE; Tue, 24 Jun 2025 15:07:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1750777647; bh=Df7CTgkd1sYa7DgXpsj70h5CzI6BGbH2lgQBkKTKQ9E=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=S2avx8YDxnqiCHqEDYeZSRzuyTfc/6EdYLAKGlF+BB5cNIpVpcjayHXRCQ1wVYF5i M8/4YYThlKDMe7Br0+Eamhretf0BQDgVf+ND60EJbEb+8iZ67dvW/flsLaiu6lCEkv wRbXqWyZOXjNEK6jH86lkbNZoYFWoZY+xqljIsAFgizoGwSeRS5/IT/oYyOVLZrf3X KSEBpAvmCMCmNamcqniqox6ceTwKnp5kwiatZL+bjd9d9br6wBAqbOrRXqWf0Y1f9K YVG6RD90Zhi9OM4jZTOSIHFkFNW1sD46NaDPatEKrRUrXS9fkFrLuHmgV7AVvOeBqX n5tOIz5EBnJiw== From: Masahiro Yamada To: linux-kbuild@vger.kernel.org Cc: Masahiro Yamada , linux-kernel@vger.kernel.org Subject: [PATCH 06/66] kconfig: gconf: make columns resizable Date: Wed, 25 Jun 2025 00:04:54 +0900 Message-ID: <20250624150645.1107002-7-masahiroy@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250624150645.1107002-1-masahiroy@kernel.org> References: <20250624150645.1107002-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 variable "resizeable" is a typo and always set to FALSE, resulting in dead code in init_right_tree(). It is unclear column resizing should be disabled. Enable it. Signed-off-by: Masahiro Yamada Acked-by: Randy Dunlap Tested-by: Randy Dunlap --- scripts/kconfig/gconf.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/scripts/kconfig/gconf.c b/scripts/kconfig/gconf.c index c0f46f189060..a3978d3420d1 100644 --- a/scripts/kconfig/gconf.c +++ b/scripts/kconfig/gconf.c @@ -30,7 +30,6 @@ static gint view_mode =3D FULL_VIEW; static gboolean show_name =3D TRUE; static gboolean show_range =3D TRUE; static gboolean show_value =3D TRUE; -static gboolean resizeable =3D FALSE; static int opt_mode =3D OPT_NORMAL; =20 GtkWidget *main_wnd =3D NULL; @@ -312,11 +311,9 @@ static void init_right_tree(void) column =3D gtk_tree_view_get_column(view, COL_VALUE); gtk_tree_view_column_set_visible(column, show_value); =20 - if (resizeable) { - for (i =3D 0; i < COL_VALUE; i++) { - column =3D gtk_tree_view_get_column(view, i); - gtk_tree_view_column_set_resizable(column, TRUE); - } + for (i =3D 0; i < COL_VALUE; i++) { + column =3D gtk_tree_view_get_column(view, i); + gtk_tree_view_column_set_resizable(column, TRUE); } =20 sel =3D gtk_tree_view_get_selection(view); --=20 2.43.0 From nobody Wed Oct 8 20:53:21 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 4D3582D9EDA; Tue, 24 Jun 2025 15:07:29 +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=1750777649; cv=none; b=D9kkJy5pj8wtc0zvXbV7UzMJnyHvyLhMvJNSCRl/19fHHHhA2zG4JlA6cW8DKnYEhI4w4uZ3DE5xm+Kd4ykewiX0ID21dYCCG48IcDxLP+yE+bPGD4B3+jbp4nSzoAO511w/CgpPJPGyDisp9ZdtVQEjGg0l+F5VOZc6AUO1oGM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1750777649; c=relaxed/simple; bh=Q+jmRBRKNoaVd6mWu0jQ4WHnszmsX6I2dMVeEPsgj4w=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Tqva7hM3uaAUBdwW1QzN6yZaxrkvyJWsAvEbelz0/qoM5euuWIer3KKSH2f0raMmhBCwGtNHki7n+uwXjA6sV7vxO5ds/5UMDuOHpkrAU3QFNyUapjv3yUfLUaZ/ETH4Ev9RWizxamSspcsE8gIo6/IuPAYERTP3OUjIqjEYFoU= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=h/xsAokG; 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="h/xsAokG" Received: by smtp.kernel.org (Postfix) with ESMTPSA id EDE62C4CEE3; Tue, 24 Jun 2025 15:07:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1750777649; bh=Q+jmRBRKNoaVd6mWu0jQ4WHnszmsX6I2dMVeEPsgj4w=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=h/xsAokGRPiDn+OaIYj1SQdU1jt9cAW/I64FZhSCaerNqjxkhEhyIsGGfeeNMVlfY TG0V/Mde25xp4QdFLdQ03Kp5MDCjSXsa2KxIpDlFYykFEyogZUAaDcRupsGnwGb3U+ br8uiZzBp3OgAgB4bZ6WybdRCfLgQVVCi6G4ZBdRuc0FqBxXfiZrCRR1ak6fenm9/u juvNb9HwKwOcrWOkvuzB5kffufsphPwKgibDNu8k6kbxK+z5zrcDaoNub/SyHLTAsf THBBjauskga9P4JuqfTyDrf/pn+2fu1KHe52mMdOszk2Xu3ukmyadwBnl8LPs80kt4 Ou5KcvzxS8jOg== From: Masahiro Yamada To: linux-kbuild@vger.kernel.org Cc: Masahiro Yamada , linux-kernel@vger.kernel.org Subject: [PATCH 07/66] kconfig: gconf: fix potential memory leak in renderer_edited() Date: Wed, 25 Jun 2025 00:04:55 +0900 Message-ID: <20250624150645.1107002-8-masahiroy@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250624150645.1107002-1-masahiroy@kernel.org> References: <20250624150645.1107002-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" If gtk_tree_model_get_iter() fails, gtk_tree_path_free() is not called. Signed-off-by: Masahiro Yamada Acked-by: Randy Dunlap --- scripts/kconfig/gconf.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/scripts/kconfig/gconf.c b/scripts/kconfig/gconf.c index a3978d3420d1..769f38307f34 100644 --- a/scripts/kconfig/gconf.c +++ b/scripts/kconfig/gconf.c @@ -745,7 +745,7 @@ static void renderer_edited(GtkCellRendererText * cell, struct symbol *sym; =20 if (!gtk_tree_model_get_iter(model2, &iter, path)) - return; + goto free; =20 gtk_tree_model_get(model2, &iter, COL_MENU, &menu, -1); sym =3D menu->sym; @@ -757,6 +757,7 @@ static void renderer_edited(GtkCellRendererText * cell, =20 update_tree(&rootmenu, NULL); =20 +free: gtk_tree_path_free(path); } =20 --=20 2.43.0 From nobody Wed Oct 8 20:53:21 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 6D8EB2DA76F; Tue, 24 Jun 2025 15:07:31 +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=1750777651; cv=none; b=u/KZaKIWxLQiUkovdpMvr18G0AaMYxKmwydfJ3As6UdIwD7xdfkbf4ODMW56NNOzXHFMnkADpepfpeqgaCKs5z1Ma0H7Nwktz4usIZzTknRhJVytG5CTbQ9jIxlTtYEb85cl4omSO1nWpZl8zxyvnrqQ/atSNeexxw7HTsqCOEU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1750777651; c=relaxed/simple; bh=ki2KKf6iNvDWcRS7JkKjHtSYtV3XYM5ZgyBnkoAtRow=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=caJy2Nnv8oQvxIeCudAO8T0s6hFxCqweF1AYegl0NEAHnSNMa8mD8HMIrsvbL58N9Lu6AGWu1OI8zRIx0wHZFp1DNb7yMBeygsg3CsrpqPPaqjT3BJmtEryuvIfuCrrYgT0fNjJfavW5XjtVJ+RQLhGglEYKaKXT+ymKWDyvcJ0= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=ShPKjSXB; 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="ShPKjSXB" Received: by smtp.kernel.org (Postfix) with ESMTPSA id F3BB4C4CEEE; Tue, 24 Jun 2025 15:07:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1750777651; bh=ki2KKf6iNvDWcRS7JkKjHtSYtV3XYM5ZgyBnkoAtRow=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ShPKjSXBqiH1FjTI72NwMJSwDh1yfIMSqW/kOuHGi6fdefvGHb4ZT4TxWow25N1/n tMPCrzXGHuAiQ2Bj0+W3xNLQhAPs47MSNr2C+dXhoyoguTWZQWr6UUuoXOL4YmpGo4 fXbpjPswEyWxyQJTRJFeP4gWFi7kf70TOCKWhcvGniwrJdOQyPKfF8G+hELhiOcSBS 72539U4vE+xLRk9DT5J9MpNU7BpySYKD/qqWFwNRQ7VsLj/Elt6mTt+vTatvLQ+/rx d7jC+CzeYW5RPhGvovgQd9vHT4G4/g63lLkpk3MPNnrOFppgmoyotnzgssjvb5AGa3 V2xj2+h0KXUTg== From: Masahiro Yamada To: linux-kbuild@vger.kernel.org Cc: Masahiro Yamada , linux-kernel@vger.kernel.org Subject: [PATCH 08/66] kconfig: gconf: always destroy dialog in on_window1_delete_event() Date: Wed, 25 Jun 2025 00:04:56 +0900 Message-ID: <20250624150645.1107002-9-masahiroy@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250624150645.1107002-1-masahiroy@kernel.org> References: <20250624150645.1107002-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" When gtk_dialog_run() returns GTK_RESPONSE_YES or GTK_RESPONSE_NO, gtk_widget_destroy() is not called, resulting is a memory leak. It is better to always destroy the dialog, even if the application is about to exit. Signed-off-by: Masahiro Yamada Acked-by: Randy Dunlap --- scripts/kconfig/gconf.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/scripts/kconfig/gconf.c b/scripts/kconfig/gconf.c index 769f38307f34..52d439a5119b 100644 --- a/scripts/kconfig/gconf.c +++ b/scripts/kconfig/gconf.c @@ -378,6 +378,7 @@ gboolean on_window1_delete_event(GtkWidget * widget, Gd= kEvent * event, { GtkWidget *dialog, *label; gint result; + gint ret =3D FALSE; =20 if (!conf_get_changed()) return FALSE; @@ -404,17 +405,19 @@ gboolean on_window1_delete_event(GtkWidget * widget, = GdkEvent * event, switch (result) { case GTK_RESPONSE_YES: on_save_activate(NULL, NULL); - return FALSE; + break; case GTK_RESPONSE_NO: - return FALSE; + break; case GTK_RESPONSE_CANCEL: case GTK_RESPONSE_DELETE_EVENT: default: - gtk_widget_destroy(dialog); - return TRUE; + ret =3D TRUE; + break; } =20 - return FALSE; + gtk_widget_destroy(dialog); + + return ret; } =20 =20 --=20 2.43.0 From nobody Wed Oct 8 20:53:21 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 9773B2D4B7C; Tue, 24 Jun 2025 15:07:33 +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=1750777653; cv=none; b=K9ARuEx1fUuWmdWwSkUr4O+M5EEKtwrL/lTSnX7KEh6IiKrA6KB7x7Up2n88M2P4qBkVWNrEObPOHp6gQWhcobnl8ZucWs+cidtI/WWr12KxbTYR0z/CTN9sKP8+gnbpURtIJu6al8bvESmuKmKKAVzotueUOEJ1CYvWUX2ssBs= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1750777653; c=relaxed/simple; bh=G1AT3VHKys4zTokOD43hca/wyFnW3MdYRZ+D26s86tE=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=qoYoD8tcSorM7bsN/zRotwJtMENs2NtuTQV/Qxo6IzSBZwbQlIm1DuqrPqwzYzRKcIEN9D3fyjoOmC3vrFwUt5DfHeFHKj5fV/zkTFsTOSHzoOzSoke+X8/FAFp1QPXpKftkZUwN/UfVHaaKxEhkFWKD+bv+jfgma274K9EvjPE= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=Tq2kJHWr; 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="Tq2kJHWr" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 36A82C4CEE3; Tue, 24 Jun 2025 15:07:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1750777653; bh=G1AT3VHKys4zTokOD43hca/wyFnW3MdYRZ+D26s86tE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Tq2kJHWrQvhRdMtCuSqM3NbpSclmrn5uTtAL/Sdb2l4gcsamxoKNlGEWlw0anbgkY gUbkJTWePLPOepRlnluy5FF2EizGztxt3kGPrEgyCX3f8H+IGg2TbmCjdqQ21lhFOK P5+KYzLgvIyngAAERzTsQkIND4mhP+hJp1i5Vb/GXbm97OgFX1iXLj1M+lfuncnA/w zKHU+cchCmK3Y47SVxeUnybk9yXucMxc655SYXO6eoCstUk//KYSAUh4ZHxVIOa4kU kiERDqGQgq6IXxhAFz31YiWMZE87Gxlpfrn4NBXL71bB757kxdPBT3l+rgYgwKTnyo XjGBje4G7V1NA== From: Masahiro Yamada To: linux-kbuild@vger.kernel.org Cc: Masahiro Yamada , linux-kernel@vger.kernel.org Subject: [PATCH 09/66] kconfig: gconf: remove old #ifdef GTK_CHECK_VERSION Date: Wed, 25 Jun 2025 00:04:57 +0900 Message-ID: <20250624150645.1107002-10-masahiroy@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250624150645.1107002-1-masahiroy@kernel.org> References: <20250624150645.1107002-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" Remove old code. Signed-off-by: Masahiro Yamada --- scripts/kconfig/gconf.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/scripts/kconfig/gconf.c b/scripts/kconfig/gconf.c index 52d439a5119b..b2a0208b0a5f 100644 --- a/scripts/kconfig/gconf.c +++ b/scripts/kconfig/gconf.c @@ -849,16 +849,12 @@ on_treeview2_button_press_event(GtkWidget * widget, struct menu *menu; gint col; =20 -#if GTK_CHECK_VERSION(2,1,4) // bug in ctree with earlier version of GTK gint tx =3D (gint) event->x; gint ty =3D (gint) event->y; gint cx, cy; =20 gtk_tree_view_get_path_at_pos(view, tx, ty, &path, &column, &cx, &cy); -#else - gtk_tree_view_get_cursor(view, &path, &column); -#endif if (path =3D=3D NULL) return FALSE; =20 --=20 2.43.0 From nobody Wed Oct 8 20:53:21 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 382BE2DCC1A; Tue, 24 Jun 2025 15:07:35 +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=1750777656; cv=none; b=EBQ7iooVZou6+717n4CX8LlQrwS+akQREqsww9YJD8beBX4KwnYT122hbwvjJEvmDkl15kWq/6Ru/Rj/bSFibX8Vy743EpYxHNj1z0yEQFmp04ACybL+rAVf4pPL6b9Og2jpByEjRuHEV4bP2tYJQ0aZK7j0FGkt2saf7HmqU/o= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1750777656; c=relaxed/simple; bh=2ipZ4yhNez1WY8mSHhL9J1q+eZ09WrwfNcT0C5SaaRU=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Pna/LURD/HPFgIf63ZGc8OjXbWe05DVf9V2Lw10/gxZ5LBJBum+Pwya/FCnzvlFc40GE1n6AMiFLjfHDLBUDsLjvRGX4jzCcsCi9Ti/rnPl80Y3QpphS5IlTSWK6GGlr07jC6OrSXIZZGJxbyh/WYBoI5CKC+wVWyVY40/ydOPU= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=a24brRf3; 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="a24brRf3" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 5B75AC4CEEE; Tue, 24 Jun 2025 15:07:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1750777655; bh=2ipZ4yhNez1WY8mSHhL9J1q+eZ09WrwfNcT0C5SaaRU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=a24brRf3CUbiTU2eQzkCKZgFizfE2dNL6P+6v+Pwqjy9+hqswGQcNdE2al8D8m+az wSNXOSFZz7oWtoQP8fRVSX8TTksYa/ZcTjQX2TyLmta6lNe/ev5NbPI/PDCfIE8/OS bfJ2YSpQrGx2L3Z2OuSicfwi+2jvpoja5dPAZTBhh2hGM58df2MkYDbj81f8GFUSJA A1XVRf57CYpsZVzAms7AbKc7LCcUrHOnwnQe3y24RbkKtc3FT2778jS5eokJpUjPI5 XVqPNsjuM7BwTSlcDg4jTAfB/b3aZWlDQOQJSzNwlUTvdQLQG6JwGuQLYdE//ODbVV bxzsfcWlsGBUw== From: Masahiro Yamada To: linux-kbuild@vger.kernel.org Cc: Masahiro Yamada , linux-kernel@vger.kernel.org Subject: [PATCH 10/66] kconfig: gconf: remove empty if-block Date: Wed, 25 Jun 2025 00:04:58 +0900 Message-ID: <20250624150645.1107002-11-masahiroy@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250624150645.1107002-1-masahiroy@kernel.org> References: <20250624150645.1107002-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 if-block is empty. Signed-off-by: Masahiro Yamada Acked-by: Randy Dunlap --- scripts/kconfig/gconf.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/scripts/kconfig/gconf.c b/scripts/kconfig/gconf.c index b2a0208b0a5f..7960c456e3b9 100644 --- a/scripts/kconfig/gconf.c +++ b/scripts/kconfig/gconf.c @@ -913,8 +913,6 @@ on_treeview2_key_press_event(GtkWidget * widget, gtk_tree_view_expand_row(view, path, FALSE); return TRUE; } - if (event->keyval =3D=3D GDK_KP_Enter) { - } if (widget =3D=3D tree1_w) return FALSE; =20 --=20 2.43.0 From nobody Wed Oct 8 20:53:21 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 66A222DCC14; Tue, 24 Jun 2025 15:07:38 +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=1750777658; cv=none; b=nFd+1OVCBql48iNd5LvqDMqBXJBjUHk3rzj7o/tii+g8XfDdlYtKoJzJkiS4tag3jhUows5nKrwg56THjssoePxvgX3FwVC9XinKeeH1JIUKd+uol8VylEDlN1deDD0zpwBFljLOp/0EfqcfBmNDH8seTm5TAjG1c+6AtN/jSh0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1750777658; c=relaxed/simple; bh=+eP9owx5Mga3rQXBjpqoo4y+J1aKKuXfBEaV7R+UZ+o=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=fOQt250uDk/lzRJg+nkcQwZc3NzyMneKaPhQH3WCyKE1Yp5L1LgDPQln94OeOWK04CYRsNPRzgs0toWZVMTy3YNDrvHseKnuiM8VhzV4tSOKIa9kcNO74oy9m3u2Jperh+vhya46RELOpRk1pSL0qP1rw6P9T785xVinZME8nBA= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=FR0cZmPq; 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="FR0cZmPq" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 99469C4CEEE; Tue, 24 Jun 2025 15:07:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1750777657; bh=+eP9owx5Mga3rQXBjpqoo4y+J1aKKuXfBEaV7R+UZ+o=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=FR0cZmPqfzoXlT500JZTIVV40yBAmhIfXrip52FkuUKy7ggQY5aeTEiAHy5uvxqS4 oF6pnfRMwIY/asU4enyMQj+DK5iolc6BmGSXX8blg0In5FdFlFIuScg3uG41O2/cHD iQWxiEpTjCVFwBa3z8dV9l9EJBA6OwGNATWLxTLpUVohclgco9cuOMesax40J+P/vK xZpwNG887rbh9N6OCUfrADiTxmvzY+/YkBzKp9pWNbEAccPpTdBasv1w+c7nlDdt1c N6Gek1eTG99v85SMB39CjdkkBQAGHhyz51qkNLKDZgQHJ7mjvwn0HbpH9RkBYwUU9C PS8WiaBx/Ytow== From: Masahiro Yamada To: linux-kbuild@vger.kernel.org Cc: Masahiro Yamada , linux-kernel@vger.kernel.org Subject: [PATCH 11/66] kconfig: gconf: remove meaningless code in init_main_window() Date: Wed, 25 Jun 2025 00:04:59 +0900 Message-ID: <20250624150645.1107002-12-masahiroy@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250624150645.1107002-1-masahiroy@kernel.org> References: <20250624150645.1107002-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 'widget' variable is set, but not used in later code. Signed-off-by: Masahiro Yamada Acked-by: Randy Dunlap --- scripts/kconfig/gconf.c | 1 - 1 file changed, 1 deletion(-) diff --git a/scripts/kconfig/gconf.c b/scripts/kconfig/gconf.c index 7960c456e3b9..4b5befa4f685 100644 --- a/scripts/kconfig/gconf.c +++ b/scripts/kconfig/gconf.c @@ -129,7 +129,6 @@ static void init_main_window(const gchar *glade_file) conf_set_changed_callback(conf_changed); =20 style =3D gtk_widget_get_style(main_wnd); - widget =3D glade_xml_get_widget(xml, "toolbar1"); =20 replace_button_icon(xml, main_wnd->window, style, "button4", (gchar **) xpm_single_view); --=20 2.43.0 From nobody Wed Oct 8 20:53:21 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 94D822DECD0; Tue, 24 Jun 2025 15:07:40 +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=1750777660; cv=none; b=RA2qbdA0YU6rmeuMXsTJjBU2xt291gBeKwFgizLACqYXZHS3eoq/s4oNbBppEnxQGhXdI3mSsTOS3BZPd1Im1UjPGZii17CbtHDuiucDziM16uvjqR4d9/RYwmI+Xoff2wU8mDeg8m9yeyYMR+kjdsGebVNAifoaw60KGp4x0j4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1750777660; c=relaxed/simple; bh=J4hXFCOyqgSrIfSWUJJlcb5yDNssR+ZNvrVMvt1fBXI=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=SG/5KspRuI/h2BUcP5/4xs4k6e6VO1fRzO/Vox6Z/mwcIlgjv7owFFxgPZXUNKJJEfSBXXZ4N6BrJ5TrQYBtEmsOHFlRI0ZfidD/NDnQRLWoZj5d0GSM2goUIOqnOIiAEzkKf863Py/O4HvhPnrXYmz4oUY5hB5aSohy7tnoi3A= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=AlNmiGdR; 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="AlNmiGdR" Received: by smtp.kernel.org (Postfix) with ESMTPSA id B3329C4CEEE; Tue, 24 Jun 2025 15:07:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1750777660; bh=J4hXFCOyqgSrIfSWUJJlcb5yDNssR+ZNvrVMvt1fBXI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=AlNmiGdRfS966cBIM5B+oboULDoBS78/y9rBV7yjGZNmjNabMIW5i8R3tELCVxZHK waBQ5zCbj2Gs0ywnm4v2FV9hCPOON8YSYPT6ImEsFezmB75HcPabsPt/vg4Y7AuoLc CF2uT28NTMJcdgSdnLcYz2nki0ObsK+vROftW36YLzG4QHH7l6t34YAaKSCdfKX982 Qp9MXDWjQ70LNrWDGLt+WA+mwskZ/EqsK3hR+C641q7Xwg6FkAgu8FyCDI2GWS66Fg WLA/AB7EpQC4fD2F9wVqhVJAxIE6GGaE2QTf+18Btz/DkhDP7fBcRozxadiwxsBdlO PaA8WPDgbo/+w== From: Masahiro Yamada To: linux-kbuild@vger.kernel.org Cc: Masahiro Yamada , linux-kernel@vger.kernel.org Subject: [PATCH 12/66] kconfig: gconf: remove unneeded gtk_tree_view_set_headers_visible() calls Date: Wed, 25 Jun 2025 00:05:00 +0900 Message-ID: <20250624150645.1107002-13-masahiroy@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250624150645.1107002-1-masahiroy@kernel.org> References: <20250624150645.1107002-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 headers are visible by default. Signed-off-by: Masahiro Yamada --- scripts/kconfig/gconf.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/scripts/kconfig/gconf.c b/scripts/kconfig/gconf.c index 4b5befa4f685..32e5e9054846 100644 --- a/scripts/kconfig/gconf.c +++ b/scripts/kconfig/gconf.c @@ -189,7 +189,6 @@ static void init_left_tree(void) GtkTreeViewColumn *column; =20 gtk_tree_view_set_model(view, model1); - gtk_tree_view_set_headers_visible(view, TRUE); gtk_tree_view_set_rules_hint(view, TRUE); =20 column =3D gtk_tree_view_column_new(); @@ -232,7 +231,6 @@ static void init_right_tree(void) gint i; =20 gtk_tree_view_set_model(view, model2); - gtk_tree_view_set_headers_visible(view, TRUE); gtk_tree_view_set_rules_hint(view, TRUE); =20 column =3D gtk_tree_view_column_new(); --=20 2.43.0 From nobody Wed Oct 8 20:53:21 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 BCA362DFA34; Tue, 24 Jun 2025 15:07:42 +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=1750777662; cv=none; b=AmhAQN1WiSw/jJw3nePdoZQH3sr4AyQ1Kg2B287XJy1vpe9zxovB7Xp2fyihTww6fJ3exhTdpccG6CKIfASzi3ff1MRAPG8IkVAfCxwfZLryX1Qrp5yhqaJTRL7J7obtO+xD35n2XBTkB6F81/aZXUKxtL2vcsBZnsMDOq+4TLA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1750777662; c=relaxed/simple; bh=6aZeWjP2ooNcf5Y5X6PkZZB668cTXDKBy45bbSWCQcw=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=SbWmVO2D0fBo85o0ZbiER5JB5hPzLRrJgxcXYTCdpXGZy/l4aRbjZLp4u1PZiQtAb/QeOuIjIf/gUx/YvpS5YoqPUgSaGd6zqMnj569z21mXQz1BQlC7Mm1uYBYnoFd+Mvqpe8eSEKKyAM3ch+Y2+688lmoevpp2t51IWRO39kY= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=nnkTGZYR; 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="nnkTGZYR" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 07685C4CEE3; Tue, 24 Jun 2025 15:07:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1750777662; bh=6aZeWjP2ooNcf5Y5X6PkZZB668cTXDKBy45bbSWCQcw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=nnkTGZYROw9zSekRUQ+vCs/iYvwYmqkvMtFRyaJp3ZZJMfcxEe9m01kIoZRCMzBYn ZpoeeJVDC5J3bu4EvHD6TrA2LNqqKYCm77aJ6ncfO36Chxs5WJH1ThGyRJGQ1/XpM2 VP1/JFyAs8DWWMrgTHtKomdrSlKMHmwB1UPihVoWis1F2kG5I0nA1sl2QSvK8dHpsI yinvxur3l6TOVtDYO8xS9a6xJhWJAtdZmeqoSZ0+mg3oSKwuHhmiUKyKp5RCBOsx/5 /UR1dKX33yMK4gPaYdcydq+O7OQfKwoaNlwEs1wBBlaoPVtDlD1PsJBvvfUDUazTJF 3iY9PZ8HuBMpQ== From: Masahiro Yamada To: linux-kbuild@vger.kernel.org Cc: Masahiro Yamada , linux-kernel@vger.kernel.org Subject: [PATCH 13/66] kconfig: gconf: remove gtk_tree_view_column_set_visible() calls Date: Wed, 25 Jun 2025 00:05:01 +0900 Message-ID: <20250624150645.1107002-14-masahiroy@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250624150645.1107002-1-masahiroy@kernel.org> References: <20250624150645.1107002-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 columns are visible by default. Signed-off-by: Masahiro Yamada --- scripts/kconfig/gconf.c | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/scripts/kconfig/gconf.c b/scripts/kconfig/gconf.c index 32e5e9054846..a027f0f10af9 100644 --- a/scripts/kconfig/gconf.c +++ b/scripts/kconfig/gconf.c @@ -297,17 +297,6 @@ static void init_right_tree(void) g_signal_connect(G_OBJECT(renderer), "edited", G_CALLBACK(renderer_edited), NULL); =20 - column =3D gtk_tree_view_get_column(view, COL_NAME); - gtk_tree_view_column_set_visible(column, show_name); - column =3D gtk_tree_view_get_column(view, COL_NO); - gtk_tree_view_column_set_visible(column, show_range); - column =3D gtk_tree_view_get_column(view, COL_MOD); - gtk_tree_view_column_set_visible(column, show_range); - column =3D gtk_tree_view_get_column(view, COL_YES); - gtk_tree_view_column_set_visible(column, show_range); - column =3D gtk_tree_view_get_column(view, COL_VALUE); - gtk_tree_view_column_set_visible(column, show_value); - for (i =3D 0; i < COL_VALUE; i++) { column =3D gtk_tree_view_get_column(view, i); gtk_tree_view_column_set_resizable(column, TRUE); --=20 2.43.0 From nobody Wed Oct 8 20:53:21 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 8AA672DFA4C; Tue, 24 Jun 2025 15:07:44 +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=1750777664; cv=none; b=bRbMTIOvEUWbhcYJu8BEKKxk0ZUWWA5wqYR3PKaFR9lBMzqsdbaruATEAP5HBUVi0QTBrXHaK+CSDhT+MA0oiaDZB4/QbBPa0a40iMOWXYNQcsYGJaynnidcI5ewgOlpS54DkyB2nKhCG9T3TDrTnHp6AdBKaOrPaP+I0BGUSyo= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1750777664; c=relaxed/simple; bh=xSqsSj+re36b61uvUAgbmU3+DgEFWWE9SuCGgwtwW8g=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=EZAFJA23zAlS6qS5Uj3Mgi5FuKznOm2MN7g3ub7QzjBEHC/61lNcvpNsOWkjIE6M/jTtNEuSdN9Ensi0cnwewpeXnWUoJV4R2hoL6BBF+CcTL8GNyLXHdV22lP5G/QcVlMg69GRrDbRZpIn9xsUntL4ArvhD5gcUXjRvgVXSY/8= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=PHcsCrr8; 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="PHcsCrr8" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 22FC2C4CEEE; Tue, 24 Jun 2025 15:07:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1750777664; bh=xSqsSj+re36b61uvUAgbmU3+DgEFWWE9SuCGgwtwW8g=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=PHcsCrr8uRn+WWzcCar9rFKcnLnlBfKFqs1m+6QzBNHU7qsGKfXy91hVD6Jay62EP H5JD4VpqjjrWu74mGMpgx2nxQQq3KMVLnuP5AWQCnXXO6qsK2Egb1P922WPYdkFA+p mF/m/sIgOGerdp5A4KsGiDmr9rNXdthzDIu45Z+1yKdHrNx8c3Nw5qFbzx1rs3Bm6e fivX8QU52bsdGhpRrmdzEw7I1LcKdBWSyDtuvwUy0OnFpYs2kEHcExlN1gSIVFJWns v4RHpJjMPijdKMs9vNTm8N1ihrT44N/mRhyWMEN0h2uAHBDQ9KhxAX1GEkFwrsx3Qs s3cHNrmbZVAaA== From: Masahiro Yamada To: linux-kbuild@vger.kernel.org Cc: Masahiro Yamada , linux-kernel@vger.kernel.org Subject: [PATCH 14/66] kconfig: gconf: remove gtk_widget_realize() calls Date: Wed, 25 Jun 2025 00:05:02 +0900 Message-ID: <20250624150645.1107002-15-masahiroy@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250624150645.1107002-1-masahiroy@kernel.org> References: <20250624150645.1107002-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 is primarily used in widget implementations, and isn't very useful otherwise. Signed-off-by: Masahiro Yamada --- scripts/kconfig/gconf.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/scripts/kconfig/gconf.c b/scripts/kconfig/gconf.c index a027f0f10af9..3f9b9957f089 100644 --- a/scripts/kconfig/gconf.c +++ b/scripts/kconfig/gconf.c @@ -215,7 +215,6 @@ static void init_left_tree(void) =20 sel =3D gtk_tree_view_get_selection(view); gtk_tree_selection_set_mode(sel, GTK_SELECTION_SINGLE); - gtk_widget_realize(tree1_w); } =20 static void renderer_edited(GtkCellRendererText * cell, @@ -967,7 +966,6 @@ on_treeview1_button_press_event(GtkWidget * widget, display_tree_part(); } =20 - gtk_widget_realize(tree2_w); gtk_tree_view_set_cursor(view, path, NULL, FALSE); gtk_widget_grab_focus(tree2_w); =20 --=20 2.43.0 From nobody Wed Oct 8 20:53:21 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 9E6842DFA51; Tue, 24 Jun 2025 15:07:46 +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=1750777666; cv=none; b=JFq+uDcdKhpmNpGV8rKDlo7K/aoZlLTJN9O+Emg496WP9hRXJhd5aRZvZuZXsNaveIhAiWioy4PNRCKlyOKa4q2Zm9gTX2rIpI4p/M4KpcC4Qwn9n4qLOQMeDCddkBtFwS9rmPeSyn9FkPyzUOf8yTWerqHQr+LTqnfCEWxhDT0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1750777666; c=relaxed/simple; bh=lQ7e7UVZWB4GWvI2mdfJ7vf4PsqCvuiTiYnRRyrFWYk=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=PyMX+ryRlxivAUoyUccjT3JFGuYUBXbgdTZv8gYwQd8BE6HMQ9+sNgGPsfwn1ss5iJrlq4S0/xmnSPLGLUJ3OKcku140kvhM7bq2hjFdeo0rQ2b7EoxL7wImGOnMfRWbIqcq0BiNmj5ykeSQrD9YY58r2TaLVpIdJHb5McvnDzM= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=Zunbh6y7; 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="Zunbh6y7" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 394A8C4CEEE; Tue, 24 Jun 2025 15:07:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1750777666; bh=lQ7e7UVZWB4GWvI2mdfJ7vf4PsqCvuiTiYnRRyrFWYk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Zunbh6y7aksbmEUReufrPlX9PmjbvExXkNttVIsEz+NaiBskoDWjhVZRbxUyho56B R+d/FlIJUcn8p2JHwfftPd8O7abK6p/CVjwef0Z89uC0akik12sEQXJkQcBuyMV2Nj bAnC6E+OJIjPSvJTXjS4G5CkTlxurSJwUX08I0ix9+hZ70RC7ozBQce3Y3A1/iiw+h wJ1DT+9KB+OvcRCYDHkLUIU4VT6vsFt6Ffi6eGsyCISOX7jJeX9Zw5fJj2ywRKvk0J ognlk4Vkve6prIGsll4tmL6RelPBLyB5fVeKOmPgSnCVQrmwGgi5UHomJv4X0VqCMl 3yFLu+KsfGCkw== From: Masahiro Yamada To: linux-kbuild@vger.kernel.org Cc: Masahiro Yamada , linux-kernel@vger.kernel.org Subject: [PATCH 15/66] kconfig: gconf: remove gtk_tree_view_set_rules_hint() calls Date: Wed, 25 Jun 2025 00:05:03 +0900 Message-ID: <20250624150645.1107002-16-masahiroy@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250624150645.1107002-1-masahiroy@kernel.org> References: <20250624150645.1107002-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 use of the this function is not recommended, and it has been deprecated since GTK 3.14. [1]: https://gitlab.gnome.org/GNOME/gtk/-/blob/3.14.0/gtk/gtktreeview.c#L11= 891 Signed-off-by: Masahiro Yamada --- scripts/kconfig/gconf.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/scripts/kconfig/gconf.c b/scripts/kconfig/gconf.c index 3f9b9957f089..4bbc8f87deb6 100644 --- a/scripts/kconfig/gconf.c +++ b/scripts/kconfig/gconf.c @@ -189,7 +189,6 @@ static void init_left_tree(void) GtkTreeViewColumn *column; =20 gtk_tree_view_set_model(view, model1); - gtk_tree_view_set_rules_hint(view, TRUE); =20 column =3D gtk_tree_view_column_new(); gtk_tree_view_append_column(view, column); @@ -230,7 +229,6 @@ static void init_right_tree(void) gint i; =20 gtk_tree_view_set_model(view, model2); - gtk_tree_view_set_rules_hint(view, TRUE); =20 column =3D gtk_tree_view_column_new(); gtk_tree_view_append_column(view, column); --=20 2.43.0 From nobody Wed Oct 8 20:53:21 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 0DD562E0B52; Tue, 24 Jun 2025 15:07:48 +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=1750777669; cv=none; b=lalM12LVV26gJsWKoWlQEUkeCcOpIMK+80rlaq3SlY0/LxwxHyUoC1L+WEht8fg3/VAAaqBS5Cp3+ERmngjMeI2SRW9+E02T0N0QYwV2/ycxaSiBJ4W2jtWd6G3YpN08ehtoAciGRFDjLbb6BihBlQZVxI7D23y0QV+Mld/iwE4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1750777669; c=relaxed/simple; bh=WY3+oQOoOobBDBIV9B9r0FRd//LRrSH0ZkEsslD3FRs=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=PaOx0tG3B/YDBnlm7vKtDtmGoUwMZxCANJ48FGm3tJJvarzc0rmEzF3Z8w0VVGmLOMqbp4ej2804oERe41Gxi3eYeX1H6KB0JzRJ0jqtMlyQjyEWE+t9L2+v3/VaFW9MgvKH1SZyIUtec2tQSw0k5O5zYBz3RS+E+p4pDrdlnd0= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=C8Es6ALf; 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="C8Es6ALf" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 5CB5AC4CEEE; Tue, 24 Jun 2025 15:07:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1750777668; bh=WY3+oQOoOobBDBIV9B9r0FRd//LRrSH0ZkEsslD3FRs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=C8Es6ALf7oU/8fzIJQlXx1UssqPm7/P6kEDHCDxhMhHYytv9kNUs3ksJc759kdZsw 9ZNxzeM6amOuHxaIwIFr47XY7aBhOy6vZPjLeoC+9d3j8Ded/qsDIG8cWQnh7AX7iK kf/eNhCafzmLxl5rbcedvW70jm70rzuVKDIETYxdHzFUNjSDgxVsr4AUab+f2e7oQe Ud2Mg1e2SY4a1Spf1EFYGgqd2M+ZHQ5XE9N2TRaQlCwlCnoEiLplZ6wJkoaczdZ68n pvjNgOPwkdsIvy+50nh82WnEH/far+EDl6j1utMqPWO1anckcjRJIKRu4z4KSDeZa6 pYr8gnz7agOtA== From: Masahiro Yamada To: linux-kbuild@vger.kernel.org Cc: Masahiro Yamada , linux-kernel@vger.kernel.org Subject: [PATCH 16/66] kconfig: gconf: remove unnecessary gtk_set_locale() call Date: Wed, 25 Jun 2025 00:05:04 +0900 Message-ID: <20250624150645.1107002-17-masahiroy@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250624150645.1107002-1-masahiroy@kernel.org> References: <20250624150645.1107002-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" gtk_set_locale() has been deprecated since version 2.24, and setlocale() should be used directly. [1] However, gtk_init() automatically does this, so there is typically no point in calling this function. [1]: https://gitlab.gnome.org/GNOME/gtk/-/blob/2.24.33/gtk/gtkmain.c#L1152 Signed-off-by: Masahiro Yamada --- scripts/kconfig/gconf.c | 1 - 1 file changed, 1 deletion(-) diff --git a/scripts/kconfig/gconf.c b/scripts/kconfig/gconf.c index 4bbc8f87deb6..3e632a325c10 100644 --- a/scripts/kconfig/gconf.c +++ b/scripts/kconfig/gconf.c @@ -1367,7 +1367,6 @@ int main(int ac, char *av[]) gchar *glade_file; =20 /* GTK stuffs */ - gtk_set_locale(); gtk_init(&ac, &av); glade_init(); =20 --=20 2.43.0 From nobody Wed Oct 8 20:53:21 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 206312E11A8; Tue, 24 Jun 2025 15:07:50 +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=1750777671; cv=none; b=EVhHCq/V/cYAt+t+giNHlEWgVmv12Eg3wEAiWZa1vKuPCW33hVLLiFEWO3y9YqXmGQ54HjcEkqt005QpaqONgLhsXJEvFeix7gOL2JJdtmCE8SADkNmTIR0Z+T6HRS01X+KHKmzDi1gZ9LFH7ns52B3InqBwH2MXArBeR5twLgo= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1750777671; c=relaxed/simple; bh=Dx6j4wazm09/lX6cbpWlD4pzsjTYFBVT2FF/S8nZ4Ag=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=M7A1MK2OMrNl47RCwoAYBP7pKuNKXtd0KrWGIloN81+RxwmAunBg5vDCuW1Xh0PZvduLisqhAS3Qv4Ln5RiWrMqw4o/C+IqQ28RfaAfQzYVAc615qXv5NKlXLrQWeMMpwzHGtIBqX4Vw6SuGZoB0OjWiJ+ZOc4GQJBg7s5xfN6M= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=l5uPISNw; 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="l5uPISNw" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 68FD1C4CEEE; Tue, 24 Jun 2025 15:07:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1750777670; bh=Dx6j4wazm09/lX6cbpWlD4pzsjTYFBVT2FF/S8nZ4Ag=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=l5uPISNwC+/P9j2vX3EVk2WTei5KF8/gLPpXnKznKvWnRkOp+2lUp8k9hYCT2VXzG PSrnItqpq0cMQbWaQgqsYBXFZUMNMjqFT7oIQROSdHzga43ODR8zKwCh2FMafuL5Vs rcFQH/VeSFh9zc2ppK1YgaSJmRHhM0L4AKHsW4fkaM+d0P3tfVmcEUI94X3sNMArD4 xR8Kn1ZyjVgvDlMiwD3aHpPGahMx2tWE72vk5VDwurUvhFIrQiFZzgpYcgsfDv5DQe i/qFfQY5VTbi5SpRWgRAxyBJA0ewv7oyHwAJ4LmRZcNtsYLS1S3VvR6G/KGwdFG8d7 2mwvl2EnfGskw== From: Masahiro Yamada To: linux-kbuild@vger.kernel.org Cc: Masahiro Yamada , linux-kernel@vger.kernel.org Subject: [PATCH 17/66] kconfig: gconf: remove internal-child="image" nodes from glade Date: Wed, 25 Jun 2025 00:05:05 +0900 Message-ID: <20250624150645.1107002-18-masahiroy@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250624150645.1107002-1-masahiroy@kernel.org> References: <20250624150645.1107002-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" These nodes do not appear to serve anything useful. Signed-off-by: Masahiro Yamada --- scripts/kconfig/gconf.glade | 84 ------------------------------------- 1 file changed, 84 deletions(-) diff --git a/scripts/kconfig/gconf.glade b/scripts/kconfig/gconf.glade index aa483cb32755..19b80f2ec1ff 100644 --- a/scripts/kconfig/gconf.glade +++ b/scripts/kconfig/gconf.glade @@ -48,18 +48,6 @@ True - - - - True - gtk-open - 1 - 0.5 - 0.5 - 0 - 0 - - =20 @@ -71,18 +59,6 @@ True - - - - True - gtk-save - 1 - 0.5 - 0.5 - 0 - 0 - - =20 @@ -93,18 +69,6 @@ Save _as True - - - - True - gtk-save-as - 1 - 0.5 - 0.5 - 0 - 0 - - =20 @@ -121,18 +85,6 @@ True - - - - True - gtk-quit - 1 - 0.5 - 0.5 - 0 - 0 - - @@ -244,18 +196,6 @@ True - - - - True - gtk-dialog-question - 1 - 0.5 - 0.5 - 0 - 0 - - =20 @@ -266,18 +206,6 @@ True - - - - True - gtk-properties - 1 - 0.5 - 0.5 - 0 - 0 - - =20 @@ -287,18 +215,6 @@ _License True - - - - True - gtk-justify-fill - 1 - 0.5 - 0.5 - 0 - 0 - - --=20 2.43.0 From nobody Wed Oct 8 20:53:21 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 CBBEE2E11B9; Tue, 24 Jun 2025 15:07:52 +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=1750777672; cv=none; b=Bww0A87EDALOSwJAJeOpi61u4Gt2R80X/Ih0ZlXrd6Ut9/trXemWe4HxrtK07/ORi32AfqpiK2uZMtkTxESdNicFWvJCB3hIa4SXzbTpaEpKfVyjIgPjKWLhe472AhvpzPiy8i6Sws19uKPyxfPT55xB3cvoIDuryatajNdE5ko= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1750777672; c=relaxed/simple; bh=LW+bB5SVKxnHDdlR8+C2VtbTMAf1SYKnEZ4+zHYx3jE=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=MrEAO/ldzNZ1C9U0Sq20v8wmPCB2WWEHqeUsqX5PXt5wy94eukghJDT+OBxA4XXc3Tw/H3H+9MJCu1qzXJpFl79UTtSO2dZqPUQNKX6WzaAvvuGAfB93VohEvBcfIKPMCpzrN2wZWDH4RJVzotTXZ6S63ZeYH0G8L6awTd6s8wM= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=cs5qKqBG; 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="cs5qKqBG" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 7A4E1C4CEF1; Tue, 24 Jun 2025 15:07:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1750777672; bh=LW+bB5SVKxnHDdlR8+C2VtbTMAf1SYKnEZ4+zHYx3jE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=cs5qKqBGh9lGex1o6gNRe7LL7VvrhO10i6R4hAaPHFk656rhoDvBawdxzv16yyKUu aet9VPAwl3CB5uyxql5JOJZuYP373eI+fttAXG4ZWWl18l1KMIcvpykd1NqK2bxbsl EnD5YUAkkbTuijuKOwSUma44ba/gBbVgpdbnnau8nrTT5eETIna0WS3IWNgJBiIKuI T3+8JQI8nLTVVVOdSyHvp6p0yCuw3osowTO4jCbtCYFly8IgqjV6/9TTUvrcWeFD8Z dWojR3g1OyuqIViNF9EeAsZ+joPtiSAXsyudGF99YzZ7QEKwlO/iAAa+rS7tQs9vKT 4AN4N/GQkkbvg== From: Masahiro Yamada To: linux-kbuild@vger.kernel.org Cc: Masahiro Yamada , linux-kernel@vger.kernel.org Subject: [PATCH 18/66] kconfig: gconf: remove parents[] array and indent variable Date: Wed, 25 Jun 2025 00:05:06 +0900 Message-ID: <20250624150645.1107002-19-masahiroy@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250624150645.1107002-1-masahiroy@kernel.org> References: <20250624150645.1107002-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 parents[] array is used to store the GtkTreeIter of parent nodes, but this can be simplified: we can pass a GtkTreeIter pointer down when _display_tree() recurses. Signed-off-by: Masahiro Yamada --- scripts/kconfig/gconf.c | 49 ++++++++++++----------------------------- 1 file changed, 14 insertions(+), 35 deletions(-) diff --git a/scripts/kconfig/gconf.c b/scripts/kconfig/gconf.c index 3e632a325c10..432a467e3250 100644 --- a/scripts/kconfig/gconf.c +++ b/scripts/kconfig/gconf.c @@ -47,8 +47,6 @@ GdkColor color; =20 GtkTreeStore *tree1, *tree2, *tree; GtkTreeModel *model1, *model2; -static GtkTreeIter *parents[256]; -static gint indent; =20 static struct menu *current; // current node for SINGLE view static struct menu *browsed; // browsed node for SPLIT view @@ -153,8 +151,6 @@ static void init_main_window(const gchar *glade_file) =20 static void init_tree_model(void) { - gint i; - tree =3D tree2 =3D gtk_tree_store_new(COL_NUMBER, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING, @@ -166,9 +162,6 @@ static void init_tree_model(void) G_TYPE_BOOLEAN); model2 =3D GTK_TREE_MODEL(tree2); =20 - for (parents[0] =3D NULL, i =3D 1; i < 256; i++) - parents[i] =3D (GtkTreeIter *) g_malloc(sizeof(GtkTreeIter)); - tree1 =3D gtk_tree_store_new(COL_NUMBER, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING, @@ -1131,18 +1124,6 @@ static void set_node(GtkTreeIter * node, struct menu= *menu, gchar ** row) g_object_unref(pix); } =20 - -/* Add a node to the tree */ -static void place_node(struct menu *menu, char **row) -{ - GtkTreeIter *parent =3D parents[indent - 1]; - GtkTreeIter *node =3D parents[indent]; - - gtk_tree_store_append(tree, node, parent); - set_node(node, menu, row); -} - - /* Find a node in the GTK+ tree */ static GtkTreeIter found; =20 @@ -1193,9 +1174,6 @@ static void update_tree(struct menu *src, GtkTreeIter= * dst) struct symbol *sym; struct menu *menu1, *menu2; =20 - if (src =3D=3D &rootmenu) - indent =3D 1; - valid =3D gtk_tree_model_iter_children(model2, child2, dst); for (child1 =3D src->list; child1; child1 =3D child1->next) { =20 @@ -1253,9 +1231,7 @@ static void update_tree(struct menu *src, GtkTreeIter= * dst) set_node(child2, menu1, fill_row(menu1)); } =20 - indent++; update_tree(child1, child2); - indent--; =20 valid =3D gtk_tree_model_iter_next(model2, child2); } @@ -1263,16 +1239,15 @@ static void update_tree(struct menu *src, GtkTreeIt= er * dst) =20 =20 /* Display the whole tree (single/split/full view) */ -static void display_tree(struct menu *menu) +static void _display_tree(struct menu *menu, GtkTreeIter *parent) { struct property *prop; struct menu *child; enum prop_type ptype; + GtkTreeIter iter; =20 - if (menu =3D=3D &rootmenu) { - indent =3D 1; + if (menu =3D=3D &rootmenu) current =3D &rootmenu; - } =20 for (child =3D menu->list; child; child =3D child->next) { prop =3D child->prompt; @@ -1290,8 +1265,10 @@ static void display_tree(struct menu *menu) =20 if ((opt_mode =3D=3D OPT_NORMAL && menu_is_visible(child)) || (opt_mode =3D=3D OPT_PROMPT && menu_has_prompt(child)) || - (opt_mode =3D=3D OPT_ALL && menu_get_prompt(child))) - place_node(child, fill_row(child)); + (opt_mode =3D=3D OPT_ALL && menu_get_prompt(child))) { + gtk_tree_store_append(tree, &iter, parent); + set_node(&iter, child, fill_row(child)); + } =20 if ((view_mode !=3D FULL_VIEW) && (ptype =3D=3D P_MENU) && (tree =3D=3D tree2)) @@ -1308,14 +1285,16 @@ static void display_tree(struct menu *menu) =20 if (((view_mode =3D=3D SINGLE_VIEW) && (menu->flags & MENU_ROOT)) || (view_mode =3D=3D FULL_VIEW) - || (view_mode =3D=3D SPLIT_VIEW)) { - indent++; - display_tree(child); - indent--; - } + || (view_mode =3D=3D SPLIT_VIEW)) + _display_tree(child, &iter); } } =20 +static void display_tree(struct menu *menu) +{ + _display_tree(menu, NULL); +} + /* Display a part of the tree starting at current node (single/split view)= */ static void display_tree_part(void) { --=20 2.43.0 From nobody Wed Oct 8 20:53:21 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 359E12E11DD; Tue, 24 Jun 2025 15:07:54 +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=1750777675; cv=none; b=D+G7fZGaSlNdqsx1orTJX9wN9BreRxarBSfuOrToPbTcJLhbbCQ0ElCAzpdb1bYM7dXB/oTCcIuF5gt8KqwZB0yqxJaP+tVVJs7fleuyADG1N736dtVclFuank/dwL5auPxO+NM1kBRPt/PGlrMjCKMQy3EMO8gTasgQSYzTPXU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1750777675; c=relaxed/simple; bh=3473YJWmxzQg/dUOJyS/4LBxQjxctGC23u6bK6NKXGY=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=U+jZFA3ROXljFpT67lm+UGX9+xWz/phKClOzTm7n8HvVzu4HP3huXMbEP7NvIjrBOGKugSnHjoEr675T7KC7XOtvWeHlBvVk2qnbZ10htG9lIM1Rnto1juDOInfRph9nvCwtkeBG3/w6LuRIiOjzTA5MnPFrDNwQRbyOzi+EbY8= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=MHlW76SX; 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="MHlW76SX" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 80F58C4CEE3; Tue, 24 Jun 2025 15:07:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1750777674; bh=3473YJWmxzQg/dUOJyS/4LBxQjxctGC23u6bK6NKXGY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=MHlW76SXDK8fVlUPen/sA9jaHLXwMuWzEcOC++EdIenBaTnE3RAxLY2vgDpz3bzwl CMdSf8od4/jltqB0Il6MXazEhWYzTcTmaOS5VVqDKoWtJ7klTY4T2kisP1HnepSpE3 sW7aNz1lPmhjWlAJ/zmq4gO0Ar9/Eb7zLConnrf2sD1YbpG01iRNcQoq1n9h+SWmR6 s07q1Zo6jY5rKppKS8pKTDzSN+V/xS/BcSRv/Jb1WR9GuTmvTswos+/Ilr3nRkqyZa KBwWUVa50Rw9MGSznevFybiOm4PbP/fpmOSmeD6XNR4yMzxaQt+QU/VgzMhFlnu6Md hbPcf2yyb+6YQ== From: Masahiro Yamada To: linux-kbuild@vger.kernel.org Cc: Masahiro Yamada , linux-kernel@vger.kernel.org Subject: [PATCH 19/66] kconfig: gconf: remove unnecessary NULL checks for tree1 and tree2 Date: Wed, 25 Jun 2025 00:05:07 +0900 Message-ID: <20250624150645.1107002-20-masahiroy@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250624150645.1107002-1-masahiroy@kernel.org> References: <20250624150645.1107002-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 tree1 and tree2 variables are initialized earlier in init_tree_model(), so the NULL checks are redundant. Signed-off-by: Masahiro Yamada --- scripts/kconfig/gconf.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/scripts/kconfig/gconf.c b/scripts/kconfig/gconf.c index 432a467e3250..2ab000adcced 100644 --- a/scripts/kconfig/gconf.c +++ b/scripts/kconfig/gconf.c @@ -678,8 +678,7 @@ void on_split_clicked(GtkButton * button, gpointer user= _data) gtk_widget_show(tree1_w); gtk_window_get_default_size(GTK_WINDOW(main_wnd), &w, &h); gtk_paned_set_position(GTK_PANED(hpaned), w / 2); - if (tree2) - gtk_tree_store_clear(tree2); + gtk_tree_store_clear(tree2); display_list(); =20 /* Disable back btn, like in full mode. */ @@ -691,8 +690,7 @@ void on_full_clicked(GtkButton * button, gpointer user_= data) { view_mode =3D FULL_VIEW; gtk_widget_hide(tree1_w); - if (tree2) - gtk_tree_store_clear(tree2); + gtk_tree_store_clear(tree2); display_tree(&rootmenu); gtk_widget_set_sensitive(back_btn, FALSE); } @@ -1298,8 +1296,7 @@ static void display_tree(struct menu *menu) /* Display a part of the tree starting at current node (single/split view)= */ static void display_tree_part(void) { - if (tree2) - gtk_tree_store_clear(tree2); + gtk_tree_store_clear(tree2); if (view_mode =3D=3D SINGLE_VIEW) display_tree(current); else if (view_mode =3D=3D SPLIT_VIEW) @@ -1312,8 +1309,7 @@ static void display_tree_part(void) /* Display the list in the left frame (split view) */ static void display_list(void) { - if (tree1) - gtk_tree_store_clear(tree1); + gtk_tree_store_clear(tree1); =20 tree =3D tree1; display_tree(&rootmenu); --=20 2.43.0 From nobody Wed Oct 8 20:53:21 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 2EAC32E1739; Tue, 24 Jun 2025 15:07:56 +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=1750777677; cv=none; b=PWtC7T4L1wJeuKeu4dPG1+PYSDIV9O7S0q/zoiBBPNKKwMnmuNX1jnTqrlc6dAnuksPPBlYrAtQB9DeLgCM/7bF/R1avP8zq+IHuoQCp8heFgj2eLPmL+Jx7efY9DKjRmdF+dUGoobjdaiO2UAwrt1YgdzX8UllYEz/HkCkMtWQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1750777677; c=relaxed/simple; bh=nXrZyNxUw9jh8Gl+y4uhwdkkCXCgB5TbFxXYBj8A8ao=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=VERkGqt2I1V2ZUwfVv/mzFeFVej/LBqXxRd2zQ6wITuxTqSoCkm+iYIHtquBUoQ3fgABLQsqZ8J6tKNM/MSMMWIlJNFvSnfAPikrLyJT5I1q2qFPAALNBvJTV7c8hBVxfTyGMjht9CEY4MRzeC7lkmNqYmJTTMRqaMg1S7d2p/8= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=V5Rk8JoS; 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="V5Rk8JoS" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 87C76C4CEEE; Tue, 24 Jun 2025 15:07:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1750777676; bh=nXrZyNxUw9jh8Gl+y4uhwdkkCXCgB5TbFxXYBj8A8ao=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=V5Rk8JoSfCZL24QdO+W1Jmezb96W0sAw1jxvPybRul6Tq1X1VVDd1UoGhVQDcaJNH hkq/zBQ8+XoOOI2BilfxIrzc80bDRsoWgYPDPMC06KbJFoftmkPtZdfZDExD/HQHQo 4Qf9QUH7X+lHoSF7LDbxjZl4ooc0ECcDvyc44hgYgWBo//gCoxH3O52V0IjoLxYNB4 c140BAOmYjgaiVIWvtSoMHpOnt/iuGDqd0za7iXZ29cuSOVFk2sbN/bEQDjq0/IKB1 AEt7LolTI5kbfDLg2s+1eD7VMbfnvJjxHJf7hAAvJ22FHuPGSY3CbsC04tGCiixTvX ET7zs/9W+d37Q== From: Masahiro Yamada To: linux-kbuild@vger.kernel.org Cc: Masahiro Yamada , linux-kernel@vger.kernel.org Subject: [PATCH 20/66] kconfig: gconf: remove unneeded variable in on_split_clicked() Date: Wed, 25 Jun 2025 00:05:08 +0900 Message-ID: <20250624150645.1107002-21-masahiroy@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250624150645.1107002-1-masahiroy@kernel.org> References: <20250624150645.1107002-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 height of the window is not used here. Passing NULL to gtk_window_get_default_size() is allowed. [1] [1]: https://gitlab.gnome.org/GNOME/gtk/-/blob/2.24.33/gtk/gtkwindow.c#L3974 Signed-off-by: Masahiro Yamada --- scripts/kconfig/gconf.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/kconfig/gconf.c b/scripts/kconfig/gconf.c index 2ab000adcced..c78eded5c01b 100644 --- a/scripts/kconfig/gconf.c +++ b/scripts/kconfig/gconf.c @@ -673,10 +673,10 @@ void on_single_clicked(GtkButton * button, gpointer u= ser_data) =20 void on_split_clicked(GtkButton * button, gpointer user_data) { - gint w, h; + gint w; view_mode =3D SPLIT_VIEW; gtk_widget_show(tree1_w); - gtk_window_get_default_size(GTK_WINDOW(main_wnd), &w, &h); + gtk_window_get_default_size(GTK_WINDOW(main_wnd), &w, NULL); gtk_paned_set_position(GTK_PANED(hpaned), w / 2); gtk_tree_store_clear(tree2); display_list(); --=20 2.43.0 From nobody Wed Oct 8 20:53:21 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 323C12D3A80; Tue, 24 Jun 2025 15:07:58 +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=1750777679; cv=none; b=QnPKdBVcDzuKtRTFVhmf3wniVJorn0wsiz5aT+G5z3Q7Fr/5wWw9StgFRNyfLXLMHvnzhrFXz0qHFWvjdsEvzQrPv3z0nnaDk+NbpCjfPZw7VriCQzrsxHi5OuuMbMmjuGqTQ43zkrleVTv5BNJdEqdVVHl/qWBzfMEXyeaJXD0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1750777679; c=relaxed/simple; bh=7R9zLWVFiLd9C1meIr0Aq65EzG0bbG2WnzXi/9AlQKY=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Gu7/MRXRp8prJhz4c48/90yt8Kd5hOQB36zMB6AB/W5pErXHvK+RwMVwZbUIkLHOK2usRXQuGT+CVhhZGTiFXrx3e3/ilQ0WFchCi5AmqeDxmI5s5SNAdSg05P7bpu0Tkk0jV30oJBdL7F6aWDkyR8XcwSptqQ4YFMYE+KN2xpk= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=ReshN+DS; 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="ReshN+DS" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 8DB60C4CEF3; Tue, 24 Jun 2025 15:07:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1750777678; bh=7R9zLWVFiLd9C1meIr0Aq65EzG0bbG2WnzXi/9AlQKY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ReshN+DSDx1NCSu9XGW9wu59RACEShcoTShMju3VFSQtgQZp93OkT4SmflzD5WXiw f5hx/HhMnNygiGLA/i3DZbzp9ltE96yr2jpBb9rvM9OB6B04KSbUP2JyFc3Mvmv6um M2beU0MFem3BoInFsRwheIBtUjQJJJBGQO1xzmVJAWx476aj8Nj1UqQYDe5EmqhtBV IJuhtWSSG6IY5uM9+jp4ZD0U53+apImX9fvkvfGrQ03rXuElly0eag038m3E0gl5pK iTm9AKK7jEEmSGk2apTD06iORGYD2JvZUvBu2wrW3yG3oB+pe8YIhxd68cEh2o3BuL BGYw2Z1fvaH4w== From: Masahiro Yamada To: linux-kbuild@vger.kernel.org Cc: Masahiro Yamada , linux-kernel@vger.kernel.org Subject: [PATCH 21/66] kconfig: gconf: remove unneeded variables in on_treeview*_button_press_event() Date: Wed, 25 Jun 2025 00:05:09 +0900 Message-ID: <20250624150645.1107002-22-masahiroy@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250624150645.1107002-1-masahiroy@kernel.org> References: <20250624150645.1107002-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" No all position parameters are used here. Passing NULL to gtk_tree_view_get_cursor() or gtk_tree_view_get_path_at_pos() is allowed. [1] [2] [1]: https://gitlab.gnome.org/GNOME/gtk/-/blob/2.24.33/gtk/gtktreeview.c#L1= 2638 [1]: https://gitlab.gnome.org/GNOME/gtk/-/blob/2.24.33/gtk/gtktreeview.c#L1= 2795 Signed-off-by: Masahiro Yamada --- scripts/kconfig/gconf.c | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/scripts/kconfig/gconf.c b/scripts/kconfig/gconf.c index c78eded5c01b..ab2e0df21037 100644 --- a/scripts/kconfig/gconf.c +++ b/scripts/kconfig/gconf.c @@ -822,13 +822,10 @@ on_treeview2_button_press_event(GtkWidget * widget, GtkTreeIter iter; struct menu *menu; gint col; - gint tx =3D (gint) event->x; gint ty =3D (gint) event->y; - gint cx, cy; =20 - gtk_tree_view_get_path_at_pos(view, tx, ty, &path, &column, &cx, - &cy); + gtk_tree_view_get_path_at_pos(view, tx, ty, &path, &column, NULL, NULL); if (path =3D=3D NULL) return FALSE; =20 @@ -871,12 +868,11 @@ on_treeview2_key_press_event(GtkWidget * widget, { GtkTreeView *view =3D GTK_TREE_VIEW(widget); GtkTreePath *path; - GtkTreeViewColumn *column; GtkTreeIter iter; struct menu *menu; gint col; =20 - gtk_tree_view_get_cursor(view, &path, &column); + gtk_tree_view_get_cursor(view, &path, NULL); if (path =3D=3D NULL) return FALSE; =20 @@ -930,16 +926,12 @@ on_treeview1_button_press_event(GtkWidget * widget, { GtkTreeView *view =3D GTK_TREE_VIEW(widget); GtkTreePath *path; - GtkTreeViewColumn *column; GtkTreeIter iter; struct menu *menu; - gint tx =3D (gint) event->x; gint ty =3D (gint) event->y; - gint cx, cy; =20 - gtk_tree_view_get_path_at_pos(view, tx, ty, &path, &column, &cx, - &cy); + gtk_tree_view_get_path_at_pos(view, tx, ty, &path, NULL, NULL, NULL); if (path =3D=3D NULL) return FALSE; =20 --=20 2.43.0 From nobody Wed Oct 8 20:53:21 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 4EA542E2EFB; Tue, 24 Jun 2025 15:08: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=1750777681; cv=none; b=VHsVjqFXgm1u1QgqHeQrKqIf3ud5FICkgB+c429nt+vN2zMI70f1yF9p5asUVVGc0IkW75SOtDebVwwidZO5kWSC4KIWKLF0U155xZfTBkjwMgiyrxTLT7Xotw/nKZmHeMN351vyJxjKsHHWpenJY6LDRK/+O8qyyTuSq/aQsvA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1750777681; c=relaxed/simple; bh=fDBnlVO3Vf85hLDpEe1AKJjaVVFfGIN6/lmQHUXH4fw=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=flHbbhbTV0yYn0YTmCZV/oaeP8bM7AhSorJrOlYp7lxgwdWLuPC42tn6MpDAtV7bSqKZCPNYMkRSVpabRNMmXNuYlAq0axv5ibUUGf+1YbKwtBGKvwxz8ZO//xGBKA9J4phfvL0FeLROhLhmQBG9PYUGQhWN7I02WX54mD7dQ+Q= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=IpicmP/q; 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="IpicmP/q" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 94912C4CEEE; Tue, 24 Jun 2025 15:07:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1750777680; bh=fDBnlVO3Vf85hLDpEe1AKJjaVVFfGIN6/lmQHUXH4fw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=IpicmP/qWJK0T3NGy3pi4raRiL0y5ktvP/BnsK1EqTI3quFFe5n+ff57/I93+6oMt YN74l8pGWv/1XXtXMhoKgXaI4Mh8lGZ/MKOliVWDwRiOvgh6hGLZTug9N+cMIO3PcU ufl9qjGwQ/i9vlVRP/WEXOTM2WERrRcuB1XjANG1qiiqhXY1AtFsETo1OA/5//TrmY Idyy53UaUqhxPH+1Hn7SamLDcbyrjM2fZ3f0O7hUKctqShxapAZO/1+w78EIGkfUE0 Iw8UbDK78qQDnxLMUGs9b/C6QlolMuyNPa23kP1H40wTmMBDctZo5l6cH2dhHtJY51 hM+RbubH96xMg== From: Masahiro Yamada To: linux-kbuild@vger.kernel.org Cc: Masahiro Yamada , linux-kernel@vger.kernel.org Subject: [PATCH 22/66] kconfig: gconf: remove unused 'color' variable Date: Wed, 25 Jun 2025 00:05:10 +0900 Message-ID: <20250624150645.1107002-23-masahiroy@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250624150645.1107002-1-masahiroy@kernel.org> References: <20250624150645.1107002-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 is not used at all. Signed-off-by: Masahiro Yamada --- scripts/kconfig/gconf.c | 1 - 1 file changed, 1 deletion(-) diff --git a/scripts/kconfig/gconf.c b/scripts/kconfig/gconf.c index ab2e0df21037..4fff931f34fc 100644 --- a/scripts/kconfig/gconf.c +++ b/scripts/kconfig/gconf.c @@ -43,7 +43,6 @@ GtkWidget *save_btn =3D NULL; GtkWidget *save_menu_item =3D NULL; =20 GtkTextTag *tag1, *tag2; -GdkColor color; =20 GtkTreeStore *tree1, *tree2, *tree; GtkTreeModel *model1, *model2; --=20 2.43.0 From nobody Wed Oct 8 20:53:21 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 059C22E2F1C; Tue, 24 Jun 2025 15:08:03 +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=1750777683; cv=none; b=e1cBvhO+boNYZutW3/Z/oao427z+4TrU/PsigmBrlR6KNfgpIMXbi+LrC91pR9KlLc+SwW6cQaDnyEKY9MRFntsXvUquarQbfn/yjaVYl108kuTj2A7yf2bPdfty6JQOrjFkNZa/ek0zGJXyaJMWmBQQCSDw2ZkRUNFE2pQubOo= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1750777683; c=relaxed/simple; bh=KlL9W2ov30wUEU9PFO719dWCIY+6KkZeRfGU12+ns2M=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=ZRv2SCxdUyKdOSGpCgC+nHTZHiybMm60qwxUqaVhHlVRa2eCaKR9UldJfORCDMfTcOYSoplAjYj4Xx2WuhZS2xEknYgOEUqvhVb1zyJ4MEoObTcAUQR1XKPvSYn60LXs61Qhk7lQa1vjQ8/o17H1ft4qusXyLNfcF3FqMEBARkw= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=BozZJFMH; 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="BozZJFMH" Received: by smtp.kernel.org (Postfix) with ESMTPSA id A5551C4CEE3; Tue, 24 Jun 2025 15:08:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1750777682; bh=KlL9W2ov30wUEU9PFO719dWCIY+6KkZeRfGU12+ns2M=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=BozZJFMHZQcVNl5vQdsPpiFpCYlyV211zoPRMKBWj9goX5OGdYRpsIuFx6sz0g6p2 +o9oLt6LPwLEwEyUJPb8uTHsk0sL3xLpefmp/PYAkztKCGgpNcQK4VcPApi1K+Faa5 2SJtNIvEkBUmfqDb21AyWPb3jYg/e8G5ML0Znmfw8bTrXHfEesrN09O4L8OfWxCb71 qhc/LQFyXAoEPsGX2rjEikIVhICpjUXA9WD0MSqQ79uz6CNEJVZhtTAN6SY/V99UGC rRVVUBgGhh27nktAAvSXS0QaafVTDXM8gcXB9Le54HtQM4WFEfT2VQNBDwK6N5vsvl N/HTeHfY7+QsQ== From: Masahiro Yamada To: linux-kbuild@vger.kernel.org Cc: Masahiro Yamada , linux-kernel@vger.kernel.org Subject: [PATCH 23/66] kconfig: gconf: add static qualifiers to variables Date: Wed, 25 Jun 2025 00:05:11 +0900 Message-ID: <20250624150645.1107002-24-masahiroy@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250624150645.1107002-1-masahiroy@kernel.org> References: <20250624150645.1107002-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" I also removed unnecessary initializers. Signed-off-by: Masahiro Yamada --- scripts/kconfig/gconf.c | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/scripts/kconfig/gconf.c b/scripts/kconfig/gconf.c index 4fff931f34fc..0d5a02706bcb 100644 --- a/scripts/kconfig/gconf.c +++ b/scripts/kconfig/gconf.c @@ -32,20 +32,20 @@ static gboolean show_range =3D TRUE; static gboolean show_value =3D TRUE; static int opt_mode =3D OPT_NORMAL; =20 -GtkWidget *main_wnd =3D NULL; -GtkWidget *tree1_w =3D NULL; // left frame -GtkWidget *tree2_w =3D NULL; // right frame -GtkWidget *text_w =3D NULL; -GtkWidget *hpaned =3D NULL; -GtkWidget *vpaned =3D NULL; -GtkWidget *back_btn =3D NULL; -GtkWidget *save_btn =3D NULL; -GtkWidget *save_menu_item =3D NULL; +static GtkWidget *main_wnd; +static GtkWidget *tree1_w; // left frame +static GtkWidget *tree2_w; // right frame +static GtkWidget *text_w; +static GtkWidget *hpaned; +static GtkWidget *vpaned; +static GtkWidget *back_btn; +static GtkWidget *save_btn; +static GtkWidget *save_menu_item; =20 -GtkTextTag *tag1, *tag2; +static GtkTextTag *tag1, *tag2; =20 -GtkTreeStore *tree1, *tree2, *tree; -GtkTreeModel *model1, *model2; +static GtkTreeStore *tree1, *tree2, *tree; +static GtkTreeModel *model1, *model2; =20 static struct menu *current; // current node for SINGLE view static struct menu *browsed; // browsed node for SPLIT view --=20 2.43.0 From nobody Wed Oct 8 20:53:21 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 87F4B2E338D; Tue, 24 Jun 2025 15:08:05 +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=1750777685; cv=none; b=VawWoQ15RLkWCHo2Qs3LPWV7WRczhpCCvYnyG1ZMLmcwAmftaM/Z5vJ6DqAQcRw9mbHumcbuPJ4Wu9zRalBgGd2H/PQLR2H1JbnPn+nYLQHDawMZooPhbVZOjjPgVL/mJk9hIOEuW7vXinVRJuzVUTEdc11hpRGd23sTzwhklME= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1750777685; c=relaxed/simple; bh=P9q77/PjbY5UNWBGZhkITuW0pMrWeEKN+OB48AdFtB4=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=HqUZDZiNOCA/XZIUId10ro/cIItfONNeNocmWGGRtHnEv16ijY2aXgqwA1nGOqleeDREyv9vI7s7SX5808qUUVf42+kuSxTflNN6Tjmqkw/pyUoszDZYAKBMCgL5KgkfuYOZDlxiYJKPQxQRL9Rk6D0gA440PVMjXVI2SIdd3kE= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=mXwbi44h; 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="mXwbi44h" Received: by smtp.kernel.org (Postfix) with ESMTPSA id ADDD4C4CEE3; Tue, 24 Jun 2025 15:08:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1750777685; bh=P9q77/PjbY5UNWBGZhkITuW0pMrWeEKN+OB48AdFtB4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=mXwbi44hKPwkvOOAiBg1RvxWP0gJzQ/wk4IV/DJruNV+5LchvoGfOD8M7cmk3wMfU gFKSjuRxJfC1ribB9FZieSHwx65apZGOJaf4Tkus2wOsFW0w97mb5CuoaNG/x0oz8T y1gtLpjMsj7L4tFSvPbTXKym4b01bi2CXi722aAoTw1H6jFUj/QefUZ3b+yU4pzFS3 qeVMjgBv7IIucbuHt/ZopQi1SDMjdXq2+fjf9YzcyzXctoasYH4rMW3hA0s7AkXRs0 XPGQCwXurWsj7g7H/knQ9wZP4+Iewy2jAi3/hiXfptMutsb/9XHEgDrxaFeafxW70Q Agj604Mf6n4pQ== From: Masahiro Yamada To: linux-kbuild@vger.kernel.org Cc: Masahiro Yamada , linux-kernel@vger.kernel.org Subject: [PATCH 24/66] kconfig: gconf: move init_*() functions below Date: Wed, 25 Jun 2025 00:05:12 +0900 Message-ID: <20250624150645.1107002-25-masahiroy@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250624150645.1107002-1-masahiroy@kernel.org> References: <20250624150645.1107002-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 allows removal of the forward declaration of renderer_edited(). Signed-off-by: Masahiro Yamada --- scripts/kconfig/gconf.c | 450 ++++++++++++++++++++-------------------- 1 file changed, 222 insertions(+), 228 deletions(-) diff --git a/scripts/kconfig/gconf.c b/scripts/kconfig/gconf.c index 0d5a02706bcb..9d06c050b270 100644 --- a/scripts/kconfig/gconf.c +++ b/scripts/kconfig/gconf.c @@ -62,240 +62,12 @@ static void display_tree(struct menu *menu); static void display_tree_part(void); static void update_tree(struct menu *src, GtkTreeIter * dst); =20 -static void replace_button_icon(GladeXML *xml, GdkDrawable *window, - GtkStyle *style, gchar *btn_name, gchar **xpm) -{ - GdkPixmap *pixmap; - GdkBitmap *mask; - GtkToolButton *button; - GtkWidget *image; - - pixmap =3D gdk_pixmap_create_from_xpm_d(window, &mask, - &style->bg[GTK_STATE_NORMAL], - xpm); - - button =3D GTK_TOOL_BUTTON(glade_xml_get_widget(xml, btn_name)); - image =3D gtk_image_new_from_pixmap(pixmap, mask); - gtk_widget_show(image); - gtk_tool_button_set_icon_widget(button, image); -} - static void conf_changed(bool dirty) { gtk_widget_set_sensitive(save_btn, dirty); gtk_widget_set_sensitive(save_menu_item, dirty); } =20 -/* Main Window Initialization */ -static void init_main_window(const gchar *glade_file) -{ - GladeXML *xml; - GtkWidget *widget; - GtkTextBuffer *txtbuf; - GtkStyle *style; - - xml =3D glade_xml_new(glade_file, "window1", NULL); - if (!xml) - g_error("GUI loading failed !\n"); - glade_xml_signal_autoconnect(xml); - - main_wnd =3D glade_xml_get_widget(xml, "window1"); - 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"); - tree2_w =3D glade_xml_get_widget(xml, "treeview2"); - text_w =3D glade_xml_get_widget(xml, "textview3"); - - back_btn =3D glade_xml_get_widget(xml, "button1"); - gtk_widget_set_sensitive(back_btn, FALSE); - - widget =3D glade_xml_get_widget(xml, "show_name1"); - gtk_check_menu_item_set_active((GtkCheckMenuItem *) widget, - show_name); - - widget =3D glade_xml_get_widget(xml, "show_range1"); - gtk_check_menu_item_set_active((GtkCheckMenuItem *) widget, - show_range); - - widget =3D glade_xml_get_widget(xml, "show_data1"); - gtk_check_menu_item_set_active((GtkCheckMenuItem *) widget, - show_value); - - save_btn =3D glade_xml_get_widget(xml, "button3"); - save_menu_item =3D glade_xml_get_widget(xml, "save1"); - conf_set_changed_callback(conf_changed); - - style =3D gtk_widget_get_style(main_wnd); - - replace_button_icon(xml, main_wnd->window, style, - "button4", (gchar **) xpm_single_view); - replace_button_icon(xml, main_wnd->window, style, - "button5", (gchar **) xpm_split_view); - replace_button_icon(xml, main_wnd->window, style, - "button6", (gchar **) xpm_tree_view); - - txtbuf =3D gtk_text_view_get_buffer(GTK_TEXT_VIEW(text_w)); - tag1 =3D gtk_text_buffer_create_tag(txtbuf, "mytag1", - "foreground", "red", - "weight", PANGO_WEIGHT_BOLD, - NULL); - tag2 =3D gtk_text_buffer_create_tag(txtbuf, "mytag2", - /*"style", PANGO_STYLE_OBLIQUE, */ - NULL); - - gtk_window_set_title(GTK_WINDOW(main_wnd), rootmenu.prompt->text); - - gtk_widget_show(main_wnd); -} - -static void init_tree_model(void) -{ - tree =3D tree2 =3D gtk_tree_store_new(COL_NUMBER, - 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_BOOLEAN, GDK_TYPE_PIXBUF, - G_TYPE_BOOLEAN, G_TYPE_BOOLEAN, - G_TYPE_BOOLEAN, G_TYPE_BOOLEAN, - G_TYPE_BOOLEAN); - model2 =3D GTK_TREE_MODEL(tree2); - - tree1 =3D gtk_tree_store_new(COL_NUMBER, - 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_BOOLEAN, GDK_TYPE_PIXBUF, - G_TYPE_BOOLEAN, G_TYPE_BOOLEAN, - G_TYPE_BOOLEAN, G_TYPE_BOOLEAN, - G_TYPE_BOOLEAN); - model1 =3D GTK_TREE_MODEL(tree1); -} - -static void init_left_tree(void) -{ - GtkTreeView *view =3D GTK_TREE_VIEW(tree1_w); - GtkCellRenderer *renderer; - GtkTreeSelection *sel; - GtkTreeViewColumn *column; - - gtk_tree_view_set_model(view, model1); - - column =3D gtk_tree_view_column_new(); - gtk_tree_view_append_column(view, column); - gtk_tree_view_column_set_title(column, "Options"); - - renderer =3D gtk_cell_renderer_toggle_new(); - gtk_tree_view_column_pack_start(GTK_TREE_VIEW_COLUMN(column), - renderer, FALSE); - gtk_tree_view_column_set_attributes(GTK_TREE_VIEW_COLUMN(column), - renderer, - "active", COL_BTNACT, - "inconsistent", COL_BTNINC, - "visible", COL_BTNVIS, - "radio", COL_BTNRAD, NULL); - renderer =3D gtk_cell_renderer_text_new(); - gtk_tree_view_column_pack_start(GTK_TREE_VIEW_COLUMN(column), - renderer, FALSE); - gtk_tree_view_column_set_attributes(GTK_TREE_VIEW_COLUMN(column), - renderer, - "text", COL_OPTION, - "foreground-gdk", - COL_COLOR, NULL); - - sel =3D gtk_tree_view_get_selection(view); - gtk_tree_selection_set_mode(sel, GTK_SELECTION_SINGLE); -} - -static void renderer_edited(GtkCellRendererText * cell, - const gchar * path_string, - const gchar * new_text, gpointer user_data); - -static void init_right_tree(void) -{ - GtkTreeView *view =3D GTK_TREE_VIEW(tree2_w); - GtkCellRenderer *renderer; - GtkTreeSelection *sel; - GtkTreeViewColumn *column; - gint i; - - gtk_tree_view_set_model(view, model2); - - column =3D gtk_tree_view_column_new(); - gtk_tree_view_append_column(view, column); - gtk_tree_view_column_set_title(column, "Options"); - - renderer =3D gtk_cell_renderer_pixbuf_new(); - gtk_tree_view_column_pack_start(GTK_TREE_VIEW_COLUMN(column), - renderer, FALSE); - gtk_tree_view_column_set_attributes(GTK_TREE_VIEW_COLUMN(column), - renderer, - "pixbuf", COL_PIXBUF, - "visible", COL_PIXVIS, NULL); - renderer =3D gtk_cell_renderer_toggle_new(); - gtk_tree_view_column_pack_start(GTK_TREE_VIEW_COLUMN(column), - renderer, FALSE); - gtk_tree_view_column_set_attributes(GTK_TREE_VIEW_COLUMN(column), - renderer, - "active", COL_BTNACT, - "inconsistent", COL_BTNINC, - "visible", COL_BTNVIS, - "radio", COL_BTNRAD, NULL); - renderer =3D gtk_cell_renderer_text_new(); - gtk_tree_view_column_pack_start(GTK_TREE_VIEW_COLUMN(column), - renderer, FALSE); - gtk_tree_view_column_set_attributes(GTK_TREE_VIEW_COLUMN(column), - renderer, - "text", COL_OPTION, - "foreground-gdk", - COL_COLOR, NULL); - - renderer =3D gtk_cell_renderer_text_new(); - gtk_tree_view_insert_column_with_attributes(view, -1, - "Name", renderer, - "text", COL_NAME, - "foreground-gdk", - 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", - 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", - 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", - COL_COLOR, NULL); - renderer =3D gtk_cell_renderer_text_new(); - gtk_tree_view_insert_column_with_attributes(view, -1, - "Value", renderer, - "text", COL_VALUE, - "editable", - COL_EDIT, - "foreground-gdk", - COL_COLOR, NULL); - g_signal_connect(G_OBJECT(renderer), "edited", - G_CALLBACK(renderer_edited), NULL); - - for (i =3D 0; i < COL_VALUE; i++) { - column =3D gtk_tree_view_get_column(view, i); - gtk_tree_view_column_set_resizable(column, TRUE); - } - - sel =3D gtk_tree_view_get_selection(view); - gtk_tree_selection_set_mode(sel, GTK_SELECTION_SINGLE); -} - - /* Utility Functions */ =20 =20 @@ -1324,6 +1096,228 @@ static void fixup_rootmenu(struct menu *menu) } } =20 +/* Main Window Initialization */ +static void replace_button_icon(GladeXML *xml, GdkDrawable *window, + GtkStyle *style, gchar *btn_name, gchar **xpm) +{ + GdkPixmap *pixmap; + GdkBitmap *mask; + GtkToolButton *button; + GtkWidget *image; + + pixmap =3D gdk_pixmap_create_from_xpm_d(window, &mask, + &style->bg[GTK_STATE_NORMAL], + xpm); + + button =3D GTK_TOOL_BUTTON(glade_xml_get_widget(xml, btn_name)); + image =3D gtk_image_new_from_pixmap(pixmap, mask); + gtk_widget_show(image); + gtk_tool_button_set_icon_widget(button, image); +} + +static void init_main_window(const gchar *glade_file) +{ + GladeXML *xml; + GtkWidget *widget; + GtkTextBuffer *txtbuf; + GtkStyle *style; + + xml =3D glade_xml_new(glade_file, "window1", NULL); + if (!xml) + g_error("GUI loading failed !\n"); + glade_xml_signal_autoconnect(xml); + + main_wnd =3D glade_xml_get_widget(xml, "window1"); + 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"); + tree2_w =3D glade_xml_get_widget(xml, "treeview2"); + text_w =3D glade_xml_get_widget(xml, "textview3"); + + back_btn =3D glade_xml_get_widget(xml, "button1"); + gtk_widget_set_sensitive(back_btn, FALSE); + + widget =3D glade_xml_get_widget(xml, "show_name1"); + gtk_check_menu_item_set_active((GtkCheckMenuItem *) widget, + show_name); + + widget =3D glade_xml_get_widget(xml, "show_range1"); + gtk_check_menu_item_set_active((GtkCheckMenuItem *) widget, + show_range); + + widget =3D glade_xml_get_widget(xml, "show_data1"); + gtk_check_menu_item_set_active((GtkCheckMenuItem *) widget, + show_value); + + save_btn =3D glade_xml_get_widget(xml, "button3"); + save_menu_item =3D glade_xml_get_widget(xml, "save1"); + conf_set_changed_callback(conf_changed); + + style =3D gtk_widget_get_style(main_wnd); + + replace_button_icon(xml, main_wnd->window, style, + "button4", (gchar **) xpm_single_view); + replace_button_icon(xml, main_wnd->window, style, + "button5", (gchar **) xpm_split_view); + replace_button_icon(xml, main_wnd->window, style, + "button6", (gchar **) xpm_tree_view); + + txtbuf =3D gtk_text_view_get_buffer(GTK_TEXT_VIEW(text_w)); + tag1 =3D gtk_text_buffer_create_tag(txtbuf, "mytag1", + "foreground", "red", + "weight", PANGO_WEIGHT_BOLD, + NULL); + tag2 =3D gtk_text_buffer_create_tag(txtbuf, "mytag2", + /*"style", PANGO_STYLE_OBLIQUE, */ + NULL); + + gtk_window_set_title(GTK_WINDOW(main_wnd), rootmenu.prompt->text); + + gtk_widget_show(main_wnd); +} + +static void init_tree_model(void) +{ + tree =3D tree2 =3D gtk_tree_store_new(COL_NUMBER, + 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_BOOLEAN, GDK_TYPE_PIXBUF, + G_TYPE_BOOLEAN, G_TYPE_BOOLEAN, + G_TYPE_BOOLEAN, G_TYPE_BOOLEAN, + G_TYPE_BOOLEAN); + model2 =3D GTK_TREE_MODEL(tree2); + + tree1 =3D gtk_tree_store_new(COL_NUMBER, + 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_BOOLEAN, GDK_TYPE_PIXBUF, + G_TYPE_BOOLEAN, G_TYPE_BOOLEAN, + G_TYPE_BOOLEAN, G_TYPE_BOOLEAN, + G_TYPE_BOOLEAN); + model1 =3D GTK_TREE_MODEL(tree1); +} + +static void init_left_tree(void) +{ + GtkTreeView *view =3D GTK_TREE_VIEW(tree1_w); + GtkCellRenderer *renderer; + GtkTreeSelection *sel; + GtkTreeViewColumn *column; + + gtk_tree_view_set_model(view, model1); + + column =3D gtk_tree_view_column_new(); + gtk_tree_view_append_column(view, column); + gtk_tree_view_column_set_title(column, "Options"); + + renderer =3D gtk_cell_renderer_toggle_new(); + gtk_tree_view_column_pack_start(GTK_TREE_VIEW_COLUMN(column), + renderer, FALSE); + gtk_tree_view_column_set_attributes(GTK_TREE_VIEW_COLUMN(column), + renderer, + "active", COL_BTNACT, + "inconsistent", COL_BTNINC, + "visible", COL_BTNVIS, + "radio", COL_BTNRAD, NULL); + renderer =3D gtk_cell_renderer_text_new(); + gtk_tree_view_column_pack_start(GTK_TREE_VIEW_COLUMN(column), + renderer, FALSE); + gtk_tree_view_column_set_attributes(GTK_TREE_VIEW_COLUMN(column), + renderer, + "text", COL_OPTION, + "foreground-gdk", + COL_COLOR, NULL); + + sel =3D gtk_tree_view_get_selection(view); + gtk_tree_selection_set_mode(sel, GTK_SELECTION_SINGLE); +} + +static void init_right_tree(void) +{ + GtkTreeView *view =3D GTK_TREE_VIEW(tree2_w); + GtkCellRenderer *renderer; + GtkTreeSelection *sel; + GtkTreeViewColumn *column; + gint i; + + gtk_tree_view_set_model(view, model2); + + column =3D gtk_tree_view_column_new(); + gtk_tree_view_append_column(view, column); + gtk_tree_view_column_set_title(column, "Options"); + + renderer =3D gtk_cell_renderer_pixbuf_new(); + gtk_tree_view_column_pack_start(GTK_TREE_VIEW_COLUMN(column), + renderer, FALSE); + gtk_tree_view_column_set_attributes(GTK_TREE_VIEW_COLUMN(column), + renderer, + "pixbuf", COL_PIXBUF, + "visible", COL_PIXVIS, NULL); + renderer =3D gtk_cell_renderer_toggle_new(); + gtk_tree_view_column_pack_start(GTK_TREE_VIEW_COLUMN(column), + renderer, FALSE); + gtk_tree_view_column_set_attributes(GTK_TREE_VIEW_COLUMN(column), + renderer, + "active", COL_BTNACT, + "inconsistent", COL_BTNINC, + "visible", COL_BTNVIS, + "radio", COL_BTNRAD, NULL); + renderer =3D gtk_cell_renderer_text_new(); + gtk_tree_view_column_pack_start(GTK_TREE_VIEW_COLUMN(column), + renderer, FALSE); + gtk_tree_view_column_set_attributes(GTK_TREE_VIEW_COLUMN(column), + renderer, + "text", COL_OPTION, + "foreground-gdk", + COL_COLOR, NULL); + + renderer =3D gtk_cell_renderer_text_new(); + gtk_tree_view_insert_column_with_attributes(view, -1, + "Name", renderer, + "text", COL_NAME, + "foreground-gdk", + 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", + 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", + 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", + COL_COLOR, NULL); + renderer =3D gtk_cell_renderer_text_new(); + gtk_tree_view_insert_column_with_attributes(view, -1, + "Value", renderer, + "text", COL_VALUE, + "editable", + COL_EDIT, + "foreground-gdk", + COL_COLOR, NULL); + g_signal_connect(G_OBJECT(renderer), "edited", + G_CALLBACK(renderer_edited), NULL); + + for (i =3D 0; i < COL_VALUE; i++) { + column =3D gtk_tree_view_get_column(view, i); + gtk_tree_view_column_set_resizable(column, TRUE); + } + + sel =3D gtk_tree_view_get_selection(view); + gtk_tree_selection_set_mode(sel, GTK_SELECTION_SINGLE); +} =20 /* Main */ int main(int ac, char *av[]) --=20 2.43.0 From nobody Wed Oct 8 20:53:21 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 4F3FC2E339E; Tue, 24 Jun 2025 15:08: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=1750777687; cv=none; b=vGczkCAjZtvHP/A+XqpeJPi1h4k8ArpksCQe2cNS3ndDrjh2s/NCkkO+qsQES+maKv2tBvFDRIMjmiz9SOCks6jyKBHVWisGiQtToa/PXU1vrNCFv1cv7Y1wp7ggNv4Wu5vjrWWxFQzmQn25r/g/WQJ3mRnnwmrLAm9LOHI27ME= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1750777687; c=relaxed/simple; bh=bNtsGGjTyO9WQwrZ3YIZD66hIR2SF4mfZ+K5q+4ZGA0=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=aMOQQqnSd98COO5lPzAJk2bxNg3FHGkHeHRBES1uSJCFUPb8+gAligc/2RTl5QvqhZaghJl+2YU9LC5+OblA4bq+PMfVJnIETsy5hZ71NEOCspenR7dpXOgp1ZfQHPatbssYL0x0//ASIiH1aXxznvReBsPsK75vq2t1fYCdMo0= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=oRo5HgTw; 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="oRo5HgTw" Received: by smtp.kernel.org (Postfix) with ESMTPSA id EF707C4CEE3; Tue, 24 Jun 2025 15:08:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1750777687; bh=bNtsGGjTyO9WQwrZ3YIZD66hIR2SF4mfZ+K5q+4ZGA0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=oRo5HgTwvObh2V6UGb1kJwqCYnsD2uqG+zmG4J0GlcdtJGGlbd9SeeTvfVbR7VfOM cO0oT0D31rNeEj23v6iQS4YjBbKZNKgruVfvjANiU3v4v8jxqxfJTsTCD1f+9DzRZj wSzZbeKc7dain/uCJzPF1CpTHSnB6F5VYsdqkaSuwKaNGPnXCcuWFS+i+L74lWKYjr /LF2sPzutmDmlLkfWFAgtmuEgvpb0Z+35dqfYkivPPI0MpDWXYrbUZRe6pu4aTGs+t iaOgAaEaA4kzPW6C2qXbnOOO3mDII4/fzo0x//6fVJ1Dhk14Ffbph+0ATP7PttORpx vqvhNhc/1yvwQ== From: Masahiro Yamada To: linux-kbuild@vger.kernel.org Cc: Masahiro Yamada , linux-kernel@vger.kernel.org Subject: [PATCH 25/66] kconfig: gconf: refactor view setting code Date: Wed, 25 Jun 2025 00:05:13 +0900 Message-ID: <20250624150645.1107002-26-masahiroy@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250624150645.1107002-1-masahiroy@kernel.org> References: <20250624150645.1107002-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" Factor out common code for setting the view into a new function, set_view_mode(). Signed-off-by: Masahiro Yamada Acked-by: Randy Dunlap --- scripts/kconfig/gconf.c | 74 +++++++++++++++++++++-------------------- 1 file changed, 38 insertions(+), 36 deletions(-) diff --git a/scripts/kconfig/gconf.c b/scripts/kconfig/gconf.c index 9d06c050b270..b67ebff3f288 100644 --- a/scripts/kconfig/gconf.c +++ b/scripts/kconfig/gconf.c @@ -18,7 +18,7 @@ #include #include =20 -enum { +enum view_mode { SINGLE_VIEW, SPLIT_VIEW, FULL_VIEW }; =20 @@ -70,6 +70,39 @@ static void conf_changed(bool dirty) =20 /* Utility Functions */ =20 +static void set_view_mode(enum view_mode mode) +{ + view_mode =3D mode; + + if (mode =3D=3D SPLIT_VIEW) { // two panes + gint w; + + gtk_widget_show(tree1_w); + gtk_window_get_default_size(GTK_WINDOW(main_wnd), &w, NULL); + gtk_paned_set_position(GTK_PANED(hpaned), w / 2); + } else { + gtk_widget_hide(tree1_w); + gtk_paned_set_position(GTK_PANED(hpaned), 0); + } + + switch (mode) { + case SINGLE_VIEW: + current =3D &rootmenu; + display_tree_part(); + break; + case SPLIT_VIEW: + gtk_tree_store_clear(tree2); + display_list(); + break; + case FULL_VIEW: + gtk_tree_store_clear(tree2); + display_tree(&rootmenu); + break; + } + + if (mode !=3D SINGLE_VIEW) + gtk_widget_set_sensitive(back_btn, FALSE); +} =20 static void text_insert_help(struct menu *menu) { @@ -435,35 +468,19 @@ void on_load_clicked(GtkButton * button, gpointer use= r_data) =20 void on_single_clicked(GtkButton * button, gpointer user_data) { - view_mode =3D SINGLE_VIEW; - gtk_widget_hide(tree1_w); - current =3D &rootmenu; - display_tree_part(); + set_view_mode(SINGLE_VIEW); } =20 =20 void on_split_clicked(GtkButton * button, gpointer user_data) { - gint w; - view_mode =3D SPLIT_VIEW; - gtk_widget_show(tree1_w); - gtk_window_get_default_size(GTK_WINDOW(main_wnd), &w, NULL); - gtk_paned_set_position(GTK_PANED(hpaned), w / 2); - gtk_tree_store_clear(tree2); - display_list(); - - /* Disable back btn, like in full mode. */ - gtk_widget_set_sensitive(back_btn, FALSE); + set_view_mode(SPLIT_VIEW); } =20 =20 void on_full_clicked(GtkButton * button, gpointer user_data) { - view_mode =3D FULL_VIEW; - gtk_widget_hide(tree1_w); - gtk_tree_store_clear(tree2); - display_tree(&rootmenu); - gtk_widget_set_sensitive(back_btn, FALSE); + set_view_mode(FULL_VIEW); } =20 =20 @@ -1039,11 +1056,6 @@ static void _display_tree(struct menu *menu, GtkTree= Iter *parent) || (view_mode =3D=3D FULL_VIEW) || (view_mode =3D=3D SPLIT_VIEW))*/ =20 - /* Change paned position if the view is not in 'split mode' */ - if (view_mode =3D=3D SINGLE_VIEW || view_mode =3D=3D FULL_VIEW) { - gtk_paned_set_position(GTK_PANED(hpaned), 0); - } - if (((view_mode =3D=3D SINGLE_VIEW) && (menu->flags & MENU_ROOT)) || (view_mode =3D=3D FULL_VIEW) || (view_mode =3D=3D SPLIT_VIEW)) @@ -1368,17 +1380,7 @@ int main(int ac, char *av[]) =20 conf_read(NULL); =20 - switch (view_mode) { - case SINGLE_VIEW: - display_tree_part(); - break; - case SPLIT_VIEW: - display_list(); - break; - case FULL_VIEW: - display_tree(&rootmenu); - break; - } + set_view_mode(view_mode); =20 gtk_main(); =20 --=20 2.43.0 From nobody Wed Oct 8 20:53:21 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 6A0372E612B; Tue, 24 Jun 2025 15:08:09 +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=1750777689; cv=none; b=L6s8O2/NREvarQ5B0bxlucF85tlK0xFqrf5H48OB6+b8B6ER1j6qdaFWK9UHcEtMwPZnOUwYUyHaET5UzrGUx36ljHYjI5qOvKIKtoNDXHFGRWQn3edBaZ8x5Tzvl0a2rS0+kPPlNWjkOfOEyTAY/6HzKEKG9n7E+pmEI5/D4RE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1750777689; c=relaxed/simple; bh=i4o0MIiXrKnd2POyw1dzd5rPYrHxB+RC0SVAVUTDI5M=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=IgZNcQXXRUBlRsQlAxtuCk5YY/2RNkFdtZFRgFaU1ZssXtlnXol3uCW4k2/XY42wKOb4HWac9JF058t7BHi1j1eTBy1ewNElFp/B+/rExX1xRNNmaoIZQVoq8AZOnO4KJuojS2db3ZiTqnISd8DcBt7yxbCZawcsMvnS18lVFIg= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=KzAzBKbR; 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="KzAzBKbR" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 03469C4CEEE; Tue, 24 Jun 2025 15:08:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1750777689; bh=i4o0MIiXrKnd2POyw1dzd5rPYrHxB+RC0SVAVUTDI5M=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=KzAzBKbRR7lxB0Fb3xeVFdrAE3QmwdbtHsnqB4cHYCvuQWWWCuTyHsQ6joWPWDpsy SKOqjXfhEAiEStL9wMYidYNw03DG0+yoKV9kVF85BFQRnJ84jFYEC8Egf6aiGzxbcY tdeLAFvmzjkIukC4q20Le/qnIi1O5OGEUB4+RhZA88HSk7wj2JUAkmX4tTrqlhXjaT Js3OZPfCX0VNfq5lrt1th0oby4sRbkYFy1S0nScYUWtrYfDquJY23H9Ifw3qHXc6nI 3KPr7tC8mLQAVzfDurRJqmWecaboFWhAkQBv8fWaJ+LTzLNt5dGInj8p0JDhi0tF63 oRuCjweldSXkg== From: Masahiro Yamada To: linux-kbuild@vger.kernel.org Cc: Masahiro Yamada , linux-kernel@vger.kernel.org Subject: [PATCH 26/66] kconfig: gconf: grey out button for current view Date: Wed, 25 Jun 2025 00:05:14 +0900 Message-ID: <20250624150645.1107002-27-masahiroy@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250624150645.1107002-1-masahiroy@kernel.org> References: <20250624150645.1107002-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 clarifies which view is currently selected. Signed-off-by: Masahiro Yamada Acked-by: Randy Dunlap Tested-by: Randy Dunlap --- scripts/kconfig/gconf.c | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/scripts/kconfig/gconf.c b/scripts/kconfig/gconf.c index b67ebff3f288..67c5c965aaf8 100644 --- a/scripts/kconfig/gconf.c +++ b/scripts/kconfig/gconf.c @@ -38,8 +38,7 @@ static GtkWidget *tree2_w; // right frame static GtkWidget *text_w; static GtkWidget *hpaned; static GtkWidget *vpaned; -static GtkWidget *back_btn; -static GtkWidget *save_btn; +static GtkWidget *back_btn, *save_btn, *single_btn, *split_btn, *full_btn; static GtkWidget *save_menu_item; =20 static GtkTextTag *tag1, *tag2; @@ -85,18 +84,25 @@ static void set_view_mode(enum view_mode mode) gtk_paned_set_position(GTK_PANED(hpaned), 0); } =20 + gtk_widget_set_sensitive(single_btn, TRUE); + gtk_widget_set_sensitive(split_btn, TRUE); + gtk_widget_set_sensitive(full_btn, TRUE); + switch (mode) { case SINGLE_VIEW: current =3D &rootmenu; display_tree_part(); + gtk_widget_set_sensitive(single_btn, FALSE); break; case SPLIT_VIEW: gtk_tree_store_clear(tree2); display_list(); + gtk_widget_set_sensitive(split_btn, FALSE); break; case FULL_VIEW: gtk_tree_store_clear(tree2); display_tree(&rootmenu); + gtk_widget_set_sensitive(full_btn, FALSE); break; } =20 @@ -1167,10 +1173,15 @@ static void init_main_window(const gchar *glade_fil= e) =20 style =3D gtk_widget_get_style(main_wnd); =20 + single_btn =3D glade_xml_get_widget(xml, "button4"); replace_button_icon(xml, main_wnd->window, style, "button4", (gchar **) xpm_single_view); + + split_btn =3D glade_xml_get_widget(xml, "button5"); replace_button_icon(xml, main_wnd->window, style, "button5", (gchar **) xpm_split_view); + + full_btn =3D glade_xml_get_widget(xml, "button6"); replace_button_icon(xml, main_wnd->window, style, "button6", (gchar **) xpm_tree_view); =20 --=20 2.43.0 From nobody Wed Oct 8 20:53:21 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 D12822E62C2; Tue, 24 Jun 2025 15:08: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=1750777691; cv=none; b=SqQDJnCBtBgoGVgWmH1QH5E0qXXacrX8sV38jEcca7VgBr/lNdRK0OS35eDp6NjL0PXICCpRtevDx/LX4Lr9DEWBRZ87twEkiDimVKSRLbR5A1Iq/MzRyuteYTRbWvTyyanYWPF2w9gx/AeF/7Km73WTlyxxuBCqilqvpxu3tBA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1750777691; c=relaxed/simple; bh=SzQMjrw+KMdNtlRzerQIdXvl+LKSRqlgY3ItrKPeIuU=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=cXsDBoopJjO8WFN5eOhrOtX7RopQke/gNZD0Ddb7P4aKHC1vXmbin3vq4sdWiU/AcWpjn8hjdUYMiXHpqnVNZaqIW2yc5aPKunI7VquV4bCT3KCAT9vTJHldMwlWdcb7xV8bOaPx59k+LxL1uKf/wudl++0z5OMS76B54gt4qrM= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=N2xo7EG9; 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="N2xo7EG9" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 1B6BBC4CEE3; Tue, 24 Jun 2025 15:08:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1750777691; bh=SzQMjrw+KMdNtlRzerQIdXvl+LKSRqlgY3ItrKPeIuU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=N2xo7EG9kPqwhnqtlXrK7VYyPExM4FpNMw4768q4qeO8zB5Pe4INvHvTxPYbyO2jW +2bpUM7DLPQCrFxefnN4qhhUI2IxKwTVanX8ZlPGBmN4pNRv+O88l1dtwJgQq7c3sT /wdr6w1lPEgi/dmu5+QtS4sfrHmbopvA8O7J/1ZIycZ2/wSZpQSSc7Qaj+ZrUQSgqM TD73Y+/cxTZvuhG0Rtvt9H6yyeoHxcE+la8q1AAm0VPbB26SeDCHKGAAuhQmxH23YF MC0vZ9ktOzpgarKW/YFLKmqq63wgFtE8GFezQkGNufWzGUwSi2waHgaLVYLhZVvuGB dNStEGdZVRDUA== From: Masahiro Yamada To: linux-kbuild@vger.kernel.org Cc: Masahiro Yamada , linux-kernel@vger.kernel.org Subject: [PATCH 27/66] kconfig: gconf: move the main window event handlers below Date: Wed, 25 Jun 2025 00:05:15 +0900 Message-ID: <20250624150645.1107002-28-masahiroy@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250624150645.1107002-1-masahiroy@kernel.org> References: <20250624150645.1107002-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 allows removal of the forward delcaration of on_save_activate(). Signed-off-by: Masahiro Yamada --- scripts/kconfig/gconf.c | 164 +++++++++++++++++++--------------------- 1 file changed, 78 insertions(+), 86 deletions(-) diff --git a/scripts/kconfig/gconf.c b/scripts/kconfig/gconf.c index 67c5c965aaf8..530ad6aa42d0 100644 --- a/scripts/kconfig/gconf.c +++ b/scripts/kconfig/gconf.c @@ -155,84 +155,6 @@ static void text_insert_msg(const char *title, const c= har *message) NULL); } =20 - -/* Main Windows Callbacks */ - -void on_save_activate(GtkMenuItem * menuitem, gpointer user_data); -gboolean on_window1_delete_event(GtkWidget * widget, GdkEvent * event, - gpointer user_data) -{ - GtkWidget *dialog, *label; - gint result; - gint ret =3D FALSE; - - if (!conf_get_changed()) - return FALSE; - - dialog =3D gtk_dialog_new_with_buttons("Warning !", - GTK_WINDOW(main_wnd), - (GtkDialogFlags) - (GTK_DIALOG_MODAL | - GTK_DIALOG_DESTROY_WITH_PARENT), - GTK_STOCK_OK, - GTK_RESPONSE_YES, - GTK_STOCK_NO, - GTK_RESPONSE_NO, - GTK_STOCK_CANCEL, - GTK_RESPONSE_CANCEL, NULL); - gtk_dialog_set_default_response(GTK_DIALOG(dialog), - GTK_RESPONSE_CANCEL); - - label =3D gtk_label_new("\nSave configuration ?\n"); - gtk_container_add(GTK_CONTAINER(GTK_DIALOG(dialog)->vbox), label); - gtk_widget_show(label); - - result =3D gtk_dialog_run(GTK_DIALOG(dialog)); - switch (result) { - case GTK_RESPONSE_YES: - on_save_activate(NULL, NULL); - break; - case GTK_RESPONSE_NO: - break; - case GTK_RESPONSE_CANCEL: - case GTK_RESPONSE_DELETE_EVENT: - default: - ret =3D TRUE; - break; - } - - gtk_widget_destroy(dialog); - - return ret; -} - - -void on_window1_destroy(GtkObject * object, gpointer user_data) -{ - gtk_main_quit(); -} - - -void -on_window1_size_request(GtkWidget * widget, - GtkRequisition * requisition, 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); -} - - /* Menu & Toolbar Callbacks */ =20 =20 @@ -311,14 +233,6 @@ void on_save_as1_activate(GtkMenuItem * menuitem, gpoi= nter user_data) gtk_widget_show(fs); } =20 - -void on_quit1_activate(GtkMenuItem * menuitem, gpointer user_data) -{ - if (!on_window1_delete_event(NULL, NULL, NULL)) - gtk_widget_destroy(GTK_WIDGET(main_wnd)); -} - - void on_show_name1_activate(GtkMenuItem * menuitem, gpointer user_data) { GtkTreeViewColumn *col; @@ -501,6 +415,84 @@ void on_expand_clicked(GtkButton * button, gpointer us= er_data) gtk_tree_view_expand_all(GTK_TREE_VIEW(tree2_w)); } =20 +/* Main Windows Callbacks */ + +void on_window1_destroy(GtkObject *object, gpointer user_data) +{ + gtk_main_quit(); +} + +void on_window1_size_request(GtkWidget *widget, + GtkRequisition *requisition, + 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); +} + +gboolean on_window1_delete_event(GtkWidget *widget, GdkEvent *event, + gpointer user_data) +{ + GtkWidget *dialog, *label; + gint result; + gint ret =3D FALSE; + + if (!conf_get_changed()) + return FALSE; + + dialog =3D gtk_dialog_new_with_buttons("Warning !", + GTK_WINDOW(main_wnd), + (GtkDialogFlags) + (GTK_DIALOG_MODAL | + GTK_DIALOG_DESTROY_WITH_PARENT), + GTK_STOCK_OK, + GTK_RESPONSE_YES, + GTK_STOCK_NO, + GTK_RESPONSE_NO, + GTK_STOCK_CANCEL, + GTK_RESPONSE_CANCEL, NULL); + gtk_dialog_set_default_response(GTK_DIALOG(dialog), + GTK_RESPONSE_CANCEL); + + label =3D gtk_label_new("\nSave configuration ?\n"); + gtk_container_add(GTK_CONTAINER(GTK_DIALOG(dialog)->vbox), label); + gtk_widget_show(label); + + result =3D gtk_dialog_run(GTK_DIALOG(dialog)); + switch (result) { + case GTK_RESPONSE_YES: + on_save_activate(NULL, NULL); + break; + case GTK_RESPONSE_NO: + break; + case GTK_RESPONSE_CANCEL: + case GTK_RESPONSE_DELETE_EVENT: + default: + ret =3D TRUE; + break; + } + + gtk_widget_destroy(dialog); + + return ret; +} + +void on_quit1_activate(GtkMenuItem *menuitem, gpointer user_data) +{ + if (!on_window1_delete_event(NULL, NULL, NULL)) + gtk_widget_destroy(GTK_WIDGET(main_wnd)); +} =20 /* CTree Callbacks */ =20 --=20 2.43.0 From nobody Wed Oct 8 20:53:21 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 AC02D2D3A8C; Tue, 24 Jun 2025 15:08:13 +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=1750777693; cv=none; b=rEU2e01Waw51hl+2QQZfkHaDWN557voenO5RbjI3mej9nJqdOGpBAH0hyUqIZwJWB4fwfc9IvFAGT6kxgfeA7YKXzeKiizNeHw9Yt5BwvPNm1BOWI9OlMNLm6A8zh/b8dRftamr4hsrCUR4ud57nT0IJhEhXQpFoNq6JLDyhlGE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1750777693; c=relaxed/simple; bh=/xvw+d2DNr170zbN4wOZ/bwy5K0kVuVgb6lKgCGnKSc=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=gRWShLBSH7Ky/6IAeRiKivIvFtLqGASpBsMVOPyclWHjLgSX+bhoLymwUUkj+FNIOiQEBrjHn1U3L+Ns6B6AkmdOUOQj9myCthxDBS0YD3a7nJ15+Ic66b1NPZXUUj9/mGGxnNf36X87PbiMoVZbaof0pWPJeMaCBIXS5lVFHfg= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=a1aN+PPH; 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="a1aN+PPH" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 403D0C4CEE3; Tue, 24 Jun 2025 15:08:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1750777693; bh=/xvw+d2DNr170zbN4wOZ/bwy5K0kVuVgb6lKgCGnKSc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=a1aN+PPHeMciK+x4HGVeoVftWFXqsfpj0bzYsSBR8LDoEtvUkFr6Zk74U3bFLHISN oeEL29yggnX6VrREF7YJMthwnl7fzYiuY7iGgsk1e55xaUKyeeSlemdutKDBxpH3YM 3I6ZYSFahFNR4Gg/mNeWbq5gS5ZhVhqCOTVVm7iE8R7tlwZywezVDlKs99smNphuBe TUUr0KzK3j4jrgZCQn/iKwj74HnBMxVEHzwVFT1ePB5135MJY3F8Euotxy36aKA653 8eu7+8QZvMTX4jbmg7RMq+F4Rzb9KmlO9C0U6reqWs/HqYd6p3QpJNjdmudu4g5JOU 4MHeWS+utlW9A== From: Masahiro Yamada To: linux-kbuild@vger.kernel.org Cc: Masahiro Yamada , linux-kernel@vger.kernel.org Subject: [PATCH 28/66] kconfig: gconf: move button1 initialization below Date: Wed, 25 Jun 2025 00:05:16 +0900 Message-ID: <20250624150645.1107002-29-masahiroy@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250624150645.1107002-1-masahiroy@kernel.org> References: <20250624150645.1107002-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" Collect the toolbar-related code in one place. Signed-off-by: Masahiro Yamada --- scripts/kconfig/gconf.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/scripts/kconfig/gconf.c b/scripts/kconfig/gconf.c index 530ad6aa42d0..bed4c86c2085 100644 --- a/scripts/kconfig/gconf.c +++ b/scripts/kconfig/gconf.c @@ -1144,9 +1144,7 @@ static void init_main_window(const gchar *glade_file) tree2_w =3D glade_xml_get_widget(xml, "treeview2"); text_w =3D glade_xml_get_widget(xml, "textview3"); =20 - back_btn =3D glade_xml_get_widget(xml, "button1"); - gtk_widget_set_sensitive(back_btn, FALSE); - + /* menubar */ widget =3D glade_xml_get_widget(xml, "show_name1"); gtk_check_menu_item_set_active((GtkCheckMenuItem *) widget, show_name); @@ -1159,6 +1157,10 @@ static void init_main_window(const gchar *glade_file) gtk_check_menu_item_set_active((GtkCheckMenuItem *) widget, show_value); =20 + /* toolbar */ + back_btn =3D glade_xml_get_widget(xml, "button1"); + gtk_widget_set_sensitive(back_btn, FALSE); + save_btn =3D glade_xml_get_widget(xml, "button3"); save_menu_item =3D glade_xml_get_widget(xml, "save1"); conf_set_changed_callback(conf_changed); --=20 2.43.0 From nobody Wed Oct 8 20:53:21 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 C03042E7620; Tue, 24 Jun 2025 15:08:16 +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=1750777699; cv=none; b=HsKtDQ0z+Aoe+aTvW4mEyLt5fiu+V0YFECWXrwCssUmJg4XNg1faoHmWS2qaCh+kM687XgUX5S+jHiBPpU/zT7jyjoi5yp8ct9wrBRjaeGCB2QkhKU0GQ4n40m0rr0NTGFUXeiFsym1cV1sQsQZMn38vVw5SDD4Cj8pkhyO/YSY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1750777699; c=relaxed/simple; bh=72XpK3F7rwXAaYkJRYBXWfX1Fa8/pabtr/KOcOc5e5U=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=tjZu0tu+3T7T4hsm1dhrS28idvc80uoxEnd1+giUdsqmsk4G0/AT47UoJtTZMM2OrqM/pdxtC2dd7OZcdfJfKeMDkssynreor0CZLoukpGzCLWAsfnJQgT4sZfyFYCu9LowMJzrR0AYOheX0enqEZRLvIp+oBZnfkrZ+sPJeUfU= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=NH+4mwGQ; 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="NH+4mwGQ" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 62CC4C4CEEE; Tue, 24 Jun 2025 15:08:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1750777696; bh=72XpK3F7rwXAaYkJRYBXWfX1Fa8/pabtr/KOcOc5e5U=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=NH+4mwGQ6AD4pcBZy85D4No2JNpZZFLqP6kairiVZQGP5CXf2/SO1xXjBuTp/BB5F vFD4wUWol/IUJydU7uuLJC0GD7/J/tleAW2mdfJO21TgQcj5Jp9f3qDM9dFGQSfuC6 wb8gT2lhlS++dGFLYDhNR/V0KNVWxljfyRBLU4Rg80ECVdGCyYYk8dP8ilvT/h46Gf WH08Btyf4ANfc2YKM0MyjSPJP5kA3WinuSuhUqkPyR1uWJwZ71jqOjKQvarFPyxGIi zll3iPjfBSaZPVUSbAryf3Tf5E+dGL+A68W4k+drWLjth69z1S0oVIVkN9pGLHkvLl ivga1b1DJKVSw== From: Masahiro Yamada To: linux-kbuild@vger.kernel.org Cc: Masahiro Yamada , linux-kernel@vger.kernel.org Subject: [PATCH 29/66] kconfig: gconf: add static qualifiers to event handlers Date: Wed, 25 Jun 2025 00:05:17 +0900 Message-ID: <20250624150645.1107002-30-masahiroy@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250624150645.1107002-1-masahiroy@kernel.org> References: <20250624150645.1107002-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 fixes several -Wmissing-prototypes warnings. Signed-off-by: Masahiro Yamada Acked-by: Randy Dunlap --- scripts/kconfig/gconf.c | 173 +++++++++++++++++++++++++----------- scripts/kconfig/gconf.glade | 30 ------- 2 files changed, 120 insertions(+), 83 deletions(-) diff --git a/scripts/kconfig/gconf.c b/scripts/kconfig/gconf.c index bed4c86c2085..02bbb7ce4c4a 100644 --- a/scripts/kconfig/gconf.c +++ b/scripts/kconfig/gconf.c @@ -172,7 +172,7 @@ load_filename(GtkFileSelection * file_selector, gpointe= r user_data) display_tree_part(); } =20 -void on_load1_activate(GtkMenuItem * menuitem, gpointer user_data) +static void on_load1_activate(GtkMenuItem *menuitem, gpointer user_data) { GtkWidget *fs; =20 @@ -191,8 +191,7 @@ void on_load1_activate(GtkMenuItem * menuitem, gpointer= user_data) gtk_widget_show(fs); } =20 - -void on_save_activate(GtkMenuItem * menuitem, gpointer user_data) +static void on_save_activate(GtkMenuItem *menuitem, gpointer user_data) { if (conf_write(NULL)) text_insert_msg("Error", "Unable to save configuration !"); @@ -214,7 +213,7 @@ store_filename(GtkFileSelection * file_selector, gpoint= er user_data) gtk_widget_destroy(GTK_WIDGET(user_data)); } =20 -void on_save_as1_activate(GtkMenuItem * menuitem, gpointer user_data) +static void on_save_as1_activate(GtkMenuItem *menuitem, gpointer user_data) { GtkWidget *fs; =20 @@ -233,7 +232,7 @@ void on_save_as1_activate(GtkMenuItem * menuitem, gpoin= ter user_data) gtk_widget_show(fs); } =20 -void on_show_name1_activate(GtkMenuItem * menuitem, gpointer user_data) +static void on_show_name1_activate(GtkMenuItem *menuitem, gpointer user_da= ta) { GtkTreeViewColumn *col; =20 @@ -243,8 +242,7 @@ void on_show_name1_activate(GtkMenuItem * menuitem, gpo= inter user_data) gtk_tree_view_column_set_visible(col, show_name); } =20 - -void on_show_range1_activate(GtkMenuItem * menuitem, gpointer user_data) +static void on_show_range1_activate(GtkMenuItem *menuitem, gpointer user_d= ata) { GtkTreeViewColumn *col; =20 @@ -261,8 +259,7 @@ void on_show_range1_activate(GtkMenuItem * menuitem, gp= ointer user_data) =20 } =20 - -void on_show_data1_activate(GtkMenuItem * menuitem, gpointer user_data) +static void on_show_data1_activate(GtkMenuItem *menuitem, gpointer user_da= ta) { GtkTreeViewColumn *col; =20 @@ -272,35 +269,31 @@ void on_show_data1_activate(GtkMenuItem * menuitem, g= pointer user_data) gtk_tree_view_column_set_visible(col, show_value); } =20 - -void -on_set_option_mode1_activate(GtkMenuItem *menuitem, gpointer user_data) +static void on_set_option_mode1_activate(GtkMenuItem *menuitem, + gpointer user_data) { opt_mode =3D OPT_NORMAL; gtk_tree_store_clear(tree2); display_tree(&rootmenu); /* instead of update_tree to speed-up */ } =20 - -void -on_set_option_mode2_activate(GtkMenuItem *menuitem, gpointer user_data) +static void on_set_option_mode2_activate(GtkMenuItem *menuitem, + gpointer user_data) { opt_mode =3D OPT_ALL; gtk_tree_store_clear(tree2); display_tree(&rootmenu); /* instead of update_tree to speed-up */ } =20 - -void -on_set_option_mode3_activate(GtkMenuItem *menuitem, gpointer user_data) +static void on_set_option_mode3_activate(GtkMenuItem *menuitem, + gpointer user_data) { opt_mode =3D OPT_PROMPT; gtk_tree_store_clear(tree2); display_tree(&rootmenu); /* instead of update_tree to speed-up */ } =20 - -void on_introduction1_activate(GtkMenuItem * menuitem, gpointer user_data) +static void on_introduction1_activate(GtkMenuItem *menuitem, gpointer user= _data) { GtkWidget *dialog; const gchar *intro_text =3D @@ -327,8 +320,7 @@ void on_introduction1_activate(GtkMenuItem * menuitem, = gpointer user_data) gtk_widget_show_all(dialog); } =20 - -void on_about1_activate(GtkMenuItem * menuitem, gpointer user_data) +static void on_about1_activate(GtkMenuItem *menuitem, gpointer user_data) { GtkWidget *dialog; const gchar *about_text =3D @@ -345,8 +337,7 @@ void on_about1_activate(GtkMenuItem * menuitem, gpointe= r user_data) gtk_widget_show_all(dialog); } =20 - -void on_license1_activate(GtkMenuItem * menuitem, gpointer user_data) +static void on_license1_activate(GtkMenuItem *menuitem, gpointer user_data) { GtkWidget *dialog; const gchar *license_text =3D @@ -364,8 +355,8 @@ void on_license1_activate(GtkMenuItem * menuitem, gpoin= ter user_data) gtk_widget_show_all(dialog); } =20 - -void on_back_clicked(GtkButton * button, gpointer user_data) +/* toolbar handlers */ +static void on_back_clicked(GtkButton *button, gpointer user_data) { enum prop_type ptype; =20 @@ -379,50 +370,44 @@ void on_back_clicked(GtkButton * button, gpointer use= r_data) gtk_widget_set_sensitive(back_btn, FALSE); } =20 - -void on_load_clicked(GtkButton * button, gpointer user_data) +static void on_load_clicked(GtkButton *button, gpointer user_data) { on_load1_activate(NULL, user_data); } =20 - -void on_single_clicked(GtkButton * button, gpointer user_data) +static void on_single_clicked(GtkButton *button, gpointer user_data) { set_view_mode(SINGLE_VIEW); } =20 - -void on_split_clicked(GtkButton * button, gpointer user_data) +static void on_split_clicked(GtkButton *button, gpointer user_data) { set_view_mode(SPLIT_VIEW); } =20 - -void on_full_clicked(GtkButton * button, gpointer user_data) +static void on_full_clicked(GtkButton *button, gpointer user_data) { set_view_mode(FULL_VIEW); } =20 - -void on_collapse_clicked(GtkButton * button, gpointer user_data) +static void on_collapse_clicked(GtkButton *button, gpointer user_data) { gtk_tree_view_collapse_all(GTK_TREE_VIEW(tree2_w)); } =20 - -void on_expand_clicked(GtkButton * button, gpointer user_data) +static void on_expand_clicked(GtkButton *button, gpointer user_data) { gtk_tree_view_expand_all(GTK_TREE_VIEW(tree2_w)); } =20 /* Main Windows Callbacks */ =20 -void on_window1_destroy(GtkObject *object, gpointer user_data) +static void on_window1_destroy(GtkObject *object, gpointer user_data) { gtk_main_quit(); } =20 -void on_window1_size_request(GtkWidget *widget, +static void on_window1_size_request(GtkWidget *widget, GtkRequisition *requisition, gpointer user_data) { @@ -441,7 +426,7 @@ void on_window1_size_request(GtkWidget *widget, gtk_paned_set_position(GTK_PANED(vpaned), 2 * h / 3); } =20 -gboolean on_window1_delete_event(GtkWidget *widget, GdkEvent *event, +static gboolean on_window1_delete_event(GtkWidget *widget, GdkEvent *event, gpointer user_data) { GtkWidget *dialog, *label; @@ -488,7 +473,7 @@ gboolean on_window1_delete_event(GtkWidget *widget, Gdk= Event *event, return ret; } =20 -void on_quit1_activate(GtkMenuItem *menuitem, gpointer user_data) +static void on_quit1_activate(GtkMenuItem *menuitem, gpointer user_data) { if (!on_window1_delete_event(NULL, NULL, NULL)) gtk_widget_destroy(GTK_WIDGET(main_wnd)); @@ -598,9 +583,9 @@ static gint column2index(GtkTreeViewColumn * column) =20 =20 /* User click: update choice (full) or goes down (single) */ -gboolean -on_treeview2_button_press_event(GtkWidget * widget, - GdkEventButton * event, gpointer user_data) +static gboolean on_treeview2_button_press_event(GtkWidget *widget, + GdkEventButton *event, + gpointer user_data) { GtkTreeView *view =3D GTK_TREE_VIEW(widget); GtkTreePath *path; @@ -648,9 +633,9 @@ on_treeview2_button_press_event(GtkWidget * widget, } =20 /* Key pressed: update choice */ -gboolean -on_treeview2_key_press_event(GtkWidget * widget, - GdkEventKey * event, gpointer user_data) +static gboolean on_treeview2_key_press_event(GtkWidget *widget, + GdkEventKey *event, + gpointer user_data) { GtkTreeView *view =3D GTK_TREE_VIEW(widget); GtkTreePath *path; @@ -690,8 +675,8 @@ on_treeview2_key_press_event(GtkWidget * widget, =20 =20 /* Row selection changed: update help */ -void -on_treeview2_cursor_changed(GtkTreeView * treeview, gpointer user_data) +static void on_treeview2_cursor_changed(GtkTreeView *treeview, + gpointer user_data) { GtkTreeSelection *selection; GtkTreeIter iter; @@ -706,9 +691,9 @@ on_treeview2_cursor_changed(GtkTreeView * treeview, gpo= inter user_data) =20 =20 /* User click: display sub-tree in the right frame. */ -gboolean -on_treeview1_button_press_event(GtkWidget * widget, - GdkEventButton * event, gpointer user_data) +static gboolean on_treeview1_button_press_event(GtkWidget *widget, + GdkEventButton *event, + gpointer user_data) { GtkTreeView *view =3D GTK_TREE_VIEW(widget); GtkTreePath *path; @@ -1138,47 +1123,129 @@ static void init_main_window(const gchar *glade_fi= le) glade_xml_signal_autoconnect(xml); =20 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, "delete_event", + G_CALLBACK(on_window1_delete_event), NULL); + 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"); + g_signal_connect(tree1_w, "cursor_changed", + G_CALLBACK(on_treeview2_cursor_changed), NULL); + g_signal_connect(tree1_w, "button_press_event", + G_CALLBACK(on_treeview1_button_press_event), NULL); + g_signal_connect(tree1_w, "key_press_event", + G_CALLBACK(on_treeview2_key_press_event), NULL); + tree2_w =3D glade_xml_get_widget(xml, "treeview2"); + g_signal_connect(tree2_w, "cursor_changed", + G_CALLBACK(on_treeview2_cursor_changed), NULL); + g_signal_connect(tree2_w, "button_press_event", + G_CALLBACK(on_treeview2_button_press_event), NULL); + g_signal_connect(tree2_w, "key_press_event", + G_CALLBACK(on_treeview2_key_press_event), NULL); + text_w =3D glade_xml_get_widget(xml, "textview3"); =20 /* menubar */ + widget =3D glade_xml_get_widget(xml, "load1"); + g_signal_connect(widget, "activate", G_CALLBACK(on_load1_activate), NULL); + + widget =3D glade_xml_get_widget(xml, "save1"); + g_signal_connect(widget, "activate", G_CALLBACK(on_save_activate), NULL); + + widget =3D glade_xml_get_widget(xml, "save_as1"); + g_signal_connect(widget, "activate", G_CALLBACK(on_save_as1_activate), NU= LL); + + widget =3D glade_xml_get_widget(xml, "quit1"); + g_signal_connect(widget, "activate", G_CALLBACK(on_quit1_activate), NULL); + widget =3D glade_xml_get_widget(xml, "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"); + 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"); + 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"); + g_signal_connect(widget, "activate", + G_CALLBACK(on_set_option_mode1_activate), NULL); + + widget =3D glade_xml_get_widget(xml, "set_option_mode2"); + g_signal_connect(widget, "activate", + G_CALLBACK(on_set_option_mode2_activate), NULL); + + widget =3D glade_xml_get_widget(xml, "set_option_mode3"); + g_signal_connect(widget, "activate", + G_CALLBACK(on_set_option_mode3_activate), NULL); + + widget =3D glade_xml_get_widget(xml, "introduction1"); + g_signal_connect(widget, "activate", + G_CALLBACK(on_introduction1_activate), NULL); + + widget =3D glade_xml_get_widget(xml, "about1"); + g_signal_connect(widget, "activate", + G_CALLBACK(on_about1_activate), NULL); + + widget =3D glade_xml_get_widget(xml, "license1"); + g_signal_connect(widget, "activate", + G_CALLBACK(on_license1_activate), NULL); + /* toolbar */ back_btn =3D glade_xml_get_widget(xml, "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"); + g_signal_connect(widget, "clicked", + G_CALLBACK(on_load_clicked), NULL); + save_btn =3D glade_xml_get_widget(xml, "button3"); + g_signal_connect(save_btn, "clicked", + G_CALLBACK(on_save_activate), NULL); save_menu_item =3D glade_xml_get_widget(xml, "save1"); conf_set_changed_callback(conf_changed); =20 style =3D gtk_widget_get_style(main_wnd); =20 single_btn =3D glade_xml_get_widget(xml, "button4"); + g_signal_connect(single_btn, "clicked", + G_CALLBACK(on_single_clicked), NULL); replace_button_icon(xml, main_wnd->window, style, "button4", (gchar **) xpm_single_view); =20 split_btn =3D glade_xml_get_widget(xml, "button5"); + g_signal_connect(split_btn, "clicked", + G_CALLBACK(on_split_clicked), NULL); replace_button_icon(xml, main_wnd->window, style, "button5", (gchar **) xpm_split_view); =20 full_btn =3D glade_xml_get_widget(xml, "button6"); + g_signal_connect(full_btn, "clicked", + G_CALLBACK(on_full_clicked), NULL); replace_button_icon(xml, main_wnd->window, style, "button6", (gchar **) xpm_tree_view); =20 + widget =3D glade_xml_get_widget(xml, "button7"); + g_signal_connect(widget, "clicked", + G_CALLBACK(on_collapse_clicked), NULL); + + widget =3D glade_xml_get_widget(xml, "button8"); + g_signal_connect(widget, "clicked", + G_CALLBACK(on_expand_clicked), NULL); + txtbuf =3D gtk_text_view_get_buffer(GTK_TEXT_VIEW(text_w)); tag1 =3D gtk_text_buffer_create_tag(txtbuf, "mytag1", "foreground", "red", diff --git a/scripts/kconfig/gconf.glade b/scripts/kconfig/gconf.glade index 19b80f2ec1ff..8519104a3c2b 100644 --- a/scripts/kconfig/gconf.glade +++ b/scripts/kconfig/gconf.glade @@ -17,9 +17,6 @@ False GDK_WINDOW_TYPE_HINT_NORMAL GDK_GRAVITY_NORTH_WEST - - - =20 @@ -46,7 +43,6 @@ Load a config file= _Load True - @@ -57,7 +53,6 @@ Save the config in= .config _Save True - @@ -68,7 +63,6 @@ Save the config in= a file Save _as True - =20 @@ -83,7 +77,6 @@ True _Quit True - @@ -108,7 +101,6 @@ Show _name True False - =20 @@ -119,7 +111,6 @@ Show _range True False - =20 @@ -130,7 +121,6 @@ Show _data True False - =20 @@ -147,7 +137,6 @@ Show normal options<= /property> True True - =20 @@ -159,7 +148,6 @@ True False set_option_mode1 - =20 @@ -171,7 +159,6 @@ True False set_option_mode1 - =20 @@ -194,7 +181,6 @@ True _Introduction True - @@ -204,7 +190,6 @@ True _About True - @@ -214,7 +199,6 @@ True _License True - @@ -254,7 +238,6 @@ True True False - False @@ -291,7 +274,6 @@ True True False - False @@ -309,7 +291,6 @@ True True False - False @@ -346,7 +327,6 @@ True True False - False @@ -364,7 +344,6 @@ True True False - False @@ -382,7 +361,6 @@ True True False - False @@ -419,7 +397,6 @@ True True False - False @@ -437,7 +414,6 @@ True True False - False @@ -477,9 +453,6 @@ False False False - - - @@ -512,9 +485,6 @@ False False False - - - --=20 2.43.0 From nobody Wed Oct 8 20:53:21 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 76C372D3A8C; Tue, 24 Jun 2025 15:08:18 +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=1750777698; cv=none; b=gRjSbuzF35Bc0mU5WapwPyKiVzJoVxn+xqfrVRWYL9lke5nVZjY7qiMq0pWiiCzzGURm6b36ZCXiXHzHY+u4gRlJrrHEyuWIssZD2vv+OaNSrX1mrYdsJ04NDOY0otVOzfww/s4tqeXAaq2PcOm/28/sb9WV3AYB3MewjzOYdlo= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1750777698; c=relaxed/simple; bh=lQOXS5XkltNaHpRChFfbCSkSPUttaa14aTnxpjQhsUk=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=GdItSTjAhDEB8BJ8KWx3M8bW0WHfu+seI7b8zDUki8jgycrqQcU6RtKxOPIW5OkOUmiE0NzZUaw7LVdziYjRT0oFdSnPe+CmR8hgbiUxZko/BRllh22WZ0LhnLNwHQD/BvrutL32cL2h60CfCmgiZARZ9Oomp6sfu/NDW9SRxBI= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=BaKt3QGX; 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="BaKt3QGX" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 075BCC4CEE3; Tue, 24 Jun 2025 15:08:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1750777698; bh=lQOXS5XkltNaHpRChFfbCSkSPUttaa14aTnxpjQhsUk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=BaKt3QGXpi6YjTdDXLnstbuJZx4TRUipgR/8OYL5+WU8aaYjADx3WbmHsrw4/8lBx 4EX0yRGvIgTHM0vtUZdIlnlxBb+OG3PMppOrg3J5GPB/tVhmBXAnxRmt58j8j8pdbC rNmQS8NGo/hRzruWF9KYb1R3HYq7YkZ3DAX0ojVshp/vFc9wP+PadGfkJgKAaJ8lwh 1OMpr5u13f8khc/jdU/xc5f3BHr7+iCr5Iecttm47iV21uP1Tux7xZtX9qV+g5B9DQ ulqhgYfy1saarvvZlOl6GSYgKomJfSWmbt5ya2Ifm3HhUpMrUY1jt2KczPIacgBYB4 PF7BAA+MLS0hQ== From: Masahiro Yamada To: linux-kbuild@vger.kernel.org Cc: Masahiro Yamada , linux-kernel@vger.kernel.org Subject: [PATCH 30/66] kconfig: gconf: remove glade_xml_signal_autoconnect() call Date: Wed, 25 Jun 2025 00:05:18 +0900 Message-ID: <20250624150645.1107002-31-masahiroy@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250624150645.1107002-1-masahiroy@kernel.org> References: <20250624150645.1107002-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" Now that all signals are connected manually, this is no longer unnecessary. Signed-off-by: Masahiro Yamada --- scripts/kconfig/gconf.c | 1 - 1 file changed, 1 deletion(-) diff --git a/scripts/kconfig/gconf.c b/scripts/kconfig/gconf.c index 02bbb7ce4c4a..09537245213a 100644 --- a/scripts/kconfig/gconf.c +++ b/scripts/kconfig/gconf.c @@ -1120,7 +1120,6 @@ static void init_main_window(const gchar *glade_file) xml =3D glade_xml_new(glade_file, "window1", NULL); if (!xml) g_error("GUI loading failed !\n"); - glade_xml_signal_autoconnect(xml); =20 main_wnd =3D glade_xml_get_widget(xml, "window1"); g_signal_connect(main_wnd, "destroy", --=20 2.43.0 From nobody Wed Oct 8 20:53:21 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 87FDA2E7630; Tue, 24 Jun 2025 15:08:20 +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=1750777700; cv=none; b=cYT+qqOOh+hqn5UcvLaou9C3nrz0HlyolDEJ7iL8TUi/J0awI5YFcCGcv/FHVPFxxqrlvM1YJ32nAR0gXHDtasoPvIAKUMkNiPrKYD/Go/A1ozzXzc+NfOJYHRnBS8vXg/lYNb+wDlS56Uvqe1rXH7tGrkaMjFIy9qpIh0ljqQw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1750777700; c=relaxed/simple; bh=ZrCNSsgWHi2+vLNO7PX9LEok4dDMNUdWFNqGBSA8SGI=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=NnOppXrEk9LdwjUNGOb37mNS6ly/MLrWv36CrbjLm3zI10ffjjA3XI4SUIwowofs5KN4A3Nevu3W79psFLw86UVlFLL2Ih+ZmFfdcZ5UxOspRXYrmDO433IHRww4jBBSdSTNHhSNyLgyE6cDZ4vKNlf53oL5AvP9ZKOcrrvNPY8= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=c4hiBUzQ; 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="c4hiBUzQ" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 3748BC4CEF0; Tue, 24 Jun 2025 15:08:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1750777700; bh=ZrCNSsgWHi2+vLNO7PX9LEok4dDMNUdWFNqGBSA8SGI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=c4hiBUzQ8jE3UbHoej+gXKRxjZMLQHwIRtRo35TCHVBl5t/gDCtu3K1t5GZyfaGLD aR8aw45WT4opN96n+WY/QCw2pY465h8zsVWij42WZnDIbDw9ZLwviVEG6ArVmq8Bal +cySVJ0hzlCA/G3wTyIl8h8/tIb9wNw7i4T3UwL4FBiT8g6PpwA0Yi9XERSY6RITg1 srUAREyBz++2RZqozVtn+ozYcO30Rk5RPS48RLyIIHtsrzowbUYR1CCY+FWDxr02Pa sZ89CtFzfC8P3mHjYpv4M0i2X6hNOLjS3s9csMylpn2nXzZZNEf0qeX63agvj7Q4Uv MIvk1n1cbvrLQ== From: Masahiro Yamada To: linux-kbuild@vger.kernel.org Cc: Masahiro Yamada , linux-kernel@vger.kernel.org Subject: [PATCH 31/66] kconfig: gconf: make key_press_event work in left pane too Date: Wed, 25 Jun 2025 00:05:19 +0900 Message-ID: <20250624150645.1107002-32-masahiroy@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250624150645.1107002-1-masahiroy@kernel.org> References: <20250624150645.1107002-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" Currently, on_treeview2_key_press_event() returns early for the tree1 widget. We can make it work on the left pane as well by avoiding the hardcoded use of model2. Signed-off-by: Masahiro Yamada --- scripts/kconfig/gconf.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/scripts/kconfig/gconf.c b/scripts/kconfig/gconf.c index 09537245213a..51d987c8ffaf 100644 --- a/scripts/kconfig/gconf.c +++ b/scripts/kconfig/gconf.c @@ -638,6 +638,7 @@ static gboolean on_treeview2_key_press_event(GtkWidget = *widget, gpointer user_data) { GtkTreeView *view =3D GTK_TREE_VIEW(widget); + GtkTreeModel *model =3D gtk_tree_view_get_model(view); GtkTreePath *path; GtkTreeIter iter; struct menu *menu; @@ -654,11 +655,9 @@ static gboolean on_treeview2_key_press_event(GtkWidget= *widget, gtk_tree_view_expand_row(view, path, FALSE); return TRUE; } - if (widget =3D=3D tree1_w) - return FALSE; =20 - gtk_tree_model_get_iter(model2, &iter, path); - gtk_tree_model_get(model2, &iter, COL_MENU, &menu, -1); + gtk_tree_model_get_iter(model, &iter, path); + gtk_tree_model_get(model, &iter, COL_MENU, &menu, -1); =20 if (!strcasecmp(event->string, "n")) col =3D COL_NO; --=20 2.43.0 From nobody Wed Oct 8 20:53:21 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 0C3E02E7F0D; Tue, 24 Jun 2025 15:08:22 +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=1750777703; cv=none; b=L48n33+PLM8rnQB9opTrLQGQFRFMm/EJIq+drZlcQeWapwXd6DpZTdU/G2SLnlJgHUehOTSzvkVbq6JOWFb4F8vbfn9hIa5NE+GMT9rS8dzIHTFPifTtK24HRJatebggXe861uDOMTgLcnTX5339sVI4w/wQQQYhN0kJ3j6yyGc= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1750777703; c=relaxed/simple; bh=i5+4zBmg+RQmdV80XXcA8B3KXOzZSn9pgDB47SILc2c=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=TrZD9+5UvL9aheil6dJp+rpKdPp8gNbOokerug+znik2gOQyBMPGor3ZLYVZhMUtcE6YeZYqWKcZfgg9BFMszO2onJygx34UzotVD6U7Y8J+8c/iLQ+/s39KpM/YASQghYloH4JVbzYr4o/NMatt3zAaAXnVtn6yhOLN/fBsAPI= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=PpAUJdzG; 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="PpAUJdzG" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 3E01CC4CEE3; Tue, 24 Jun 2025 15:08:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1750777702; bh=i5+4zBmg+RQmdV80XXcA8B3KXOzZSn9pgDB47SILc2c=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=PpAUJdzGVJF2VYsYQwfj2I3V2VzFVUiYYtih7PTqKRgqV3kHVTI/iaex5Hhdu1oPV tHhru6fXbooiHwIwIroAjRuYseEHbT9+/E++Tsid+nujlIbQ6YKrP3odR9ChbIXoHE 9xwUkCLvqj3HOX5OGMvE91V6WBeySV0nnG2HGGnb+SJ9SdNGyI9oM1xKThJR563Eeo y1h8VNFEsv/mH1JZaniTsKEy6F7f5bmjYOPmAIzSsnnav1w/vFX/3KaSvATbxa4SyL OBlSa/yRdjGOijV9lXJ120bHxLmXY1Fk/tCF7NJKi3nkPtrx0zdsRqzHHyu5U7AwRF WVY7l5nGg250w== From: Masahiro Yamada To: linux-kbuild@vger.kernel.org Cc: Masahiro Yamada , linux-kernel@vger.kernel.org Subject: [PATCH 32/66] kconfig: gconf: avoid hardcoding model2 in on_treeview2_cursor_changed() Date: Wed, 25 Jun 2025 00:05:20 +0900 Message-ID: <20250624150645.1107002-33-masahiroy@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250624150645.1107002-1-masahiroy@kernel.org> References: <20250624150645.1107002-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 on_treeview2_cursor_changed() handler is connected to both the left and right tree views, but it hardcodes model2 (the GtkTreeModel of the right tree view). This is incorrect. Get the associated model from the view. Signed-off-by: Masahiro Yamada --- scripts/kconfig/gconf.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/scripts/kconfig/gconf.c b/scripts/kconfig/gconf.c index 51d987c8ffaf..2d7a556eddaf 100644 --- a/scripts/kconfig/gconf.c +++ b/scripts/kconfig/gconf.c @@ -677,13 +677,14 @@ static gboolean on_treeview2_key_press_event(GtkWidge= t *widget, static void on_treeview2_cursor_changed(GtkTreeView *treeview, gpointer user_data) { + GtkTreeModel *model =3D gtk_tree_view_get_model(treeview); GtkTreeSelection *selection; GtkTreeIter iter; struct menu *menu; =20 selection =3D gtk_tree_view_get_selection(treeview); - if (gtk_tree_selection_get_selected(selection, &model2, &iter)) { - gtk_tree_model_get(model2, &iter, COL_MENU, &menu, -1); + if (gtk_tree_selection_get_selected(selection, &model, &iter)) { + gtk_tree_model_get(model, &iter, COL_MENU, &menu, -1); text_insert_help(menu); } } --=20 2.43.0 From nobody Wed Oct 8 20:53:21 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 BE02F2E8884; Tue, 24 Jun 2025 15:08:24 +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=1750777704; cv=none; b=lFiPnwzKrjzkoUJQmUB+MRfeviuwg5hLdgxTtK4UK+8KlPGdCqdpaAepz28IDCcsVY6E8+x/CozB/5kM79YA30YZdm3FCNKVrQ53emJiwYv+D8qo/0hS0zCi/ezh6AmCTZf/1S9uxORkImkomnXut2Hp9yn1CVwkJJ6+ixMVXKU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1750777704; c=relaxed/simple; bh=KVe0746hXNPejZk1YodN3h2TERUQYGYoz4tNbuhM7b4=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=GbSVCDI5vjirb4F0Dr9G3f3WUuCY42TuKpLyihiE1PqRO/YQdMb1L34Yh386MNxk00LoNBpKeE/xdSRsh4mKwFp7h+cpjFR6p5knLYINWs2Z2+cuisyrfYSN1q+ZkHnE07/wUp/zhO8tO7RobcC+e+5FZKdypymRoNIvGUxxYkU= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=uRuzZuba; 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="uRuzZuba" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 67AA0C4CEF0; Tue, 24 Jun 2025 15:08:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1750777704; bh=KVe0746hXNPejZk1YodN3h2TERUQYGYoz4tNbuhM7b4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=uRuzZubaP0wbgErwqGmwxaaUeEVMwdBDRcsiizi5ZmC+lI05jm2/z2oCpoa/Ucuho pAWNL3NNLfKJZaEuFiNyUdlaydb+WBF0gxaPSbQMABBCnmvMVle7Eunqc5+eY66J7y 2xRfxwlnCYUJ4xORQPDFHyYbwAwfYVFAgMGS15hAIQv8hrskuOmdIy/RH66be+Irlr 0nZEMBuUxfvyCDT7Vn9HrVcvl+96rXm/3v+DJDI7nksyvYrkV6BzYOasSQyQElrfet Nm4SLiL+IzAaK5pWArYovre/4mt7HNb44TGxGGtmBi+g/vvVSVdEo9vartYzWpPXs+ J0sKsGaJ26Lxg== From: Masahiro Yamada To: linux-kbuild@vger.kernel.org Cc: Masahiro Yamada , linux-kernel@vger.kernel.org Subject: [PATCH 33/66] kconfig: gconf: avoid hardcoding model2 in renderer_edited() Date: Wed, 25 Jun 2025 00:05:21 +0900 Message-ID: <20250624150645.1107002-34-masahiroy@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250624150645.1107002-1-masahiroy@kernel.org> References: <20250624150645.1107002-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" Although this is only used in the right tree view, it is better not to hardcode model2 for consistency. Signed-off-by: Masahiro Yamada --- scripts/kconfig/gconf.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/scripts/kconfig/gconf.c b/scripts/kconfig/gconf.c index 2d7a556eddaf..66c58a15b717 100644 --- a/scripts/kconfig/gconf.c +++ b/scripts/kconfig/gconf.c @@ -486,19 +486,21 @@ static void renderer_edited(GtkCellRendererText * cel= l, const gchar * path_string, const gchar * new_text, gpointer user_data) { + GtkTreeView *view =3D GTK_TREE_VIEW(user_data); + GtkTreeModel *model =3D gtk_tree_view_get_model(view); GtkTreePath *path =3D gtk_tree_path_new_from_string(path_string); GtkTreeIter iter; const char *old_def, *new_def; struct menu *menu; struct symbol *sym; =20 - if (!gtk_tree_model_get_iter(model2, &iter, path)) + if (!gtk_tree_model_get_iter(model, &iter, path)) goto free; =20 - gtk_tree_model_get(model2, &iter, COL_MENU, &menu, -1); + gtk_tree_model_get(model, &iter, COL_MENU, &menu, -1); sym =3D menu->sym; =20 - gtk_tree_model_get(model2, &iter, COL_VALUE, &old_def, -1); + gtk_tree_model_get(model, &iter, COL_VALUE, &old_def, -1); new_def =3D new_text; =20 sym_set_string_value(sym, new_def); @@ -1391,7 +1393,7 @@ static void init_right_tree(void) "foreground-gdk", COL_COLOR, NULL); g_signal_connect(G_OBJECT(renderer), "edited", - G_CALLBACK(renderer_edited), NULL); + G_CALLBACK(renderer_edited), tree2_w); =20 for (i =3D 0; i < COL_VALUE; i++) { column =3D gtk_tree_view_get_column(view, i); --=20 2.43.0 From nobody Wed Oct 8 20:53:21 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 3200B2D542A; Tue, 24 Jun 2025 15:08:26 +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=1750777707; cv=none; b=fQr3KRo14lMR9C5mEH53G8YpBuvG+t7WCi9jv2NBSwijEuC/K2I8lUU+mLUzzRdckIxzJ4gl2zEzNvhrf7zidw4kvr4kDjwwIL1H5R7z/xDCgF/3KIudZaB+MC9J94oKxe/VxL6axlhEd5abLkmQDM4AEf2tUC4zqNgpFZOPWoE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1750777707; c=relaxed/simple; bh=UU9gPrvR7gUHvpGDoplY+ssUC3cjt97ALdclLMiZxIA=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=FLOP1ZmlHv4Z/40mOlo9AM+abqGt2Ic1jAAeG2GXs3/SzwYO9Zr8w1LmbOIv6x7lB6dS0NeanrqfkkR2tHJIMgTW3AptfDo2wJIlytC5/IdubMBDIug7bWJUFh57+adz4y22n+/16sD+LXOS7L9MydDRR92tuUwyp4AFl+WIn2c= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=hETbJJer; 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="hETbJJer" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 7012BC4CEEE; Tue, 24 Jun 2025 15:08:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1750777706; bh=UU9gPrvR7gUHvpGDoplY+ssUC3cjt97ALdclLMiZxIA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=hETbJJerXxFpL9MbCG7EqubH6NxwR4DYEcNh6Y3Ymu/0zZjbv5V5SDqjrGMjxTqI/ IgPwtvw/G4tpibeOL8rubCf8Pad6iNwMUDoYN57Ao6qdkiBQ+761XegLv9NQJuG16C 9oDBMiXLAagHakj+BHOeE1ZUm/PsUw2rs29EKiOLfrhcStgPmrP9HL1Jx7aTjjXFQK bm/1adxyOHetz6HaXZv5p2elt20b31x4uMjD2rmg2BonK/e38wkK3EmHbYV0PAltxB i2fK7vNjQcjiGv5Gmd9uh+9hwRG2jNVhxjenfEYPu9eRDd9e/RbVpTpiQP0dZZKCMc a0NhbKyQ8VS0g== From: Masahiro Yamada To: linux-kbuild@vger.kernel.org Cc: Masahiro Yamada , linux-kernel@vger.kernel.org Subject: [PATCH 34/66] kconfig: gconf: avoid hardcoding model* in on_treeview*_button_press_event() Date: Wed, 25 Jun 2025 00:05:22 +0900 Message-ID: <20250624150645.1107002-35-masahiroy@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250624150645.1107002-1-masahiroy@kernel.org> References: <20250624150645.1107002-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" It is better not to hardcode model1 or model2 for consistency. Signed-off-by: Masahiro Yamada --- scripts/kconfig/gconf.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/scripts/kconfig/gconf.c b/scripts/kconfig/gconf.c index 66c58a15b717..6972acb4b396 100644 --- a/scripts/kconfig/gconf.c +++ b/scripts/kconfig/gconf.c @@ -590,6 +590,7 @@ static gboolean on_treeview2_button_press_event(GtkWidg= et *widget, gpointer user_data) { GtkTreeView *view =3D GTK_TREE_VIEW(widget); + GtkTreeModel *model =3D gtk_tree_view_get_model(view); GtkTreePath *path; GtkTreeViewColumn *column; GtkTreeIter iter; @@ -602,9 +603,9 @@ static gboolean on_treeview2_button_press_event(GtkWidg= et *widget, if (path =3D=3D NULL) return FALSE; =20 - if (!gtk_tree_model_get_iter(model2, &iter, path)) + if (!gtk_tree_model_get_iter(model, &iter, path)) return FALSE; - gtk_tree_model_get(model2, &iter, COL_MENU, &menu, -1); + gtk_tree_model_get(model, &iter, COL_MENU, &menu, -1); =20 col =3D column2index(column); if (event->type =3D=3D GDK_2BUTTON_PRESS) { @@ -698,6 +699,7 @@ static gboolean on_treeview1_button_press_event(GtkWidg= et *widget, gpointer user_data) { GtkTreeView *view =3D GTK_TREE_VIEW(widget); + GtkTreeModel *model =3D gtk_tree_view_get_model(view); GtkTreePath *path; GtkTreeIter iter; struct menu *menu; @@ -708,8 +710,8 @@ static gboolean on_treeview1_button_press_event(GtkWidg= et *widget, if (path =3D=3D NULL) return FALSE; =20 - gtk_tree_model_get_iter(model1, &iter, path); - gtk_tree_model_get(model1, &iter, COL_MENU, &menu, -1); + gtk_tree_model_get_iter(model, &iter, path); + gtk_tree_model_get(model, &iter, COL_MENU, &menu, -1); =20 if (event->type =3D=3D GDK_2BUTTON_PRESS) { toggle_sym_value(menu); --=20 2.43.0 From nobody Wed Oct 8 20:53:21 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 E04A12E9729; Tue, 24 Jun 2025 15:08:28 +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=1750777709; cv=none; b=eTk6eMCQKp/Gh/mIGRFPMHCRxJpa58+jZSVVI79Rr/JkobIObJLLFwFXOPd9YZc7dBY2qVOS1ZAunnO6rf5Oq3W3GBBNneWtL7e7sUt3cM0fTl1rr9GBdb929ozzB02Zfb7/h9h5/nOtQvrvsPnKWbrxmRUku7RxzuJPcqTagSw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1750777709; c=relaxed/simple; bh=PluKFvs+HMYP4pgTX9WTg1RSxH3D8rzHm8dVdb5O1OA=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=LZMiXPSQ9mmN3MSIgG5ijF7zf8YMsSAmNFxE4TGlulMuTDsCEqary7FzzFwms0Nhmnl5DqSFJKxZBNU55zLWM3LUkXpxxgY9kyrkFIt5DnwVL9v5EJpUy642ur9Wem2LAC6GuOADg6Viv2gihIfdxXt0VLD+z3cv0fiIMfmUSlU= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=hwvZXwVh; 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="hwvZXwVh" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 87499C4CEE3; Tue, 24 Jun 2025 15:08:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1750777708; bh=PluKFvs+HMYP4pgTX9WTg1RSxH3D8rzHm8dVdb5O1OA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=hwvZXwVhTzxhYTbhzZvbV1qL/xVxkfY42dC2LMyles/lGzoCTwb6Ov+SLogD2lkVr WF3vDXFDsUuXI+QBZKeVK0TBBvYEOTNu/CX6MkZzjK3EC38EPLDjjD06jpOkCfGmdD iKrpdW+iBprM0D12s7kkl/1KbS8GB3Fsj4PoUvayl0MUlmT3SVcukP/MXXXDcuQYsj FGEPmFTBvxKofjwTcqnLBLIVD39jgYW8QPkcebh+bB4pigtNcME4rPTV8f1ng6j6aO hPZ5H5r0oWm/csSL4xvABhK5quQOsMndKVAAfmVpEbH6wtYVGH14asunUksZVB3IKx wBi55FmrCfNMw== From: Masahiro Yamada To: linux-kbuild@vger.kernel.org Cc: Masahiro Yamada , linux-kernel@vger.kernel.org Subject: [PATCH 35/66] kconfig: gconf: add on_save_clicked() event handler Date: Wed, 25 Jun 2025 00:05:23 +0900 Message-ID: <20250624150645.1107002-36-masahiroy@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250624150645.1107002-1-masahiroy@kernel.org> References: <20250624150645.1107002-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 "clicked" event handler for GtkToolButton takes the GtkToolButton* as the first parameter. This is different from the existing on_save_activate() handler. Signed-off-by: Masahiro Yamada --- scripts/kconfig/gconf.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/scripts/kconfig/gconf.c b/scripts/kconfig/gconf.c index 6972acb4b396..8c60b9f25eaa 100644 --- a/scripts/kconfig/gconf.c +++ b/scripts/kconfig/gconf.c @@ -375,6 +375,11 @@ static void on_load_clicked(GtkButton *button, gpointe= r user_data) on_load1_activate(NULL, user_data); } =20 +static void on_save_clicked(GtkButton *button, gpointer user_data) +{ + on_save_activate(NULL, user_data); +} + static void on_single_clicked(GtkButton *button, gpointer user_data) { set_view_mode(SINGLE_VIEW); @@ -1217,7 +1222,7 @@ static void init_main_window(const gchar *glade_file) =20 save_btn =3D glade_xml_get_widget(xml, "button3"); g_signal_connect(save_btn, "clicked", - G_CALLBACK(on_save_activate), NULL); + G_CALLBACK(on_save_clicked), NULL); save_menu_item =3D glade_xml_get_widget(xml, "save1"); conf_set_changed_callback(conf_changed); =20 --=20 2.43.0 From nobody Wed Oct 8 20:53:21 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 02BD82EA744; Tue, 24 Jun 2025 15:08:31 +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=1750777711; cv=none; b=ZfdBq4Vnq9mCcoa2DgfNoeKw/0MkjJIRyCGgc6PuybEy9NPQEpzpFOaflr8XuI7V2jG4H4iXNAO0QAHufETzNBguwKfjmq+zqaLwG1I1MFJ9SEst3Eq8gVrkqjWaUxNdCCxuHONgH91lUVee5fTqHyDuVRMY8IxBnU7Legyb9Jc= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1750777711; c=relaxed/simple; bh=m8Ej33GQzB/O0lVEDaPm6wBaX2XKl7jtMagUdTuAqt0=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=lPJFHGBJHNq6774Wy1ojLF9QIvWBiZBtkUJqpJV0vzYG4HdzGpvOABZCYLUwjbtBvUPLuVWTeiu5Bk6psJE0dHAP5ONr2Btkt88qQJATBMWSbPbIa2KGsKvDOI8oE683ttp3GDUyTcakc6TVhLmzo439aPPAXF7aDPtmH2d0hds= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=rgZh15Q2; 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="rgZh15Q2" Received: by smtp.kernel.org (Postfix) with ESMTPSA id A4159C4CEE3; Tue, 24 Jun 2025 15:08:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1750777710; bh=m8Ej33GQzB/O0lVEDaPm6wBaX2XKl7jtMagUdTuAqt0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=rgZh15Q2lHVz5aZKbGguxCW0n30I1j38k0eTJP0Zxr97SVoQHjmofPJSszyO1ujUU eifuaVVYXEhJi9Ge+0+9oBdXFVmMT5yU8FxITicUXOB6ymAmf/neVCeU/yRSUjpgEp aENXxvZEF44qYK/KIqIUWJABWtVXxB7Fgez+4HhzMwhsmd3AxJkTF4hL7+cTxeDavM KMMT2HHQS2HyMCnHZQNqDPFAHiWXVZ45geiKmOv2v8Dsqwiw7czuBA3XJ4BRR9lJCi nnPTNJexUm6qUVusngC5aq89HZAE5bviMNHigS6eV/euNPvqeU0XvC3adFfYBE4c3U 05TpIqE1FOZtQ== From: Masahiro Yamada To: linux-kbuild@vger.kernel.org Cc: Masahiro Yamada , linux-kernel@vger.kernel.org Subject: [PATCH 36/66] kconfig: gconf: use GtkFileChooser in on_load1_activate() Date: Wed, 25 Jun 2025 00:05:24 +0900 Message-ID: <20250624150645.1107002-37-masahiroy@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250624150645.1107002-1-masahiroy@kernel.org> References: <20250624150645.1107002-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" gtk_file_selection_new() is deprecated, and gtk_file_chooser_dialog_new() should be used instead. [1] [1]: https://gitlab.gnome.org/GNOME/gtk/-/blob/2.24.33/docs/reference/gtk/t= mpl/gtkfilesel.sgml?ref_type=3Dtags#L156 Signed-off-by: Masahiro Yamada Acked-by: Randy Dunlap Tested-by: Randy Dunlap --- scripts/kconfig/gconf.c | 58 ++++++++++++++++++++--------------------- 1 file changed, 29 insertions(+), 29 deletions(-) diff --git a/scripts/kconfig/gconf.c b/scripts/kconfig/gconf.c index 8c60b9f25eaa..f33f39d50f3d 100644 --- a/scripts/kconfig/gconf.c +++ b/scripts/kconfig/gconf.c @@ -157,38 +157,38 @@ static void text_insert_msg(const char *title, const = char *message) =20 /* Menu & Toolbar Callbacks */ =20 - -static void -load_filename(GtkFileSelection * file_selector, gpointer user_data) -{ - const gchar *fn; - - fn =3D gtk_file_selection_get_filename(GTK_FILE_SELECTION - (user_data)); - - if (conf_read(fn)) - text_insert_msg("Error", "Unable to load configuration !"); - else - display_tree_part(); -} - static void on_load1_activate(GtkMenuItem *menuitem, gpointer user_data) { - GtkWidget *fs; + GtkWidget *dialog; + GtkFileChooser *chooser; + gint res; =20 - fs =3D gtk_file_selection_new("Load file..."); - g_signal_connect(GTK_OBJECT(GTK_FILE_SELECTION(fs)->ok_button), - "clicked", - G_CALLBACK(load_filename), (gpointer) fs); - g_signal_connect_swapped(GTK_OBJECT - (GTK_FILE_SELECTION(fs)->ok_button), - "clicked", G_CALLBACK(gtk_widget_destroy), - (gpointer) fs); - g_signal_connect_swapped(GTK_OBJECT - (GTK_FILE_SELECTION(fs)->cancel_button), - "clicked", G_CALLBACK(gtk_widget_destroy), - (gpointer) fs); - gtk_widget_show(fs); + dialog =3D gtk_file_chooser_dialog_new("Load file...", + GTK_WINDOW(user_data), + GTK_FILE_CHOOSER_ACTION_OPEN, + "_Cancel", GTK_RESPONSE_CANCEL, + "_Open", GTK_RESPONSE_ACCEPT, + NULL); + + chooser =3D GTK_FILE_CHOOSER(dialog); + gtk_file_chooser_set_filename(chooser, conf_get_configname()); + + res =3D gtk_dialog_run(GTK_DIALOG(dialog)); + if (res =3D=3D GTK_RESPONSE_ACCEPT) { + char *filename; + + filename =3D gtk_file_chooser_get_filename(chooser); + + if (conf_read(filename)) + text_insert_msg("Error", + "Unable to load configuration!"); + else + display_tree_part(); + + g_free(filename); + } + + gtk_widget_destroy(GTK_WIDGET(dialog)); } =20 static void on_save_activate(GtkMenuItem *menuitem, gpointer user_data) --=20 2.43.0 From nobody Wed Oct 8 20:53:21 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 10CC52EA74B; Tue, 24 Jun 2025 15:08:33 +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=1750777713; cv=none; b=ZoFfLdP6dUig/wjWEamlT+WLvok8XzsAl4XQrinvt8GybmRmx7IBmh5vwEEhKtv/lese4x0aQ1FbzQA1iLn4v2gvRflhynMmXrxHjRQZmJ6d4ZxgoqNjtsrzeLqs3wLd2LZSW08rntBRj3MCk+WCp8C67xSK3rZyeJD1wlbqNDk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1750777713; c=relaxed/simple; bh=JOVIgeyXUscWiujQ8Da71WDqvgkxsjYjFJncsY2bfic=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=O0I8Yo/znqqvSGlRQaUij87IKwmw669GmhcyqinkuOBR2D5QhhS+KsRk6RfC2b8wQgQhqNLUc1lPm9tzOHcGMM3NhWDSatRyYvu+HH9BHBtWUpi6fp3Yu/oAxvkrt3AZXvpCFtsKQEuLr5M5H2TZls4+4eTQwrR/DOiJ9av6v1s= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=iRdhVVm5; 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="iRdhVVm5" Received: by smtp.kernel.org (Postfix) with ESMTPSA id AF8A1C4CEE3; Tue, 24 Jun 2025 15:08:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1750777712; bh=JOVIgeyXUscWiujQ8Da71WDqvgkxsjYjFJncsY2bfic=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=iRdhVVm5Z1MGsfPnys8RTIq0M61TcVP++p3LwZwSnQ+Yf+5WxvumkerWMHDKBN0gm mrekRrh3xp9t+hrzE0eGvI2Dbh6k+MCXUcHf7EsJc9fDivd0+suAKdUxk8HopthqtC TTq8uZB8dZzOqsYJg05yFUKDj9/Dw/HJzsEiU0II8orOSqpbgEox4CiGKm7hq6Hsqr biyUyUEXzP12cvLH5gSH3e4qaAocgSQPgv6JowRz7SAGtWW/zlTaXfjK8rAI5yTSvz JeoFCmkDK/AqXA06WQRn0i9SNhV9XMKcETOzcLAbMIB4EdaTwyRMTa9va1LV00vITP Ys1Y0DoMeMgag== From: Masahiro Yamada To: linux-kbuild@vger.kernel.org Cc: Masahiro Yamada , linux-kernel@vger.kernel.org Subject: [PATCH 37/66] kconfig: gconf: use GtkFileChooser in on_save_as1_activate() Date: Wed, 25 Jun 2025 00:05:25 +0900 Message-ID: <20250624150645.1107002-38-masahiroy@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250624150645.1107002-1-masahiroy@kernel.org> References: <20250624150645.1107002-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" gtk_file_selection_new() is deprecated, and gtk_file_chooser_dialog_new() should be used instead. [1] [1]: https://gitlab.gnome.org/GNOME/gtk/-/blob/2.24.33/docs/reference/gtk/t= mpl/gtkfilesel.sgml?ref_type=3Dtags#L156 Signed-off-by: Masahiro Yamada Acked-by: Randy Dunlap Tested-by: Randy Dunlap --- scripts/kconfig/gconf.c | 56 ++++++++++++++++++++--------------------- 1 file changed, 27 insertions(+), 29 deletions(-) diff --git a/scripts/kconfig/gconf.c b/scripts/kconfig/gconf.c index f33f39d50f3d..b019711142c3 100644 --- a/scripts/kconfig/gconf.c +++ b/scripts/kconfig/gconf.c @@ -198,38 +198,36 @@ static void on_save_activate(GtkMenuItem *menuitem, g= pointer user_data) conf_write_autoconf(0); } =20 - -static void -store_filename(GtkFileSelection * file_selector, gpointer user_data) -{ - const gchar *fn; - - fn =3D gtk_file_selection_get_filename(GTK_FILE_SELECTION - (user_data)); - - if (conf_write(fn)) - text_insert_msg("Error", "Unable to save configuration !"); - - gtk_widget_destroy(GTK_WIDGET(user_data)); -} - static void on_save_as1_activate(GtkMenuItem *menuitem, gpointer user_data) { - GtkWidget *fs; + GtkWidget *dialog; + GtkFileChooser *chooser; + gint res; =20 - fs =3D gtk_file_selection_new("Save file as..."); - g_signal_connect(GTK_OBJECT(GTK_FILE_SELECTION(fs)->ok_button), - "clicked", - G_CALLBACK(store_filename), (gpointer) fs); - g_signal_connect_swapped(GTK_OBJECT - (GTK_FILE_SELECTION(fs)->ok_button), - "clicked", G_CALLBACK(gtk_widget_destroy), - (gpointer) fs); - g_signal_connect_swapped(GTK_OBJECT - (GTK_FILE_SELECTION(fs)->cancel_button), - "clicked", G_CALLBACK(gtk_widget_destroy), - (gpointer) fs); - gtk_widget_show(fs); + dialog =3D gtk_file_chooser_dialog_new("Save file as...", + GTK_WINDOW(user_data), + GTK_FILE_CHOOSER_ACTION_SAVE, + "_Cancel", GTK_RESPONSE_CANCEL, + "_Save", GTK_RESPONSE_ACCEPT, + NULL); + + chooser =3D GTK_FILE_CHOOSER(dialog); + gtk_file_chooser_set_filename(chooser, conf_get_configname()); + + res =3D gtk_dialog_run(GTK_DIALOG(dialog)); + if (res =3D=3D GTK_RESPONSE_ACCEPT) { + char *filename; + + filename =3D gtk_file_chooser_get_filename(chooser); + + if (conf_write(filename)) + text_insert_msg("Error", + "Unable to save configuration !"); + + g_free(filename); + } + + gtk_widget_destroy(dialog); } =20 static void on_show_name1_activate(GtkMenuItem *menuitem, gpointer user_da= ta) --=20 2.43.0 From nobody Wed Oct 8 20:53:21 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 325832EB5DA; Tue, 24 Jun 2025 15:08:35 +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=1750777715; cv=none; b=IdxzfbWGbRA7QZIVYjMRiEMaBtiklQ1J5NIU5/Im17dDTl5kBRq18uvrX2jDl4qxTZbE8jxaOwdnpkVEw0y/DvseWj3nEGVcrDeReARwQA5wSieBGuo/erpshS1MgH5SiSE2in/aJvOY9yE6Vs6UTb6ifjSW9RMQQYzOyEUEsHs= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1750777715; c=relaxed/simple; bh=6BxQlve/9eKgcuDNXBD1gciAEQ20k95qOSD/V5qVJ1U=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Pn32UJDzGbDye0NYxJgHe+kWR6ZWSDWmC+J/TG+VNmgmBATS7LaIACUQjcQYFQbqNR5hUB4/d2JR2dLLPQXI7S7/0bVNdxd0WXEHomy5zZ97BbdR5ftCOz7Syy0goKLVRmVzJc0qd6QrpPlF710U9/2bmIcFAHmBr0AQkTFOU/o= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=oBVEsW3q; 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="oBVEsW3q" Received: by smtp.kernel.org (Postfix) with ESMTPSA id CDB29C4CEE3; Tue, 24 Jun 2025 15:08:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1750777715; bh=6BxQlve/9eKgcuDNXBD1gciAEQ20k95qOSD/V5qVJ1U=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=oBVEsW3qwBouhCyduKHLDfb8Ez/OPfqljP/E3UTxdkQmt9nAVrUzQgjL02IkOdSBB 7EoXoJjAFgRdkU0PBFqWdvHlhOFi9+YhSVQuxUqYm/6xCGigI3HrYE8PoZQPK6Lf2C HGd/hWBhPEEivG1v47+ue6pVp9NZskrJANv75Tp8ydws2CS4i9VMG6fSaO7pMhO6xj JRuBBpdPjnxMzrqTSoDLj9pZoDYAdGPEpzxEWKNYrzZ1hiePRekcy0+jMhomvnY7Sj YOpovMddwd3Fzdvl8nOS3qVe1LUaReaS86z9G6H/6iyxoleY9Pe/hn2+tLo8hxj40h 4KM0z2x/BSUcQ== From: Masahiro Yamada To: linux-kbuild@vger.kernel.org Cc: Masahiro Yamada , linux-kernel@vger.kernel.org Subject: [PATCH 38/66] kconfig: gconf: use GdkPixbuf in replace_button_icon() Date: Wed, 25 Jun 2025 00:05:26 +0900 Message-ID: <20250624150645.1107002-39-masahiroy@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250624150645.1107002-1-masahiroy@kernel.org> References: <20250624150645.1107002-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" gdk_pixmap_create_from_xpm_d has been deprecated since version 2.22. Use a GdkPixbuf instead. You can use gdk_pixbuf_new_from_xpm_data() to create it. [1] [1]: https://gitlab.gnome.org/GNOME/gtk/-/blob/2.24.33/gdk/gdkpixmap.c#L742 Signed-off-by: Masahiro Yamada --- scripts/kconfig/gconf.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/scripts/kconfig/gconf.c b/scripts/kconfig/gconf.c index b019711142c3..30d8fdb886c0 100644 --- a/scripts/kconfig/gconf.c +++ b/scripts/kconfig/gconf.c @@ -1102,17 +1102,16 @@ static void fixup_rootmenu(struct menu *menu) static void replace_button_icon(GladeXML *xml, GdkDrawable *window, GtkStyle *style, gchar *btn_name, gchar **xpm) { - GdkPixmap *pixmap; - GdkBitmap *mask; - GtkToolButton *button; + GdkPixbuf *pixbuf; GtkWidget *image; + GtkToolButton *button; =20 - pixmap =3D gdk_pixmap_create_from_xpm_d(window, &mask, - &style->bg[GTK_STATE_NORMAL], - xpm); + pixbuf =3D gdk_pixbuf_new_from_xpm_data((const char **)xpm); + image =3D gtk_image_new_from_pixbuf(pixbuf); + g_object_unref(pixbuf); =20 button =3D GTK_TOOL_BUTTON(glade_xml_get_widget(xml, btn_name)); - image =3D gtk_image_new_from_pixmap(pixmap, mask); + gtk_widget_show(image); gtk_tool_button_set_icon_widget(button, image); } --=20 2.43.0 From nobody Wed Oct 8 20:53:21 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 C6DB72EBDE6; Tue, 24 Jun 2025 15:08:37 +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=1750777717; cv=none; b=iUs4CYDpnOGJGpam8ZqsuFJpWBHKMZkolql9Llr4DDA8hXaLfkD/ldDYMZ2ufx2OwAWHjPGUgNPq5SOvzWMbnmX+p8iyF4Hw13z96aZsp4mHtDnvw9mcUcmxEULW/diJ9ErmPtzY3SL7lJ7O77w4HqCDEckeXizr5dyGO0NXUi8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1750777717; c=relaxed/simple; bh=9TppseAjxd/C3qrHT83scHQsCqYfsRnZlZjp4lNUSOE=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=SaFDDJHp9Y+C48daovAwyah7HFhRU4IWxgBeuN/hMurQfH1zzDUoTZTA+G7kXs4CHYwJjV4sudXJL+WySwO23VLpbHbhV0MctnfUnFYvZvoBdE2hDrjxxrnKYLVrMZOilOFrKUQ+bEEwZNPA/9tyGd4B+a570Qal0xj5B/N9Qn0= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=pzCPLUN/; 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="pzCPLUN/" Received: by smtp.kernel.org (Postfix) with ESMTPSA id F1694C4CEEE; Tue, 24 Jun 2025 15:08:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1750777717; bh=9TppseAjxd/C3qrHT83scHQsCqYfsRnZlZjp4lNUSOE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=pzCPLUN/Iab2zGMXguKosxuhkNX4s81Q/1pHNSX5hKFegnSyqud6/iOGSrAvWSO8z meKYP51aExGml9GsTdrfC9KMD5SXvvANGwplrokoXPwzhD67oer6arGsEpTKaZ1AOH UKS2OfGIiBRyudTcxoIaSkr3EKlIX1CSPr8ZV11nnPy6zGky51zzDZhLlwV3n/F3zH iBGL3BI/BcyIyY5TWMI0W/OWtMqG90hwyA14tT/HiusCoSzQvN50VbZmFsb70ZWfe9 hH6MxLJW9bCXSrJZ5Hswsko2QsZ/9gZo+TIgAe7UCWP6c8Coi5TqKWZ2g5ws7GUQe4 y74wx8im62TOA== From: Masahiro Yamada To: linux-kbuild@vger.kernel.org Cc: Masahiro Yamada , linux-kernel@vger.kernel.org Subject: [PATCH 39/66] kconfig: gconf: refactor replace_button_icon() Date: Wed, 25 Jun 2025 00:05:27 +0900 Message-ID: <20250624150645.1107002-40-masahiroy@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250624150645.1107002-1-masahiroy@kernel.org> References: <20250624150645.1107002-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 "window" and "style" arguments for replace_button_icon() are now unused. Remove them and refactor the function accordingly. Signed-off-by: Masahiro Yamada --- scripts/kconfig/gconf.c | 20 +++++--------------- 1 file changed, 5 insertions(+), 15 deletions(-) diff --git a/scripts/kconfig/gconf.c b/scripts/kconfig/gconf.c index 30d8fdb886c0..e20cbceb89d3 100644 --- a/scripts/kconfig/gconf.c +++ b/scripts/kconfig/gconf.c @@ -1099,21 +1099,17 @@ static void fixup_rootmenu(struct menu *menu) } =20 /* Main Window Initialization */ -static void replace_button_icon(GladeXML *xml, GdkDrawable *window, - GtkStyle *style, gchar *btn_name, gchar **xpm) +static void replace_button_icon(GtkWidget *widget, const char * const xpm[= ]) { GdkPixbuf *pixbuf; GtkWidget *image; - GtkToolButton *button; =20 pixbuf =3D gdk_pixbuf_new_from_xpm_data((const char **)xpm); image =3D gtk_image_new_from_pixbuf(pixbuf); g_object_unref(pixbuf); =20 - button =3D GTK_TOOL_BUTTON(glade_xml_get_widget(xml, btn_name)); - gtk_widget_show(image); - gtk_tool_button_set_icon_widget(button, image); + gtk_tool_button_set_icon_widget(GTK_TOOL_BUTTON(widget), image); } =20 static void init_main_window(const gchar *glade_file) @@ -1121,7 +1117,6 @@ static void init_main_window(const gchar *glade_file) GladeXML *xml; GtkWidget *widget; GtkTextBuffer *txtbuf; - GtkStyle *style; =20 xml =3D glade_xml_new(glade_file, "window1", NULL); if (!xml) @@ -1223,25 +1218,20 @@ static void init_main_window(const gchar *glade_fil= e) save_menu_item =3D glade_xml_get_widget(xml, "save1"); conf_set_changed_callback(conf_changed); =20 - style =3D gtk_widget_get_style(main_wnd); - single_btn =3D glade_xml_get_widget(xml, "button4"); g_signal_connect(single_btn, "clicked", G_CALLBACK(on_single_clicked), NULL); - replace_button_icon(xml, main_wnd->window, style, - "button4", (gchar **) xpm_single_view); + replace_button_icon(single_btn, xpm_single_view); =20 split_btn =3D glade_xml_get_widget(xml, "button5"); g_signal_connect(split_btn, "clicked", G_CALLBACK(on_split_clicked), NULL); - replace_button_icon(xml, main_wnd->window, style, - "button5", (gchar **) xpm_split_view); + replace_button_icon(split_btn, xpm_split_view); =20 full_btn =3D glade_xml_get_widget(xml, "button6"); g_signal_connect(full_btn, "clicked", G_CALLBACK(on_full_clicked), NULL); - replace_button_icon(xml, main_wnd->window, style, - "button6", (gchar **) xpm_tree_view); + replace_button_icon(full_btn, xpm_tree_view); =20 widget =3D glade_xml_get_widget(xml, "button7"); g_signal_connect(widget, "clicked", --=20 2.43.0 From nobody Wed Oct 8 20:53:21 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 C5B422ECEBC; Tue, 24 Jun 2025 15:08:39 +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=1750777719; cv=none; b=indPcr2XOTgs15qRGQswJ0pJ+fkT3oFgPQefFyqNOh4Oojr7LkFh34QgvFPYpBmsufmopj72MyvUtq/jinFrM5mJ8GPa/Fia3TCT5t+xHlX8xlqbHxyFZpLA/sfwGMqMB6yd8RgIknM3vDP8x05laZyX+buxb1TxCObhIHX4Y6M= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1750777719; c=relaxed/simple; bh=oEHtH14Rn8+uCKZFnsLvzgCz36hd+wLvBm2EYrQesSE=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Vuz9tZIS7dU84+YVorQHwOiPocUfewlLe4y1NvNDA7+mjWEwOpfNaMt8z4vG7tg8TCGQXK3yzUNFu0+8o+j7+e5Vh35iKijHMuJuTyQEyu3zeO3S1gAbes4cl2cqkf+zz9yBDHwtE1jjlqCp1SRPdRWonoNWp0F6h3So5QfJV10= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=jNYi8Rwd; 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="jNYi8Rwd" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 20F74C4CEE3; Tue, 24 Jun 2025 15:08:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1750777719; bh=oEHtH14Rn8+uCKZFnsLvzgCz36hd+wLvBm2EYrQesSE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=jNYi8Rwd9t0MN0v71FU4PvNs8RQvdh9N7fxKqxmnKsqXHd/pavS/Ju++ytTZdjpF5 MakK95o8lbjiN4W1si50gFBYVn4iGkqWb3+nzuEEDGuK9J6ioBgKo/5EgGv4sah4BF 22e/U+4wn9zMmh/eoTWSHvUVSZ3XrdezsTMl5J7RQhrWRLw+hWe5U1+Jw2bV3z6YjI 6w3Y0Cr889HHm3Xn23bWVjRmPDp+Lv+rHmNDKDgPKHRd9f55XxfsW0SqVEX4zrp2xq v+dlwjn61W9sOHVaqWK3k7z25oOGhApYYMvEGaHsu8sPdn62e+9qwef33k0akwHcWb Q7iS/L2MiJPIg== From: Masahiro Yamada To: linux-kbuild@vger.kernel.org Cc: Masahiro Yamada , linux-kernel@vger.kernel.org Subject: [PATCH 40/66] kconfig: gconf: make introduction, about, license dialogs modal Date: Wed, 25 Jun 2025 00:05:28 +0900 Message-ID: <20250624150645.1107002-41-masahiroy@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250624150645.1107002-1-masahiroy@kernel.org> References: <20250624150645.1107002-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" These are modal dialogs in xconfig. Make them modal in gconfig as well. Signed-off-by: Masahiro Yamada Acked-by: Randy Dunlap Tested-by: Randy Dunlap --- scripts/kconfig/gconf.c | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) diff --git a/scripts/kconfig/gconf.c b/scripts/kconfig/gconf.c index e20cbceb89d3..67305577b432 100644 --- a/scripts/kconfig/gconf.c +++ b/scripts/kconfig/gconf.c @@ -312,10 +312,8 @@ static void on_introduction1_activate(GtkMenuItem *men= uitem, gpointer user_data) GTK_DIALOG_DESTROY_WITH_PARENT, GTK_MESSAGE_INFO, GTK_BUTTONS_CLOSE, "%s", intro_text); - g_signal_connect_swapped(GTK_OBJECT(dialog), "response", - G_CALLBACK(gtk_widget_destroy), - GTK_OBJECT(dialog)); - gtk_widget_show_all(dialog); + gtk_dialog_run(GTK_DIALOG(dialog)); + gtk_widget_destroy(dialog); } =20 static void on_about1_activate(GtkMenuItem *menuitem, gpointer user_data) @@ -329,10 +327,8 @@ static void on_about1_activate(GtkMenuItem *menuitem, = gpointer user_data) GTK_DIALOG_DESTROY_WITH_PARENT, GTK_MESSAGE_INFO, GTK_BUTTONS_CLOSE, "%s", about_text); - g_signal_connect_swapped(GTK_OBJECT(dialog), "response", - G_CALLBACK(gtk_widget_destroy), - GTK_OBJECT(dialog)); - gtk_widget_show_all(dialog); + gtk_dialog_run(GTK_DIALOG(dialog)); + gtk_widget_destroy(dialog); } =20 static void on_license1_activate(GtkMenuItem *menuitem, gpointer user_data) @@ -347,10 +343,8 @@ static void on_license1_activate(GtkMenuItem *menuitem= , gpointer user_data) GTK_DIALOG_DESTROY_WITH_PARENT, GTK_MESSAGE_INFO, GTK_BUTTONS_CLOSE, "%s", license_text); - g_signal_connect_swapped(GTK_OBJECT(dialog), "response", - G_CALLBACK(gtk_widget_destroy), - GTK_OBJECT(dialog)); - gtk_widget_show_all(dialog); + gtk_dialog_run(GTK_DIALOG(dialog)); + gtk_widget_destroy(dialog); } =20 /* toolbar handlers */ --=20 2.43.0 From nobody Wed Oct 8 20:53:21 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 75FDB2ED86E; Tue, 24 Jun 2025 15:08:41 +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=1750777721; cv=none; b=e6RLFdHNElgquTlXOVfnEu1qw/uVpNsYsxdTYq+tlbU2MsBCs+J012UgRvpFk2nFDM47lwXAEsdbrligiVZoDHculaxzCJ+1PI/Mmt7odUX55hLcjXLO4SpdVZHpfnJEN5PlezO+gkKWFpOBBfDqSmLo57NoamfMMwBHWseLrFo= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1750777721; c=relaxed/simple; bh=7p6CtxcfcmIwA2DnVyNG43k7NGjSirtbylmlPIfJn7U=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=q0ASSDwqLuK3DtffkjYqh1oqf92YpktfQ7DvgJCeyE8Leb5iis5sSGDlLoSb9RxeCQD4t3tZHGu3SWECoYufp4YFHYlA2346KPnh6AyATfnTzlHDPYgAHbCHjPjrfeoC40UXUtyYoudeelV4CcpYcrU5yOQ55ycxJt0lRcX079c= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=YZvyPWC4; 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="YZvyPWC4" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 253E8C4CEE3; Tue, 24 Jun 2025 15:08:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1750777721; bh=7p6CtxcfcmIwA2DnVyNG43k7NGjSirtbylmlPIfJn7U=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=YZvyPWC4U9VSO1RShcSnrIKy/8YyIlD87e69FhDE+g5MqXyyNjCkl/SXYubN0KaAM qNZ2Un1q6QL/SmcxJk9sIr/7KyeCC0j5gJ3pVU6J5RRXhs+ptG2VTKwuXN3f+pnmW6 XSM9DXRBi1+fqxSBH30lM0iypUYiiV+SYlsiGGGVx3zzCl1WZgbmZJtZqRev1b92kh DIJNdE/x2OLeWFtmpkd/ToIhd2dzFnfbE0BrhvPYXiesS2nebOlJNzu97MefUmnjvQ +iuLOHaJlAHwuLODdYCes5T4iasYtqt16qNw/eYoLj5y/MAin8m+9UzjoTFPNU7aey 1kn3WwKXxd1xA== From: Masahiro Yamada To: linux-kbuild@vger.kernel.org Cc: Masahiro Yamada , linux-kernel@vger.kernel.org Subject: [PATCH 41/66] kconfig: gconf: remove global 'tree' variable Date: Wed, 25 Jun 2025 00:05:29 +0900 Message-ID: <20250624150645.1107002-42-masahiroy@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250624150645.1107002-1-masahiroy@kernel.org> References: <20250624150645.1107002-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" Pass the tree store as a function parameter to make it clearer which tree is being updated. Signed-off-by: Masahiro Yamada --- scripts/kconfig/gconf.c | 42 ++++++++++++++++++++--------------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/scripts/kconfig/gconf.c b/scripts/kconfig/gconf.c index 67305577b432..cfe65baa4f18 100644 --- a/scripts/kconfig/gconf.c +++ b/scripts/kconfig/gconf.c @@ -43,7 +43,7 @@ static GtkWidget *save_menu_item; =20 static GtkTextTag *tag1, *tag2; =20 -static GtkTreeStore *tree1, *tree2, *tree; +static GtkTreeStore *tree1, *tree2; static GtkTreeModel *model1, *model2; =20 static struct menu *current; // current node for SINGLE view @@ -57,7 +57,7 @@ enum { }; =20 static void display_list(void); -static void display_tree(struct menu *menu); +static void display_tree(GtkTreeStore *store, struct menu *menu); static void display_tree_part(void); static void update_tree(struct menu *src, GtkTreeIter * dst); =20 @@ -101,7 +101,7 @@ static void set_view_mode(enum view_mode mode) break; case FULL_VIEW: gtk_tree_store_clear(tree2); - display_tree(&rootmenu); + display_tree(tree2, &rootmenu); gtk_widget_set_sensitive(full_btn, FALSE); break; } @@ -272,7 +272,7 @@ static void on_set_option_mode1_activate(GtkMenuItem *m= enuitem, { opt_mode =3D OPT_NORMAL; gtk_tree_store_clear(tree2); - display_tree(&rootmenu); /* instead of update_tree to speed-up */ + display_tree(tree2, &rootmenu); /* instead of update_tree to speed-up */ } =20 static void on_set_option_mode2_activate(GtkMenuItem *menuitem, @@ -280,7 +280,7 @@ static void on_set_option_mode2_activate(GtkMenuItem *m= enuitem, { opt_mode =3D OPT_ALL; gtk_tree_store_clear(tree2); - display_tree(&rootmenu); /* instead of update_tree to speed-up */ + display_tree(tree2, &rootmenu); /* instead of update_tree to speed-up */ } =20 static void on_set_option_mode3_activate(GtkMenuItem *menuitem, @@ -288,7 +288,7 @@ static void on_set_option_mode3_activate(GtkMenuItem *m= enuitem, { opt_mode =3D OPT_PROMPT; gtk_tree_store_clear(tree2); - display_tree(&rootmenu); /* instead of update_tree to speed-up */ + display_tree(tree2, &rootmenu); /* instead of update_tree to speed-up */ } =20 static void on_introduction1_activate(GtkMenuItem *menuitem, gpointer user= _data) @@ -852,7 +852,8 @@ static gchar **fill_row(struct menu *menu) =20 =20 /* Set the node content with a row of strings */ -static void set_node(GtkTreeIter * node, struct menu *menu, gchar ** row) +static void set_node(GtkTreeStore *tree, GtkTreeIter *node, + struct menu *menu, gchar **row) { GdkColor color; gboolean success; @@ -976,7 +977,7 @@ static void update_tree(struct menu *src, GtkTreeIter *= dst) gtk_tree_store_insert_before(tree2, child2, dst, sibling); - set_node(child2, menu1, fill_row(menu1)); + set_node(tree2, child2, menu1, fill_row(menu1)); if (menu2 =3D=3D NULL) valid =3D TRUE; } else { // remove node @@ -990,7 +991,7 @@ static void update_tree(struct menu *src, GtkTreeIter *= dst) goto reparse; // next child } } else if (sym && (child1->flags & MENU_CHANGED)) { - set_node(child2, menu1, fill_row(menu1)); + set_node(tree2, child2, menu1, fill_row(menu1)); } =20 update_tree(child1, child2); @@ -1001,7 +1002,8 @@ static void update_tree(struct menu *src, GtkTreeIter= * dst) =20 =20 /* Display the whole tree (single/split/full view) */ -static void _display_tree(struct menu *menu, GtkTreeIter *parent) +static void _display_tree(GtkTreeStore *tree, struct menu *menu, + GtkTreeIter *parent) { struct property *prop; struct menu *child; @@ -1029,7 +1031,7 @@ static void _display_tree(struct menu *menu, GtkTreeI= ter *parent) (opt_mode =3D=3D OPT_PROMPT && menu_has_prompt(child)) || (opt_mode =3D=3D OPT_ALL && menu_get_prompt(child))) { gtk_tree_store_append(tree, &iter, parent); - set_node(&iter, child, fill_row(child)); + set_node(tree, &iter, child, fill_row(child)); } =20 if ((view_mode !=3D FULL_VIEW) && (ptype =3D=3D P_MENU) @@ -1043,13 +1045,13 @@ static void _display_tree(struct menu *menu, GtkTre= eIter *parent) if (((view_mode =3D=3D SINGLE_VIEW) && (menu->flags & MENU_ROOT)) || (view_mode =3D=3D FULL_VIEW) || (view_mode =3D=3D SPLIT_VIEW)) - _display_tree(child, &iter); + _display_tree(tree, child, &iter); } } =20 -static void display_tree(struct menu *menu) +static void display_tree(GtkTreeStore *store, struct menu *menu) { - _display_tree(menu, NULL); + _display_tree(store, menu, NULL); } =20 /* Display a part of the tree starting at current node (single/split view)= */ @@ -1057,11 +1059,11 @@ static void display_tree_part(void) { gtk_tree_store_clear(tree2); if (view_mode =3D=3D SINGLE_VIEW) - display_tree(current); + display_tree(tree2, current); else if (view_mode =3D=3D SPLIT_VIEW) - display_tree(browsed); + display_tree(tree2, browsed); else if (view_mode =3D=3D FULL_VIEW) - display_tree(&rootmenu); + display_tree(tree2, &rootmenu); gtk_tree_view_expand_all(GTK_TREE_VIEW(tree2_w)); } =20 @@ -1070,10 +1072,8 @@ static void display_list(void) { gtk_tree_store_clear(tree1); =20 - tree =3D tree1; - display_tree(&rootmenu); + display_tree(tree1, &rootmenu); gtk_tree_view_expand_all(GTK_TREE_VIEW(tree1_w)); - tree =3D tree2; } =20 static void fixup_rootmenu(struct menu *menu) @@ -1251,7 +1251,7 @@ static void init_main_window(const gchar *glade_file) =20 static void init_tree_model(void) { - tree =3D tree2 =3D gtk_tree_store_new(COL_NUMBER, + tree2 =3D gtk_tree_store_new(COL_NUMBER, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING, --=20 2.43.0 From nobody Wed Oct 8 20:53:21 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 7F3B22EE28F; Tue, 24 Jun 2025 15:08:43 +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=1750777723; cv=none; b=oEddkyDrFgSNdW4I146NPAO8JWrf3CTrI/GzGJloco9CtJV7wAK1dhe008HSrhEappVrwKWnmnGVt6MVJ+IDtHuH+C68YN7y8JagSIX7QSXCKwDqM97Udhl1UpvtU6ZHhj1hqca6Vb7Y4SI65EsYLmMEat354JE1xrX336tI7bs= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1750777723; c=relaxed/simple; bh=nGspiZsKab9eVwp41zZc7FKxzc+4sRANyVju35ULvhE=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=ZFpecfrmoJA3hUN6ZZCY/tdd7+zrWbf2LPtcc8WQ9z9SgqdMw6dXMMIN5Il3AhyYqPwMaJmpaV++LC3yukPtaDEjthQYQC8Dej+5XFUdYqOVbaVHSQj33DzTSwup4iLtz7UF+KZsG8M7dvoopwijIY+B19Ga+zRCWbQYWxkhKzU= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=gesKfYTt; 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="gesKfYTt" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 2ED55C4CEF0; Tue, 24 Jun 2025 15:08:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1750777723; bh=nGspiZsKab9eVwp41zZc7FKxzc+4sRANyVju35ULvhE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=gesKfYTtu8J27H/TY9Nf853gj/1pqxbjGzO85uJJCl1K3MUoz5dRn4C+X6m1jn0qt FjfAbi5iBNEVShwAGNLYAn62hi57NojaDgkNQU2b14JpY2sm/OTM5enNpd0GpAMnIJ FP1db/dNby2rC0X8xa7XH6fGY361dF2d/u8i1nk7ie/iSDdrw2vrdn6L2RUh2HXujv CCtbIehS69r056eGe2ycmmLVa6WAk+fBBJpQ8nFT7dD3mfnmIHtDAY8HMp335MGd6W JSA6sJi6lqn+GIm/X57hlSpTulx4hrDaBVNL+NGpOY1FWEGMFRJwownCoMV5XbE4CP W68Fgg92pQlKA== From: Masahiro Yamada To: linux-kbuild@vger.kernel.org Cc: Masahiro Yamada , linux-kernel@vger.kernel.org Subject: [PATCH 42/66] kconfig: gconf: merge 'current' and 'browsed' global variables Date: Wed, 25 Jun 2025 00:05:30 +0900 Message-ID: <20250624150645.1107002-43-masahiroy@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250624150645.1107002-1-masahiroy@kernel.org> References: <20250624150645.1107002-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 'current' (SINGLE view) and 'browsed' (SPLIT_VIEW) variables serve similar purposes and are not needed at the same time. Merge them. Signed-off-by: Masahiro Yamada --- scripts/kconfig/gconf.c | 32 +++++++++++++------------------- 1 file changed, 13 insertions(+), 19 deletions(-) diff --git a/scripts/kconfig/gconf.c b/scripts/kconfig/gconf.c index cfe65baa4f18..cf9345ba23ce 100644 --- a/scripts/kconfig/gconf.c +++ b/scripts/kconfig/gconf.c @@ -46,8 +46,7 @@ static GtkTextTag *tag1, *tag2; static GtkTreeStore *tree1, *tree2; static GtkTreeModel *model1, *model2; =20 -static struct menu *current; // current node for SINGLE view -static struct menu *browsed; // browsed node for SPLIT view +static struct menu *browsed; // browsed menu for SINGLE/SPLIT view =20 enum { COL_OPTION, COL_NAME, COL_NO, COL_MOD, COL_YES, COL_VALUE, @@ -90,7 +89,7 @@ static void set_view_mode(enum view_mode mode) =20 switch (mode) { case SINGLE_VIEW: - current =3D &rootmenu; + browsed =3D &rootmenu; display_tree_part(); gtk_widget_set_sensitive(single_btn, FALSE); break; @@ -352,13 +351,13 @@ static void on_back_clicked(GtkButton *button, gpoint= er user_data) { enum prop_type ptype; =20 - current =3D current->parent; - ptype =3D current->prompt ? current->prompt->type : P_UNKNOWN; + browsed =3D browsed->parent; + ptype =3D browsed->prompt ? browsed->prompt->type : P_UNKNOWN; if (ptype !=3D P_MENU) - current =3D current->parent; + browsed =3D browsed->parent; display_tree_part(); =20 - if (current =3D=3D &rootmenu) + if (browsed =3D=3D &rootmenu) gtk_widget_set_sensitive(back_btn, FALSE); } =20 @@ -611,7 +610,7 @@ static gboolean on_treeview2_button_press_event(GtkWidg= et *widget, =20 if (ptype =3D=3D P_MENU && view_mode !=3D FULL_VIEW && col =3D=3D COL_OP= TION) { // goes down into menu - current =3D menu; + browsed =3D menu; display_tree_part(); gtk_widget_set_sensitive(back_btn, TRUE); } else if (col =3D=3D COL_OPTION) { @@ -710,14 +709,11 @@ static gboolean on_treeview1_button_press_event(GtkWi= dget *widget, gtk_tree_model_get_iter(model, &iter, path); gtk_tree_model_get(model, &iter, COL_MENU, &menu, -1); =20 - if (event->type =3D=3D GDK_2BUTTON_PRESS) { + if (event->type =3D=3D GDK_2BUTTON_PRESS) toggle_sym_value(menu); - current =3D menu; - display_tree_part(); - } else { - browsed =3D menu; - display_tree_part(); - } + + browsed =3D menu; + display_tree_part(); =20 gtk_tree_view_set_cursor(view, path, NULL, FALSE); gtk_widget_grab_focus(tree2_w); @@ -1011,7 +1007,7 @@ static void _display_tree(GtkTreeStore *tree, struct = menu *menu, GtkTreeIter iter; =20 if (menu =3D=3D &rootmenu) - current =3D &rootmenu; + browsed =3D &rootmenu; =20 for (child =3D menu->list; child; child =3D child->next) { prop =3D child->prompt; @@ -1058,9 +1054,7 @@ static void display_tree(GtkTreeStore *store, struct = menu *menu) static void display_tree_part(void) { gtk_tree_store_clear(tree2); - if (view_mode =3D=3D SINGLE_VIEW) - display_tree(tree2, current); - else if (view_mode =3D=3D SPLIT_VIEW) + if (view_mode =3D=3D SINGLE_VIEW || view_mode =3D=3D SPLIT_VIEW) display_tree(tree2, browsed); else if (view_mode =3D=3D FULL_VIEW) display_tree(tree2, &rootmenu); --=20 2.43.0 From nobody Wed Oct 8 20:53:21 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 888842EE980; Tue, 24 Jun 2025 15:08:45 +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=1750777725; cv=none; b=qqawr3U0OkUzf+lLjJHhtspGD3n3NCo18HXOk1VnRzGcG8z0QTzKwWzmEl9sUimhuhQTE7kOvJHmzOMprrWUXLyx8uW5DvY298isDNRZpWUGno8rX+K0Jd45wY4fBMil+CLmpDztsgDlbG/yKpaEDAra5eulGGhOupgbmMQ3Pkk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1750777725; c=relaxed/simple; bh=xp6446iJXQaQj/u0PWhIbBfp6TSCs3uvRB+uvz0SEZ0=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=tsEaSpP8c/c66dGUDLAu3OafNztMw7qvBwF97SUsqsFA1kiATFxs/aZqm+rCAX2sOwbX2jkkLI8stwEzCYwqDfU+P62mnAzobrDrkUiwb/PTCXl8F0KnGyYNt5D8/KuIROGxsj2+De1ZsFmlxAqM2TDc52+jARJjkZD2FyJKYRM= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=S8SlOiFI; 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="S8SlOiFI" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 347ADC4CEE3; Tue, 24 Jun 2025 15:08:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1750777725; bh=xp6446iJXQaQj/u0PWhIbBfp6TSCs3uvRB+uvz0SEZ0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=S8SlOiFIYJpF1C+2PRMsC7cLXAHMLdbJeXqkmTc7rC8Su0ahvTQXdfZlngIobBEOw Z1sayoA4YjjVQtZeRm6axJ2kK4aySJifS+aMxuVzU/PVNDLAiYeiWadvw7b5feeA8v fZbb6z009Z5GUYqVyQiBnOou/QtuJImOR83hbKL+xpJHGIqFIH0DukJhPpEAB3XUlW 417nH0WiWbO4J50SYx36FmSjXkANDtsN0X8foAQZwtNaF0jPpWXHhowSw/CDQT24jW ZWMwdXwxX5HF69bTq84JNbfXd+mCSyx4aOfrZWss5wjt44Vg1v9gogKF55gHFpHr5L 9MHf+oKJkpeIQ== From: Masahiro Yamada To: linux-kbuild@vger.kernel.org Cc: Masahiro Yamada , linux-kernel@vger.kernel.org Subject: [PATCH 43/66] kconfig: gconf: preserve menu selection when switching view mode Date: Wed, 25 Jun 2025 00:05:31 +0900 Message-ID: <20250624150645.1107002-44-masahiroy@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250624150645.1107002-1-masahiroy@kernel.org> References: <20250624150645.1107002-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" Preserve the current menu selection when switching to a different view mode, as it improves usability. Signed-off-by: Masahiro Yamada --- scripts/kconfig/gconf.c | 86 +++++++++++++++++++++++++++++++++++++---- 1 file changed, 78 insertions(+), 8 deletions(-) diff --git a/scripts/kconfig/gconf.c b/scripts/kconfig/gconf.c index cf9345ba23ce..184678dd4fa6 100644 --- a/scripts/kconfig/gconf.c +++ b/scripts/kconfig/gconf.c @@ -47,6 +47,7 @@ static GtkTreeStore *tree1, *tree2; static GtkTreeModel *model1, *model2; =20 static struct menu *browsed; // browsed menu for SINGLE/SPLIT view +static struct menu *selected; // selected entry =20 enum { COL_OPTION, COL_NAME, COL_NO, COL_MOD, COL_YES, COL_VALUE, @@ -68,6 +69,47 @@ static void conf_changed(bool dirty) =20 /* Utility Functions */ =20 +static void _select_menu(GtkTreeView *view, GtkTreeModel *model, + GtkTreeIter *parent, struct menu *match) +{ + GtkTreeIter iter; + gboolean valid; + + valid =3D gtk_tree_model_iter_children(model, &iter, parent); + while (valid) { + struct menu *menu; + + gtk_tree_model_get(model, &iter, COL_MENU, &menu, -1); + + if (menu =3D=3D match) { + GtkTreeSelection *selection; + GtkTreePath *path; + + /* + * Expand parents to reflect the selection, and + * scroll down to it. + */ + path =3D gtk_tree_model_get_path(model, &iter); + gtk_tree_view_expand_to_path(view, path); + gtk_tree_view_scroll_to_cell(view, path, NULL, TRUE, + 0.5, 0.0); + gtk_tree_path_free(path); + + selection =3D gtk_tree_view_get_selection(view); + gtk_tree_selection_select_iter(selection, &iter); + } + + _select_menu(view, model, &iter, match); + + valid =3D gtk_tree_model_iter_next(model, &iter); + } +} + +static void select_menu(GtkTreeView *view, struct menu *match) +{ + _select_menu(view, gtk_tree_view_get_model(view), NULL, match); +} + static void set_view_mode(enum view_mode mode) { view_mode =3D mode; @@ -89,24 +131,40 @@ static void set_view_mode(enum view_mode mode) =20 switch (mode) { case SINGLE_VIEW: - browsed =3D &rootmenu; + if (selected) + browsed =3D menu_get_parent_menu(selected) ?: &rootmenu; + else + browsed =3D &rootmenu; display_tree_part(); + select_menu(GTK_TREE_VIEW(tree2_w), selected); gtk_widget_set_sensitive(single_btn, FALSE); break; case SPLIT_VIEW: + browsed =3D NULL; + if (selected) { + if (selected->type =3D=3D M_MENU) + browsed =3D selected; + else + browsed =3D menu_get_parent_menu(selected); + } gtk_tree_store_clear(tree2); display_list(); + if (browsed) + display_tree(tree2, browsed); + select_menu(GTK_TREE_VIEW(tree1_w), browsed); + select_menu(GTK_TREE_VIEW(tree2_w), selected); gtk_widget_set_sensitive(split_btn, FALSE); break; case FULL_VIEW: gtk_tree_store_clear(tree2); display_tree(tree2, &rootmenu); + select_menu(GTK_TREE_VIEW(tree2_w), selected); gtk_widget_set_sensitive(full_btn, FALSE); break; } =20 - if (mode !=3D SINGLE_VIEW) - gtk_widget_set_sensitive(back_btn, FALSE); + gtk_widget_set_sensitive(back_btn, + mode =3D=3D SINGLE_VIEW && browsed !=3D &rootmenu); } =20 static void text_insert_help(struct menu *menu) @@ -603,6 +661,8 @@ static gboolean on_treeview2_button_press_event(GtkWidg= et *widget, return FALSE; gtk_tree_model_get(model, &iter, COL_MENU, &menu, -1); =20 + selected =3D menu; + col =3D column2index(column); if (event->type =3D=3D GDK_2BUTTON_PRESS) { enum prop_type ptype; @@ -712,8 +772,12 @@ static gboolean on_treeview1_button_press_event(GtkWid= get *widget, if (event->type =3D=3D GDK_2BUTTON_PRESS) toggle_sym_value(menu); =20 - browsed =3D menu; - display_tree_part(); + selected =3D menu; + + if (menu->type =3D=3D M_MENU) { + browsed =3D menu; + display_tree_part(); + } =20 gtk_tree_view_set_cursor(view, path, NULL, FALSE); gtk_widget_grab_focus(tree2_w); @@ -1006,10 +1070,16 @@ static void _display_tree(GtkTreeStore *tree, struc= t menu *menu, enum prop_type ptype; GtkTreeIter iter; =20 - if (menu =3D=3D &rootmenu) - browsed =3D &rootmenu; - for (child =3D menu->list; child; child =3D child->next) { + /* + * REVISIT: + * menu_finalize() creates empty "if" entries. + * Do not confuse gtk_tree_model_get(), which would otherwise + * return "if" menu entry. + */ + if (child->type =3D=3D M_IF) + continue; + prop =3D child->prompt; ptype =3D prop ? prop->type : P_UNKNOWN; =20 --=20 2.43.0 From nobody Wed Oct 8 20:53:21 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 D233D2EF9C2; Tue, 24 Jun 2025 15:08:47 +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=1750777727; cv=none; b=KrOyNKfvU06pZdJOXx3wsgFUlhH42xWKd7O8GLpO0QSiDwY6Q4TSl9kyNNUYT+bDZBAhU8j4isZCoORx287zytVe9Uso5y98oO932OvnIy/F5XgXKFZgL4vKOu3oawKtldwHPmjEYZP2zdzwrLSOY58NV6Su/kEr4jPd2aoOGi4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1750777727; c=relaxed/simple; bh=dHj/8m+PzvEdiBpLDRqkqti7Prwdtu9fZA/ul8s9JWQ=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=T38sJ2fuNqXlb8QfyrNIgBwXpz2wV1jlxc0NmA3WEeG0j4CdJfQCKlEK2EVNRKUHKIoHN6sItilEVNIuimKXDcZ3Ji99G6HIbeKlPy6dd3KdoER8ptoZDqq1S5OlTytvhcuBLBXA+pGOl5UHogoswtFYbVRd6saJrSA5+nFRfFg= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=Fxde2rzE; 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="Fxde2rzE" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 3B0D2C4CEF1; Tue, 24 Jun 2025 15:08:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1750777727; bh=dHj/8m+PzvEdiBpLDRqkqti7Prwdtu9fZA/ul8s9JWQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Fxde2rzEZjiqeLGiV4x9/YbpF0fMJyiBZqOSbUfa80tBYNI9sfhjJWz7NV2JoOxK5 kOEdoSTY9TgWrXrtxCDjDe4Pw0VkRr7FaTvtSFkET58KCAd6cyaakYTv4swI5H9rDP /os7ejyhwHUiRcX+q/4gQezGNLmpi/VxKXaD0EO4i04rmENs5jpO0XNBtXaWMSx1kR iAfuZH0pzELmx42Li2MV435ip+8GgBBcFP+Vd7NDlIZb6AgJz2O9/mEzP9AqmK7BPI 0GYieIbwvanvry4mBIE4RnCWGWP9kvv/bCA+UYMfPEJqV5W3sRelU7eSvB28vxvOZ4 L/3u2oX4a2TEQ== From: Masahiro Yamada To: linux-kbuild@vger.kernel.org Cc: Masahiro Yamada , linux-kernel@vger.kernel.org Subject: [PATCH 44/66] kconfig: gconf: use GtkTreeModelFilter to control row visibility Date: Wed, 25 Jun 2025 00:05:32 +0900 Message-ID: <20250624150645.1107002-45-masahiroy@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250624150645.1107002-1-masahiroy@kernel.org> References: <20250624150645.1107002-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" Currently, update_tree() adds/removes entries to show/hide rows. This approach is extremely complicated. Use the tree model filter to control row visibility instead. Do not toggle the MENU_CHANGED flag, as it is hard to control this correctly. Signed-off-by: Masahiro Yamada --- scripts/kconfig/gconf.c | 217 +++++++++++++++------------------------- 1 file changed, 80 insertions(+), 137 deletions(-) diff --git a/scripts/kconfig/gconf.c b/scripts/kconfig/gconf.c index 184678dd4fa6..a0cc7cb98670 100644 --- a/scripts/kconfig/gconf.c +++ b/scripts/kconfig/gconf.c @@ -59,7 +59,9 @@ enum { static void display_list(void); static void display_tree(GtkTreeStore *store, struct menu *menu); static void display_tree_part(void); -static void update_tree(struct menu *src, GtkTreeIter * dst); +static gchar **fill_row(struct menu *menu); +static void set_node(GtkTreeStore *tree, GtkTreeIter *node, + struct menu *menu, gchar **row); =20 static void conf_changed(bool dirty) { @@ -110,6 +112,47 @@ static void select_menu(GtkTreeView *view, struct menu= *match) _select_menu(view, gtk_tree_view_get_model(view), NULL, match); } =20 +static void _update_row_visibility(GtkTreeView *view) +{ + GtkTreeModelFilter *filter =3D GTK_TREE_MODEL_FILTER(gtk_tree_view_get_mo= del(view)); + + gtk_tree_model_filter_refilter(filter); +} + +static void update_row_visibility(void) +{ + if (view_mode =3D=3D SPLIT_VIEW) + _update_row_visibility(GTK_TREE_VIEW(tree1_w)); + _update_row_visibility(GTK_TREE_VIEW(tree2_w)); +} + +static void _update_tree(GtkTreeStore *store, GtkTreeIter *parent) +{ + GtkTreeModel *model =3D GTK_TREE_MODEL(store); + GtkTreeIter iter; + gboolean valid; + + valid =3D gtk_tree_model_iter_children(model, &iter, parent); + while (valid) { + struct menu *menu; + + gtk_tree_model_get(model, &iter, COL_MENU, &menu, -1); + + if (menu) + set_node(store, &iter, menu, fill_row(menu)); + + _update_tree(store, &iter); + + valid =3D gtk_tree_model_iter_next(model, &iter); + } +} + +static void update_tree(GtkTreeStore *store) +{ + _update_tree(store, NULL); + update_row_visibility(); +} + static void set_view_mode(enum view_mode mode) { view_mode =3D mode; @@ -328,24 +371,21 @@ static void on_set_option_mode1_activate(GtkMenuItem = *menuitem, gpointer user_data) { opt_mode =3D OPT_NORMAL; - gtk_tree_store_clear(tree2); - display_tree(tree2, &rootmenu); /* instead of update_tree to speed-up */ + update_row_visibility(); } =20 static void on_set_option_mode2_activate(GtkMenuItem *menuitem, gpointer user_data) { opt_mode =3D OPT_ALL; - gtk_tree_store_clear(tree2); - display_tree(tree2, &rootmenu); /* instead of update_tree to speed-up */ + update_row_visibility(); } =20 static void on_set_option_mode3_activate(GtkMenuItem *menuitem, gpointer user_data) { opt_mode =3D OPT_PROMPT; - gtk_tree_store_clear(tree2); - display_tree(tree2, &rootmenu); /* instead of update_tree to speed-up */ + update_row_visibility(); } =20 static void on_introduction1_activate(GtkMenuItem *menuitem, gpointer user= _data) @@ -559,7 +599,7 @@ static void renderer_edited(GtkCellRendererText * cell, =20 sym_set_string_value(sym, new_def); =20 - update_tree(&rootmenu, NULL); + update_tree(tree2); =20 free: gtk_tree_path_free(path); @@ -590,9 +630,9 @@ static void change_sym_value(struct menu *menu, gint co= l) newval =3D yes; sym_set_tristate_value(sym, newval); if (view_mode =3D=3D FULL_VIEW) - update_tree(&rootmenu, NULL); + update_tree(tree2); else if (view_mode =3D=3D SPLIT_VIEW) { - update_tree(browsed, NULL); + update_tree(tree2); display_list(); } else if (view_mode =3D=3D SINGLE_VIEW) @@ -613,9 +653,9 @@ static void toggle_sym_value(struct menu *menu) =20 sym_toggle_tristate_value(menu->sym); if (view_mode =3D=3D FULL_VIEW) - update_tree(&rootmenu, NULL); + update_tree(tree2); else if (view_mode =3D=3D SPLIT_VIEW) { - update_tree(browsed, NULL); + update_tree(tree2); display_list(); } else if (view_mode =3D=3D SINGLE_VIEW) @@ -842,7 +882,6 @@ static gchar **fill_row(struct menu *menu) row[COL_NAME] =3D g_strdup(sym->name); =20 sym_calc_value(sym); - menu->flags &=3D ~MENU_CHANGED; =20 if (sym_is_choice(sym)) { // parse childs for getting final value struct menu *child; @@ -947,120 +986,6 @@ static void set_node(GtkTreeStore *tree, GtkTreeIter = *node, g_object_unref(pix); } =20 -/* Find a node in the GTK+ tree */ -static GtkTreeIter found; - -/* - * Find a menu in the GtkTree starting at parent. - */ -static GtkTreeIter *gtktree_iter_find_node(GtkTreeIter *parent, - struct menu *tofind) -{ - GtkTreeIter iter; - GtkTreeIter *child =3D &iter; - gboolean valid; - GtkTreeIter *ret; - - valid =3D gtk_tree_model_iter_children(model2, child, parent); - while (valid) { - struct menu *menu; - - gtk_tree_model_get(model2, child, 6, &menu, -1); - - if (menu =3D=3D tofind) { - memcpy(&found, child, sizeof(GtkTreeIter)); - return &found; - } - - ret =3D gtktree_iter_find_node(child, tofind); - if (ret) - return ret; - - valid =3D gtk_tree_model_iter_next(model2, child); - } - - return NULL; -} - - -/* - * Update the tree by adding/removing entries - * Does not change other nodes - */ -static void update_tree(struct menu *src, GtkTreeIter * dst) -{ - struct menu *child1; - GtkTreeIter iter, tmp; - GtkTreeIter *child2 =3D &iter; - gboolean valid; - GtkTreeIter *sibling; - struct symbol *sym; - struct menu *menu1, *menu2; - - valid =3D gtk_tree_model_iter_children(model2, child2, dst); - for (child1 =3D src->list; child1; child1 =3D child1->next) { - - sym =3D child1->sym; - - reparse: - menu1 =3D child1; - if (valid) - gtk_tree_model_get(model2, child2, COL_MENU, - &menu2, -1); - else - menu2 =3D NULL; // force adding of a first child - - if ((opt_mode =3D=3D OPT_NORMAL && !menu_is_visible(child1)) || - (opt_mode =3D=3D OPT_PROMPT && !menu_has_prompt(child1)) || - (opt_mode =3D=3D OPT_ALL && !menu_get_prompt(child1))) { - - /* remove node */ - if (gtktree_iter_find_node(dst, menu1) !=3D NULL) { - memcpy(&tmp, child2, sizeof(GtkTreeIter)); - valid =3D gtk_tree_model_iter_next(model2, - child2); - gtk_tree_store_remove(tree2, &tmp); - if (!valid) - return; /* next parent */ - else - goto reparse; /* next child */ - } else - continue; - } - - if (menu1 !=3D menu2) { - if (gtktree_iter_find_node(dst, menu1) =3D=3D NULL) { // add node - if (!valid && !menu2) - sibling =3D NULL; - else - sibling =3D child2; - gtk_tree_store_insert_before(tree2, - child2, - dst, sibling); - set_node(tree2, child2, menu1, fill_row(menu1)); - if (menu2 =3D=3D NULL) - valid =3D TRUE; - } else { // remove node - memcpy(&tmp, child2, sizeof(GtkTreeIter)); - valid =3D gtk_tree_model_iter_next(model2, - child2); - gtk_tree_store_remove(tree2, &tmp); - if (!valid) - return; // next parent - else - goto reparse; // next child - } - } else if (sym && (child1->flags & MENU_CHANGED)) { - set_node(tree2, child2, menu1, fill_row(menu1)); - } - - update_tree(child1, child2); - - valid =3D gtk_tree_model_iter_next(model2, child2); - } -} - - /* Display the whole tree (single/split/full view) */ static void _display_tree(GtkTreeStore *tree, struct menu *menu, GtkTreeIter *parent) @@ -1083,8 +1008,6 @@ static void _display_tree(GtkTreeStore *tree, struct = menu *menu, prop =3D child->prompt; ptype =3D prop ? prop->type : P_UNKNOWN; =20 - menu->flags &=3D ~MENU_CHANGED; - if ((view_mode =3D=3D SPLIT_VIEW) && !(child->flags & MENU_ROOT) && (tree =3D=3D tree1)) continue; @@ -1093,12 +1016,8 @@ static void _display_tree(GtkTreeStore *tree, struct= menu *menu, && (tree =3D=3D tree2)) continue; =20 - if ((opt_mode =3D=3D OPT_NORMAL && menu_is_visible(child)) || - (opt_mode =3D=3D OPT_PROMPT && menu_has_prompt(child)) || - (opt_mode =3D=3D OPT_ALL && menu_get_prompt(child))) { - gtk_tree_store_append(tree, &iter, parent); - set_node(tree, &iter, child, fill_row(child)); - } + gtk_tree_store_append(tree, &iter, parent); + set_node(tree, &iter, child, fill_row(child)); =20 if ((view_mode !=3D FULL_VIEW) && (ptype =3D=3D P_MENU) && (tree =3D=3D tree2)) @@ -1313,6 +1232,20 @@ static void init_main_window(const gchar *glade_file) gtk_widget_show(main_wnd); } =20 +static gboolean visible_func(GtkTreeModel *model, GtkTreeIter *iter, + gpointer data) +{ + struct menu *menu; + + gtk_tree_model_get(model, iter, COL_MENU, &menu, -1); + + if (!menu) + return FALSE; + + return menu_is_visible(menu) || opt_mode =3D=3D OPT_ALL || + (opt_mode =3D=3D OPT_PROMPT && menu_has_prompt(menu)); +} + static void init_tree_model(void) { tree2 =3D gtk_tree_store_new(COL_NUMBER, @@ -1344,8 +1277,13 @@ static void init_left_tree(void) GtkCellRenderer *renderer; GtkTreeSelection *sel; GtkTreeViewColumn *column; + GtkTreeModel *filter; =20 - gtk_tree_view_set_model(view, model1); + filter =3D gtk_tree_model_filter_new(model1, NULL); + + gtk_tree_model_filter_set_visible_func(GTK_TREE_MODEL_FILTER(filter), + visible_func, NULL, NULL); + gtk_tree_view_set_model(view, filter); =20 column =3D gtk_tree_view_column_new(); gtk_tree_view_append_column(view, column); @@ -1379,9 +1317,14 @@ static void init_right_tree(void) GtkCellRenderer *renderer; GtkTreeSelection *sel; GtkTreeViewColumn *column; + GtkTreeModel *filter; gint i; =20 - gtk_tree_view_set_model(view, model2); + filter =3D gtk_tree_model_filter_new(model2, NULL); + + gtk_tree_model_filter_set_visible_func(GTK_TREE_MODEL_FILTER(filter), + visible_func, NULL, NULL); + gtk_tree_view_set_model(view, filter); =20 column =3D gtk_tree_view_column_new(); gtk_tree_view_append_column(view, column); --=20 2.43.0 From nobody Wed Oct 8 20:53:21 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 B1D072F0C65; Tue, 24 Jun 2025 15:08:49 +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=1750777729; cv=none; b=k9+oEBtsUal2Mnzyuclfn+Glr33Ha8d7pxGrFRr9uO9xFqoM5CU9hAY2Q2joVAo2iOxh7XDPfCMyK46RrxVtvEzl0189ZqLNuqUbrhjvb5Rom6Bn8TDtuCPrgrZZAn2qpRNwX3X9Xk8nbaFubJSYxxjthiFzdd+IZnxak2LWQ+0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1750777729; c=relaxed/simple; bh=CnAPOpB3/I8zIlFlWpKQGmku5vpQhVOoWIqBic6genM=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=cXjcRPcKyKc/5dZjV3Oxg8tuGkbUIX8c3NN25OT1sa4isFhH14/9Adf1go3jkuMAwvnsye3bgSaJp5NSZhXkxQOClSaTIZBhiqjyzhK07K6MuLXrPnwth19eh8RS23s5eMIzAIAIle9JD0K35GKgfT3Kq1ulfjuu72q5DH5oobo= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=Vwkzkx2B; 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="Vwkzkx2B" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 4231BC4CEEE; Tue, 24 Jun 2025 15:08:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1750777729; bh=CnAPOpB3/I8zIlFlWpKQGmku5vpQhVOoWIqBic6genM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Vwkzkx2Bv81YquZ719ycVEhUSsPJGTnSSC6XhejahSH1QvSvpFwsz7AQwOA/jrtH4 8o2dsEgtNWjBLHdlM2sQ7St4eWAkc+CK5gnCVyA39f+qhfv8dOcWusCmglDXOwU3/5 31VVrw4FRKbBs0Iv4vBfoLJb00baxDR4ue+eShyw5p6A0CVDGx/0i3XCXg+J1/PSCd 0PCawmJkiKGG4vMr3OPp+70dNjB4xfkP8U8BBCMeI9RcquXrZ5ukNqNzplAaINIW6g Mi7nbjncnwE8wzQttGUelgqvYfjQkAQ48XJCA5WhHVpBm9RR9SLYe62u7l7nIjmZAp yzZGVL5jLR0IQ== From: Masahiro Yamada To: linux-kbuild@vger.kernel.org Cc: Masahiro Yamada , linux-kernel@vger.kernel.org Subject: [PATCH 45/66] kconfig: gconf: remove global 'model1' and 'model2' variables Date: Wed, 25 Jun 2025 00:05:33 +0900 Message-ID: <20250624150645.1107002-46-masahiroy@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250624150645.1107002-1-masahiroy@kernel.org> References: <20250624150645.1107002-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" These variables are unnecessary because the current model can be retrieved using gtk_tree_view_get_model(). Signed-off-by: Masahiro Yamada Acked-by: Randy Dunlap --- scripts/kconfig/gconf.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/scripts/kconfig/gconf.c b/scripts/kconfig/gconf.c index a0cc7cb98670..32cf6ae0e5f2 100644 --- a/scripts/kconfig/gconf.c +++ b/scripts/kconfig/gconf.c @@ -44,7 +44,6 @@ static GtkWidget *save_menu_item; static GtkTextTag *tag1, *tag2; =20 static GtkTreeStore *tree1, *tree2; -static GtkTreeModel *model1, *model2; =20 static struct menu *browsed; // browsed menu for SINGLE/SPLIT view static struct menu *selected; // selected entry @@ -1257,7 +1256,6 @@ static void init_tree_model(void) G_TYPE_BOOLEAN, G_TYPE_BOOLEAN, G_TYPE_BOOLEAN, G_TYPE_BOOLEAN, G_TYPE_BOOLEAN); - model2 =3D GTK_TREE_MODEL(tree2); =20 tree1 =3D gtk_tree_store_new(COL_NUMBER, G_TYPE_STRING, G_TYPE_STRING, @@ -1268,7 +1266,6 @@ static void init_tree_model(void) G_TYPE_BOOLEAN, G_TYPE_BOOLEAN, G_TYPE_BOOLEAN, G_TYPE_BOOLEAN, G_TYPE_BOOLEAN); - model1 =3D GTK_TREE_MODEL(tree1); } =20 static void init_left_tree(void) @@ -1279,7 +1276,7 @@ static void init_left_tree(void) GtkTreeViewColumn *column; GtkTreeModel *filter; =20 - filter =3D gtk_tree_model_filter_new(model1, NULL); + filter =3D gtk_tree_model_filter_new(GTK_TREE_MODEL(tree1), NULL); =20 gtk_tree_model_filter_set_visible_func(GTK_TREE_MODEL_FILTER(filter), visible_func, NULL, NULL); @@ -1320,7 +1317,7 @@ static void init_right_tree(void) GtkTreeModel *filter; gint i; =20 - filter =3D gtk_tree_model_filter_new(model2, NULL); + filter =3D gtk_tree_model_filter_new(GTK_TREE_MODEL(tree2), NULL); =20 gtk_tree_model_filter_set_visible_func(GTK_TREE_MODEL_FILTER(filter), visible_func, NULL, NULL); --=20 2.43.0 From nobody Wed Oct 8 20:53:21 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 272322F273A; Tue, 24 Jun 2025 15:08:51 +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=1750777732; cv=none; b=j5s4o/keDybFEIi9l2W21tqxv+1rn1/CSUd4F5W+J4aMflELx7ekm8FI+aH7+6Ltik7qotmyeKlxT0vh2Mi7n48SU9PgbF/9UCHH6u1Y+HmhPot2EZsJE309g1kOfsAqkiAHRGlZE+cLpnVB/zobj2PujE6L8LTKgVWIajr6ZyA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1750777732; c=relaxed/simple; bh=TYExhak6MbqHe07uVTZCXrE91anp6T9Nx3wR/oydH6A=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=FXelHb/04l2/jKgbZErd/eGfZmPdQE9hl3h4LCS6tuza/ZDesb5gj+LXZfAw1TP9cN70f9/Wx8w4IMqcdxYK+0L8oesh+1t9NSEBoW+JjmUJuTPTbkNAKLPJhMySrin1xxCl08Q2kggmOky0nojlqTHDk20UTbL/aSGucKgRGIA= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=gkHUt0BO; 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="gkHUt0BO" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 5A184C4CEF3; Tue, 24 Jun 2025 15:08:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1750777731; bh=TYExhak6MbqHe07uVTZCXrE91anp6T9Nx3wR/oydH6A=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=gkHUt0BOl4kdJWPJuX+N6iCKkN0crmgOsB9Pv9Z/Ja0FmiMmpW33R30frxbPGDNuE P9y3zNltD/wmbnVKljFtu+P4AuO3Owpy+EbN1M8OvhDI8J8ZKJKZlsTX9Drz+iOvHM hZaLJaJuCtFeU7psc5Ljawff1/CONzAexfB3th2NAFxgq2/ME17zJO6UH92Gl+qOeC /S1QXg/HeSM/oFEWTM7e7p4Z/GfZ5+i0YWQe2gtUA1eOck+Th6Gw7SKDgvT+RqV+Wu 2Mhsj/ats5pVKzRurtp1ym+gadW9CJ94UUWhGVZCN7NO2GWIkKFIVasw/YS9llTfFj dAM0BRuq2shfA== From: Masahiro Yamada To: linux-kbuild@vger.kernel.org Cc: Masahiro Yamada , linux-kernel@vger.kernel.org Subject: [PATCH 46/66] kconfig: gconf: remove init_tree_model() Date: Wed, 25 Jun 2025 00:05:34 +0900 Message-ID: <20250624150645.1107002-47-masahiroy@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250624150645.1107002-1-masahiroy@kernel.org> References: <20250624150645.1107002-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" Move the relevant code into init_left_tree() or init_right_tree(). Signed-off-by: Masahiro Yamada --- scripts/kconfig/gconf.c | 36 ++++++++++++++++-------------------- 1 file changed, 16 insertions(+), 20 deletions(-) diff --git a/scripts/kconfig/gconf.c b/scripts/kconfig/gconf.c index 32cf6ae0e5f2..0977d906bea6 100644 --- a/scripts/kconfig/gconf.c +++ b/scripts/kconfig/gconf.c @@ -1245,17 +1245,13 @@ static gboolean visible_func(GtkTreeModel *model, G= tkTreeIter *iter, (opt_mode =3D=3D OPT_PROMPT && menu_has_prompt(menu)); } =20 -static void init_tree_model(void) +static void init_left_tree(void) { - tree2 =3D gtk_tree_store_new(COL_NUMBER, - 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_BOOLEAN, GDK_TYPE_PIXBUF, - G_TYPE_BOOLEAN, G_TYPE_BOOLEAN, - G_TYPE_BOOLEAN, G_TYPE_BOOLEAN, - G_TYPE_BOOLEAN); + GtkTreeView *view =3D GTK_TREE_VIEW(tree1_w); + GtkCellRenderer *renderer; + GtkTreeSelection *sel; + GtkTreeViewColumn *column; + GtkTreeModel *filter; =20 tree1 =3D gtk_tree_store_new(COL_NUMBER, G_TYPE_STRING, G_TYPE_STRING, @@ -1266,15 +1262,6 @@ static void init_tree_model(void) G_TYPE_BOOLEAN, G_TYPE_BOOLEAN, G_TYPE_BOOLEAN, G_TYPE_BOOLEAN, G_TYPE_BOOLEAN); -} - -static void init_left_tree(void) -{ - GtkTreeView *view =3D GTK_TREE_VIEW(tree1_w); - GtkCellRenderer *renderer; - GtkTreeSelection *sel; - GtkTreeViewColumn *column; - GtkTreeModel *filter; =20 filter =3D gtk_tree_model_filter_new(GTK_TREE_MODEL(tree1), NULL); =20 @@ -1317,6 +1304,16 @@ static void init_right_tree(void) GtkTreeModel *filter; gint i; =20 + tree2 =3D gtk_tree_store_new(COL_NUMBER, + 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_BOOLEAN, GDK_TYPE_PIXBUF, + G_TYPE_BOOLEAN, G_TYPE_BOOLEAN, + G_TYPE_BOOLEAN, G_TYPE_BOOLEAN, + G_TYPE_BOOLEAN); + filter =3D gtk_tree_model_filter_new(GTK_TREE_MODEL(tree2), NULL); =20 gtk_tree_model_filter_set_visible_func(GTK_TREE_MODEL_FILTER(filter), @@ -1439,7 +1436,6 @@ int main(int ac, char *av[]) =20 /* Load the interface and connect signals */ init_main_window(glade_file); - init_tree_model(); init_left_tree(); init_right_tree(); =20 --=20 2.43.0 From nobody Wed Oct 8 20:53:21 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 C13382F3C02; Tue, 24 Jun 2025 15:08:53 +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=1750777733; cv=none; b=Xw3nIyvWkhuIIYNLF3xVC52soLFXDwC/Yz4BA+gv3uMlM15A9XTNwokTTnsRVovVfI4YzxLig+hFWebdeM5JuWKD2bD1+NgCePx1TVj8xp393rnhLwcnmC7Apkbec0zHIPACnVExby1rLMie2WPbPf0FQROJ7gydPOuChkHcVyY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1750777733; c=relaxed/simple; bh=824f8DlEQgSpnKuIo6VOnt4KdtWe09eG9Iq5JKNcA5Y=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=UzpdmJ1huJw+vivxRwXBWCbdiVggV0I9oTTq2M34kx0o4KLp3Vhb3Q4nrwp282yytyuGRSh6UY1ZGSo6Y1xIdZQUX1dBH0TgLDSzJqgWaCn+fCldyKSQSLYMRQ/+P0+alWo8NMEmc3l2hbWNbC/USE1JlAsYU94PG01BqS6W+zw= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=bToGsVnl; 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="bToGsVnl" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 63AB4C4CEF3; Tue, 24 Jun 2025 15:08:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1750777733; bh=824f8DlEQgSpnKuIo6VOnt4KdtWe09eG9Iq5JKNcA5Y=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=bToGsVnlDrldMN/c/S4MSB0PccHJWCVOoyXCP5WUJKixgUeCXJIKI6tDNnX2mJfyb yCepNOO0PUZJiRJKw8QQFDoacFclifQTskcMvZWGGQSiVR6VZmG+6H28lrvL/t5pj0 ojutSlSi7LzbOtaCGRoL26fEjmijUBpO98UhR7wG9giJgYIWEPFHp7eX5QmzqeK5W9 qAaQJIDkNztdHp4puidd1aoEVCtbugade9Ej/JR3t391MHcephPagsNqaiYQNK5t8K Ob/pbjMiYgqnDda1Z7OiycXa8L21D6YhRJWHIPuhZ4YIJ0t7qB9EFhWgRMebI6vvda zYawMgkBZCh+Q== From: Masahiro Yamada To: linux-kbuild@vger.kernel.org Cc: Masahiro Yamada , linux-kernel@vger.kernel.org Subject: [PATCH 47/66] kconfig: gconf: inline fill_row() into set_node() Date: Wed, 25 Jun 2025 00:05:35 +0900 Message-ID: <20250624150645.1107002-48-masahiroy@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250624150645.1107002-1-masahiroy@kernel.org> References: <20250624150645.1107002-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 row[] array is used to prepare data passed to set_node(), but this indirection is unnecessary. Squash fill_row() into set_node() and call gtk_tree_store_set() directly. Also, calling gdk_pixbuf_new_from_xpm_data() for every row is inefficient. Call it once and store the resulting pixbuf in a global variable. Signed-off-by: Masahiro Yamada --- scripts/kconfig/gconf.c | 272 ++++++++++++++++------------------------ 1 file changed, 106 insertions(+), 166 deletions(-) diff --git a/scripts/kconfig/gconf.c b/scripts/kconfig/gconf.c index 0977d906bea6..0b73ba9eca14 100644 --- a/scripts/kconfig/gconf.c +++ b/scripts/kconfig/gconf.c @@ -44,6 +44,7 @@ static GtkWidget *save_menu_item; static GtkTextTag *tag1, *tag2; =20 static GtkTreeStore *tree1, *tree2; +static GdkPixbuf *pix_menu; =20 static struct menu *browsed; // browsed menu for SINGLE/SPLIT view static struct menu *selected; // selected entry @@ -58,9 +59,6 @@ enum { static void display_list(void); static void display_tree(GtkTreeStore *store, struct menu *menu); static void display_tree_part(void); -static gchar **fill_row(struct menu *menu); -static void set_node(GtkTreeStore *tree, GtkTreeIter *node, - struct menu *menu, gchar **row); =20 static void conf_changed(bool dirty) { @@ -125,6 +123,104 @@ static void update_row_visibility(void) _update_row_visibility(GTK_TREE_VIEW(tree2_w)); } =20 +static void set_node(GtkTreeStore *tree, GtkTreeIter *node, struct menu *m= enu) +{ + struct symbol *sym =3D menu->sym; + tristate val; + gchar *option; + const gchar *_no =3D ""; + const gchar *_mod =3D ""; + const gchar *_yes =3D ""; + const gchar *value =3D ""; + GdkColor color; + gboolean editable =3D FALSE; + gboolean btnvis =3D FALSE; + + option =3D g_strdup_printf("%s %s %s %s", + menu->type =3D=3D M_COMMENT ? "***" : "", + menu_get_prompt(menu), + menu->type =3D=3D M_COMMENT ? "***" : "", + sym && !sym_has_value(sym) ? "(NEW)" : ""); + + gdk_color_parse(menu_is_visible(menu) ? "Black" : "DarkGray", &color); + + if (!sym) + goto set; + + sym_calc_value(sym); + + if (menu->type =3D=3D M_CHOICE) { // parse children to get a final value + struct symbol *def_sym =3D sym_calc_choice(menu); + struct menu *def_menu =3D NULL; + + for (struct menu *child =3D menu->list; child; child =3D child->next) { + if (menu_is_visible(child) && child->sym =3D=3D def_sym) + def_menu =3D child; + } + + if (def_menu) + value =3D menu_get_prompt(def_menu); + + goto set; + } + + switch (sym_get_type(sym)) { + case S_BOOLEAN: + case S_TRISTATE: + + btnvis =3D TRUE; + + val =3D sym_get_tristate_value(sym); + switch (val) { + case no: + _no =3D "N"; + value =3D "N"; + break; + case mod: + _mod =3D "M"; + value =3D "M"; + break; + case yes: + _yes =3D "Y"; + value =3D "Y"; + break; + } + + if (val !=3D no && sym_tristate_within_range(sym, no)) + _no =3D "_"; + if (val !=3D mod && sym_tristate_within_range(sym, mod)) + _mod =3D "_"; + if (val !=3D yes && sym_tristate_within_range(sym, yes)) + _yes =3D "_"; + break; + default: + value =3D sym_get_string_value(sym); + editable =3D TRUE; + break; + } + +set: + gtk_tree_store_set(tree, node, + COL_OPTION, option, + COL_NAME, sym ? sym->name : "", + COL_NO, _no, + COL_MOD, _mod, + COL_YES, _yes, + COL_VALUE, value, + COL_MENU, (gpointer) menu, + COL_COLOR, &color, + COL_EDIT, editable, + COL_PIXBUF, pix_menu, + COL_PIXVIS, view_mode =3D=3D SINGLE_VIEW && menu->type =3D=3D M_MENU, + COL_BTNVIS, btnvis, + COL_BTNACT, _yes[0] =3D=3D 'Y', + COL_BTNINC, _mod[0] =3D=3D 'M', + COL_BTNRAD, sym && sym_is_choice_value(sym), + -1); + + g_free(option); +} + static void _update_tree(GtkTreeStore *store, GtkTreeIter *parent) { GtkTreeModel *model =3D GTK_TREE_MODEL(store); @@ -138,7 +234,7 @@ static void _update_tree(GtkTreeStore *store, GtkTreeIt= er *parent) gtk_tree_model_get(model, &iter, COL_MENU, &menu, -1); =20 if (menu) - set_node(store, &iter, menu, fill_row(menu)); + set_node(store, &iter, menu); =20 _update_tree(store, &iter); =20 @@ -563,6 +659,9 @@ static gboolean on_window1_delete_event(GtkWidget *widg= et, GdkEvent *event, =20 gtk_widget_destroy(dialog); =20 + if (!ret) + g_object_unref(pix_menu); + return ret; } =20 @@ -824,167 +923,6 @@ static gboolean on_treeview1_button_press_event(GtkWi= dget *widget, return FALSE; } =20 - -/* Fill a row of strings */ -static gchar **fill_row(struct menu *menu) -{ - static gchar *row[COL_NUMBER]; - struct symbol *sym =3D menu->sym; - const char *def; - int stype; - tristate val; - enum prop_type ptype; - int i; - - for (i =3D COL_OPTION; i <=3D COL_COLOR; i++) - g_free(row[i]); - bzero(row, sizeof(row)); - - ptype =3D menu->prompt ? menu->prompt->type : P_UNKNOWN; - - row[COL_OPTION] =3D - g_strdup_printf("%s %s %s %s", - ptype =3D=3D P_COMMENT ? "***" : "", - menu_get_prompt(menu), - ptype =3D=3D P_COMMENT ? "***" : "", - sym && !sym_has_value(sym) ? "(NEW)" : ""); - - if (opt_mode =3D=3D OPT_ALL && !menu_is_visible(menu)) - row[COL_COLOR] =3D g_strdup("DarkGray"); - else if (opt_mode =3D=3D OPT_PROMPT && - menu_has_prompt(menu) && !menu_is_visible(menu)) - row[COL_COLOR] =3D g_strdup("DarkGray"); - else - row[COL_COLOR] =3D g_strdup("Black"); - - switch (ptype) { - case P_MENU: - row[COL_PIXBUF] =3D (gchar *) xpm_menu; - if (view_mode =3D=3D SINGLE_VIEW) - row[COL_PIXVIS] =3D GINT_TO_POINTER(TRUE); - row[COL_BTNVIS] =3D GINT_TO_POINTER(FALSE); - break; - case P_COMMENT: - row[COL_PIXBUF] =3D (gchar *) xpm_void; - row[COL_PIXVIS] =3D GINT_TO_POINTER(FALSE); - row[COL_BTNVIS] =3D GINT_TO_POINTER(FALSE); - break; - default: - row[COL_PIXBUF] =3D (gchar *) xpm_void; - row[COL_PIXVIS] =3D GINT_TO_POINTER(FALSE); - row[COL_BTNVIS] =3D GINT_TO_POINTER(TRUE); - break; - } - - if (!sym) - return row; - row[COL_NAME] =3D g_strdup(sym->name); - - sym_calc_value(sym); - - if (sym_is_choice(sym)) { // parse childs for getting final value - struct menu *child; - struct symbol *def_sym =3D sym_calc_choice(menu); - struct menu *def_menu =3D NULL; - - for (child =3D menu->list; child; child =3D child->next) { - if (menu_is_visible(child) - && child->sym =3D=3D def_sym) - def_menu =3D child; - } - - if (def_menu) - row[COL_VALUE] =3D - g_strdup(menu_get_prompt(def_menu)); - - row[COL_BTNVIS] =3D GINT_TO_POINTER(FALSE); - return row; - } - if (sym_is_choice_value(sym)) - row[COL_BTNRAD] =3D GINT_TO_POINTER(TRUE); - - stype =3D sym_get_type(sym); - switch (stype) { - case S_BOOLEAN: - case S_TRISTATE: - val =3D sym_get_tristate_value(sym); - switch (val) { - case no: - row[COL_NO] =3D g_strdup("N"); - row[COL_VALUE] =3D g_strdup("N"); - row[COL_BTNACT] =3D GINT_TO_POINTER(FALSE); - row[COL_BTNINC] =3D GINT_TO_POINTER(FALSE); - break; - case mod: - row[COL_MOD] =3D g_strdup("M"); - row[COL_VALUE] =3D g_strdup("M"); - row[COL_BTNINC] =3D GINT_TO_POINTER(TRUE); - break; - case yes: - row[COL_YES] =3D g_strdup("Y"); - row[COL_VALUE] =3D g_strdup("Y"); - row[COL_BTNACT] =3D GINT_TO_POINTER(TRUE); - row[COL_BTNINC] =3D GINT_TO_POINTER(FALSE); - break; - } - - if (val !=3D no && sym_tristate_within_range(sym, no)) - row[COL_NO] =3D g_strdup("_"); - if (val !=3D mod && sym_tristate_within_range(sym, mod)) - row[COL_MOD] =3D g_strdup("_"); - if (val !=3D yes && sym_tristate_within_range(sym, yes)) - row[COL_YES] =3D g_strdup("_"); - break; - case S_INT: - case S_HEX: - case S_STRING: - def =3D sym_get_string_value(sym); - row[COL_VALUE] =3D g_strdup(def); - row[COL_EDIT] =3D GINT_TO_POINTER(TRUE); - row[COL_BTNVIS] =3D GINT_TO_POINTER(FALSE); - break; - } - - return row; -} - - -/* Set the node content with a row of strings */ -static void set_node(GtkTreeStore *tree, GtkTreeIter *node, - struct menu *menu, gchar **row) -{ - GdkColor color; - gboolean success; - GdkPixbuf *pix; - - pix =3D gdk_pixbuf_new_from_xpm_data((const char **) - row[COL_PIXBUF]); - - gdk_color_parse(row[COL_COLOR], &color); - gdk_colormap_alloc_colors(gdk_colormap_get_system(), &color, 1, - FALSE, FALSE, &success); - - gtk_tree_store_set(tree, node, - COL_OPTION, row[COL_OPTION], - COL_NAME, row[COL_NAME], - COL_NO, row[COL_NO], - COL_MOD, row[COL_MOD], - COL_YES, row[COL_YES], - COL_VALUE, row[COL_VALUE], - COL_MENU, (gpointer) menu, - COL_COLOR, &color, - COL_EDIT, GPOINTER_TO_INT(row[COL_EDIT]), - COL_PIXBUF, pix, - COL_PIXVIS, GPOINTER_TO_INT(row[COL_PIXVIS]), - COL_BTNVIS, GPOINTER_TO_INT(row[COL_BTNVIS]), - COL_BTNACT, GPOINTER_TO_INT(row[COL_BTNACT]), - COL_BTNINC, GPOINTER_TO_INT(row[COL_BTNINC]), - COL_BTNRAD, GPOINTER_TO_INT(row[COL_BTNRAD]), - -1); - - g_object_unref(pix); -} - /* Display the whole tree (single/split/full view) */ static void _display_tree(GtkTreeStore *tree, struct menu *menu, GtkTreeIter *parent) @@ -1016,7 +954,7 @@ static void _display_tree(GtkTreeStore *tree, struct m= enu *menu, continue; =20 gtk_tree_store_append(tree, &iter, parent); - set_node(tree, &iter, child, fill_row(child)); + set_node(tree, &iter, child); =20 if ((view_mode !=3D FULL_VIEW) && (ptype =3D=3D P_MENU) && (tree =3D=3D tree2)) @@ -1384,6 +1322,8 @@ static void init_right_tree(void) g_signal_connect(G_OBJECT(renderer), "edited", G_CALLBACK(renderer_edited), tree2_w); =20 + pix_menu =3D gdk_pixbuf_new_from_xpm_data((const char **)xpm_menu); + for (i =3D 0; i < COL_VALUE; i++) { column =3D gtk_tree_view_get_column(view, i); gtk_tree_view_column_set_resizable(column, TRUE); --=20 2.43.0 From nobody Wed Oct 8 20:53:21 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 1E6EA2F49F5; Tue, 24 Jun 2025 15:08:55 +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=1750777736; cv=none; b=QNUw54Lbax5svXnXBTTv1IAeD1cwGuND+huQzJ3Pw+cHjJO+5BhVPJTjRm1+6rQep0JQWp5EhW+2ka1bHEJEaNgjwRpZf5YLs+ZwWjnL+EFneQ4FD3nuypdLf7Ssx15kXzRfLIoOjhcMqelYGdbR36c0OTal+RaO8jfpt0dQnQM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1750777736; c=relaxed/simple; bh=dFhGcc6Alhno4K/SJYBCoGpeZNOH9EjBbEF76fl4VFo=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=g65DQ+r5HjB9LHO0QpZKn2d0RMC72/U2Ry8PiwwOy0yhoZLuuZTcFTU1f1ZTJDT6ljrgy7TkiTgRNPpY4tEBBEaWWttlBTsxDqz+hvuODVOhAZRBN6VNqnOdIG+IPmGJYgBEG6n7uTiv5EifrEVZWm0P2acP+mrT8OilSRr3Byg= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=FCPvT1rN; 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="FCPvT1rN" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 6E4C9C4CEF0; Tue, 24 Jun 2025 15:08:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1750777735; bh=dFhGcc6Alhno4K/SJYBCoGpeZNOH9EjBbEF76fl4VFo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=FCPvT1rNuL6HgV1hXXIT/hRzQJ91ysq1SS0QKxdM9dLDPkZJS5+XXM5XBGkwidLPx cXH16Jo1VljfeNmXM0433Z6tQIg0Z13IJ+HPjQw4ooxnVSudQWruvdDPTvu1vFdUtq cIGKgaGqcrFv1cExffDyGXmhIjzyF1+zz3PMxVAMgIBO4dieisCWwem2GSLDVOCeP1 3g4rW3aZLiVaUsMgp9MqKADQEjgqSp4imPsE6wNMp2Blcf0UWUlvoNN398Y+HH6P9u HdG/kOv4wocd0zp9c93QjJy8WUTyLgkWjQYiZNP/pWcuFl1ExdIO0+f1i0RVbUoJJN 0cKbMyAHNu84w== From: Masahiro Yamada To: linux-kbuild@vger.kernel.org Cc: Masahiro Yamada , linux-kernel@vger.kernel.org Subject: [PATCH 48/66] kconfig: gconf: do not reconstruct tree store when a symbol is changed Date: Wed, 25 Jun 2025 00:05:36 +0900 Message-ID: <20250624150645.1107002-49-masahiroy@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250624150645.1107002-1-masahiroy@kernel.org> References: <20250624150645.1107002-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" There is no need to reconstruct the entire tree store when a symbol's value changes. Simply call gtk_tree_store_set() to update the row data. Introduce update_trees() to factor out the common update logic. Signed-off-by: Masahiro Yamada --- scripts/kconfig/gconf.c | 29 +++++++++++------------------ 1 file changed, 11 insertions(+), 18 deletions(-) diff --git a/scripts/kconfig/gconf.c b/scripts/kconfig/gconf.c index 0b73ba9eca14..a358589535e3 100644 --- a/scripts/kconfig/gconf.c +++ b/scripts/kconfig/gconf.c @@ -248,6 +248,13 @@ static void update_tree(GtkTreeStore *store) update_row_visibility(); } =20 +static void update_trees(void) +{ + if (view_mode =3D=3D SPLIT_VIEW) + update_tree(tree1); + update_tree(tree2); +} + static void set_view_mode(enum view_mode mode) { view_mode =3D mode; @@ -378,7 +385,7 @@ static void on_load1_activate(GtkMenuItem *menuitem, gp= ointer user_data) text_insert_msg("Error", "Unable to load configuration!"); else - display_tree_part(); + update_trees(); =20 g_free(filename); } @@ -697,7 +704,7 @@ static void renderer_edited(GtkCellRendererText * cell, =20 sym_set_string_value(sym, new_def); =20 - update_tree(tree2); + update_trees(); =20 free: gtk_tree_path_free(path); @@ -727,14 +734,7 @@ static void change_sym_value(struct menu *menu, gint c= ol) if (!sym_tristate_within_range(sym, newval)) newval =3D yes; sym_set_tristate_value(sym, newval); - if (view_mode =3D=3D FULL_VIEW) - update_tree(tree2); - else if (view_mode =3D=3D SPLIT_VIEW) { - update_tree(tree2); - display_list(); - } - else if (view_mode =3D=3D SINGLE_VIEW) - display_tree_part(); //fixme: keep exp/coll + update_trees(); break; case S_INT: case S_HEX: @@ -750,14 +750,7 @@ static void toggle_sym_value(struct menu *menu) return; =20 sym_toggle_tristate_value(menu->sym); - if (view_mode =3D=3D FULL_VIEW) - update_tree(tree2); - else if (view_mode =3D=3D SPLIT_VIEW) { - update_tree(tree2); - display_list(); - } - else if (view_mode =3D=3D SINGLE_VIEW) - display_tree_part(); //fixme: keep exp/coll + update_trees(); } =20 static gint column2index(GtkTreeViewColumn * column) --=20 2.43.0 From nobody Wed Oct 8 20:53:21 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 4D7422F949D; Tue, 24 Jun 2025 15:08:57 +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=1750777738; cv=none; b=pNB2ytPjvVnOKny2I7Ou7uOG7PgW43HOxz4PZDnYyKRO/LldpBhyEJ4njeV3XvziTAlmEU2RcieV3kCnfGsr1YvNJQjRUnSj0m48fl6oCMhjYrvply/HBFlKJ39kIn7n2hJSuxzjqUh3c1l24gaPX9NQ9K7Ex24A8QRY61zhYts= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1750777738; c=relaxed/simple; bh=vu6L3/V67OE7+Pil3oqFcjU/RjpFh4fq9CGIuiBcMTc=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=HZf60/hBdR3W2Zj9qle6dW/vyzpkcE4Gk419Nlu1yHYm+pukatdkxIY7hVUZm6kidy3bECynahXfpnxUpw5gfacXKvX9AoATjL/JcizDjN8jUDHiIiv5vh7aOUA+AGH2jc7KHxk7l4HfHMJp2WoFFzDY+NBaD9qDFmgZduQrOt8= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=Uyzeyyis; 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="Uyzeyyis" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 836D7C4CEF1; Tue, 24 Jun 2025 15:08:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1750777737; bh=vu6L3/V67OE7+Pil3oqFcjU/RjpFh4fq9CGIuiBcMTc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=UyzeyyisF/tF+vA6CNyQGUrZuxMW4F1eSIrqScz3HHQu37ft6M5o4nWLMICOBEDlz UcdFwOdcc8bkvAit8V1q5YFdo9iMrW9xHB2kCDQnEDmHhPF1T8ok5K2o2d/VWsRSmu m45HJMIUQjcft/2KojzfBpOC/au2xMFOuCAd4YLeAFcZlsO2/1bhwzE4cNSFU43wa5 ZgwfkbwtZ4hlnWusRASm4NWNftj+mCRQ6Nogi9yeSqaY1c6PvWnB49Fe1MV/QlNeY8 e+nxi4C0o515zh/cAf7gZ5eT16ZTtsmK5iUIeYgMOMCFCFWkssTRYBi5yzehczmQjI dfH1c5QsOqyXg== From: Masahiro Yamada To: linux-kbuild@vger.kernel.org Cc: Masahiro Yamada , linux-kernel@vger.kernel.org Subject: [PATCH 49/66] kconfig: gconf: inline display_list() into set_view_mode() Date: Wed, 25 Jun 2025 00:05:37 +0900 Message-ID: <20250624150645.1107002-50-masahiroy@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250624150645.1107002-1-masahiroy@kernel.org> References: <20250624150645.1107002-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 is now only called by set_view_mode(), so inline it for simplicity. Signed-off-by: Masahiro Yamada --- scripts/kconfig/gconf.c | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/scripts/kconfig/gconf.c b/scripts/kconfig/gconf.c index a358589535e3..29b73f0bea38 100644 --- a/scripts/kconfig/gconf.c +++ b/scripts/kconfig/gconf.c @@ -56,7 +56,6 @@ enum { COL_NUMBER }; =20 -static void display_list(void); static void display_tree(GtkTreeStore *store, struct menu *menu); static void display_tree_part(void); =20 @@ -292,8 +291,10 @@ static void set_view_mode(enum view_mode mode) else browsed =3D menu_get_parent_menu(selected); } + gtk_tree_store_clear(tree1); + display_tree(tree1, &rootmenu); + gtk_tree_view_expand_all(GTK_TREE_VIEW(tree1_w)); gtk_tree_store_clear(tree2); - display_list(); if (browsed) display_tree(tree2, browsed); select_menu(GTK_TREE_VIEW(tree1_w), browsed); @@ -980,15 +981,6 @@ static void display_tree_part(void) gtk_tree_view_expand_all(GTK_TREE_VIEW(tree2_w)); } =20 -/* Display the list in the left frame (split view) */ -static void display_list(void) -{ - gtk_tree_store_clear(tree1); - - display_tree(tree1, &rootmenu); - gtk_tree_view_expand_all(GTK_TREE_VIEW(tree1_w)); -} - static void fixup_rootmenu(struct menu *menu) { struct menu *child; --=20 2.43.0 From nobody Wed Oct 8 20:53:21 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 17CD82FBFE1; Tue, 24 Jun 2025 15:09: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=1750777740; cv=none; b=HO2jvdeNH9rDvyh0leREXAigwZ9S9rdzOn9kjJHUkyUtMIaminIvado7mC0LQEyce5nM5dKLCdjzy6EKEqzuPDz7m7hn+UYgCPCKgn7tWf99xfSPfYh+SPzNyaU1Wh50tEMROg4twCJut8Gtia+4sFinBcSZ8vPKlsZEOxu/dc8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1750777740; c=relaxed/simple; bh=06rZLWBazpQ9tGXbkXlybCFX2VlRsw2zu1ihD0jaZnQ=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=DFUUC1HeJrFOy1Fn4xvHCo9mDJBpmUPU6M0zVrFqhmjG75IrYryYa9eBEpS+sZ09aFT9s9Ln2Bwn6juO8vr4Mz988+y+W2Ff7Fc6iUcBOfnzeoWKtMqTVZLavaXYWDnlc2b9GC3iuryzZj+bFKmRvskPf+rbute/yGw4ok3EPhw= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=bayJ/vIk; 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="bayJ/vIk" Received: by smtp.kernel.org (Postfix) with ESMTPSA id A1034C4CEE3; Tue, 24 Jun 2025 15:08:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1750777740; bh=06rZLWBazpQ9tGXbkXlybCFX2VlRsw2zu1ihD0jaZnQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=bayJ/vIki9oKHMtMZZVH24txlsSukTgLXQNqrcyP0o3KXkLTf1RVgNqhWhndNjVKT eWnFQrYgZmlj8Thb/pb+tEGljdRSFdinnnnJ+CwXnmnvt1HA7WI7LLvP6e9NO+CbsR D4YTKl5w9iTCc4kXL4BHaOWqjW3fgFhm1r6LFgw2K1+0ob+3q8VUR9IXyuKg7LLVvt lIXIfhlIr5HpxqS9gFVHXmhJif02SgpYEWjCI5KZ5Dtm8Y695/DOEmjLPgljhwIig1 Fj5xcwGrDvAwQrlo9vPmbfkrSsC3aGlX440ASXBcasuTguikbx5NruuVa/RndFL+LP 1xzWFG0IHdYlg== From: Masahiro Yamada To: linux-kbuild@vger.kernel.org Cc: Masahiro Yamada , linux-kernel@vger.kernel.org Subject: [PATCH 50/66] kconfig: gconf: remove dead code in display_tree_part() Date: Wed, 25 Jun 2025 00:05:38 +0900 Message-ID: <20250624150645.1107002-51-masahiroy@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250624150645.1107002-1-masahiroy@kernel.org> References: <20250624150645.1107002-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 is no longer called in the FULL_VIEW mode, so remove the dead code. Signed-off-by: Masahiro Yamada --- scripts/kconfig/gconf.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/scripts/kconfig/gconf.c b/scripts/kconfig/gconf.c index 29b73f0bea38..64defbe59afc 100644 --- a/scripts/kconfig/gconf.c +++ b/scripts/kconfig/gconf.c @@ -974,10 +974,7 @@ static void display_tree(GtkTreeStore *store, struct m= enu *menu) static void display_tree_part(void) { gtk_tree_store_clear(tree2); - if (view_mode =3D=3D SINGLE_VIEW || view_mode =3D=3D SPLIT_VIEW) - display_tree(tree2, browsed); - else if (view_mode =3D=3D FULL_VIEW) - display_tree(tree2, &rootmenu); + display_tree(tree2, browsed); gtk_tree_view_expand_all(GTK_TREE_VIEW(tree2_w)); } =20 --=20 2.43.0 From nobody Wed Oct 8 20:53:21 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 818482FBFE8; Tue, 24 Jun 2025 15:09: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=1750777742; cv=none; b=ZPRk9amNSvMKotLSGw2lpOXpjO51Cb6Yqspq2hJJ5qFerClmExYyspbqaOixSL2p4J13OehEDROPGQFa83pmDOmWFbPL8YTJCsBp9DMNcrYO9/BYIx1f6gAklmql4zeaCP+ZlLxAyAvaveEqpjaVzo4OOFu/B/poXqFfUjZvaaY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1750777742; c=relaxed/simple; bh=aUctP13oUDRwlXx9fO0EcU0q+shh9jFIo5WKjcq5DNU=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=MaoVLRfqNWFhD+PnMXITjh2zgU7Z/OuVIw6V17dSI9M8hIDOeTqcoXaO/nzslskILRMKSOZ50pFggJN9IYK8u2Ntxv/U+VnVu1u5GicclHSX3sLJ1MvHYiQfhMCUseGNO/0otfiGedEdmYLmt2baKp1IpKRSM9R2+XAA2hwxFV8= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=pKTelaBB; 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="pKTelaBB" Received: by smtp.kernel.org (Postfix) with ESMTPSA id D5E93C4CEF5; Tue, 24 Jun 2025 15:09:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1750777742; bh=aUctP13oUDRwlXx9fO0EcU0q+shh9jFIo5WKjcq5DNU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=pKTelaBB/HneArAJgjUVdQq+dicUlatWo3R6iCuqGufIWAgIncZ56MTf93mE4ef6K Be1Ocj5Q7Vse2Mj6lIyRIhJ/AR2eA4ImzXrybdTvDHY3fRcK93ruzJsvNOVmzduA0c Ll5AvvjT4qplbWmpI12I9GKEC5Ikw6+F+O1zpkzzItx4ZTGNXgqbDGvDR4FOQnO+On kkzkddS13nOVWkN7xTiSGaa611/NHQeClDVvmy3s4EKCanqQPeb4XRy4aH2NlDKrkM 91HCzWucXqsV2UVIY21nqSMtiKYvgY3sfoP9sI/4Xbbv0fjfjyRJ+p3vVJlDPvSS3F 44MF1QrPeldyg== From: Masahiro Yamada To: linux-kbuild@vger.kernel.org Cc: Masahiro Yamada , linux-kernel@vger.kernel.org Subject: [PATCH 51/66] kconfig: gconf: rename display_tree_part() Date: Wed, 25 Jun 2025 00:05:39 +0900 Message-ID: <20250624150645.1107002-52-masahiroy@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250624150645.1107002-1-masahiroy@kernel.org> References: <20250624150645.1107002-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_menu_content_tree() to better reflect its purpose. Signed-off-by: Masahiro Yamada --- 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 64defbe59afc..23a6f99d2cd4 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_menu_content_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_menu_content_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_menu_content_tree(); =20 if (browsed =3D=3D &rootmenu) gtk_widget_set_sensitive(back_btn, FALSE); @@ -803,7 +803,7 @@ static gboolean on_treeview2_button_press_event(GtkWidg= et *widget, if (ptype =3D=3D P_MENU && view_mode !=3D FULL_VIEW && col =3D=3D COL_OP= TION) { // goes down into menu browsed =3D menu; - display_tree_part(); + recreate_menu_content_tree(); gtk_widget_set_sensitive(back_btn, TRUE); } else if (col =3D=3D COL_OPTION) { toggle_sym_value(menu); @@ -908,7 +908,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_menu_content_tree(); } =20 gtk_tree_view_set_cursor(view, path, NULL, FALSE); @@ -971,7 +971,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_menu_content_tree(void) { gtk_tree_store_clear(tree2); display_tree(tree2, browsed); --=20 2.43.0 From nobody Wed Oct 8 20:53:21 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 460B72FC012; Tue, 24 Jun 2025 15:09: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=1750777744; cv=none; b=N9YG9ZiMYaH3q2b9VfOWjp3ZK4cM5g8yilUKR6e7/M+oLpAJJYYbTnTFcTh1n1arj6gA/ih7jqh4jZqLGt+1T/3dZ1CNlb3it4gBs41UhG7tI1+QpwepU4mmQsUp8kfyFBKu3xzhTvgacL89Hcli0nbTFjH1/l4OPrT6nvn2pn4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1750777744; c=relaxed/simple; bh=DjI+et6lMefW9uMpXQWCqe2FLU+qpgBvDy2eHlDXZtw=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=DDQvZsUxTXhMLdc+GxRazDzy5WUd1anjfAfJjLZWUhmrtWoSP8DRhjAkHB2Da7mIdhe7YtcCSBQs+KqDZi26nrryXBdimC/ykCSH3iJAz8Ap76tX9ANXumC/nSOz3LbtmgLH4pQ0d7NseycqdT/iJDZmsBwKMC9wa0MLI5oSzlI= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=iXUa8LQx; 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="iXUa8LQx" Received: by smtp.kernel.org (Postfix) with ESMTPSA id DC962C4CEEE; Tue, 24 Jun 2025 15:09:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1750777744; bh=DjI+et6lMefW9uMpXQWCqe2FLU+qpgBvDy2eHlDXZtw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=iXUa8LQxWXUkt3I9HNzDhV/VZ6P1sMvKeMc364XxK7M9gHw5svN74suC/DZUA2FGY TsyuyDcrdmGJ2GiZ72dDlw+/EPrJriBI0I2H2Qcn3FHEM9cUsBzW8nqW8IkTin0YeM 3Y6EygUw3hHn5GLDRIyRx6ke+ooikzKLaP4eQj4rAxpDrQMRgIudBmmQ9yFWTIB/lf 6H06vwILf9gWcHwo75fYH7vsyl5MA7EwbuFkdB+Iw6d6Nmec08hXPgtkifcHjuLsLn eMMvG80Fhc+wNj5JyJm6ocoLcnEW9Lj6sVDpmHxVnGIZGNsUN5NBr3b/3/sLoHeGVN Vqop5+6hP7wpg== From: Masahiro Yamada To: linux-kbuild@vger.kernel.org Cc: Masahiro Yamada , linux-kernel@vger.kernel.org Subject: [PATCH 52/66] kconfig: gconf: remove fixup_rootmenu() Date: Wed, 25 Jun 2025 00:05:40 +0900 Message-ID: <20250624150645.1107002-53-masahiroy@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250624150645.1107002-1-masahiroy@kernel.org> References: <20250624150645.1107002-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 MENU_ROOT flag is a hack used for SPLIT_VIEW mode. Top-level symbols have no parent menu, so they are displayed directly in the left pane. Show the rootmenu, allowing top-level symbols to have a proper parent menu and be displayed consistently in the right pane. Signed-off-by: Masahiro Yamada --- scripts/kconfig/gconf.c | 164 +++++++++++++++++----------------------- 1 file changed, 71 insertions(+), 93 deletions(-) diff --git a/scripts/kconfig/gconf.c b/scripts/kconfig/gconf.c index 23a6f99d2cd4..b86d54c222e3 100644 --- a/scripts/kconfig/gconf.c +++ b/scripts/kconfig/gconf.c @@ -56,9 +56,6 @@ enum { COL_NUMBER }; =20 -static void display_tree(GtkTreeStore *store, struct menu *menu); -static void recreate_menu_content_tree(void); - static void conf_changed(bool dirty) { gtk_widget_set_sensitive(save_btn, dirty); @@ -254,6 +251,74 @@ static void update_trees(void) update_tree(tree2); } =20 +static void _recreate_menu_tree(GtkTreeStore *store, struct menu *menu, + GtkTreeIter *parent, gboolean menu_only) +{ + GtkTreeIter iter; + + /* REVISIT: menu_finalize() creates empty "if" entries. */ + if (menu->type =3D=3D M_IF) + return; + + if (!menu_only || menu->type =3D=3D M_MENU) { + gtk_tree_store_append(store, &iter, parent); + set_node(store, &iter, menu); + } + + for (struct menu *child =3D menu->list; child; child =3D child->next) + _recreate_menu_tree(store, child, &iter, menu_only); +} + +static void recreate_menu_tree(void) +{ + GtkTreeStore *store; + GtkTreeView *view; + + if (view_mode =3D=3D SPLIT_VIEW) { + store =3D tree1; + view =3D GTK_TREE_VIEW(tree1_w); + } else { + store =3D tree2; + view =3D GTK_TREE_VIEW(tree2_w); + } + + gtk_tree_store_clear(store); + _recreate_menu_tree(store, &rootmenu, NULL, view_mode =3D=3D SPLIT_VIEW); + select_menu(view, browsed); + gtk_tree_view_expand_all(view); +} + +static void _recreate_menu_content_tree(GtkTreeStore *store, struct menu *= menu, + GtkTreeIter *parent, gboolean no_menu) +{ + for (struct menu *child =3D menu->list; child; child =3D child->next) { + GtkTreeIter iter; + + /* REVISIT: menu_finalize() creates empty "if" entries. */ + if (child->type =3D=3D M_IF) + continue; + + if (!no_menu || child->type !=3D M_MENU) { + gtk_tree_store_append(store, &iter, parent); + set_node(store, &iter, child); + } + + if (child->type !=3D M_MENU) + _recreate_menu_content_tree(store, child, &iter, + no_menu); + } +} + +static void recreate_menu_content_tree(void) +{ + gtk_tree_store_clear(tree2); + if (browsed) + _recreate_menu_content_tree(tree2, browsed, NULL, + view_mode =3D=3D SPLIT_VIEW); + select_menu(GTK_TREE_VIEW(tree2_w), selected); + gtk_tree_view_expand_all(GTK_TREE_VIEW(tree2_w)); +} + static void set_view_mode(enum view_mode mode) { view_mode =3D mode; @@ -280,7 +345,6 @@ static void set_view_mode(enum view_mode mode) else browsed =3D &rootmenu; recreate_menu_content_tree(); - select_menu(GTK_TREE_VIEW(tree2_w), selected); gtk_widget_set_sensitive(single_btn, FALSE); break; case SPLIT_VIEW: @@ -291,20 +355,12 @@ static void set_view_mode(enum view_mode mode) else browsed =3D menu_get_parent_menu(selected); } - gtk_tree_store_clear(tree1); - display_tree(tree1, &rootmenu); - gtk_tree_view_expand_all(GTK_TREE_VIEW(tree1_w)); - gtk_tree_store_clear(tree2); - if (browsed) - display_tree(tree2, browsed); - select_menu(GTK_TREE_VIEW(tree1_w), browsed); - select_menu(GTK_TREE_VIEW(tree2_w), selected); + recreate_menu_tree(); + recreate_menu_content_tree(); gtk_widget_set_sensitive(split_btn, FALSE); break; case FULL_VIEW: - gtk_tree_store_clear(tree2); - display_tree(tree2, &rootmenu); - select_menu(GTK_TREE_VIEW(tree2_w), selected); + recreate_menu_tree(); gtk_widget_set_sensitive(full_btn, FALSE); break; } @@ -917,83 +973,6 @@ static gboolean on_treeview1_button_press_event(GtkWid= get *widget, return FALSE; } =20 -/* Display the whole tree (single/split/full view) */ -static void _display_tree(GtkTreeStore *tree, struct menu *menu, - GtkTreeIter *parent) -{ - struct property *prop; - struct menu *child; - enum prop_type ptype; - GtkTreeIter iter; - - for (child =3D menu->list; child; child =3D child->next) { - /* - * REVISIT: - * menu_finalize() creates empty "if" entries. - * Do not confuse gtk_tree_model_get(), which would otherwise - * return "if" menu entry. - */ - if (child->type =3D=3D M_IF) - continue; - - prop =3D child->prompt; - ptype =3D prop ? prop->type : P_UNKNOWN; - - if ((view_mode =3D=3D SPLIT_VIEW) - && !(child->flags & MENU_ROOT) && (tree =3D=3D tree1)) - continue; - - if ((view_mode =3D=3D SPLIT_VIEW) && (child->flags & MENU_ROOT) - && (tree =3D=3D tree2)) - continue; - - gtk_tree_store_append(tree, &iter, parent); - set_node(tree, &iter, child); - - if ((view_mode !=3D FULL_VIEW) && (ptype =3D=3D P_MENU) - && (tree =3D=3D tree2)) - continue; -/* - if (((menu !=3D &rootmenu) && !(menu->flags & MENU_ROOT)) - || (view_mode =3D=3D FULL_VIEW) - || (view_mode =3D=3D SPLIT_VIEW))*/ - - if (((view_mode =3D=3D SINGLE_VIEW) && (menu->flags & MENU_ROOT)) - || (view_mode =3D=3D FULL_VIEW) - || (view_mode =3D=3D SPLIT_VIEW)) - _display_tree(tree, child, &iter); - } -} - -static void display_tree(GtkTreeStore *store, struct menu *menu) -{ - _display_tree(store, menu, NULL); -} - -/* Display a part of the tree starting at current node (single/split view)= */ -static void recreate_menu_content_tree(void) -{ - gtk_tree_store_clear(tree2); - display_tree(tree2, browsed); - gtk_tree_view_expand_all(GTK_TREE_VIEW(tree2_w)); -} - -static void fixup_rootmenu(struct menu *menu) -{ - struct menu *child; - static int menu_cnt =3D 0; - - menu->flags |=3D MENU_ROOT; - for (child =3D menu->list; child; child =3D child->next) { - if (child->prompt && child->prompt->type =3D=3D P_MENU) { - menu_cnt++; - fixup_rootmenu(child); - menu_cnt--; - } else if (!menu_cnt) - fixup_rootmenu(child); - } -} - /* Main Window Initialization */ static void replace_button_icon(GtkWidget *widget, const char * const xpm[= ]) { @@ -1354,7 +1333,6 @@ int main(int ac, char *av[]) name =3D av[1]; =20 conf_parse(name); - fixup_rootmenu(&rootmenu); =20 /* Load the interface and connect signals */ init_main_window(glade_file); --=20 2.43.0 From nobody Wed Oct 8 20:53:21 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 57AF42DA769; Tue, 24 Jun 2025 15:09: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=1750777746; cv=none; b=p77S/CitLADmX0sINBWY6bXMZFEuGeAa4fI/Qcirgxz8+ObbUkIlYWxlN3nrmImcG27eLYn3zLu6zzcIDzXxSnCnJtx5mZNyEYcYgYbqjcj7pOeHzEMUUP8pf1ME3Bv7WxWdZ2cZ81kgQ7b2Z7udQJgKNfc24vGEuaYhPT8xnFw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1750777746; c=relaxed/simple; bh=GOqKXHTBfnBKMo9irpdgKN4z3s14Jq1iPyT5J8xtIFw=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=JlBTOvPwtWJnQTCLYg6q4zPTB/YlwKuYFrWpkha/mmVDsQmjpZk6LswHoI1sh+YoYfgmZ0XPkDjy1dkiDHPnMrKs3H0QgWnQMPZSxZMunH2X6l+96zO7x87Zw7g4nPjpyLvHOnsfVWvvALv6tOArsNWkHQaNuAbZOnIm/vq9OQs= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=vPQ3uqQ4; 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="vPQ3uqQ4" Received: by smtp.kernel.org (Postfix) with ESMTPSA id F14E1C4CEE3; Tue, 24 Jun 2025 15:09:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1750777746; bh=GOqKXHTBfnBKMo9irpdgKN4z3s14Jq1iPyT5J8xtIFw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=vPQ3uqQ4s15fk/FULvJkLsguQHaMBVWIA8zLT0VqyKKR1wi9tT7zqkxf0C2JZJ0xe X6SKQuLnu4odqlmDsYhDQsqSKz2HkW3AXD4Jqfzdi8kSt9+bRQVGopg5Sx9j3XkZyW v84yh2PnaK8raE4YQoK/StJzFrBUbBeKh6JMvBBoSDNpNkw8zyQdICWIfkEznQonLS KpO4q0t7sALDt4M59XhYerZHGQ3IIRfgxFFDhv0ipgcs2eFKKDYMLgZq/h0BssOJiH PW4uG/9jdaRnuP/MjEbDEBUHTKPjKPm2l10IoZ1fiuDMv8+wSV778YL0/Z27Ij1aqi YkrPLpTGr9V6Q== From: Masahiro Yamada To: linux-kbuild@vger.kernel.org Cc: Masahiro Yamada , linux-kernel@vger.kernel.org Subject: [PATCH 53/66] kconfig: gconf: use size_allocate event handler Date: Wed, 25 Jun 2025 00:05:41 +0900 Message-ID: <20250624150645.1107002-54-masahiroy@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250624150645.1107002-1-masahiroy@kernel.org> References: <20250624150645.1107002-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 is not available in GTK 3. Use the size_allocate event handler instead. Signed-off-by: Masahiro Yamada --- scripts/kconfig/gconf.c | 20 ++++++-------------- 1 file changed, 6 insertions(+), 14 deletions(-) diff --git a/scripts/kconfig/gconf.c b/scripts/kconfig/gconf.c index b86d54c222e3..6487d6a0dd9d 100644 --- a/scripts/kconfig/gconf.c +++ b/scripts/kconfig/gconf.c @@ -660,21 +660,13 @@ 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, +static void on_window_size_allocate(GtkWidget *widget, + GtkAllocation *allocation, gpointer user_data) { - static gint old_h; - gint w, h; + gint h; =20 - 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; + h =3D allocation->height; =20 gtk_paned_set_position(GTK_PANED(vpaned), 2 * h / 3); } @@ -1000,8 +992,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, "size_allocate", + G_CALLBACK(on_window_size_allocate), 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 20:53:21 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 B80802FCE2D; Tue, 24 Jun 2025 15:09: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=1750777748; cv=none; b=lbeQwFzuZj9p+o4SYm2KLJldRh9ZD/DKB1jvUNxQ/rdwSWtyrT7vINs2CypyyZ4K/MqicQ9Zp7TN68roqvQ1Dd8DiT09VDwzs6r9Qzqg/CedWHPtGzqNq+fDbOWYsBS+SbOPTziodyAIVcoADRecOvmQEv1FTh3EiQZVd+y32x8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1750777748; c=relaxed/simple; bh=jxtJy1t5UpEtyEe7TLfdiMn0AMq+Xpnuqn/FzxcOWkU=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=DhYVo2Agsc4mx+FALmzbk3eiyHRlyfcxhbXZxjXrt2v0JAXJ49DMZA0pEX8PK1O3kMjUJ1DvAX4fixrMQ3KAJo91/Nt/IIkNQRjKWIk7vwJq0BDFtBYjRQbnM/+Ki1tvVtaVASv4VZCaIFez7IVF08U79755aYIC3lYYOUX3AaM= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=bQKtuMZX; 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="bQKtuMZX" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 12899C4CEE3; Tue, 24 Jun 2025 15:09:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1750777748; bh=jxtJy1t5UpEtyEe7TLfdiMn0AMq+Xpnuqn/FzxcOWkU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=bQKtuMZXA7Y8tlRE04E2hHTxAiMF/Lg+UMUcdiWQUbm8tnzd3ZRO1RT4QIBVPhymj 1ST2GZxTG6Yb1egPm7F5KgBEBEmGkXyVY2Bwenn5gRyMP7RczQtMe++bL3H09o8HLR hvg2HdUhjRQmERSyPGBhVazdbmteW19WEY/+oC5DZ8dXUwiPCQetiWubov7hSRIHRo 936CUs/Mxm90m4typwBYSG5yKHmeAaBxLiaxMGwNAnNkf2mnYg1szWMZPiRLua+wPr tnYvwYiY1eWk4jOTeLpAPACIy3+0Stjp2XryYZmJlRCd2BOw9WCIJJ0dhv0YSo2t7n 1xqNz+bf/y//Q== From: Masahiro Yamada To: linux-kbuild@vger.kernel.org Cc: Masahiro Yamada , linux-kernel@vger.kernel.org Subject: [PATCH 54/66] kconfig: gconf: replace GDK_space with GDK_KEY_space Date: Wed, 25 Jun 2025 00:05:42 +0900 Message-ID: <20250624150645.1107002-55-masahiroy@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250624150645.1107002-1-masahiroy@kernel.org> References: <20250624150645.1107002-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" In GTK3, keysyms changed to have a KEY_ prefix. [1]: https://gitlab.gnome.org/GNOME/gtk/-/blob/2.24.33/gdk/gdkkeysyms-compa= t.h#L24 Signed-off-by: Masahiro Yamada --- scripts/kconfig/gconf.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/kconfig/gconf.c b/scripts/kconfig/gconf.c index 6487d6a0dd9d..28953449a1ed 100644 --- a/scripts/kconfig/gconf.c +++ b/scripts/kconfig/gconf.c @@ -887,7 +887,7 @@ static gboolean on_treeview2_key_press_event(GtkWidget = *widget, if (path =3D=3D NULL) return FALSE; =20 - if (event->keyval =3D=3D GDK_space) { + if (event->keyval =3D=3D GDK_KEY_space) { if (gtk_tree_view_row_expanded(view, path)) gtk_tree_view_collapse_row(view, path); else --=20 2.43.0 From nobody Wed Oct 8 20:53:21 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 826E32FCE3F; Tue, 24 Jun 2025 15:09: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=1750777750; cv=none; b=JqEiBRIyjLl7CwtCyIp3oWfeT9ymME2haw5iyw6/h4EG3Qc8rmSYiYucFqG1wsdK0x//dqYbuPA1MvySnUvNAvuQfLYc7vnN/dxoXZH9WhlaFTvHjUNmvGScrOVNHWLpJl0Jko4SNOqaPNOH9x3bsc77HBGaFZ4BVoz7MJBqsYU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1750777750; c=relaxed/simple; bh=t3WbTLqr7+6TcQ5KLfFT3f6FYixepUlNaLPdLqQ2+EE=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=AFqFvmuqKvr4f9MLyHPTqhZDGjyschxEQXM1BN2YPTPFeMYyKVWQ3E3JQNWJLEIl2rp2xO6oGuSFQNSA/xT9om41LVq23RjXj8XFivwOdxrQQfaQKydFHtBXk5i3lqL69px5XuB14vLqTs71Lmtgls3FZ2YwyXU0d6aglFdO9Zc= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=mc0xTQ2X; 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="mc0xTQ2X" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 30524C4CEE3; Tue, 24 Jun 2025 15:09:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1750777750; bh=t3WbTLqr7+6TcQ5KLfFT3f6FYixepUlNaLPdLqQ2+EE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=mc0xTQ2XiwRqQKNHK1PpjgucSlhtybOXmmewaEz3W1j41+HLD0/ztzxjMJv/lDB+S G6ITwD3ImrJrqRQudv1IkLwqWFgu2r/+PLlv4zHXujcYGqTwxsm2PRrs3BCt1zABcQ fGmrMBRciEy3pgPsLn1rkKTB9zGnWs4OG4vHcejbDyJwdgrlafTnoXSgIWXhCwOTMo uOYVEITaotqaF+vlQVd36X/hQ9GBM6IN36MjdHokpHlXzOaN1hgJE4nDuwqXiCEg3J 2p6ZO7xufHGbYc181SQu093TuKcknTcSh6DuxU5sCwOz/c7HvtX08yUQDxe9vkAO6B OrucLoJJx2urA== From: Masahiro Yamada To: linux-kbuild@vger.kernel.org Cc: Masahiro Yamada , linux-kernel@vger.kernel.org Subject: [PATCH 55/66] kconfig: gconf: replace GTK_STOCK_{OK,NO,CANCEL} Date: Wed, 25 Jun 2025 00:05:43 +0900 Message-ID: <20250624150645.1107002-56-masahiroy@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250624150645.1107002-1-masahiroy@kernel.org> References: <20250624150645.1107002-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" These are deprecated with GTK 3.10. [1] Use "_OK", "_no", "_Cancel". [1]: https://gitlab.gnome.org/GNOME/gtk/-/blob/3.10.0/gtk/deprecated/gtksto= ck.h#L827 Signed-off-by: Masahiro Yamada --- scripts/kconfig/gconf.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/kconfig/gconf.c b/scripts/kconfig/gconf.c index 28953449a1ed..32d1815b425e 100644 --- a/scripts/kconfig/gconf.c +++ b/scripts/kconfig/gconf.c @@ -686,11 +686,11 @@ static gboolean on_window1_delete_event(GtkWidget *wi= dget, GdkEvent *event, (GtkDialogFlags) (GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT), - GTK_STOCK_OK, + "_OK", GTK_RESPONSE_YES, - GTK_STOCK_NO, + "_No", GTK_RESPONSE_NO, - GTK_STOCK_CANCEL, + "_Cancel", GTK_RESPONSE_CANCEL, NULL); gtk_dialog_set_default_response(GTK_DIALOG(dialog), GTK_RESPONSE_CANCEL); --=20 2.43.0 From nobody Wed Oct 8 20:53:21 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 A89BA2FCFDA; Tue, 24 Jun 2025 15:09:12 +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=1750777752; cv=none; b=m4pmk8fsxrmgVypmo79H1XBneXpkXggzdqQpSHVJI1f1V2iYfBf74+WO1MW4D9L5kwRmeU7Int0nvzuu9y/g7V1trDe9+8ZLl/RLaSNGWcF19oTCdl/A0GVAx0/Zrbe17LYOYRwWxL35L0Zi62Ega2qK1iRdJ1YzuGOKmgjxRYg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1750777752; c=relaxed/simple; bh=0tqH0RLbA29AAC1GgzXmYAocsoCaLeD8PAD7fLt7BNo=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=mkXzIHRZWzW7IVPR283gWvbMbe+H3QaDVe4i5UJ/GLH4FuvGd0c/Y7nVUl1g0f6qeeG6PGJeIa0A3mkHVGJA97Vffz2v886oCi7hMC82hcY8B3a2uoXfap87iMbdN00fHRTIKKlxqIH34EbY6NNdxrT4qgfZIS8EPaJo2Yf98uc= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=L4ORJt+K; 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="L4ORJt+K" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 55261C4CEEE; Tue, 24 Jun 2025 15:09:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1750777752; bh=0tqH0RLbA29AAC1GgzXmYAocsoCaLeD8PAD7fLt7BNo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=L4ORJt+KPXL/Wh86Os4sHknY+B7qK0mEO1qwAOSC6K2jnBkk34aW1oheCqtTdIiq3 el2iu8FVIzqtniMRhbZyck0OenO2qAAs3WXHKsrfI8nBM3SuaQa/ioCGxadQbPLvUK WwbI6iTHjAK1dX8UYh7wVVaeLrUQOCrLr6nG1OQlqwVutS0JSiNU5NW0GVC1p/6ZRA NgNy2/M2JPz8dcnAJyLS9yYN9fLsNRAoQqvGUJTVrMq5D/8JcMekxZNMjWpP5ZQVw0 yZIWynMJpuImnJ67pcYrDBBv9/sIUi6MO4oHvkxEP3ifQpHWdLInNmkKqtp1OI0yRV 6MBJlKItr84lA== From: Masahiro Yamada To: linux-kbuild@vger.kernel.org Cc: Masahiro Yamada , linux-kernel@vger.kernel.org Subject: [PATCH 56/66] kconfig: gconf: remove "tooltips" property from glade Date: Wed, 25 Jun 2025 00:05:44 +0900 Message-ID: <20250624150645.1107002-57-masahiroy@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250624150645.1107002-1-masahiroy@kernel.org> References: <20250624150645.1107002-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 tips are still displayed without this. This property does not exist in GtkBuilder with GTK 3. Signed-off-by: Masahiro Yamada --- scripts/kconfig/gconf.glade | 1 - 1 file changed, 1 deletion(-) diff --git a/scripts/kconfig/gconf.glade b/scripts/kconfig/gconf.glade index 8519104a3c2b..c0ada331a5bf 100644 --- a/scripts/kconfig/gconf.glade +++ b/scripts/kconfig/gconf.glade @@ -225,7 +225,6 @@ True GTK_ORIENTATION_HORIZONTAL GTK_TOOLBAR_BOTH - True True =20 --=20 2.43.0 From nobody Wed Oct 8 20:53:21 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 C43632FCFF7; Tue, 24 Jun 2025 15:09:14 +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=1750777754; cv=none; b=TJfq2jp06VzhiXYZXoHwr53u7N8Tzsj8mFSeiyky7oAaCw1Giwk5hnpK8moyevM6L2JPdZGpBruE/Lx5n8SKSlJ8IOV/6BjzZ5gFM0JnTw6uXyOB2IJfJE0UnZItckJo817sIabWYx3LNwi97OA57hWYU1FukK6TBZnUmwfaAOQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1750777754; c=relaxed/simple; bh=OegY9b6sECR27ULaASx2mhfovD6WCbXKMtUurFTMw8A=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=UsmXFJzNmCMQpeQY96k7PLnBgPkHZPlXftcm+Ph9WNF96nXJT+TZ4ZZ3zncxUobpBcMnP7x1KbExulXaUk2fqt8FPzwo1IA6gzyEEjzVkmkDS0H3dcUbNxREUr2Cpn0m/aRnsfsFP8hQum3uQxAQcZV2TUa+MHJeXB0q1EM1LnE= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=maVY78zL; 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="maVY78zL" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 5BC43C4CEE3; Tue, 24 Jun 2025 15:09:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1750777754; bh=OegY9b6sECR27ULaASx2mhfovD6WCbXKMtUurFTMw8A=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=maVY78zLXSs4RKYl4dK0XNtYabqiLdKStwaFiQTQwNEMY/EVqRw43mOxwNac8KTtb SBxUFhFxu/b+NEx/meCFQ3sCbQPt90fe7R2GJ+mJB4Vca6zuwxi5Lql+26q4Ge/JCc HJ35pWhVnoPY5jxC+PRrBAdK51ZXEbDPKVfs7JruoVZea4QK+2rUKFD/vP6C2xC947 8KTJ3fD7H6JEHXP1rIgiJZB/U0KppQsctbi8jd98kWvRUefjRMJGzRdAndZI9LpiI0 CM95Y+s1w30kpwkntvYs5SJ1ktyuacfraHPqFK1Vb56I2FB2C8MCfAxa0oMHr+KUQZ FrT5BIo91DVZw== From: Masahiro Yamada To: linux-kbuild@vger.kernel.org Cc: Masahiro Yamada , linux-kernel@vger.kernel.org Subject: [PATCH 57/66] kconfig: gconf: replace "tooltip" property with "tooltip-text" Date: Wed, 25 Jun 2025 00:05:45 +0900 Message-ID: <20250624150645.1107002-58-masahiroy@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250624150645.1107002-1-masahiroy@kernel.org> References: <20250624150645.1107002-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 was replaced with "tooltip-text" in GtkBuilder with GTK 3. Signed-off-by: Masahiro Yamada Acked-by: Randy Dunlap Tested-by: Randy Dunlap --- scripts/kconfig/gconf.glade | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/scripts/kconfig/gconf.glade b/scripts/kconfig/gconf.glade index c0ada331a5bf..c3996f4635e9 100644 --- a/scripts/kconfig/gconf.glade +++ b/scripts/kconfig/gconf.glade @@ -40,7 +40,7 @@ True - Load a config file= + Load a config= file _Load True @@ -50,7 +50,7 @@ True - Save the config in= .config + Save the conf= ig in .config _Save True @@ -60,7 +60,7 @@ True - Save the config in= a file + Save the conf= ig in a file Save _as True @@ -97,7 +97,7 @@ True - Show name + Show name Show _name True False @@ -107,7 +107,7 @@ True - Show range (Y/M/N)= + Show range (Y= /M/N) Show _range True False @@ -117,7 +117,7 @@ True - Show value of the = option + Show value of= the option Show _data True False @@ -133,7 +133,7 @@ True - Show normal option= s + Show normal o= ptions Show normal options<= /property> True True @@ -143,7 +143,7 @@ True - Show all options + Show all opti= ons Show all _options True False @@ -154,7 +154,7 @@ True - Show all options w= ith prompts + Show all opti= ons with prompts Show all prompt opti= ons True False @@ -230,7 +230,7 @@ True - Goes up of one level (= single view) + Goes up of one le= vel (single view) Back True gtk-undo @@ -266,7 +266,7 @@ True - Load a config file + Load a config fil= e Load True gtk-open @@ -283,7 +283,7 @@ True - Save a config file + Save a config fil= e Save True gtk-save @@ -319,7 +319,7 @@ True - Single view + Single view Single True gtk-missing-image @@ -336,7 +336,7 @@ True - Split view + Split view Split True gtk-missing-image @@ -353,7 +353,7 @@ True - Full view + Full view Full True gtk-missing-image @@ -389,7 +389,7 @@ True - Collapse the whole tre= e in the right frame + Collapse the whol= e tree in the right frame Collapse True gtk-remove @@ -406,7 +406,7 @@ True - Expand the whole tree = in the right frame + Expand the whole = tree in the right frame Expand True gtk-add --=20 2.43.0 From nobody Wed Oct 8 20:53:21 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 EE8E02FD86A; Tue, 24 Jun 2025 15:09:16 +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=1750777757; cv=none; b=aPNrPV6flYcV7MM89jYnSBSdO1Iw0ZgcWBk48tFrZ532w45Y6oBVGR6U9uHM0eSsaBIcghAl3NBOVJZ5jHf/cT7u7wpn4In99I6/QPus8woUMab2WJKw6Oojb6nJBaCEMaGVBFaU5glNMNTLnbG6hoK5Z+GFSD4J4CtZw7UcSKo= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1750777757; c=relaxed/simple; bh=ZE9LwqVUg7dE6O4fOWYKm1h+jAevlxkSZzzZRGPLOVE=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=iAswNszhrcQ7X72NSNxkPzX53qkdfwAYrIGhiokcvXwtrsUDz9HeLVsEiSbYgk7yec1iHwnjIq6FvMZI1JdQqc3P8PuynHwxG6EShYYxWVXFZ6xPsYX4VcDLb80oyC8V7VPWNI1FHaIz2h/vy52/uV5yjfJXkHjrOzxd97wRVuI= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=tkyfgX3/; 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="tkyfgX3/" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 7A16EC4CEE3; Tue, 24 Jun 2025 15:09:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1750777756; bh=ZE9LwqVUg7dE6O4fOWYKm1h+jAevlxkSZzzZRGPLOVE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=tkyfgX3/J6QVKMJXtG0wnh7g+fDtZ7DgUEGLgMDZF05CADwhDykusuSm5JwEN/XE/ 0VxO1lWCK+LeXKqEMEFiIPu9+J3noWlcdD17BRLyipIF91d+x2yhlThcqn4kdh3FnJ vWObKsACfAhyJncjoRIAbyr3PnblEQ4AQo6XjoLY4Jdnh6CPlyjtxILgHIWLvFVg+E LWacU48CnlyJ+m43G7ooBPqRwbZNx6RME6NOH+Dh08WN47Ko/+nN2hfMXuOuvGcphi xjO09ZCQu5IOuqMZCXw5/KCM8mA2DDfgtqQUhs7G1+3pF3DMlmfoBFXpFZv1k8WX/Z 3wJJWFncOS6cA== From: Masahiro Yamada To: linux-kbuild@vger.kernel.org Cc: Masahiro Yamada , linux-kernel@vger.kernel.org Subject: [PATCH 58/66] kconfig: gconf: remove unnecessary default message in text view Date: Wed, 25 Jun 2025 00:05:46 +0900 Message-ID: <20250624150645.1107002-59-masahiroy@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250624150645.1107002-1-masahiroy@kernel.org> References: <20250624150645.1107002-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 message looks odd because it is displayed when nothing is selected. Signed-off-by: Masahiro Yamada --- scripts/kconfig/gconf.glade | 1 - 1 file changed, 1 deletion(-) diff --git a/scripts/kconfig/gconf.glade b/scripts/kconfig/gconf.glade index c3996f4635e9..b2e15b23744f 100644 --- a/scripts/kconfig/gconf.glade +++ b/scripts/kconfig/gconf.glade @@ -517,7 +517,6 @@ 0 0 0 - Sorry, no help availa= ble for this option yet. --=20 2.43.0 From nobody Wed Oct 8 20:53:21 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 412BE2FD885; Tue, 24 Jun 2025 15:09:18 +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=1750777759; cv=none; b=Mzbrvcoy8NDzIIgd9pfiEi4WUpkhMPPneyjVYh4GtgOVtpISNCF2mFv86DsAkJLeKf6ZV9yRwxYvT/mZ3AWPvKxlBjh5FzTmuNMOBKGAGH2mWCizxvNEXnErtJq8G/qjqCvRegooAzTmKlTqI7hBjdCrceuxHXrkRfClWjxZRis= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1750777759; c=relaxed/simple; bh=CLsXBajG+opi/I80fDlZNe/2hXwX6/6PVGc+PKsFKh0=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=UI3tK1Wht7DY6fvYIepRAW0/EnLQjLCCnyBWvMRk/mXCseNlxhEfZwVOwZiAcxpu4dFcGGN5r94Rf7c1tn1csVtDaH+JkIHLNCh39mu6RPKYuxAHJkEbqP+1+pPLzZB92qVcFlZ3kuAFNWEHd41vQwFCGLR2WceQOtKwCUt0yPQ= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=a64GKWm+; 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="a64GKWm+" Received: by smtp.kernel.org (Postfix) with ESMTPSA id A57C8C4CEF0; Tue, 24 Jun 2025 15:09:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1750777758; bh=CLsXBajG+opi/I80fDlZNe/2hXwX6/6PVGc+PKsFKh0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=a64GKWm+EZ7WI+IifcR28ndqLvEWZR1ygan0zeDr/fvmtNbSkSIviux8b4ALGQXv7 CcKJwpNMwJRHmVLpd6KOQ1PvUwxQypBREfBgRdwUk9wyRgL1J4eewRocSjUN+gfKFT 38Zo2mOa+exq16+873T31g1qI+0tFOop1/8eBjpfM9cZT4LlFbIAq42oFAu/21WRQh N3QZPZyh1FN4z3ZHCN2lyiBaf8iUFTt1Dm7uBUJPuF8VLXVduBmsFCaTKEmp08bQ1U kXTfI75QA5HOJEB9JFMCFrx6CeOqF0rMgwr9f+ElajSmWVmVb/St5NJZ8LDHHS4umO xIE2gxAJl2M9g== From: Masahiro Yamada To: linux-kbuild@vger.kernel.org Cc: Masahiro Yamada , linux-kernel@vger.kernel.org Subject: [PATCH 59/66] kconfig: gconf: use gtk_check_menu_item_get_active() accessor Date: Wed, 25 Jun 2025 00:05:47 +0900 Message-ID: <20250624150645.1107002-60-masahiroy@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250624150645.1107002-1-masahiroy@kernel.org> References: <20250624150645.1107002-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" GTK 3 removes many implementation details and struct members from its public headers. Use the gtk_check_menu_item_get_active() accessor. [1]: https://gitlab.gnome.org/GNOME/gtk/-/blob/2.24.33/docs/reference/gtk/c= ompiling.sgml#L85 Signed-off-by: Masahiro Yamada --- scripts/kconfig/gconf.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/kconfig/gconf.c b/scripts/kconfig/gconf.c index 32d1815b425e..c49401b4c9a1 100644 --- a/scripts/kconfig/gconf.c +++ b/scripts/kconfig/gconf.c @@ -493,7 +493,7 @@ static void on_show_name1_activate(GtkMenuItem *menuite= m, gpointer user_data) { GtkTreeViewColumn *col; =20 - show_name =3D GTK_CHECK_MENU_ITEM(menuitem)->active; + show_name =3D gtk_check_menu_item_get_active(GTK_CHECK_MENU_ITEM(menuitem= )); col =3D gtk_tree_view_get_column(GTK_TREE_VIEW(tree2_w), COL_NAME); if (col) gtk_tree_view_column_set_visible(col, show_name); @@ -503,7 +503,7 @@ static void on_show_range1_activate(GtkMenuItem *menuit= em, gpointer user_data) { GtkTreeViewColumn *col; =20 - show_range =3D GTK_CHECK_MENU_ITEM(menuitem)->active; + show_range =3D gtk_check_menu_item_get_active(GTK_CHECK_MENU_ITEM(menuite= m)); col =3D gtk_tree_view_get_column(GTK_TREE_VIEW(tree2_w), COL_NO); if (col) gtk_tree_view_column_set_visible(col, show_range); @@ -520,7 +520,7 @@ static void on_show_data1_activate(GtkMenuItem *menuite= m, gpointer user_data) { GtkTreeViewColumn *col; =20 - show_value =3D GTK_CHECK_MENU_ITEM(menuitem)->active; + show_value =3D gtk_check_menu_item_get_active(GTK_CHECK_MENU_ITEM(menuite= m)); col =3D gtk_tree_view_get_column(GTK_TREE_VIEW(tree2_w), COL_VALUE); if (col) gtk_tree_view_column_set_visible(col, show_value); --=20 2.43.0 From nobody Wed Oct 8 20:53:21 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 443952FE324; Tue, 24 Jun 2025 15:09:21 +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=1750777761; cv=none; b=WptLX7NMqCXaxnCWNLkHTF3AzFBKBMDXODJ+ESKiqR4gLsONDcotGIP6PH+RXnstarO51Zmbs9zq1jyfyZTAU/NF2phLJSwGLnqU8Rzr3/tbZN8rhY67X070YuUyHeujpblHNfUq0RkJBYZolFT0EHHEh/h9UHr9Ih6zlYiJqnw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1750777761; c=relaxed/simple; bh=cOPHkAez0y5Ph2BKZusGcnFqM2fdFg+vRgSVJJENzrQ=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=t5MM0bVnPKNwNm1WLpLkMbSQ+lVPnIwouaO7CtHX2G8oM8e3esOYDvwunTkH9DRRtRWQTc6bg+euebCdKSebVQ5/MyOLywb5R74x+AQC6BJa5+oPwmCt0+hALZ7/s4I6puKiuxxELn3SkNw/5N2C54HlSK3Ro69j/MTNngBQ4rE= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=c2t3PwPE; 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="c2t3PwPE" Received: by smtp.kernel.org (Postfix) with ESMTPSA id A99CEC4CEF1; Tue, 24 Jun 2025 15:09:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1750777760; bh=cOPHkAez0y5Ph2BKZusGcnFqM2fdFg+vRgSVJJENzrQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=c2t3PwPEJXbh0S2ppORdAMA4fDxmIoEBTcUmMBPSjtSlv+9PAx4F8c0N4C2o/Zhrq YOqWA6xnTZFJJjnd2pYuyZ2lffEHyw2POQbkWi+MZiTZw2LzplNODdKSHN2Zauaslr Y4hKsYl0RWKxYD/Bb2Opmzo7z0m58Dx8jQMoQfludAl6owR57VdKiVoOuUevtSJ/KO LihxZ2YBAILAQ0sW2D+4+NiCKUl4sc3zw/PXMv73XpdjDvm/aPU+VXXNrzrQ0izeWo 2HvfO6Rky5LnVaHWhT9IiwA+3Ji9KK/yN9NhtcaBFla18Mur9dRQA5lqkqzdUqu02b OdKrNdPAe+PMw== From: Masahiro Yamada To: linux-kbuild@vger.kernel.org Cc: Masahiro Yamada , linux-kernel@vger.kernel.org Subject: [PATCH 60/66] kconfig: gconf: use gtk_dialog_get_content_area() accessor Date: Wed, 25 Jun 2025 00:05:48 +0900 Message-ID: <20250624150645.1107002-61-masahiroy@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250624150645.1107002-1-masahiroy@kernel.org> References: <20250624150645.1107002-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" GTK 3 removes many implementation details and struct members from its public headers. Use the gtk_check_menu_item_get_active() accessor. [1]: https://gitlab.gnome.org/GNOME/gtk/-/blob/2.24.33/docs/reference/gtk/c= ompiling.sgml#L85 Signed-off-by: Masahiro Yamada --- scripts/kconfig/gconf.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/scripts/kconfig/gconf.c b/scripts/kconfig/gconf.c index c49401b4c9a1..58da3f13c5a0 100644 --- a/scripts/kconfig/gconf.c +++ b/scripts/kconfig/gconf.c @@ -674,7 +674,7 @@ static void on_window_size_allocate(GtkWidget *widget, static gboolean on_window1_delete_event(GtkWidget *widget, GdkEvent *event, gpointer user_data) { - GtkWidget *dialog, *label; + GtkWidget *dialog, *label, *content_area; gint result; gint ret =3D FALSE; =20 @@ -696,7 +696,8 @@ static gboolean on_window1_delete_event(GtkWidget *widg= et, GdkEvent *event, GTK_RESPONSE_CANCEL); =20 label =3D gtk_label_new("\nSave configuration ?\n"); - gtk_container_add(GTK_CONTAINER(GTK_DIALOG(dialog)->vbox), label); + content_area =3D gtk_dialog_get_content_area(GTK_DIALOG(dialog)); + gtk_container_add(GTK_CONTAINER(content_area), label); gtk_widget_show(label); =20 result =3D gtk_dialog_run(GTK_DIALOG(dialog)); --=20 2.43.0 From nobody Wed Oct 8 20:53:21 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 54BF92FE395; Tue, 24 Jun 2025 15:09:23 +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=1750777763; cv=none; b=TEG54758QsIejTr2zaVkWiPCmHiI0UKAxhkdb73ObNoMexhxVT9mjt/JNnNW+/bnVgcP9KKxrtcPrNT7yp8hYdWZcLhg2NjRLOKpo2Ou/BJTpd5hqMlKIgH+3gPrkbLDom+zl7PiCRTvfR/gDNmRPECy9o0t7VWeZV0JHHLLqsY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1750777763; c=relaxed/simple; bh=6qPp6sIDL96xp+ZOlMxJoK1W7yHhzqj9HUhDdoQtrdg=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=qsU/u9x/muYhXarMNWKzBQeyGYNAsmkYEV6rqqZ7pAjnYp+2xpJl9ku80emyru3xB89YkQSt6OYxY8iCRsMEH7AIFbWnIFO3a8qG/b162gZ86bqVaYY7uCdqaq56GNIb1vQWVQM6CYsPz2/DV1yG5mQ39GACCCg7U7BF2ltjXPU= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=BrU0lHEe; 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="BrU0lHEe" Received: by smtp.kernel.org (Postfix) with ESMTPSA id B76D3C4CEF4; Tue, 24 Jun 2025 15:09:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1750777763; bh=6qPp6sIDL96xp+ZOlMxJoK1W7yHhzqj9HUhDdoQtrdg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=BrU0lHEeRWAb48ZGbzD9YKS/xjEqA/FZpwO/RqdP4EnvSSE4oKqWcwLhNq6As3ZIf MSac7H3S9oTUzMC0zqZE1ZiEJg3OBCGu1qfH2Ch6i9SqFMgcfp3rGGSoJOeevaGviQ oIr3MkEQF3vsJCaHcV1wIl/d2jSzInG4oU+29uRtZQ4WKF0gKIRgffEVgun9G1R57V zJvvpFb3vWTkExpGT8JwU2ufjoIs4TcinSTOmIIOy387Modc4ZnmP0vvp/AsjjiVd6 K99tcMjYMaPLG/y51FLRyDX94N1M1IzwSyFnMfmAzN1G4YPw7YCxVWwWoUMhmhfFuB 5+yfUdsijQUxw== From: Masahiro Yamada To: linux-kbuild@vger.kernel.org Cc: Masahiro Yamada , linux-kernel@vger.kernel.org Subject: [PATCH 61/66] kconfig: gconf: remove GtkHandleBox from glade Date: Wed, 25 Jun 2025 00:05:49 +0900 Message-ID: <20250624150645.1107002-62-masahiroy@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250624150645.1107002-1-masahiroy@kernel.org> References: <20250624150645.1107002-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" GtkHandleBox is deprecated with GTK 3.4. [1] [1]: https://gitlab.gnome.org/GNOME/gtk/-/blob/3.4.0/gtk/deprecated/gtkhand= lebox.c#L426 Signed-off-by: Masahiro Yamada --- scripts/kconfig/gconf.glade | 9 --------- 1 file changed, 9 deletions(-) diff --git a/scripts/kconfig/gconf.glade b/scripts/kconfig/gconf.glade index b2e15b23744f..f0c572c7f47c 100644 --- a/scripts/kconfig/gconf.glade +++ b/scripts/kconfig/gconf.glade @@ -214,13 +214,6 @@ =20 - - True - GTK_SHADOW_OUT - GTK_POS_LEFT - GTK_POS_TOP - - True GTK_ORIENTATION_HORIZONTAL @@ -420,8 +413,6 @@ - - 0 False --=20 2.43.0 From nobody Wed Oct 8 20:53:21 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 3AE082FE38A; Tue, 24 Jun 2025 15:09:25 +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=1750777765; cv=none; b=JAu6s99WBB13cC+pTtTfYUpsxgtRTBNfVT9gVZT35HzBcOXzDC/ywtKNcTj3V1eHkB8MLE/6yKKNfLROyiVE78twC8VBZpnCACuIVKtUtFGv+C1NtnL68YW522J+kQizNyAf5rT+dybxFTzK1MmjVG79kQR9iHG3gRnCYpvXUtY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1750777765; c=relaxed/simple; bh=jnyNXKAK3VyOEQ7LNV7u1/xum5b84RnliLk2+Unux04=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Uy0G4rCcYajGN4cY3D7lqhXAZajoRcdR5ueeDzJdzOm9bENvP91Glmki6xnWO3aZqtzQwu1UWYQmvswlzkJ9IbQp/2OqlMbuQ07BlAcmXQbGXXCThMS6sM47GV8c4vdpVSgF6p2F5WI110UZnSyxFhGzEJiHO3pJnC1rhR78UZI= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=fWF5J54V; 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="fWF5J54V" Received: by smtp.kernel.org (Postfix) with ESMTPSA id C4165C4CEE3; Tue, 24 Jun 2025 15:09:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1750777765; bh=jnyNXKAK3VyOEQ7LNV7u1/xum5b84RnliLk2+Unux04=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=fWF5J54VuOIsIYtHvw1vWzHw2ePXjWMfupj+WVC1zr6btcL1M2gcusw9/Cad4FXVB fg9e30oPTeD/FlJOcIXc4UbyN7YhPMqK9sF9UmJiW1wHjHFb8+/T+BTjoN10S3XFN/ FyZk47jOpp0rhslwMLkPI0Lk5P7NWoVMMZSFpf4YqQCrc03Zq1WErO83cUInUS/czr xvHsTrrExLcIHXAok7dA3MJUJ4K9setD3JkkEO4N+8MVqs60GbnezfHdfsF2OrC6Qj QhsOMyd6GopO8jzFdLI7ZZgxYkYKCCs8VfmSymc3ebc5N+a89Ztzw88duBdBEf7XHQ GAs1Zxi8Y3dJw== From: Masahiro Yamada To: linux-kbuild@vger.kernel.org Cc: Masahiro Yamada , linux-kernel@vger.kernel.org Subject: [PATCH 62/66] kconfig: gconf: rename gconf.glade to gconf.ui Date: Wed, 25 Jun 2025 00:05:50 +0900 Message-ID: <20250624150645.1107002-63-masahiroy@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250624150645.1107002-1-masahiroy@kernel.org> References: <20250624150645.1107002-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 --- 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 58da3f13c5a0..4c6459cc26e7 100644 --- a/scripts/kconfig/gconf.c +++ b/scripts/kconfig/gconf.c @@ -1301,11 +1301,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 20:53:21 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 8B3AF302CC1; Tue, 24 Jun 2025 15:09:27 +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=1750777767; cv=none; b=nXzXnaLjy8tXiCJj6il/IAmMDmq4qdFC2SR5eRaWFAK9eYhT/MvLJsWRuAlgjXCGNgDy1LNc2xs3WWKFxcpJREQyBlI77/91pyR6JodZOLiZY/5o4Yh1WJZhhlCYP9N9iksHE8HuH48SyUHCbqKtBJF8vWndonaQTPr8ovkMXzo= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1750777767; c=relaxed/simple; bh=E57QtEgtUWtuFVBzYKMcq15VHy6oZ1mCKarLh20U/4k=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=IZtHCGl6LpQkdaPwTbffH7/WC5MyuxMWZNS/hGvPPmyci6wTH3kpLUQTIvM1icgRZduWaXQHJ9i1s/Fu0wx2RWEYhu5JOmM6ebXDlbGKNFaEpSY0qo4nRtr01gmFPAaaFhoCTznndZborrc/mKMe5A1ahECB6umr/dB4mpDq6kk= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=K6ynx9qw; 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="K6ynx9qw" Received: by smtp.kernel.org (Postfix) with ESMTPSA id DB65DC4CEE3; Tue, 24 Jun 2025 15:09:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1750777767; bh=E57QtEgtUWtuFVBzYKMcq15VHy6oZ1mCKarLh20U/4k=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=K6ynx9qweO3sDDLJteK/2U69GW00yA3smYWR9Vfnj8Akk42SIAiMU2OmmTCEstmHl y3sc2tAwe2taNuMQtowzcZnoUvIez7T+S9ymEy3osMzOODkqw8DGLWxundyRhrndqt IQUkByInVjtv8LaZNfuk7acTW+4TdN7PTPjZBWN8l3tNmYY6SGabQlUOZYZ3kCGaSm UsoxFSBautoQ+///Sbttz+fyP7QeVZg6YriDjMixEgjx/UswQIRpt+KXYLL4Lj7V6P Wckw9Vaz9XPXVnPT3daI06bNBDDjx+THRVQeVt/peZoABqus9ITAL7Sy5hKJh2Hk/w xS5oiK8DCr7zQ== From: Masahiro Yamada To: linux-kbuild@vger.kernel.org Cc: Masahiro Yamada , linux-kernel@vger.kernel.org Subject: [PATCH 63/66] kconfig: gconf: migrate to GTK 3 Date: Wed, 25 Jun 2025 00:05:51 +0900 Message-ID: <20250624150645.1107002-64-masahiroy@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250624150645.1107002-1-masahiroy@kernel.org> References: <20250624150645.1107002-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 --- scripts/kconfig/gconf-cfg.sh | 11 +- scripts/kconfig/gconf.c | 72 ++++++------- scripts/kconfig/gconf.ui | 200 +++++++++++++++++------------------ 3 files changed, 136 insertions(+), 147 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 4c6459cc26e7..5959ed255d12 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 @@ -655,7 +652,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(); } @@ -982,15 +979,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, "size_allocate", @@ -998,9 +995,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", @@ -1008,7 +1005,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", @@ -1016,96 +1013,96 @@ static void init_main_window(const gchar *glade_fil= e) 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 - widget =3D glade_xml_get_widget(xml, "save1"); + widget =3D GTK_WIDGET(gtk_builder_get_object(builder, "save1")); g_signal_connect(widget, "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), NU= LL); =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); - save_menu_item =3D glade_xml_get_widget(xml, "save1"); + save_menu_item =3D GTK_WIDGET(gtk_builder_get_object(builder, "save1")); conf_set_changed_callback(conf_changed); =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 @@ -1120,7 +1117,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 static gboolean visible_func(GtkTreeModel *model, GtkTreeIter *iter, @@ -1296,7 +1295,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 20:53:21 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 F383F3DABE3; Tue, 24 Jun 2025 15:09:29 +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=1750777770; cv=none; b=HL/nQCrJtnENtwKpiBQx2e6i/jzJWjHIlLCkJ6fpswUZq7cZNdFTpt6Nqyg0x4nrUexyOzvxLCKMEMgu0GyWGAxOnPjcC5FvMoL/wglasveJJiwzVzdi8omVZk96OGV+cI7foigol4yKptwLZFJMUB7S61czOo8PkC3e5oc3zWs= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1750777770; c=relaxed/simple; bh=WpdSrMIWUAX+/wei+NDTtBpQwZ+wiFGmbtIoxxBGCvU=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=ObysPMvvs3D4PUbpMLHAR2s/9CJSlW4F8ZCpvCYbifI1fB/o5bKBp5krH/T4o2v7KwNYHh5TGNmtmokp0lNz1cmBdNYLlZpOyjmkkV4hjCJCinThqBm0iBTWLVfmzuDwCf5PrKlDhM4nMkmWU+jpq/zEAmLMeF4UwkFI3IrQOy4= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=PPf+BK7v; 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="PPf+BK7v" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 34144C4CEF1; Tue, 24 Jun 2025 15:09:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1750777769; bh=WpdSrMIWUAX+/wei+NDTtBpQwZ+wiFGmbtIoxxBGCvU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=PPf+BK7v9IKHuIh0UjDmuDBFNpIqxbC6we3fjqpBg8QCh7b578M4CGE8LyX14c4qT RRKVGHtX2AqqAyaFX1DXgCEBuViMBAOPdr3w4WXyvAPYC2t+z/47brIViA6RY1vIdL 2Kbz6lnPvQ5YEExGg1B4NBR/VotrhfZ3sDqDRKknRAsXI0cnFp48We1qyKY/5oq1ds KxP25cEGqv0wuyYOa4QdBGcEXQnPHSQhP+FJHn/kT2MKb3xXMW6p1Mli7oRcFaPQ65 tGB9Ww7pbiC1i+H61zYxenBjhTm4RcoxrOHz6DxDhBAhJeiAuuROdMUcI/bqTx/jM7 K1qppQKTW9oEQ== From: Masahiro Yamada To: linux-kbuild@vger.kernel.org Cc: Masahiro Yamada , linux-kernel@vger.kernel.org Subject: [PATCH 64/66] kconfig: gconf: replace GtkVbox with GtkBox Date: Wed, 25 Jun 2025 00:05:52 +0900 Message-ID: <20250624150645.1107002-65-masahiroy@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250624150645.1107002-1-masahiroy@kernel.org> References: <20250624150645.1107002-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 --- 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 20:53:21 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 EABC726CE3A; Tue, 24 Jun 2025 15:09:31 +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=1750777772; cv=none; b=Wcr/MRyGWb0GT6IoRCK6/lmq+q0Y8SC/55XVWGg65QTKHJsCaXBg8JToZ5o0nsDsTndYrkIBTEclwLGjbxkK5PUydcQUHj/OTsT1Pu10UyzkxwBYwtg/hNOHOVUJXdiGEvo1baYiIDHy7J9UHAh8ZQ/p0ZpeB2cpppOpYRPdo24= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1750777772; c=relaxed/simple; bh=Lz9m9SXvUVEm7qdM1FMKtPZYPlZLcS/XNMVA5d0LNOM=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=IMg3dVyE/nw1ZY0p/6Qo4zfSxGOdik35z/TMeJpezhau2+0zbbHnW26eqRc0xz/j9aocHhl6Vf3m2rIbiydt/FCByNDfY+e8jJqXLZfD+wMmEdYEZOk8dTaygRf3N6EKsEjRf+guh3tl2A0VO7r5xY4H5GAKlPnKirnPbXLps7c= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=X9M1Bq87; 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="X9M1Bq87" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 37D3CC4CEE3; Tue, 24 Jun 2025 15:09:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1750777771; bh=Lz9m9SXvUVEm7qdM1FMKtPZYPlZLcS/XNMVA5d0LNOM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=X9M1Bq87rEfvDbCrbSabrTAksUFtecnfu8eFGChMP4SE/CCyUIT9PQXlNkLhGC9yG R+KkbprXN4NrHROJBUfURRLBTTH4E5Kab6o5Y4c5ezRy4lQlzaBlxLwjbksk/DctPw ybmU062xZ9i2kQvabwDWOH4p52rZBuVn36q5BquMUCGrJ+x+/kXUVEh+HqIoePoeWh wVyWAwRZvrSRv3AIo6Orh0350YualFV8x5tnMitW3x7OIMpGXcH6WbDpQuLJFbrldI Xy8nVV7mG5YQGe5Gj8rI0OVTkErlBGCiSMy5K6Qzy8TNpIqpEMExLvuTHDmawL4hvG LxdazXm6WibUQ== From: Masahiro Yamada To: linux-kbuild@vger.kernel.org Cc: Masahiro Yamada , linux-kernel@vger.kernel.org Subject: [PATCH 65/66] kconfig: gconf: replace GdkColor with GdkRGBA Date: Wed, 25 Jun 2025 00:05:53 +0900 Message-ID: <20250624150645.1107002-66-masahiroy@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250624150645.1107002-1-masahiroy@kernel.org> References: <20250624150645.1107002-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 --- 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 5959ed255d12..5b1b468e782d 100644 --- a/scripts/kconfig/gconf.c +++ b/scripts/kconfig/gconf.c @@ -125,7 +125,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 @@ -135,7 +135,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; @@ -1148,7 +1148,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, @@ -1179,7 +1179,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); @@ -1199,7 +1199,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, @@ -1237,32 +1237,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, @@ -1270,7 +1270,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 20:53:21 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 E899B29E112; Tue, 24 Jun 2025 15:09:33 +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=1750777775; cv=none; b=gZI/TghHl1ltw4Jpf/kAzL9MLAmUr/vQkeO6vM3uJ++pgJm/qm7gqrmkzpkH1MFn+OChq4lWm8PCOhuN3T4QiV0I5agxtGwUFrx16yRcnK25oqb1Iyf7brEY4PXzB/T9BDrtHIN7oywcNaFkh/CC45bCoogREYjvSBkRBHv7khs= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1750777775; c=relaxed/simple; bh=FKQZCVhssxinxGFnIiXQ+JCv5IXUQMwaUCZ/SHC7gr4=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=YAiPQ3rw++53Vn4IDCxvzxVDU22EjyRQFoIoyotlf52kl5eYs6IoUufBM70cvTqUpWgxnrGcnuz7epCAUt6gUisFDhNsY/3A/WyQwCV8lKjx3213/xBtKLikO9TNksLX0E2acxtwICLgMA/+1iTLEawn6mg7t3CPoeJRfX5vXfY= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=HNOcHaty; 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="HNOcHaty" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 42D44C4CEEE; Tue, 24 Jun 2025 15:09:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1750777773; bh=FKQZCVhssxinxGFnIiXQ+JCv5IXUQMwaUCZ/SHC7gr4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=HNOcHatyjO/OqtnGd5KJGCedy2277uSRpj0NTQUehchAtnU7zjDKXW7G+81Sxz5hp dI25wQQIC4Ek4Pi0lmQxiJsX3/Krq8y1ApYeF+N3CG7Y7iesqySHm6WL4/EtUZUxEj 7eb4vTaBrVM7YckORT+9HB78NpFiUi1x6lB94U59A2AAwXVJA5WzSOzom/XwYuaPBY 8WNk2yTZ9PDo/fuS11f/R/G79l+AcRIRutvEebSeqvUH5vDRewaPoVKRCGLW+Jjz9d Cn7I2uTH62kFP3fZ2N8P+Zx76/T0bO4LShzSKzS2XBaKKDqtn25TzQMKOpnQE+VLvp CmWLg5+96SSjA== From: Masahiro Yamada To: linux-kbuild@vger.kernel.org Cc: Masahiro Yamada , linux-kernel@vger.kernel.org Subject: [PATCH 66/66] kconfig: gconf: show GTK version in About dialog Date: Wed, 25 Jun 2025 00:05:54 +0900 Message-ID: <20250624150645.1107002-67-masahiroy@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250624150645.1107002-1-masahiroy@kernel.org> References: <20250624150645.1107002-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 --- 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 5b1b468e782d..7340407e4d6e 100644 --- a/scripts/kconfig/gconf.c +++ b/scripts/kconfig/gconf.c @@ -579,7 +579,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