i mean, there are too many changes to even comment it
This commit is contained in:
+52
-44
@@ -1,20 +1,23 @@
|
||||
#include <wayland-server-core.h>
|
||||
#include <wlr/util/log.h>
|
||||
|
||||
#include "absinthe-toplevel.h"
|
||||
#include "layout.h"
|
||||
#include "toplevel.h"
|
||||
#include "types.h"
|
||||
|
||||
void reset_cursor_mode(struct absinthe_server *server)
|
||||
void
|
||||
reset_cursor_mode(struct absinthe_server *server)
|
||||
{
|
||||
server->cursor_mode = ABSINTHE_CURSOR_PASSTHROUGH;
|
||||
server->cursor_mode = CURSOR_PASSTHROUGH;
|
||||
wlr_cursor_set_xcursor(server->cursor, server->cursor_mgr, "default");
|
||||
if (server->focused_toplevel) {
|
||||
wlr_xdg_toplevel_set_resizing(server->focused_toplevel->xdg_toplevel, false);
|
||||
wlr_xdg_toplevel_set_resizing(server->focused_toplevel->xdg,
|
||||
false);
|
||||
}
|
||||
}
|
||||
|
||||
static void process_cursor_move(struct absinthe_server *server)
|
||||
static void
|
||||
process_cursor_move(struct absinthe_server *server)
|
||||
{
|
||||
struct absinthe_toplevel *toplevel = server->focused_toplevel;
|
||||
|
||||
@@ -22,16 +25,14 @@ static void process_cursor_move(struct absinthe_server *server)
|
||||
return;
|
||||
|
||||
if (toplevel->fullscreen) {
|
||||
toplevel->prev_geometry = toplevel->geometry;
|
||||
absinthe_toplevel_set_fullscreen(toplevel, false);
|
||||
toplevel->prev_geom = toplevel->geom;
|
||||
toplevel_set_fullscreen(toplevel, false);
|
||||
}
|
||||
|
||||
uint32_t new_x, new_y;
|
||||
new_x = server->cursor->x - server->grab_x + server->grabbed_geometry.x;
|
||||
new_y = server->cursor->y - server->grab_y + server->grabbed_geometry.y;
|
||||
toplevel->geometry.x = new_x;
|
||||
toplevel->geometry.y = new_y;
|
||||
absinthe_toplevel_set_position(toplevel, new_x, new_y);
|
||||
new_x = server->cursor->x - server->grab_x + server->grab_geom.x;
|
||||
new_y = server->cursor->y - server->grab_y + server->grab_geom.y;
|
||||
toplevel_set_pos(toplevel, new_x, new_y);
|
||||
|
||||
if (toplevel->tiled) {
|
||||
toplevel->tiled = false;
|
||||
@@ -39,13 +40,14 @@ static void process_cursor_move(struct absinthe_server *server)
|
||||
}
|
||||
}
|
||||
|
||||
static void apply_resize(struct absinthe_toplevel *toplevel, struct wlr_box *new_geometry)
|
||||
static void
|
||||
apply_resize(struct absinthe_toplevel *toplevel, struct wlr_box *new_geometry)
|
||||
{
|
||||
int32_t min_width = toplevel->xdg_toplevel->current.min_width;
|
||||
int32_t min_height = toplevel->xdg_toplevel->current.min_height;
|
||||
int32_t min_width = toplevel->xdg->current.min_width;
|
||||
int32_t min_height = toplevel->xdg->current.min_height;
|
||||
|
||||
int32_t max_width = toplevel->xdg_toplevel->current.max_width;
|
||||
int32_t max_height = toplevel->xdg_toplevel->current.max_height;
|
||||
int32_t max_width = toplevel->xdg->current.max_width;
|
||||
int32_t max_height = toplevel->xdg->current.max_height;
|
||||
|
||||
if (max_width == 0)
|
||||
max_width = 10000;
|
||||
@@ -53,21 +55,24 @@ static void apply_resize(struct absinthe_toplevel *toplevel, struct wlr_box *new
|
||||
if (max_height == 0)
|
||||
max_height = 10000;
|
||||
|
||||
if (!(new_geometry->width >= min_width && new_geometry->width <= max_width)) {
|
||||
new_geometry->width = toplevel->geometry.width;
|
||||
new_geometry->x = toplevel->geometry.x;
|
||||
if (!(new_geometry->width >= min_width &&
|
||||
new_geometry->width <= max_width)) {
|
||||
new_geometry->width = toplevel->geom.width;
|
||||
new_geometry->x = toplevel->geom.x;
|
||||
}
|
||||
|
||||
if (!(new_geometry->height >= min_height && new_geometry->height <= max_height)) {
|
||||
new_geometry->height = toplevel->geometry.height;
|
||||
new_geometry->y = toplevel->geometry.y;
|
||||
if (!(new_geometry->height >= min_height &&
|
||||
new_geometry->height <= max_height)) {
|
||||
new_geometry->height = toplevel->geom.height;
|
||||
new_geometry->y = toplevel->geom.y;
|
||||
}
|
||||
|
||||
absinthe_toplevel_set_size(toplevel, new_geometry->width, new_geometry->height);
|
||||
absinthe_toplevel_set_position(toplevel, new_geometry->x, new_geometry->y);
|
||||
toplevel_set_size(toplevel, new_geometry->width, new_geometry->height);
|
||||
toplevel_set_pos(toplevel, new_geometry->x, new_geometry->y);
|
||||
}
|
||||
|
||||
static void process_cursor_resize(struct absinthe_server *server)
|
||||
static void
|
||||
process_cursor_resize(struct absinthe_server *server)
|
||||
{
|
||||
struct absinthe_toplevel *toplevel = server->focused_toplevel;
|
||||
|
||||
@@ -78,7 +83,7 @@ static void process_cursor_resize(struct absinthe_server *server)
|
||||
return;
|
||||
|
||||
if (toplevel->fullscreen)
|
||||
absinthe_toplevel_set_fullscreen(toplevel, false);
|
||||
toplevel_set_fullscreen(toplevel, false);
|
||||
|
||||
if (toplevel->tiled) {
|
||||
toplevel->tiled = false;
|
||||
@@ -86,10 +91,10 @@ static void process_cursor_resize(struct absinthe_server *server)
|
||||
}
|
||||
|
||||
int32_t new_x, new_y, new_width, new_height;
|
||||
new_x = server->grabbed_geometry.x;
|
||||
new_y = server->grabbed_geometry.y;
|
||||
new_width = server->grabbed_geometry.width;
|
||||
new_height = server->grabbed_geometry.height;
|
||||
new_x = server->grab_geom.x;
|
||||
new_y = server->grab_geom.y;
|
||||
new_width = server->grab_geom.width;
|
||||
new_height = server->grab_geom.height;
|
||||
|
||||
int32_t dx = server->cursor->x - server->grab_x;
|
||||
int32_t dy = server->cursor->y - server->grab_y;
|
||||
@@ -97,24 +102,24 @@ static void process_cursor_resize(struct absinthe_server *server)
|
||||
if (dx == 0 && dy == 0)
|
||||
return;
|
||||
|
||||
switch (server->cursor_resize_corner) {
|
||||
case ABSINTHE_CURSOR_RESIZE_CORNER_TOP_LEFT:
|
||||
switch (server->resize_corner) {
|
||||
case TOP_LEFT:
|
||||
new_x += dx;
|
||||
new_y += dy;
|
||||
new_width -= dx;
|
||||
new_height -= dy;
|
||||
break;
|
||||
case ABSINTHE_CURSOR_RESIZE_CORNER_TOP_RIGHT:
|
||||
case TOP_RIGHT:
|
||||
new_y += dy;
|
||||
new_width += dx;
|
||||
new_height -= dy;
|
||||
break;
|
||||
case ABSINTHE_CURSOR_RESIZE_CORNER_BOTTOM_LEFT:
|
||||
case BOTTOM_LEFT:
|
||||
new_x += dx;
|
||||
new_width -= dx;
|
||||
new_height += dy;
|
||||
break;
|
||||
case ABSINTHE_CURSOR_RESIZE_CORNER_BOTTOM_RIGHT:
|
||||
case BOTTOM_RIGHT:
|
||||
new_width += dx;
|
||||
new_height += dy;
|
||||
break;
|
||||
@@ -124,26 +129,29 @@ static void process_cursor_resize(struct absinthe_server *server)
|
||||
|
||||
if (new_width > 0 && new_height > 0) {
|
||||
struct wlr_box new_geometry = {
|
||||
.x = new_x,
|
||||
.y = new_y,
|
||||
.width = new_width,
|
||||
.height = new_height,
|
||||
.x = new_x,
|
||||
.y = new_y,
|
||||
.width = new_width,
|
||||
.height = new_height,
|
||||
};
|
||||
|
||||
apply_resize(server->focused_toplevel, &new_geometry);
|
||||
}
|
||||
}
|
||||
|
||||
void process_cursor_motion(struct absinthe_server *server, uint32_t time)
|
||||
void
|
||||
process_cursor_motion(struct absinthe_server *server, uint32_t time)
|
||||
{
|
||||
double sx, sy;
|
||||
struct wlr_seat *seat = server->seat;
|
||||
struct wlr_surface *surface = NULL;
|
||||
toplevel_at(server, server->cursor->x, server->cursor->y, &surface, &sx,
|
||||
&sy);
|
||||
struct wlr_seat *seat = server->seat;
|
||||
|
||||
if (server->cursor_mode == ABSINTHE_CURSOR_MOVE) {
|
||||
if (server->cursor_mode == CURSOR_MOVE) {
|
||||
process_cursor_move(server);
|
||||
return;
|
||||
} else if (server->cursor_mode == ABSINTHE_CURSOR_RESIZE) {
|
||||
} else if (server->cursor_mode == CURSOR_RESIZE) {
|
||||
process_cursor_resize(server);
|
||||
return;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user