luke
/
magic
mirror of https://github.com/RTimothyEdwards/magic.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

graphics: cleanup various warnings

This commit is contained in:
Darryl L. Miles 2025-10-03 23:20:09 +01:00 committed by R. Timothy Edwards
parent a16c667290
commit f4212d8e0e
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
graphics/grX11su1.c
View File

@ -560,7 +560,7 @@ GrX11Init(dispType)
}
else
{
TxPrintf("Using %s, VisualID 0x%x depth %d\n",
TxPrintf("Using %s, VisualID 0x%lx depth %d\n",
visual_type[grvisual_get[gritems].class],
grvisual_get[gritems].visualid,
grvisual_get[gritems].depth);
@ -931,7 +931,7 @@ grX11Stdin(
exception. Why X11 is generating an event for a non-existent
window is another question... ***mdg*** */
if (w == 0) {printf("CreateNotify: w = %d.\n", w); break;}
if (w == 0) {printf("CreateNotify: w = %ld.\n", (intptr_t)w); break;}
SigDisableInterrupts();
WindView(w);
SigEnableInterrupts();
@ -1169,7 +1169,7 @@ GrX11Create(w, name)
WindSeparateRedisplay(w);
xsh = XAllocSizeHints();
/* ASSERT(xsh!=0, "failed XAllocSizeHints"); */
if (windowplace=XGetDefault(grXdpy,"magic",option))
if ((windowplace=XGetDefault(grXdpy,"magic",option)) != NULL)
{
XParseGeometry(windowplace,&x,&y,
(unsigned int *)&width,(unsigned int *)&height);
@ -1194,9 +1194,9 @@ GrX11Create(w, name)
TxPrintf("x %d y %d width %d height %d depth %d class %d mask %d\n",
x,y,width,height, grDepth, grClass, attribmask);
#endif /* HIRESDB */
if (wind = XCreateWindow(grXdpy, XDefaultRootWindow(grXdpy),
if ((wind = XCreateWindow(grXdpy, XDefaultRootWindow(grXdpy),
x, y, width, height, 0, grDepth, InputOutput, grVisual,
attribmask, &grAttributes))
attribmask, &grAttributes)) != 0)
{
#ifdef sun
/* Hint's for Sun's implementation of X11 (News/X11) */

2
graphics/grX11su3.c
View File

@ -307,7 +307,7 @@ GrX11ReadPixel (w, x, y)
image = XGetImage(grXdpy, grCurrent.window, x, grMagicToX(y), 1, 1,
~0, ZPixmap);
value = XGetPixel(image, 0, 0);
return (value & (1 << grDisplay.depth) - 1);
return (value & ((1UL << grDisplay.depth) - 1));
}

2
graphics/grX11su5.c
View File

@ -318,7 +318,7 @@ GrX11SetCursor(cursorNum)
grCurrent.cursor = grCursors[cursorNum];
HashStartSearch(&hs);
while (entry = HashNext(&grX11WindowTable,&hs))
while ((entry = HashNext(&grX11WindowTable,&hs)) != NULL)
{
if (HashGetValue(entry))
XDefineCursor(grXdpy,(Window)entry->h_key.h_ptr,grCurrent.cursor);