Enlightenment CVS committal
Author : kwo
Project : e16
Module : e
Dir : e16/e/src
Modified Files:
actions.c backgrounds.c dialog.c dialog.h session.c
Log Message:
Add data parameter to dialog keybinding callback.
===================================================================
RCS file: /cvs/e/e16/e/src/actions.c,v
retrieving revision 1.205
retrieving revision 1.206
diff -u -3 -r1.205 -r1.206
--- actions.c 8 Aug 2006 03:58:41 -0000 1.205
+++ actions.c 20 Aug 2006 17:39:32 -0000 1.206
@@ -312,8 +312,8 @@
DialogItemSetText(di, buf);
DialogAddButton(d, _("OK"), NULL, 1, DLG_BUTTON_OK);
- DialogBindKey(d, "Return", DialogCallbackClose, 0);
- DialogBindKey(d, "Escape", DialogCallbackClose, 0);
+ DialogBindKey(d, "Return", DialogCallbackClose, 0, NULL);
+ DialogBindKey(d, "Escape", DialogCallbackClose, 0, NULL);
}
static const DialogDef DlgAbout = {
===================================================================
RCS file: /cvs/e/e16/e/src/backgrounds.c,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -3 -r1.82 -r1.83
--- backgrounds.c 8 Aug 2006 03:58:41 -0000 1.82
+++ backgrounds.c 20 Aug 2006 17:39:32 -0000 1.83
@@ -2036,7 +2036,7 @@
di = DialogAddItem(table2, DITEM_BUTTON);
DialogItemSetText(di, _("Move to Front\n"));
DialogItemSetCallback(di, CB_ConfigureFrontBG, 0, NULL);
- DialogBindKey(d, "F", CB_ConfigureFrontBG, 0);
+ DialogBindKey(d, "F", CB_ConfigureFrontBG, 0, NULL);
di = DialogAddItem(table2, DITEM_BUTTON);
DialogItemSetText(di, _("Duplicate\n"));
@@ -2049,8 +2049,8 @@
di = DialogAddItem(table2, DITEM_BUTTON);
DialogItemSetText(di, _("Delete File\n"));
DialogItemSetCallback(di, CB_ConfigureDelBG, 0, NULL);
- DialogBindKey(d, "D", CB_ConfigureDelBG, 0);
- DialogBindKey(d, "Delete", CB_ConfigureDelBG, 1);
+ DialogBindKey(d, "D", CB_ConfigureDelBG, 0, NULL);
+ DialogBindKey(d, "Delete", CB_ConfigureDelBG, 1, NULL);
di = DialogAddItem(table, DITEM_TEXT);
DialogItemSetFill(di, 0, 0);
@@ -2204,15 +2204,15 @@
DialogItemSetFill(di, 0, 0);
DialogItemSetText(di, "<-");
DialogItemSetCallback(di, CB_BGNext, -1, NULL);
- DialogBindKey(d, "Left", CB_BGNext, -1);
- DialogBindKey(d, "BackSpace", CB_BGNext, -1);
+ DialogBindKey(d, "Left", CB_BGNext, -1, NULL);
+ DialogBindKey(d, "BackSpace", CB_BGNext, -1, NULL);
di = DialogAddItem(table2, DITEM_BUTTON);
DialogItemSetFill(di, 0, 0);
DialogItemSetText(di, "->");
DialogItemSetCallback(di, CB_BGNext, 1, NULL);
- DialogBindKey(d, "Right", CB_BGNext, 1);
- DialogBindKey(d, "space", CB_BGNext, 1);
+ DialogBindKey(d, "Right", CB_BGNext, 1, NULL);
+ DialogBindKey(d, "space", CB_BGNext, 1, NULL);
di = DialogAddItem(table, DITEM_BUTTON);
DialogItemSetFill(di, 0, 0);
===================================================================
RCS file: /cvs/e/e16/e/src/dialog.c,v
retrieving revision 1.167
retrieving revision 1.168
diff -u -3 -r1.167 -r1.168
--- dialog.c 20 Aug 2006 13:53:55 -0000 1.167
+++ dialog.c 20 Aug 2006 17:39:32 -0000 1.168
@@ -175,8 +175,9 @@
typedef struct
{
KeyCode key;
- int val;
DialogCallbackFunc *func;
+ int val;
+ void *data;
} DKeyBind;
struct _dialog
@@ -232,7 +233,8 @@
static char dialog_update_pending = 0;
void
-DialogBindKey(Dialog * d, const char *key, DialogCallbackFunc * func, int val)
+DialogBindKey(Dialog * d, const char *key, DialogCallbackFunc * func, int val,
+ void *data)
{
d->num_bindings++;
if (!d->keybindings)
@@ -242,6 +244,7 @@
Erealloc(d->keybindings, sizeof(DKeyBind) * d->num_bindings);
d->keybindings[d->num_bindings - 1].val = val;
d->keybindings[d->num_bindings - 1].func = func;
+ d->keybindings[d->num_bindings - 1].data = data;
d->keybindings[d->num_bindings - 1].key =
XKeysymToKeycode(disp, XStringToKeysym(key));
}
@@ -960,8 +963,7 @@
}
static void
-DialogAddFooter(Dialog * d, DItem * parent __UNUSED__, int flags,
- DialogCallbackFunc * cb)
+DialogAddFooter(Dialog * d, DItem * parent, int flags, DialogCallbackFunc * cb)
{
DItem *table, *di;
@@ -978,12 +980,12 @@
if (flags & 2)
{
DialogAddButton(d, _("Apply"), cb, 0, DLG_BUTTON_APPLY);
- DialogBindKey(d, "Return", cb, 0);
+ DialogBindKey(d, "Return", cb, 0, NULL);
}
if (flags & 1)
{
DialogAddButton(d, _("Close"), cb, 1, DLG_BUTTON_CLOSE);
- DialogBindKey(d, "Escape", DialogCallbackClose, 0);
+ DialogBindKey(d, "Escape", DialogCallbackClose, 0, NULL);
}
DialogSetExitFunction(d, cb, 2);
}
@@ -2216,8 +2218,8 @@
DialogSetText(d, txt);
DialogAddButton(d, _("OK"), NULL, 1, DLG_BUTTON_OK);
- DialogBindKey(d, "Return", DialogCallbackClose, 0);
- DialogBindKey(d, "Escape", DialogCallbackClose, 0);
+ DialogBindKey(d, "Return", DialogCallbackClose, 0, NULL);
+ DialogBindKey(d, "Escape", DialogCallbackClose, 0, NULL);
DialogShow(d);
}
@@ -2258,7 +2260,8 @@
{
if (ev->xkey.keycode != d->keybindings[i].key)
continue;
- d->keybindings[i].func(d, d->keybindings[i].val, NULL);
+ d->keybindings[i].func(d, d->keybindings[i].val,
+ d->keybindings[i].data);
break;
}
}
===================================================================
RCS file: /cvs/e/e16/e/src/dialog.h,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -3 -r1.15 -r1.16
--- dialog.h 20 Aug 2006 13:53:55 -0000 1.15
+++ dialog.h 20 Aug 2006 17:39:32 -0000 1.16
@@ -70,7 +70,8 @@
Dialog *DialogCreate(const char *name);
Dialog *DialogFind(const char *name);
void DialogBindKey(Dialog * d, const char *key,
- DialogCallbackFunc * func, int val);
+ DialogCallbackFunc * func, int val,
+ void *data);
void DialogSetText(Dialog * d, const char *text);
void DialogSetTitle(Dialog * d, const char *title);
void DialogSetExitFunction(Dialog * d, DialogCallbackFunc *
func,
===================================================================
RCS file: /cvs/e/e16/e/src/session.c,v
retrieving revision 1.134
retrieving revision 1.135
diff -u -3 -r1.134 -r1.135
--- session.c 8 Aug 2006 03:58:42 -0000 1.134
+++ session.c 20 Aug 2006 17:39:32 -0000 1.135
@@ -658,8 +658,8 @@
}
DialogAddButton(d, _(" Yes, Log Out "), LogoutCB, 1, DLG_BUTTON_OK);
DialogAddButton(d, _(" No "), NULL, 1, DLG_BUTTON_CANCEL);
- DialogBindKey(d, "Escape", DialogCallbackClose, 1);
- DialogBindKey(d, "Return", LogoutCB, 0);
+ DialogBindKey(d, "Escape", DialogCallbackClose, 1, NULL);
+ DialogBindKey(d, "Return", LogoutCB, 0, NULL);
}
DialogShowCentered(d);
-------------------------------------------------------------------------
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
