gryf/wmaker
1
0
Fork 0
mirror of https://github.com/gryf/wmaker.git synced 2026-03-11 12:05:48 +01:00
Code Issues Projects Releases Wiki Activity

Additional function for checking head

Browse Source 
Added function for checking head of certain location. This function is
used for determinig head bounduary.
This commit is contained in:
gryf
2017-01-16 20:57:38 +01:00
parent 58561dc08a
commit 02d2d0f2e3
3 changed files with 18 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/actions.c
View File

@@ -497,8 +497,8 @@ void handleMaximize(WWindow *wwin, int directions)
p.y = 0; p.y = 0;
if (p.x > 0) { if (p.x > 0) {
head = wGetHeadForPoint(wwin->screen_ptr, p); head = wGetHeadForPointOrNegative(wwin->screen_ptr, p);
if (head != wGetHeadForWindow(wwin)) { if (head != -1) {
effective |= MAX_RIGHTHALF; effective |= MAX_RIGHTHALF;
effective |= MAX_VERTICAL; effective |= MAX_VERTICAL;
effective &= ~(MAX_HORIZONTAL | MAX_LEFTHALF); effective &= ~(MAX_HORIZONTAL | MAX_LEFTHALF);
@@ -508,8 +508,8 @@ void handleMaximize(WWindow *wwin, int directions)
} else if (requested & MAX_RIGHTHALF && current & MAX_RIGHTHALF) { } else if (requested & MAX_RIGHTHALF && current & MAX_RIGHTHALF) {
p.x = wwin->frame_x + wwin->frame->core->width + 100; p.x = wwin->frame_x + wwin->frame->core->width + 100;
p.y = 0; p.y = 0;
head = wGetHeadForPoint(wwin->screen_ptr, p); head = wGetHeadForPointOrNegative(wwin->screen_ptr, p);
if (head != wGetHeadForWindow(wwin)) { if (head != -1) {
effective |= MAX_LEFTHALF; effective |= MAX_LEFTHALF;
effective |= MAX_VERTICAL; effective |= MAX_VERTICAL;
effective &= ~(MAX_HORIZONTAL | MAX_RIGHTHALF); effective &= ~(MAX_HORIZONTAL | MAX_RIGHTHALF);

14
src/xinerama.c
View File

@@ -236,7 +236,7 @@ int wGetHeadForWindow(WWindow * wwin)
return wGetHeadForRect(wwin->screen_ptr, rect); return wGetHeadForRect(wwin->screen_ptr, rect);
} }
int wGetHeadForPoint(WScreen * scr, WMPoint point) int wGetHeadForPointOrNegative(WScreen * scr, WMPoint point)
{ {
int i; int i;
@@ -247,7 +247,17 @@ int wGetHeadForPoint(WScreen * scr, WMPoint point)
(unsigned)(point.y - rect->pos.y) < rect->size.height) (unsigned)(point.y - rect->pos.y) < rect->size.height)
return i; return i;
} }
return scr->xine_info.primary_head; return -1;
}
int wGetHeadForPoint(WScreen * scr, WMPoint point)
{
int head = wGetHeadForPointOrNegative(scr, point);
if (head < 0)
return scr->xine_info.primary_head;
return head;
} }
int wGetHeadForPointerLocation(WScreen * scr) int wGetHeadForPointerLocation(WScreen * scr)

2
src/xinerama.h
View File

@@ -41,6 +41,8 @@ int wGetHeadForRect(WScreen *scr, WMRect rect);
int wGetHeadForWindow(WWindow *wwin); int wGetHeadForWindow(WWindow *wwin);
int wGetHeadForPointOrNegative(WScreen * scr, WMPoint point);
int wGetHeadForPoint(WScreen *scr, WMPoint point); int wGetHeadForPoint(WScreen *scr, WMPoint point);
int wGetHeadForPointerLocation(WScreen *scr); int wGetHeadForPointerLocation(WScreen *scr);