kconfig/mconf.c: revision of curses initialization. (3eb95c84) · Commits · 戴 / test

scripts/kconfig/lxdialog/dialog.h

+1 −0

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

		/*
		* Function prototypes

+7 −0

Original line number	Diff line number	Diff line
		@@ -23,6 +23,9 @@

		#include "dialog.h"

		/* Needed in signal handler in mconf.c */
		int saved_x, saved_y;

		struct dialog_info dlg;

		static void set_mono_theme(void)
		@@ -273,6 +276,10 @@ int init_dialog(const char *backtitle)
		int height, width;

		initscr(); /* Init curses */

		/* Get current cursor position for signal handler in mconf.c */
		getyx(stdscr, saved_y, saved_x);

		getmaxyx(stdscr, height, width);
		if (height < 19 \|\| width < 80) {
		endwin();

+0 −4

Original line number	Diff line number	Diff line
		@@ -273,7 +273,6 @@ static struct menu *current_menu;
		static int child_count;
		static int single_menu_mode;
		static int show_all_options;
		static int saved_x, saved_y;

		static void conf(struct menu *menu);
		static void conf_choice(struct menu *menu);
		@@ -862,9 +861,6 @@ int main(int ac, char **av)
		single_menu_mode = 1;
		}

		initscr();

		getyx(stdscr, saved_y, saved_x);
		if (init_dialog(NULL)) {
		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"));