Enlightenment CVS committal
Author : kwo
Project : e16
Module : e
Dir : e16/e/src
Modified Files:
container.c dialog.c ewins.c ewins.h menus.c pager.c
Log Message:
Minor reorganization of internal window ops.
===================================================================
RCS file: /cvs/e/e16/e/src/container.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -3 -r1.7 -r1.8
--- container.c 4 Feb 2007 23:06:03 -0000 1.7
+++ container.c 6 Apr 2007 21:44:22 -0000 1.8
@@ -240,7 +240,21 @@
}
static void
-ContainerEwinLayout(EWin * ewin, int *px, int *py, int *pw, int *ph)
+_ContainerEwinInit(EWin * ewin)
+{
+ ewin->props.skip_ext_task = 1;
+ ewin->props.skip_ext_pager = 1;
+ ewin->props.skip_focuslist = 1;
+ ewin->props.skip_winlist = 1;
+ EwinInhSetWM(ewin, focus, 1);
+ EwinInhSetWM(ewin, iconify, 1);
+ ewin->props.autosave = 1;
+
+ EoSetSticky(ewin, 1);
+}
+
+static void
+_ContainerEwinLayout(EWin * ewin, int *px, int *py, int *pw, int *ph)
{
Container *ct = (Container *) ewin->data;
@@ -251,7 +265,7 @@
}
static void
-ContainerEwinMoveResize(EWin * ewin, int resize)
+_ContainerEwinMoveResize(EWin * ewin, int resize)
{
Container *ct = (Container *) ewin->data;
@@ -266,37 +280,21 @@
}
static void
-ContainerEwinClose(EWin * ewin)
+_ContainerEwinClose(EWin * ewin)
{
ContainerDestroy((Container *) ewin->data, 0);
ewin->client.win = NULL;
ewin->data = NULL;
}
-static const EWinOps ContainerEwinOps = {
- ContainerEwinLayout,
- ContainerEwinMoveResize,
- ContainerEwinClose,
+static const EWinOps _ContainerEwinOps = {
+ _ContainerEwinInit,
+ _ContainerEwinLayout,
+ _ContainerEwinMoveResize,
+ _ContainerEwinClose,
};
static void
-ContainerEwinInit(EWin * ewin, void *ptr)
-{
- ewin->data = (Container *) ptr;
- ewin->ops = &ContainerEwinOps;
-
- ewin->props.skip_ext_task = 1;
- ewin->props.skip_ext_pager = 1;
- ewin->props.skip_focuslist = 1;
- ewin->props.skip_winlist = 1;
- EwinInhSetWM(ewin, focus, 1);
- EwinInhSetWM(ewin, iconify, 1);
- ewin->props.autosave = 1;
-
- EoSetSticky(ewin, 1);
-}
-
-static void
ContainerShow(Container * ct)
{
EWin *ewin;
@@ -307,8 +305,8 @@
HintsSetWindowName(ct->win, ct->wm_name);
HintsSetWindowClass(ct->win, ct->name, "Enlightenment_IconBox");
- ewin = AddInternalToFamily(ct->win, "ICONBOX", EWIN_TYPE_ICONBOX, ct,
- ContainerEwinInit);
+ ewin = AddInternalToFamily(ct->win, "ICONBOX", EWIN_TYPE_ICONBOX,
+ &_ContainerEwinOps, ct);
ct->ewin = ewin;
if (!ewin)
return;
===================================================================
RCS file: /cvs/e/e16/e/src/dialog.c,v
retrieving revision 1.181
retrieving revision 1.182
diff -u -3 -r1.181 -r1.182
--- dialog.c 17 Jan 2007 01:10:42 -0000 1.181
+++ dialog.c 6 Apr 2007 21:44:22 -0000 1.182
@@ -503,7 +503,15 @@
}
static void
-DialogEwinMoveResize(EWin * ewin, int resize __UNUSED__)
+_DialogEwinInit(EWin * ewin)
+{
+ ewin->props.focus_when_mapped = 1;
+
+ EoSetLayer(ewin, 10);
+}
+
+static void
+_DialogEwinMoveResize(EWin * ewin, int resize __UNUSED__)
{
Dialog *d = (Dialog *) ewin->data;
@@ -515,30 +523,20 @@
}
static void
-DialogEwinClose(EWin * ewin)
+_DialogEwinClose(EWin * ewin)
{
DialogDestroy((Dialog *) ewin->data);
ewin->client.win = NULL;
ewin->data = NULL;
}
-static const EWinOps DialogEwinOps = {
+static const EWinOps _DialogEwinOps = {
+ _DialogEwinInit,
NULL,
- DialogEwinMoveResize,
- DialogEwinClose,
+ _DialogEwinMoveResize,
+ _DialogEwinClose,
};
-static void
-DialogEwinInit(EWin * ewin, void *ptr)
-{
- ewin->data = ptr;
- ewin->ops = &DialogEwinOps;
-
- ewin->props.focus_when_mapped = 1;
-
- EoSetLayer(ewin, 10);
-}
-
void
DialogArrange(Dialog * d, int resize)
{
@@ -580,8 +578,8 @@
HintsSetWindowClass(d->win, d->name, "Enlightenment_Dialog");
- ewin = AddInternalToFamily(d->win, "DIALOG", EWIN_TYPE_DIALOG, d,
- DialogEwinInit);
+ ewin = AddInternalToFamily(d->win, "DIALOG", EWIN_TYPE_DIALOG,
+ &_DialogEwinOps, d);
d->ewin = ewin;
if (!ewin)
return;
===================================================================
RCS file: /cvs/e/e16/e/src/ewins.c,v
retrieving revision 1.192
retrieving revision 1.193
diff -u -3 -r1.192 -r1.193
--- ewins.c 17 Mar 2007 15:49:41 -0000 1.192
+++ ewins.c 6 Apr 2007 21:44:22 -0000 1.193
@@ -955,8 +955,8 @@
}
EWin *
-AddInternalToFamily(Win win, const char *bname, int type, void *ptr,
- void (*init) (EWin * ewin, void *ptr))
+AddInternalToFamily(Win win, const char *bname, int type,
+ const EWinOps * ops, void *ptr)
{
EWin *ewin;
@@ -970,8 +970,10 @@
EwinGetHints(ewin);
EwinManage(ewin);
- if (init)
- init(ewin, ptr); /* Type specific initialisation */
+ ewin->data = ptr;
+ ewin->ops = ops;
+ if (ops && ops->Init)
+ ops->Init(ewin); /* Type specific initialisation */
if (bname)
ewin->border = BorderFind(bname);
===================================================================
RCS file: /cvs/e/e16/e/src/ewins.h,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -3 -r1.69 -r1.70
--- ewins.h 17 Mar 2007 15:49:41 -0000 1.69
+++ ewins.h 6 Apr 2007 21:44:22 -0000 1.70
@@ -58,6 +58,7 @@
typedef struct
{
+ void (*Init) (EWin * ewin);
void (*Layout) (EWin * ewin, int *px, int *py, int *pw,
int *ph);
void (*MoveResize) (EWin * ewin, int resize);
@@ -364,8 +365,7 @@
void EwinStateUpdate(EWin * ewin);
void AddToFamily(EWin * ewin, Window win);
EWin *AddInternalToFamily(Win win, const char *bname, int type,
- void *ptr,
- void (*init) (EWin * ewin, void *ptr));
+ const EWinOps * ops, void *ptr);
void EwinReparent(EWin * ewin, Win parent);
const char *EwinGetTitle(const EWin * ewin);
const char *EwinGetIconName(const EWin * ewin);
===================================================================
RCS file: /cvs/e/e16/e/src/menus.c,v
retrieving revision 1.272
retrieving revision 1.273
diff -u -3 -r1.272 -r1.273
--- menus.c 26 Feb 2007 04:16:29 -0000 1.272
+++ menus.c 6 Apr 2007 21:44:22 -0000 1.273
@@ -195,7 +195,28 @@
}
static void
-MenuEwinMoveResize(EWin * ewin, int resize __UNUSED__)
+_MenuEwinInit(EWin * ewin)
+{
+ Menu *m = (Menu *) ewin->data;
+
+ ewin->props.skip_ext_task = 1;
+ ewin->props.skip_ext_pager = 1;
+ ewin->props.no_actions = 1;
+ ewin->props.skip_focuslist = 1;
+ ewin->props.skip_winlist = 1;
+ ewin->props.ignorearrange = 1;
+ EwinInhSetWM(ewin, focus, 1);
+ ewin->client.grav = StaticGravity;
+
+ ICCCM_SetSizeConstraints(ewin, m->w, m->h, m->w, m->h, 0, 0, 1, 1,
+ 0.0, 65535.0);
+
+ EoSetLayer(ewin, 12);
+ ewin->ewmh.opacity = OpacityFromPercent(Conf.opacity.menus);
+}
+
+static void
+_MenuEwinMoveResize(EWin * ewin, int resize __UNUSED__)
{
Menu *m = (Menu *) ewin->data;
@@ -213,7 +234,7 @@
}
static void
-MenuEwinClose(EWin * ewin)
+_MenuEwinClose(EWin * ewin)
{
if ((Menu *) (ewin->data) == Mode_menus.active)
{
@@ -224,36 +245,13 @@
ewin->data = NULL;
}
-static const EWinOps MenuEwinOps = {
+static const EWinOps _MenuEwinOps = {
+ _MenuEwinInit,
NULL,
- MenuEwinMoveResize,
- MenuEwinClose,
+ _MenuEwinMoveResize,
+ _MenuEwinClose,
};
-static void
-MenuEwinInit(EWin * ewin, void *ptr)
-{
- Menu *m = (Menu *) ptr;
-
- ewin->data = ptr;
- ewin->ops = &MenuEwinOps;
-
- ewin->props.skip_ext_task = 1;
- ewin->props.skip_ext_pager = 1;
- ewin->props.no_actions = 1;
- ewin->props.skip_focuslist = 1;
- ewin->props.skip_winlist = 1;
- ewin->props.ignorearrange = 1;
- EwinInhSetWM(ewin, focus, 1);
- ewin->client.grav = StaticGravity;
-
- ICCCM_SetSizeConstraints(ewin, m->w, m->h, m->w, m->h, 0, 0, 1, 1,
- 0.0, 65535.0);
-
- EoSetLayer(ewin, 12);
- ewin->ewmh.opacity = OpacityFromPercent(Conf.opacity.menus);
-}
-
static void MenuShowMasker(Menu * m);
int
@@ -333,8 +331,8 @@
EMoveWindow(m->win, wx, wy);
- ewin = AddInternalToFamily(m->win, m->style->border_name, EWIN_TYPE_MENU, m,
- MenuEwinInit);
+ ewin = AddInternalToFamily(m->win, m->style->border_name, EWIN_TYPE_MENU,
+ &_MenuEwinOps, m);
m->ewin = ewin;
if (ewin)
{
===================================================================
RCS file: /cvs/e/e16/e/src/pager.c,v
retrieving revision 1.237
retrieving revision 1.238
diff -u -3 -r1.237 -r1.238
--- pager.c 17 Jan 2007 01:10:43 -0000 1.237
+++ pager.c 6 Apr 2007 21:44:22 -0000 1.238
@@ -641,7 +641,20 @@
}
static void
-PagerEwinMoveResize(EWin * ewin, int resize __UNUSED__)
+_PagerEwinInit(EWin * ewin)
+{
+ ewin->props.skip_ext_task = 1;
+ ewin->props.skip_ext_pager = 1;
+ ewin->props.skip_focuslist = 1;
+ ewin->props.skip_winlist = 1;
+ EwinInhSetWM(ewin, focus, 1);
+ ewin->props.autosave = 1;
+
+ EoSetSticky(ewin, 1);
+}
+
+static void
+_PagerEwinMoveResize(EWin * ewin, int resize __UNUSED__)
{
Pager *p = (Pager *) ewin->data;
int w, h;
@@ -685,36 +698,21 @@
}
static void
-PagerEwinClose(EWin * ewin)
+_PagerEwinClose(EWin * ewin)
{
PagerDestroy((Pager *) ewin->data);
ewin->client.win = NULL;
ewin->data = NULL;
}
-static const EWinOps PagerEwinOps = {
+static const EWinOps _PagerEwinOps = {
+ _PagerEwinInit,
NULL,
- PagerEwinMoveResize,
- PagerEwinClose,
+ _PagerEwinMoveResize,
+ _PagerEwinClose,
};
static void
-PagerEwinInit(EWin * ewin, void *ptr)
-{
- ewin->data = ptr;
- ewin->ops = &PagerEwinOps;
-
- ewin->props.skip_ext_task = 1;
- ewin->props.skip_ext_pager = 1;
- ewin->props.skip_focuslist = 1;
- ewin->props.skip_winlist = 1;
- EwinInhSetWM(ewin, focus, 1);
- ewin->props.autosave = 1;
-
- EoSetSticky(ewin, 1);
-}
-
-static void
PagerShow(Pager * p)
{
EWin *ewin = NULL;
@@ -735,8 +733,8 @@
Esnprintf(s, sizeof(s), "%i", p->dsk->num);
HintsSetWindowClass(p->win, s, "Enlightenment_Pager");
- ewin =
- AddInternalToFamily(p->win, "PAGER", EWIN_TYPE_PAGER, p, PagerEwinInit);
+ ewin = AddInternalToFamily(p->win, "PAGER", EWIN_TYPE_PAGER,
+ &_PagerEwinOps, p);
p->ewin = ewin;
if (!ewin)
return;
-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys-and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
