gryf/wmaker
1
0
Fork 0
mirror of https://github.com/gryf/wmaker.git synced 2025-12-20 04:48:06 +01:00
Code Issues Projects Releases Wiki Activity

fixes to comply to ANSI C

Browse Source
This commit is contained in:
dan
2003-07-16 20:58:49 +00:00
parent bd7943d9a7
commit 8457611316
19 changed files with 838 additions and 817 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
WINGs/WINGs/WINGs.h
View File

@@ -625,6 +625,8 @@ WMPoint wmkpoint(int x, int y);
WMSize wmksize(unsigned int width, unsigned int height);
WMRect wmkrect(int x, int y, unsigned int width, unsigned int height);
#ifdef ANSI_C_DOESNT_LIKE_IT_THIS_WAY
#define wmksize(width, height) (WMSize){(width), (height)}
#define wmkpoint(x, y) (WMPoint){(x), (y)}

2
WINGs/proplist.c
View File

@@ -1615,7 +1615,9 @@ WMReadPropListFromFile(char *file)
pldata->lineNumber = 1;
if (fread(pldata->ptr, length, 1, f) != 1) {
if (ferror(f)) {
wsyserror(_("error reading from file '%s'"), file);
}
plist = NULL;
goto cleanup;
}

13
WINGs/wmisc.c
View File

@@ -338,7 +338,18 @@ wmksize(unsigned int width, unsigned int height)
}
WMRect
wmkrect(int x, int y, unsigned int width, unsigned int height)
{
WMRect rect;
rect.pos.x = x;
rect.pos.y = y;
rect.size.width = width;
rect.size.height = height;
return rect;
}

28
src/actions.c
View File

@@ -146,12 +146,12 @@ wSetFocusTo(WScreen *scr, WWindow *wwin)
LastFocusChange = timestamp;
/*
/*
* This is a hack, because XSetInputFocus() should have a proper
* timestamp instead of CurrentTime but it seems that some times
* clients will not receive focus properly that way.
if (ignoreTimestamp)
*/
*/
timestamp = CurrentTime;
if (old_focused)
@@ -415,11 +415,11 @@ wMaximizeWindow(WWindow *wwin, int directions)
if (WFLAGP(wwin, no_resizable))
return;
usableArea = totalArea = (WArea){
0, 0,
wwin->screen_ptr->scr_width,
wwin->screen_ptr->scr_height
};
totalArea.x1 = 0;
totalArea.y1 = 0;
totalArea.x2 = wwin->screen_ptr->scr_width;
totalArea.y2 = wwin->screen_ptr->scr_height;
usableArea = totalArea;
if (!(directions & MAX_IGNORE_XINERAMA)) {
WScreen *scr = wwin->screen_ptr;
@@ -1019,7 +1019,7 @@ wIconifyWindow(WWindow *wwin)
if (present) {
WWindow *owner = recursiveTransientFor(wwin->screen_ptr->focused_window);
/*
/*
* It doesn't seem to be working and causes button event hangup
* when deiconifying a transient window.
setupIconGrabs(wwin->icon);
@@ -1524,7 +1524,7 @@ wArrangeIcons(WScreen *scr, Bool arrangeAll)
int head;
const int heads = wXineramaHeads(scr);
struct {
struct HeadVars {
int pf; /* primary axis */
int sf; /* secondary axis */
int fullW;
@@ -1534,16 +1534,18 @@ wArrangeIcons(WScreen *scr, Bool arrangeAll)
int sw, sh;
int xo, yo;
int xs, ys;
} vars[heads];
} *vars;
int isize = wPreferences.icon_size;
vars = (struct HeadVars*)wmalloc(sizeof(struct HeadVars)*heads);
for (head = 0; head < heads; ++head) {
#if 0
WMRect rect = wGetRectForHead(scr, head);
#else
WArea area = wGetUsableAreaForHead(scr, head, NULL, False);
WMRect rect = (WMRect){ area.x1, area.y1, area.x2-area.x1, area.y2-area.y1 };
WMRect rect = wmkrect(area.x1, area.y1, area.x2-area.x1, area.y2-area.y1);
#endif
vars[head].pi = vars[head].si = 0;
@@ -1611,7 +1613,7 @@ wArrangeIcons(WScreen *scr, Bool arrangeAll)
if (!aicon->docked) {
/* XXX: can: icon == NULL ? */
/* The intention here is to place the AppIcon on the head that contains most of the applications _main_ window. */
/* printf( "appicon: %x %x\n", aicon->icon->core->window, aicon->main_window); */
/* printf("appicon: %x %x\n", aicon->icon->core->window, aicon->main_window); */
head = wGetHeadForWindow(aicon->icon->owner);
if (aicon->x_pos != X || aicon->y_pos != Y) {
@@ -1674,6 +1676,8 @@ wArrangeIcons(WScreen *scr, Bool arrangeAll)
/* we reversed the order, so we use next */
wwin = wwin->next;
}
wfree(vars);
}
#if 0

2
src/application.c
View File

@@ -88,7 +88,7 @@ makeMainWindow(WScreen *scr, Window window)
&wwin->user_flags, &wwin->defined_user_flags, True);
XSelectInput(dpy, window, attr.your_event_mask | PropertyChangeMask
| StructureNotifyMask );
| StructureNotifyMask);
return wwin;
}

