mirrors/labwc
1
0
Fork 0
mirror of https://github.com/labwc/labwc.git synced 2026-03-07 04:33:54 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

resistance: remove bool, add resistance.h + license

Browse source
This commit is contained in:
ARDiDo 2021-10-24 21:31:05 -04:00 • committed by Johan Malm
parent 4d5b4be608
commit 91a9f1dec9
4 changed files with 77 additions and 75 deletions
Download patch file Download diff file Expand all files Collapse all files

3
include/labwc.h
View file

@ -345,9 +345,6 @@ void view_child_finish(struct view_child *child);
void subsurface_create(struct view *view, struct wlr_subsurface *wlr_subsurface); void subsurface_create(struct view *view, struct wlr_subsurface *wlr_subsurface);
void view_set_activated(struct view *view, bool activated); void view_set_activated(struct view *view, bool activated);
void resistance_move_apply(struct view *view, double *x, double *y, bool screen_edge);
void resistance_resize_apply(struct view *view, struct wlr_box *new_view_geo,
bool screen_edge);
struct border view_border(struct view *view); struct border view_border(struct view *view);
void view_move_resize(struct view *view, struct wlr_box geo); void view_move_resize(struct view *view, struct wlr_box geo);
void view_move(struct view *view, double x, double y); void view_move(struct view *view, double x, double y);

8
include/resistance.h Normal file
View file

@ -0,0 +1,8 @@
#ifndef __RESISTANCE_H
#define __RESISTANCE_H
#include "labwc.h"
void resistance_move_apply(struct view *view, double *x, double *y);
void resistance_resize_apply(struct view *view, struct wlr_box *new_view_geo);
#endif /* __RESISTANCE_H */

5
src/cursor.c
View file

@ -5,6 +5,7 @@
#include <time.h> #include <time.h>
#include "labwc.h" #include "labwc.h"
#include "menu/menu.h" #include "menu/menu.h"
#include "resistance.h"
#include "ssd.h" #include "ssd.h"
#include "config/mousebind.h" #include "config/mousebind.h"
#include <wlr/types/wlr_primary_selection.h> #include <wlr/types/wlr_primary_selection.h>
@ -81,7 +82,7 @@ process_cursor_move(struct server *server, uint32_t time)
/* Move the grabbed view to the new position. */ /* Move the grabbed view to the new position. */
dx += server->grab_box.x; dx += server->grab_box.x;
dy += server->grab_box.y; dy += server->grab_box.y;
resistance_move_apply(view, &dx, &dy, true); resistance_move_apply(view, &dx, &dy);
view_move(view, dx, dy); view_move(view, dx, dy);
} }
@ -125,7 +126,7 @@ process_cursor_resize(struct server *server, uint32_t time)
new_view_geo.width = server->grab_box.width + dx; new_view_geo.width = server->grab_box.width + dx;
} }
resistance_resize_apply(view, &new_view_geo, true); resistance_resize_apply(view, &new_view_geo);
view_move_resize(view, new_view_geo); view_move_resize(view, new_view_geo);
} }

136
src/resistance.c
View file

