Aire-One
/
awesome
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

screen_getbycoord: fallback to nearest screen 

This removes the handling of negative x/y from `screen_coord_in_screen`,
which was added in 0f840d2e and does not make sense in
screen_coord_in_screen.

Ref: 50982fc082 (commitcomment-12358053).
Ref: https://github.com/awesomeWM/awesome/pull/331.
This commit is contained in:
Daniel Hahler 2015-07-25 20:12:45 +02:00
parent 50982fc082
commit 27fb170744
1 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
objects/screen.c
View File

@ -35,6 +35,7 @@
#include "objects/client.h" #include "objects/client.h"
#include "objects/drawin.h" #include "objects/drawin.h"
#include <math.h>
#include <stdio.h> #include <stdio.h>
#include <xcb/xcb.h> #include <xcb/xcb.h>
@ -297,8 +298,19 @@ screen_getbycoord(int x, int y)
if(screen_coord_in_screen(*s, x, y)) if(screen_coord_in_screen(*s, x, y))
return *s; return *s;
/* No screen found, let's be creative. */ /* No screen found, find nearest screen. */
return globalconf.screens.tab[0]; screen_t * nearest_screen = globalconf.screens.tab[0];
int nearest_dist = INT_MAX;
foreach(s, globalconf.screens)
{
int dist = sqrt(pow((*s)->geometry.x - x, 2) + pow((*s)->geometry.y - y, 2));
if( dist < nearest_dist )
{
nearest_dist = dist;
nearest_screen = (*s);
}
}
return nearest_screen;
} }
/** Are the given coordinates in a given screen? /** Are the given coordinates in a given screen?
@ -310,8 +322,8 @@ screen_getbycoord(int x, int y)
bool bool
screen_coord_in_screen(screen_t *s, int x, int y) screen_coord_in_screen(screen_t *s, int x, int y)
{ {
return (x < 0 || (x >= s->geometry.x && x < s->geometry.x + s->geometry.width)) return (x >= s->geometry.x && x < s->geometry.x + s->geometry.width)
&& (y < 0 || (y >= s->geometry.y && y < s->geometry.y + s->geometry.height)); && (y >= s->geometry.y && y < s->geometry.y + s->geometry.height);
} }
/** Get screens info. /** Get screens info.