Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

kconfig/mconf.c: revision of curses initialization.

Browse source 
Since commit d0e1e09568 initscr() is called twice in mconf.

Do it only in init_dialog() in util.c and there also save the
cursor position for the signal handler in mconf.c.

Signed-off-by: Dirk Gouders <gouders@et.bocholt.fh-gelsenkirchen.de>
Signed-off-by: Michal Marek <mmarek@suse.cz>
This commit is contained in:
Dirk Gouders 2012-08-06 16:48:23 +02:00 committed by Michal Marek
parent 0d7614f09c
commit 3eb95c84ee
3 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
scripts/kconfig/lxdialog/dialog.h
View file

@ -144,6 +144,7 @@ struct dialog_info {
*/ */
extern struct dialog_info dlg; extern struct dialog_info dlg;
extern char dialog_input_result[]; extern char dialog_input_result[];
extern int saved_x, saved_y; /* Needed in signal handler in mconf.c */
/* /*
* Function prototypes * Function prototypes

7
scripts/kconfig/lxdialog/util.c
View file

@ -23,6 +23,9 @@
#include "dialog.h" #include "dialog.h"
/* Needed in signal handler in mconf.c */
int saved_x, saved_y;
struct dialog_info dlg; struct dialog_info dlg;
static void set_mono_theme(void) static void set_mono_theme(void)
@ -273,6 +276,10 @@ int init_dialog(const char *backtitle)
int height, width; int height, width;
initscr(); /* Init curses */ initscr(); /* Init curses */
/* Get current cursor position for signal handler in mconf.c */
getyx(stdscr, saved_y, saved_x);
getmaxyx(stdscr, height, width); getmaxyx(stdscr, height, width);
if (height < 19 || width < 80) { if (height < 19 || width < 80) {
endwin(); endwin();

4
scripts/kconfig/mconf.c
View file

@ -273,7 +273,6 @@ static struct menu *current_menu;
static int child_count; static int child_count;
static int single_menu_mode; static int single_menu_mode;
static int show_all_options; static int show_all_options;
static int saved_x, saved_y;
static void conf(struct menu *menu); static void conf(struct menu *menu);
static void conf_choice(struct menu *menu); static void conf_choice(struct menu *menu);
@ -862,9 +861,6 @@ int main(int ac, char **av)
single_menu_mode = 1; single_menu_mode = 1;
} }
initscr();
getyx(stdscr, saved_y, saved_x);
if (init_dialog(NULL)) { if (init_dialog(NULL)) {
fprintf(stderr, N_("Your display is too small to run Menuconfig!\n")); fprintf(stderr, N_("Your display is too small to run Menuconfig!\n"));
fprintf(stderr, N_("It must be at least 19 lines by 80 columns.\n")); fprintf(stderr, N_("It must be at least 19 lines by 80 columns.\n"));