Merge remote-tracking branch 'origin/master' into obsd

1 files changed, 19 insertions, 19 deletions

diff --git a/src/icons.c b/src/icons.c
index 617a1f7..a3a6588 100644
--- a/src/icons.c
+++ b/src/icons.c
@@ -378,12 +378,12 @@ CreateIconWindow(TwmWindow *tmp_win, int def_x, int def_y)
 		(unsigned int *) &tmp_win->icon_width, (unsigned int *)&tmp_win->icon_height,
 		&JunkBW, &JunkDepth);
 
-	    pm = XCreatePixmap(dpy, Scr->Root, tmp_win->icon_width,
-		tmp_win->icon_height, Scr->d_depth);
+	    pm = XCreatePixmap(dpy, Scr->Root, (unsigned)tmp_win->icon_width,
+		(unsigned)tmp_win->icon_height, (unsigned)Scr->d_depth);
 
 	    /* the copy plane works on color ! */
 	    XCopyPlane(dpy, bm, pm, Scr->NormalGC,
-		0,0, tmp_win->icon_width, tmp_win->icon_height, 0, 0, 1 );
+		0,0, (unsigned)tmp_win->icon_width, (unsigned)tmp_win->icon_height, 0, 0, 1 );
 
 	    tmp_win->forced = TRUE;
 	}
@@ -402,11 +402,11 @@ CreateIconWindow(TwmWindow *tmp_win, int def_x, int def_y)
 	     (unsigned int *)&tmp_win->icon_width, (unsigned int *)&tmp_win->icon_height, &JunkBW, &JunkDepth);
 
 	pm = XCreatePixmap(dpy, Scr->Root,
-			   tmp_win->icon_width, tmp_win->icon_height,
-			   Scr->d_depth);
+			   (unsigned)tmp_win->icon_width, (unsigned)tmp_win->icon_height,
+			   (unsigned)Scr->d_depth);
 
 	XCopyPlane(dpy, tmp_win->wmhints->icon_pixmap, pm, Scr->NormalGC,
-	    0,0, tmp_win->icon_width, tmp_win->icon_height, 0, 0, 1 );
+	    0,0, (unsigned)tmp_win->icon_width, (unsigned)tmp_win->icon_height, 0, 0, 1 );
     }
 
     /* if we still haven't got an icon, let's look in the Icon list
@@ -438,12 +438,12 @@ CreateIconWindow(TwmWindow *tmp_win, int def_x, int def_y)
 		(unsigned int *)&tmp_win->icon_width, (unsigned int *)&tmp_win->icon_height,
 		&JunkBW, &JunkDepth);
 
-	    pm = XCreatePixmap(dpy, Scr->Root, tmp_win->icon_width,
-		tmp_win->icon_height, Scr->d_depth);
+	    pm = XCreatePixmap(dpy, Scr->Root, (unsigned)tmp_win->icon_width,
+		(unsigned)tmp_win->icon_height, (unsigned)Scr->d_depth);
 
 	    /* the copy plane works on color ! */
 	    XCopyPlane(dpy, bm, pm, Scr->NormalGC,
-		0,0, tmp_win->icon_width, tmp_win->icon_height, 0, 0, 1 );
+		0,0, (unsigned)tmp_win->icon_width, (unsigned)tmp_win->icon_height, 0, 0, 1 );
 	}
     }
 
@@ -454,12 +454,12 @@ CreateIconWindow(TwmWindow *tmp_win, int def_x, int def_y)
 	tmp_win->icon_width = Scr->UnknownWidth;
 	tmp_win->icon_height = Scr->UnknownHeight;
 
-	pm = XCreatePixmap(dpy, Scr->Root, tmp_win->icon_width,
-	    tmp_win->icon_height, Scr->d_depth);
+	pm = XCreatePixmap(dpy, Scr->Root, (unsigned)tmp_win->icon_width,
+	    (unsigned)tmp_win->icon_height, (unsigned)Scr->d_depth);
 
 	/* the copy plane works on color ! */
 	XCopyPlane(dpy, Scr->UnknownPm, pm, Scr->NormalGC,
-	    0,0, tmp_win->icon_width, tmp_win->icon_height, 0, 0, 1 );
+	    0,0, (unsigned)tmp_win->icon_width, (unsigned)tmp_win->icon_height, 0, 0, 1 );
     }
 
     if (pm == None)
@@ -475,7 +475,7 @@ CreateIconWindow(TwmWindow *tmp_win, int def_x, int def_y)
     }
 
     tmp_win->icon_w_width = MyFont_TextWidth(&Scr->IconFont,
-	tmp_win->icon_name, strlen(tmp_win->icon_name));
+	tmp_win->icon_name, (int)strlen(tmp_win->icon_name));
 
     tmp_win->icon_w_width += 6;
     if (tmp_win->icon_w_width < tmp_win->icon_width)
@@ -518,14 +518,14 @@ CreateIconWindow(TwmWindow *tmp_win, int def_x, int def_y)
     {
 	tmp_win->icon_w = XCreateSimpleWindow(dpy, Scr->Root,
 	    0,0,
-	    tmp_win->icon_w_width, tmp_win->icon_w_height,
-	    Scr->IconBorderWidth, tmp_win->icon_border, tmp_win->iconc.back);
+	    (unsigned)tmp_win->icon_w_width, (unsigned)tmp_win->icon_w_height,
+	    (unsigned)Scr->IconBorderWidth, tmp_win->icon_border, tmp_win->iconc.back);
 	event_mask = ExposureMask;
     }
 
     XSelectInput (dpy, tmp_win->icon_w,
-		  KeyPressMask | ButtonPressMask | ButtonReleaseMask |
-		  event_mask);
+		  (long)(KeyPressMask | ButtonPressMask | ButtonReleaseMask |
+		  event_mask));
 
     tmp_win->icon_bm_w = None;
     if (pm != None &&
@@ -574,8 +574,8 @@ CreateIconWindow(TwmWindow *tmp_win, int def_x, int def_y)
     tmp_win->iconified = TRUE;
 
     XMapSubwindows(dpy, tmp_win->icon_w);
-    XSaveContext(dpy, tmp_win->icon_w, TwmContext, (caddr_t)tmp_win);
-    XSaveContext(dpy, tmp_win->icon_w, ScreenContext, (caddr_t)Scr);
+    XSaveContext(dpy, tmp_win->icon_w, TwmContext, (XPointer)tmp_win);
+    XSaveContext(dpy, tmp_win->icon_w, ScreenContext, (XPointer)Scr);
     XDefineCursor(dpy, tmp_win->icon_w, Scr->IconCursor);
     if (pm) XFreePixmap (dpy, pm);
     return;