Miroirs/awesome
1
0
Fork 0
mirror of https://github.com/awesomeWM/awesome synced 2024-11-17 07:47:41 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'client_resize_do-prefer-current' of https://github.com/blueyed/awesome

Browse source
This commit is contained in:
Uli Schlachter 2015-10-10 19:57:45 +02:00
commit 22305f3abf
3 changed files with 34 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
objects/client.c
View file

@ -799,7 +799,10 @@ client_resize_do(client_t *c, area_t geometry, bool force_notice)
lua_State *L = globalconf_get_lua_State();
bool send_notice = force_notice;
bool hide_titlebars = c->fullscreen;
screen_t *new_screen = screen_getbycoord(geometry.x, geometry.y);
screen_t *new_screen = c->screen;
if(!screen_coord_in_screen(new_screen, geometry.x, geometry.y))
new_screen = screen_getbycoord(geometry.x, geometry.y);
if(c->geometry.width == geometry.width
&& c->geometry.height == geometry.height)

35
objects/screen.c
View file

@ -35,6 +35,7 @@
#include "objects/client.h"
#include "objects/drawin.h"
#include <math.h>
#include <stdio.h>
#include <xcb/xcb.h>
@ -284,8 +285,7 @@ screen_scan(void)
screen_scan_x11();
}
/** Return the Xinerama screen number where the coordinates belongs to.
* \param screen The logical screen number.
/** Return the first screen number where the coordinates belong to.
* \param x X coordinate
* \param y Y coordinate
* \return Screen pointer or screen param if no match or no multi-head.
@ -294,12 +294,35 @@ screen_t *
screen_getbycoord(int x, int y)
{
foreach(s, globalconf.screens)
if((x < 0 || (x >= (*s)->geometry.x && x < (*s)->geometry.x + (*s)->geometry.width))
&& (y < 0 || (y >= (*s)->geometry.y && y < (*s)->geometry.y + (*s)->geometry.height)))
if(screen_coord_in_screen(*s, x, y))
return *s;
/* No screen found, let's be creative. */
return globalconf.screens.tab[0];
/* No screen found, find nearest screen. */
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?
* \param screen The logical screen number.
* \param x X coordinate
* \param y Y coordinate
* \return True if the X/Y coordinates are in the given screen.
*/
bool
screen_coord_in_screen(screen_t *s, int x, int y)
{
return (x >= s->geometry.x && x < s->geometry.x + s->geometry.width)
&& (y >= s->geometry.y && y < s->geometry.y + s->geometry.height);
}
/** Get screens info.

1
objects/screen.h
View file

@ -43,6 +43,7 @@ ARRAY_FUNCS(screen_t *, screen, DO_NOTHING)
void screen_class_setup(lua_State *L);
void screen_scan(void);
screen_t *screen_getbycoord(int, int);
bool screen_coord_in_screen(screen_t *, int, int);
int screen_get_index(screen_t *);
area_t display_area_get(void);
void screen_client_moveto(client_t *, screen_t *, bool);