mirrors/mc
1
0
Fork 0
mirror of https://github.com/MidnightCommander/mc synced 2025-01-08 20:41:59 +03:00
Code Issues Packages Projects Releases Wiki Activity

Implement uniq widget ID for each widget.

Browse Source 
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
This commit is contained in:
Andrew Borodin 2016-09-28 13:37:31 +03:00
parent b9cf650605
commit 5ce511e07e
4 changed files with 24 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
lib/widget/group.c
View File

@ -174,7 +174,6 @@ group_add_widget_autopos (WGroup * g, void *w, widget_pos_flags_t pos_flags, con
ww->owner = g; ww->owner = g;
ww->pos_flags = pos_flags; ww->pos_flags = pos_flags;
ww->id = g->widget_id++;
if (g->widgets == NULL || before == NULL) if (g->widgets == NULL || before == NULL)
{ {

1
lib/widget/group.h
View File

@ -30,7 +30,6 @@ struct WGroup
GList *widgets; /* widgets list */ GList *widgets; /* widgets list */
GList *current; /* Currently active widget */ GList *current; /* Currently active widget */
unsigned long widget_id; /* maximum id of all widgets */
gboolean winch_pending; /* SIGWINCH signal has been got. Resize group after rise */ gboolean winch_pending; /* SIGWINCH signal has been got. Resize group after rise */
}; };

23
lib/widget/widget-common.c
View File

@ -53,10 +53,32 @@
/*** file scope variables ************************************************************************/ /*** file scope variables ************************************************************************/
/* maximum value of used widget ID */
static unsigned long widget_id = 0;
/* --------------------------------------------------------------------------------------------- */ /* --------------------------------------------------------------------------------------------- */
/*** file scope functions ************************************************************************/ /*** file scope functions ************************************************************************/
/* --------------------------------------------------------------------------------------------- */ /* --------------------------------------------------------------------------------------------- */
/**
* Calc widget ID,
* Widget ID is uniq for each widget created during MC session (like PID in OS).
*
* @return widget ID.
*/
static unsigned long
widget_set_id (void)
{
unsigned long id;
id = widget_id++;
/* TODO IF NEEDED: if id is already used, find next free id. */
return id;
}
/* --------------------------------------------------------------------------------------------- */
static void static void
widget_do_focus (Widget * w, gboolean enable) widget_do_focus (Widget * w, gboolean enable)
{ {
@ -252,6 +274,7 @@ void
widget_init (Widget * w, int y, int x, int lines, int cols, widget_init (Widget * w, int y, int x, int lines, int cols,
widget_cb_fn callback, widget_mouse_cb_fn mouse_callback) widget_cb_fn callback, widget_mouse_cb_fn mouse_callback)
{ {
w->id = widget_set_id ();
w->x = x; w->x = x;
w->y = y; w->y = y;
w->cols = cols; w->cols = cols;

2
lib/widget/widget-common.h
View File

@ -131,7 +131,7 @@ struct Widget
widget_pos_flags_t pos_flags; /* repositioning flags */ widget_pos_flags_t pos_flags; /* repositioning flags */
widget_options_t options; widget_options_t options;
widget_state_t state; widget_state_t state;
unsigned int id; /* Number of the widget, starting with 0 */ unsigned long id; /* uniq widget ID */
widget_cb_fn callback; widget_cb_fn callback;
widget_mouse_cb_fn mouse_callback; widget_mouse_cb_fn mouse_callback;
WGroup *owner; WGroup *owner;