2
src/appmenu.c
View File

@@ -300,7 +300,7 @@ wAppMenuMap(WMenu *menu, WWindow *wwin)
int x, min;
min = 20; /* Keep at least 20 pixels visible */
if( wwin->frame_x > min ) {
if (wwin->frame_x > min) {
x = wwin->frame_x - menu->frame->core->width;
}
else {

2
src/client.c
View File

@@ -180,7 +180,7 @@ wClientConfigure(WWindow *wwin, XConfigureRequestEvent *xcre)
int nx, ny, nwidth, nheight;
int ofs_x, ofs_y;
/* printf( "configure event: %d %d %d %d\n", xcre->x, xcre->y, xcre->width, xcre->height);*/
/* printf("configure event: %d %d %d %d\n", xcre->x, xcre->y, xcre->width, xcre->height);*/
if (wwin==NULL) {
/*

3
src/defaults.c
View File

@@ -3195,7 +3195,7 @@ setIconTitleBack(WScreen *scr, WDefaultEntry *entry, XColor *color, void *foo)
if (scr->icon_title_texture) {
wTextureDestroy(scr, (WTexture*)scr->icon_title_texture);
}
// ?? why is this necessary? color was already parsed and alloc'ed
/* // ?? why is this necessary? color was already parsed and alloc'ed */
XQueryColor (dpy, scr->w_colormap, color);
scr->icon_title_texture = wTextureMakeSolid(scr, color);
@@ -3464,6 +3464,7 @@ setKeyGrab(WScreen *scr, WDefaultEntry *entry, WShortKey *shortcut, long index)
static int
setIconPosition(WScreen *scr, WDefaultEntry *entry, void *bar, void *foo)
{
wScreenUpdateUsableArea(scr);
wArrangeIcons(scr, True);
return 0;

2
src/dock.c
View File

@@ -2646,7 +2646,7 @@ wDockSnapIcon(WDock *dock, WAppIcon *icon, int req_x, int req_y,
static int
onScreen(WScreen *scr, int x, int y, int sx, int ex, int sy, int ey)
{
WMRect rect = {x, y, ICON_SIZE, ICON_SIZE};
WMRect rect = wmkrect(x, y, ICON_SIZE, ICON_SIZE);
int flags;
wGetRectPlacementInfo(scr, rect, &flags);

2
src/event.c
View File

@@ -1726,7 +1726,7 @@ handleMotionNotify(XEvent *event)
WScreen *scr = wScreenForRootWindow(event->xmotion.root);
if (wPreferences.scrollable_menus) {
WMPoint p = { event->xmotion.x_root, event->xmotion.y_root };
WMPoint p = wmkpoint(event->xmotion.x_root, event->xmotion.y_root);
WMRect rect = wGetRectForHead(scr, wGetHeadForPoint(scr, p));
if (scr->flags.jump_back_pending ||

12
src/kwm.c
View File

@@ -1401,7 +1401,7 @@ wKWMCheckRootHintChange(WScreen *scr, XPropertyEvent *event)
}
}
#else
if ( i == scr->current_workspace % MAX_WORKSPACES)
if (i == scr->current_workspace % MAX_WORKSPACES)
wScreenUpdateUsableArea(scr);
#endif
@@ -1630,13 +1630,13 @@ wKWMGetUsableArea(WScreen *scr, int head, WArea *area)
ok = getAreaHint(scr->root_win, _XA_KWM_WINDOW_REGION_[region], area);
if ( ok) {
if (ok) {
WMRect rect = wGetRectForHead(scr, head);
area->x1 = WMAX( area->x1, rect.pos.x);
area->x2 = WMIN( area->x2, rect.pos.x + rect.size.width);
area->y1 = WMAX( area->y1, rect.pos.y);
area->y2 = WMIN( area->y2, rect.pos.y + rect.size.height);
area->x1 = WMAX(area->x1, rect.pos.x);
area->x2 = WMIN(area->x2, rect.pos.x + rect.size.width);
area->y1 = WMAX(area->y1, rect.pos.y);
area->y2 = WMIN(area->y2, rect.pos.y + rect.size.height);
}
return ok;

22
src/menu.c
View File

@@ -1746,9 +1746,10 @@ isPointNearBoder(WMenu *menu, int x, int y)
int menuX2 = menu->frame_x + MENUW(menu);
int menuY2 = menu->frame_y + MENUH(menu);
int flag = 0;
/* XXX: handle screen joins proper !! */
WMRect rect = wGetRectForHead(menu->frame->screen_ptr,
wGetHeadForPoint(menu->frame->screen_ptr, (WMPoint){ x, y}));
int head = wGetHeadForPoint(menu->frame->screen_ptr, wmkpoint(x, y));
WMRect rect = wGetRectForHead(menu->frame->screen_ptr, head);
/* XXX: handle screen joins properly !! */
if (x >= menuX1 && x <= menuX2 &&
(y < rect.pos.y + MENU_SCROLL_BORDER ||
@@ -1764,17 +1765,16 @@ isPointNearBoder(WMenu *menu, int x, int y)
typedef struct _delay {
WWindow *wwin;
WMenu *menu;
int ox,oy;
int ox, oy;
} _delay;
static void
_leaving(_delay *dl)
leaving(_delay *dl)
{
wMenuMove(dl->menu, dl->ox, dl->oy, True);
dl->menu->jump_back=NULL;
dl->menu->jump_back = NULL;
dl->menu->menu->screen_ptr->flags.jump_back_pending = 0;
wfree(dl);
}
@@ -1832,7 +1832,7 @@ wMenuScroll(WMenu *menu, XEvent *event)
break;
}
rect = wGetRectForHead(scr, wGetHeadForPoint(scr, (WMPoint){ x, y }));
rect = wGetRectForHead(scr, wGetHeadForPoint(scr, wmkpoint(x, y)));
on_x_edge = x <= rect.pos.x + 1 || x >= rect.pos.x + rect.size.width - 2;
on_y_edge = y <= rect.pos.y + 1 || y >= rect.pos.y + rect.size.height - 2;
on_border = on_x_edge || on_y_edge;
@@ -1884,15 +1884,15 @@ wMenuScroll(WMenu *menu, XEvent *event)
if (jump_back) {
_delay *delayer;
if (!omenu->jump_back) {
delayer=wmalloc(sizeof(_delay));
delayer = wmalloc(sizeof(_delay));
delayer->menu=omenu;
delayer->ox=old_frame_x;
delayer->oy=old_frame_y;
omenu->jump_back=delayer;
omenu->jump_back = delayer;
scr->flags.jump_back_pending = 1;
}
else delayer = omenu->jump_back;
WMAddTimerHandler(MENU_JUMP_BACK_DELAY,(WMCallback*)_leaving, delayer);
WMAddTimerHandler(MENU_JUMP_BACK_DELAY,(WMCallback*)leaving, delayer);
}
}

28
src/placement.c
View File

@@ -141,22 +141,18 @@ PlaceIcon(WScreen *scr, int *x_ret, int *y_ret, int head)
int isize = wPreferences.icon_size;
int done = 0;
WMBagIterator iter;
/*
* Find out screen boundaries.
*/
/*
* Allows each head to have miniwindows
*/
WArea area = wGetUsableAreaForHead(scr, head, NULL, False);
WMRect rect = (WMRect){ area.x1, area.y1, area.x2-area.x1, area.y2-area.y1 };
sx1 = rect.pos.x;
sy1 = rect.pos.y;
sw = rect.size.width;
sh = rect.size.height;
sx2 = sx1 + sw;
sy2 = sy1 + sh;
/* Find out screen boundaries. */
/* Allows each head to have miniwindows */
sx1 = area.x1;
sy1 = area.y1;
sx2 = area.x2;
sy2 = area.y2;
sw = sx2-sx1;
sh = sy2-sy1;
#if 0
if (scr->dock) {
@@ -383,7 +379,7 @@ smartPlaceWindow(WWindow *wwin, int *x_ret, int *y_ret,
sum_isect = calcSumOfCoveredAreas(wwin, test_x, test_y,
width, height);
if ( sum_isect < min_isect ) {
if (sum_isect < min_isect) {
min_isect = sum_isect;
min_isect_x = test_x;
min_isect_y = test_y;
@@ -411,7 +407,7 @@ smartPlaceWindow(WWindow *wwin, int *x_ret, int *y_ret,
sum_isect = calcSumOfCoveredAreas(wwin, test_x, test_y,
width, height);
if ( sum_isect < min_isect ) {
if (sum_isect < min_isect) {
min_isect = sum_isect;
min_isect_x = test_x;
min_isect_y = test_y;

62
src/screen.c
View File

@@ -624,10 +624,10 @@ wScreenInit(int screen_number)
wInitXinerama(scr);
scr->usableArea = (WArea *)wmalloc( sizeof(WArea)*wXineramaHeads(scr)); /* XXX: checl NULL */
scr->totalUsableArea = (WArea *)wmalloc( sizeof(WArea)*wXineramaHeads(scr)); /* XXX: */
scr->usableArea = (WArea *)wmalloc(sizeof(WArea)*wXineramaHeads(scr));
scr->totalUsableArea = (WArea *)wmalloc(sizeof(WArea)*wXineramaHeads(scr));
for ( i=0; i<wXineramaHeads(scr); ++i) {
for (i=0; i<wXineramaHeads(scr); ++i) {
WMRect rect = wGetRectForHead(scr, i);
scr->usableArea[i].x1 = scr->totalUsableArea[i].x1 = rect.pos.x;
scr->usableArea[i].y1 = scr->totalUsableArea[i].y1 = rect.pos.y;
@@ -839,7 +839,8 @@ wScreenUpdateUsableArea(WScreen *scr)
{
/*
* scr->totalUsableArea[] will become the usableArea used for Windowplacement,
* scr->usableArea[] will be used for iconplacement, hence no iconyard nor border.
* scr->usableArea[] will be used for iconplacement, hence no iconyard nor
* border.
*/
int i;
@@ -847,25 +848,27 @@ wScreenUpdateUsableArea(WScreen *scr)
WArea area;
int dock_head = scr->xine_info.primary_head;
if ( scr->dock) {
WMRect rect = { scr->dock->x_pos, scr->dock->y_pos, wPreferences.icon_size, wPreferences.icon_size };
if (scr->dock) {
WMRect rect;
rect.pos.x = scr->dock->x_pos;
rect.pos.y = scr->dock->y_pos;
rect.size.width = wPreferences.icon_size;
rect.size.height = wPreferences.icon_size;
dock_head = wGetHeadForRect(scr, rect);
}
for ( i=0; i<wXineramaHeads(scr); ++i) {
for (i=0; i<wXineramaHeads(scr); ++i) {
WMRect rect = wGetRectForHead(scr, i);
scr->totalUsableArea[i] = (WArea){
rect.pos.x,
rect.pos.y,
rect.pos.x + rect.size.width,
rect.pos.y + rect.size.height
};
scr->totalUsableArea[i].x1 = rect.pos.x;
scr->totalUsableArea[i].y1 = rect.pos.y;
scr->totalUsableArea[i].x2 = rect.pos.x + rect.size.width;
scr->totalUsableArea[i].y2 = rect.pos.y + rect.size.height;
if ( scr->dock && dock_head==i &&
if (scr->dock && dock_head==i &&
(!scr->dock->lowered || wPreferences.no_window_over_dock)) {
int offset = wPreferences.icon_size + DOCK_EXTRA_SPACE;
if ( scr->dock->on_right_side) {
if (scr->dock->on_right_side) {
scr->totalUsableArea[i].x2 -= offset;
} else {
scr->totalUsableArea[i].x1 += offset;
@@ -875,7 +878,7 @@ wScreenUpdateUsableArea(WScreen *scr)
#ifdef NETWM_HINTS
{
WArea area;
if ( wNETWMGetUsableArea(scr, i, &area)) {
if (wNETWMGetUsableArea(scr, i, &area)) {
scr->totalUsableArea[i].x1 = WMAX(scr->totalUsableArea[i].x1, area.x1);
scr->totalUsableArea[i].y1 = WMAX(scr->totalUsableArea[i].y1, area.y1);
scr->totalUsableArea[i].x2 = WMIN(scr->totalUsableArea[i].x2, area.x2);
@@ -887,7 +890,7 @@ wScreenUpdateUsableArea(WScreen *scr)
#ifdef GNOME_STUFF
{
WArea area;
if ( wGNOMEGetUsableArea(scr, i, &area)) {
if (wGNOMEGetUsableArea(scr, i, &area)) {
scr->totalUsableArea[i].x1 = WMAX(scr->totalUsableArea[i].x1, area.x1);
scr->totalUsableArea[i].y1 = WMAX(scr->totalUsableArea[i].y1, area.y1);
scr->totalUsableArea[i].x2 = WMIN(scr->totalUsableArea[i].x2, area.x2);
@@ -899,7 +902,7 @@ wScreenUpdateUsableArea(WScreen *scr)
#ifdef KWM_HINTS
{
WArea area;
if ( wKWMGetUsableArea(scr, i, &area)) {
if (wKWMGetUsableArea(scr, i, &area)) {
scr->totalUsableArea[i].x1 = WMAX(scr->totalUsableArea[i].x1, area.x1);
scr->totalUsableArea[i].y1 = WMAX(scr->totalUsableArea[i].y1, area.y1);
scr->totalUsableArea[i].x2 = WMIN(scr->totalUsableArea[i].x2, area.x2);
@@ -911,22 +914,20 @@ wScreenUpdateUsableArea(WScreen *scr)
scr->usableArea[i] = scr->totalUsableArea[i];
#if 0
printf( "usableArea[%d]: %d %d %d %d\n", i,
scr->usableArea[i].x1,
scr->usableArea[i].x2,
scr->usableArea[i].y1,
scr->usableArea[i].y2);
printf("usableArea[%d]: %d %d %d %d\n", i,
scr->usableArea[i].x1, scr->usableArea[i].x2,
scr->usableArea[i].y1, scr->usableArea[i].y2);
#endif
if ( wPreferences.no_window_over_icons) {
if ( wPreferences.icon_yard & IY_VERT) {
if ( wPreferences.icon_yard & IY_RIGHT) {
scr->totalUsableArea[i].x1 += wPreferences.icon_size;
} else {
if (wPreferences.no_window_over_icons) {
if (wPreferences.icon_yard & IY_VERT) {
if (wPreferences.icon_yard & IY_RIGHT) {
scr->totalUsableArea[i].x2 -= wPreferences.icon_size;
} else {
scr->totalUsableArea[i].x1 += wPreferences.icon_size;
}
} else {
if ( wPreferences.icon_yard & IY_TOP) {
if (wPreferences.icon_yard & IY_TOP) {
scr->totalUsableArea[i].y1 += wPreferences.icon_size;
} else {
scr->totalUsableArea[i].y2 -= wPreferences.icon_size;
@@ -938,6 +939,7 @@ wScreenUpdateUsableArea(WScreen *scr)
scr->totalUsableArea[i].x1 = rect.pos.x;
scr->totalUsableArea[i].x2 = rect.pos.x + rect.size.width;
}
if (scr->totalUsableArea[i].y2 - scr->totalUsableArea[i].y1 < rect.size.height/2) {
scr->totalUsableArea[i].y1 = rect.pos.y;
scr->totalUsableArea[i].y2 = rect.pos.y + rect.size.height;
@@ -946,7 +948,7 @@ wScreenUpdateUsableArea(WScreen *scr)
tmp_area = (scr->totalUsableArea[i].x2 - scr->totalUsableArea[i].x1) *
(scr->totalUsableArea[i].y2 - scr->totalUsableArea[i].y1);
if ( tmp_area > best_area) {
if (tmp_area > best_area) {
best_area = tmp_area;
area = scr->totalUsableArea[i];
}

2
src/session.c
View File

@@ -289,7 +289,7 @@ makeWindowState(WWindow *wwin, WApplication *wapp)
for(i=0; i<scr->workspace_count; i++)
if(scr->workspaces[i]->clip == wapp->app_icon->dock)
break;
assert( i < scr->workspace_count);
assert(i < scr->workspace_count);
/*n = i+1;*/
name = scr->workspaces[i]->name;
}

2
src/usermenu.c
View File

@@ -355,7 +355,7 @@ wUserMenuGet(WScreen *scr, WWindow *wwin)
char buffer[100];
char *path = NULL;
char *tmp;
if ( wwin->wm_instance && wwin->wm_class ) {
if (wwin->wm_instance && wwin->wm_class) {
int len = strlen(wwin->wm_instance)+strlen(wwin->wm_class)+7;
tmp=wmalloc(len);
snprintf(tmp,len,"%s.%s.menu",wwin->wm_instance,wwin->wm_class);

11
src/window.c
View File

@@ -773,7 +773,7 @@ wManageWindow(WScreen *scr, Window window)
/* get geometry stuff */
wClientGetNormalHints(wwin, &wattribs, True, &x, &y, &width, &height);
/* printf( "wManageWindow: %d %d %d %d\n", x, y, width, height);*/
/* printf("wManageWindow: %d %d %d %d\n", x, y, width, height);*/
/* get colormap windows */
GetColormapWindows(wwin);
@@ -1152,10 +1152,10 @@ wManageWindow(WScreen *scr, Window window)
* them. -alfredo
*/
#if 0
printf( "xinerama PPosition: x: %d %d\n", x, (scr->scr_width - width)/2);
printf( "xinerama PPosition: y: %d %d\n", y, (scr->scr_height - height)/2);
printf("xinerama PPosition: x: %d %d\n", x, (scr->scr_width - width)/2);
printf("xinerama PPosition: y: %d %d\n", y, (scr->scr_height - height)/2);
if ( (unsigned)(x + (width - scr->scr_width)/2 + 10) < 20 &&
if ((unsigned)(x + (width - scr->scr_width)/2 + 10) < 20 &&
(unsigned)(y + (height - scr->scr_height)/2 + 10) < 20) {
reposition = 1;
@@ -3005,7 +3005,8 @@ wWindowDeleteSavedStatesForPID(pid_t pid)
void
wWindowSetOmnipresent(WWindow *wwin, Bool flag)
{
if ( wwin->flags.omnipresent == flag) return;
if (wwin->flags.omnipresent == flag)
return;
wwin->flags.omnipresent = flag;
WMPostNotificationName(WMNChangedState, wwin, "omnipresent");

8
src/xinerama.c
View File

@@ -135,17 +135,17 @@ wGetRectPlacementInfo(WScreen *scr, WMRect rect, int *flags)
totalArea += a;
if (a > area) {
if ( best != -1)
if (best != -1)
*flags |= XFLAG_MULTIPLE;
area = a;
best = i;
}
}
if ( best == -1) {
if (best == -1) {
*flags |= XFLAG_DEAD;
best = wGetHeadForPointerLocation(scr);
} else if ( totalArea != rw*rh)
} else if (totalArea != rw*rh)
*flags |= XFLAG_PARTIAL;
return best;
@@ -242,7 +242,7 @@ wGetHeadForPoint(WScreen *scr, WMPoint point, int *flags)
int i;
// paranoia
if ( flags == NULL) {
if (flags == NULL) {
static int tmp;
flags = &tmp;
}

2
src/xinerama.h
View File

@@ -51,6 +51,8 @@ WArea wGetUsableAreaForHead(WScreen *scr, int head, WArea *totalAreaPtr, Bool no
WMPoint wGetPointToCenterRectInHead(WScreen *scr, int head, int width, int height);
Bool wWindowTouchesHead(WWindow *wwin, int head);
#endif