-rw-r--r-- | scripts/kconfig/Makefile | 110 | ||||
-rw-r--r-- | scripts/kconfig/Makefile.kernel | 44 | ||||
-rw-r--r-- | scripts/kconfig/conf.c | 7 | ||||
-rw-r--r-- | scripts/kconfig/confdata.c | 74 | ||||
-rw-r--r-- | scripts/kconfig/expr.h | 5 | ||||
-rw-r--r-- | scripts/kconfig/kconfig.i | 5 | ||||
-rw-r--r-- | scripts/kconfig/lkc.h | 5 | ||||
-rw-r--r-- | scripts/kconfig/mconf.c | 101 | ||||
-rw-r--r-- | scripts/kconfig/menu.c | 2 | ||||
-rw-r--r-- | scripts/kconfig/qconf.cc | 274 | ||||
-rw-r--r-- | scripts/kconfig/qconf.h | 59 | ||||
-rw-r--r-- | scripts/kconfig/symbol.c | 35 | ||||
-rw-r--r-- | scripts/kconfig/zconf.l | 72 | ||||
-rw-r--r-- | scripts/kconfig/zconf.y | 6 |
14 files changed, 542 insertions, 257 deletions
diff --git a/scripts/kconfig/Makefile b/scripts/kconfig/Makefile index 7e257be..5a0d7e5 100644 --- a/scripts/kconfig/Makefile +++ b/scripts/kconfig/Makefile | |||
@@ -1,61 +1,45 @@ | |||
1 | VERSION=1.2 | 1 | VERSION=1.3 |
2 | CC=gcc | 2 | CC=gcc |
3 | CXX=g++ | 3 | CXX=g++ |
4 | CFLAGS=-O2 -Wall -g -fPIC | 4 | CFLAGS=-O0 -Wall -g -fPIC |
5 | CXXFLAGS=$(CFLAGS) -I$(HOSTQTDIR)/include | 5 | CXXFLAGS=$(CFLAGS) -I$(HOSTQTDIR)/include |
6 | LDFLAGS= | 6 | LDFLAGS= |
7 | LXXFLAGS=$(LDFLAGS) -L$(HOSTQTDIR)/lib -Wl,-rpath,$(HOSTQTDIR)/lib | 7 | LXXFLAGS=$(LDFLAGS) -L$(HOSTQTDIR)/lib -Wl,-rpath,$(HOSTQTDIR)/lib |
8 | LEX=flex | 8 | LEX=flex |
9 | LFLAGS=-L | ||
9 | YACC=bison | 10 | YACC=bison |
10 | YFLAGS=-d -t #-v | 11 | YFLAGS=-l |
12 | #YFLAGS=-d -t -v -l | ||
11 | ifndef HOSTQTDIR | 13 | ifndef HOSTQTDIR |
12 | ifeq ($(shell if [ -e /usr/share/qt ]; then echo foundit; fi),foundit) | ||
13 | HOSTQTDIR=/usr/share/qt | 14 | HOSTQTDIR=/usr/share/qt |
14 | else | ||
15 | ifeq ($(shell if [ -e /usr/lib/qt ]; then echo foundit; fi),foundit) | ||
16 | HOSTQTDIR=/usr/lib/qt | ||
17 | endif | ||
18 | endif | ||
19 | endif | ||
20 | |||
21 | ifndef QTLIB | ||
22 | ifeq ($(shell if [ -e $(HOSTQTDIR)/lib/libqt-mt.so ]; then echo foundit; fi),foundit) | ||
23 | QTLIB=-lqt-mt | ||
24 | else | ||
25 | ifneq ($(shell if [ -e $(HOSTQTDIR)/lib/libqt.so ]; then echo foundit; fi),foundit) | ||
26 | $(warning Unable to locate libqt.so!) | ||
27 | endif | 15 | endif |
28 | QTLIB=-lqt | ||
29 | endif | ||
30 | endif | ||
31 | |||
32 | MOC=$(wildcard $(HOSTQTDIR)/bin/moc) | 16 | MOC=$(wildcard $(HOSTQTDIR)/bin/moc) |
33 | 17 | ||
34 | parse_SRC=zconf.y | 18 | parse_SRC=zconf.y |
35 | conf_SRC=conf.c $(parse_SRC) | 19 | conf_SRC=conf.c $(parse_SRC) |
36 | mconf_SRC=mconf.c $(parse_SRC) | 20 | mconf_SRC=mconf.c $(parse_SRC) |
37 | qconf_SRC=qconf.cc | 21 | qconf_SRC=qconf.cc |
38 | lkcc_SRC=cml1.y cml1.l help.l cml1.h expr1.c | ||
39 | HDR=expr.h lkc.h lkc_proto.h qconf.h | 22 | HDR=expr.h lkc.h lkc_proto.h qconf.h |
40 | OTHER=README lkc_spec lkc_overview Makefile.kernel convert-all prepare-all.diff fixup-all.diff \ | 23 | OTHER=README lkc-language.txt Makefile.kernel \ |
41 | kconfig.i extconf.rb example | 24 | kconfig.i extconf.rb example |
42 | INST=zconf.y zconf.l confdata.c expr.c symbol.c menu.c conf.c mconf.c qconf.cc kconfig_load.c images.c $(parse_SRC) $(HDR) | 25 | INST=zconf.y zconf.l confdata.c expr.c symbol.c menu.c \ |
43 | INSTGEN=lex.zconf.c zconf.tab.c zconf.tab.h | 26 | conf.c mconf.c qconf.cc kconfig_load.c images.c $(HDR) |
27 | INSTGEN=lex.zconf.c zconf.tab.c | ||
44 | 28 | ||
45 | #DEBUG=1 | 29 | #DEBUG=1 |
46 | ifdef DEBUG | 30 | ifdef DEBUG |
47 | CFLAGS+=-DLKC_DIRECT_LINK | 31 | CFLAGS+=-DLKC_DIRECT_LINK |
48 | qconf_SRC+=$(parse_SRC) | 32 | qconf_SRC+=$(parse_SRC) |
49 | else | 33 | else |
50 | qconf_SRC+=kconfig_load.c | 34 | qconf_SRC+=kconfig_load.c |
51 | endif | 35 | endif |
52 | 36 | ||
53 | SRC=$(conf_SRC) $(mconf_SRC) $(qconf_SRC) $(lkcc_SRC) | 37 | SRC=$(conf_SRC) $(mconf_SRC) $(qconf_SRC) |
54 | CSRC=$(filter %.c, $(SRC)) | 38 | CSRC=$(filter %.c, $(SRC)) |
55 | YSRC=$(filter %.y, $(SRC)) | 39 | YSRC=$(filter %.y, $(SRC)) |
56 | LSRC=$(filter %.l, $(SRC)) | 40 | LSRC=$(filter %.l, $(SRC)) |
57 | 41 | ||
58 | parse_OBJ=$(filter %.o, \ | 42 | parse_OBJ=$(filter %.o, \ |
59 | $(patsubst %.c,%.o, \ | 43 | $(patsubst %.c,%.o, \ |
60 | $(patsubst %.y,%.tab.o, \ | 44 | $(patsubst %.y,%.tab.o, \ |
61 | $(patsubst %.l,lex.%.o, \ | 45 | $(patsubst %.l,lex.%.o, \ |
@@ -71,38 +55,24 @@ mconf_OBJ=$(filter %.o, \ | |||
71 | $(patsubst %.l,lex.%.o, \ | 55 | $(patsubst %.l,lex.%.o, \ |
72 | $(mconf_SRC))))) | 56 | $(mconf_SRC))))) |
73 | qconf_OBJ=$(filter %.o, \ | 57 | qconf_OBJ=$(filter %.o, \ |
74 | $(patsubst %.c,%.o, \ | 58 | $(patsubst %.c,%.o, \ |
75 | $(patsubst %.cc,%.o, \ | 59 | $(patsubst %.cc,%.o, \ |
76 | $(patsubst %.y,%.tab.o, \ | 60 | $(patsubst %.y,%.tab.o, \ |
77 | $(patsubst %.l,lex.%.o, \ | 61 | $(patsubst %.l,lex.%.o, \ |
78 | $(qconf_SRC)))))) | 62 | $(qconf_SRC)))))) |
79 | lkcc_OBJ=$(filter %.o, \ | 63 | OBJ=$(conf_OBJ) $(mconf_OBJ) $(qconf_OBJ) |
80 | $(patsubst %.c,%.o, \ | ||
81 | $(patsubst %.y,%.tab.o, \ | ||
82 | $(patsubst %.l,lex.%.o, \ | ||
83 | $(lkcc_SRC))))) | ||
84 | OBJ=$(conf_OBJ) $(mconf_OBJ) $(qconf_OBJ) $(lkcc_OBJ) | ||
85 | 64 | ||
86 | ifeq ($(MOC),) | 65 | ifeq ($(MOC),) |
87 | all: lkcc conf mconf | 66 | all: conf mconf |
88 | else | 67 | else |
89 | all: lkcc conf mconf qconf libkconfig.so | 68 | all: conf mconf qconf libkconfig.so |
90 | endif | 69 | endif |
91 | 70 | ||
92 | lex.help.c: help.l | ||
93 | lex.help.o: lex.help.c cml1.h expr.h | ||
94 | lex.cml1.c: cml1.l | ||
95 | lex.cml1.o: lex.cml1.c cml1.tab.h cml1.h expr.h | ||
96 | cml1.tab.c: cml1.y | ||
97 | cml1.tab.h: cml1.y | ||
98 | cml1.tab.o: cml1.tab.c cml1.h expr.h | ||
99 | expr1.o: expr1.c expr.h | ||
100 | |||
101 | lkc_deps := lkc.h lkc_proto.h lkc_defs.h expr.h | 71 | lkc_deps := lkc.h lkc_proto.h lkc_defs.h expr.h |
102 | 72 | ||
103 | zconf.tab.c: zconf.y | 73 | zconf.tab.c: zconf.y |
104 | zconf.tab.h: zconf.y | 74 | zconf.tab.h: zconf.y |
105 | lex.zconf.c: zconf.l | 75 | lex.zconf.c: zconf.l |
106 | zconf.tab.o: zconf.tab.c lex.zconf.c confdata.c expr.c symbol.c menu.c $(lkc_deps) | 76 | zconf.tab.o: zconf.tab.c lex.zconf.c confdata.c expr.c symbol.c menu.c $(lkc_deps) |
107 | #lex.zconf.o: lex.zconf.c zconf.tab.h $(lkc_deps) | 77 | #lex.zconf.o: lex.zconf.c zconf.tab.h $(lkc_deps) |
108 | #confdata.o: confdata.c $(lkc_deps) | 78 | #confdata.o: confdata.c $(lkc_deps) |
@@ -123,37 +93,35 @@ conf: $(conf_OBJ) | |||
123 | 93 | ||
124 | ifeq ($(MOC),) | 94 | ifeq ($(MOC),) |
125 | qconf: | 95 | qconf: |
126 | @echo Unable to find the QT installation. Please make sure that the | 96 | @echo Unable to find the QT installation. Please make sure that the |
127 | @echo QT development package is correctly installed and the HOSTQTDIR | 97 | @echo QT development package is correctly installed and the HOSTQTDIR |
128 | @echo environment variable is set to the correct location. | 98 | @echo environment variable is set to the correct location. |
129 | @false | 99 | @false |
130 | else | 100 | else |
131 | qconf: $(qconf_OBJ) libkconfig.so | 101 | qconf: $(qconf_OBJ) |
132 | $(CXX) $(LXXFLAGS) $^ $(QTLIB) -o $@ | 102 | $(CXX) $(LXXFLAGS) $^ -lqt -o $@ |
133 | endif | 103 | endif |
134 | 104 | ||
135 | lkcc: $(lkcc_OBJ) | ||
136 | $(CC) $(LDFLAGS) $^ -o $@ | ||
137 | |||
138 | libkconfig.so: $(parse_OBJ) | 105 | libkconfig.so: $(parse_OBJ) |
139 | $(CC) -shared $^ -o $@ | 106 | $(CC) -shared $^ -o $@ |
140 | 107 | ||
141 | lkc_defs.h: lkc_proto.h | 108 | lkc_defs.h: lkc_proto.h |
142 | sed < $< > $@ 's/P(\([^,]*\),.*/#define \1 (\*\1_p)/' | 109 | sed < $< > $@ 's/P(\([^,]*\),.*/#define \1 (\*\1_p)/' |
143 | 110 | ||
144 | clean: | 111 | clean: |
145 | rm -f $(OBJ) lkcc conf qconf mconf *.moc lex.* *.tab.? *.output | 112 | rm -f $(OBJ) conf qconf mconf *.moc lex.* *.tab.? *.output |
113 | rm -rf .ruby .python | ||
146 | 114 | ||
147 | tgz: | 115 | tgz: |
148 | mkdir tmp | 116 | mkdir tmp |
149 | mkdir tmp/lkc-$(VERSION) | 117 | mkdir tmp/lkc-$(VERSION) |
150 | cp -ra Makefile $(sort $(SRC) $(HDR) $(OTHER) $(INST)) tmp/lkc-$(VERSION) | 118 | cp -ra Makefile $(sort $(SRC) $(HDR) $(OTHER) $(INST)) tmp/lkc-$(VERSION) |
151 | tar -cpvz -C tmp -f lkc-$(VERSION).tar.gz lkc-$(VERSION) | 119 | tar -cpvz -C tmp --exclude CVS -f lkc-$(VERSION).tar.gz lkc-$(VERSION) |
152 | rm -rf tmp | 120 | rm -rf tmp |
153 | 121 | ||
154 | %.tab.c %.tab.h: %.y | 122 | %.tab.c %.tab.h: %.y |
155 | $(YACC) $(YFLAGS) -b $* -p $* $< | 123 | $(YACC) $(YFLAGS) -b $* -p $* $< |
156 | 124 | ||
157 | lex.%.c: %.l | 125 | lex.%.c: %.l |
158 | $(LEX) $(LFLAGS) -P$* $< | 126 | $(LEX) $(LFLAGS) -P$* $< |
159 | 127 | ||
@@ -162,34 +130,25 @@ lex.%.c: %.l | |||
162 | 130 | ||
163 | %.o: %.c | 131 | %.o: %.c |
164 | $(CC) $(CFLAGS) -c $< -o $@ | 132 | $(CC) $(CFLAGS) -c $< -o $@ |
165 | 133 | ||
166 | %.o: %.cc | 134 | %.o: %.cc |
167 | $(CXX) $(CXXFLAGS) -c $< -o $@ | 135 | $(CXX) $(CXXFLAGS) -c $< -o $@ |
168 | 136 | ||
169 | ifdef KERNELSRC | 137 | ifdef KERNELSRC |
170 | install: lkcc $(INSTGEN) | 138 | install: $(INSTGEN) |
171 | set -x; mkdir $(KERNELSRC)/scripts/kconfig; \ | 139 | set -x; cp $(sort $(INST)) $(KERNELSRC)/scripts/kconfig; \ |
172 | cp $(sort $(INST)) $(KERNELSRC)/scripts/kconfig; \ | ||
173 | for f in $(INSTGEN); do cp $$f $(KERNELSRC)/scripts/kconfig/$${f}_shipped; done; \ | 140 | for f in $(INSTGEN); do cp $$f $(KERNELSRC)/scripts/kconfig/$${f}_shipped; done; \ |
174 | cp Makefile.kernel $(KERNELSRC)/scripts/kconfig/Makefile; \ | 141 | cp Makefile.kernel $(KERNELSRC)/scripts/kconfig/Makefile |
175 | LKCSRC=$$PWD; export LKCSRC; \ | 142 | |
176 | cd $(KERNELSRC); \ | 143 | diff: $(INSTGEN) |
177 | patch -p0 -N < $$LKCSRC/prepare-all.diff; \ | 144 | for f in $(sort $(INST)); do diff -u $(KERNELSRC)/scripts/kconfig/$$f $$f; done; \ |
178 | sh $$LKCSRC/convert-all; \ | 145 | for f in $(INSTGEN); do diff -u $(KERNELSRC)/scripts/kconfig/$${f}_shipped $$f; done; \ |
179 | patch -p0 -N < $$LKCSRC/fixup-all.diff | 146 | diff -u $(KERNELSRC)/scripts/kconfig/Makefile Makefile.kernel |
180 | |||
181 | #cp Makefile $(KERNELSRC)/scripts/kconfig/Makefile; \ | ||
182 | |||
183 | uninstall: | ||
184 | patch -p0 -N -R -d $(KERNELSRC) < prepare-all.diff; \ | ||
185 | cd $(KERNELSRC); \ | ||
186 | find -name "Kconfig*" | xargs rm; \ | ||
187 | rm -rf scripts/kconfig log.* | ||
188 | else | 147 | else |
189 | install: | 148 | install: |
190 | @echo "Please use KERNELSRC=<path/to/linux-kernel> to install" | 149 | @echo "Please use KERNELSRC=<path/to/linux-kernel> to install" |
191 | endif | 150 | endif |
192 | 151 | ||
193 | ruby: .ruby libkconfig.so .ruby/kconfig.so | 152 | ruby: .ruby libkconfig.so .ruby/kconfig.so |
194 | 153 | ||
195 | .ruby: | 154 | .ruby: |
@@ -199,9 +158,24 @@ ruby: .ruby libkconfig.so .ruby/kconfig.so | |||
199 | swig -ruby -o $@ $< | 158 | swig -ruby -o $@ $< |
200 | 159 | ||
201 | .ruby/Makefile: extconf.rb | 160 | .ruby/Makefile: extconf.rb |
202 | cd .ruby; ruby ../extconf.rb | 161 | cd .ruby; ruby ../extconf.rb |
203 | 162 | ||
204 | .ruby/kconfig.so: .ruby/kconfig_wrap.c .ruby/Makefile | 163 | .ruby/kconfig.so: .ruby/kconfig_wrap.c .ruby/Makefile |
205 | make -C .ruby | 164 | make -C .ruby |
206 | 165 | ||
207 | .PHONY: all tgz clean ruby | 166 | |
167 | PYTHON_INCLUDE=$(shell python -c "import sys; print '-I'+sys.prefix+'/include/python'+sys.version[:3]") | ||
168 | |||
169 | python: .python .python/kconfig.py .python/_kconfig.so | ||
170 | |||
171 | .python: | ||
172 | mkdir .python | ||
173 | |||
174 | .python/kconfig_wrap.c .python/kconfig.py: kconfig.i kconfig_load.c expr.h lkc_proto.h | ||
175 | swig -python -o .python/kconfig_wrap.c kconfig.i | ||
176 | |||
177 | .python/_kconfig.so: .python/kconfig_wrap.c | ||
178 | cd .python; $(CC) $(CFLAGS) -shared kconfig_wrap.c -o _kconfig.so -I.. $(PYTHON_INCLUDE) | ||
179 | |||
180 | |||
181 | .PHONY: all tgz clean ruby python | ||
diff --git a/scripts/kconfig/Makefile.kernel b/scripts/kconfig/Makefile.kernel index beb4dcf..22724a7 100644 --- a/scripts/kconfig/Makefile.kernel +++ b/scripts/kconfig/Makefile.kernel | |||
@@ -18,43 +18,53 @@ mconf-objs := mconf.o libkconfig.so | |||
18 | qconf-objs:= kconfig_load.o | 18 | qconf-objs:= kconfig_load.o |
19 | qconf-cxxobjs:= qconf.o | 19 | qconf-cxxobjs:= qconf.o |
20 | 20 | ||
21 | clean-files:= libkconfig.so lkc_defs.h qconf.moc .tmp_qtcheck \ | 21 | clean-files:= libkconfig.so lkc_defs.h qconf.moc .tmp_qtcheck \ |
22 | zconf.tab.c zconf.tab.h lex.zconf.c | 22 | zconf.tab.c zconf.tab.h lex.zconf.c |
23 | 23 | ||
24 | include $(TOPDIR)/Rules.make | 24 | include $(TOPDIR)/Rules.make |
25 | 25 | ||
26 | # QT needs some extra effort... | ||
27 | ifndef QTDIR | ||
28 | QTDIR := /usr/share/qt | ||
29 | endif | ||
30 | |||
31 | # Executable to generate the .moc file | ||
32 | MOC=$(wildcard $(QTDIR)/bin/moc) | ||
33 | |||
34 | # generated files seem to need this to find local include files | 26 | # generated files seem to need this to find local include files |
35 | HOSTCFLAGS_lex.zconf.o:= -I$(src) | 27 | HOSTCFLAGS_lex.zconf.o:= -I$(src) |
36 | HOSTCFLAGS_zconf.tab.o:= -I$(src) | 28 | HOSTCFLAGS_zconf.tab.o:= -I$(src) |
37 | 29 | ||
38 | HOSTLOADLIBES_qconf:= -L$(QTDIR)/lib -Wl,-rpath,$(QTDIR)/lib -lqt -ldl | 30 | HOSTLOADLIBES_qconf= -L$(QTDIR)/lib -Wl,-rpath,$(QTDIR)/lib -l$(QTLIB) -ldl |
39 | HOSTCXXFLAGS_qconf.o:= -I$(QTDIR)/include | 31 | HOSTCXXFLAGS_qconf.o= -I$(QTDIR)/include |
40 | 32 | ||
41 | $(obj)/conf.o $(obj)/mconf.o $(obj)/qconf.o: $(obj)/zconf.tab.h | 33 | $(obj)/conf.o $(obj)/mconf.o $(obj)/qconf.o: $(obj)/zconf.tab.h |
42 | 34 | ||
43 | $(obj)/qconf.o: $(obj)/.tmp_qtcheck | 35 | $(obj)/qconf.o: $(obj)/.tmp_qtcheck |
44 | 36 | ||
37 | ifeq ($(MAKECMDGOALS),$(obj)/qconf) | ||
38 | MOC = $(QTDIR)/bin/moc | ||
39 | -include $(obj)/.tmp_qtcheck | ||
40 | |||
41 | # QT needs some extra effort... | ||
45 | $(obj)/.tmp_qtcheck: | 42 | $(obj)/.tmp_qtcheck: |
46 | ifeq ($(MOC),) | 43 | @set -e; for d in $$QTDIR /usr/share/qt /usr/lib/qt3; do \ |
47 | @echo Unable to find the QT installation. Please make sure that the | 44 | if [ -f $$d/include/qconfig.h ]; then DIR=$$d; break; fi; \ |
48 | @echo QT development package is correctly installed and the QTDIR | 45 | done; \ |
49 | @echo environment variable is set to the correct location. | 46 | if [ -z "$$DIR" ]; then \ |
50 | @false | 47 | echo "*"; \ |
51 | else | 48 | echo "* Unable to find the QT installation. Please make sure that the"; \ |
52 | @touch $@ | 49 | echo "* QT development package is correctly installed and the QTDIR"; \ |
50 | echo "* environment variable is set to the correct location."; \ | ||
51 | echo "*"; \ | ||
52 | false; \ | ||
53 | fi; \ | ||
54 | LIB=qt; \ | ||
55 | if [ -f $$DIR/lib/libqt-mt.so ]; then LIB=qt-mt; fi; \ | ||
56 | echo "QTDIR=$$DIR" > $@; echo "QTLIB=$$LIB" >> $@; \ | ||
57 | if [ ! -x $$DIR/bin/moc -a -x /usr/bin/moc ]; then \ | ||
58 | echo "*"; \ | ||
59 | echo "* Unable to find $$DIR/bin/moc, using /usr/bin/moc instead."; \ | ||
60 | echo "*"; \ | ||
61 | echo "MOC=/usr/bin/moc" >> $@; \ | ||
62 | fi | ||
53 | endif | 63 | endif |
54 | 64 | ||
55 | $(obj)/zconf.tab.o: $(obj)/lex.zconf.c | 65 | $(obj)/zconf.tab.o: $(obj)/lex.zconf.c |
56 | 66 | ||
57 | $(obj)/kconfig_load.o: $(obj)/lkc_defs.h | 67 | $(obj)/kconfig_load.o: $(obj)/lkc_defs.h |
58 | 68 | ||
59 | $(obj)/qconf.o: $(obj)/qconf.moc $(obj)/lkc_defs.h | 69 | $(obj)/qconf.o: $(obj)/qconf.moc $(obj)/lkc_defs.h |
60 | 70 | ||
diff --git a/scripts/kconfig/conf.c b/scripts/kconfig/conf.c index 74c94c2..1602d5f 100644 --- a/scripts/kconfig/conf.c +++ b/scripts/kconfig/conf.c | |||
@@ -110,16 +110,17 @@ static void conf_askvalue(struct symbol *sym, const char *def) | |||
110 | } | 110 | } |
111 | if (!valid_stdin && input_mode == ask_silent) { | 111 | if (!valid_stdin && input_mode == ask_silent) { |
112 | printf("aborted!\n\n"); | 112 | printf("aborted!\n\n"); |
113 | printf("Console input/output is redirected. "); | 113 | printf("Console input/output is redirected. "); |
114 | printf("Run 'make oldconfig' to update configuration.\n\n"); | 114 | printf("Run 'make oldconfig' to update configuration.\n\n"); |
115 | exit(1); | 115 | exit(1); |
116 | } | 116 | } |
117 | case ask_all: | 117 | case ask_all: |
118 | fflush(stdout); | ||
118 | fgets(line, 128, stdin); | 119 | fgets(line, 128, stdin); |
119 | return; | 120 | return; |
120 | case set_default: | 121 | case set_default: |
121 | printf("%s\n", def); | 122 | printf("%s\n", def); |
122 | return; | 123 | return; |
123 | default: | 124 | default: |
124 | break; | 125 | break; |
125 | } | 126 | } |
@@ -337,39 +338,41 @@ static int conf_choice(struct menu *menu) | |||
337 | else { | 338 | else { |
338 | printf("\n"); | 339 | printf("\n"); |
339 | return 1; | 340 | return 1; |
340 | } | 341 | } |
341 | switch (input_mode) { | 342 | switch (input_mode) { |
342 | case ask_new: | 343 | case ask_new: |
343 | case ask_silent: | 344 | case ask_silent: |
344 | case ask_all: | 345 | case ask_all: |
346 | if (is_new) | ||
347 | sym->flags |= SYMBOL_NEW; | ||
345 | conf_askvalue(sym, menu_get_prompt(def_menu)); | 348 | conf_askvalue(sym, menu_get_prompt(def_menu)); |
346 | strip(line); | 349 | strip(line); |
347 | break; | 350 | break; |
348 | default: | 351 | default: |
349 | line[0] = 0; | 352 | line[0] = 0; |
350 | printf("\n"); | 353 | printf("\n"); |
351 | } | 354 | } |
352 | if (line[0] == '?' && !line[1]) { | 355 | if (line[0] == '?' && !line[1]) { |
353 | help = nohelp_text; | 356 | help = nohelp_text; |
354 | if (menu->sym->help) | 357 | if (menu->sym->help) |
355 | help = menu->sym->help; | 358 | help = menu->sym->help; |
356 | printf("\n%s\n", help); | 359 | printf("\n%s\n", help); |
357 | continue; | 360 | continue; |
358 | } | 361 | } |
359 | if (line[0]) { | 362 | if (line[0]) { |
360 | len = strlen(line) - 1; | 363 | len = strlen(line); |
361 | line[len] = 0; | 364 | line[len] = 0; |
362 | 365 | ||
363 | def_menu = NULL; | 366 | def_menu = NULL; |
364 | for (cmenu = menu->list; cmenu; cmenu = cmenu->next) { | 367 | for (cmenu = menu->list; cmenu; cmenu = cmenu->next) { |
365 | if (!cmenu->sym || !menu_is_visible(cmenu)) | 368 | if (!cmenu->sym || !menu_is_visible(cmenu)) |
366 | continue; | 369 | continue; |
367 | if (!strncmp(line, menu_get_prompt(cmenu), len)) { | 370 | if (!strncasecmp(line, menu_get_prompt(cmenu), len)) { |
368 | def_menu = cmenu; | 371 | def_menu = cmenu; |
369 | break; | 372 | break; |
370 | } | 373 | } |
371 | } | 374 | } |
372 | } | 375 | } |
373 | if (def_menu) { | 376 | if (def_menu) { |
374 | sym_set_choice_value(sym, def_menu->sym); | 377 | sym_set_choice_value(sym, def_menu->sym); |
375 | if (def_menu->list) { | 378 | if (def_menu->list) { |
diff --git a/scripts/kconfig/confdata.c b/scripts/kconfig/confdata.c index 0f5fd97..9bf7af9 100644 --- a/scripts/kconfig/confdata.c +++ b/scripts/kconfig/confdata.c | |||
@@ -1,25 +1,24 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (C) 2002 Roman Zippel <zippel@linux-m68k.org> | 2 | * Copyright (C) 2002 Roman Zippel <zippel@linux-m68k.org> |
3 | * Released under the terms of the GNU GPL v2.0. | 3 | * Released under the terms of the GNU GPL v2.0. |
4 | */ | 4 | */ |
5 | 5 | ||
6 | #include <sys/stat.h> | ||
6 | #include <ctype.h> | 7 | #include <ctype.h> |
7 | #include <limits.h> | ||
8 | #include <stdio.h> | 8 | #include <stdio.h> |
9 | #include <stdlib.h> | 9 | #include <stdlib.h> |
10 | #include <string.h> | 10 | #include <string.h> |
11 | #include <unistd.h> | 11 | #include <unistd.h> |
12 | 12 | ||
13 | #define LKC_DIRECT_LINK | 13 | #define LKC_DIRECT_LINK |
14 | #include "lkc.h" | 14 | #include "lkc.h" |
15 | 15 | ||
16 | const char conf_def_filename[] = ".config"; | 16 | const char conf_def_filename[] = ".config"; |
17 | char conf_filename[PATH_MAX+1]; | ||
18 | 17 | ||
19 | const char conf_defname[] = "arch/$ARCH/defconfig"; | 18 | const char conf_defname[] = "arch/$ARCH/defconfig"; |
20 | 19 | ||
21 | const char *conf_confnames[] = { | 20 | const char *conf_confnames[] = { |
22 | ".config", | 21 | ".config", |
23 | "/lib/modules/$UNAME_RELEASE/.config", | 22 | "/lib/modules/$UNAME_RELEASE/.config", |
24 | "/etc/kernel-config", | 23 | "/etc/kernel-config", |
25 | "/boot/config-$UNAME_RELEASE", | 24 | "/boot/config-$UNAME_RELEASE", |
@@ -50,79 +49,87 @@ static char *conf_expand_value(const char *in) | |||
50 | } | 49 | } |
51 | strcat(res_value, in); | 50 | strcat(res_value, in); |
52 | 51 | ||
53 | return res_value; | 52 | return res_value; |
54 | } | 53 | } |
55 | 54 | ||
56 | char *conf_get_default_confname(void) | 55 | char *conf_get_default_confname(void) |
57 | { | 56 | { |
58 | return conf_expand_value(conf_defname); | 57 | struct stat buf; |
58 | static char fullname[PATH_MAX+1]; | ||
59 | char *env, *name; | ||
60 | |||
61 | name = conf_expand_value(conf_defname); | ||
62 | env = getenv(SRCTREE); | ||
63 | if (env) { | ||
64 | sprintf(fullname, "%s/%s", env, name); | ||
65 | if (!stat(fullname, &buf)) | ||
66 | return fullname; | ||
67 | } | ||
68 | return name; | ||
59 | } | 69 | } |
60 | 70 | ||
61 | int conf_read(const char *name) | 71 | int conf_read(const char *name) |
62 | { | 72 | { |
63 | FILE *in = NULL; | 73 | FILE *in = NULL; |
64 | char line[128]; | 74 | char line[1024]; |
65 | char *p, *p2; | 75 | char *p, *p2; |
66 | int lineno = 0; | 76 | int lineno = 0; |
67 | struct symbol *sym; | 77 | struct symbol *sym; |
68 | struct property *prop; | 78 | struct property *prop; |
69 | struct expr *e; | 79 | struct expr *e; |
70 | int i; | 80 | int i; |
71 | 81 | ||
72 | if (name) { | 82 | if (name) { |
73 | in = fopen(name, "r"); | 83 | in = zconf_fopen(name); |
74 | if (in) | ||
75 | strcpy(conf_filename, name); | ||
76 | } else { | 84 | } else { |
77 | const char **names = conf_confnames; | 85 | const char **names = conf_confnames; |
78 | while ((name = *names++)) { | 86 | while ((name = *names++)) { |
79 | name = conf_expand_value(name); | 87 | name = conf_expand_value(name); |
80 | in = fopen(name, "r"); | 88 | in = zconf_fopen(name); |
81 | if (in) { | 89 | if (in) { |
82 | printf("#\n" | 90 | printf("#\n" |
83 | "# using defaults found in %s\n" | 91 | "# using defaults found in %s\n" |
84 | "#\n", name); | 92 | "#\n", name); |
85 | break; | 93 | break; |
86 | } | 94 | } |
87 | } | 95 | } |
88 | } | 96 | } |
89 | 97 | ||
90 | if (!in) | 98 | if (!in) |
91 | return 1; | 99 | return 1; |
92 | 100 | ||
93 | for_all_symbols(i, sym) { | 101 | for_all_symbols(i, sym) { |
94 | sym->flags |= SYMBOL_NEW; | 102 | sym->flags |= SYMBOL_NEW | SYMBOL_CHANGED; |
103 | sym->flags &= ~SYMBOL_VALID; | ||
95 | switch (sym->type) { | 104 | switch (sym->type) { |
96 | case S_INT: | 105 | case S_INT: |
97 | case S_HEX: | 106 | case S_HEX: |
98 | case S_STRING: | 107 | case S_STRING: |
99 | if (S_VAL(sym->def)) { | 108 | if (S_VAL(sym->def)) |
100 | free(S_VAL(sym->def)); | 109 | free(S_VAL(sym->def)); |
101 | S_VAL(sym->def) = NULL; | ||
102 | } | ||
103 | default: | 110 | default: |
104 | ; | 111 | S_VAL(sym->def) = NULL; |
112 | S_TRI(sym->def) = no; | ||
105 | } | 113 | } |
106 | } | 114 | } |
107 | 115 | ||
108 | while (fgets(line, 128, in)) { | 116 | while (fgets(line, sizeof(line), in)) { |
109 | lineno++; | 117 | lineno++; |
110 | switch (line[0]) { | 118 | switch (line[0]) { |
111 | case '#': | 119 | case '#': |
112 | if (memcmp(line + 2, "CONFIG_", 7)) | 120 | if (memcmp(line + 2, "CONFIG_", 7)) |
113 | continue; | 121 | continue; |
114 | p = strchr(line + 9, ' '); | 122 | p = strchr(line + 9, ' '); |
115 | if (!p) | 123 | if (!p) |
116 | continue; | 124 | continue; |
117 | *p++ = 0; | 125 | *p++ = 0; |
118 | if (strncmp(p, "is not set", 10)) | 126 | if (strncmp(p, "is not set", 10)) |
119 | continue; | 127 | continue; |
120 | //printf("%s -> n\n", line + 9); | ||
121 | sym = sym_lookup(line + 9, 0); | 128 | sym = sym_lookup(line + 9, 0); |
122 | switch (sym->type) { | 129 | switch (sym->type) { |
123 | case S_BOOLEAN: | 130 | case S_BOOLEAN: |
124 | case S_TRISTATE: | 131 | case S_TRISTATE: |
125 | sym->def = symbol_no.curr; | 132 | sym->def = symbol_no.curr; |
126 | sym->flags &= ~SYMBOL_NEW; | 133 | sym->flags &= ~SYMBOL_NEW; |
127 | break; | 134 | break; |
128 | default: | 135 | default: |
@@ -134,51 +141,63 @@ int conf_read(const char *name) | |||
134 | continue; | 141 | continue; |
135 | p = strchr(line + 7, '='); | 142 | p = strchr(line + 7, '='); |
136 | if (!p) | 143 | if (!p) |
137 | continue; | 144 | continue; |
138 | *p++ = 0; | 145 | *p++ = 0; |
139 | p2 = strchr(p, '\n'); | 146 | p2 = strchr(p, '\n'); |
140 | if (p2) | 147 | if (p2) |
141 | *p2 = 0; | 148 | *p2 = 0; |
142 | //printf("%s -> %s\n", line + 7, p); | ||
143 | sym = sym_find(line + 7); | 149 | sym = sym_find(line + 7); |
144 | if (!sym) { | 150 | if (!sym) { |
145 | fprintf(stderr, "%s:%d: trying to assign nonexistent symbol %s\n", name, lineno, line + 7); | 151 | fprintf(stderr, "%s:%d: trying to assign nonexistent symbol %s\n", name, lineno, line + 7); |
146 | break; | 152 | break; |
147 | } | 153 | } |
148 | switch (sym->type) { | 154 | switch (sym->type) { |
149 | case S_BOOLEAN: | ||
150 | sym->def = symbol_yes.curr; | ||
151 | sym->flags &= ~SYMBOL_NEW; | ||
152 | break; | ||
153 | case S_TRISTATE: | 155 | case S_TRISTATE: |
154 | if (p[0] == 'm') | 156 | if (p[0] == 'm') { |
155 | sym->def = symbol_mod.curr; | 157 | S_TRI(sym->def) = mod; |
156 | else | 158 | sym->flags &= ~SYMBOL_NEW; |
157 | sym->def = symbol_yes.curr; | 159 | break; |
158 | sym->flags &= ~SYMBOL_NEW; | 160 | } |
161 | case S_BOOLEAN: | ||
162 | if (p[0] == 'y') { | ||
163 | S_TRI(sym->def) = yes; | ||
164 | sym->flags &= ~SYMBOL_NEW; | ||
165 | break; | ||
166 | } | ||
167 | if (p[0] == 'n') { | ||
168 | S_TRI(sym->def) = no; | ||
169 | sym->flags &= ~SYMBOL_NEW; | ||
170 | break; | ||
171 | } | ||
159 | break; | 172 | break; |
160 | case S_STRING: | 173 | case S_STRING: |
161 | if (*p++ != '"') | 174 | if (*p++ != '"') |
162 | break; | 175 | break; |
163 | for (p2 = p; (p2 = strpbrk(p2, "\"\\")); p2++) { | 176 | for (p2 = p; (p2 = strpbrk(p2, "\"\\")); p2++) { |
164 | if (*p2 == '"') { | 177 | if (*p2 == '"') { |
165 | *p2 = 0; | 178 | *p2 = 0; |
166 | break; | 179 | break; |
167 | } | 180 | } |
168 | memmove(p2, p2 + 1, strlen(p2)); | 181 | memmove(p2, p2 + 1, strlen(p2)); |
169 | } | 182 | } |
183 | if (!p2) { | ||
184 | fprintf(stderr, "%s:%d: invalid string found\n", name, lineno); | ||
185 | exit(1); | ||
186 | } | ||
170 | case S_INT: | 187 | case S_INT: |
171 | case S_HEX: | 188 | case S_HEX: |
172 | if (sym_string_valid(sym, p)) { | 189 | if (sym_string_valid(sym, p)) { |
173 | S_VAL(sym->def) = strdup(p); | 190 | S_VAL(sym->def) = strdup(p); |
174 | sym->flags &= ~SYMBOL_NEW; | 191 | sym->flags &= ~SYMBOL_NEW; |
175 | } else | 192 | } else { |
176 | fprintf(stderr, "%s:%d:symbol value '%s' invalid for %s\n", name, lineno, p, sym->name); | 193 | fprintf(stderr, "%s:%d: symbol value '%s' invalid for %s\n", name, lineno, p, sym->name); |
194 | exit(1); | ||
195 | } | ||
177 | break; | 196 | break; |
178 | default: | 197 | default: |
179 | ; | 198 | ; |
180 | } | 199 | } |
181 | if (sym_is_choice_value(sym)) { | 200 | if (sym_is_choice_value(sym)) { |
182 | prop = sym_get_choice_prop(sym); | 201 | prop = sym_get_choice_prop(sym); |
183 | switch (S_TRI(sym->def)) { | 202 | switch (S_TRI(sym->def)) { |
184 | case mod: | 203 | case mod: |
@@ -347,14 +366,13 @@ int conf_write(const char *name) | |||
347 | file_write_dep(NULL); | 366 | file_write_dep(NULL); |
348 | } else | 367 | } else |
349 | unlink(".tmpconfig.h"); | 368 | unlink(".tmpconfig.h"); |
350 | 369 | ||
351 | sprintf(oldname, "%s.old", name); | 370 | sprintf(oldname, "%s.old", name); |
352 | rename(name, oldname); | 371 | rename(name, oldname); |
353 | if (rename(".tmpconfig", name)) | 372 | if (rename(".tmpconfig", name)) |
354 | return 1; | 373 | return 1; |
355 | strcpy(conf_filename, name); | ||
356 | 374 | ||
357 | sym_change_count = 0; | 375 | sym_change_count = 0; |
358 | 376 | ||
359 | return 0; | 377 | return 0; |
360 | } | 378 | } |
diff --git a/scripts/kconfig/expr.h b/scripts/kconfig/expr.h index fd9c32a..896a296 100644 --- a/scripts/kconfig/expr.h +++ b/scripts/kconfig/expr.h | |||
@@ -161,22 +161,25 @@ struct property { | |||
161 | 161 | ||
162 | struct menu { | 162 | struct menu { |
163 | struct menu *next; | 163 | struct menu *next; |
164 | struct menu *parent; | 164 | struct menu *parent; |
165 | struct menu *list; | 165 | struct menu *list; |
166 | struct symbol *sym; | 166 | struct symbol *sym; |
167 | struct property *prompt; | 167 | struct property *prompt; |
168 | struct expr *dep; | 168 | struct expr *dep; |
169 | unsigned int flags; | ||
169 | //char *help; | 170 | //char *help; |
170 | struct file *file; | 171 | struct file *file; |
171 | int lineno; | 172 | int lineno; |
172 | //void *data; | 173 | void *data; |
173 | }; | 174 | }; |
174 | 175 | ||
176 | #define MENU_CHANGED 0x0001 | ||
177 | |||
175 | #ifndef SWIG | 178 | #ifndef SWIG |
176 | 179 | ||
177 | extern struct file *file_list; | 180 | extern struct file *file_list; |
178 | extern struct file *current_file; | 181 | extern struct file *current_file; |
179 | struct file *lookup_file(const char *name); | 182 | struct file *lookup_file(const char *name); |
180 | 183 | ||
181 | extern struct symbol symbol_yes, symbol_no, symbol_mod; | 184 | extern struct symbol symbol_yes, symbol_no, symbol_mod; |
182 | extern struct symbol *modules_sym; | 185 | extern struct symbol *modules_sym; |
diff --git a/scripts/kconfig/kconfig.i b/scripts/kconfig/kconfig.i index 699cb13..77405fc 100644 --- a/scripts/kconfig/kconfig.i +++ b/scripts/kconfig/kconfig.i | |||
@@ -26,16 +26,21 @@ | |||
26 | %{ | 26 | %{ |
27 | static void expr_to_s_help(void *data, const char *str) | 27 | static void expr_to_s_help(void *data, const char *str) |
28 | { | 28 | { |
29 | rb_str_cat((VALUE)data, str, strlen(str)); | 29 | rb_str_cat((VALUE)data, str, strlen(str)); |
30 | } | 30 | } |
31 | %} | 31 | %} |
32 | #endif | 32 | #endif |
33 | 33 | ||
34 | #ifdef SWIGPYTHON | ||
35 | %rename (Property) property; | ||
36 | %rename (default) def; | ||
37 | #endif | ||
38 | |||
34 | %immutable; | 39 | %immutable; |
35 | %include "expr.h" | 40 | %include "expr.h" |
36 | #define P(name,type,arg) extern type name arg | 41 | #define P(name,type,arg) extern type name arg |
37 | %include "lkc_proto.h" | 42 | %include "lkc_proto.h" |
38 | %mutable; | 43 | %mutable; |
39 | 44 | ||
40 | #ifdef SWIGRUBY | 45 | #ifdef SWIGRUBY |
41 | %predicate menu::isVisible; | 46 | %predicate menu::isVisible; |
diff --git a/scripts/kconfig/lkc.h b/scripts/kconfig/lkc.h index 688945b..cdd04a9 100644 --- a/scripts/kconfig/lkc.h +++ b/scripts/kconfig/lkc.h | |||
@@ -16,22 +16,24 @@ extern "C" { | |||
16 | #define P(name,type,arg)extern type name arg | 16 | #define P(name,type,arg)extern type name arg |
17 | #else | 17 | #else |
18 | #include "lkc_defs.h" | 18 | #include "lkc_defs.h" |
19 | #define P(name,type,arg)extern type (*name ## _p) arg | 19 | #define P(name,type,arg)extern type (*name ## _p) arg |
20 | #endif | 20 | #endif |
21 | #include "lkc_proto.h" | 21 | #include "lkc_proto.h" |
22 | #undef P | 22 | #undef P |
23 | 23 | ||
24 | void symbol_end(char *help); | 24 | #define SRCTREE "srctree" |
25 | |||
25 | int zconfparse(void); | 26 | int zconfparse(void); |
26 | void zconfdump(FILE *out); | 27 | void zconfdump(FILE *out); |
27 | 28 | ||
28 | extern int zconfdebug; | 29 | extern int zconfdebug; |
29 | void zconf_starthelp(void); | 30 | void zconf_starthelp(void); |
31 | FILE *zconf_fopen(const char *name); | ||
30 | void zconf_initscan(const char *name); | 32 | void zconf_initscan(const char *name); |
31 | void zconf_nextfile(const char *name); | 33 | void zconf_nextfile(const char *name); |
32 | int zconf_lineno(void); | 34 | int zconf_lineno(void); |
33 | char *zconf_curname(void); | 35 | char *zconf_curname(void); |
34 | 36 | ||
35 | /* confdata.c */ | 37 | /* confdata.c */ |
36 | extern const char conf_def_filename[]; | 38 | extern const char conf_def_filename[]; |
37 | extern char conf_filename[]; | 39 | extern char conf_filename[]; |
@@ -56,16 +58,17 @@ struct file *file_lookup(const char *name); | |||
56 | int file_write_dep(const char *name); | 58 | int file_write_dep(const char *name); |
57 | 59 | ||
58 | extern struct menu *current_entry; | 60 | extern struct menu *current_entry; |
59 | extern struct menu *current_menu; | 61 | extern struct menu *current_menu; |
60 | 62 | ||
61 | /* symbol.c */ | 63 | /* symbol.c */ |
62 | void sym_init(void); | 64 | void sym_init(void); |
63 | void sym_clear_all_valid(void); | 65 | void sym_clear_all_valid(void); |
66 | void sym_set_changed(struct symbol *sym); | ||
64 | 67 | ||
65 | static inline tristate sym_get_tristate_value(struct symbol *sym) | 68 | static inline tristate sym_get_tristate_value(struct symbol *sym) |
66 | { | 69 | { |
67 | return S_TRI(sym->curr); | 70 | return S_TRI(sym->curr); |
68 | } | 71 | } |
69 | 72 | ||
70 | 73 | ||
71 | static inline struct symbol *sym_get_choice_value(struct symbol *sym) | 74 | static inline struct symbol *sym_get_choice_value(struct symbol *sym) |
diff --git a/scripts/kconfig/mconf.c b/scripts/kconfig/mconf.c index dec8603..eba5ff7 100644 --- a/scripts/kconfig/mconf.c +++ b/scripts/kconfig/mconf.c | |||
@@ -1,22 +1,27 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (C) 2002 Roman Zippel <zippel@linux-m68k.org> | 2 | * Copyright (C) 2002 Roman Zippel <zippel@linux-m68k.org> |
3 | * Released under the terms of the GNU GPL v2.0. | 3 | * Released under the terms of the GNU GPL v2.0. |
4 | * | ||
5 | * Introduced single menu mode (show all sub-menus in one large tree). | ||
6 | * 2002-11-06 Petr Baudis <pasky@ucw.cz> | ||
4 | */ | 7 | */ |
5 | 8 | ||
6 | #include <sys/ioctl.h> | 9 | #include <sys/ioctl.h> |
7 | #include <sys/wait.h> | 10 | #include <sys/wait.h> |
8 | #include <ctype.h> | 11 | #include <ctype.h> |
9 | #include <errno.h> | 12 | #include <errno.h> |
10 | #include <fcntl.h> | 13 | #include <fcntl.h> |
14 | #include <limits.h> | ||
11 | #include <signal.h> | 15 | #include <signal.h> |
12 | #include <stdarg.h> | 16 | #include <stdarg.h> |
13 | #include <stdlib.h> | 17 | #include <stdlib.h> |
14 | #include <string.h> | 18 | #include <string.h> |
19 | #include <termios.h> | ||
15 | #include <unistd.h> | 20 | #include <unistd.h> |
16 | 21 | ||
17 | #define LKC_DIRECT_LINK | 22 | #define LKC_DIRECT_LINK |
18 | #include "lkc.h" | 23 | #include "lkc.h" |
19 | 24 | ||
20 | static char menu_backtitle[128]; | 25 | static char menu_backtitle[128]; |
21 | static const char menu_instructions[] = | 26 | static const char menu_instructions[] = |
22 | "Arrow keys navigate the menu. " | 27 | "Arrow keys navigate the menu. " |
@@ -39,56 +44,59 @@ inputbox_instructions_hex[] = | |||
39 | "Use the <TAB> key to move from the input field to the buttons below it.", | 44 | "Use the <TAB> key to move from the input field to the buttons below it.", |
40 | inputbox_instructions_string[] = | 45 | inputbox_instructions_string[] = |
41 | "Please enter a string value. " | 46 | "Please enter a string value. " |
42 | "Use the <TAB> key to move from the input field to the buttons below it.", | 47 | "Use the <TAB> key to move from the input field to the buttons below it.", |
43 | setmod_text[] = | 48 | setmod_text[] = |
44 | "This feature depends on another which has been configured as a module.\n" | 49 | "This feature depends on another which has been configured as a module.\n" |
45 | "As a result, this feature will be built as a module.", | 50 | "As a result, this feature will be built as a module.", |
46 | nohelp_text[] = | 51 | nohelp_text[] = |
47 | "There is no help available for this option.\n", | 52 | "There is no help available for this kernel option.\n", |
48 | load_config_text[] = | 53 | load_config_text[] = |
49 | "Enter the name of the configuration file you wish to load. " | 54 | "Enter the name of the configuration file you wish to load. " |
50 | "Accept the name shown to restore the configuration you " | 55 | "Accept the name shown to restore the configuration you " |
51 | "last retrieved. Leave blank to abort.", | 56 | "last retrieved. Leave blank to abort.", |
52 | load_config_help[] = | 57 | load_config_help[] = |
53 | "\n" | 58 | "\n" |
54 | "For various reasons, one may wish to keep several different\n" | 59 | "For various reasons, one may wish to keep several different kernel\n" |
55 | "configurations available on a single machine.\n" | 60 | "configurations available on a single machine.\n" |
56 | "\n" | 61 | "\n" |
57 | "If you have saved a previous configuration in a file other than the\n" | 62 | "If you have saved a previous configuration in a file other than the\n" |
58 | "default, entering the name of the file here will allow you\n" | 63 | "kernel's default, entering the name of the file here will allow you\n" |
59 | "to modify that configuration.\n" | 64 | "to modify that configuration.\n" |
60 | "\n" | 65 | "\n" |
61 | "If you are uncertain, then you have probably never used alternate\n" | 66 | "If you are uncertain, then you have probably never used alternate\n" |
62 | "configuration files. You should therefor leave this blank to abort.\n", | 67 | "configuration files. You should therefor leave this blank to abort.\n", |
63 | save_config_text[] = | 68 | save_config_text[] = |
64 | "Enter a filename to which this configuration should be saved " | 69 | "Enter a filename to which this configuration should be saved " |
65 | "as an alternate. Leave blank to abort.", | 70 | "as an alternate. Leave blank to abort.", |
66 | save_config_help[] = | 71 | save_config_help[] = |
67 | "\n" | 72 | "\n" |
68 | "For various reasons, one may wish to keep different\n" | 73 | "For various reasons, one may wish to keep different kernel\n" |
69 | "configurations available on a single machine.\n" | 74 | "configurations available on a single machine.\n" |
70 | "\n" | 75 | "\n" |
71 | "Entering a file name here will allow you to later retrieve, modify\n" | 76 | "Entering a file name here will allow you to later retrieve, modify\n" |
72 | "and use the current configuration as an alternate to whatever\n" | 77 | "and use the current configuration as an alternate to whatever\n" |
73 | "configuration options you have selected at that time.\n" | 78 | "configuration options you have selected at that time.\n" |
74 | "\n" | 79 | "\n" |
75 | "If you are uncertain what all this means then you should probably\n" | 80 | "If you are uncertain what all this means then you should probably\n" |
76 | "leave this blank.\n" | 81 | "leave this blank.\n" |
77 | ; | 82 | ; |
78 | 83 | ||
79 | static char buf[4096], *bufptr = buf; | 84 | static char buf[4096], *bufptr = buf; |
80 | static char input_buf[4096]; | 85 | static char input_buf[4096]; |
86 | static char filename[PATH_MAX+1] = ".config"; | ||
81 | static char *args[1024], **argptr = args; | 87 | static char *args[1024], **argptr = args; |
82 | static int indent = 0; | 88 | static int indent = 0; |
89 | static struct termios ios_org; | ||
83 | static int rows, cols; | 90 | static int rows, cols; |
84 | static struct menu *current_menu; | 91 | static struct menu *current_menu; |
85 | static int child_count; | 92 | static int child_count; |
86 | static int do_resize; | 93 | static int do_resize; |
94 | static int single_menu_mode; | ||
87 | 95 | ||
88 | static void conf(struct menu *menu); | 96 | static void conf(struct menu *menu); |
89 | static void conf_choice(struct menu *menu); | 97 | static void conf_choice(struct menu *menu); |
90 | static void conf_string(struct menu *menu); | 98 | static void conf_string(struct menu *menu); |
91 | static void conf_load(void); | 99 | static void conf_load(void); |
92 | static void conf_save(void); | 100 | static void conf_save(void); |
93 | static void show_textbox(const char *title, const char *text, int r, int c); | 101 | static void show_textbox(const char *title, const char *text, int r, int c); |
94 | static void show_helptext(const char *title, const char *text); | 102 | static void show_helptext(const char *title, const char *text); |
@@ -98,23 +106,38 @@ static void show_readme(void); | |||
98 | static void cprint_init(void); | 106 | static void cprint_init(void); |
99 | static int cprint1(const char *fmt, ...); | 107 | static int cprint1(const char *fmt, ...); |
100 | static void cprint_done(void); | 108 | static void cprint_done(void); |
101 | static int cprint(const char *fmt, ...); | 109 | static int cprint(const char *fmt, ...); |
102 | 110 | ||
103 | static void init_wsize(void) | 111 | static void init_wsize(void) |
104 | { | 112 | { |
105 | struct winsize ws; | 113 | struct winsize ws; |
114 | char *env; | ||
106 | 115 | ||
107 | if (ioctl(1, TIOCGWINSZ, &ws) == -1) { | 116 | if (ioctl(1, TIOCGWINSZ, &ws) == -1) { |
108 | rows = 24; | 117 | rows = 24; |
109 | cols = 80; | 118 | cols = 80; |
110 | } else { | 119 | } else { |
111 | rows = ws.ws_row; | 120 | rows = ws.ws_row; |
112 | cols = ws.ws_col; | 121 | cols = ws.ws_col; |
122 | if (!rows) { | ||
123 | env = getenv("LINES"); | ||
124 | if (env) | ||
125 | rows = atoi(env); | ||
126 | if (!rows) | ||
127 | rows = 24; | ||
128 | } | ||
129 | if (!cols) { | ||
130 | env = getenv("COLUMNS"); | ||
131 | if (env) | ||
132 | cols = atoi(env); | ||
133 | if (!cols) | ||
134 | cols = 80; | ||
135 | } | ||
113 | } | 136 | } |
114 | 137 | ||
115 | if (rows < 19 || cols < 80) { | 138 | if (rows < 19 || cols < 80) { |
116 | fprintf(stderr, "Your display is too small to run Menuconfig!\n"); | 139 | fprintf(stderr, "Your display is too small to run Menuconfig!\n"); |
117 | fprintf(stderr, "It must be at least 19 lines by 80 columns.\n"); | 140 | fprintf(stderr, "It must be at least 19 lines by 80 columns.\n"); |
118 | exit(1); | 141 | exit(1); |
119 | } | 142 | } |
120 | 143 | ||
@@ -269,20 +292,30 @@ static void build_conf(struct menu *menu) | |||
269 | prop = menu->prompt; | 292 | prop = menu->prompt; |
270 | if (!sym) { | 293 | if (!sym) { |
271 | if (prop && menu != current_menu) { | 294 | if (prop && menu != current_menu) { |
272 | const char *prompt = menu_get_prompt(menu); | 295 | const char *prompt = menu_get_prompt(menu); |
273 | switch (prop->type) { | 296 | switch (prop->type) { |
274 | case P_MENU: | 297 | case P_MENU: |
275 | child_count++; | 298 | child_count++; |
276 | cprint("m%p", menu); | 299 | cprint("m%p", menu); |
277 | if (menu->parent != &rootmenu) | 300 | |
278 | cprint1(" %*c", indent + 1, ' '); | 301 | if (single_menu_mode) { |
279 | cprint1("%s --->", prompt); | 302 | cprint1("%s%*c%s", |
303 | menu->data ? "-->" : "++>", | ||
304 | indent + 1, ' ', prompt); | ||
305 | } else { | ||
306 | if (menu->parent != &rootmenu) | ||
307 | cprint1(" %*c", indent + 1, ' '); | ||
308 | cprint1("%s --->", prompt); | ||
309 | } | ||
310 | |||
280 | cprint_done(); | 311 | cprint_done(); |
312 | if (single_menu_mode && menu->data) | ||
313 | goto conf_childs; | ||
281 | return; | 314 | return; |
282 | default: | 315 | default: |
283 | if (prompt) { | 316 | if (prompt) { |
284 | child_count++; | 317 | child_count++; |
285 | cprint(":%p", menu); | 318 | cprint(":%p", menu); |
286 | cprint("---%*c%s", indent + 1, ' ', prompt); | 319 | cprint("---%*c%s", indent + 1, ' ', prompt); |
287 | } | 320 | } |
288 | } | 321 | } |
@@ -387,16 +420,17 @@ conf_childs: | |||
387 | static void conf(struct menu *menu) | 420 | static void conf(struct menu *menu) |
388 | { | 421 | { |
389 | struct menu *submenu; | 422 | struct menu *submenu; |
390 | const char *prompt = menu_get_prompt(menu); | 423 | const char *prompt = menu_get_prompt(menu); |
391 | struct symbol *sym; | 424 | struct symbol *sym; |
392 | char active_entry[40]; | 425 | char active_entry[40]; |
393 | int stat, type, i; | 426 | int stat, type, i; |
394 | 427 | ||
428 | unlink("lxdialog.scrltmp"); | ||
395 | active_entry[0] = 0; | 429 | active_entry[0] = 0; |
396 | while (1) { | 430 | while (1) { |
397 | cprint_init(); | 431 | cprint_init(); |
398 | cprint("--title"); | 432 | cprint("--title"); |
399 | cprint("%s", prompt ? prompt : "Main Menu"); | 433 | cprint("%s", prompt ? prompt : "Main Menu"); |
400 | cprint("--menu"); | 434 | cprint("--menu"); |
401 | cprint(menu_instructions); | 435 | cprint(menu_instructions); |
402 | cprint("%d", rows); | 436 | cprint("%d", rows); |
@@ -437,17 +471,20 @@ static void conf(struct menu *menu) | |||
437 | submenu = NULL; | 471 | submenu = NULL; |
438 | if (sscanf(input_buf + 1, "%p", &submenu) == 1) | 472 | if (sscanf(input_buf + 1, "%p", &submenu) == 1) |
439 | sym = submenu->sym; | 473 | sym = submenu->sym; |
440 | 474 | ||
441 | switch (stat) { | 475 | switch (stat) { |
442 | case 0: | 476 | case 0: |
443 | switch (type) { | 477 | switch (type) { |
444 | case 'm': | 478 | case 'm': |
445 | conf(submenu); | 479 | if (single_menu_mode) |
480 | submenu->data = (void *) !submenu->data; | ||
481 | else | ||
482 | conf(submenu); | ||
446 | break; | 483 | break; |
447 | case 't': | 484 | case 't': |
448 | if (sym_is_choice(sym) && sym_get_tristate_value(sym) == yes) | 485 | if (sym_is_choice(sym) && sym_get_tristate_value(sym) == yes) |
449 | conf_choice(submenu); | 486 | conf_choice(submenu); |
450 | break; | 487 | break; |
451 | case 's': | 488 | case 's': |
452 | conf_string(submenu); | 489 | conf_string(submenu); |
453 | break; | 490 | break; |
@@ -479,16 +516,18 @@ static void conf(struct menu *menu) | |||
479 | break; | 516 | break; |
480 | case 5: | 517 | case 5: |
481 | if (type == 't') | 518 | if (type == 't') |
482 | sym_set_tristate_value(sym, mod); | 519 | sym_set_tristate_value(sym, mod); |
483 | break; | 520 | break; |
484 | case 6: | 521 | case 6: |
485 | if (type == 't') | 522 | if (type == 't') |
486 | sym_toggle_tristate_value(sym); | 523 | sym_toggle_tristate_value(sym); |
524 | else if (type == 'm') | ||
525 | conf(submenu); | ||
487 | break; | 526 | break; |
488 | } | 527 | } |
489 | } | 528 | } |
490 | } | 529 | } |
491 | 530 | ||
492 | static void show_textbox(const char *title, const char *text, int r, int c) | 531 | static void show_textbox(const char *title, const char *text, int r, int c) |
493 | { | 532 | { |
494 | int fd; | 533 | int fd; |
@@ -513,21 +552,29 @@ static void show_textbox(const char *title, const char *text, int r, int c) | |||
513 | static void show_helptext(const char *title, const char *text) | 552 | static void show_helptext(const char *title, const char *text) |
514 | { | 553 | { |
515 | show_textbox(title, text, rows, cols); | 554 | show_textbox(title, text, rows, cols); |
516 | } | 555 | } |
517 | 556 | ||
518 | static void show_help(struct menu *menu) | 557 | static void show_help(struct menu *menu) |
519 | { | 558 | { |
520 | const char *help; | 559 | const char *help; |
560 | char *helptext; | ||
561 | struct symbol *sym = menu->sym; | ||
521 | 562 | ||
522 | help = menu->sym->help; | 563 | help = sym->help; |
523 | if (!help) | 564 | if (!help) |
524 | help = nohelp_text; | 565 | help = nohelp_text; |
525 | show_helptext(menu_get_prompt(menu), help); | 566 | if (sym->name) { |
567 | helptext = malloc(strlen(sym->name) + strlen(help) + 16); | ||
568 | sprintf(helptext, "CONFIG_%s:\n\n%s", sym->name, help); | ||
569 | show_helptext(menu_get_prompt(menu), helptext); | ||
570 | free(helptext); | ||
571 | } else | ||
572 | show_helptext(menu_get_prompt(menu), help); | ||
526 | } | 573 | } |
527 | 574 | ||
528 | static void show_readme(void) | 575 | static void show_readme(void) |
529 | { | 576 | { |
530 | do { | 577 | do { |
531 | cprint_init(); | 578 | cprint_init(); |
532 | cprint("--textbox"); | 579 | cprint("--textbox"); |
533 | cprint("scripts/README.Menuconfig"); | 580 | cprint("scripts/README.Menuconfig"); |
@@ -626,17 +673,17 @@ static void conf_load(void) | |||
626 | int stat; | 673 | int stat; |
627 | 674 | ||
628 | while (1) { | 675 | while (1) { |
629 | cprint_init(); | 676 | cprint_init(); |
630 | cprint("--inputbox"); | 677 | cprint("--inputbox"); |
631 | cprint(load_config_text); | 678 | cprint(load_config_text); |
632 | cprint("11"); | 679 | cprint("11"); |
633 | cprint("55"); | 680 | cprint("55"); |
634 | cprint("%s", conf_filename); | 681 | cprint("%s", filename); |
635 | stat = exec_conf(); | 682 | stat = exec_conf(); |
636 | switch(stat) { | 683 | switch(stat) { |
637 | case 0: | 684 | case 0: |
638 | if (!input_buf[0]) | 685 | if (!input_buf[0]) |
639 | return; | 686 | return; |
640 | if (!conf_read(input_buf)) | 687 | if (!conf_read(input_buf)) |
641 | return; | 688 | return; |
642 | show_textbox(NULL, "File does not exist!", 5, 38); | 689 | show_textbox(NULL, "File does not exist!", 5, 38); |
@@ -655,17 +702,17 @@ static void conf_save(void) | |||
655 | int stat; | 702 | int stat; |
656 | 703 | ||
657 | while (1) { | 704 | while (1) { |
658 | cprint_init(); | 705 | cprint_init(); |
659 | cprint("--inputbox"); | 706 | cprint("--inputbox"); |
660 | cprint(save_config_text); | 707 | cprint(save_config_text); |
661 | cprint("11"); | 708 | cprint("11"); |
662 | cprint("55"); | 709 | cprint("55"); |
663 | cprint("%s", conf_filename); | 710 | cprint("%s", filename); |
664 | stat = exec_conf(); | 711 | stat = exec_conf(); |
665 | switch(stat) { | 712 | switch(stat) { |
666 | case 0: | 713 | case 0: |
667 | if (!input_buf[0]) | 714 | if (!input_buf[0]) |
668 | return; | 715 | return; |
669 | if (!conf_write(input_buf)) | 716 | if (!conf_write(input_buf)) |
670 | return; | 717 | return; |
671 | show_textbox(NULL, "Can't create file! Probably a nonexistent directory.", 5, 60); | 718 | show_textbox(NULL, "Can't create file! Probably a nonexistent directory.", 5, 60); |
@@ -674,38 +721,60 @@ static void conf_save(void) | |||
674 | show_helptext("Save Alternate Configuration", save_config_help); | 721 | show_helptext("Save Alternate Configuration", save_config_help); |
675 | break; | 722 | break; |
676 | case 255: | 723 | case 255: |
677 | return; | 724 | return; |
678 | } | 725 | } |
679 | } | 726 | } |
680 | } | 727 | } |
681 | 728 | ||
729 | static void conf_cleanup(void) | ||
730 | { | ||
731 | tcsetattr(1, TCSAFLUSH, &ios_org); | ||
732 | unlink(".help.tmp"); | ||
733 | unlink("lxdialog.scrltmp"); | ||
734 | } | ||
735 | |||
682 | int main(int ac, char **av) | 736 | int main(int ac, char **av) |
683 | { | 737 | { |
738 | struct symbol *sym; | ||
739 | char *mode; | ||
684 | int stat; | 740 | int stat; |
741 | |||
685 | conf_parse(av[1]); | 742 | conf_parse(av[1]); |
686 | conf_read(NULL); | 743 | conf_read(NULL); |
687 | 744 | ||
688 | sprintf(menu_backtitle, "Configuration"); | 745 | sym = sym_lookup("KERNELRELEASE", 0); |
746 | sym_calc_value(sym); | ||
747 | sprintf(menu_backtitle, "Linux Kernel v%s Configuration", | ||
748 | sym_get_string_value(sym)); | ||
749 | |||
750 | mode = getenv("MENUCONFIG_MODE"); | ||
751 | if (mode) { | ||
752 | if (!strcasecmp(mode, "single_menu")) | ||
753 | single_menu_mode = 1; | ||
754 | } | ||
689 | 755 | ||
756 | tcgetattr(1, &ios_org); | ||
757 | atexit(conf_cleanup); | ||
690 | init_wsize(); | 758 | init_wsize(); |
691 | conf(&rootmenu); | 759 | conf(&rootmenu); |
692 | 760 | ||
693 | do { | 761 | do { |
694 | cprint_init(); | 762 | cprint_init(); |
695 | cprint("--yesno"); | 763 | cprint("--yesno"); |
696 | cprint("Do you wish to save your new configuration?"); | 764 | cprint("Do you wish to save your new configuration?"); |
697 | cprint("5"); | 765 | cprint("5"); |
698 | cprint("60"); | 766 | cprint("60"); |
699 | stat = exec_conf(); | 767 | stat = exec_conf(); |
700 | } while (stat < 0); | 768 | } while (stat < 0); |
701 | 769 | ||
702 | if (stat == 0) { | 770 | if (stat == 0) { |
703 | conf_write(NULL); | 771 | conf_write(NULL); |
704 | printf("\n\n" | 772 | printf("\n\n" |
705 | "*** End of configuration.\n" | 773 | "*** End of Linux kernel configuration.\n" |
706 | "*** Check the top-level Makefile for additional configuration.\n"); | 774 | "*** Check the top-level Makefile for additional configuration.\n" |
775 | "*** Next, you may run 'make bzImage', 'make bzdisk', or 'make install'.\n\n"); | ||
707 | } else | 776 | } else |
708 | printf("\n\nYour configuration changes were NOT saved.\n\n"); | 777 | printf("\n\nYour kernel configuration changes were NOT saved.\n\n"); |
709 | 778 | ||
710 | return 0; | 779 | return 0; |
711 | } | 780 | } |
diff --git a/scripts/kconfig/menu.c b/scripts/kconfig/menu.c index 4595110..24be0ec 100644 --- a/scripts/kconfig/menu.c +++ b/scripts/kconfig/menu.c | |||
@@ -285,17 +285,17 @@ struct file *file_lookup(const char *name) | |||
285 | } | 285 | } |
286 | 286 | ||
287 | int file_write_dep(const char *name) | 287 | int file_write_dep(const char *name) |
288 | { | 288 | { |
289 | struct file *file; | 289 | struct file *file; |
290 | FILE *out; | 290 | FILE *out; |
291 | 291 | ||
292 | if (!name) | 292 | if (!name) |
293 | name = "..config.cmd"; | 293 | name = ".config.cmd"; |
294 | out = fopen("..config.tmp", "w"); | 294 | out = fopen("..config.tmp", "w"); |
295 | if (!out) | 295 | if (!out) |
296 | return 1; | 296 | return 1; |
297 | fprintf(out, "deps_config := \\\n"); | 297 | fprintf(out, "deps_config := \\\n"); |
298 | for (file = file_list; file; file = file->next) { | 298 | for (file = file_list; file; file = file->next) { |
299 | if (file->next) | 299 | if (file->next) |
300 | fprintf(out, "\t%s \\\n", file->name); | 300 | fprintf(out, "\t%s \\\n", file->name); |
301 | else | 301 | else |
diff --git a/scripts/kconfig/qconf.cc b/scripts/kconfig/qconf.cc index feefa1c..bed541d 100644 --- a/scripts/kconfig/qconf.cc +++ b/scripts/kconfig/qconf.cc | |||
@@ -12,25 +12,32 @@ | |||
12 | #include <qtextview.h> | 12 | #include <qtextview.h> |
13 | #include <qlineedit.h> | 13 | #include <qlineedit.h> |
14 | #include <qmenubar.h> | 14 | #include <qmenubar.h> |
15 | #include <qmessagebox.h> | 15 | #include <qmessagebox.h> |
16 | #include <qaction.h> | 16 | #include <qaction.h> |
17 | #include <qheader.h> | 17 | #include <qheader.h> |
18 | #include <qfiledialog.h> | 18 | #include <qfiledialog.h> |
19 | #include <qregexp.h> | 19 | #include <qregexp.h> |
20 | #if QT_VERSION >= 300 | ||
21 | #include <qsettings.h> | ||
22 | #endif | ||
23 | |||
20 | #include <stdlib.h> | 24 | #include <stdlib.h> |
21 | 25 | ||
22 | #include "lkc.h" | 26 | #include "lkc.h" |
23 | #include "qconf.h" | 27 | #include "qconf.h" |
24 | 28 | ||
25 | #include "qconf.moc" | 29 | #include "qconf.moc" |
26 | #include "images.c" | 30 | #include "images.c" |
27 | 31 | ||
28 | static QApplication *configApp; | 32 | static QApplication *configApp; |
33 | #if QT_VERSION >= 300 | ||
34 | static QSettings *configSettings; | ||
35 | #endif | ||
29 | 36 | ||
30 | /* | 37 | /* |
31 | * update all the children of a menu entry | 38 | * update all the children of a menu entry |
32 | * removes/adds the entries from the parent widget as necessary | 39 | * removes/adds the entries from the parent widget as necessary |
33 | * | 40 | * |
34 | * parent: either the menu list widget or a menu entry widget | 41 | * parent: either the menu list widget or a menu entry widget |
35 | * menu: entry to be updated | 42 | * menu: entry to be updated |
36 | */ | 43 | */ |
@@ -68,19 +75,27 @@ static void updateMenuList(P* parent, struct menu* menu) | |||
68 | break; | 75 | break; |
69 | default: | 76 | default: |
70 | break; | 77 | break; |
71 | } | 78 | } |
72 | 79 | ||
73 | visible = menu_is_visible(child); | 80 | visible = menu_is_visible(child); |
74 | if (showAll || visible) { | 81 | if (showAll || visible) { |
75 | if (!item || item->menu != child) | 82 | if (!item || item->menu != child) |
76 | item = new ConfigItem(parent, last, child); | 83 | item = new ConfigItem(parent, last, child, visible); |
77 | item->visible = visible; | 84 | else { |
78 | item->updateMenu(); | 85 | item->visible = visible; |
86 | if (item->updateNeeded()) { | ||
87 | ConfigItem* i = (ConfigItem*)child->data; | ||
88 | for (; i; i = i->nextItem) { | ||
89 | i->updateMenu(); | ||
90 | } | ||
91 | } else if (list->updateAll) | ||
92 | item->updateMenu(); | ||
93 | } | ||
79 | 94 | ||
80 | if (mode == fullMode || mode == menuMode || | 95 | if (mode == fullMode || mode == menuMode || |
81 | (type != P_MENU && type != P_ROOTMENU)) | 96 | (type != P_MENU && type != P_ROOTMENU)) |
82 | updateMenuList(item, child); | 97 | updateMenuList(item, child); |
83 | else | 98 | else |
84 | updateMenuList(item, 0); | 99 | updateMenuList(item, 0); |
85 | last = item; | 100 | last = item; |
86 | continue; | 101 | continue; |
@@ -115,46 +130,32 @@ void ConfigItem::okRename(int col) | |||
115 | void ConfigItem::updateMenu(void) | 130 | void ConfigItem::updateMenu(void) |
116 | { | 131 | { |
117 | ConfigList* list; | 132 | ConfigList* list; |
118 | struct symbol* sym; | 133 | struct symbol* sym; |
119 | QString prompt; | 134 | QString prompt; |
120 | int type; | 135 | int type; |
121 | enum prop_type ptype; | 136 | enum prop_type ptype; |
122 | tristate expr; | 137 | tristate expr; |
123 | bool update; | ||
124 | 138 | ||
125 | list = listView(); | 139 | list = listView(); |
126 | update = doInit; | ||
127 | if (update) | ||
128 | doInit = false; | ||
129 | else | ||
130 | update = list->updateAll; | ||
131 | 140 | ||
132 | sym = menu->sym; | 141 | sym = menu->sym; |
133 | if (!sym) { | 142 | if (!sym) { |
134 | if (update) { | 143 | setText(promptColIdx, menu_get_prompt(menu)); |
135 | setText(promptColIdx, menu_get_prompt(menu)); | 144 | ptype = menu->prompt ? menu->prompt->type : P_UNKNOWN; |
136 | ptype = menu->prompt ? menu->prompt->type : P_UNKNOWN; | 145 | if ((ptype == P_ROOTMENU || ptype == P_MENU) && |
137 | if ((ptype == P_ROOTMENU || ptype == P_MENU) && | 146 | (list->mode == singleMode || list->mode == symbolMode)) |
138 | (list->mode == singleMode || list->mode == symbolMode)) | 147 | setPixmap(promptColIdx, list->menuPix); |
139 | setPixmap(promptColIdx, list->menuPix); | 148 | else |
140 | else | 149 | setPixmap(promptColIdx, 0); |
141 | setPixmap(promptColIdx, 0); | ||
142 | } | ||
143 | return; | 150 | return; |
144 | } | 151 | } |
145 | 152 | ||
146 | sym_calc_value(sym); | 153 | setText(nameColIdx, sym->name); |
147 | if (!(sym->flags & SYMBOL_CHANGED) && !update) | ||
148 | return; | ||
149 | |||
150 | sym->flags &= ~SYMBOL_CHANGED; | ||
151 | |||
152 | setText(nameColIdx, menu->sym->name); | ||
153 | 154 | ||
154 | type = sym_get_type(sym); | 155 | type = sym_get_type(sym); |
155 | switch (type) { | 156 | switch (type) { |
156 | case S_BOOLEAN: | 157 | case S_BOOLEAN: |
157 | case S_TRISTATE: | 158 | case S_TRISTATE: |
158 | char ch; | 159 | char ch; |
159 | 160 | ||
160 | prompt = menu_get_prompt(menu); | 161 | prompt = menu_get_prompt(menu); |
@@ -199,30 +200,44 @@ void ConfigItem::updateMenu(void) | |||
199 | break; | 200 | break; |
200 | case S_INT: | 201 | case S_INT: |
201 | case S_HEX: | 202 | case S_HEX: |
202 | case S_STRING: | 203 | case S_STRING: |
203 | const char* data; | 204 | const char* data; |
204 | 205 | ||
205 | data = sym_get_string_value(sym); | 206 | data = sym_get_string_value(sym); |
206 | #if QT_VERSION >= 300 | 207 | #if QT_VERSION >= 300 |
207 | setRenameEnabled(list->mapIdx(dataColIdx), TRUE); | 208 | int i = list->mapIdx(dataColIdx); |
209 | if (i >= 0) | ||
210 | setRenameEnabled(i, TRUE); | ||
208 | #endif | 211 | #endif |
209 | setText(dataColIdx, data); | 212 | setText(dataColIdx, data); |
210 | if (type == S_STRING) | 213 | if (type == S_STRING) |
211 | prompt.sprintf("%s: %s", menu_get_prompt(menu), data); | 214 | prompt.sprintf("%s: %s", menu_get_prompt(menu), data); |
212 | else | 215 | else |
213 | prompt.sprintf("(%s) %s", data, menu_get_prompt(menu)); | 216 | prompt.sprintf("(%s) %s", data, menu_get_prompt(menu)); |
214 | break; | 217 | break; |
215 | } | 218 | } |
216 | if (!sym_has_value(sym) && visible) | 219 | if (!sym_has_value(sym) && visible) |
217 | prompt += " (NEW)"; | 220 | prompt += " (NEW)"; |
218 | setText(promptColIdx, prompt); | 221 | setText(promptColIdx, prompt); |
219 | } | 222 | } |
220 | 223 | ||
224 | bool ConfigItem::updateNeeded(void) | ||
225 | { | ||
226 | struct symbol* sym = menu->sym; | ||
227 | if (sym) | ||
228 | sym_calc_value(sym); | ||
229 | if (menu->flags & MENU_CHANGED) { | ||
230 | menu->flags &= ~MENU_CHANGED; | ||
231 | return true; | ||
232 | } | ||
233 | return false; | ||
234 | } | ||
235 | |||
221 | void ConfigItem::paintCell(QPainter* p, const QColorGroup& cg, int column, int width, int align) | 236 | void ConfigItem::paintCell(QPainter* p, const QColorGroup& cg, int column, int width, int align) |
222 | { | 237 | { |
223 | ConfigList* list = listView(); | 238 | ConfigList* list = listView(); |
224 | 239 | ||
225 | if (visible) { | 240 | if (visible) { |
226 | if (isSelected() && !list->hasFocus() && list->mode == menuMode) | 241 | if (isSelected() && !list->hasFocus() && list->mode == menuMode) |
227 | Parent::paintCell(p, list->inactivedColorGroup, column, width, align); | 242 | Parent::paintCell(p, list->inactivedColorGroup, column, width, align); |
228 | else | 243 | else |
@@ -232,31 +247,38 @@ void ConfigItem::paintCell(QPainter* p, const QColorGroup& cg, int column, int w | |||
232 | } | 247 | } |
233 | 248 | ||
234 | /* | 249 | /* |
235 | * construct a menu entry | 250 | * construct a menu entry |
236 | */ | 251 | */ |
237 | void ConfigItem::init(void) | 252 | void ConfigItem::init(void) |
238 | { | 253 | { |
239 | ConfigList* list = listView(); | 254 | ConfigList* list = listView(); |
240 | #if QT_VERSION < 300 | 255 | nextItem = (ConfigItem*)menu->data; |
241 | visible = TRUE; | 256 | menu->data = this; |
242 | #endif | 257 | |
243 | //menu->data = this; | ||
244 | if (list->mode != fullMode) | 258 | if (list->mode != fullMode) |
245 | setOpen(TRUE); | 259 | setOpen(TRUE); |
246 | doInit= true; | 260 | if (menu->sym) |
261 | sym_calc_value(menu->sym); | ||
262 | updateMenu(); | ||
247 | } | 263 | } |
248 | 264 | ||
249 | /* | 265 | /* |
250 | * destruct a menu entry | 266 | * destruct a menu entry |
251 | */ | 267 | */ |
252 | ConfigItem::~ConfigItem(void) | 268 | ConfigItem::~ConfigItem(void) |
253 | { | 269 | { |
254 | //menu->data = 0; | 270 | ConfigItem** ip = &(ConfigItem*)menu->data; |
271 | for (; *ip; ip = &(*ip)->nextItem) { | ||
272 | if (*ip == this) { | ||
273 | *ip = nextItem; | ||
274 | break; | ||
275 | } | ||
276 | } | ||
255 | } | 277 | } |
256 | 278 | ||
257 | void ConfigLineEdit::show(ConfigItem* i) | 279 | void ConfigLineEdit::show(ConfigItem* i) |
258 | { | 280 | { |
259 | item = i; | 281 | item = i; |
260 | if (sym_get_string_value(item->menu->sym)) | 282 | if (sym_get_string_value(item->menu->sym)) |
261 | setText(sym_get_string_value(item->menu->sym)); | 283 | setText(sym_get_string_value(item->menu->sym)); |
262 | else | 284 | else |
@@ -268,27 +290,28 @@ void ConfigLineEdit::show(ConfigItem* i) | |||
268 | void ConfigLineEdit::keyPressEvent(QKeyEvent* e) | 290 | void ConfigLineEdit::keyPressEvent(QKeyEvent* e) |
269 | { | 291 | { |
270 | switch (e->key()) { | 292 | switch (e->key()) { |
271 | case Key_Escape: | 293 | case Key_Escape: |
272 | break; | 294 | break; |
273 | case Key_Return: | 295 | case Key_Return: |
274 | case Key_Enter: | 296 | case Key_Enter: |
275 | sym_set_string_value(item->menu->sym, text().latin1()); | 297 | sym_set_string_value(item->menu->sym, text().latin1()); |
276 | emit lineChanged(item); | 298 | parent()->updateList(item); |
277 | break; | 299 | break; |
278 | default: | 300 | default: |
279 | Parent::keyPressEvent(e); | 301 | Parent::keyPressEvent(e); |
280 | return; | 302 | return; |
281 | } | 303 | } |
282 | e->accept(); | 304 | e->accept(); |
305 | parent()->list->setFocus(); | ||
283 | hide(); | 306 | hide(); |
284 | } | 307 | } |
285 | 308 | ||
286 | ConfigList::ConfigList(QWidget* p, ConfigView* cv) | 309 | ConfigList::ConfigList(ConfigView* p, ConfigMainWindow* cv) |
287 | : Parent(p), cview(cv), | 310 | : Parent(p), cview(cv), |
288 | updateAll(false), | 311 | updateAll(false), |
289 | symbolYesPix(xpm_symbol_yes), symbolModPix(xpm_symbol_mod), symbolNoPix(xpm_symbol_no), | 312 | symbolYesPix(xpm_symbol_yes), symbolModPix(xpm_symbol_mod), symbolNoPix(xpm_symbol_no), |
290 | choiceYesPix(xpm_choice_yes), choiceNoPix(xpm_choice_no), menuPix(xpm_menu), menuInvPix(xpm_menu_inv), | 313 | choiceYesPix(xpm_choice_yes), choiceNoPix(xpm_choice_no), menuPix(xpm_menu), menuInvPix(xpm_menu_inv), |
291 | showAll(false), showName(false), showRange(false), showData(false), | 314 | showAll(false), showName(false), showRange(false), showData(false), |
292 | rootEntry(0) | 315 | rootEntry(0) |
293 | { | 316 | { |
294 | int i; | 317 | int i; |
@@ -347,16 +370,17 @@ void ConfigList::updateSelection(void) | |||
347 | if (mode == menuMode && (type == P_MENU || type == P_ROOTMENU)) | 370 | if (mode == menuMode && (type == P_MENU || type == P_ROOTMENU)) |
348 | emit menuSelected(menu); | 371 | emit menuSelected(menu); |
349 | } | 372 | } |
350 | 373 | ||
351 | void ConfigList::updateList(ConfigItem* item) | 374 | void ConfigList::updateList(ConfigItem* item) |
352 | { | 375 | { |
353 | (void)item;// unused so far | 376 | (void)item;// unused so far |
354 | updateMenuList(this, rootEntry); | 377 | updateMenuList(this, rootEntry); |
378 | triggerUpdate(); | ||
355 | } | 379 | } |
356 | 380 | ||
357 | void ConfigList::setAllOpen(bool open) | 381 | void ConfigList::setAllOpen(bool open) |
358 | { | 382 | { |
359 | QListViewItemIterator it(this); | 383 | QListViewItemIterator it(this); |
360 | 384 | ||
361 | for (; it.current(); it++) | 385 | for (; it.current(); it++) |
362 | it.current()->setOpen(open); | 386 | it.current()->setOpen(open); |
@@ -377,17 +401,17 @@ void ConfigList::setValue(ConfigItem* item, tristate val) | |||
377 | case S_BOOLEAN: | 401 | case S_BOOLEAN: |
378 | case S_TRISTATE: | 402 | case S_TRISTATE: |
379 | oldval = sym_get_tristate_value(sym); | 403 | oldval = sym_get_tristate_value(sym); |
380 | 404 | ||
381 | if (!sym_set_tristate_value(sym, val)) | 405 | if (!sym_set_tristate_value(sym, val)) |
382 | return; | 406 | return; |
383 | if (oldval == no && item->menu->list) | 407 | if (oldval == no && item->menu->list) |
384 | item->setOpen(TRUE); | 408 | item->setOpen(TRUE); |
385 | emit symbolChanged(item); | 409 | parent()->updateList(item); |
386 | break; | 410 | break; |
387 | } | 411 | } |
388 | } | 412 | } |
389 | 413 | ||
390 | void ConfigList::changeValue(ConfigItem* item) | 414 | void ConfigList::changeValue(ConfigItem* item) |
391 | { | 415 | { |
392 | struct symbol* sym; | 416 | struct symbol* sym; |
393 | struct menu* menu; | 417 | struct menu* menu; |
@@ -409,27 +433,27 @@ void ConfigList::changeValue(ConfigItem* item) | |||
409 | newexpr = sym_toggle_tristate_value(sym); | 433 | newexpr = sym_toggle_tristate_value(sym); |
410 | if (item->menu->list) { | 434 | if (item->menu->list) { |
411 | if (oldexpr == newexpr) | 435 | if (oldexpr == newexpr) |
412 | item->setOpen(!item->isOpen()); | 436 | item->setOpen(!item->isOpen()); |
413 | else if (oldexpr == no) | 437 | else if (oldexpr == no) |
414 | item->setOpen(TRUE); | 438 | item->setOpen(TRUE); |
415 | } | 439 | } |
416 | if (oldexpr != newexpr) | 440 | if (oldexpr != newexpr) |
417 | emit symbolChanged(item); | 441 | parent()->updateList(item); |
418 | break; | 442 | break; |
419 | case S_INT: | 443 | case S_INT: |
420 | case S_HEX: | 444 | case S_HEX: |
421 | case S_STRING: | 445 | case S_STRING: |
422 | #if QT_VERSION >= 300 | 446 | #if QT_VERSION >= 300 |
423 | if (colMap[dataColIdx] >= 0) | 447 | if (colMap[dataColIdx] >= 0) |
424 | item->startRename(colMap[dataColIdx]); | 448 | item->startRename(colMap[dataColIdx]); |
425 | else | 449 | else |
426 | #endif | 450 | #endif |
427 | lineEdit->show(item); | 451 | parent()->lineEdit->show(item); |
428 | break; | 452 | break; |
429 | } | 453 | } |
430 | } | 454 | } |
431 | 455 | ||
432 | void ConfigList::setRootMenu(struct menu *menu) | 456 | void ConfigList::setRootMenu(struct menu *menu) |
433 | { | 457 | { |
434 | enum prop_type type; | 458 | enum prop_type type; |
435 | 459 | ||
@@ -511,17 +535,17 @@ void ConfigList::keyPressEvent(QKeyEvent* ev) | |||
511 | } | 535 | } |
512 | ev->accept(); | 536 | ev->accept(); |
513 | } | 537 | } |
514 | 538 | ||
515 | void ConfigList::contentsMousePressEvent(QMouseEvent* e) | 539 | void ConfigList::contentsMousePressEvent(QMouseEvent* e) |
516 | { | 540 | { |
517 | //QPoint p(contentsToViewport(e->pos())); | 541 | //QPoint p(contentsToViewport(e->pos())); |
518 | //printf("contentsMousePressEvent: %d,%d\n", p.x(), p.y()); | 542 | //printf("contentsMousePressEvent: %d,%d\n", p.x(), p.y()); |
519 | QListView::contentsMousePressEvent(e); | 543 | Parent::contentsMousePressEvent(e); |
520 | } | 544 | } |
521 | 545 | ||
522 | void ConfigList::contentsMouseReleaseEvent(QMouseEvent* e) | 546 | void ConfigList::contentsMouseReleaseEvent(QMouseEvent* e) |
523 | { | 547 | { |
524 | QPoint p(contentsToViewport(e->pos())); | 548 | QPoint p(contentsToViewport(e->pos())); |
525 | ConfigItem* item = (ConfigItem*)itemAt(p); | 549 | ConfigItem* item = (ConfigItem*)itemAt(p); |
526 | struct menu *menu; | 550 | struct menu *menu; |
527 | const QPixmap* pm; | 551 | const QPixmap* pm; |
@@ -558,89 +582,145 @@ void ConfigList::contentsMouseReleaseEvent(QMouseEvent* e) | |||
558 | break; | 582 | break; |
559 | case dataColIdx: | 583 | case dataColIdx: |
560 | changeValue(item); | 584 | changeValue(item); |
561 | break; | 585 | break; |
562 | } | 586 | } |
563 | 587 | ||
564 | skip: | 588 | skip: |
565 | //printf("contentsMouseReleaseEvent: %d,%d\n", p.x(), p.y()); | 589 | //printf("contentsMouseReleaseEvent: %d,%d\n", p.x(), p.y()); |
566 | QListView::contentsMouseReleaseEvent(e); | 590 | Parent::contentsMouseReleaseEvent(e); |
567 | } | 591 | } |
568 | 592 | ||
569 | void ConfigList::contentsMouseMoveEvent(QMouseEvent* e) | 593 | void ConfigList::contentsMouseMoveEvent(QMouseEvent* e) |
570 | { | 594 | { |
571 | //QPoint p(contentsToViewport(e->pos())); | 595 | //QPoint p(contentsToViewport(e->pos())); |
572 | //printf("contentsMouseMoveEvent: %d,%d\n", p.x(), p.y()); | 596 | //printf("contentsMouseMoveEvent: %d,%d\n", p.x(), p.y()); |
573 | QListView::contentsMouseMoveEvent(e); | 597 | Parent::contentsMouseMoveEvent(e); |
574 | } | 598 | } |
575 | 599 | ||
576 | void ConfigList::contentsMouseDoubleClickEvent(QMouseEvent* e) | 600 | void ConfigList::contentsMouseDoubleClickEvent(QMouseEvent* e) |
577 | { | 601 | { |
578 | QPoint p(contentsToViewport(e->pos())); | 602 | QPoint p(contentsToViewport(e->pos())); |
579 | ConfigItem* item = (ConfigItem*)itemAt(p); | 603 | ConfigItem* item = (ConfigItem*)itemAt(p); |
580 | struct menu *menu; | 604 | struct menu *menu; |
581 | enum prop_type ptype; | 605 | enum prop_type ptype; |
582 | 606 | ||
583 | if (!item) | 607 | if (!item) |
584 | goto skip; | 608 | goto skip; |
585 | menu = item->menu; | 609 | menu = item->menu; |
586 | ptype = menu->prompt ? menu->prompt->type : P_UNKNOWN; | 610 | ptype = menu->prompt ? menu->prompt->type : P_UNKNOWN; |
587 | if ((ptype == P_ROOTMENU || ptype == P_MENU) && | 611 | if ((ptype == P_ROOTMENU || ptype == P_MENU) && |
588 | (mode == singleMode || mode == symbolMode)) | 612 | (mode == singleMode || mode == symbolMode)) |
589 | emit menuSelected(menu); | 613 | emit menuSelected(menu); |
614 | else if (menu->sym) | ||
615 | changeValue(item); | ||
590 | 616 | ||
591 | skip: | 617 | skip: |
592 | //printf("contentsMouseDoubleClickEvent: %d,%d\n", p.x(), p.y()); | 618 | //printf("contentsMouseDoubleClickEvent: %d,%d\n", p.x(), p.y()); |
593 | QListView::contentsMouseDoubleClickEvent(e); | 619 | Parent::contentsMouseDoubleClickEvent(e); |
594 | } | 620 | } |
595 | 621 | ||
596 | void ConfigList::focusInEvent(QFocusEvent *e) | 622 | void ConfigList::focusInEvent(QFocusEvent *e) |
597 | { | 623 | { |
598 | Parent::focusInEvent(e); | 624 | Parent::focusInEvent(e); |
599 | 625 | ||
600 | QListViewItem* item = currentItem(); | 626 | QListViewItem* item = currentItem(); |
601 | if (!item) | 627 | if (!item) |
602 | return; | 628 | return; |
603 | 629 | ||
604 | setSelected(item, TRUE); | 630 | setSelected(item, TRUE); |
605 | emit gotFocus(); | 631 | emit gotFocus(); |
606 | } | 632 | } |
607 | 633 | ||
634 | ConfigView* ConfigView::viewList; | ||
635 | |||
636 | ConfigView::ConfigView(QWidget* parent, ConfigMainWindow* cview) | ||
637 | : Parent(parent) | ||
638 | { | ||
639 | list = new ConfigList(this, cview); | ||
640 | lineEdit = new ConfigLineEdit(this); | ||
641 | lineEdit->hide(); | ||
642 | |||
643 | this->nextView = viewList; | ||
644 | viewList = this; | ||
645 | } | ||
646 | |||
647 | ConfigView::~ConfigView(void) | ||
648 | { | ||
649 | ConfigView** vp; | ||
650 | |||
651 | for (vp = &viewList; *vp; vp = &(*vp)->nextView) { | ||
652 | if (*vp == this) { | ||
653 | *vp = nextView; | ||
654 | break; | ||
655 | } | ||
656 | } | ||
657 | } | ||
658 | |||
659 | void ConfigView::updateList(ConfigItem* item) | ||
660 | { | ||
661 | ConfigView* v; | ||
662 | |||
663 | for (v = viewList; v; v = v->nextView) | ||
664 | v->list->updateList(item); | ||
665 | } | ||
666 | |||
667 | void ConfigView::updateListAll(void) | ||
668 | { | ||
669 | ConfigView* v; | ||
670 | |||
671 | for (v = viewList; v; v = v->nextView) | ||
672 | v->list->updateListAll(); | ||
673 | } | ||
674 | |||
608 | /* | 675 | /* |
609 | * Construct the complete config widget | 676 | * Construct the complete config widget |
610 | */ | 677 | */ |
611 | ConfigView::ConfigView(void) | 678 | ConfigMainWindow::ConfigMainWindow(void) |
612 | { | 679 | { |
680 | ConfigView* view; | ||
613 | QMenuBar* menu; | 681 | QMenuBar* menu; |
614 | QSplitter* split1; | 682 | QSplitter* split1; |
615 | QSplitter* split2; | 683 | QSplitter* split2; |
684 | bool ok; | ||
685 | int x, y, width, height; | ||
686 | |||
687 | QWidget *d = configApp->desktop(); | ||
688 | |||
689 | #if QT_VERSION >= 300 | ||
690 | width = configSettings->readNumEntry("/kconfig/qconf/window width", d->width() - 64); | ||
691 | height = configSettings->readNumEntry("/kconfig/qconf/window height", d->height() - 64); | ||
692 | resize(width, height); | ||
693 | x = configSettings->readNumEntry("/kconfig/qconf/window x", 0, &ok); | ||
694 | if (ok) | ||
695 | y = configSettings->readNumEntry("/kconfig/qconf/window y", 0, &ok); | ||
696 | if (ok) | ||
697 | move(x, y); | ||
698 | #else | ||
699 | width = d->width() - 64; | ||
700 | height = d->height() - 64; | ||
701 | resize(width, height); | ||
702 | #endif | ||
616 | 703 | ||
617 | showDebug = false; | 704 | showDebug = false; |
618 | 705 | ||
619 | split1 = new QSplitter(this); | 706 | split1 = new QSplitter(this); |
620 | split1->setOrientation(QSplitter::Horizontal); | 707 | split1->setOrientation(QSplitter::Horizontal); |
621 | setCentralWidget(split1); | 708 | setCentralWidget(split1); |
622 | 709 | ||
623 | menuList = new ConfigList(split1, this); | 710 | view = new ConfigView(split1, this); |
711 | menuList = view->list; | ||
624 | 712 | ||
625 | split2 = new QSplitter(split1); | 713 | split2 = new QSplitter(split1); |
626 | split2->setOrientation(QSplitter::Vertical); | 714 | split2->setOrientation(QSplitter::Vertical); |
627 | 715 | ||
628 | // create config tree | 716 | // create config tree |
629 | QVBox* box = new QVBox(split2); | 717 | view = new ConfigView(split2, this); |
630 | configList = new ConfigList(box, this); | 718 | configList = view->list; |
631 | configList->lineEdit = new ConfigLineEdit(box); | ||
632 | configList->lineEdit->hide(); | ||
633 | configList->connect(configList, SIGNAL(symbolChanged(ConfigItem*)), | ||
634 | configList, SLOT(updateList(ConfigItem*))); | ||
635 | configList->connect(configList, SIGNAL(symbolChanged(ConfigItem*)), | ||
636 | menuList, SLOT(updateList(ConfigItem*))); | ||
637 | configList->connect(configList->lineEdit, SIGNAL(lineChanged(ConfigItem*)), | ||
638 | SLOT(updateList(ConfigItem*))); | ||
639 | 719 | ||
640 | helpText = new QTextView(split2); | 720 | helpText = new QTextView(split2); |
641 | helpText->setTextFormat(Qt::RichText); | 721 | helpText->setTextFormat(Qt::RichText); |
642 | 722 | ||
643 | setTabOrder(configList, helpText); | 723 | setTabOrder(configList, helpText); |
644 | configList->setFocus(); | 724 | configList->setFocus(); |
645 | 725 | ||
646 | menu = menuBar(); | 726 | menu = menuBar(); |
@@ -680,16 +760,21 @@ ConfigView::ConfigView(void) | |||
680 | showAllAction->setToggleAction(TRUE); | 760 | showAllAction->setToggleAction(TRUE); |
681 | showAllAction->setOn(configList->showAll); | 761 | showAllAction->setOn(configList->showAll); |
682 | connect(showAllAction, SIGNAL(toggled(bool)), SLOT(setShowAll(bool))); | 762 | connect(showAllAction, SIGNAL(toggled(bool)), SLOT(setShowAll(bool))); |
683 | QAction *showDebugAction = new QAction(NULL, "Show Debug Info", 0, this); | 763 | QAction *showDebugAction = new QAction(NULL, "Show Debug Info", 0, this); |
684 | showDebugAction->setToggleAction(TRUE); | 764 | showDebugAction->setToggleAction(TRUE); |
685 | showDebugAction->setOn(showDebug); | 765 | showDebugAction->setOn(showDebug); |
686 | connect(showDebugAction, SIGNAL(toggled(bool)), SLOT(setShowDebug(bool))); | 766 | connect(showDebugAction, SIGNAL(toggled(bool)), SLOT(setShowDebug(bool))); |
687 | 767 | ||
768 | QAction *showIntroAction = new QAction(NULL, "Introduction", 0, this); | ||
769 | connect(showIntroAction, SIGNAL(activated()), SLOT(showIntro())); | ||
770 | QAction *showAboutAction = new QAction(NULL, "About", 0, this); | ||
771 | connect(showAboutAction, SIGNAL(activated()), SLOT(showAbout())); | ||
772 | |||
688 | // init tool bar | 773 | // init tool bar |
689 | backAction->addTo(toolBar); | 774 | backAction->addTo(toolBar); |
690 | toolBar->addSeparator(); | 775 | toolBar->addSeparator(); |
691 | loadAction->addTo(toolBar); | 776 | loadAction->addTo(toolBar); |
692 | saveAction->addTo(toolBar); | 777 | saveAction->addTo(toolBar); |
693 | toolBar->addSeparator(); | 778 | toolBar->addSeparator(); |
694 | singleViewAction->addTo(toolBar); | 779 | singleViewAction->addTo(toolBar); |
695 | splitViewAction->addTo(toolBar); | 780 | splitViewAction->addTo(toolBar); |
@@ -709,16 +794,23 @@ ConfigView::ConfigView(void) | |||
709 | menu->insertItem("&Option", optionMenu); | 794 | menu->insertItem("&Option", optionMenu); |
710 | showNameAction->addTo(optionMenu); | 795 | showNameAction->addTo(optionMenu); |
711 | showRangeAction->addTo(optionMenu); | 796 | showRangeAction->addTo(optionMenu); |
712 | showDataAction->addTo(optionMenu); | 797 | showDataAction->addTo(optionMenu); |
713 | optionMenu->insertSeparator(); | 798 | optionMenu->insertSeparator(); |
714 | showAllAction->addTo(optionMenu); | 799 | showAllAction->addTo(optionMenu); |
715 | showDebugAction->addTo(optionMenu); | 800 | showDebugAction->addTo(optionMenu); |
716 | 801 | ||
802 | // create help menu | ||
803 | QPopupMenu* helpMenu = new QPopupMenu(this); | ||
804 | menu->insertSeparator(); | ||
805 | menu->insertItem("&Help", helpMenu); | ||
806 | showIntroAction->addTo(helpMenu); | ||
807 | showAboutAction->addTo(helpMenu); | ||
808 | |||
717 | connect(configList, SIGNAL(menuSelected(struct menu *)), | 809 | connect(configList, SIGNAL(menuSelected(struct menu *)), |
718 | SLOT(changeMenu(struct menu *))); | 810 | SLOT(changeMenu(struct menu *))); |
719 | connect(configList, SIGNAL(parentSelected()), | 811 | connect(configList, SIGNAL(parentSelected()), |
720 | SLOT(goBack())); | 812 | SLOT(goBack())); |
721 | connect(menuList, SIGNAL(menuSelected(struct menu *)), | 813 | connect(menuList, SIGNAL(menuSelected(struct menu *)), |
722 | SLOT(changeMenu(struct menu *))); | 814 | SLOT(changeMenu(struct menu *))); |
723 | 815 | ||
724 | connect(configList, SIGNAL(gotFocus(void)), | 816 | connect(configList, SIGNAL(gotFocus(void)), |
@@ -764,22 +856,22 @@ static QString print_filter(const char *str) | |||
764 | static void expr_print_help(void *data, const char *str) | 856 | static void expr_print_help(void *data, const char *str) |
765 | { | 857 | { |
766 | ((QString*)data)->append(print_filter(str)); | 858 | ((QString*)data)->append(print_filter(str)); |
767 | } | 859 | } |
768 | 860 | ||
769 | /* | 861 | /* |
770 | * display a new help entry as soon as a new menu entry is selected | 862 | * display a new help entry as soon as a new menu entry is selected |
771 | */ | 863 | */ |
772 | void ConfigView::setHelp(QListViewItem* item) | 864 | void ConfigMainWindow::setHelp(QListViewItem* item) |
773 | { | 865 | { |
774 | struct symbol* sym; | 866 | struct symbol* sym; |
775 | struct menu* menu; | 867 | struct menu* menu; |
776 | 868 | ||
777 | configList->lineEdit->hide(); | 869 | configList->parent()->lineEdit->hide(); |
778 | if (item) { | 870 | if (item) { |
779 | QString head, debug, help; | 871 | QString head, debug, help; |
780 | menu = ((ConfigItem*)item)->menu; | 872 | menu = ((ConfigItem*)item)->menu; |
781 | sym = menu->sym; | 873 | sym = menu->sym; |
782 | if (sym) { | 874 | if (sym) { |
783 | if (menu->prompt) { | 875 | if (menu->prompt) { |
784 | head += "<big><b>"; | 876 | head += "<big><b>"; |
785 | head += print_filter(menu->prompt->text); | 877 | head += print_filter(menu->prompt->text); |
@@ -852,162 +944,163 @@ void ConfigView::setHelp(QListViewItem* item) | |||
852 | } | 944 | } |
853 | } | 945 | } |
854 | helpText->setText(head + debug + help); | 946 | helpText->setText(head + debug + help); |
855 | return; | 947 | return; |
856 | } | 948 | } |
857 | helpText->setText(NULL); | 949 | helpText->setText(NULL); |
858 | } | 950 | } |
859 | 951 | ||
860 | void ConfigView::loadConfig(void) | 952 | void ConfigMainWindow::loadConfig(void) |
861 | { | 953 | { |
862 | QString s = QFileDialog::getOpenFileName(".config", NULL, this); | 954 | QString s = QFileDialog::getOpenFileName(".config", NULL, this); |
863 | if (s.isNull()) | 955 | if (s.isNull()) |
864 | return; | 956 | return; |
865 | if (conf_read(s.latin1())) | 957 | if (conf_read(s.latin1())) |
866 | QMessageBox::information(this, "qconf", "Unable to load configuration!"); | 958 | QMessageBox::information(this, "qconf", "Unable to load configuration!"); |
959 | ConfigView::updateListAll(); | ||
867 | } | 960 | } |
868 | 961 | ||
869 | void ConfigView::saveConfig(void) | 962 | void ConfigMainWindow::saveConfig(void) |
870 | { | 963 | { |
871 | if (conf_write(NULL)) | 964 | if (conf_write(NULL)) |
872 | QMessageBox::information(this, "qconf", "Unable to save configuration!"); | 965 | QMessageBox::information(this, "qconf", "Unable to save configuration!"); |
873 | } | 966 | } |
874 | 967 | ||
875 | void ConfigView::saveConfigAs(void) | 968 | void ConfigMainWindow::saveConfigAs(void) |
876 | { | 969 | { |
877 | QString s = QFileDialog::getSaveFileName(".config", NULL, this); | 970 | QString s = QFileDialog::getSaveFileName(".config", NULL, this); |
878 | if (s.isNull()) | 971 | if (s.isNull()) |
879 | return; | 972 | return; |
880 | if (conf_write(s.latin1())) | 973 | if (conf_write(s.latin1())) |
881 | QMessageBox::information(this, "qconf", "Unable to save configuration!"); | 974 | QMessageBox::information(this, "qconf", "Unable to save configuration!"); |
882 | } | 975 | } |
883 | 976 | ||
884 | void ConfigView::changeMenu(struct menu *menu) | 977 | void ConfigMainWindow::changeMenu(struct menu *menu) |
885 | { | 978 | { |
886 | configList->setRootMenu(menu); | 979 | configList->setRootMenu(menu); |
887 | backAction->setEnabled(TRUE); | 980 | backAction->setEnabled(TRUE); |
888 | } | 981 | } |
889 | 982 | ||
890 | void ConfigView::listFocusChanged(void) | 983 | void ConfigMainWindow::listFocusChanged(void) |
891 | { | 984 | { |
892 | if (menuList->hasFocus()) { | 985 | if (menuList->hasFocus()) { |
893 | if (menuList->mode == menuMode) | 986 | if (menuList->mode == menuMode) |
894 | configList->clearSelection(); | 987 | configList->clearSelection(); |
895 | setHelp(menuList->selectedItem()); | 988 | setHelp(menuList->selectedItem()); |
896 | } else if (configList->hasFocus()) { | 989 | } else if (configList->hasFocus()) { |
897 | setHelp(configList->selectedItem()); | 990 | setHelp(configList->selectedItem()); |
898 | } | 991 | } |
899 | } | 992 | } |
900 | 993 | ||
901 | void ConfigView::goBack(void) | 994 | void ConfigMainWindow::goBack(void) |
902 | { | 995 | { |
903 | ConfigItem* item; | 996 | ConfigItem* item; |
904 | 997 | ||
905 | configList->setParentMenu(); | 998 | configList->setParentMenu(); |
906 | if (configList->rootEntry == &rootmenu) | 999 | if (configList->rootEntry == &rootmenu) |
907 | backAction->setEnabled(FALSE); | 1000 | backAction->setEnabled(FALSE); |
908 | item = (ConfigItem*)menuList->selectedItem(); | 1001 | item = (ConfigItem*)menuList->selectedItem(); |
909 | while (item) { | 1002 | while (item) { |
910 | if (item->menu == configList->rootEntry) { | 1003 | if (item->menu == configList->rootEntry) { |
911 | menuList->setSelected(item, TRUE); | 1004 | menuList->setSelected(item, TRUE); |
912 | break; | 1005 | break; |
913 | } | 1006 | } |
914 | item = (ConfigItem*)item->parent(); | 1007 | item = (ConfigItem*)item->parent(); |
915 | } | 1008 | } |
916 | } | 1009 | } |
917 | 1010 | ||
918 | void ConfigView::showSingleView(void) | 1011 | void ConfigMainWindow::showSingleView(void) |
919 | { | 1012 | { |
920 | menuList->hide(); | 1013 | menuList->hide(); |
921 | menuList->setRootMenu(0); | 1014 | menuList->setRootMenu(0); |
922 | configList->mode = singleMode; | 1015 | configList->mode = singleMode; |
923 | if (configList->rootEntry == &rootmenu) | 1016 | if (configList->rootEntry == &rootmenu) |
924 | configList->updateListAll(); | 1017 | configList->updateListAll(); |
925 | else | 1018 | else |
926 | configList->setRootMenu(&rootmenu); | 1019 | configList->setRootMenu(&rootmenu); |
927 | configList->setAllOpen(TRUE); | 1020 | configList->setAllOpen(TRUE); |
928 | configList->setFocus(); | 1021 | configList->setFocus(); |
929 | } | 1022 | } |
930 | 1023 | ||
931 | void ConfigView::showSplitView(void) | 1024 | void ConfigMainWindow::showSplitView(void) |
932 | { | 1025 | { |
933 | configList->mode = symbolMode; | 1026 | configList->mode = symbolMode; |
934 | if (configList->rootEntry == &rootmenu) | 1027 | if (configList->rootEntry == &rootmenu) |
935 | configList->updateListAll(); | 1028 | configList->updateListAll(); |
936 | else | 1029 | else |
937 | configList->setRootMenu(&rootmenu); | 1030 | configList->setRootMenu(&rootmenu); |
938 | configList->setAllOpen(TRUE); | 1031 | configList->setAllOpen(TRUE); |
939 | configApp->processEvents(); | 1032 | configApp->processEvents(); |
940 | menuList->mode = menuMode; | 1033 | menuList->mode = menuMode; |
941 | menuList->setRootMenu(&rootmenu); | 1034 | menuList->setRootMenu(&rootmenu); |
942 | menuList->show(); | 1035 | menuList->show(); |
943 | menuList->setAllOpen(TRUE); | 1036 | menuList->setAllOpen(TRUE); |
944 | menuList->setFocus(); | 1037 | menuList->setFocus(); |
945 | } | 1038 | } |
946 | 1039 | ||
947 | void ConfigView::showFullView(void) | 1040 | void ConfigMainWindow::showFullView(void) |
948 | { | 1041 | { |
949 | menuList->hide(); | 1042 | menuList->hide(); |
950 | menuList->setRootMenu(0); | 1043 | menuList->setRootMenu(0); |
951 | configList->mode = fullMode; | 1044 | configList->mode = fullMode; |
952 | if (configList->rootEntry == &rootmenu) | 1045 | if (configList->rootEntry == &rootmenu) |
953 | configList->updateListAll(); | 1046 | configList->updateListAll(); |
954 | else | 1047 | else |
955 | configList->setRootMenu(&rootmenu); | 1048 | configList->setRootMenu(&rootmenu); |
956 | configList->setAllOpen(FALSE); | 1049 | configList->setAllOpen(FALSE); |
957 | configList->setFocus(); | 1050 | configList->setFocus(); |
958 | } | 1051 | } |
959 | 1052 | ||
960 | void ConfigView::setShowAll(bool b) | 1053 | void ConfigMainWindow::setShowAll(bool b) |
961 | { | 1054 | { |
962 | if (configList->showAll == b) | 1055 | if (configList->showAll == b) |
963 | return; | 1056 | return; |
964 | configList->showAll = b; | 1057 | configList->showAll = b; |
965 | configList->updateListAll(); | 1058 | configList->updateListAll(); |
966 | menuList->showAll = b; | 1059 | menuList->showAll = b; |
967 | menuList->updateListAll(); | 1060 | menuList->updateListAll(); |
968 | } | 1061 | } |
969 | 1062 | ||
970 | void ConfigView::setShowDebug(bool b) | 1063 | void ConfigMainWindow::setShowDebug(bool b) |
971 | { | 1064 | { |
972 | if (showDebug == b) | 1065 | if (showDebug == b) |
973 | return; | 1066 | return; |
974 | showDebug = b; | 1067 | showDebug = b; |
975 | } | 1068 | } |
976 | 1069 | ||
977 | void ConfigView::setShowName(bool b) | 1070 | void ConfigMainWindow::setShowName(bool b) |
978 | { | 1071 | { |
979 | if (configList->showName == b) | 1072 | if (configList->showName == b) |
980 | return; | 1073 | return; |
981 | configList->showName = b; | 1074 | configList->showName = b; |
982 | configList->reinit(); | 1075 | configList->reinit(); |
983 | } | 1076 | } |
984 | 1077 | ||
985 | void ConfigView::setShowRange(bool b) | 1078 | void ConfigMainWindow::setShowRange(bool b) |
986 | { | 1079 | { |
987 | if (configList->showRange == b) | 1080 | if (configList->showRange == b) |
988 | return; | 1081 | return; |
989 | configList->showRange = b; | 1082 | configList->showRange = b; |
990 | configList->reinit(); | 1083 | configList->reinit(); |
991 | } | 1084 | } |
992 | 1085 | ||
993 | void ConfigView::setShowData(bool b) | 1086 | void ConfigMainWindow::setShowData(bool b) |
994 | { | 1087 | { |
995 | if (configList->showData == b) | 1088 | if (configList->showData == b) |
996 | return; | 1089 | return; |
997 | configList->showData = b; | 1090 | configList->showData = b; |
998 | configList->reinit(); | 1091 | configList->reinit(); |
999 | } | 1092 | } |
1000 | 1093 | ||
1001 | /* | 1094 | /* |
1002 | * ask for saving configuration before quitting | 1095 | * ask for saving configuration before quitting |
1003 | * TODO ask only when something changed | 1096 | * TODO ask only when something changed |
1004 | */ | 1097 | */ |
1005 | void ConfigView::closeEvent(QCloseEvent* e) | 1098 | void ConfigMainWindow::closeEvent(QCloseEvent* e) |
1006 | { | 1099 | { |
1007 | if (!sym_change_count) { | 1100 | if (!sym_change_count) { |
1008 | e->accept(); | 1101 | e->accept(); |
1009 | return; | 1102 | return; |
1010 | } | 1103 | } |
1011 | QMessageBox mb("qconf", "Save configuration?", QMessageBox::Warning, | 1104 | QMessageBox mb("qconf", "Save configuration?", QMessageBox::Warning, |
1012 | QMessageBox::Yes | QMessageBox::Default, QMessageBox::No, QMessageBox::Cancel | QMessageBox::Escape); | 1105 | QMessageBox::Yes | QMessageBox::Default, QMessageBox::No, QMessageBox::Cancel | QMessageBox::Escape); |
1013 | mb.setButtonText(QMessageBox::Yes, "&Save Changes"); | 1106 | mb.setButtonText(QMessageBox::Yes, "&Save Changes"); |
@@ -1020,37 +1113,65 @@ void ConfigView::closeEvent(QCloseEvent* e) | |||
1020 | e->accept(); | 1113 | e->accept(); |
1021 | break; | 1114 | break; |
1022 | case QMessageBox::Cancel: | 1115 | case QMessageBox::Cancel: |
1023 | e->ignore(); | 1116 | e->ignore(); |
1024 | break; | 1117 | break; |
1025 | } | 1118 | } |
1026 | } | 1119 | } |
1027 | 1120 | ||
1121 | void ConfigMainWindow::showIntro(void) | ||
1122 | { | ||
1123 | static char str[] = "Welcome to the qconf graphical kernel configuration tool for Linux.\n\n" | ||
1124 | "For each option, a blank box indicates the feature is disabled, a check\n" | ||
1125 | "indicates it is enabled, and a dot indicates that it is to be compiled\n" | ||
1126 | "as a module. Clicking on the box will cycle through the three states.\n\n" | ||
1127 | "If you do not see an option (e.g., a device driver) that you believe\n" | ||
1128 | "should be present, try turning on Show All Options under the Options menu.\n" | ||
1129 | "Although there is no cross reference yet to help you figure out what other\n" | ||
1130 | "options must be enabled to support the option you are interested in, you can\n" | ||
1131 | "still view the help of a grayed-out option.\n\n" | ||
1132 | "Toggling Show Debug Info under the Options menu will show the dependencies,\n" | ||
1133 | "which you can then match by examining other options.\n\n"; | ||
1134 | |||
1135 | QMessageBox::information(this, "qconf", str); | ||
1136 | } | ||
1137 | |||
1138 | void ConfigMainWindow::showAbout(void) | ||
1139 | { | ||
1140 | static char str[] = "qconf is Copyright (C) 2002 Roman Zippel <zippel@linux-m68k.org>.\n\n" | ||
1141 | "Bug reports and feature request can also be entered at http://bugzilla.kernel.org/\n"; | ||
1142 | |||
1143 | QMessageBox::information(this, "qconf", str); | ||
1144 | } | ||
1145 | |||
1028 | void fixup_rootmenu(struct menu *menu) | 1146 | void fixup_rootmenu(struct menu *menu) |
1029 | { | 1147 | { |
1030 | struct menu *child; | 1148 | struct menu *child; |
1031 | 1149 | ||
1032 | if (!menu->prompt || menu->prompt->type != P_MENU) | 1150 | if (!menu->prompt || menu->prompt->type != P_MENU) |
1033 | return; | 1151 | return; |
1034 | menu->prompt->type = P_ROOTMENU; | 1152 | menu->prompt->type = P_ROOTMENU; |
1035 | for (child = menu->list; child; child = child->next) | 1153 | for (child = menu->list; child; child = child->next) |
1036 | fixup_rootmenu(child); | 1154 | fixup_rootmenu(child); |
1037 | } | 1155 | } |
1038 | 1156 | ||
1039 | int main(int ac, char** av) | 1157 | int main(int ac, char** av) |
1040 | { | 1158 | { |
1041 | ConfigView* v; | 1159 | ConfigMainWindow* v; |
1042 | const char *name; | 1160 | const char *name; |
1043 | 1161 | ||
1044 | #ifndef LKC_DIRECT_LINK | 1162 | #ifndef LKC_DIRECT_LINK |
1045 | kconfig_load(); | 1163 | kconfig_load(); |
1046 | #endif | 1164 | #endif |
1047 | 1165 | ||
1048 | configApp = new QApplication(ac, av); | 1166 | configApp = new QApplication(ac, av); |
1167 | #if QT_VERSION >= 300 | ||
1168 | configSettings = new QSettings; | ||
1169 | #endif | ||
1049 | if (ac > 1 && av[1][0] == '-') { | 1170 | if (ac > 1 && av[1][0] == '-') { |
1050 | switch (av[1][1]) { | 1171 | switch (av[1][1]) { |
1051 | case 'a': | 1172 | case 'a': |
1052 | //showAll = 1; | 1173 | //showAll = 1; |
1053 | break; | 1174 | break; |
1054 | case 'h': | 1175 | case 'h': |
1055 | case '?': | 1176 | case '?': |
1056 | printf("%s <config>\n", av[0]); | 1177 | printf("%s <config>\n", av[0]); |
@@ -1058,16 +1179,25 @@ int main(int ac, char** av) | |||
1058 | } | 1179 | } |
1059 | name = av[2]; | 1180 | name = av[2]; |
1060 | } else | 1181 | } else |
1061 | name = av[1]; | 1182 | name = av[1]; |
1062 | conf_parse(name); | 1183 | conf_parse(name); |
1063 | fixup_rootmenu(&rootmenu); | 1184 | fixup_rootmenu(&rootmenu); |
1064 | conf_read(NULL); | 1185 | conf_read(NULL); |
1065 | //zconfdump(stdout); | 1186 | //zconfdump(stdout); |
1066 | v = new ConfigView(); | 1187 | |
1188 | v = new ConfigMainWindow(); | ||
1067 | 1189 | ||
1068 | //zconfdump(stdout); | 1190 | //zconfdump(stdout); |
1069 | v->show(); | 1191 | v->show(); |
1070 | configApp->connect(configApp, SIGNAL(lastWindowClosed()), SLOT(quit())); | 1192 | configApp->connect(configApp, SIGNAL(lastWindowClosed()), SLOT(quit())); |
1071 | configApp->exec(); | 1193 | configApp->exec(); |
1194 | |||
1195 | #if QT_VERSION >= 300 | ||
1196 | configSettings->writeEntry("/kconfig/qconf/window x", v->pos().x()); | ||
1197 | configSettings->writeEntry("/kconfig/qconf/window y", v->pos().y()); | ||
1198 | configSettings->writeEntry("/kconfig/qconf/window width", v->size().width()); | ||
1199 | configSettings->writeEntry("/kconfig/qconf/window height", v->size().height()); | ||
1200 | delete configSettings; | ||
1201 | #endif | ||
1072 | return 0; | 1202 | return 0; |
1073 | } | 1203 | } |
diff --git a/scripts/kconfig/qconf.h b/scripts/kconfig/qconf.h index f8f3669..6f096b4 100644 --- a/scripts/kconfig/qconf.h +++ b/scripts/kconfig/qconf.h | |||
@@ -1,36 +1,57 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (C) 2002 Roman Zippel <zippel@linux-m68k.org> | 2 | * Copyright (C) 2002 Roman Zippel <zippel@linux-m68k.org> |
3 | * Released under the terms of the GNU GPL v2.0. | 3 | * Released under the terms of the GNU GPL v2.0. |
4 | */ | 4 | */ |
5 | 5 | ||
6 | #include <qlistview.h> | 6 | #include <qlistview.h> |
7 | 7 | ||
8 | class ConfigLineEdit; | 8 | class ConfigList; |
9 | class ConfigItem; | 9 | class ConfigItem; |
10 | class ConfigView; | 10 | class ConfigLineEdit; |
11 | class ConfigMainWindow; | ||
12 | |||
13 | class ConfigView : public QVBox { | ||
14 | Q_OBJECT | ||
15 | typedef class QVBox Parent; | ||
16 | public: | ||
17 | ConfigView(QWidget* parent, ConfigMainWindow* cview); | ||
18 | ~ConfigView(void); | ||
19 | static void updateList(ConfigItem* item); | ||
20 | static void updateListAll(void); | ||
21 | |||
22 | public: | ||
23 | ConfigList* list; | ||
24 | ConfigLineEdit* lineEdit; | ||
25 | |||
26 | static ConfigView* viewList; | ||
27 | ConfigView* nextView; | ||
28 | }; | ||
11 | 29 | ||
12 | enum colIdx { | 30 | enum colIdx { |
13 | promptColIdx, nameColIdx, noColIdx, modColIdx, yesColIdx, dataColIdx, colNr | 31 | promptColIdx, nameColIdx, noColIdx, modColIdx, yesColIdx, dataColIdx, colNr |
14 | }; | 32 | }; |
15 | enum listMode { | 33 | enum listMode { |
16 | singleMode, menuMode, symbolMode, fullMode | 34 | singleMode, menuMode, symbolMode, fullMode |
17 | }; | 35 | }; |
18 | 36 | ||
19 | class ConfigList : public QListView { | 37 | class ConfigList : public QListView { |
20 | Q_OBJECT | 38 | Q_OBJECT |
21 | typedef class QListView Parent; | 39 | typedef class QListView Parent; |
22 | public: | 40 | public: |
23 | ConfigList(QWidget* p, ConfigView* cview); | 41 | ConfigList(ConfigView* p, ConfigMainWindow* cview); |
24 | void reinit(void); | 42 | void reinit(void); |
43 | ConfigView* parent(void) const | ||
44 | { | ||
45 | return (ConfigView*)Parent::parent(); | ||
46 | } | ||
25 | 47 | ||
26 | ConfigLineEdit* lineEdit; | ||
27 | protected: | 48 | protected: |
28 | ConfigView* cview; | 49 | ConfigMainWindow* cview; |
29 | 50 | ||
30 | void keyPressEvent(QKeyEvent *e); | 51 | void keyPressEvent(QKeyEvent *e); |
31 | void contentsMousePressEvent(QMouseEvent *e); | 52 | void contentsMousePressEvent(QMouseEvent *e); |
32 | void contentsMouseReleaseEvent(QMouseEvent *e); | 53 | void contentsMouseReleaseEvent(QMouseEvent *e); |
33 | void contentsMouseMoveEvent(QMouseEvent *e); | 54 | void contentsMouseMoveEvent(QMouseEvent *e); |
34 | void contentsMouseDoubleClickEvent(QMouseEvent *e); | 55 | void contentsMouseDoubleClickEvent(QMouseEvent *e); |
35 | void focusInEvent(QFocusEvent *e); | 56 | void focusInEvent(QFocusEvent *e); |
36 | public slots: | 57 | public slots: |
@@ -38,17 +59,16 @@ public slots: | |||
38 | 59 | ||
39 | void updateList(ConfigItem *item); | 60 | void updateList(ConfigItem *item); |
40 | void setValue(ConfigItem* item, tristate val); | 61 | void setValue(ConfigItem* item, tristate val); |
41 | void changeValue(ConfigItem* item); | 62 | void changeValue(ConfigItem* item); |
42 | void updateSelection(void); | 63 | void updateSelection(void); |
43 | signals: | 64 | signals: |
44 | void menuSelected(struct menu *menu); | 65 | void menuSelected(struct menu *menu); |
45 | void parentSelected(void); | 66 | void parentSelected(void); |
46 | void symbolChanged(ConfigItem* item); | ||
47 | void gotFocus(void); | 67 | void gotFocus(void); |
48 | 68 | ||
49 | public: | 69 | public: |
50 | void updateListAll(void) | 70 | void updateListAll(void) |
51 | { | 71 | { |
52 | updateAll = true; | 72 | updateAll = true; |
53 | updateList(NULL); | 73 | updateList(NULL); |
54 | updateAll = false; | 74 | updateAll = false; |
@@ -95,32 +115,33 @@ public: | |||
95 | private: | 115 | private: |
96 | int colMap[colNr]; | 116 | int colMap[colNr]; |
97 | int colRevMap[colNr]; | 117 | int colRevMap[colNr]; |
98 | }; | 118 | }; |
99 | 119 | ||
100 | class ConfigItem : public QListViewItem { | 120 | class ConfigItem : public QListViewItem { |
101 | typedef class QListViewItem Parent; | 121 | typedef class QListViewItem Parent; |
102 | public: | 122 | public: |
103 | ConfigItem(QListView *parent, ConfigItem *after, struct menu *m) | 123 | ConfigItem(QListView *parent, ConfigItem *after, struct menu *m, bool v) |
104 | : Parent(parent, after), menu(m) | 124 | : Parent(parent, after), menu(m), visible(v) |
105 | { | 125 | { |
106 | init(); | 126 | init(); |
107 | } | 127 | } |
108 | ConfigItem(ConfigItem *parent, ConfigItem *after, struct menu *m) | 128 | ConfigItem(ConfigItem *parent, ConfigItem *after, struct menu *m, bool v) |
109 | : Parent(parent, after), menu(m) | 129 | : Parent(parent, after), menu(m), visible(v) |
110 | { | 130 | { |
111 | init(); | 131 | init(); |
112 | } | 132 | } |
113 | ~ConfigItem(void); | 133 | ~ConfigItem(void); |
114 | void init(void); | 134 | void init(void); |
115 | #if QT_VERSION >= 300 | 135 | #if QT_VERSION >= 300 |
116 | void okRename(int col); | 136 | void okRename(int col); |
117 | #endif | 137 | #endif |
118 | void updateMenu(void); | 138 | void updateMenu(void); |
139 | bool updateNeeded(void); | ||
119 | ConfigList* listView() const | 140 | ConfigList* listView() const |
120 | { | 141 | { |
121 | return (ConfigList*)Parent::listView(); | 142 | return (ConfigList*)Parent::listView(); |
122 | } | 143 | } |
123 | ConfigItem* firstChild() const | 144 | ConfigItem* firstChild() const |
124 | { | 145 | { |
125 | return (ConfigItem *)Parent::firstChild(); | 146 | return (ConfigItem *)Parent::firstChild(); |
126 | } | 147 | } |
@@ -141,57 +162,61 @@ public: | |||
141 | Parent::setPixmap(listView()->mapIdx(idx), pm); | 162 | Parent::setPixmap(listView()->mapIdx(idx), pm); |
142 | } | 163 | } |
143 | const QPixmap* pixmap(colIdx idx) const | 164 | const QPixmap* pixmap(colIdx idx) const |
144 | { | 165 | { |
145 | return Parent::pixmap(listView()->mapIdx(idx)); | 166 | return Parent::pixmap(listView()->mapIdx(idx)); |
146 | } | 167 | } |
147 | void paintCell(QPainter* p, const QColorGroup& cg, int column, int width, int align); | 168 | void paintCell(QPainter* p, const QColorGroup& cg, int column, int width, int align); |
148 | 169 | ||
170 | ConfigItem* nextItem; | ||
149 | struct menu *menu; | 171 | struct menu *menu; |
150 | bool visible; | 172 | bool visible; |
151 | bool doInit; | ||
152 | }; | 173 | }; |
153 | 174 | ||
154 | class ConfigLineEdit : public QLineEdit { | 175 | class ConfigLineEdit : public QLineEdit { |
155 | Q_OBJECT | 176 | Q_OBJECT |
156 | typedef class QLineEdit Parent; | 177 | typedef class QLineEdit Parent; |
157 | public: | 178 | public: |
158 | ConfigLineEdit(QWidget * parent) | 179 | ConfigLineEdit(ConfigView* parent) |
159 | : QLineEdit(parent) | 180 | : Parent(parent) |
160 | { } | 181 | { } |
182 | ConfigView* parent(void) const | ||
183 | { | ||
184 | return (ConfigView*)Parent::parent(); | ||
185 | } | ||
161 | void show(ConfigItem *i); | 186 | void show(ConfigItem *i); |
162 | void keyPressEvent(QKeyEvent *e); | 187 | void keyPressEvent(QKeyEvent *e); |
163 | signals: | ||
164 | void lineChanged(ConfigItem *item); | ||
165 | 188 | ||
166 | public: | 189 | public: |
167 | ConfigItem *item; | 190 | ConfigItem *item; |
168 | }; | 191 | }; |
169 | 192 | ||
170 | class ConfigView : public QMainWindow { | 193 | class ConfigMainWindow : public QMainWindow { |
171 | Q_OBJECT | 194 | Q_OBJECT |
172 | public: | 195 | public: |
173 | ConfigView(void); | 196 | ConfigMainWindow(void); |
174 | public slots: | 197 | public slots: |
175 | void setHelp(QListViewItem* item); | 198 | void setHelp(QListViewItem* item); |
176 | void changeMenu(struct menu *); | 199 | void changeMenu(struct menu *); |
177 | void listFocusChanged(void); | 200 | void listFocusChanged(void); |
178 | void goBack(void); | 201 | void goBack(void); |
179 | void loadConfig(void); | 202 | void loadConfig(void); |
180 | void saveConfig(void); | 203 | void saveConfig(void); |
181 | void saveConfigAs(void); | 204 | void saveConfigAs(void); |
182 | void showSingleView(void); | 205 | void showSingleView(void); |
183 | void showSplitView(void); | 206 | void showSplitView(void); |
184 | void showFullView(void); | 207 | void showFullView(void); |
185 | void setShowAll(bool); | 208 | void setShowAll(bool); |
186 | void setShowDebug(bool); | 209 | void setShowDebug(bool); |
187 | void setShowRange(bool); | 210 | void setShowRange(bool); |
188 | void setShowName(bool); | 211 | void setShowName(bool); |
189 | void setShowData(bool); | 212 | void setShowData(bool); |
213 | void showIntro(void); | ||
214 | void showAbout(void); | ||
190 | 215 | ||
191 | protected: | 216 | protected: |
192 | void closeEvent(QCloseEvent *e); | 217 | void closeEvent(QCloseEvent *e); |
193 | 218 | ||
194 | ConfigList *menuList; | 219 | ConfigList *menuList; |
195 | ConfigList *configList; | 220 | ConfigList *configList; |
196 | QTextView *helpText; | 221 | QTextView *helpText; |
197 | QToolBar *toolBar; | 222 | QToolBar *toolBar; |
diff --git a/scripts/kconfig/symbol.c b/scripts/kconfig/symbol.c index 59c88d2..845d8a3 100644 --- a/scripts/kconfig/symbol.c +++ b/scripts/kconfig/symbol.c | |||
@@ -144,17 +144,17 @@ void sym_calc_visibility(struct symbol *sym) | |||
144 | 144 | ||
145 | /* any prompt visible? */ | 145 | /* any prompt visible? */ |
146 | oldvisible = sym->visible; | 146 | oldvisible = sym->visible; |
147 | visible = no; | 147 | visible = no; |
148 | for_all_prompts(sym, prop) | 148 | for_all_prompts(sym, prop) |
149 | visible = E_OR(visible, E_CALC(prop->visible)); | 149 | visible = E_OR(visible, E_CALC(prop->visible)); |
150 | if (oldvisible != visible) { | 150 | if (oldvisible != visible) { |
151 | sym->visible = visible; | 151 | sym->visible = visible; |
152 | sym->flags |= SYMBOL_CHANGED; | 152 | sym_set_changed(sym); |
153 | } | 153 | } |
154 | } | 154 | } |
155 | 155 | ||
156 | void sym_calc_value(struct symbol *sym) | 156 | void sym_calc_value(struct symbol *sym) |
157 | { | 157 | { |
158 | struct symbol_value newval, oldval; | 158 | struct symbol_value newval, oldval; |
159 | struct property *prop, *def_prop; | 159 | struct property *prop, *def_prop; |
160 | struct symbol *def_sym; | 160 | struct symbol *def_sym; |
@@ -199,17 +199,18 @@ void sym_calc_value(struct symbol *sym) | |||
199 | sym->flags |= SYMBOL_WRITE; | 199 | sym->flags |= SYMBOL_WRITE; |
200 | if (!sym_has_value(sym)) { | 200 | if (!sym_has_value(sym)) { |
201 | if (!sym_is_choice(sym)) { | 201 | if (!sym_is_choice(sym)) { |
202 | prop = sym_get_default_prop(sym); | 202 | prop = sym_get_default_prop(sym); |
203 | if (prop) { | 203 | if (prop) { |
204 | sym_calc_value(prop->def); | 204 | sym_calc_value(prop->def); |
205 | newval = prop->def->curr; | 205 | newval = prop->def->curr; |
206 | } | 206 | } |
207 | } | 207 | } else |
208 | S_TRI(newval) = S_TRI(sym->def); | ||
208 | } else | 209 | } else |
209 | newval = sym->def; | 210 | newval = sym->def; |
210 | 211 | ||
211 | S_TRI(newval) = E_AND(S_TRI(newval), sym->visible); | 212 | S_TRI(newval) = E_AND(S_TRI(newval), sym->visible); |
212 | /* if the symbol is visible and not optionial, | 213 | /* if the symbol is visible and not optionial, |
213 | * possibly ignore old user choice. */ | 214 | * possibly ignore old user choice. */ |
214 | if (!sym_is_optional(sym) && S_TRI(newval) == no) | 215 | if (!sym_is_optional(sym) && S_TRI(newval) == no) |
215 | S_TRI(newval) = sym->visible; | 216 | S_TRI(newval) = sym->visible; |
@@ -271,44 +272,58 @@ out: | |||
271 | } | 272 | } |
272 | } | 273 | } |
273 | } | 274 | } |
274 | 275 | ||
275 | S_VAL(newval) = def_sym; | 276 | S_VAL(newval) = def_sym; |
276 | } | 277 | } |
277 | 278 | ||
278 | if (memcmp(&oldval, &newval, sizeof(newval))) | 279 | if (memcmp(&oldval, &newval, sizeof(newval))) |
279 | sym->flags |= SYMBOL_CHANGED; | 280 | sym_set_changed(sym); |
280 | sym->curr = newval; | 281 | sym->curr = newval; |
281 | 282 | ||
282 | if (sym_is_choice(sym)) { | 283 | if (sym_is_choice(sym)) { |
283 | int flags = sym->flags & (SYMBOL_CHANGED | SYMBOL_WRITE); | 284 | int flags = sym->flags & (SYMBOL_CHANGED | SYMBOL_WRITE); |
284 | prop = sym_get_choice_prop(sym); | 285 | prop = sym_get_choice_prop(sym); |
285 | for (e = prop->dep; e; e = e->left.expr) | 286 | for (e = prop->dep; e; e = e->left.expr) { |
286 | e->right.sym->flags |= flags; | 287 | e->right.sym->flags |= flags; |
288 | if (flags & SYMBOL_CHANGED) | ||
289 | sym_set_changed(e->right.sym); | ||
290 | } | ||
287 | } | 291 | } |
288 | } | 292 | } |
289 | 293 | ||
290 | void sym_clear_all_valid(void) | 294 | void sym_clear_all_valid(void) |
291 | { | 295 | { |
292 | struct symbol *sym; | 296 | struct symbol *sym; |
293 | int i; | 297 | int i; |
294 | 298 | ||
295 | for_all_symbols(i, sym) | 299 | for_all_symbols(i, sym) |
296 | sym->flags &= ~SYMBOL_VALID; | 300 | sym->flags &= ~SYMBOL_VALID; |
297 | sym_change_count++; | 301 | sym_change_count++; |
298 | } | 302 | } |
299 | 303 | ||
304 | void sym_set_changed(struct symbol *sym) | ||
305 | { | ||
306 | struct property *prop; | ||
307 | |||
308 | sym->flags |= SYMBOL_CHANGED; | ||
309 | for (prop = sym->prop; prop; prop = prop->next) { | ||
310 | if (prop->menu) | ||
311 | prop->menu->flags |= MENU_CHANGED; | ||
312 | } | ||
313 | } | ||
314 | |||
300 | void sym_set_all_changed(void) | 315 | void sym_set_all_changed(void) |
301 | { | 316 | { |
302 | struct symbol *sym; | 317 | struct symbol *sym; |
303 | int i; | 318 | int i; |
304 | 319 | ||
305 | for_all_symbols(i, sym) | 320 | for_all_symbols(i, sym) |
306 | sym->flags |= SYMBOL_CHANGED; | 321 | sym_set_changed(sym); |
307 | } | 322 | } |
308 | 323 | ||
309 | bool sym_tristate_within_range(struct symbol *sym, tristate val) | 324 | bool sym_tristate_within_range(struct symbol *sym, tristate val) |
310 | { | 325 | { |
311 | int type = sym_get_type(sym); | 326 | int type = sym_get_type(sym); |
312 | 327 | ||
313 | if (sym->visible == no) | 328 | if (sym->visible == no) |
314 | return false; | 329 | return false; |
@@ -335,17 +350,17 @@ bool sym_set_tristate_value(struct symbol *sym, tristate val) | |||
335 | { | 350 | { |
336 | tristate oldval = sym_get_tristate_value(sym); | 351 | tristate oldval = sym_get_tristate_value(sym); |
337 | 352 | ||
338 | if (oldval != val && !sym_tristate_within_range(sym, val)) | 353 | if (oldval != val && !sym_tristate_within_range(sym, val)) |
339 | return false; | 354 | return false; |
340 | 355 | ||
341 | if (sym->flags & SYMBOL_NEW) { | 356 | if (sym->flags & SYMBOL_NEW) { |
342 | sym->flags &= ~SYMBOL_NEW; | 357 | sym->flags &= ~SYMBOL_NEW; |
343 | sym->flags |= SYMBOL_CHANGED; | 358 | sym_set_changed(sym); |
344 | } | 359 | } |
345 | if (sym_is_choice_value(sym) && val == yes) { | 360 | if (sym_is_choice_value(sym) && val == yes) { |
346 | struct property *prop = sym_get_choice_prop(sym); | 361 | struct property *prop = sym_get_choice_prop(sym); |
347 | 362 | ||
348 | S_VAL(prop->def->def) = sym; | 363 | S_VAL(prop->def->def) = sym; |
349 | prop->def->flags &= ~SYMBOL_NEW; | 364 | prop->def->flags &= ~SYMBOL_NEW; |
350 | } | 365 | } |
351 | 366 | ||
@@ -455,17 +470,17 @@ bool sym_set_string_value(struct symbol *sym, const char *newval) | |||
455 | ; | 470 | ; |
456 | } | 471 | } |
457 | 472 | ||
458 | if (!sym_string_valid(sym, newval)) | 473 | if (!sym_string_valid(sym, newval)) |
459 | return false; | 474 | return false; |
460 | 475 | ||
461 | if (sym->flags & SYMBOL_NEW) { | 476 | if (sym->flags & SYMBOL_NEW) { |
462 | sym->flags &= ~SYMBOL_NEW; | 477 | sym->flags &= ~SYMBOL_NEW; |
463 | sym->flags |= SYMBOL_CHANGED; | 478 | sym_set_changed(sym); |
464 | } | 479 | } |
465 | 480 | ||
466 | oldval = S_VAL(sym->def); | 481 | oldval = S_VAL(sym->def); |
467 | size = strlen(newval) + 1; | 482 | size = strlen(newval) + 1; |
468 | if (sym->type == S_HEX && (newval[0] != '0' || (newval[1] != 'x' && newval[1] != 'X'))) { | 483 | if (sym->type == S_HEX && (newval[0] != '0' || (newval[1] != 'x' && newval[1] != 'X'))) { |
469 | size += 2; | 484 | size += 2; |
470 | S_VAL(sym->def) = val = malloc(size); | 485 | S_VAL(sym->def) = val = malloc(size); |
471 | *val++ = '0'; | 486 | *val++ = '0'; |
@@ -520,36 +535,33 @@ bool sym_is_changable(struct symbol *sym) | |||
520 | 535 | ||
521 | struct symbol *sym_lookup(const char *name, int isconst) | 536 | struct symbol *sym_lookup(const char *name, int isconst) |
522 | { | 537 | { |
523 | struct symbol *symbol; | 538 | struct symbol *symbol; |
524 | const char *ptr; | 539 | const char *ptr; |
525 | char *new_name; | 540 | char *new_name; |
526 | int hash = 0; | 541 | int hash = 0; |
527 | 542 | ||
528 | //printf("lookup: %s -> ", name); | ||
529 | if (name) { | 543 | if (name) { |
530 | if (name[0] && !name[1]) { | 544 | if (name[0] && !name[1]) { |
531 | switch (name[0]) { | 545 | switch (name[0]) { |
532 | case 'y': return &symbol_yes; | 546 | case 'y': return &symbol_yes; |
533 | case 'm': return &symbol_mod; | 547 | case 'm': return &symbol_mod; |
534 | case 'n': return &symbol_no; | 548 | case 'n': return &symbol_no; |
535 | } | 549 | } |
536 | } | 550 | } |
537 | for (ptr = name; *ptr; ptr++) | 551 | for (ptr = name; *ptr; ptr++) |
538 | hash += *ptr; | 552 | hash += *ptr; |
539 | hash &= 0xff; | 553 | hash &= 0xff; |
540 | 554 | ||
541 | for (symbol = symbol_hash[hash]; symbol; symbol = symbol->next) { | 555 | for (symbol = symbol_hash[hash]; symbol; symbol = symbol->next) { |
542 | if (!strcmp(symbol->name, name)) { | 556 | if (!strcmp(symbol->name, name)) { |
543 | if ((isconst && symbol->flags & SYMBOL_CONST) || | 557 | if ((isconst && symbol->flags & SYMBOL_CONST) || |
544 | (!isconst && !(symbol->flags & SYMBOL_CONST))) { | 558 | (!isconst && !(symbol->flags & SYMBOL_CONST))) |
545 | //printf("h:%p\n", symbol); | ||
546 | return symbol; | 559 | return symbol; |
547 | } | ||
548 | } | 560 | } |
549 | } | 561 | } |
550 | new_name = strdup(name); | 562 | new_name = strdup(name); |
551 | } else { | 563 | } else { |
552 | new_name = NULL; | 564 | new_name = NULL; |
553 | hash = 256; | 565 | hash = 256; |
554 | } | 566 | } |
555 | 567 | ||
@@ -559,17 +571,16 @@ struct symbol *sym_lookup(const char *name, int isconst) | |||
559 | symbol->type = S_UNKNOWN; | 571 | symbol->type = S_UNKNOWN; |
560 | symbol->flags = SYMBOL_NEW; | 572 | symbol->flags = SYMBOL_NEW; |
561 | if (isconst) | 573 | if (isconst) |
562 | symbol->flags |= SYMBOL_CONST; | 574 | symbol->flags |= SYMBOL_CONST; |
563 | 575 | ||
564 | symbol->next = symbol_hash[hash]; | 576 | symbol->next = symbol_hash[hash]; |
565 | symbol_hash[hash] = symbol; | 577 | symbol_hash[hash] = symbol; |
566 | 578 | ||
567 | //printf("n:%p\n", symbol); | ||
568 | return symbol; | 579 | return symbol; |
569 | } | 580 | } |
570 | 581 | ||
571 | struct symbol *sym_find(const char *name) | 582 | struct symbol *sym_find(const char *name) |
572 | { | 583 | { |
573 | struct symbol *symbol = NULL; | 584 | struct symbol *symbol = NULL; |
574 | const char *ptr; | 585 | const char *ptr; |
575 | int hash = 0; | 586 | int hash = 0; |
diff --git a/scripts/kconfig/zconf.l b/scripts/kconfig/zconf.l index 6d81e5e..1471630 100644 --- a/scripts/kconfig/zconf.l +++ b/scripts/kconfig/zconf.l | |||
@@ -1,25 +1,25 @@ | |||
1 | %option backup nostdinit noyywrap full ecs | 1 | %option backup nostdinit noyywrap never-interactive full ecs |
2 | %option 8bit backup nodefault perf-report perf-report | 2 | %option 8bit backup nodefault perf-report perf-report |
3 | %x COMMAND HELP STRING PARAM | 3 | %x COMMAND HELP STRING PARAM |
4 | %{ | 4 | %{ |
5 | /* | 5 | /* |
6 | * Copyright (C) 2002 Roman Zippel <zippel@linux-m68k.org> | 6 | * Copyright (C) 2002 Roman Zippel <zippel@linux-m68k.org> |
7 | * Released under the terms of the GNU GPL v2.0. | 7 | * Released under the terms of the GNU GPL v2.0. |
8 | */ | 8 | */ |
9 | 9 | ||
10 | #include <limits.h> | ||
10 | #include <stdio.h> | 11 | #include <stdio.h> |
11 | #include <stdlib.h> | 12 | #include <stdlib.h> |
12 | #include <string.h> | 13 | #include <string.h> |
13 | #include <unistd.h> | 14 | #include <unistd.h> |
14 | 15 | ||
15 | #define LKC_DIRECT_LINK | 16 | #define LKC_DIRECT_LINK |
16 | #include "lkc.h" | 17 | #include "lkc.h" |
17 | #include "zconf.tab.h" | ||
18 | 18 | ||
19 | #define START_STRSIZE16 | 19 | #define START_STRSIZE16 |
20 | 20 | ||
21 | char *text; | 21 | char *text; |
22 | static char *text_ptr; | 22 | static char *text_ptr; |
23 | static int text_size, text_asize; | 23 | static int text_size, text_asize; |
24 | 24 | ||
25 | struct buffer { | 25 | struct buffer { |
@@ -78,18 +78,16 @@ n [A-Za-z0-9_] | |||
78 | [ \t]*\ncurrent_file->lineno++; return T_EOL; | 78 | [ \t]*\ncurrent_file->lineno++; return T_EOL; |
79 | 79 | ||
80 | [ \t]+{ | 80 | [ \t]+{ |
81 | BEGIN(COMMAND); | 81 | BEGIN(COMMAND); |
82 | } | 82 | } |
83 | 83 | ||
84 | .{ | 84 | .{ |
85 | unput(yytext[0]); | 85 | unput(yytext[0]); |
86 | //printf("new config: "); | ||
87 | //symbol_end(NULL); | ||
88 | BEGIN(COMMAND); | 86 | BEGIN(COMMAND); |
89 | } | 87 | } |
90 | 88 | ||
91 | 89 | ||
92 | <COMMAND>{ | 90 | <COMMAND>{ |
93 | "mainmenu" BEGIN(PARAM); return T_MAINMENU; | 91 | "mainmenu" BEGIN(PARAM); return T_MAINMENU; |
94 | "menu" BEGIN(PARAM); return T_MENU; | 92 | "menu" BEGIN(PARAM); return T_MENU; |
95 | "endmenu" BEGIN(PARAM); return T_ENDMENU; | 93 | "endmenu" BEGIN(PARAM); return T_ENDMENU; |
@@ -138,42 +136,56 @@ n [A-Za-z0-9_] | |||
138 | } | 136 | } |
139 | \nBEGIN(INITIAL); current_file->lineno++; return T_EOL; | 137 | \nBEGIN(INITIAL); current_file->lineno++; return T_EOL; |
140 | ---/* ignore */ | 138 | ---/* ignore */ |
141 | ({n}|[-/.])+{ | 139 | ({n}|[-/.])+{ |
142 | alloc_string(yytext, yyleng); | 140 | alloc_string(yytext, yyleng); |
143 | zconflval.string = text; | 141 | zconflval.string = text; |
144 | return T_WORD; | 142 | return T_WORD; |
145 | } | 143 | } |
144 | \\\ncurrent_file->lineno++; | ||
146 | . | 145 | . |
146 | <<EOF>> { | ||
147 | BEGIN(INITIAL); | ||
148 | } | ||
147 | } | 149 | } |
148 | 150 | ||
149 | <STRING>{ | 151 | <STRING>{ |
150 | [^'"\n\\]+{ | 152 | [^'"\\\n]+/\n{ |
153 | append_string(yytext, yyleng); | ||
154 | zconflval.string = text; | ||
155 | return T_STRING; | ||
156 | } | ||
157 | [^'"\\\n]+{ | ||
151 | append_string(yytext, yyleng); | 158 | append_string(yytext, yyleng); |
152 | } | 159 | } |
160 | \\.?/\n{ | ||
161 | append_string(yytext + 1, yyleng - 1); | ||
162 | zconflval.string = text; | ||
163 | return T_STRING; | ||
164 | } | ||
165 | \\.?{ | ||
166 | append_string(yytext + 1, yyleng - 1); | ||
167 | } | ||
153 | \'|\"{ | 168 | \'|\"{ |
154 | if (str == yytext[0]) { | 169 | if (str == yytext[0]) { |
155 | BEGIN(PARAM); | 170 | BEGIN(PARAM); |
156 | zconflval.string = text; | 171 | zconflval.string = text; |
157 | //printf("s:%s\n", text); | ||
158 | return T_STRING; | 172 | return T_STRING; |
159 | } else | 173 | } else |
160 | append_string(yytext, 1); | 174 | append_string(yytext, 1); |
161 | } | 175 | } |
162 | \\[ \t]*\nappend_string(yytext+yyleng-1, 1); current_file->lineno++; | ||
163 | \\[ \t]*append_string(yytext+1, yyleng-1); | ||
164 | \\. append_string(yytext+1, 1); | ||
165 | \n{ | 176 | \n{ |
166 | //printf(":%d: open string!\n", current_file->lineno+1); | 177 | printf("%s:%d:warning: multi-line strings not supported\n", zconf_curname(), zconf_lineno()); |
167 | exit(0); | 178 | current_file->lineno++; |
179 | BEGIN(INITIAL); | ||
180 | return T_EOL; | ||
168 | } | 181 | } |
169 | <<EOF>>{ | 182 | <<EOF>>{ |
170 | //printf(":%d: open string!\n", current_file->lineno+1); | 183 | BEGIN(INITIAL); |
171 | exit(0); | ||
172 | } | 184 | } |
173 | } | 185 | } |
174 | 186 | ||
175 | <HELP>{ | 187 | <HELP>{ |
176 | [ \t]+{ | 188 | [ \t]+{ |
177 | ts = 0; | 189 | ts = 0; |
178 | for (i = 0; i < yyleng; i++) { | 190 | for (i = 0; i < yyleng; i++) { |
179 | if (yytext[i] == '\t') | 191 | if (yytext[i] == '\t') |
@@ -216,16 +228,17 @@ n [A-Za-z0-9_] | |||
216 | } | 228 | } |
217 | } | 229 | } |
218 | 230 | ||
219 | <<EOF>>{ | 231 | <<EOF>>{ |
220 | if (current_buf) { | 232 | if (current_buf) { |
221 | zconf_endfile(); | 233 | zconf_endfile(); |
222 | return T_EOF; | 234 | return T_EOF; |
223 | } | 235 | } |
236 | fclose(yyin); | ||
224 | yyterminate(); | 237 | yyterminate(); |
225 | } | 238 | } |
226 | 239 | ||
227 | %% | 240 | %% |
228 | void zconf_starthelp(void) | 241 | void zconf_starthelp(void) |
229 | { | 242 | { |
230 | new_string(); | 243 | new_string(); |
231 | last_ts = first_ts = 0; | 244 | last_ts = first_ts = 0; |
@@ -233,51 +246,73 @@ void zconf_starthelp(void) | |||
233 | } | 246 | } |
234 | 247 | ||
235 | static void zconf_endhelp(void) | 248 | static void zconf_endhelp(void) |
236 | { | 249 | { |
237 | zconflval.string = text; | 250 | zconflval.string = text; |
238 | BEGIN(INITIAL); | 251 | BEGIN(INITIAL); |
239 | } | 252 | } |
240 | 253 | ||
254 | |||
255 | /* | ||
256 | * Try to open specified file with following names: | ||
257 | * ./name | ||
258 | * $(srctree)/name | ||
259 | * The latter is used when srctree is separate from objtree | ||
260 | * when compiling the kernel. | ||
261 | * Return NULL if file is not found. | ||
262 | */ | ||
263 | FILE *zconf_fopen(const char *name) | ||
264 | { | ||
265 | char *env, fullname[PATH_MAX+1]; | ||
266 | FILE *f; | ||
267 | |||
268 | f = fopen(name, "r"); | ||
269 | if (!f && name[0] != '/') { | ||
270 | env = getenv(SRCTREE); | ||
271 | if (env) { | ||
272 | sprintf(fullname, "%s/%s", env, name); | ||
273 | f = fopen(fullname, "r"); | ||
274 | } | ||
275 | } | ||
276 | return f; | ||
277 | } | ||
278 | |||
241 | void zconf_initscan(const char *name) | 279 | void zconf_initscan(const char *name) |
242 | { | 280 | { |
243 | yyin = fopen(name, "r"); | 281 | yyin = zconf_fopen(name); |
244 | if (!yyin) { | 282 | if (!yyin) { |
245 | printf("can't find file %s\n", name); | 283 | printf("can't find file %s\n", name); |
246 | exit(1); | 284 | exit(1); |
247 | } | 285 | } |
248 | //fprintf(stderr, "zconf_initscan: %s\n", name); | ||
249 | 286 | ||
250 | current_buf = malloc(sizeof(*current_buf)); | 287 | current_buf = malloc(sizeof(*current_buf)); |
251 | memset(current_buf, 0, sizeof(*current_buf)); | 288 | memset(current_buf, 0, sizeof(*current_buf)); |
252 | 289 | ||
253 | current_file = file_lookup(name); | 290 | current_file = file_lookup(name); |
254 | current_file->lineno = 1; | 291 | current_file->lineno = 1; |
255 | current_file->flags = FILE_BUSY; | 292 | current_file->flags = FILE_BUSY; |
256 | } | 293 | } |
257 | 294 | ||
258 | void zconf_nextfile(const char *name) | 295 | void zconf_nextfile(const char *name) |
259 | { | 296 | { |
260 | struct file *file = file_lookup(name); | 297 | struct file *file = file_lookup(name); |
261 | struct buffer *buf = malloc(sizeof(*buf)); | 298 | struct buffer *buf = malloc(sizeof(*buf)); |
262 | memset(buf, 0, sizeof(*buf)); | 299 | memset(buf, 0, sizeof(*buf)); |
263 | 300 | ||
264 | current_buf->state = YY_CURRENT_BUFFER; | 301 | current_buf->state = YY_CURRENT_BUFFER; |
265 | yyin = fopen(name, "r"); | 302 | yyin = zconf_fopen(name); |
266 | if (!yyin) { | 303 | if (!yyin) { |
267 | printf("%s:%d: can't open file \"%s\"\n", zconf_curname(), zconf_lineno(), name); | 304 | printf("%s:%d: can't open file \"%s\"\n", zconf_curname(), zconf_lineno(), name); |
268 | exit(1); | 305 | exit(1); |
269 | } | 306 | } |
270 | yy_switch_to_buffer(yy_create_buffer(yyin, YY_BUF_SIZE)); | 307 | yy_switch_to_buffer(yy_create_buffer(yyin, YY_BUF_SIZE)); |
271 | buf->parent = current_buf; | 308 | buf->parent = current_buf; |
272 | current_buf = buf; | 309 | current_buf = buf; |
273 | 310 | ||
274 | //fprintf(stderr, "zconf_nextfile: %s\n", name); | ||
275 | |||
276 | if (file->flags & FILE_BUSY) { | 311 | if (file->flags & FILE_BUSY) { |
277 | printf("recursive scan (%s)?\n", name); | 312 | printf("recursive scan (%s)?\n", name); |
278 | exit(1); | 313 | exit(1); |
279 | } | 314 | } |
280 | if (file->flags & FILE_SCANNED) { | 315 | if (file->flags & FILE_SCANNED) { |
281 | printf("file %s already scanned?\n", name); | 316 | printf("file %s already scanned?\n", name); |
282 | exit(1); | 317 | exit(1); |
283 | } | 318 | } |
@@ -292,16 +327,17 @@ static struct buffer *zconf_endfile(void) | |||
292 | struct buffer *parent; | 327 | struct buffer *parent; |
293 | 328 | ||
294 | current_file->flags |= FILE_SCANNED; | 329 | current_file->flags |= FILE_SCANNED; |
295 | current_file->flags &= ~FILE_BUSY; | 330 | current_file->flags &= ~FILE_BUSY; |
296 | current_file = current_file->parent; | 331 | current_file = current_file->parent; |
297 | 332 | ||
298 | parent = current_buf->parent; | 333 | parent = current_buf->parent; |
299 | if (parent) { | 334 | if (parent) { |
335 | fclose(yyin); | ||
300 | yy_delete_buffer(YY_CURRENT_BUFFER); | 336 | yy_delete_buffer(YY_CURRENT_BUFFER); |
301 | yy_switch_to_buffer(parent->state); | 337 | yy_switch_to_buffer(parent->state); |
302 | } | 338 | } |
303 | free(current_buf); | 339 | free(current_buf); |
304 | current_buf = parent; | 340 | current_buf = parent; |
305 | 341 | ||
306 | return parent; | 342 | return parent; |
307 | } | 343 | } |
diff --git a/scripts/kconfig/zconf.y b/scripts/kconfig/zconf.y index c3f1bd0..996b10a 100644 --- a/scripts/kconfig/zconf.y +++ b/scripts/kconfig/zconf.y | |||
@@ -222,35 +222,33 @@ choice_option: T_PROMPT prompt if_expr | |||
222 | }; | 222 | }; |
223 | 223 | ||
224 | choice_option: T_OPTIONAL | 224 | choice_option: T_OPTIONAL |
225 | { | 225 | { |
226 | current_entry->sym->flags |= SYMBOL_OPTIONAL; | 226 | current_entry->sym->flags |= SYMBOL_OPTIONAL; |
227 | printd(DEBUG_PARSE, "%s:%d:optional\n", zconf_curname(), zconf_lineno()); | 227 | printd(DEBUG_PARSE, "%s:%d:optional\n", zconf_curname(), zconf_lineno()); |
228 | }; | 228 | }; |
229 | 229 | ||
230 | choice_option: T_DEFAULT symbol | 230 | choice_option: T_DEFAULT symbol if_expr |
231 | { | 231 | { |
232 | menu_add_prop(P_DEFAULT, NULL, $2, NULL); | 232 | menu_add_prop(P_DEFAULT, NULL, $2, $3); |
233 | //current_choice->prop->def = $2; | ||
234 | printd(DEBUG_PARSE, "%s:%d:default\n", zconf_curname(), zconf_lineno()); | 233 | printd(DEBUG_PARSE, "%s:%d:default\n", zconf_curname(), zconf_lineno()); |
235 | }; | 234 | }; |
236 | 235 | ||
237 | choice_block: | 236 | choice_block: |
238 | /* empty */ | 237 | /* empty */ |
239 | | choice_block common_block | 238 | | choice_block common_block |
240 | ; | 239 | ; |
241 | 240 | ||
242 | /* if entry */ | 241 | /* if entry */ |
243 | 242 | ||
244 | if: T_IF expr | 243 | if: T_IF expr |
245 | { | 244 | { |
246 | printd(DEBUG_PARSE, "%s:%d:if\n", zconf_curname(), zconf_lineno()); | 245 | printd(DEBUG_PARSE, "%s:%d:if\n", zconf_curname(), zconf_lineno()); |
247 | menu_add_entry(NULL); | 246 | menu_add_entry(NULL); |
248 | //current_entry->prompt = menu_add_prop(T_IF, NULL, NULL, $2); | ||
249 | menu_add_dep($2); | 247 | menu_add_dep($2); |
250 | menu_end_entry(); | 248 | menu_end_entry(); |
251 | menu_add_menu(); | 249 | menu_add_menu(); |
252 | }; | 250 | }; |
253 | 251 | ||
254 | if_end: end | 252 | if_end: end |
255 | { | 253 | { |
256 | if (zconf_endtoken($1, T_IF, T_ENDIF)) { | 254 | if (zconf_endtoken($1, T_IF, T_ENDIF)) { |