e16
/
e16
3
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

Compile cleanly with gcc4. 

SVN revision: 14312
This commit is contained in:
Kim Woelders 2005-04-23 08:28:04 +00:00
parent 937be0bb74
commit 7a2b4b7ebe
12 changed files with 32 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/E.h
View File

@ -1860,7 +1860,8 @@ void HintsDelWindowHints(EWin * ewin);
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 @@ XRectangle *EShapeGetRectangles(Window win, int dest, int *rn,
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);

4
src/backgrounds.c
View File

@ -456,7 +456,7 @@ BgFindImageSize(BgPart * bgp, int rw, int rh, int *pw, int *ph)
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 @@ BackgroundApply(Background * bg, Window win, int setbg)
dpmap = (setbg) ? bg->pmap : None;
if (!dpmap)
{
unsigned int w, h, x, y;
int w, h, x, y;
char hasbg, hasfg;
Pixmap pmap, mask;

2
src/buttons.c
View File

@ -461,7 +461,7 @@ int
ButtonEmbedWindow(Button * b, Window WindowToEmbed)
{
unsigned int w, h;
int w, h;
EReparentWindow(WindowToEmbed, EoGetWin(b), 0, 0);
b->inside_win = WindowToEmbed;

3
src/draw.c
View File

@ -1377,8 +1377,7 @@ PropagateShapes(Window win)
{
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;

10
src/ewmh.c
View File

@ -204,12 +204,12 @@ EWMH_SetDesktopSize(void)
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 @@ EWMH_SetCurrentDesktop(void)
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 @@ EWMH_SetWindowState(const EWin * ewin)
void
EWMH_SetWindowBorder(const EWin * ewin)
{
int val[4];
unsigned int val[4];
if (ewin->border)
{

7
src/hints.c
View File

@ -285,7 +285,7 @@ HintsProcessClientMessage(XClientMessageEvent * event)
}
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 @@ EHintsSetInfo(const EWin * ewin)
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 @@ EHintsGetInfo(EWin * ewin)
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;

6
src/icccm.c
View File

@ -356,8 +356,7 @@ ICCCM_GetGeoms(EWin * ewin, Atom atom_change)
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 @@ ICCCM_GetShapeInfo(EWin * ewin)
{
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();

2
src/iclass.c
View File

@ -1144,7 +1144,7 @@ ImageclassApplyCopy(ImageClass * ic, Window win, int w, int h, int active,
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);

13
src/menus.c
View File

@ -265,7 +265,7 @@ MenuShow(Menu * m, char noshow)
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 @@ MenuRealize(Menu * m)
{
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 @@ MenuDrawItem(Menu * m, MenuItem * mi, char shape)
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 @@ MenuItemEventMouseDown(MenuItem * mi, XEvent * ev __UNUSED__)
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 @@ MenusSetEvents(int on)
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;

5
src/pager.c
View File

@ -1384,13 +1384,14 @@ static void
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);

2
src/slideout.c
View File

@ -90,7 +90,7 @@ SlideoutShow(Slideout * s, EWin * ewin, Window win)
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)

10
src/x.c
View File

@ -748,8 +748,7 @@ EMapRaised(Window win)
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 @@ int
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 @@ int
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;