diff options
author | Thomas E. Dickey <dickey@invisible-island.net> | 2019-07-15 19:58:35 -0400 |
---|---|---|
committer | Thomas E. Dickey <dickey@invisible-island.net> | 2019-07-15 19:58:35 -0400 |
commit | c3ff775bfe4556ffbe920cbfbc860e471dfc7f07 (patch) | |
tree | 0fbeaafb2ec09955240bac3eb3a9bbe49a44f52e /src/resize.c | |
parent | f7a9ead69089a862fbd9aab6995980d3ecd290bf (diff) |
fix gcc-normal compiler warnings, no object change
Signed-off-by: Thomas E. Dickey <dickey@invisible-island.net>
Diffstat (limited to 'src/resize.c')
-rw-r--r-- | src/resize.c | 48 |
1 files changed, 24 insertions, 24 deletions
diff --git a/src/resize.c b/src/resize.c index 7cb4aa6..e59e190 100644 --- a/src/resize.c +++ b/src/resize.c @@ -174,8 +174,8 @@ StartResize(XEvent *evp, TwmWindow *tmp_win, Bool fromtitlebar) Scr->SizeStringOffset = SIZE_HINDENT; XResizeWindow (dpy, Scr->SizeWindow, - Scr->SizeStringWidth + SIZE_HINDENT * 2, - Scr->SizeFont.height + SIZE_VINDENT * 2); + (unsigned)(Scr->SizeStringWidth + SIZE_HINDENT * 2), + (unsigned)(Scr->SizeFont.height + SIZE_VINDENT * 2)); XMapRaised(dpy, Scr->SizeWindow); InstallRootColormap(); last_width = 0; @@ -208,8 +208,8 @@ MenuStartResize(TwmWindow *tmp_win, int x, int y, int w, int h) last_height = 0; Scr->SizeStringOffset = SIZE_HINDENT; XResizeWindow (dpy, Scr->SizeWindow, - Scr->SizeStringWidth + SIZE_HINDENT * 2, - Scr->SizeFont.height + SIZE_VINDENT * 2); + (unsigned)(Scr->SizeStringWidth + SIZE_HINDENT * 2), + (unsigned)(Scr->SizeFont.height + SIZE_VINDENT * 2)); XMapRaised(dpy, Scr->SizeWindow); DisplaySize(tmp_win, origWidth, origHeight); MoveOutline (Scr->Root, dragx - tmp_win->frame_bw, @@ -829,7 +829,7 @@ void SetupFrame (TwmWindow *tmp_win, int x, int y, int w, int h, int bw, Bool se xwcm |= (CWX | CWY | CWBorderWidth); } - XConfigureWindow(dpy, tmp_win->title_w, xwcm, &xwc); + XConfigureWindow(dpy, tmp_win->title_w, (unsigned)xwcm, &xwc); } if (tmp_win->attr.width != w) @@ -842,7 +842,7 @@ void SetupFrame (TwmWindow *tmp_win, int x, int y, int w, int h, int bw, Bool se tmp_win->attr.height = h - tmp_win->title_height; XMoveResizeWindow (dpy, tmp_win->w, 0, tmp_win->title_height, - w, h - tmp_win->title_height); + (unsigned)w, (unsigned)(h - tmp_win->title_height)); /* * fix up frame and assign size/location values in tmp_win @@ -857,7 +857,7 @@ void SetupFrame (TwmWindow *tmp_win, int x, int y, int w, int h, int bw, Bool se frame_wc.width = tmp_win->frame_width = w; frame_wc.height = tmp_win->frame_height = h; frame_mask |= (CWX | CWY | CWWidth | CWHeight); - XConfigureWindow (dpy, tmp_win->frame, frame_mask, &frame_wc); + XConfigureWindow (dpy, tmp_win->frame, (unsigned)frame_mask, &frame_wc); /* * fix up highlight window @@ -874,7 +874,7 @@ void SetupFrame (TwmWindow *tmp_win, int x, int y, int w, int h, int bw, Bool se } xwcm = CWX | CWWidth; - XConfigureWindow(dpy, tmp_win->hilite_w, xwcm, &xwc); + XConfigureWindow(dpy, tmp_win->hilite_w, (unsigned)xwcm, &xwc); } if (HasShape && reShape) { @@ -941,10 +941,10 @@ fullzoom(TwmWindow *tmp_win, int flag) tmp_win->save_frame_y = dragy; tmp_win->save_frame_width = dragWidth; tmp_win->save_frame_height = dragHeight; - tmp_win->zoomed = flag; + tmp_win->zoomed = (short)flag; } else - tmp_win->zoomed = flag; + tmp_win->zoomed = (short)flag; frame_bw_times_2 = 2*tmp_win->frame_bw; @@ -1053,25 +1053,25 @@ SetFrameShape (TwmWindow *tmp) * The frame_width and frame_height do *not* include borders. */ /* border */ - newBounding[0].x = tmp->title_x; - newBounding[0].y = tmp->title_y; - newBounding[0].width = tmp->title_width + fbw2; - newBounding[0].height = tmp->title_height; - newBounding[1].x = -tmp->frame_bw; - newBounding[1].y = Scr->TitleHeight; - newBounding[1].width = tmp->attr.width + fbw2; - newBounding[1].height = tmp->attr.height + fbw2; + newBounding[0].x = (short)tmp->title_x; + newBounding[0].y = (short)tmp->title_y; + newBounding[0].width = (unsigned short)(tmp->title_width + fbw2); + newBounding[0].height = (unsigned short)tmp->title_height; + newBounding[1].x = (short)-tmp->frame_bw; + newBounding[1].y = (short)Scr->TitleHeight; + newBounding[1].width = (unsigned short)(tmp->attr.width + fbw2); + newBounding[1].height = (unsigned short)(tmp->attr.height + fbw2); XShapeCombineRectangles (dpy, tmp->frame, ShapeBounding, 0, 0, newBounding, 2, ShapeSet, YXBanded); /* insides */ - newClip[0].x = tmp->title_x + tmp->frame_bw; + newClip[0].x = (short)(tmp->title_x + tmp->frame_bw); newClip[0].y = 0; - newClip[0].width = tmp->title_width; - newClip[0].height = Scr->TitleHeight; + newClip[0].width = (unsigned short)tmp->title_width; + newClip[0].height = (unsigned short)Scr->TitleHeight; newClip[1].x = 0; - newClip[1].y = tmp->title_height; - newClip[1].width = tmp->attr.width; - newClip[1].height = tmp->attr.height; + newClip[1].y = (short)tmp->title_height; + newClip[1].width = (unsigned short)tmp->attr.width; + newClip[1].height = (unsigned short)tmp->attr.height; XShapeCombineRectangles (dpy, tmp->frame, ShapeClip, 0, 0, newClip, 2, ShapeSet, YXBanded); } else { |