gryf/wmaker
1
0
Fork 0
mirror of https://github.com/gryf/wmaker.git synced 2025-12-19 12:28:22 +01:00
Code Issues Projects Releases Wiki Activity

Consolidated all code checking whether a tile is fully on screen in one static function

Browse Source 
The function existed before, but had all kinds of unneeded arguments and wasn't called everywhere.
This commit is contained in:
Daniel Déchelotte
2013-04-12 01:42:32 +02:00
committed by Carlos R. Mafra
parent 4b44020488
commit 6f44be87fc
1 changed files with 17 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
src/dock.c
View File

@@ -118,6 +118,8 @@ static void clipAutoRaise(void *cdata);
static void reattachIcon(WDock *dock, WAppIcon *icon, int x, int y); static void reattachIcon(WDock *dock, WAppIcon *icon, int x, int y);
static WAppIcon *mainIconCreate(WScreen *scr, int type); static WAppIcon *mainIconCreate(WScreen *scr, int type);
static int onScreen(WScreen *scr, int x, int y);
static void make_keys(void) static void make_keys(void)
{ {
if (dCommand != NULL) if (dCommand != NULL)
@@ -1477,19 +1479,11 @@ WAppIcon *wClipRestoreState(WScreen *scr, WMPropList *clip_state)
if (!WMIsPLString(value)) { if (!WMIsPLString(value)) {
COMPLAIN("Position"); COMPLAIN("Position");
} else { } else {
WMRect rect;
int flags;
if (sscanf(WMGetFromPLString(value), "%i,%i", &icon->x_pos, &icon->y_pos) != 2) if (sscanf(WMGetFromPLString(value), "%i,%i", &icon->x_pos, &icon->y_pos) != 2)
COMPLAIN("Position"); COMPLAIN("Position");
/* check position sanity */ /* check position sanity */
rect.pos.x = icon->x_pos; if (!onScreen(scr, icon->x_pos, icon->y_pos))
rect.pos.y = icon->y_pos;
rect.size.width = rect.size.height = ICON_SIZE;
wGetRectPlacementInfo(scr, rect, &flags);
if (flags & (XFLAG_DEAD | XFLAG_PARTIAL))
wScreenKeepInside(scr, &icon->x_pos, &icon->y_pos, ICON_SIZE, ICON_SIZE); wScreenKeepInside(scr, &icon->x_pos, &icon->y_pos, ICON_SIZE, ICON_SIZE);
} }
} }
@@ -1529,19 +1523,11 @@ WDock *wDockRestoreState(WScreen *scr, WMPropList *dock_state, int type)
if (!WMIsPLString(value)) { if (!WMIsPLString(value)) {
COMPLAIN("Position"); COMPLAIN("Position");
} else { } else {
WMRect rect;
int flags;
if (sscanf(WMGetFromPLString(value), "%i,%i", &dock->x_pos, &dock->y_pos) != 2) if (sscanf(WMGetFromPLString(value), "%i,%i", &dock->x_pos, &dock->y_pos) != 2)
COMPLAIN("Position"); COMPLAIN("Position");
/* check position sanity */ /* check position sanity */
rect.pos.x = dock->x_pos; if (!onScreen(scr, dock->x_pos, dock->y_pos)) {
rect.pos.y = dock->y_pos;
rect.size.width = rect.size.height = ICON_SIZE;
wGetRectPlacementInfo(scr, rect, &flags);
if (flags & (XFLAG_DEAD | XFLAG_PARTIAL)) {
int x = dock->x_pos; int x = dock->x_pos;
wScreenKeepInside(scr, &x, &dock->y_pos, ICON_SIZE, ICON_SIZE); wScreenKeepInside(scr, &x, &dock->y_pos, ICON_SIZE, ICON_SIZE);
} }
@@ -2228,18 +2214,8 @@ Bool wDockSnapIcon(WDock *dock, WAppIcon *icon, int req_x, int req_y, int *ret_x
ex_x = (req_x + offset - dx) / ICON_SIZE; ex_x = (req_x + offset - dx) / ICON_SIZE;
/* check if the icon is outside the screen boundaries */ /* check if the icon is outside the screen boundaries */
{ if (!onScreen(scr, dx + ex_x * ICON_SIZE, dy + ex_y * ICON_SIZE))
WMRect rect; return False;
int flags;
rect.pos.x = dx + ex_x * ICON_SIZE;
rect.pos.y = dy + ex_y * ICON_SIZE;
rect.size.width = rect.size.height = ICON_SIZE;
wGetRectPlacementInfo(scr, rect, &flags);
if (flags & (XFLAG_DEAD | XFLAG_PARTIAL))
return False;
}
if (dock->type == WM_DOCK) { if (dock->type == WM_DOCK) {
if (icon->dock != dock && ex_x != 0) if (icon->dock != dock && ex_x != 0)
@@ -2365,11 +2341,15 @@ Bool wDockSnapIcon(WDock *dock, WAppIcon *icon, int req_x, int req_y, int *ret_x
return False; return False;
} }
static int onScreen(WScreen *scr, int x, int y, int sx, int ex, int sy, int ey) static int onScreen(WScreen *scr, int x, int y)
{ {
WMRect rect = wmkrect(x, y, ICON_SIZE, ICON_SIZE); WMRect rect;
int flags; int flags;
rect.pos.x = x;
rect.pos.y = y;
rect.size.width = rect.size.height = ICON_SIZE;
wGetRectPlacementInfo(scr, rect, &flags); wGetRectPlacementInfo(scr, rect, &flags);
return !(flags & (XFLAG_DEAD | XFLAG_PARTIAL)); return !(flags & (XFLAG_DEAD | XFLAG_PARTIAL));
@@ -2391,7 +2371,7 @@ Bool wDockFindFreeSlot(WDock *dock, int *x_pos, int *y_pos)
int x, y; int x, y;
int i, done = False; int i, done = False;
int corner; int corner;
int sx = 0, sy = 0, ex = scr->scr_width, ey = scr->scr_height; int sx = 0, ex = scr->scr_width, ey = scr->scr_height;
int extra_count = 0; int extra_count = 0;
if (dock->type == WM_CLIP && dock != scr->workspaces[scr->current_workspace]->clip) if (dock->type == WM_CLIP && dock != scr->workspaces[scr->current_workspace]->clip)
@@ -2603,7 +2583,7 @@ Bool wDockFindFreeSlot(WDock *dock, int *x_pos, int *y_pos)
tx = dock->x_pos + x * ICON_SIZE; tx = dock->x_pos + x * ICON_SIZE;
y = -i; y = -i;
ty = dock->y_pos + y * ICON_SIZE; ty = dock->y_pos + y * ICON_SIZE;
if (slot_map[XY2OFS(x, y)] == 0 && onScreen(scr, tx, ty, sx, ex, sy, ey)) { if (slot_map[XY2OFS(x, y)] == 0 && onScreen(scr, tx, ty)) {
*x_pos = x; *x_pos = x;
*y_pos = y; *y_pos = y;
done = 1; done = 1;
@@ -2611,7 +2591,7 @@ Bool wDockFindFreeSlot(WDock *dock, int *x_pos, int *y_pos)
} }
y = i; y = i;
ty = dock->y_pos + y * ICON_SIZE; ty = dock->y_pos + y * ICON_SIZE;
if (slot_map[XY2OFS(x, y)] == 0 && onScreen(scr, tx, ty, sx, ex, sy, ey)) { if (slot_map[XY2OFS(x, y)] == 0 && onScreen(scr, tx, ty)) {
*x_pos = x; *x_pos = x;
*y_pos = y; *y_pos = y;
done = 1; done = 1;
@@ -2623,7 +2603,7 @@ Bool wDockFindFreeSlot(WDock *dock, int *x_pos, int *y_pos)
ty = dock->y_pos + y * ICON_SIZE; ty = dock->y_pos + y * ICON_SIZE;
x = -i; x = -i;
tx = dock->x_pos + x * ICON_SIZE; tx = dock->x_pos + x * ICON_SIZE;
if (slot_map[XY2OFS(x, y)] == 0 && onScreen(scr, tx, ty, sx, ex, sy, ey)) { if (slot_map[XY2OFS(x, y)] == 0 && onScreen(scr, tx, ty)) {
*x_pos = x; *x_pos = x;
*y_pos = y; *y_pos = y;
done = 1; done = 1;
@@ -2631,7 +2611,7 @@ Bool wDockFindFreeSlot(WDock *dock, int *x_pos, int *y_pos)
} }
x = i; x = i;
tx = dock->x_pos + x * ICON_SIZE; tx = dock->x_pos + x * ICON_SIZE;
if (slot_map[XY2OFS(x, y)] == 0 && onScreen(scr, tx, ty, sx, ex, sy, ey)) { if (slot_map[XY2OFS(x, y)] == 0 && onScreen(scr, tx, ty)) {
*x_pos = x; *x_pos = x;
*y_pos = y; *y_pos = y;
done = 1; done = 1;