mirrors/labwc
1
0
Fork 0
mirror of https://github.com/labwc/labwc.git synced 2025-11-04 13:30:07 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

output: Add output_nearest_to()

Browse source 
Reimplement output_from_cursor_coords() as output_nearest_to_cursor().
This commit is contained in:
John Lindgren 2023-02-03 15:22:54 -05:00 • committed by Consolatis
parent 84294c9cfb
commit 976136299d
5 changed files with 25 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

3
include/labwc.h
View file

@ -416,11 +416,12 @@ void output_init(struct server *server);
void output_manager_init(struct server *server); void output_manager_init(struct server *server);
struct output *output_from_wlr_output(struct server *server, struct output *output_from_wlr_output(struct server *server,
struct wlr_output *wlr_output); struct wlr_output *wlr_output);
struct output *output_nearest_to(struct server *server, int lx, int ly);
struct output *output_nearest_to_cursor(struct server *server);
bool output_is_usable(struct output *output); bool output_is_usable(struct output *output);
void output_update_usable_area(struct output *output); void output_update_usable_area(struct output *output);
void output_update_all_usable_areas(struct server *server, bool layout_changed); void output_update_all_usable_areas(struct server *server, bool layout_changed);
struct wlr_box output_usable_area_in_layout_coords(struct output *output); struct wlr_box output_usable_area_in_layout_coords(struct output *output);
struct output *output_from_cursor_coords(struct server *server);
void handle_output_power_manager_set_mode(struct wl_listener *listener, void handle_output_power_manager_set_mode(struct wl_listener *listener,
void *data); void *data);

28
src/output.c
View file

@ -458,6 +458,25 @@ output_from_wlr_output(struct server *server, struct wlr_output *wlr_output)
return NULL; return NULL;
} }
struct output *
output_nearest_to(struct server *server, int lx, int ly)
{
double closest_x, closest_y;
wlr_output_layout_closest_point(server->output_layout, NULL, lx, ly,
&closest_x, &closest_y);
return output_from_wlr_output(server,
wlr_output_layout_output_at(server->output_layout,
closest_x, closest_y));
}
struct output *
output_nearest_to_cursor(struct server *server)
{
return output_nearest_to(server, server->seat.cursor->x,
server->seat.cursor->y);
}
bool bool
output_is_usable(struct output *output) output_is_usable(struct output *output)
{ {
@ -518,15 +537,6 @@ output_usable_area_in_layout_coords(struct output *output)
return box; return box;
} }
struct output *
output_from_cursor_coords(struct server *server)
{
struct wlr_output *wlr_output;
wlr_output = wlr_output_layout_output_at(server->output_layout,
server->seat.cursor->x, server->seat.cursor->y);
return output_from_wlr_output(server, wlr_output);
}
void void
handle_output_power_manager_set_mode(struct wl_listener *listener, void *data) handle_output_power_manager_set_mode(struct wl_listener *listener, void *data)
{ {

10
src/view.c
View file

@ -226,15 +226,9 @@ struct output *
view_output(struct view *view) view_output(struct view *view)
{ {
assert(view); assert(view);
double closest_x, closest_y; return output_nearest_to(view->server,
struct wlr_output *wlr_output = NULL;
wlr_output_layout_closest_point(view->server->output_layout, wlr_output,
view->current.x + view->current.width / 2, view->current.x + view->current.width / 2,
view->current.y + view->current.height / 2, view->current.y + view->current.height / 2);
&closest_x, &closest_y);
wlr_output = wlr_output_layout_output_at(view->server->output_layout,
closest_x, closest_y);
return output_from_wlr_output(view->server, wlr_output);
} }
static bool static bool

3
src/xdg.c
View file

@ -276,8 +276,7 @@ position_xdg_toplevel_view(struct view *view)
xdg_toplevel_from_view(view)->parent; xdg_toplevel_from_view(view)->parent;
if (!parent_xdg_toplevel) { if (!parent_xdg_toplevel) {
view_center(view, output_from_cursor_coords(view->server), view_center(view, output_nearest_to_cursor(view->server), NULL);
NULL);
} else { } else {
/* /*
* If child-toplevel-views, we center-align relative to their * If child-toplevel-views, we center-align relative to their

3
src/xwayland.c
View file

@ -440,8 +440,7 @@ set_initial_position(struct view *view,
/* Just make sure the view is on-screen */ /* Just make sure the view is on-screen */
view_adjust_for_layout_change(view); view_adjust_for_layout_change(view);
} else { } else {
view_center(view, output_from_cursor_coords(view->server), view_center(view, output_nearest_to_cursor(view->server), NULL);
NULL);
} }
} }