mirror of
https://github.com/gryf/wmaker.git
synced 2025-12-25 07:32:36 +01:00
eliminated gcc-4 compilation warnings
This commit is contained in:
@@ -365,7 +365,8 @@ wUnshadeWindow(WWindow *wwin)
|
||||
void
|
||||
wMaximizeWindow(WWindow *wwin, int directions)
|
||||
{
|
||||
int new_width, new_height, new_x, new_y;
|
||||
int new_x, new_y;
|
||||
unsigned int new_width, new_height;
|
||||
int changed_h, changed_v, shrink_h, shrink_v;
|
||||
WArea usableArea, totalArea;
|
||||
|
||||
|
||||
@@ -559,6 +559,10 @@ handleMapRequest(XEvent *ev)
|
||||
wwin->flags.skip_next_animation = 1;
|
||||
wIconifyWindow(wwin);
|
||||
}
|
||||
if (wwin->flags.fullscreen) {
|
||||
wwin->flags.fullscreen = 0;
|
||||
wFullscreenWindow(wwin);
|
||||
}
|
||||
if (wwin->flags.hidden) {
|
||||
WApplication *wapp = wApplicationOf(wwin->main_window);
|
||||
|
||||
|
||||
@@ -651,7 +651,7 @@ wIconUpdate(WIcon *icon)
|
||||
if (icon->icon_win!=None) {
|
||||
XWindowAttributes attr;
|
||||
int resize=0;
|
||||
int width, height, depth;
|
||||
unsigned int width, height, depth;
|
||||
int theight;
|
||||
Pixmap pixmap;
|
||||
|
||||
|
||||
@@ -1128,7 +1128,7 @@ UnescapeWM_CLASS(char *str, char **name, char **class)
|
||||
void
|
||||
SendHelperMessage(WScreen *scr, char type, int workspace, char *msg)
|
||||
{
|
||||
unsigned char *buffer;
|
||||
char *buffer;
|
||||
int len;
|
||||
int i;
|
||||
char buf[16];
|
||||
|
||||
@@ -1471,7 +1471,7 @@ wKeyboardMoveResizeWindow(WWindow *wwin)
|
||||
|
||||
ww=w;wh=h;
|
||||
wh-=vert_border;
|
||||
wWindowConstrainSize(wwin, &ww, &wh);
|
||||
wWindowConstrainSize(wwin, (unsigned int*)&ww, (unsigned int*)&wh);
|
||||
wh+=vert_border;
|
||||
|
||||
if (wPreferences.ws_cycle){
|
||||
@@ -2070,7 +2070,7 @@ wMouseResizeWindow(WWindow *wwin, XEvent *ev)
|
||||
rh += dh;
|
||||
fw = rw;
|
||||
fh = rh - vert_border;
|
||||
wWindowConstrainSize(wwin, &fw, &fh);
|
||||
wWindowConstrainSize(wwin, (unsigned int*)&fw, (unsigned int*)&fh);
|
||||
fh += vert_border;
|
||||
if (res & LEFT)
|
||||
fx = rx2 - fw + 1;
|
||||
|
||||
@@ -234,8 +234,8 @@ PropSetIconTileHint(WScreen *scr, RImage *image)
|
||||
if (image->format == RRGBAFormat) {
|
||||
memcpy(&tmp[4], image->data, image->width*image->height*4);
|
||||
} else {
|
||||
char *ptr = tmp+4;
|
||||
char *src = image->data;
|
||||
char *ptr = (char*)(tmp+4);
|
||||
char *src = (char*)image->data;
|
||||
|
||||
for (y = 0; y < image->height; y++) {
|
||||
for (x = 0; x < image->width; x++) {
|
||||
|
||||
@@ -25,6 +25,7 @@
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
#include <unistd.h>
|
||||
#include <string.h>
|
||||
#include <errno.h>
|
||||
#include <signal.h>
|
||||
#include <sys/wait.h>
|
||||
|
||||
10
src/window.c
10
src/window.c
@@ -2043,10 +2043,10 @@ wWindowUpdateName(WWindow *wwin, char *newTitle)
|
||||
*----------------------------------------------------------------------
|
||||
*/
|
||||
void
|
||||
wWindowConstrainSize(WWindow *wwin, int *nwidth, int *nheight)
|
||||
wWindowConstrainSize(WWindow *wwin, unsigned int *nwidth, unsigned int *nheight)
|
||||
{
|
||||
int width = *nwidth;
|
||||
int height = *nheight;
|
||||
int width = (int)*nwidth;
|
||||
int height = (int)*nheight;
|
||||
int winc = 1;
|
||||
int hinc = 1;
|
||||
int minW = 1, minH = 1;
|
||||
@@ -2143,8 +2143,8 @@ wWindowConstrainSize(WWindow *wwin, int *nwidth, int *nheight)
|
||||
|
||||
|
||||
void
|
||||
wWindowCropSize(WWindow *wwin, int maxW, int maxH,
|
||||
int *width, int *height)
|
||||
wWindowCropSize(WWindow *wwin, unsigned int maxW, unsigned int maxH,
|
||||
unsigned int *width, unsigned int *height)
|
||||
{
|
||||
int baseW = 0, baseH = 0;
|
||||
int winc = 1, hinc = 1;
|
||||
|
||||
@@ -388,9 +388,9 @@ void wWindowFocus(WWindow *wwin, WWindow *owin);
|
||||
void wWindowUnfocus(WWindow *wwin);
|
||||
|
||||
void wWindowUpdateName(WWindow *wwin, char *newTitle);
|
||||
void wWindowConstrainSize(WWindow *wwin, int *nwidth, int *nheight);
|
||||
void wWindowCropSize(WWindow *wwin, int maxw, int maxh,
|
||||
int *nwidth, int *nheight);
|
||||
void wWindowConstrainSize(WWindow *wwin, unsigned int *nwidth, unsigned int *nheight);
|
||||
void wWindowCropSize(WWindow *wwin, unsigned int maxw, unsigned int maxh,
|
||||
unsigned int *nwidth, unsigned int *nheight);
|
||||
void wWindowConfigure(WWindow *wwin, int req_x, int req_y,
|
||||
int req_width, int req_height);
|
||||
|
||||
|
||||
Reference in New Issue
Block a user