The patch titled
kconfig: create links in info window
has been removed from the -mm tree. Its filename is
kconfig-create-links-in-info-window.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
Subject: kconfig: create links in info window
From: Roman Zippel <zippel@xxxxxxxxxxxxxx>
Extend the expression print helper function to allow customization of the
symbol output and use it to add links to the info window.
Signed-off-by: Roman Zippel <zippel@xxxxxxxxxxxxxx>
Cc: Sam Ravnborg <sam@xxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
scripts/kconfig/expr.c | 50 ++++++++++++++---------------
scripts/kconfig/lkc_proto.h | 2 -
scripts/kconfig/qconf.cc | 57 +++++++++++++++++++++++++++++++---
scripts/kconfig/qconf.h | 4 +-
4 files changed, 81 insertions(+), 32 deletions(-)
diff -puN scripts/kconfig/expr.c~kconfig-create-links-in-info-window scripts/kconfig/expr.c
--- devel/scripts/kconfig/expr.c~kconfig-create-links-in-info-window 2006-04-09 23:44:51.000000000 -0700
+++ devel-akpm/scripts/kconfig/expr.c 2006-04-09 23:44:51.000000000 -0700
@@ -1013,73 +1013,73 @@ int expr_compare_type(enum expr_type t1,
#endif
}
-void expr_print(struct expr *e, void (*fn)(void *, const char *), void *data, int prevtoken)
+void expr_print(struct expr *e, void (*fn)(void *, struct symbol *, const char *), void *data, int prevtoken)
{
if (!e) {
- fn(data, "y");
+ fn(data, NULL, "y");
return;
}
if (expr_compare_type(prevtoken, e->type) > 0)
- fn(data, "(");
+ fn(data, NULL, "(");
switch (e->type) {
case E_SYMBOL:
if (e->left.sym->name)
- fn(data, e->left.sym->name);
+ fn(data, e->left.sym, e->left.sym->name);
else
- fn(data, "<choice>");
+ fn(data, NULL, "<choice>");
break;
case E_NOT:
- fn(data, "!");
+ fn(data, NULL, "!");
expr_print(e->left.expr, fn, data, E_NOT);
break;
case E_EQUAL:
- fn(data, e->left.sym->name);
- fn(data, "=");
- fn(data, e->right.sym->name);
+ fn(data, e->left.sym, e->left.sym->name);
+ fn(data, NULL, "=");
+ fn(data, e->right.sym, e->right.sym->name);
break;
case E_UNEQUAL:
- fn(data, e->left.sym->name);
- fn(data, "!=");
- fn(data, e->right.sym->name);
+ fn(data, e->left.sym, e->left.sym->name);
+ fn(data, NULL, "!=");
+ fn(data, e->right.sym, e->right.sym->name);
break;
case E_OR:
expr_print(e->left.expr, fn, data, E_OR);
- fn(data, " || ");
+ fn(data, NULL, " || ");
expr_print(e->right.expr, fn, data, E_OR);
break;
case E_AND:
expr_print(e->left.expr, fn, data, E_AND);
- fn(data, " && ");
+ fn(data, NULL, " && ");
expr_print(e->right.expr, fn, data, E_AND);
break;
case E_CHOICE:
- fn(data, e->right.sym->name);
+ fn(data, e->right.sym, e->right.sym->name);
if (e->left.expr) {
- fn(data, " ^ ");
+ fn(data, NULL, " ^ ");
expr_print(e->left.expr, fn, data, E_CHOICE);
}
break;
case E_RANGE:
- fn(data, "[");
- fn(data, e->left.sym->name);
- fn(data, " ");
- fn(data, e->right.sym->name);
- fn(data, "]");
+ fn(data, NULL, "[");
+ fn(data, e->left.sym, e->left.sym->name);
+ fn(data, NULL, " ");
+ fn(data, e->right.sym, e->right.sym->name);
+ fn(data, NULL, "]");
break;
default:
{
char buf[32];
sprintf(buf, "<unknown type %d>", e->type);
- fn(data, buf);
+ fn(data, NULL, buf);
break;
}
}
if (expr_compare_type(prevtoken, e->type) > 0)
- fn(data, ")");
+ fn(data, NULL, ")");
}
-static void expr_print_file_helper(void *data, const char *str)
+static void expr_print_file_helper(void *data, struct symbol *sym, const char *str)
{
fwrite(str, strlen(str), 1, data);
}
@@ -1089,7 +1089,7 @@ void expr_fprint(struct expr *e, FILE *o
expr_print(e, expr_print_file_helper, out, E_NONE);
}
-static void expr_print_gstr_helper(void *data, const char *str)
+static void expr_print_gstr_helper(void *data, struct symbol *sym, const char *str)
{
str_append((struct gstr*)data, str);
}
diff -puN scripts/kconfig/lkc_proto.h~kconfig-create-links-in-info-window scripts/kconfig/lkc_proto.h
--- devel/scripts/kconfig/lkc_proto.h~kconfig-create-links-in-info-window 2006-04-09 23:44:51.000000000 -0700
+++ devel-akpm/scripts/kconfig/lkc_proto.h 2006-04-09 23:44:51.000000000 -0700
@@ -39,4 +39,4 @@ P(prop_get_type_name,const char *,(enum
/* expr.c */
P(expr_compare_type,int,(enum expr_type t1, enum expr_type t2));
-P(expr_print,void,(struct expr *e, void (*fn)(void *, const char *), void *data, int prevtoken));
+P(expr_print,void,(struct expr *e, void (*fn)(void *, struct symbol *, const char *), void *data, int prevtoken));
diff -puN scripts/kconfig/qconf.cc~kconfig-create-links-in-info-window scripts/kconfig/qconf.cc
--- devel/scripts/kconfig/qconf.cc~kconfig-create-links-in-info-window 2006-04-09 23:44:51.000000000 -0700
+++ devel-akpm/scripts/kconfig/qconf.cc 2006-04-09 23:44:51.000000000 -0700
@@ -925,6 +925,8 @@ void ConfigInfoView::setShowDebug(bool b
_showDebug = b;
if (menu)
menuInfo();
+ else if (sym)
+ symbolInfo();
emit showDebugChanged(b);
}
}
@@ -943,15 +945,44 @@ void ConfigInfoView::setSource(const QSt
const char *p = name.latin1();
menu = NULL;
+ sym = NULL;
switch (p[0]) {
case 'm':
- if (sscanf(p, "m%p", &menu) == 1)
+ struct menu *m;
+
+ if (sscanf(p, "m%p", &m) == 1 && menu != m) {
+ menu = m;
menuInfo();
+ }
+ break;
+ case 's':
+ struct symbol *s;
+
+ if (sscanf(p, "s%p", &s) == 1 && sym != s) {
+ sym = s;
+ symbolInfo();
+ }
break;
}
}
+void ConfigInfoView::symbolInfo(void)
+{
+ QString str;
+
+ str += "<big>Symbol: <b>";
+ str += print_filter(sym->name);
+ str += "</b></big><br><br>value: ";
+ str += print_filter(sym_get_string_value(sym));
+ str += "<br>visibility: ";
+ str += sym->visible == yes ? "y" : sym->visible == mod ? "m" : "n";
+ str += "<br>";
+ str += debug_info(sym);
+
+ setText(str);
+}
+
void ConfigInfoView::menuInfo(void)
{
struct symbol* sym;
@@ -965,12 +996,20 @@ void ConfigInfoView::menuInfo(void)
head += "</b></big>";
if (sym->name) {
head += " (";
+ if (showDebug())
+ head += QString().sprintf("<a href=\"s%p\">", sym);
head += print_filter(sym->name);
+ if (showDebug())
+ head += "</a>";
head += ")";
}
} else if (sym->name) {
head += "<big><b>";
+ if (showDebug())
+ head += QString().sprintf("<a href=\"s%p\">", sym);
head += print_filter(sym->name);
+ if (showDebug())
+ head += "</a>";
head += "</b></big>";
}
head += "<br><br>";
@@ -1015,9 +1054,9 @@ QString ConfigInfoView::debug_info(struc
switch (prop->type) {
case P_PROMPT:
case P_MENU:
- debug += "prompt: ";
+ debug += QString().sprintf("prompt: <a href=\"m%p\">", prop->menu);
debug += print_filter(_(prop->text));
- debug += "<br>";
+ debug += "</a><br>";
break;
case P_DEFAULT:
debug += "default: ";
@@ -1088,9 +1127,17 @@ QString ConfigInfoView::print_filter(con
return res;
}
-void ConfigInfoView::expr_print_help(void *data, const char *str)
+void ConfigInfoView::expr_print_help(void *data, struct symbol *sym, const char *str)
{
- reinterpret_cast<QString*>(data)->append(print_filter(str));
+ QString* text = reinterpret_cast<QString*>(data);
+ QString str2 = print_filter(str);
+
+ if (sym && sym->name && !(sym->flags & SYMBOL_CONST)) {
+ *text += QString().sprintf("<a href=\"s%p\">", sym);
+ *text += str2;
+ *text += "</a>";
+ } else
+ *text += str2;
}
QPopupMenu* ConfigInfoView::createPopupMenu(const QPoint& pos)
diff -puN scripts/kconfig/qconf.h~kconfig-create-links-in-info-window scripts/kconfig/qconf.h
--- devel/scripts/kconfig/qconf.h~kconfig-create-links-in-info-window 2006-04-09 23:44:51.000000000 -0700
+++ devel-akpm/scripts/kconfig/qconf.h 2006-04-09 23:44:51.000000000 -0700
@@ -260,13 +260,15 @@ signals:
void showDebugChanged(bool);
protected:
+ void symbolInfo(void);
void menuInfo(void);
QString debug_info(struct symbol *sym);
static QString print_filter(const QString &str);
- static void expr_print_help(void *data, const char *str);
+ static void expr_print_help(void *data, struct symbol *sym, const char *str);
QPopupMenu* createPopupMenu(const QPoint& pos);
void contentsContextMenuEvent(QContextMenuEvent *e);
+ struct symbol *sym;
struct menu *menu;
bool _showDebug;
};
_
Patches currently in -mm which might be from zippel@xxxxxxxxxxxxxx are
git-kbuild.patch
m68k-completely-initialize-hw_regs_t-in-ide_setup_ports.patch
m68k-atyfb_base-compile-fix-for-config_pci=n.patch
m68k-cleanup-unistdh.patch
m68k-remove-some-unused-definitions-in-zorroh.patch
m68k-use-c99-initializer.patch
m68k-print-correct-stack-trace.patch
m68k-restore-amikbd-compatibility-with-24.patch
m68k-extra-delay.patch
m68k-use-proper-defines-for-zone-initialization.patch
m68k-adjust-to-changed-hardirq_mask.patch
m68k-m68k-mac-via2-fixes-and-cleanups.patch
m68k-clean-up-uaccessh.patch
fix-incorrect-sa_onstack-behaviour-for-64-bit-processes.patch
adjust-handle_irr_event-return-type.patch
time-use-clocksource-abstraction-for-ntp-adjustments-optimize-out-some-mults-since-gcc-cant-avoid-them.patch
time-rename-clocksource-functions.patch
fix-rt-mutex-defaults-and-dependencies.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
