Enlightenment CVS committal
Author : kwo
Project : e16
Module : e
Dir : e16/e/src
Modified Files:
Tag: branch-exp
E.h backgrounds.c dialog.c fx.c groups.c iconify.c mod-desks.c
mod-trans.c pager.c session.c settings.c snaps.c sound.c
tooltips.c
Log Message:
Dialog stuff.
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/E.h,v
retrieving revision 1.314.2.75
retrieving revision 1.314.2.76
diff -u -3 -r1.314.2.75 -r1.314.2.76
--- E.h 22 Dec 2004 23:39:06 -0000 1.314.2.75
+++ E.h 24 Dec 2004 14:03:52 -0000 1.314.2.76
@@ -1474,45 +1474,43 @@
void DeskDragMotion(void);
/* dialog.c */
+typedef void (DialogCallbackFunc) (Dialog * d, int val, void *data);
+typedef void (DialogItemCallbackFunc) (int val, void *data);
+
Dialog *DialogCreate(const char *name);
void DialogDestroy(Dialog * d);
void DialogBindKey(Dialog * d, const char *key,
- void (*func) (int val, void *data), int val,
- void *data);
+ DialogCallbackFunc * func, int val);
void DialogSetText(Dialog * d, const char *text);
void DialogSetTitle(Dialog * d, const char *title);
-void DialogSetExitFunction(Dialog * d,
- void (*func) (int val, void *data),
- int val, void *data);
+void DialogSetExitFunction(Dialog * d, DialogCallbackFunc *
func,
+ int val);
void DialogRedraw(Dialog * d);
void ShowDialog(Dialog * d);
void DialogClose(Dialog * d);
void DialogAddButton(Dialog * d, const char *text,
- void (*func) (int val, void *data),
- char doclose);
+ DialogCallbackFunc * func, char doclose);
DItem *DialogInitItem(Dialog * d);
DItem *DialogAddItem(DItem * dii, int type);
DItem *DialogItem(Dialog * d);
-void DialogItemSetCallback(DItem * di,
- void (*func) (int val, void *data),
- int val, char *data);
+void DialogItemSetCallback(DItem * di, DialogCallbackFunc *
func,
+ int val, void *data);
void DialogItemSetClass(DItem * di, ImageClass * ic,
TextClass * tclass);
void DialogItemSetPadding(DItem * di, int left, int right,
int top, int bottom);
void DialogItemSetFill(DItem * di, char fill_h, char fill_v);
void DialogItemSetAlign(DItem * di, int align_h, int align_v);
-void DialogItemCallCallback(DItem * di);
+void DialogItemCallCallback(Dialog * d, DItem * di);
void DialogDrawItems(Dialog * d, DItem * di, int x, int y, int
w,
int h);
void DialogItemButtonSetText(DItem * di, const char *text);
void DialogItemCheckButtonSetText(DItem * di, const char *text);
void DialogItemTextSetText(DItem * di, const char *text);
void DialogItemRadioButtonSetEventFunc(DItem * di,
- void (*func) (int val,
- void
- *data));
+ DialogItemCallbackFunc *
+ func);
void DialogItemCheckButtonSetState(DItem * di, char onoff);
void DialogItemCheckButtonSetPtr(DItem * di, char *onoff_ptr);
void DialogItemTableSetOptions(DItem * di, int num_columns,
@@ -1545,14 +1543,12 @@
void DialogItemAreaGetSize(DItem * di, int *w, int *h);
Window DialogItemAreaGetWindow(DItem * di);
void DialogItemAreaSetEventFunc(DItem * di,
- void (*func) (int val,
- void *data));
-void DialogCallbackClose(int val, void *data);
+ DialogItemCallbackFunc * func);
+
+void DialogCallbackClose(Dialog * d, int val, void *data);
void DialogOK(const char *title, const char *fmt, ...);
void DialogOKstr(const char *title, const char *txt);
-void DialogRestart(int val, void *data);
-void DialogQuit(int val, void *data);
void DialogAlert(const char *fmt, ...);
void DialogAlertOK(const char *fmt, ...);
@@ -2124,6 +2120,7 @@
void RemoveRememberedWindow(EWin * ewin);
void SettingsRemember(void);
void SettingsMiscellaneous(void);
+void SettingsComposite(void);
/* setup.c */
void MapUnmap(int start);
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/backgrounds.c,v
retrieving revision 1.5.2.15
retrieving revision 1.5.2.16
diff -u -3 -r1.5.2.15 -r1.5.2.16
--- backgrounds.c 18 Dec 2004 00:00:57 -0000 1.5.2.15
+++ backgrounds.c 24 Dec 2004 14:03:53 -0000 1.5.2.16
@@ -1312,7 +1312,7 @@
static void BG_RedrawView(char nuke_old);
static void
-CB_ConfigureBG(int val, void *data __UNUSED__)
+CB_ConfigureBG(Dialog * d __UNUSED__, int val, void *data __UNUSED__)
{
int i;
@@ -1370,7 +1370,8 @@
/* Draw the background preview image */
static void
-CB_DesktopMiniDisplayRedraw(int val __UNUSED__, void *data)
+CB_DesktopMiniDisplayRedraw(Dialog * d __UNUSED__, int val __UNUSED__,
+ void *data)
{
Background *bg;
int w, h;
@@ -1467,7 +1468,7 @@
DialogItemSliderSetVal(tmp_w[9], tmp_bg_xperc);
/* Redraw preview image */
- CB_DesktopMiniDisplayRedraw(0, bg_mini_disp);
+ CB_DesktopMiniDisplayRedraw(NULL, 0, bg_mini_disp);
/* Redraw scrolling BG list */
BG_RedrawView(0);
@@ -1478,7 +1479,8 @@
/* Duplicate current (tmp_bg) to new */
static void
-CB_ConfigureNewBG(int val __UNUSED__, void *data __UNUSED__)
+CB_ConfigureNewBG(Dialog * d __UNUSED__, int val __UNUSED__,
+ void *data __UNUSED__)
{
char s[1024];
XColor xclr;
@@ -1511,7 +1513,7 @@
}
static void
-CB_ConfigureDelBG(int val, void *data __UNUSED__)
+CB_ConfigureDelBG(Dialog * d __UNUSED__, int val, void *data __UNUSED__)
{
Background **bglist, *bg;
int i, num;
@@ -1558,7 +1560,8 @@
/* Move current background to first position in list */
static void
-CB_ConfigureFrontBG(int val __UNUSED__, void *data __UNUSED__)
+CB_ConfigureFrontBG(Dialog * d __UNUSED__, int val __UNUSED__,
+ void *data __UNUSED__)
{
MoveItemToListTop(tmp_bg, LIST_TYPE_BACKGROUND);
BG_RedrawView(0);
@@ -1691,13 +1694,13 @@
}
static void
-CB_BGAreaSlide(int val __UNUSED__, void *data __UNUSED__)
+CB_BGAreaSlide(Dialog * d __UNUSED__, int val __UNUSED__, void *data
__UNUSED__)
{
BG_RedrawView(0);
}
static void
-CB_BGScan(int val __UNUSED__, void *data __UNUSED__)
+CB_BGScan(Dialog * d, int val __UNUSED__, void *data __UNUSED__)
{
int slider, lower, upper;
@@ -1709,7 +1712,7 @@
{
DialogItemSliderSetVal(bg_sel_slider, slider);
DialogDrawItems(bg_sel_dialog, bg_sel_slider, 0, 0, 99999, 99999);
- DialogItemCallCallback(bg_sel_slider);
+ DialogItemCallCallback(d, bg_sel_slider);
}
}
@@ -1751,7 +1754,7 @@
}
static void
-CB_DesktopTimeout(int val __UNUSED__, void *data)
+CB_DesktopTimeout(Dialog * d __UNUSED__, int val __UNUSED__, void *data)
{
DItem *di;
char s[256];
@@ -1785,7 +1788,7 @@
{
DialogItemSliderSetVal(bg_sel_slider, 4 * i);
DialogDrawItems(bg_sel_dialog, bg_sel_slider, 0, 0, 99999, 99999);
- DialogItemCallCallback(bg_sel_slider);
+ DialogItemCallCallback(NULL, bg_sel_slider);
tmp_bg_selected = i;
BackgroundImagesKeep(tmp_bg, 0);
BgDialogSetNewCurrent(bglist[tmp_bg_selected]);
@@ -1797,7 +1800,7 @@
}
static void
-CB_BGPrev(int val __UNUSED__, void *data __UNUSED__)
+CB_BGPrev(Dialog * d __UNUSED__, int val __UNUSED__, void *data __UNUSED__)
{
Background **bglist;
int i, num;
@@ -1817,7 +1820,7 @@
}
static void
-CB_BGNext(int val __UNUSED__, void *data __UNUSED__)
+CB_BGNext(Dialog * d __UNUSED__, int val __UNUSED__, void *data __UNUSED__)
{
Background **bglist;
int i, num;
@@ -1859,7 +1862,7 @@
}
static void
-CB_BGSortFile(int val __UNUSED__, void *data __UNUSED__)
+CB_BGSortFile(Dialog * d __UNUSED__, int val __UNUSED__, void *data __UNUSED__)
{
Background **bglist;
int i, num;
@@ -1889,7 +1892,8 @@
}
static void
-CB_BGSortAttrib(int val __UNUSED__, void *data __UNUSED__)
+CB_BGSortAttrib(Dialog * d __UNUSED__, int val __UNUSED__,
+ void *data __UNUSED__)
{
Background **bglist;
int i, num;
@@ -1932,7 +1936,8 @@
}
static void
-CB_BGSortContent(int val __UNUSED__, void *data __UNUSED__)
+CB_BGSortContent(Dialog * d __UNUSED__, int val __UNUSED__,
+ void *data __UNUSED__)
{
Background **bglist;
int i, num;
@@ -2030,7 +2035,7 @@
DialogItemSetFill(di, 1, 0);
DialogItemButtonSetText(di, _("Move to Front\n"));
DialogItemSetCallback(di, CB_ConfigureFrontBG, 0, NULL);
- DialogBindKey(d, "F", CB_ConfigureFrontBG, 0, NULL);
+ DialogBindKey(d, "F", CB_ConfigureFrontBG, 0);
di = DialogAddItem(table2, DITEM_BUTTON);
DialogItemSetPadding(di, 2, 2, 2, 2);
@@ -2049,8 +2054,8 @@
DialogItemSetFill(di, 1, 0);
DialogItemButtonSetText(di, _("Delete File\n"));
DialogItemSetCallback(di, CB_ConfigureDelBG, 0, NULL);
- DialogBindKey(d, "D", CB_ConfigureDelBG, 0, NULL);
- DialogBindKey(d, "Delete", CB_ConfigureDelBG, 1, NULL);
+ DialogBindKey(d, "D", CB_ConfigureDelBG, 0);
+ DialogBindKey(d, "Delete", CB_ConfigureDelBG, 1);
di = DialogAddItem(table, DITEM_TEXT);
DialogItemSetPadding(di, 2, 2, 2, 2);
@@ -2260,16 +2265,16 @@
DialogItemSetFill(di, 0, 0);
DialogItemButtonSetText(di, "<-");
DialogItemSetCallback(di, CB_BGPrev, 0, NULL);
- DialogBindKey(d, "Left", CB_BGPrev, 0, NULL);
- DialogBindKey(d, "BackSpace", CB_BGPrev, 0, NULL);
+ DialogBindKey(d, "Left", CB_BGPrev, 0);
+ DialogBindKey(d, "BackSpace", CB_BGPrev, 0);
di = DialogAddItem(table2, DITEM_BUTTON);
DialogItemSetPadding(di, 2, 2, 2, 2);
DialogItemSetFill(di, 0, 0);
DialogItemButtonSetText(di, "->");
DialogItemSetCallback(di, CB_BGNext, 0, NULL);
- DialogBindKey(d, "Right", CB_BGNext, 0, NULL);
- DialogBindKey(d, "space", CB_BGNext, 0, NULL);
+ DialogBindKey(d, "Right", CB_BGNext, 0);
+ DialogBindKey(d, "space", CB_BGNext, 0);
di = DialogAddItem(table, DITEM_BUTTON);
DialogItemSetPadding(di, 2, 2, 2, 2);
@@ -2341,13 +2346,13 @@
DialogAddButton(d, _("OK"), CB_ConfigureBG, 1);
DialogAddButton(d, _("Apply"), CB_ConfigureBG, 0);
DialogAddButton(d, _("Close"), CB_ConfigureBG, 1);
- DialogSetExitFunction(d, CB_ConfigureBG, 2, d);
- DialogBindKey(d, "Escape", DialogCallbackClose, 0, d);
- DialogBindKey(d, "Return", CB_ConfigureBG, 0, d);
+ DialogSetExitFunction(d, CB_ConfigureBG, 2);
+ DialogBindKey(d, "Escape", DialogCallbackClose, 0);
+ DialogBindKey(d, "Return", CB_ConfigureBG, 0);
ShowDialog(d);
- CB_DesktopMiniDisplayRedraw(1, area);
+ CB_DesktopMiniDisplayRedraw(NULL, 1, area);
BG_RedrawView(0);
BGSettingsGoTo(tmp_bg);
/* This is kind of a hack - somehow it loses the correct current desktop
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/dialog.c,v
retrieving revision 1.91.2.12
retrieving revision 1.91.2.13
diff -u -3 -r1.91.2.12 -r1.91.2.13
--- dialog.c 20 Oct 2004 21:04:05 -0000 1.91.2.12
+++ dialog.c 24 Dec 2004 14:03:53 -0000 1.91.2.13
@@ -63,7 +63,7 @@
{
Window area_win;
int w, h;
- void (*event_func) (int val, void *data);
+ DialogItemCallbackFunc *event_func;
} DItemArea;
typedef struct
@@ -115,13 +115,13 @@
int *val_ptr;
DItem *next;
DItem *first;
- void (*event_func) (int val, void *data);
+ DialogItemCallbackFunc *event_func;
} DItemRadioButton;
struct _ditem
{
int type;
- void (*func) (int val, void *data);
+ DialogCallbackFunc *func;
int val;
void *data;
ImageClass *iclass;
@@ -157,7 +157,7 @@
{
Dialog *parent;
char *text;
- void (*func) (int val, void *data);
+ DialogCallbackFunc *func;
Window win;
int x, y, w, h;
char hilited;
@@ -171,8 +171,7 @@
{
KeyCode key;
int val;
- void *data;
- void (*func) (int val, void *data);
+ DialogCallbackFunc *func;
} DKeyBind;
struct _dialog
@@ -187,9 +186,8 @@
ImageClass *iclass;
int w, h;
DItem *item;
- void (*exit_func) (int val, void *data);
+ DialogCallbackFunc *exit_func;
int exit_val;
- void *exit_data;
int num_bindings;
DKeyBind *keybindings;
};
@@ -203,8 +201,7 @@
static void DialogItemsRealize(Dialog * d);
void
-DialogBindKey(Dialog * d, const char *key, void (*func) (int val, void *data),
- int val, void *data)
+DialogBindKey(Dialog * d, const char *key, DialogCallbackFunc * func, int val)
{
d->num_bindings++;
if (!d->keybindings)
@@ -213,7 +210,6 @@
d->keybindings =
Erealloc(d->keybindings, sizeof(DKeyBind) * d->num_bindings);
d->keybindings[d->num_bindings - 1].val = val;
- d->keybindings[d->num_bindings - 1].data = data;
d->keybindings[d->num_bindings - 1].func = func;
d->keybindings[d->num_bindings - 1].key =
XKeysymToKeycode(disp, XStringToKeysym(key));
@@ -237,7 +233,6 @@
d->item = NULL;
d->exit_func = NULL;
d->exit_val = 0;
- d->exit_data = NULL;
d->tclass = TextclassFind("DIALOG", 1);
if (d->tclass)
@@ -316,17 +311,15 @@
}
void
-DialogSetExitFunction(Dialog * d, void (*func) (int val, void *data), int val,
- void *data)
+DialogSetExitFunction(Dialog * d, DialogCallbackFunc * func, int val)
{
d->exit_func = func;
d->exit_val = val;
- d->exit_data = data;
}
void
-DialogAddButton(Dialog * d, const char *text,
- void (*func) (int val, void *data), char doclose)
+DialogAddButton(Dialog * d, const char *text, DialogCallbackFunc * func,
+ char doclose)
{
DButton *db;
int w, h;
@@ -444,7 +437,7 @@
}
static void
-DialogEwinMoveResize(EWin * ewin, int resize)
+DialogEwinMoveResize(EWin * ewin, int resize __UNUSED__)
{
Dialog *d = ewin->data;
@@ -453,8 +446,6 @@
if (TransparencyEnabled() || ImageclassIsTransparent(d->iclass))
DialogRedraw(d);
- return;
- resize = 0;
}
static void
@@ -593,7 +584,7 @@
EUnmapWindow(disp, d->win);
if (d->exit_func)
- d->exit_func(d->exit_val, d->exit_data);
+ d->exit_func(d, d->exit_val, NULL);
RemoveItem(NULL, d->win, LIST_FINDBY_ID, LIST_TYPE_DIALOG);
}
@@ -779,8 +770,8 @@
}
void
-DialogItemSetCallback(DItem * di, void (*func) (int val, void *data), int val,
- char *data)
+DialogItemSetCallback(DItem * di, DialogCallbackFunc * func, int val,
+ void *data)
{
di->func = func;
di->val = val;
@@ -839,10 +830,10 @@
}
void
-DialogItemCallCallback(DItem * di)
+DialogItemCallCallback(Dialog * d, DItem * di)
{
if (di->func)
- di->func(di->val, di->data);
+ di->func(d, di->val, di->data);
}
static void
@@ -1701,8 +1692,7 @@
}
void
-DialogItemRadioButtonSetEventFunc(DItem * di,
- void (*func) (int val, void *data))
+DialogItemRadioButtonSetEventFunc(DItem * di, DialogItemCallbackFunc * func)
{
di->item.radio_button.event_func = func;
}
@@ -1877,7 +1867,7 @@
}
void
-DialogItemAreaSetEventFunc(DItem * di, void (*func) (int val, void *data))
+DialogItemAreaSetEventFunc(DItem * di, DialogItemCallbackFunc * func)
{
di->item.area.event_func = func;
}
@@ -1974,9 +1964,9 @@
/* Convenience callback to close dialog */
void
-DialogCallbackClose(int val __UNUSED__, void *data)
+DialogCallbackClose(Dialog * d, int val __UNUSED__, void *data __UNUSED__)
{
- DialogClose((Dialog *) data);
+ DialogClose(d);
}
/*
@@ -2010,22 +2000,6 @@
}
void
-DialogRestart(int val, void *data)
-{
- SessionExit("restart");
- val = 0;
- data = NULL;
-}
-
-void
-DialogQuit(int val, void *data)
-{
- SessionExit("error");
- val = 0;
- data = NULL;
-}
-
-void
DialogAlert(const char *fmt, ...)
{
char text[10240];
@@ -2061,8 +2035,7 @@
for (i = 0; i < d->num_bindings; i++)
{
if (ev->xkey.keycode == d->keybindings[i].key)
- (d->keybindings[i].func) (d->keybindings[i].val,
- d->keybindings[i].data);
+ (d->keybindings[i].func) (d, d->keybindings[i].val, NULL);
}
}
@@ -2130,7 +2103,7 @@
if (di->item.slider.val_ptr)
*di->item.slider.val_ptr = di->item.slider.val;
if (di->func)
- (di->func) (di->val, di->data);
+ (di->func) (d, di->val, di->data);
}
DialogDrawItems(d, di, 0, 0, 99999, 99999);
@@ -2155,7 +2128,7 @@
{
case DITEM_AREA:
if (di->func)
- di->func(di->val, di->data);
+ di->func(d, di->val, di->data);
break;
}
}
@@ -2203,7 +2176,7 @@
if (di->item.slider.val_ptr)
*di->item.slider.val_ptr = di->item.slider.val;
if (di->func)
- (di->func) (di->val, di->data);
+ (di->func) (d, di->val, di->data);
}
else if (win == di->item.slider.knob_win)
{
@@ -2276,7 +2249,7 @@
DialogDrawItems(d, di, 0, 0, 99999, 99999);
if (di->func)
- di->func(di->val, di->data);
+ di->func(d, di->val, di->data);
}
static void
@@ -2431,7 +2404,7 @@
for (i = 0; i < d->num_buttons; i++)
if (d->button[i] == db)
break;
- db->func(i, d);
+ db->func(d, i, NULL);
}
if (db->close)
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/fx.c,v
retrieving revision 1.41.2.12
retrieving revision 1.41.2.13
diff -u -3 -r1.41.2.12 -r1.41.2.13
--- fx.c 20 Oct 2004 21:04:08 -0000 1.41.2.12
+++ fx.c 24 Dec 2004 14:03:53 -0000 1.41.2.13
@@ -968,7 +968,7 @@
static char tmp_effect_waves;
static void
-CB_ConfigureFX(int val, void *data __UNUSED__)
+CB_ConfigureFX(Dialog * d __UNUSED__, int val, void *data __UNUSED__)
{
if (val < 2)
{
@@ -1058,9 +1058,9 @@
DialogAddButton(d, _("OK"), CB_ConfigureFX, 1);
DialogAddButton(d, _("Apply"), CB_ConfigureFX, 0);
DialogAddButton(d, _("Close"), CB_ConfigureFX, 1);
- DialogSetExitFunction(d, CB_ConfigureFX, 2, d);
- DialogBindKey(d, "Escape", DialogCallbackClose, 0, d);
- DialogBindKey(d, "Return", CB_ConfigureFX, 0, d);
+ DialogSetExitFunction(d, CB_ConfigureFX, 2);
+ DialogBindKey(d, "Escape", DialogCallbackClose, 0);
+ DialogBindKey(d, "Return", CB_ConfigureFX, 0);
ShowDialog(d);
}
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/groups.c,v
retrieving revision 1.57.2.7
retrieving revision 1.57.2.8
diff -u -3 -r1.57.2.7 -r1.57.2.8
--- groups.c 10 Oct 2004 11:17:38 -0000 1.57.2.7
+++ groups.c 24 Dec 2004 14:03:53 -0000 1.57.2.8
@@ -499,19 +499,18 @@
static int tmp_action;
static void
-ChooseGroupEscape(int val, void *data)
+ChooseGroupEscape(Dialog * d, int val __UNUSED__, void *data __UNUSED__)
{
if (tmp_groups)
{
ShowHideWinGroups(tmp_ewin, tmp_groups[tmp_index], SET_OFF);
Efree(tmp_groups);
}
- DialogClose((Dialog *) data);
- val = 0;
+ DialogClose(d);
}
static void
-ChooseGroup(int val, void *data)
+ChooseGroup(Dialog * d __UNUSED__, int val, void *data __UNUSED__)
{
if (((val == 0) || (val == 2)) && tmp_groups)
{
@@ -542,16 +541,14 @@
Efree(tmp_groups);
tmp_groups = NULL;
}
- data = NULL;
}
static void
-GroupCallback(int val, void *data)
+GroupCallback(Dialog * d __UNUSED__, int val, void *data __UNUSED__)
{
ShowHideWinGroups(tmp_ewin, tmp_groups[tmp_index], SET_OFF);
ShowHideWinGroups(tmp_ewin, tmp_groups[val], SET_ON);
tmp_index = val;
- data = NULL;
}
void
@@ -655,7 +652,7 @@
DialogItemSetColSpan(di, 2);
DialogItemSetPadding(di, 2, 2, 2, 2);
DialogItemSetFill(di, 1, 0);
- DialogItemSetCallback(di, &GroupCallback, i, (void *)d);
+ DialogItemSetCallback(di, GroupCallback, i, NULL);
DialogItemRadioButtonSetText(di, group_member_strings[i]);
DialogItemRadioButtonSetFirst(di, radio);
DialogItemRadioButtonGroupSetVal(di, i);
@@ -670,9 +667,9 @@
DialogAddButton(d, _("OK"), ChooseGroup, 1);
DialogAddButton(d, _("Close"), ChooseGroup, 1);
- DialogSetExitFunction(d, ChooseGroup, 2, d);
- DialogBindKey(d, "Escape", ChooseGroupEscape, 0, d);
- DialogBindKey(d, "Return", ChooseGroup, 0, d);
+ DialogSetExitFunction(d, ChooseGroup, 2);
+ DialogBindKey(d, "Escape", ChooseGroupEscape, 0);
+ DialogBindKey(d, "Return", ChooseGroup, 0);
for (i = 0; i < num_groups; i++)
Efree(group_member_strings[i]);
@@ -698,7 +695,7 @@
static DItem *di_mirror;
static void
-CB_ConfigureGroupEscape(int val, void *data)
+CB_ConfigureGroupEscape(Dialog * d, int val __UNUSED__, void *data __UNUSED__)
{
if (tmp_cfgs)
{
@@ -706,12 +703,11 @@
Efree(tmp_cfgs);
tmp_cfgs = NULL;
}
- DialogClose((Dialog *) data);
- val = 0;
+ DialogClose(d);
}
static void
-CB_ConfigureGroup(int val, void *data)
+CB_ConfigureGroup(Dialog * d __UNUSED__, int val, void *data __UNUSED__)
{
int i;
@@ -727,11 +723,10 @@
tmp_cfgs = NULL;
}
autosave();
- data = NULL;
}
static void
-GroupSelectCallback(int val, void *data)
+GroupSelectCallback(Dialog * d, int val, void *data __UNUSED__)
{
DialogItemCheckButtonSetState(di_border, tmp_cfgs[val].set_border);
DialogItemCheckButtonSetState(di_kill, tmp_cfgs[val].kill);
@@ -741,14 +736,14 @@
DialogItemCheckButtonSetState(di_stick, tmp_cfgs[val].stick);
DialogItemCheckButtonSetState(di_shade, tmp_cfgs[val].shade);
DialogItemCheckButtonSetState(di_mirror, tmp_cfgs[val].mirror);
- DialogRedraw((Dialog *) data);
+ DialogRedraw(d);
ShowHideWinGroups(tmp_ewin, tmp_groups[tmp_current_group], SET_OFF);
ShowHideWinGroups(tmp_ewin, tmp_groups[val], SET_ON);
tmp_current_group = val;
}
static void
-GroupFeatureChangeCallback(int val, void *data)
+GroupFeatureChangeCallback(Dialog * d __UNUSED__, int val, void *data)
{
switch (val)
{
@@ -976,9 +971,9 @@
DialogAddButton(d, _("OK"), CB_ConfigureGroup, 1);
DialogAddButton(d, _("Apply"), CB_ConfigureGroup, 0);
DialogAddButton(d, _("Close"), CB_ConfigureGroup, 1);
- DialogSetExitFunction(d, CB_ConfigureGroup, 2, d);
- DialogBindKey(d, "Escape", CB_ConfigureGroupEscape, 0, d);
- DialogBindKey(d, "Return", CB_ConfigureGroup, 0, d);
+ DialogSetExitFunction(d, CB_ConfigureGroup, 2);
+ DialogBindKey(d, "Escape", CB_ConfigureGroupEscape, 0);
+ DialogBindKey(d, "Return", CB_ConfigureGroup, 0);
for (i = 0; i < ewin->num_groups; i++)
Efree(group_member_strings[i]);
@@ -990,7 +985,8 @@
static GroupConfig tmp_group_cfg;
static char tmp_group_swap;
static void
-CB_ConfigureDefaultGroupSettings(int val, void *data)
+CB_ConfigureDefaultGroupSettings(Dialog * d __UNUSED__, int val,
+ void *data __UNUSED__)
{
if (val < 2)
{
@@ -998,7 +994,6 @@
Conf.groups.swapmove = tmp_group_swap;
}
autosave();
- data = NULL;
}
static void
@@ -1153,9 +1148,9 @@
DialogAddButton(d, _("OK"), CB_ConfigureDefaultGroupSettings, 1);
DialogAddButton(d, _("Apply"), CB_ConfigureDefaultGroupSettings, 0);
DialogAddButton(d, _("Close"), CB_ConfigureDefaultGroupSettings, 1);
- DialogSetExitFunction(d, CB_ConfigureDefaultGroupSettings, 2, d);
- DialogBindKey(d, "Escape", DialogCallbackClose, 0, d);
- DialogBindKey(d, "Return", CB_ConfigureDefaultGroupSettings, 0, d);
+ DialogSetExitFunction(d, CB_ConfigureDefaultGroupSettings, 2);
+ DialogBindKey(d, "Escape", DialogCallbackClose, 0);
+ DialogBindKey(d, "Return", CB_ConfigureDefaultGroupSettings, 0);
ShowDialog(d);
}
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/iconify.c,v
retrieving revision 1.116.2.28
retrieving revision 1.116.2.29
diff -u -3 -r1.116.2.28 -r1.116.2.29
--- iconify.c 15 Dec 2004 22:17:10 -0000 1.116.2.28
+++ iconify.c 24 Dec 2004 14:03:53 -0000 1.116.2.29
@@ -2600,7 +2600,7 @@
static char tmp_ib_animate;
static void
-CB_ConfigureIconbox(int val, void *data __UNUSED__)
+CB_ConfigureIconbox(Dialog * d __UNUSED__, int val, void *data __UNUSED__)
{
if (val < 2)
{
@@ -2919,9 +2919,9 @@
DialogAddButton(d, _("OK"), CB_ConfigureIconbox, 1);
DialogAddButton(d, _("Apply"), CB_ConfigureIconbox, 0);
DialogAddButton(d, _("Close"), CB_ConfigureIconbox, 1);
- DialogSetExitFunction(d, CB_ConfigureIconbox, 2, d);
- DialogBindKey(d, "Escape", DialogCallbackClose, 0, d);
- DialogBindKey(d, "Return", CB_ConfigureIconbox, 0, d);
+ DialogSetExitFunction(d, CB_ConfigureIconbox, 2);
+ DialogBindKey(d, "Escape", DialogCallbackClose, 0);
+ DialogBindKey(d, "Return", CB_ConfigureIconbox, 0);
ShowDialog(d);
}
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/Attic/mod-desks.c,v
retrieving revision 1.1.2.12
retrieving revision 1.1.2.13
diff -u -3 -r1.1.2.12 -r1.1.2.13
--- mod-desks.c 25 Oct 2004 22:14:23 -0000 1.1.2.12
+++ mod-desks.c 24 Dec 2004 14:03:54 -0000 1.1.2.13
@@ -64,7 +64,7 @@
static char tmp_desktop_wraparound;
static void
-CB_ConfigureDesktops(int val, void *data)
+CB_ConfigureDesktops(Dialog * d __UNUSED__, int val, void *data __UNUSED__)
{
if (val < 2)
{
@@ -72,11 +72,10 @@
Conf.desks.wraparound = tmp_desktop_wraparound;
}
autosave();
- data = NULL;
}
static void
-CB_DesktopDisplayRedraw(int val, void *data)
+CB_DesktopDisplayRedraw(Dialog * d __UNUSED__, int val, void *data)
{
static char called = 0;
DItem *di;
@@ -246,12 +245,12 @@
DialogAddButton(d, _("OK"), CB_ConfigureDesktops, 1);
DialogAddButton(d, _("Apply"), CB_ConfigureDesktops, 0);
DialogAddButton(d, _("Close"), CB_ConfigureDesktops, 1);
- DialogSetExitFunction(d, CB_ConfigureDesktops, 2, d);
- DialogBindKey(d, "Escape", DialogCallbackClose, 0, d);
- DialogBindKey(d, "Return", CB_ConfigureDesktops, 0, d);
+ DialogSetExitFunction(d, CB_ConfigureDesktops, 2);
+ DialogBindKey(d, "Escape", DialogCallbackClose, 0);
+ DialogBindKey(d, "Return", CB_ConfigureDesktops, 0);
ShowDialog(d);
DialogItemSetCallback(slider, CB_DesktopDisplayRedraw, 0, (void *)area);
- CB_DesktopDisplayRedraw(1, area);
+ CB_DesktopDisplayRedraw(d, 1, area);
}
static int tmp_area_x;
@@ -263,7 +262,7 @@
static char tmp_area_wraparound;
static void
-CB_ConfigureAreas(int val, void *data)
+CB_ConfigureAreas(Dialog * d __UNUSED__, int val, void *data __UNUSED__)
{
if (val < 2)
{
@@ -280,11 +279,10 @@
EdgeWindowsShow();
}
autosave();
- data = NULL;
}
static void
-CB_AreaDisplayRedraw(int val, void *data)
+CB_AreaDisplayRedraw(Dialog * d __UNUSED__, int val, void *data)
{
char s[64];
static char called = 0;
@@ -480,11 +478,11 @@
DialogAddButton(d, _("OK"), CB_ConfigureAreas, 1);
DialogAddButton(d, _("Apply"), CB_ConfigureAreas, 0);
DialogAddButton(d, _("Close"), CB_ConfigureAreas, 1);
- DialogSetExitFunction(d, CB_ConfigureAreas, 2, d);
- DialogBindKey(d, "Escape", DialogCallbackClose, 0, d);
- DialogBindKey(d, "Return", CB_ConfigureAreas, 0, d);
+ DialogSetExitFunction(d, CB_ConfigureAreas, 2);
+ DialogBindKey(d, "Escape", DialogCallbackClose, 0);
+ DialogBindKey(d, "Return", CB_ConfigureAreas, 0);
ShowDialog(d);
- CB_AreaDisplayRedraw(1, area);
+ CB_AreaDisplayRedraw(d, 1, area);
}
/*
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/Attic/mod-trans.c,v
retrieving revision 1.1.2.6
retrieving revision 1.1.2.7
diff -u -3 -r1.1.2.6 -r1.1.2.7
--- mod-trans.c 10 Oct 2004 11:17:39 -0000 1.1.2.6
+++ mod-trans.c 24 Dec 2004 14:03:54 -0000 1.1.2.7
@@ -38,7 +38,7 @@
static int tmp_st_hilight;
static void
-CB_ConfigureTrans(int val, void *data __UNUSED__)
+CB_ConfigureTrans(Dialog * d __UNUSED__, int val, void *data __UNUSED__)
{
if (val < 2)
{
@@ -77,7 +77,7 @@
}
static void
-CB_ThemeTransparency(int val __UNUSED__, void *data)
+CB_ThemeTransparency(Dialog * d __UNUSED__, int val __UNUSED__, void *data)
{
DItem *di;
char s[256];
@@ -363,9 +363,9 @@
DialogAddButton(d, _("OK"), CB_ConfigureTrans, 1);
DialogAddButton(d, _("Apply"), CB_ConfigureTrans, 0);
DialogAddButton(d, _("Close"), CB_ConfigureTrans, 1);
- DialogSetExitFunction(d, CB_ConfigureTrans, 2, d);
- DialogBindKey(d, "Escape", DialogCallbackClose, 0, d);
- DialogBindKey(d, "Return", CB_ConfigureTrans, 0, d);
+ DialogSetExitFunction(d, CB_ConfigureTrans, 2);
+ DialogBindKey(d, "Escape", DialogCallbackClose, 0);
+ DialogBindKey(d, "Return", CB_ConfigureTrans, 0);
ShowDialog(d);
}
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/pager.c,v
retrieving revision 1.103.2.24
retrieving revision 1.103.2.25
diff -u -3 -r1.103.2.24 -r1.103.2.25
--- pager.c 11 Dec 2004 15:51:36 -0000 1.103.2.24
+++ pager.c 24 Dec 2004 14:03:54 -0000 1.103.2.25
@@ -1892,7 +1892,7 @@
static Dialog *pager_settings_dialog = NULL;
static void
-CB_ConfigurePager(int val, void *data)
+CB_ConfigurePager(Dialog * d __UNUSED__, int val, void *data __UNUSED__)
{
if (val < 2)
{
@@ -1918,11 +1918,11 @@
PagerSetSnap(tmp_pager_snap);
}
autosave();
- data = NULL;
}
static void
-CB_PagerScanSlide(int val, void *data)
+CB_PagerScanSlide(Dialog * d __UNUSED__, int val __UNUSED__,
+ void *data __UNUSED__)
{
char s[256];
@@ -1931,8 +1931,6 @@
DialogItemTextSetText(pager_scan_speed_label, s);
DialogDrawItems(pager_settings_dialog, pager_scan_speed_label, 0, 0, 99999,
99999);
- val = 0;
- data = NULL;
}
static void
@@ -2171,9 +2169,9 @@
DialogAddButton(d, _("OK"), CB_ConfigurePager, 1);
DialogAddButton(d, _("Apply"), CB_ConfigurePager, 0);
DialogAddButton(d, _("Close"), CB_ConfigurePager, 1);
- DialogSetExitFunction(d, CB_ConfigurePager, 2, d);
- DialogBindKey(d, "Escape", DialogCallbackClose, 0, d);
- DialogBindKey(d, "Return", CB_ConfigurePager, 0, d);
+ DialogSetExitFunction(d, CB_ConfigurePager, 2);
+ DialogBindKey(d, "Escape", DialogCallbackClose, 0);
+ DialogBindKey(d, "Return", CB_ConfigurePager, 0);
ShowDialog(d);
}
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/session.c,v
retrieving revision 1.75.2.17
retrieving revision 1.75.2.18
diff -u -3 -r1.75.2.17 -r1.75.2.18
--- session.c 28 Nov 2004 17:51:35 -0000 1.75.2.17
+++ session.c 24 Dec 2004 14:03:55 -0000 1.75.2.18
@@ -802,7 +802,7 @@
}
static void
-LogoutCB(int val __UNUSED__, void *data __UNUSED__)
+LogoutCB(Dialog * d __UNUSED__, int val __UNUSED__, void *data __UNUSED__)
{
#ifdef HAVE_X11_SM_SMLIB_H
if (sm_conn)
@@ -938,8 +938,8 @@
"\n\n"));
DialogAddButton(d, _(" Yes, Log Out "), LogoutCB, 1);
DialogAddButton(d, _(" No "), NULL, 1);
- DialogBindKey(d, "Escape", DialogCallbackClose, 1, d);
- DialogBindKey(d, "Return", LogoutCB, 0, d);
+ DialogBindKey(d, "Escape", DialogCallbackClose, 1);
+ DialogBindKey(d, "Return", LogoutCB, 0);
}
ShowDialog(d);
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/settings.c,v
retrieving revision 1.120.2.12
retrieving revision 1.120.2.13
diff -u -3 -r1.120.2.12 -r1.120.2.13
--- settings.c 22 Dec 2004 23:39:10 -0000 1.120.2.12
+++ settings.c 24 Dec 2004 14:03:55 -0000 1.120.2.13
@@ -48,7 +48,7 @@
static char tmp_clickalways;
static void
-CB_ConfigureFocus(int val, void *data)
+CB_ConfigureFocus(Dialog * d __UNUSED__, int val, void *data __UNUSED__)
{
if (val < 2)
{
@@ -72,7 +72,6 @@
FocusFix();
}
autosave();
- data = NULL;
}
void
@@ -294,9 +293,9 @@
DialogAddButton(d, _("OK"), CB_ConfigureFocus, 1);
DialogAddButton(d, _("Apply"), CB_ConfigureFocus, 0);
DialogAddButton(d, _("Close"), CB_ConfigureFocus, 1);
- DialogSetExitFunction(d, CB_ConfigureFocus, 2, d);
- DialogBindKey(d, "Escape", DialogCallbackClose, 0, d);
- DialogBindKey(d, "Return", CB_ConfigureFocus, 0, d);
+ DialogSetExitFunction(d, CB_ConfigureFocus, 2);
+ DialogBindKey(d, "Escape", DialogCallbackClose, 0);
+ DialogBindKey(d, "Return", CB_ConfigureFocus, 0);
ShowDialog(d);
}
@@ -316,10 +315,8 @@
*/
static void
-CB_ConfigureMoveResize(int val, void *data)
+CB_ConfigureMoveResize(Dialog * d, int val, void *data __UNUSED__)
{
- Dialog *d;
-
if (val < 2)
{
Conf.movres.mode_move = tmp_move;
@@ -335,7 +332,6 @@
/* je_moveend(je_prevmode, (void *)1); */
}
autosave();
- data = NULL;
}
/* I'm commenting this out for now. --cK.
@@ -665,9 +661,9 @@
DialogAddButton(d, _("OK"), CB_ConfigureMoveResize, 1);
DialogAddButton(d, _("Apply"), CB_ConfigureMoveResize, 0);
DialogAddButton(d, _("Close"), CB_ConfigureMoveResize, 1);
- DialogSetExitFunction(d, CB_ConfigureMoveResize, 2, d);
- DialogBindKey(d, "Escape", DialogCallbackClose, 0, d);
- DialogBindKey(d, "Return", CB_ConfigureMoveResize, 0, d);
+ DialogSetExitFunction(d, CB_ConfigureMoveResize, 2);
+ DialogBindKey(d, "Escape", DialogCallbackClose, 0);
+ DialogBindKey(d, "Return", CB_ConfigureMoveResize, 0);
ShowDialog(d);
/*
@@ -711,7 +707,7 @@
#endif
static void
-CB_ConfigurePlacement(int val, void *data)
+CB_ConfigurePlacement(Dialog * d __UNUSED__, int val, void *data __UNUSED__)
{
if (val < 2)
{
@@ -727,7 +723,6 @@
#endif
}
autosave();
- data = NULL;
}
void
@@ -856,9 +851,9 @@
DialogAddButton(d, _("OK"), CB_ConfigurePlacement, 1);
DialogAddButton(d, _("Apply"), CB_ConfigurePlacement, 0);
DialogAddButton(d, _("Close"), CB_ConfigurePlacement, 1);
- DialogSetExitFunction(d, CB_ConfigurePlacement, 2, d);
- DialogBindKey(d, "Escape", DialogCallbackClose, 0, d);
- DialogBindKey(d, "Return", CB_ConfigurePlacement, 0, d);
+ DialogSetExitFunction(d, CB_ConfigurePlacement, 2);
+ DialogBindKey(d, "Escape", DialogCallbackClose, 0);
+ DialogBindKey(d, "Return", CB_ConfigurePlacement, 0);
ShowDialog(d);
}
@@ -866,7 +861,7 @@
static int tmp_autoraisetime;
static void
-CB_ConfigureAutoraise(int val, void *data)
+CB_ConfigureAutoraise(Dialog * d __UNUSED__, int val, void *data __UNUSED__)
{
if (val < 2)
{
@@ -874,7 +869,6 @@
Conf.autoraise.delay = 10 * tmp_autoraisetime;
}
autosave();
- data = NULL;
}
void
@@ -953,22 +947,21 @@
DialogAddButton(d, _("OK"), CB_ConfigureAutoraise, 1);
DialogAddButton(d, _("Apply"), CB_ConfigureAutoraise, 0);
DialogAddButton(d, _("Close"), CB_ConfigureAutoraise, 1);
- DialogSetExitFunction(d, CB_ConfigureAutoraise, 2, d);
- DialogBindKey(d, "Escape", DialogCallbackClose, 0, d);
- DialogBindKey(d, "Return", CB_ConfigureAutoraise, 0, d);
+ DialogSetExitFunction(d, CB_ConfigureAutoraise, 2);
+ DialogBindKey(d, "Escape", DialogCallbackClose, 0);
+ DialogBindKey(d, "Return", CB_ConfigureAutoraise, 0);
ShowDialog(d);
}
static char tmp_dialog_headers;
static void
-CB_ConfigureMiscellaneous(int val, void *data)
+CB_ConfigureMiscellaneous(Dialog * d __UNUSED__, int val, void *data
__UNUSED__)
{
if (val < 2)
{
Conf.dialogs.headers = tmp_dialog_headers;
}
autosave();
- data = NULL;
}
void
@@ -1032,9 +1025,9 @@
DialogAddButton(d, _("OK"), CB_ConfigureMiscellaneous, 1);
DialogAddButton(d, _("Apply"), CB_ConfigureMiscellaneous, 0);
DialogAddButton(d, _("Close"), CB_ConfigureMiscellaneous, 1);
- DialogSetExitFunction(d, CB_ConfigureMiscellaneous, 2, d);
- DialogBindKey(d, "Escape", DialogCallbackClose, 0, d);
- DialogBindKey(d, "Return", CB_ConfigureMiscellaneous, 0, d);
+ DialogSetExitFunction(d, CB_ConfigureMiscellaneous, 2);
+ DialogBindKey(d, "Escape", DialogCallbackClose, 0);
+ DialogBindKey(d, "Return", CB_ConfigureMiscellaneous, 0);
ShowDialog(d);
}
@@ -1055,7 +1048,7 @@
static int tmp_shade_speed;
static void
-CB_ConfigureFX(int val, void *data)
+CB_ConfigureFX(Dialog * d __UNUSED__, int val, void *data __UNUSED__)
{
if (val < 2)
{
@@ -1093,7 +1086,6 @@
}
}
autosave();
- data = NULL;
}
void
@@ -1439,9 +1431,9 @@
DialogAddButton(d, _("OK"), CB_ConfigureFX, 1);
DialogAddButton(d, _("Apply"), CB_ConfigureFX, 0);
DialogAddButton(d, _("Close"), CB_ConfigureFX, 1);
- DialogSetExitFunction(d, CB_ConfigureFX, 2, d);
- DialogBindKey(d, "Escape", DialogCallbackClose, 0, d);
- DialogBindKey(d, "Return", CB_ConfigureFX, 0, d);
+ DialogSetExitFunction(d, CB_ConfigureFX, 2);
+ DialogBindKey(d, "Escape", DialogCallbackClose, 0);
+ DialogBindKey(d, "Return", CB_ConfigureFX, 0);
ShowDialog(d);
}
@@ -1467,15 +1459,11 @@
return;
}
-void CB_ApplyRemember(int val, void *data);
-void
-CB_ApplyRemember(int val, void *data)
+static void
+CB_ApplyRemember(Dialog * d __UNUSED__, int val, void *data __UNUSED__)
{
-/* Snapshot *sn; */
int i;
- data = NULL;
-
if (val < 2 && rd_ewin_list)
{
for (i = 0; rd_ewin_list[i]; i++)
@@ -1504,13 +1492,12 @@
}
}
-void CB_ApplyRememberEscape(int val, void *data);
-void
-CB_ApplyRememberEscape(int val, void *data)
+static void
+CB_ApplyRememberEscape(Dialog * d, int val, void *data __UNUSED__)
{
int i;
- DialogClose((Dialog *) data);
+ DialogClose(d);
val = 0;
if (rd_ewin_list)
{
@@ -1521,9 +1508,8 @@
}
}
-void CB_RememberWindowSettings(int val, void *data);
-void
-CB_RememberWindowSettings(int val, void *data)
+static void
+CB_RememberWindowSettings(Dialog * d __UNUSED__, int val, void *data)
{
RememberWinList *rd;
EWin *ewin;
@@ -1658,9 +1644,145 @@
DialogAddButton(d, _("OK"), CB_ApplyRemember, 1);
DialogAddButton(d, _("Apply"), CB_ApplyRemember, 0);
DialogAddButton(d, _("Close"), CB_ApplyRemember, 1);
- DialogSetExitFunction(d, CB_ApplyRemember, 2, d);
- DialogBindKey(d, "Escape", CB_ApplyRememberEscape, 0, d);
- DialogBindKey(d, "Return", CB_ApplyRemember, 0, d);
+ DialogSetExitFunction(d, CB_ApplyRemember, 2);
+ DialogBindKey(d, "Escape", CB_ApplyRememberEscape, 0);
+ DialogBindKey(d, "Return", CB_ApplyRemember, 0);
ShowDialog(d);
}
+
+#if USE_COMPOSITE
+/*
+ * Composite dialog
+ */
+static struct
+{
+ char enable;
+ int shadow;
+} Conf_comp;
+
+static void
+CB_ConfigureComposite(Dialog * d __UNUSED__, int val, void *data __UNUSED__)
+{
+ if (val >= 2)
+ return;
+
+ autosave();
+}
+
+void
+SettingsComposite(void)
+{
+ Dialog *d;
+ DItem *table, *di, *radio;
+
+ if ((d =
+ FindItem("CONFIGURE_COMPOSITE", 0, LIST_FINDBY_NAME, LIST_TYPE_DIALOG)))
+ {
+ SoundPlay("SOUND_SETTINGS_ACTIVE");
+ ShowDialog(d);
+ return;
+ }
+ SoundPlay("SOUND_SETTINGS_COMPOSITE");
+
+ /* FIXME - get settings */
+
+ d = DialogCreate("CONFIGURE_COMPOSITE");
+ DialogSetTitle(d, _("Composite Settings"));
+
+ table = DialogInitItem(d);
+ DialogItemTableSetOptions(table, 2, 0, 0, 0);
+
+ if (Conf.dialogs.headers)
+ {
+#if 0
+ di = DialogAddItem(table, DITEM_IMAGE);
+ DialogItemSetPadding(di, 2, 2, 2, 2);
+ DialogItemImageSetFile(di, "pix/tips.png");
+#endif
+ di = DialogAddItem(table, DITEM_TEXT);
+ DialogItemSetPadding(di, 2, 2, 2, 2);
+ DialogItemSetFill(di, 1, 0);
+ DialogItemSetColSpan(di, 2);
+ DialogItemTextSetText(di,
+ _("Enlightenment Composite\n"
+ "Settings Dialog\n"));
+
+ di = DialogAddItem(table, DITEM_SEPARATOR);
+ DialogItemSetColSpan(di, 2);
+ DialogItemSetPadding(di, 2, 2, 2, 2);
+ DialogItemSetFill(di, 1, 0);
+ DialogItemSeparatorSetOrientation(di, 0);
+ }
+
+ di = DialogAddItem(table, DITEM_CHECKBUTTON);
+ DialogItemSetPadding(di, 2, 2, 2, 2);
+ DialogItemSetFill(di, 1, 0);
+ DialogItemSetColSpan(di, 2);
+ DialogItemCheckButtonSetText(di, _("Enable Composite"));
+ DialogItemCheckButtonSetState(di, Conf_comp.enable);
+ DialogItemCheckButtonSetPtr(di, &Conf_comp.enable);
+
+ di = DialogAddItem(table, DITEM_SEPARATOR);
+ DialogItemSetColSpan(di, 2);
+ DialogItemSetPadding(di, 2, 2, 2, 2);
+ DialogItemSetFill(di, 1, 0);
+ DialogItemSeparatorSetOrientation(di, 0);
+
+ radio = di = DialogAddItem(table, DITEM_RADIOBUTTON);
+ DialogItemSetPadding(di, 2, 2, 2, 2);
+ DialogItemSetFill(di, 1, 0);
+ DialogItemSetColSpan(di, 2);
+ DialogItemRadioButtonSetText(di, _("Shadows Off"));
+ DialogItemRadioButtonSetFirst(di, radio);
+ DialogItemRadioButtonGroupSetVal(di, 0);
+
+ di = DialogAddItem(table, DITEM_RADIOBUTTON);
+ DialogItemSetPadding(di, 2, 2, 2, 2);
+ DialogItemSetFill(di, 1, 0);
+ DialogItemSetColSpan(di, 2);
+ DialogItemRadioButtonSetText(di, _("Shadows Sharp"));
+ DialogItemRadioButtonSetFirst(di, radio);
+ DialogItemRadioButtonGroupSetVal(di, 1);
+
+ di = DialogAddItem(table, DITEM_RADIOBUTTON);
+ DialogItemSetPadding(di, 2, 2, 2, 2);
+ DialogItemSetFill(di, 1, 0);
+ DialogItemSetColSpan(di, 2);
+ DialogItemRadioButtonSetText(di, _("Shadows Blurred"));
+ DialogItemRadioButtonSetFirst(di, radio);
+ DialogItemRadioButtonGroupSetVal(di, 2);
+ DialogItemRadioButtonGroupSetValPtr(radio, &Conf_comp.shadow);
+
+#if 0
+ di = DialogAddItem(table, DITEM_TEXT);
+ DialogItemSetPadding(di, 2, 2, 2, 2);
+ DialogItemSetFill(di, 0, 0);
+ DialogItemSetAlign(di, 0, 512);
+ DialogItemTextSetText(di, _("Fading Speed:\n"));
+
+ di = DialogAddItem(table, DITEM_SLIDER);
+ DialogItemSetPadding(di, 2, 2, 2, 2);
+ DialogItemSetFill(di, 1, 0);
+ DialogItemSliderSetBounds(di, 0, 300);
+ DialogItemSliderSetUnits(di, 10);
+ DialogItemSliderSetJump(di, 25);
+ DialogItemSliderSetVal(di, tmp_tooltiptime);
+ DialogItemSliderSetValPtr(di, &tmp_tooltiptime);
+#endif
+
+ di = DialogAddItem(table, DITEM_SEPARATOR);
+ DialogItemSetColSpan(di, 2);
+ DialogItemSetPadding(di, 2, 2, 2, 2);
+ DialogItemSetFill(di, 1, 0);
+ DialogItemSeparatorSetOrientation(di, 0);
+
+ DialogAddButton(d, _("OK"), CB_ConfigureComposite, 1);
+ DialogAddButton(d, _("Apply"), CB_ConfigureComposite, 0);
+ DialogAddButton(d, _("Close"), CB_ConfigureComposite, 1);
+ DialogSetExitFunction(d, CB_ConfigureComposite, 2);
+ DialogBindKey(d, "Escape", DialogCallbackClose, 0);
+ DialogBindKey(d, "Return", CB_ConfigureComposite, 0);
+ ShowDialog(d);
+}
+#endif
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/snaps.c,v
retrieving revision 1.72.2.8
retrieving revision 1.72.2.9
diff -u -3 -r1.72.2.8 -r1.72.2.9
--- snaps.c 21 Nov 2004 09:43:02 -0000 1.72.2.8
+++ snaps.c 24 Dec 2004 14:03:56 -0000 1.72.2.9
@@ -217,14 +217,6 @@
}
#endif
-static void CB_ApplySnapEscape(int val, void *data);
-static void
-CB_ApplySnapEscape(int val, void *data)
-{
- DialogClose((Dialog *) data);
- val = 0;
-}
-
static Window tmp_snap_client;
static char tmp_snap_border;
static char tmp_snap_desktop;
@@ -239,9 +231,8 @@
static char tmp_snap_skiplists;
static char tmp_snap_neverfocus;
-static void CB_ApplySnap(int val, void *data);
static void
-CB_ApplySnap(int val, void *data)
+CB_ApplySnap(Dialog * d __UNUSED__, int val, void *data __UNUSED__)
{
SaveSnapInfo();
if (val < 2)
@@ -288,7 +279,6 @@
SaveSnapInfo();
}
}
- data = NULL;
}
void
@@ -595,9 +585,9 @@
DialogAddButton(d, _("OK"), CB_ApplySnap, 1);
DialogAddButton(d, _("Apply"), CB_ApplySnap, 0);
DialogAddButton(d, _("Close"), CB_ApplySnap, 1);
- DialogSetExitFunction(d, CB_ApplySnap, 2, d);
- DialogBindKey(d, "Escape", CB_ApplySnapEscape, 0, d);
- DialogBindKey(d, "Return", CB_ApplySnap, 0, d);
+ DialogSetExitFunction(d, CB_ApplySnap, 2);
+ DialogBindKey(d, "Escape", DialogCallbackClose, 0);
+ DialogBindKey(d, "Return", CB_ApplySnap, 0);
ShowDialog(d);
}
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/sound.c,v
retrieving revision 1.25.2.9
retrieving revision 1.25.2.10
diff -u -3 -r1.25.2.9 -r1.25.2.10
--- sound.c 19 Nov 2004 21:02:44 -0000 1.25.2.9
+++ sound.c 24 Dec 2004 14:03:56 -0000 1.25.2.10
@@ -432,7 +432,7 @@
static char tmp_audio;
static void
-CB_ConfigureAudio(int val, void *data __UNUSED__)
+CB_ConfigureAudio(Dialog * d __UNUSED__, int val, void *data __UNUSED__)
{
if (val < 2)
{
@@ -512,9 +512,9 @@
DialogAddButton(d, _("OK"), CB_ConfigureAudio, 1);
DialogAddButton(d, _("Apply"), CB_ConfigureAudio, 0);
DialogAddButton(d, _("Close"), CB_ConfigureAudio, 1);
- DialogSetExitFunction(d, CB_ConfigureAudio, 2, d);
- DialogBindKey(d, "Escape", DialogCallbackClose, 0, d);
- DialogBindKey(d, "Return", CB_ConfigureAudio, 0, d);
+ DialogSetExitFunction(d, CB_ConfigureAudio, 2);
+ DialogBindKey(d, "Escape", DialogCallbackClose, 0);
+ DialogBindKey(d, "Return", CB_ConfigureAudio, 0);
ShowDialog(d);
}
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/tooltips.c,v
retrieving revision 1.65.2.8
retrieving revision 1.65.2.9
diff -u -3 -r1.65.2.8 -r1.65.2.9
--- tooltips.c 22 Dec 2004 23:39:11 -0000 1.65.2.8
+++ tooltips.c 24 Dec 2004 14:03:56 -0000 1.65.2.9
@@ -797,7 +797,7 @@
static char tmp_roottip;
static void
-CB_ConfigureTooltips(int val, void *data __UNUSED__)
+CB_ConfigureTooltips(Dialog * d __UNUSED__, int val, void *data __UNUSED__)
{
if (val < 2)
{
@@ -892,9 +892,9 @@
DialogAddButton(d, _("OK"), CB_ConfigureTooltips, 1);
DialogAddButton(d, _("Apply"), CB_ConfigureTooltips, 0);
DialogAddButton(d, _("Close"), CB_ConfigureTooltips, 1);
- DialogSetExitFunction(d, CB_ConfigureTooltips, 2, d);
- DialogBindKey(d, "Escape", DialogCallbackClose, 0, d);
- DialogBindKey(d, "Return", CB_ConfigureTooltips, 0, d);
+ DialogSetExitFunction(d, CB_ConfigureTooltips, 2);
+ DialogBindKey(d, "Escape", DialogCallbackClose, 0);
+ DialogBindKey(d, "Return", CB_ConfigureTooltips, 0);
ShowDialog(d);
}
-------------------------------------------------------
SF email is sponsored by - The IT Product Guide
Read honest & candid reviews on hundreds of IT Products from real users.
Discover which products truly live up to the hype. Start reading now.
http://productguide.itmanagersjournal.com/
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
