cleanups spotted by irix cc

This commit is contained in:
Russ Cox
2005-12-29 23:15:58 +00:00
parent 3c84c725ef
commit 21b830b1ac
8 changed files with 22 additions and 42 deletions

View File

@@ -159,7 +159,6 @@ putXdata(Memimage *m, Rectangle r)
Xmem *xm;
XImage *xi;
GC g;
int offset;
Point xdelta, delta;
Point tp;
int x, y;
@@ -175,10 +174,6 @@ putXdata(Memimage *m, Rectangle r)
xi = xm->xi;
g = (m->chan == GREY1) ? xgccopy0 : xgccopy;
if(m->depth == 24)
offset = r.min.x % 4;
else
offset = m->r.min.x & (31/m->depth);
delta = subpt(r.min, m->r.min);
tp = xm->r.min; /* avoid unaligned access on digital unix */

View File

@@ -73,8 +73,6 @@ Atom targets;
Atom text;
Atom compoundtext;
static XModifierKeymap *modmap;
static int keypermod;
static Drawable xdrawable;
/* static Atom wm_take_focus; */
static void xexpose(XEvent*);
@@ -288,7 +286,6 @@ xinitscreen(void)
XSetWindowAttributes attrs;
XPixmapFormatValues *pfmt;
int n;
Memdata *md;
xscreenid = 0;
xdrawable = 0;
@@ -378,14 +375,11 @@ xinitscreen(void)
initmap(rootwin);
}
if((modmap = XGetModifierMapping(xdisplay)))
keypermod = modmap->max_keypermod;
r.min = ZP;
r.max.x = WidthOfScreen(screen);
r.max.y = HeightOfScreen(screen);
md = mallocz(sizeof(Memdata), 1);
xsize = Dx(r)*3/4;
ysize = Dy(r)*3/4;
@@ -644,11 +638,7 @@ xmapping(XEvent *e)
if(e->type != MappingNotify)
return;
xe = (XMappingEvent*)e;
if(modmap)
XFreeModifiermap(modmap);
modmap = XGetModifierMapping(xe->display);
if(modmap)
keypermod = modmap->max_keypermod;
USED(xe);
}