Enlightenment CVS committal
Author : kwo
Project : e16
Module : e
Dir : e16/e/src
Modified Files:
Tag: branch-exp
E.h borders.c evhandlers.c ewins.c groups.c iconify.c ipc.c
Log Message:
Trivial - const border pointers.
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/E.h,v
retrieving revision 1.314.2.17
retrieving revision 1.314.2.18
diff -u -3 -r1.314.2.17 -r1.314.2.18
--- E.h 15 Aug 2004 15:00:35 -0000 1.314.2.17
+++ E.h 15 Aug 2004 15:49:03 -0000 1.314.2.18
@@ -804,9 +804,9 @@
char toggle;
Window win_container;
WinClient client;
- Border *border;
- Border *normal_border;
- Border *previous_border;
+ const Border *border;
+ const Border *normal_border;
+ const Border *previous_border;
EWinBit *bits;
int flags;
int desktop;
@@ -1419,14 +1419,19 @@
int txa, int typ, int tya, int borigin,
int bxp, int bxa, int byp, int bya,
char keep_for_shade);
+void BorderIncRefcount(const Border * b);
+void BorderDecRefcount(const Border * b);
void EwinBorderSelect(EWin * ewin);
-void EwinBorderSetTo(EWin * ewin, Border * b);
+void EwinBorderSetTo(EWin * ewin, const Border * b);
void EwinBorderDraw(EWin * ewin, int do_shape, int queue_off);
void EwinBorderCalcSizes(EWin * ewin);
void EwinBorderMinShadeSize(EWin * ewin, int *mw, int *mh);
void EwinBorderUpdateInfo(EWin * ewin);
void EwinBorderUpdateState(EWin * ewin);
void EwinBorderEventsConfigure(EWin * ewin, int mode);
+void EwinSetBorder(EWin * ewin, const Border * b, int apply);
+void EwinSetBorderByName(EWin * ewin, const char *name,
+ int apply);
void BorderWinpartChange(EWin * ewin, int i, int force);
int BorderWinpartIndex(EWin * ewin, Window win);
@@ -1460,9 +1465,6 @@
void EwinShade(EWin * ewin);
void EwinUnShade(EWin * ewin);
void EwinSetFullscreen(EWin * ewin, int on);
-void EwinSetBorder(EWin * ewin, Border * b, int apply);
-void EwinSetBorderByName(EWin * ewin, const char *name,
- int apply);
void DetermineEwinFloat(EWin * ewin, int dx, int dy);
EWin *GetEwinPointerInClient(void);
EWin *GetEwinByCurrentPointer(void);
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/borders.c,v
retrieving revision 1.221.2.6
retrieving revision 1.221.2.7
diff -u -3 -r1.221.2.6 -r1.221.2.7
--- borders.c 15 Aug 2004 15:00:36 -0000 1.221.2.6
+++ borders.c 15 Aug 2004 15:49:03 -0000 1.221.2.7
@@ -42,7 +42,7 @@
void
SyncBorderToEwin(EWin * ewin)
{
- Border *b;
+ const Border *b;
EDBUG(4, "SyncBorderToEwin");
b = ewin->border;
@@ -476,7 +476,7 @@
void
EwinBorderSelect(EWin * ewin)
{
- Border *b;
+ const Border *b;
/* Quit if we allready have a border that isn't the fallback one */
b = ewin->border;
@@ -505,7 +505,7 @@
}
void
-EwinBorderSetTo(EWin * ewin, Border * b)
+EwinBorderSetTo(EWin * ewin, const Border * b)
{
int i;
int px = 0, py = 0;
@@ -536,11 +536,11 @@
if (ewin->bits)
Efree(ewin->bits);
ewin->bits = NULL;
- ewin->border->ref_count--;
+ BorderDecRefcount(ewin->border);
}
ewin->border = b;
- b->ref_count++;
+ BorderIncRefcount(b);
HintsSetWindowBorder(ewin);
if (b->num_winparts > 0)
@@ -637,7 +637,7 @@
}
void
-EwinSetBorder(EWin * ewin, Border * b, int apply)
+EwinSetBorder(EWin * ewin, const Border * b, int apply)
{
if (!b)
return;
@@ -654,7 +654,11 @@
}
else
{
+ if (ewin->border)
+ BorderDecRefcount(ewin->border);
ewin->border = b;
+ if (b)
+ BorderIncRefcount(b);
}
if (!ewin->st.fullscreen)
@@ -671,6 +675,25 @@
EwinSetBorder(ewin, b, apply);
}
+Border *
+BorderCreate(const char *name)
+{
+ Border *b;
+
+ EDBUG(5, "CreateBorder");
+
+ b = Ecalloc(1, sizeof(Border));
+ if (!b)
+ EDBUG_RETURN(NULL);
+
+ b->name = Estrdup(name);
+ b->group_border_name = NULL;
+ b->part = NULL;
+ b->shadedir = 2;
+
+ EDBUG_RETURN(b);
+}
+
void
BorderDestroy(Border * b)
{
@@ -712,32 +735,6 @@
EDBUG_RETURN_;
}
-Border *
-BorderCreate(const char *name)
-{
- Border *b;
-
- EDBUG(5, "CreateBorder");
-
- b = Emalloc(sizeof(Border));
- if (!b)
- EDBUG_RETURN(NULL);
-
- b->name = Estrdup(name);
- b->group_border_name = NULL;
- b->border.left = 0;
- b->border.right = 0;
- b->border.top = 0;
- b->border.bottom = 0;
- b->num_winparts = 0;
- b->part = NULL;
- b->changes_shape = 0;
- b->shadedir = 2;
- b->ref_count = 0;
-
- EDBUG_RETURN(b);
-}
-
void
BorderWinpartAdd(Border * b, ImageClass * iclass, ActionClass * aclass,
TextClass * tclass, ECursor * ec, char ontop, int flags,
@@ -804,6 +801,18 @@
}
void
+BorderIncRefcount(const Border * b)
+{
+ ((Border *) b)->ref_count++;
+}
+
+void
+BorderDecRefcount(const Border * b)
+{
+ ((Border *) b)->ref_count--;
+}
+
+void
EwinBorderMinShadeSize(EWin * ewin, int *mw, int *mh)
{
int i, pw, ph, w, h, min_w, min_h;
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/evhandlers.c,v
retrieving revision 1.173.2.11
retrieving revision 1.173.2.12
diff -u -3 -r1.173.2.11 -r1.173.2.12
--- evhandlers.c 15 Aug 2004 15:00:38 -0000 1.173.2.11
+++ evhandlers.c 15 Aug 2004 15:49:04 -0000 1.173.2.12
@@ -530,7 +530,7 @@
{
Window win = ((XShapeEvent *) ev)->window;
EWin *ewin;
- Border *b;
+ const Border *b;
EDBUG(5, "HandleChildShapeChange");
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/Attic/ewins.c,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -3 -r1.1.2.1 -r1.1.2.2
--- ewins.c 15 Aug 2004 15:00:39 -0000 1.1.2.1
+++ ewins.c 15 Aug 2004 15:49:04 -0000 1.1.2.2
@@ -165,7 +165,7 @@
Efree(lst);
if (ewin->border)
- ewin->border->ref_count--;
+ BorderDecRefcount(ewin->border);
if (ewin->icccm.wm_name)
Efree(ewin->icccm.wm_name);
if (ewin->icccm.wm_res_class)
@@ -2532,7 +2532,7 @@
EwinSetFullscreen(EWin * ewin, int on)
{
int x, y, w, h;
- Border *b;
+ const Border *b;
if (ewin->st.fullscreen == on)
return;
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/groups.c,v
retrieving revision 1.57.2.1
retrieving revision 1.57.2.2
diff -u -3 -r1.57.2.1 -r1.57.2.2
--- groups.c 31 Jul 2004 20:25:53 -0000 1.57.2.1
+++ groups.c 15 Aug 2004 15:49:04 -0000 1.57.2.2
@@ -281,8 +281,8 @@
{
EWin **gwins;
int i, num;
- Border *b = NULL;
- Border *previous_border;
+ const Border *b = NULL;
+ const Border *previous_border;
if (g)
{
@@ -311,15 +311,11 @@
0, LIST_FINDBY_NAME,
LIST_TYPE_BORDER);
if (b)
- {
- gwins[i]->previous_border = gwins[i]->border;
- b->ref_count++;
- }
+ gwins[i]->previous_border = gwins[i]->border;
}
else if ((previous_border) && (gwins[i]->previous_border))
{
b = gwins[i]->previous_border;
- gwins[i]->border->ref_count--;
gwins[i]->previous_border = NULL;
}
break;
@@ -333,17 +329,13 @@
0, LIST_FINDBY_NAME,
LIST_TYPE_BORDER);
if (b)
- {
- gwins[i]->previous_border = gwins[i]->border;
- b->ref_count++;
- }
+ gwins[i]->previous_border = gwins[i]->border;
}
break;
case SET_OFF:
if (gwins[i]->previous_border)
{
b = gwins[i]->previous_border;
- gwins[i]->border->ref_count--;
gwins[i]->previous_border = NULL;
}
break;
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/iconify.c,v
retrieving revision 1.116.2.8
retrieving revision 1.116.2.9
diff -u -3 -r1.116.2.8 -r1.116.2.9
--- iconify.c 15 Aug 2004 08:15:21 -0000 1.116.2.8
+++ iconify.c 15 Aug 2004 15:49:04 -0000 1.116.2.9
@@ -1874,7 +1874,7 @@
PropagateShapes(ib->win);
if (ib->ewin)
{
- Border *b;
+ const Border *b;
b = ib->ewin->border;
SyncBorderToEwin(ib->ewin);
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/ipc.c,v
retrieving revision 1.174.2.8
retrieving revision 1.174.2.9
diff -u -3 -r1.174.2.8 -r1.174.2.9
--- ipc.c 15 Aug 2004 15:00:39 -0000 1.174.2.8
+++ ipc.c 15 Aug 2004 15:49:04 -0000 1.174.2.9
@@ -4952,13 +4952,14 @@
static void
EwinShowInfo1(const EWin * ewin)
{
- Border NoBorder, *border;
+ Border NoBorder;
+ const Border *border;
border = ewin->border;
if (border == NULL)
{
border = &NoBorder;
- memset(border, 0, sizeof(Border));
+ memset(&NoBorder, 0, sizeof(Border));
}
IpcPrintf("***CLIENT***\n"
@@ -5040,13 +5041,14 @@
static void
EwinShowInfo2(const EWin * ewin)
{
- Border NoBorder, *border;
+ Border NoBorder;
+ const Border *border;
border = ewin->border;
if (border == NULL)
{
border = &NoBorder;
- memset(border, 0, sizeof(Border));
+ memset(&NoBorder, 0, sizeof(Border));
}
IpcPrintf("WM_NAME %s\n"
-------------------------------------------------------
SF.Net email is sponsored by Shop4tech.com-Lowest price on Blank Media
100pk Sonic DVD-R 4x for only $29 -100pk Sonic DVD+R for only $33
Save 50% off Retail on Ink & Toner - Free Shipping and Free Gift.
http://www.shop4tech.com/z/Inkjet_Cartridges/9_108_r285
_______________________________________________
enlightenment-cvs mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
