mirrors/mc
1
0
Fork 0
mirror of https://github.com/MidnightCommander/mc synced 2024-12-23 04:46:55 +03:00
Code Issues Packages Projects Releases Wiki Activity

* editwidget.c: Use new dialog flags.

Browse Source 
* editcmd.c: Likewise.
(edit_completion_dialog): Set DLG_COMPACT for the dialog.
This commit is contained in:
Pavel Roskin 2002-08-22 15:38:27 +00:00
parent 8aa61fffa3
commit 6071fea76d
3 changed files with 18 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
edit/ChangeLog
View File

@ -1,5 +1,9 @@
2002-08-22 Pavel Roskin <proski@gnu.org> 2002-08-22 Pavel Roskin <proski@gnu.org>
* editwidget.c: Use new dialog flags.
* editcmd.c: Likewise.
(edit_completion_dialog): Set DLG_COMPACT for the dialog.
* editcmd.c (compl_callback): Use common_dialog_repaint(). * editcmd.c (compl_callback): Use common_dialog_repaint().
* editcmd.c (raw_callback): Use standard common_dialog_repaint() * editcmd.c (raw_callback): Use standard common_dialog_repaint()

21
edit/editcmd.c
View File

@ -481,25 +481,30 @@ int raw_callback (struct Dlg_head *h, int key, int Msg)
/* gets a raw key from the keyboard. Passing cancel = 1 draws /* gets a raw key from the keyboard. Passing cancel = 1 draws
a cancel button thus allowing c-c etc.. Alternatively, cancel = 0 a cancel button thus allowing c-c etc.. Alternatively, cancel = 0
will return the next key pressed */ will return the next key pressed */
int edit_raw_key_query (char *heading, char *query, int cancel) int
edit_raw_key_query (char *heading, char *query, int cancel)
{ {
int w = strlen (query) + 7; int w = strlen (query) + 7;
struct Dlg_head *raw_dlg = create_dlg (0, 0, 7, w, dialog_colors, struct Dlg_head *raw_dlg = create_dlg (0, 0, 7, w, dialog_colors,
/* NLS ? */ /* NLS ? */
raw_callback, "[Raw Key Query]", raw_callback, "[Raw Key Query]",
"raw_key_input", "raw_key_input",
DLG_CENTER | DLG_TRYUP); DLG_CENTER | DLG_TRYUP |
DLG_WANT_TAB);
x_set_dialog_title (raw_dlg, heading); x_set_dialog_title (raw_dlg, heading);
raw_dlg->raw = 1; /* to return even a tab key */
if (cancel) if (cancel)
add_widget (raw_dlg, button_new (4, w / 2 - 5, B_CANCEL, NORMAL_BUTTON, _("Cancel"), 0, 0, 0)); add_widget (raw_dlg,
button_new (4, w / 2 - 5, B_CANCEL, NORMAL_BUTTON,
_("Cancel"), 0, 0, 0));
add_widget (raw_dlg, label_new (3 - cancel, 2, query, 0)); add_widget (raw_dlg, label_new (3 - cancel, 2, query, 0));
add_widget (raw_dlg, input_new (3 - cancel, w - 5, INPUT_COLOR, 2, "", 0)); add_widget (raw_dlg,
input_new (3 - cancel, w - 5, INPUT_COLOR, 2, "", 0));
run_dlg (raw_dlg); run_dlg (raw_dlg);
w = raw_dlg->ret_value; w = raw_dlg->ret_value;
destroy_dlg (raw_dlg); destroy_dlg (raw_dlg);
if (cancel) if (cancel)
if (w == XCTRL ('g') || w == XCTRL ('c') || w == ESC_CHAR || w == B_CANCEL) if (w == XCTRL ('g') || w == XCTRL ('c') || w == ESC_CHAR
|| w == B_CANCEL)
return 0; return 0;
/* hence ctrl-a (=B_CANCEL), ctrl-g, ctrl-c, and Esc are cannot returned */ /* hence ctrl-a (=B_CANCEL), ctrl-g, ctrl-c, and Esc are cannot returned */
return w; return w;
@ -2555,7 +2560,7 @@ void edit_completion_dialog (WEdit *edit, int max_len, int word_len,
/* create the dialog */ /* create the dialog */
compl_dlg = create_dlg (start_y, start_x, compl_dlg_h, compl_dlg_w, compl_dlg = create_dlg (start_y, start_x, compl_dlg_h, compl_dlg_w,
dialog_colors, compl_callback, "[Word Completion]", "complete_word", dialog_colors, compl_callback, "[Word Completion]", "complete_word",
DLG_NONE); DLG_COMPACT);
/* create the listbox */ /* create the listbox */
compl_list = listbox_new (1, 1, compl_dlg_w - 2, compl_dlg_h - 2, 0, compl_list = listbox_new (1, 1, compl_dlg_w - 2, compl_dlg_h - 2, 0,

4
edit/editwidget.c
View File

@ -124,9 +124,7 @@ int edit (const char *_file, int line)
edit_dlg = create_dlg (0, 0, LINES, COLS, midnight_colors, edit_dlg = create_dlg (0, 0, LINES, COLS, midnight_colors,
edit_mode_callback, "[Internal File Editor]", edit_mode_callback, "[Internal File Editor]",
"edit", "edit",
DLG_NONE); DLG_WANT_TAB);
edit_dlg->raw = 1; /*so that tab = '\t' key works */
init_widget (&(wedit->widget), 0, 0, LINES - 1, COLS, init_widget (&(wedit->widget), 0, 0, LINES - 1, COLS,
(callback_fn) edit_callback, (callback_fn) edit_callback,