Enlightenment CVS committal
Author : kwo
Project : e16
Module : e
Dir : e16/e/src
Modified Files:
E.h backgrounds.c buttons.c draw.c ewmh.c hints.c icccm.c
iclass.c menus.c pager.c slideout.c x.c
Log Message:
Compile cleanly with gcc4.
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/E.h,v
retrieving revision 1.411
retrieving revision 1.412
diff -u -3 -r1.411 -r1.412
--- E.h 23 Apr 2005 07:31:10 -0000 1.411
+++ E.h 23 Apr 2005 08:28:01 -0000 1.412
@@ -1860,7 +1860,8 @@
void HintsProcessPropertyChange(EWin * ewin, Atom atom_change);
void HintsProcessClientMessage(XClientMessageEvent * event);
void HintsSetRootHints(Window win);
-void HintsSetRootInfo(Window win, Pixmap pmap, int color);
+void HintsSetRootInfo(Window win, Pixmap pmap,
+ unsigned int color);
void EHintsSetInfo(const EWin * ewin);
int EHintsGetInfo(EWin * ewin);
@@ -2284,9 +2285,8 @@
int *ord);
void EReparentWindow(Window win, Window parent, int x, int y);
int EGetGeometry(Window win, Window * root_return,
- int *x, int *y, unsigned int *w,
- unsigned int *h, unsigned int *bw,
- unsigned int *depth);
+ int *x, int *y, int *w, int *h, int *bw,
+ int *depth);
void EConfigureWindow(Window win, unsigned int mask,
XWindowChanges * wc);
void ESetWindowBackgroundPixmap(Window win, Pixmap pmap);
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/backgrounds.c,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -3 -r1.25 -r1.26
--- backgrounds.c 23 Apr 2005 08:07:25 -0000 1.25
+++ backgrounds.c 23 Apr 2005 08:28:02 -0000 1.26
@@ -456,7 +456,7 @@
void
BackgroundApply(Background * bg, Window win, int setbg)
{
- unsigned int rw, rh, depth;
+ int rw, rh, depth;
Pixmap dpmap;
GC gc;
int rt;
@@ -483,7 +483,7 @@
dpmap = (setbg) ? bg->pmap : None;
if (!dpmap)
{
- unsigned int w, h, x, y;
+ int w, h, x, y;
char hasbg, hasfg;
Pixmap pmap, mask;
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/buttons.c,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -3 -r1.60 -r1.61
--- buttons.c 23 Apr 2005 07:31:15 -0000 1.60
+++ buttons.c 23 Apr 2005 08:28:02 -0000 1.61
@@ -461,7 +461,7 @@
ButtonEmbedWindow(Button * b, Window WindowToEmbed)
{
- unsigned int w, h;
+ int w, h;
EReparentWindow(WindowToEmbed, EoGetWin(b), 0, 0);
b->inside_win = WindowToEmbed;
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/draw.c,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -3 -r1.60 -r1.61
--- draw.c 19 Mar 2005 16:40:01 -0000 1.60
+++ draw.c 23 Apr 2005 08:28:02 -0000 1.61
@@ -1377,8 +1377,7 @@
{
Window rt, par, *list = NULL;
int k, i, num = 0, num_rects = 0, rn = 0, ord;
- int x, y;
- unsigned int ww, hh, w, h, d;
+ int x, y, ww, hh, w, h, d;
XRectangle *rects = NULL, *rl = NULL;
XWindowAttributes att;
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/ewmh.c,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -3 -r1.68 -r1.69
--- ewmh.c 24 Mar 2005 23:38:08 -0000 1.68
+++ ewmh.c 23 Apr 2005 08:28:02 -0000 1.69
@@ -204,12 +204,12 @@
void
EWMH_SetWorkArea(void)
{
- int *p_coord;
+ unsigned int *p_coord;
int n_coord, i, n_desks;
n_desks = DesksGetNumber();
n_coord = 4 * n_desks;
- p_coord = Emalloc(n_coord * sizeof(int));
+ p_coord = Emalloc(n_coord * sizeof(unsigned int));
if (!p_coord)
return;
@@ -235,12 +235,12 @@
void
EWMH_SetDesktopViewport(void)
{
- int *p_coord;
+ unsigned int *p_coord;
int n_coord, i, ax, ay, n_desks;
n_desks = DesksGetNumber();
n_coord = 2 * n_desks;
- p_coord = Emalloc(n_coord * sizeof(int));
+ p_coord = Emalloc(n_coord * sizeof(unsigned int));
if (!p_coord)
return;
@@ -393,7 +393,7 @@
void
EWMH_SetWindowBorder(const EWin * ewin)
{
- int val[4];
+ unsigned int val[4];
if (ewin->border)
{
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/hints.c,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -3 -r1.39 -r1.40
--- hints.c 30 Mar 2005 22:51:02 -0000 1.39
+++ hints.c 23 Apr 2005 08:28:02 -0000 1.40
@@ -285,7 +285,7 @@
}
void
-HintsSetRootInfo(Window win, Pixmap pmap, int color)
+HintsSetRootInfo(Window win, Pixmap pmap, unsigned int color)
{
static Atom a = 0, aa = 0;
Ecore_X_Pixmap pm;
@@ -329,7 +329,7 @@
c[7] = ewin->client.h;
c[8] = ewin->docked;
- ecore_x_window_prop_card32_set(ewin->client.win, a, c, 9);
+ ecore_x_window_prop_card32_set(ewin->client.win, a, (unsigned int *)c, 9);
ecore_x_window_prop_string_set(ewin->client.win, aa,
ewin->normal_border->name);
@@ -356,7 +356,8 @@
if (!aa)
aa = XInternAtom(disp, "ENL_INTERNAL_DATA_BORDER", False);
- num = ecore_x_window_prop_card32_get(ewin->client.win, a, c, 9);
+ num =
+ ecore_x_window_prop_card32_get(ewin->client.win, a, (unsigned int *)c,
9);
if (num < 8)
return 0;
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/icccm.c,v
retrieving revision 1.92
retrieving revision 1.93
diff -u -3 -r1.92 -r1.93
--- icccm.c 19 Mar 2005 16:40:03 -0000 1.92
+++ icccm.c 23 Apr 2005 08:28:02 -0000 1.93
@@ -356,8 +356,7 @@
XSizeHints hint;
Window ww;
long mask;
- unsigned int dummy, w, h, bw;
- int x, y;
+ int x, y, w, h, bw, dummy;
if (atom_change && atom_change != ECORE_X_ATOM_WM_NORMAL_HINTS)
return;
@@ -767,8 +766,7 @@
{
XRectangle *rl = NULL;
int rn = 0, ord;
- int x, y;
- unsigned int w, h, d;
+ int x, y, w, h, d;
Window rt;
ecore_x_grab();
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/iclass.c,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -3 -r1.59 -r1.60
--- iclass.c 15 Apr 2005 23:59:59 -0000 1.59
+++ iclass.c 23 Apr 2005 08:28:02 -0000 1.60
@@ -1144,7 +1144,7 @@
pmm->type = 0;
pmm->pmap = pmm->mask = 0;
- if ((!ic) || (!win) || (w < 1) || (h < 1))
+ if ((!ic) || (!win) || (w <= 0) || (h <= 0))
return;
is = ImageclassGetImageState(ic, state, active, sticky);
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/menus.c,v
retrieving revision 1.184
retrieving revision 1.185
diff -u -3 -r1.184 -r1.185
--- menus.c 23 Apr 2005 07:31:16 -0000 1.184
+++ menus.c 23 Apr 2005 08:28:03 -0000 1.185
@@ -265,7 +265,7 @@
EWin *ewin;
int x, y;
int wx = 0, wy = 0; /* wx, wy added to stop menus */
- unsigned int w, h, mw, mh; /* from appearing offscreen */
+ int w, h, mw, mh; /* from appearing offscreen */
int head_num = 0;
if ((m->num <= 0) || (!m->style))
@@ -656,7 +656,7 @@
{
int i, maxh, maxw, nmaxy;
int maxx1, maxx2, w, h, x, y, r, mmw, mmh;
- unsigned int iw, ih;
+ int iw, ih;
Imlib_Image *im;
char pq, has_i, has_s;
@@ -918,8 +918,7 @@
if (!mi_pmm->pmap)
{
GC gc;
- unsigned int w, h;
- int x, y;
+ int x, y, w, h;
int item_type;
ImageClass *ic;
@@ -1343,8 +1342,7 @@
if (mi->child && mi->child->shown == 0)
{
- int mx, my;
- unsigned int mw, mh;
+ int mx, my, mw, mh;
EWin *ewin2;
ewin = FindEwinByMenu(m);
@@ -1599,8 +1597,7 @@
static void
SubmenuShowTimeout(int val __UNUSED__, void *dat)
{
- int mx, my, my2, xo, yo;
- unsigned int mw;
+ int mx, my, my2, xo, yo, mw;
Menu *m;
MenuItem *mi;
EWin *ewin2, *ewin;
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/pager.c,v
retrieving revision 1.131
retrieving revision 1.132
diff -u -3 -r1.131 -r1.132
--- pager.c 23 Apr 2005 07:31:16 -0000 1.131
+++ pager.c 23 Apr 2005 08:28:03 -0000 1.132
@@ -1384,13 +1384,14 @@
PagerHandleMotion(Pager * p, Window win __UNUSED__, int x, int y, int in)
{
int hx, hy;
+ unsigned int mr;
Window rw, cw;
- EWin *ewin = NULL;
+ EWin *ewin;
if (!Conf.pagers.enable)
return;
- XQueryPointer(disp, p->win, &rw, &cw, &hx, &hy, &x, &y, &hx);
+ XQueryPointer(disp, p->win, &rw, &cw, &hx, &hy, &x, &y, &mr);
if (x >= 0 && x < p->w && y >= 0 && y < p->h)
ewin = EwinInPagerAt(p, x, y);
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/slideout.c,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -3 -r1.28 -r1.29
--- slideout.c 23 Apr 2005 08:07:28 -0000 1.28
+++ slideout.c 23 Apr 2005 08:28:03 -0000 1.29
@@ -90,7 +90,7 @@
Window dw;
char pdir;
XSetWindowAttributes att;
- unsigned int w, h, d;
+ int w, h, d;
/* Don't ever show more than one slideout */
if (Mode.slideout)
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/x.c,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -3 -r1.83 -r1.84
--- x.c 7 Apr 2005 16:38:57 -0000 1.83
+++ x.c 23 Apr 2005 08:28:04 -0000 1.84
@@ -748,8 +748,7 @@
int
EGetGeometry(Window win, Window * root_return, int *x, int *y,
- unsigned int *w, unsigned int *h, unsigned int *bw,
- unsigned int *depth)
+ int *w, int *h, int *bw, int *depth)
{
int ok;
EXID *xid;
@@ -1006,8 +1005,7 @@
GetWinDepth(Window win)
{
Window w1;
- unsigned int w, h, b, d;
- int x, y;
+ int x, y, w, h, b, d;
EGetGeometry(win, &w1, &x, &y, &w, &h, &b, &d);
return d;
@@ -1017,9 +1015,7 @@
WinExists(Window win)
{
Window w1;
- int x, y;
- unsigned int w, h;
- unsigned int b, d;
+ int x, y, w, h, b, d;
if (EGetGeometry(win, &w1, &x, &y, &w, &h, &b, &d))
return 1;
-------------------------------------------------------
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
