mirrors/linux
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2025-12-28 07:54:36 -05:00
Code Issues Packages Projects Releases Wiki Activity

kconfig: gconf: inline fill_row() into set_node()

Browse Source 
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 <masahiroy@kernel.org>
This commit is contained in:
Masahiro Yamada
2025-06-25 00:05:35 +09:00
parent ed332436f3
commit 64285dc5c4
1 changed files with 106 additions and 166 deletions
Download Patch File Download Diff File Expand all files Collapse all files

272
scripts/kconfig/gconf.c
View File

@@ -44,6 +44,7 @@ static GtkWidget *save_menu_item;
static GtkTextTag *tag1, *tag2;
static GtkTreeStore *tree1, *tree2;
static GdkPixbuf *pix_menu;
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);
static void conf_changed(bool dirty)
{
@@ -173,6 +171,104 @@ static void update_row_visibility(void)
_update_row_visibility(GTK_TREE_VIEW(tree2_w));
}
static void set_node(GtkTreeStore *tree, GtkTreeIter *node, struct menu *menu)
{
struct symbol *sym = menu->sym;
tristate val;
gchar *option;
const gchar *_no = "";
const gchar *_mod = "";
const gchar *_yes = "";
const gchar *value = "";
GdkColor color;
gboolean editable = FALSE;
gboolean btnvis = FALSE;
option = g_strdup_printf("%s %s %s %s",
menu->type == M_COMMENT ? "***" : "",
menu_get_prompt(menu),
menu->type == 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 == M_CHOICE) { // parse children to get a final value
struct symbol *def_sym = sym_calc_choice(menu);
struct menu *def_menu = NULL;
for (struct menu *child = menu->list; child; child = child->next) {
if (menu_is_visible(child) && child->sym == def_sym)
def_menu = child;
}
if (def_menu)
value = menu_get_prompt(def_menu);
goto set;
}
switch (sym_get_type(sym)) {
case S_BOOLEAN:
case S_TRISTATE:
btnvis = TRUE;
val = sym_get_tristate_value(sym);
switch (val) {
case no:
_no = "N";
value = "N";
break;
case mod:
_mod = "M";
value = "M";
break;
case yes:
_yes = "Y";
value = "Y";
break;
}
if (val != no && sym_tristate_within_range(sym, no))
_no = "_";
if (val != mod && sym_tristate_within_range(sym, mod))
_mod = "_";
if (val != yes && sym_tristate_within_range(sym, yes))
_yes = "_";
break;
default:
value = sym_get_string_value(sym);
editable = 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 == SINGLE_VIEW && menu->type == M_MENU,
COL_BTNVIS, btnvis,
COL_BTNACT, _yes[0] == 'Y',
COL_BTNINC, _mod[0] == 'M',
COL_BTNRAD, sym && sym_is_choice_value(sym),
-1);
g_free(option);
}
static void _update_tree(GtkTreeStore *store, GtkTreeIter *parent)
{
GtkTreeModel *model = GTK_TREE_MODEL(store);
@@ -186,7 +282,7 @@ static void _update_tree(GtkTreeStore *store, GtkTreeIter *parent)
gtk_tree_model_get(model, &iter, COL_MENU, &menu, -1);
if (menu)
set_node(store, &iter, menu, fill_row(menu));
set_node(store, &iter, menu);
_update_tree(store, &iter);
@@ -565,6 +661,9 @@ static gboolean on_window1_delete_event(GtkWidget *widget, GdkEvent *event,
gtk_widget_destroy(dialog);
if (!ret)
g_object_unref(pix_menu);
return ret;
}
@@ -826,167 +925,6 @@ static gboolean on_treeview1_button_press_event(GtkWidget *widget,
return FALSE;
}
/* Fill a row of strings */
static gchar **fill_row(struct menu *menu)
{
static gchar *row[COL_NUMBER];
struct symbol *sym = menu->sym;
const char *def;
int stype;
tristate val;
enum prop_type ptype;
int i;
for (i = COL_OPTION; i <= COL_COLOR; i++)
g_free(row[i]);
bzero(row, sizeof(row));
ptype = menu->prompt ? menu->prompt->type : P_UNKNOWN;
row[COL_OPTION] =
g_strdup_printf("%s %s %s %s",
ptype == P_COMMENT ? "***" : "",
menu_get_prompt(menu),
ptype == P_COMMENT ? "***" : "",
sym && !sym_has_value(sym) ? "(NEW)" : "");
if (opt_mode == OPT_ALL && !menu_is_visible(menu))
row[COL_COLOR] = g_strdup("DarkGray");
else if (opt_mode == OPT_PROMPT &&
menu_has_prompt(menu) && !menu_is_visible(menu))
row[COL_COLOR] = g_strdup("DarkGray");
else
row[COL_COLOR] = g_strdup("Black");
switch (ptype) {
case P_MENU:
row[COL_PIXBUF] = (gchar *) xpm_menu;
if (view_mode == SINGLE_VIEW)
row[COL_PIXVIS] = GINT_TO_POINTER(TRUE);
row[COL_BTNVIS] = GINT_TO_POINTER(FALSE);
break;
case P_COMMENT:
row[COL_PIXBUF] = (gchar *) xpm_void;
row[COL_PIXVIS] = GINT_TO_POINTER(FALSE);
row[COL_BTNVIS] = GINT_TO_POINTER(FALSE);
break;
default:
row[COL_PIXBUF] = (gchar *) xpm_void;
row[COL_PIXVIS] = GINT_TO_POINTER(FALSE);
row[COL_BTNVIS] = GINT_TO_POINTER(TRUE);
break;
}
if (!sym)
return row;
row[COL_NAME] = 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 = sym_calc_choice(menu);
struct menu *def_menu = NULL;
for (child = menu->list; child; child = child->next) {
if (menu_is_visible(child)
&& child->sym == def_sym)
def_menu = child;
}
if (def_menu)
row[COL_VALUE] =
g_strdup(menu_get_prompt(def_menu));
row[COL_BTNVIS] = GINT_TO_POINTER(FALSE);
return row;
}
if (sym_is_choice_value(sym))
row[COL_BTNRAD] = GINT_TO_POINTER(TRUE);
stype = sym_get_type(sym);
switch (stype) {
case S_BOOLEAN:
case S_TRISTATE:
val = sym_get_tristate_value(sym);
switch (val) {
case no:
row[COL_NO] = g_strdup("N");
row[COL_VALUE] = g_strdup("N");
row[COL_BTNACT] = GINT_TO_POINTER(FALSE);
row[COL_BTNINC] = GINT_TO_POINTER(FALSE);
break;
case mod:
row[COL_MOD] = g_strdup("M");
row[COL_VALUE] = g_strdup("M");
row[COL_BTNINC] = GINT_TO_POINTER(TRUE);
break;
case yes:
row[COL_YES] = g_strdup("Y");
row[COL_VALUE] = g_strdup("Y");
row[COL_BTNACT] = GINT_TO_POINTER(TRUE);
row[COL_BTNINC] = GINT_TO_POINTER(FALSE);
break;
}
if (val != no && sym_tristate_within_range(sym, no))
row[COL_NO] = g_strdup("_");
if (val != mod && sym_tristate_within_range(sym, mod))
row[COL_MOD] = g_strdup("_");
if (val != yes && sym_tristate_within_range(sym, yes))
row[COL_YES] = g_strdup("_");
break;
case S_INT:
case S_HEX:
case S_STRING:
def = sym_get_string_value(sym);
row[COL_VALUE] = g_strdup(def);
row[COL_EDIT] = GINT_TO_POINTER(TRUE);
row[COL_BTNVIS] = 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 = 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)
@@ -1018,7 +956,7 @@ static void _display_tree(GtkTreeStore *tree, struct menu *menu,
continue;
gtk_tree_store_append(tree, &iter, parent);
set_node(tree, &iter, child, fill_row(child));
set_node(tree, &iter, child);
if ((view_mode != FULL_VIEW) && (ptype == P_MENU)
&& (tree == tree2))
@@ -1393,6 +1331,8 @@ static void init_right_tree(void)
g_signal_connect(G_OBJECT(renderer), "edited",
G_CALLBACK(renderer_edited), tree2_w);
pix_menu = gdk_pixbuf_new_from_xpm_data((const char **)xpm_menu);
for (i = 0; i < COL_VALUE; i++) {
column = gtk_tree_view_get_column(view, i);
gtk_tree_view_column_set_resizable(column, TRUE);