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

Merge branch '3569_listbox_fixups'

Browse Source 
* 3569_listbox_fixups:
  Ticket #3161: WListbox: remember focus state.
  Ticket #3565: "External Panelize": use WListbox's notification. notification.
  Ticket #3563: "Directory hotlist": use WListbox's change notification.
  Ticket #3569: various fixups in WListbox engine.
This commit is contained in:
Andrew Borodin 2016-01-08 13:28:00 +03:00
commit 209b616816
4 changed files with 78 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

77
lib/widget/listbox.c
View File

@ -386,6 +386,39 @@ listbox_append_item (WListbox * l, WLEntry * e, listbox_append_t pos)
/* --------------------------------------------------------------------------------------------- */
/* Call this whenever the user changes the selected item. */
static void
listbox_on_change (WListbox * l)
{
listbox_draw (l, TRUE);
send_message (WIDGET (l)->owner, l, MSG_ACTION, l->pos, NULL);
}
/* --------------------------------------------------------------------------------------------- */
static void
listbox_run_hotkey (WListbox * l, int pos)
{
WDialog *h = WIDGET (l)->owner;
int action;
listbox_select_entry (l, pos);
listbox_on_change (l);
if (l->callback != NULL)
action = l->callback (l);
else
action = LISTBOX_DONE;
if (action == LISTBOX_DONE)
{
h->ret_value = B_ENTER;
dlg_stop (h);
}
}
/* --------------------------------------------------------------------------------------------- */
static inline void
listbox_destroy (WListbox * l)
{
@ -398,7 +431,6 @@ static cb_ret_t
listbox_callback (Widget * w, Widget * sender, widget_msg_t msg, int parm, void *data)
{
WListbox *l = LISTBOX (w);
WDialog *h = w->owner;
cb_ret_t ret_code;
switch (msg)
@ -408,25 +440,13 @@ listbox_callback (Widget * w, Widget * sender, widget_msg_t msg, int parm, void
case MSG_HOTKEY:
{
int pos, action;
int pos;
pos = listbox_check_hotkey (l, parm);
if (pos < 0)
return MSG_NOT_HANDLED;
listbox_select_entry (l, pos);
send_message (h, w, MSG_ACTION, l->pos, NULL);
if (l->callback != NULL)
action = l->callback (l);
else
action = LISTBOX_DONE;
if (action == LISTBOX_DONE)
{
h->ret_value = B_ENTER;
dlg_stop (h);
}
listbox_run_hotkey (l, pos);
return MSG_HANDLED;
}
@ -434,10 +454,7 @@ listbox_callback (Widget * w, Widget * sender, widget_msg_t msg, int parm, void
case MSG_KEY:
ret_code = listbox_key (l, parm);
if (ret_code != MSG_NOT_HANDLED)
{
listbox_draw (l, TRUE);
send_message (h, w, MSG_ACTION, l->pos, NULL);
}
listbox_on_change (l);
return ret_code;
case MSG_ACTION:
@ -445,13 +462,14 @@ listbox_callback (Widget * w, Widget * sender, widget_msg_t msg, int parm, void
case MSG_CURSOR:
widget_move (l, l->cursor_y, 0);
send_message (h, w, MSG_ACTION, l->pos, NULL);
return MSG_HANDLED;
case MSG_FOCUS:
case MSG_UNFOCUS:
l->focused = msg == MSG_FOCUS;
/* fall through */
case MSG_DRAW:
listbox_draw (l, msg != MSG_UNFOCUS);
listbox_draw (l, l->focused);
return MSG_HANDLED;
case MSG_DESTROY:
@ -507,7 +525,7 @@ listbox_event (Gpm_Event * event, void *data)
else
listbox_select_entry (l, listbox_y_pos (l, local.y - 1));
listbox_draw (l, TRUE);
listbox_on_change (l);
return ret;
}
@ -515,22 +533,10 @@ listbox_event (Gpm_Event * event, void *data)
if ((event->type & (GPM_DOUBLE | GPM_UP)) == (GPM_UP | GPM_DOUBLE))
{
Gpm_Event local;
int action;
local = mouse_get_local (event, w);
dlg_select_widget (l);
listbox_select_entry (l, listbox_y_pos (l, local.y - 1));
if (l->callback != NULL)
action = l->callback (l);
else
action = LISTBOX_DONE;
if (action == LISTBOX_DONE)
{
w->owner->ret_value = B_ENTER;
dlg_stop (w->owner);
}
listbox_run_hotkey (l, listbox_y_pos (l, local.y - 1));
}
return MOU_NORMAL;
@ -559,6 +565,7 @@ listbox_new (int y, int x, int height, int width, gboolean deletable, lcback_fn
l->callback = callback;
l->allow_duplicates = TRUE;
l->scrollbar = !mc_global.tty.slow_terminal;
l->focused = FALSE;
widget_want_hotkey (w, TRUE);
widget_want_cursor (w, FALSE);

1
lib/widget/listbox.h
View File

@ -52,6 +52,7 @@ typedef struct WListbox
gboolean allow_duplicates; /* Do we allow duplicates on the list? */
gboolean scrollbar; /* Draw a scrollbar? */
gboolean deletable; /* Can list entries be deleted? */
gboolean focused; /* Listbox is focused */
lcback_fn callback; /* The callback function */
int cursor_x, cursor_y; /* Cache the values */
} WListbox;

35
src/filemanager/hotlist.c
View File

@ -335,10 +335,8 @@ add_name_to_list (const char *path)
/* --------------------------------------------------------------------------------------------- */
static int
hotlist_button_callback (WButton * button, int action)
hotlist_run_cmd (int action)
{
(void) button;
switch (action)
{
case B_MOVE:
@ -489,6 +487,19 @@ hotlist_button_callback (WButton * button, int action)
/* --------------------------------------------------------------------------------------------- */
static int
hotlist_button_callback (WButton * button, int action)
{
int ret;
(void) button;
ret = hotlist_run_cmd (action);
update_path_name ();
return ret;
}
/* --------------------------------------------------------------------------------------------- */
static inline cb_ret_t
hotlist_handle_key (WDialog * h, int key)
{
@ -565,16 +576,16 @@ hotlist_callback (Widget * w, Widget * sender, widget_msg_t msg, int parm, void
switch (msg)
{
case MSG_INIT:
update_path_name ();
return MSG_HANDLED;
case MSG_UNHANDLED_KEY:
return hotlist_handle_key (h, parm);
case MSG_POST_KEY:
dlg_select_widget (h == hotlist_dlg ? l_hotlist : l_movelist);
/* always stay on hotlist */
/* fall through */
case MSG_INIT:
update_path_name ();
dlg_select_widget (h == hotlist_dlg ? l_hotlist : l_movelist);
return MSG_HANDLED;
case MSG_RESIZE:
@ -582,6 +593,14 @@ hotlist_callback (Widget * w, Widget * sender, widget_msg_t msg, int parm, void
dlg_set_size (h, LINES - (h == hotlist_dlg ? 2 : 6), COLS - 6);
return MSG_HANDLED;
case MSG_ACTION:
if (sender == NULL)
return MSG_NOT_HANDLED;
/* The listbox tells us the item has changed. */
update_path_name ();
return MSG_HANDLED;
default:
return dlg_default_callback (w, sender, msg, parm, data);
}

11
src/filemanager/panelize.c
View File

@ -113,9 +113,14 @@ panelize_callback (Widget * w, Widget * sender, widget_msg_t msg, int parm, void
switch (msg)
{
case MSG_INIT:
case MSG_POST_KEY:
case MSG_FOCUS:
tty_setcolor (MENU_ENTRY_COLOR);
update_command ();
return MSG_HANDLED;
case MSG_ACTION:
if (sender == NULL)
return MSG_NOT_HANDLED;
/* The listbox tells us the item has changed. */
update_command ();
return MSG_HANDLED;