Enlightenment CVS committal
Author : kwo
Project : e16
Module : e
Dir : e16/e/src
Modified Files:
E.h borders.c iclass.c ipc.c
Log Message:
Remove non-functional "external imageclass" stuff.
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/E.h,v
retrieving revision 1.393
retrieving revision 1.394
diff -u -3 -r1.393 -r1.394
--- E.h 19 Mar 2005 16:39:55 -0000 1.393
+++ E.h 20 Mar 2005 15:58:51 -0000 1.394
@@ -440,7 +440,6 @@
typedef struct _imageclass
{
char *name;
- char external;
ImageStateArray norm, active, sticky, sticky_active;
Imlib_Border padding;
ColorModifierClass *colmod;
@@ -1254,7 +1253,6 @@
int apply);
void BorderWinpartChange(EWin * ewin, int i, int force);
int BorderWinpartIndex(EWin * ewin, Window win);
-void HonorIclass(char *s, int id);
Border *BorderCreateFiller(int left, int right, int top,
int bottom);
void BordersSetupFallback(void);
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/borders.c,v
retrieving revision 1.250
retrieving revision 1.251
diff -u -3 -r1.250 -r1.251
--- borders.c 19 Mar 2005 16:39:58 -0000 1.250
+++ borders.c 20 Mar 2005 15:58:51 -0000 1.251
@@ -432,47 +432,6 @@
}
void
-HonorIclass(char *s, int id)
-{
- AwaitIclass *a;
- EWin *ewin;
-
- a = RemoveItem(s, 0, LIST_FINDBY_NAME, LIST_TYPE_AWAIT_ICLASS);
- if (!a)
- return;
-
- ewin = FindItem(NULL, a->client_win, LIST_FINDBY_ID, LIST_TYPE_EWIN);
- if (ewin)
- {
- if (a->ewin_bit < ewin->border->num_winparts)
- {
- if ((ewin->border->part[a->ewin_bit].iclass->external)
- && (!ewin->bits[a->ewin_bit].win) && (id))
- {
- ewin->bits[a->ewin_bit].win = id;
- BorderWinpartRealise(ewin, a->ewin_bit);
- EMapWindow(id);
- ewin->shapedone = 0;
- if (!ewin->shapedone)
- {
- EwinPropagateShapes(ewin);
- }
- else
- {
- if (ewin->border->changes_shape)
- EwinPropagateShapes(ewin);
- }
- ewin->shapedone = 1;
- }
- }
- }
- if (a->iclass)
- a->iclass->ref_count--;
-
- Efree(a);
-}
-
-void
BorderIncRefcount(const Border * b)
{
((Border *) b)->ref_count++;
@@ -578,62 +537,43 @@
for (i = 0; i < b->num_winparts; i++)
{
ewin->bits[i].ewin = ewin; /* Reference to associated Ewin */
- if (b->part[i].iclass->external)
- {
- ewin->bits[i].win = 0;
- Esnprintf(s, sizeof(s), "request imageclass %s",
- b->part[i].iclass->name);
- CommsBroadcast(s);
- await = Emalloc(sizeof(AwaitIclass));
- await->client_win = ewin->client.win;
- await->ewin_bit = i;
-
- await->iclass = b->part[i].iclass;
- if (await->iclass)
- await->iclass->ref_count++;
- AddItem(await, b->part[i].iclass->name, 0, LIST_TYPE_AWAIT_ICLASS);
- }
+ ewin->bits[i].win = ECreateWindow(EoGetWin(ewin), -10, -10, 1, 1, 0);
+ ECursorApply(b->part[i].ec, ewin->bits[i].win);
+ EMapWindow(ewin->bits[i].win);
+ EventCallbackRegister(ewin->bits[i].win, 0,
+ BorderWinpartHandleEvents, &ewin->bits[i]);
+ /*
+ * KeyPressMask KeyReleaseMask ButtonPressMask
+ * ButtonReleaseMask
+ * EnterWindowMask LeaveWindowMask PointerMotionMask
+ * PointerMotionHintMask Button1MotionMask
+ * Button2MotionMask
+ * Button3MotionMask Button4MotionMask Button5MotionMask
+ * ButtonMotionMask KeymapStateMask ExposureMask
+ * VisibilityChangeMask StructureNotifyMask
+ * ResizeRedirectMask
+ * SubstructureNotifyMask SubstructureRedirectMask
+ * FocusChangeMask PropertyChangeMas ColormapChangeMask
+ * OwnerGrabButtonMask
+ */
+ if (b->part[i].flags & FLAG_TITLE)
+ ESelectInput(ewin->bits[i].win, EWIN_BORDER_TITLE_EVENT_MASK);
else
- {
- ewin->bits[i].win =
- ECreateWindow(EoGetWin(ewin), -10, -10, 1, 1, 0);
- ECursorApply(b->part[i].ec, ewin->bits[i].win);
- EMapWindow(ewin->bits[i].win);
- EventCallbackRegister(ewin->bits[i].win, 0,
- BorderWinpartHandleEvents, &ewin->bits[i]);
- /*
- * KeyPressMask KeyReleaseMask ButtonPressMask
- * ButtonReleaseMask
- * EnterWindowMask LeaveWindowMask PointerMotionMask
- * PointerMotionHintMask Button1MotionMask
- * Button2MotionMask
- * Button3MotionMask Button4MotionMask Button5MotionMask
- * ButtonMotionMask KeymapStateMask ExposureMask
- * VisibilityChangeMask StructureNotifyMask
- * ResizeRedirectMask
- * SubstructureNotifyMask SubstructureRedirectMask
- * FocusChangeMask PropertyChangeMas ColormapChangeMask
- * OwnerGrabButtonMask
- */
- if (b->part[i].flags & FLAG_TITLE)
- ESelectInput(ewin->bits[i].win, EWIN_BORDER_TITLE_EVENT_MASK);
- else
- ESelectInput(ewin->bits[i].win, EWIN_BORDER_PART_EVENT_MASK);
- ewin->bits[i].x = -10;
- ewin->bits[i].y = -10;
- ewin->bits[i].w = -10;
- ewin->bits[i].h = -10;
- ewin->bits[i].cx = -99;
- ewin->bits[i].cy = -99;
- ewin->bits[i].cw = -99;
- ewin->bits[i].ch = -99;
- ewin->bits[i].state = 0;
- ewin->bits[i].expose = 0;
- ewin->bits[i].no_expose = 0;
- ewin->bits[i].left = 0;
- ewin->bits[i].is = NULL;
- }
+ ESelectInput(ewin->bits[i].win, EWIN_BORDER_PART_EVENT_MASK);
+ ewin->bits[i].x = -10;
+ ewin->bits[i].y = -10;
+ ewin->bits[i].w = -10;
+ ewin->bits[i].h = -10;
+ ewin->bits[i].cx = -99;
+ ewin->bits[i].cy = -99;
+ ewin->bits[i].cw = -99;
+ ewin->bits[i].ch = -99;
+ ewin->bits[i].state = 0;
+ ewin->bits[i].expose = 0;
+ ewin->bits[i].no_expose = 0;
+ ewin->bits[i].left = 0;
+ ewin->bits[i].is = NULL;
}
{
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/iclass.c,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -3 -r1.57 -r1.58
--- iclass.c 19 Mar 2005 16:40:03 -0000 1.57
+++ iclass.c 20 Mar 2005 15:58:51 -0000 1.58
@@ -207,7 +207,6 @@
return NULL;
ic->name = Estrdup(name);
- ic->external = 0;
ic->norm.normal = ic->norm.hilited = ic->norm.clicked = ic->norm.disabled =
NULL;
ic->active.normal = ic->active.hilited = ic->active.clicked =
@@ -284,7 +283,7 @@
{
ColorModifierClass *cm;
- if ((!ic) || (ic->external))
+ if (!ic)
return;
if (!ic->norm.normal)
@@ -431,7 +430,6 @@
ic->sticky_active = ICToInherit->sticky_active;
ic->padding = ICToInherit->padding;
ic->colmod = ICToInherit->colmod;
- ic->external = ICToInherit->external;
}
break;
case CONFIG_COLORMOD:
@@ -641,7 +639,7 @@
Imlib_Image *im;
ImageState *is;
- if (!ic || ic->external)
+ if (!ic)
return NULL;
is = ImageclassGetImageState(ic, state, active, sticky);
@@ -1017,9 +1015,6 @@
}
#endif
- if (ic->external)
- return;
-
if (!is)
is = ImageclassGetImageState(ic, state, active, sticky);
if (!is)
@@ -1130,9 +1125,6 @@
if ((!ic) || (!win) || (w < 1) || (h < 1))
return;
- if (ic->external)
- return;
-
is = ImageclassGetImageState(ic, state, active, sticky);
if (!is)
return;
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/ipc.c,v
retrieving revision 1.209
retrieving revision 1.210
diff -u -3 -r1.209 -r1.210
--- ipc.c 19 Mar 2005 16:40:04 -0000 1.209
+++ ipc.c 20 Mar 2005 15:58:51 -0000 1.210
@@ -937,22 +937,6 @@
}
static void
-IPC_Reply(const char *params, Client * c __UNUSED__)
-{
- char param1[FILEPATH_LEN_MAX], param2[FILEPATH_LEN_MAX];
-
- word(params, 1, param1);
-
- if (!strcmp(param1, "imageclass"))
- {
- /* Reply format "reply imageclass NAME 24243" */
- word(params, 2, param1);
- word(params, 3, param2);
- HonorIclass(param1, atoi(param2));
- }
-}
-
-static void
EwinShowInfo1(const EWin * ewin)
{
Border NoBorder;
@@ -1458,8 +1442,6 @@
{
IPC_Show, "show", "sh", "Show configuration parameter(s)", NULL},
{
- IPC_Reply, "reply", NULL, "TBD", NULL},
- {
IPC_EwinInfo, "get_client_info", NULL, "Show client window info", NULL},
{
IPC_EwinInfo2, "win_info", "wi", "Show client window info", NULL},
-------------------------------------------------------
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://ads.osdn.com/?ad_id=6595&alloc_id=14396&op=click
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
