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

Added new initialization method for connect buttonbar to events

Browse Source 
Signed-off-by: Slava Zanko <slavazanko@gmail.com>
This commit is contained in:
Slava Zanko 2014-11-12 17:40:29 +03:00
parent 998d54742c
commit 38b8901d49
2 changed files with 64 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

65
lib/widget/buttonbar.c
View File

@ -38,6 +38,7 @@
#include <string.h>
#include "lib/global.h"
#include "lib/keymap.h"
#include "lib/tty/tty.h"
#include "lib/tty/mouse.h"
@ -144,13 +145,35 @@ set_label_text (WButtonBar * bb, int idx, const char *text)
/* returns TRUE if a function has been called, FALSE otherwise. */
static gboolean
buttonbar_call (WButtonBar * bb, int i)
buttonbar_call (WButtonBar * bb, int i, GError ** error)
{
cb_ret_t ret = MSG_NOT_HANDLED;
Widget *w = WIDGET (bb);
if ((bb != NULL) && (bb->labels[i].command != CK_IgnoreKey))
ret = send_message (w->owner, w, MSG_ACTION, bb->labels[i].command, bb->labels[i].receiver);
if (bb->use_keymap)
{
if (bb->labels[i].keymap_section != NULL)
{
event_return_t event_ret;
event_ret.b = TRUE;
if (mc_keymap_process_group
(bb->labels[i].keymap_section, bb->labels[i].command,
(void *) bb->labels[i].receiver, &event_ret, error))
ret = (event_ret.b) ? MSG_HANDLED : MSG_NOT_HANDLED;
}
}
else
{
if ((bb != NULL) && (bb->labels[i].command != CK_IgnoreKey))
{
Widget *w = WIDGET (bb);
ret =
send_message (w->owner, w, MSG_ACTION, bb->labels[i].command,
bb->labels[i].receiver);
}
}
return ret;
}
@ -169,7 +192,7 @@ buttonbar_callback (Widget * w, Widget * sender, widget_msg_t msg, int parm, voi
case MSG_HOTKEY:
for (i = 0; i < BUTTONBAR_LABELS_NUM; i++)
if (parm == KEY_F (i + 1) && buttonbar_call (bb, i))
if (parm == KEY_F (i + 1) && buttonbar_call (bb, i, NULL))
return MSG_HANDLED;
return MSG_NOT_HANDLED;
@ -230,7 +253,7 @@ buttonbar_event (Gpm_Event * event, void *data)
local = mouse_get_local (event, w);
button = buttonbar_get_button_by_x_coord (bb, local.x - 1);
if (button >= 0)
buttonbar_call (bb, button);
buttonbar_call (bb, button, NULL);
}
return MOU_NORMAL;
@ -252,12 +275,42 @@ buttonbar_new (gboolean visible)
w->pos_flags = WPOS_KEEP_HORZ | WPOS_KEEP_BOTTOM;
bb->visible = visible;
bb->use_keymap = FALSE;
widget_want_hotkey (w, TRUE);
widget_want_cursor (w, FALSE);
return bb;
}
/* --------------------------------------------------------------------------------------------- */
/**
* Init one button in buttonbar. use keymap implementation.
*
* @param bb the ButtonBar object
* @param idx the buton index
* @param text the label of button
* @param keymap_section the keymap section for searching event
* @param receiver the widget
*/
void
buttonbar_init_button (WButtonBar * bb, int idx, const char *text,
const char *keymap_section, const Widget * w)
{
if ((bb != NULL) && (idx >= 1) && (idx <= BUTTONBAR_LABELS_NUM))
{
bb->use_keymap = TRUE;
bb->labels[idx - 1].command = KEY_F (idx);
bb->labels[idx - 1].receiver = WIDGET (w);
bb->labels[idx - 1].keymap_section = keymap_section;
if ((text == NULL) || (text[0] == '\0'))
set_label_text (bb, idx, "");
else
set_label_text (bb, idx, text);
}
}
/* --------------------------------------------------------------------------------------------- */
void

5
lib/widget/buttonbar.h
View File

@ -25,9 +25,11 @@ typedef struct WButtonBar
{
Widget widget;
gboolean visible; /* Is it visible? */
gboolean use_keymap; /* is the widget used Keymap(new, true) or keybind(old, false)? */
struct
{
char *text;
const char *keymap_section;
unsigned long command;
Widget *receiver;
int end_coord; /* cumulative width of buttons so far */
@ -41,6 +43,9 @@ struct global_keymap_t;
/*** declarations of public functions ************************************************************/
WButtonBar *buttonbar_new (gboolean visible);
void
buttonbar_init_button (WButtonBar * bb, int idx, const char *text,
const char *keymap_section, const Widget * w);
void buttonbar_set_label (WButtonBar * bb, int idx, const char *text,
const struct global_keymap_t *keymap, const Widget * receiver);
WButtonBar *find_buttonbar (const WDialog * h);