@ -1,3 +1,4 @@
// SPDX-License-Identifier: GPL-2.0-only
#include "labwc.h" #include "labwc.h"
#include "config/rcxml.h" #include "config/rcxml.h"
@ -30,7 +31,7 @@ is_within_resistance_range(struct edges view, struct edges target,
} }
void void
resistance_move_apply(struct view *view, double *x, double *y, bool screen_edge) resistance_move_apply(struct view *view, double *x, double *y)
{ {
struct server *server = view->server; struct server *server = view->server;
struct wlr_box mgeom; struct wlr_box mgeom;
@ -51,45 +52,42 @@ resistance_move_apply(struct view *view, double *x, double *y, bool screen_edge)
target_edges.right = *x + view->w + border.right + rc.gap; target_edges.right = *x + view->w + border.right + rc.gap;
target_edges.bottom = *y + view->h + border.bottom + rc.gap; target_edges.bottom = *y + view->h + border.bottom + rc.gap;
if (screen_edge) { if (!rc.screen_edge_strength) {
if (!rc.screen_edge_strength) { return;
return; }
wl_list_for_each(output, &server->outputs, link) {
mgeom = output_usable_area_in_layout_coords(output);
other_edges.left = mgeom.x;
other_edges.top = mgeom.y;
other_edges.right = mgeom.x + mgeom.width;
other_edges.bottom = mgeom.y + mgeom.height;
is_within_resistance_range(view_edges, target_edges,
other_edges, &flags, rc.screen_edge_strength);
if (flags.left == 1) {
*x = other_edges.left + border.left + rc.gap;
} else if (flags.right == 1) {
*x = other_edges.right - view->w - border.right
- rc.gap;
} }
wl_list_for_each(output, &server->outputs, link) { if (flags.top == 1) {
mgeom = output_usable_area_in_layout_coords(output); *y = other_edges.top + border.top + rc.gap;
} else if (flags.bottom == 1) {
other_edges.left = mgeom.x; *y = other_edges.bottom - view->h - border.bottom
other_edges.top = mgeom.y; - rc.gap;
other_edges.right = mgeom.x + mgeom.width;
other_edges.bottom = mgeom.y + mgeom.height;
is_within_resistance_range(view_edges, target_edges,
other_edges, &flags, rc.screen_edge_strength);
if (flags.left == 1) {
*x = other_edges.left + border.left + rc.gap;
} else if (flags.right == 1) {
*x = other_edges.right - view->w - border.right
- rc.gap;
}
if (flags.top == 1) {
*y = other_edges.top + border.top + rc.gap;
} else if (flags.bottom == 1) {
*y = other_edges.bottom - view->h
- border.bottom - rc.gap;
}
/* reset the flags */
flags.left = flags.top = flags.right = flags.bottom = 0;
} }
/* reset the flags */
flags.left = flags.top = flags.right = flags.bottom = 0;
} }
} }
void void
resistance_resize_apply(struct view *view, struct wlr_box *new_view_geo, resistance_resize_apply(struct view *view, struct wlr_box *new_view_geo)
bool screen_edge)
{ {
struct server *server = view->server; struct server *server = view->server;
struct output *output; struct output *output;
@ -112,47 +110,45 @@ resistance_resize_apply(struct view *view, struct wlr_box *new_view_geo,
target_edges.bottom = new_view_geo->y + new_view_geo->height target_edges.bottom = new_view_geo->y + new_view_geo->height
+ border.bottom + rc.gap; + border.bottom + rc.gap;
if (screen_edge) { if (!rc.screen_edge_strength) {
if (!rc.screen_edge_strength) { return;
return; }
} wl_list_for_each(output, &server->outputs, link) {
wl_list_for_each(output, &server->outputs, link) { mgeom = output_usable_area_in_layout_coords(output);
mgeom = output_usable_area_in_layout_coords(output); other_edges.left = mgeom.x;
other_edges.left = mgeom.x; other_edges.top = mgeom.y;
other_edges.top = mgeom.y; other_edges.right = mgeom.x + mgeom.width;
other_edges.right = mgeom.x + mgeom.width; other_edges.bottom = mgeom.y + mgeom.height;
other_edges.bottom = mgeom.y + mgeom.height;
is_within_resistance_range(view_edges, target_edges, is_within_resistance_range(view_edges, target_edges,
other_edges, &flags, rc.screen_edge_strength); other_edges, &flags, rc.screen_edge_strength);
if (server->resize_edges & WLR_EDGE_LEFT) { if (server->resize_edges & WLR_EDGE_LEFT) {
if (flags.left == 1) { if (flags.left == 1) {
new_view_geo->x = other_edges.left new_view_geo->x = other_edges.left
+ border.left + rc.gap; + border.left + rc.gap;
new_view_geo->width = view->w; new_view_geo->width = view->w;
}
} else if (server->resize_edges & WLR_EDGE_RIGHT) {
if (flags.right == 1) {
new_view_geo->width = other_edges.right
- view_edges.left
- (border.right + rc.gap) * 2 ;
}
} }
} else if (server->resize_edges & WLR_EDGE_RIGHT) {
if (flags.right == 1) {
new_view_geo->width = other_edges.right
- view_edges.left
- (border.right + rc.gap) * 2 ;
}
}
if (server->resize_edges & WLR_EDGE_TOP) { if (server->resize_edges & WLR_EDGE_TOP) {
if (flags.top == 1) { if (flags.top == 1) {
new_view_geo->y = other_edges.top new_view_geo->y = other_edges.top + border.top
+ border.top + rc.gap; + rc.gap;
new_view_geo->height = view->h; new_view_geo->height = view->h;
} }
} else if (server->resize_edges & WLR_EDGE_BOTTOM) { } else if (server->resize_edges & WLR_EDGE_BOTTOM) {
if (flags.bottom == 1) { if (flags.bottom == 1) {
new_view_geo->height = new_view_geo->height =
other_edges.bottom other_edges.bottom - view_edges.top
- view_edges.top - border.bottom - border.bottom - border.top
- border.top - rc.gap * 2; - rc.gap * 2;
}
} }
} }
} }