rasmusq/mangowc-rasmusq
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Compare commits

base: rasmusq:main
Branches Tags
rasmusq:main rasmusq:feature/dual-row-scroller
..
compare: rasmusq:c0eceeb3bf2c995c378472900fc18801a3ff35e0
Branches Tags
rasmusq:feature/dual-row-scroller rasmusq:main

1 Commits
main ... c0eceeb3bf

Author SHA1 Message Date
DreamMaoMao
c0eceeb3bf fix: avoid toggle overview when setfullscreen and setmaximziescreen
Some checks failed
Close manually marked stale issues / close-issues (push) Has been cancelled
Details
Lock Threads / lock (push) Has been cancelled
Details
2025-11-29 22:46:47 +08:00
32 changed files with 1888 additions and 2384 deletions
Expand all files Collapse all files

35
README.md
View File

@@ -1,7 +1,7 @@
# Mango Wayland Compositor # MangoWC
<div>
<img src="https://github.com/DreamMaoMao/mangowc/blob/main/assets/mango-transparency-256.png" alt="MangoWC Logo" width="120"/> <img width="255" height="256" alt="mango-transparency-256" src="https://github.com/DreamMaoMao/mangowc/blob/main/assets/mango-transparency-256.png" />
</div>
This project's development is based on [dwl](https://codeberg.org/dwl/dwl/). This project's development is based on [dwl](https://codeberg.org/dwl/dwl/).
@@ -32,7 +32,7 @@ Scroller Layout
https://github.com/user-attachments/assets/c9bf9415-fad1-4400-bcdc-3ad2d76de85a https://github.com/user-attachments/assets/c9bf9415-fad1-4400-bcdc-3ad2d76de85a
Layer animation Layer animaiton
https://github.com/user-attachments/assets/014c893f-115c-4ae9-8342-f9ae3e9a0df0 https://github.com/user-attachments/assets/014c893f-115c-4ae9-8342-f9ae3e9a0df0
@@ -71,8 +71,6 @@ https://github.com/user-attachments/assets/014c893f-115c-4ae9-8342-f9ae3e9a0df0
- hwdata - hwdata
- seatd - seatd
- pcre2 - pcre2
- xorg-xwayland
- libxcb
## Arch Linux ## Arch Linux
The package is in the Arch User Repository and is availble for manual download [here](https://aur.archlinux.org/packages/mangowc-git) or through a AUR helper like yay: The package is in the Arch User Repository and is availble for manual download [here](https://aur.archlinux.org/packages/mangowc-git) or through a AUR helper like yay:
@@ -82,6 +80,7 @@ yay -S mangowc-git
``` ```
## Gentoo Linux ## Gentoo Linux
The package is in the community-maintained repository called GURU. The package is in the community-maintained repository called GURU.
First, add GURU repository: First, add GURU repository:
@@ -99,16 +98,6 @@ Finally, install the package:
emerge --ask --verbose gui-wm/mangowc emerge --ask --verbose gui-wm/mangowc
``` ```
## Fedora Linux
The package is in the third-party Terra repository.
First, add the [Terra Repository](https://terra.fyralabs.com/).
Then, install the package:
```bash
dnf install mangowc
```
## Other ## Other
```bash ```bash
@@ -181,9 +170,7 @@ git clone https://github.com/DreamMaoMao/mango-config.git ~/.config/mango
## Config Documentation ## Config Documentation
Refer to the repo wiki [wiki](https://github.com/DreamMaoMao/mango/wiki/) Refer to the [wiki](https://github.com/DreamMaoMao/mango/wiki/)
or the website docs [docs](https://mangowc.vercel.app/docs)
# NixOS + Home-manager # NixOS + Home-manager
@@ -261,6 +248,14 @@ Here's an example of using the modules in a flake:
} }
``` ```
# Sponsor
My current device is a bit outdated and doesn't support certain features like HDR or VRR. If you'd like to support this project, here's how you can help. Thanks!
![Screenshot_2025-10-13-20-06-49-26_ee1cec40dcf6eb3](https://github.com/user-attachments/assets/240a0727-9eb5-4212-a84c-10fa9f093147)
# Packaging mango # Packaging mango
To package mango for other distributions, you can check the reference setup for: To package mango for other distributions, you can check the reference setup for:

4
config.conf
View File

@@ -48,8 +48,6 @@ animation_curve_move=0.46,1.0,0.29,1
animation_curve_tag=0.46,1.0,0.29,1 animation_curve_tag=0.46,1.0,0.29,1
animation_curve_close=0.08,0.92,0,1 animation_curve_close=0.08,0.92,0,1
animation_curve_focus=0.46,1.0,0.29,1 animation_curve_focus=0.46,1.0,0.29,1
animation_curve_opafadeout=0.5,0.5,0.5,0.5
animation_curve_opafadein=0.46,1.0,0.29,1
# Scroller Layout Setting # Scroller Layout Setting
scroller_structs=20 scroller_structs=20
@@ -77,7 +75,7 @@ overviewgappo=30
no_border_when_single=0 no_border_when_single=0
axis_bind_apply_timeout=100 axis_bind_apply_timeout=100
focus_on_activate=1 focus_on_activate=1
idleinhibit_ignore_visible=0 inhibit_regardless_of_visibility=0
sloppyfocus=1 sloppyfocus=1
warpcursor=1 warpcursor=1
focus_cross_monitor=0 focus_cross_monitor=0

64
mangowc.scm
View File

@@ -1,64 +0,0 @@
(define-module (mangowc)
#:use-module (guix download)
#:use-module (guix git-download)
#:use-module (guix gexp)
#:use-module (guix packages)
#:use-module (guix utils)
#:use-module (gnu packages wm)
#:use-module (gnu packages freedesktop)
#:use-module (gnu packages xdisorg)
#:use-module (gnu packages pciutils)
#:use-module (gnu packages admin)
#:use-module (gnu packages pcre)
#:use-module (gnu packages xorg)
#:use-module (gnu packages build-tools)
#:use-module (gnu packages ninja)
#:use-module (gnu packages pkg-config)
#:use-module (guix build-system meson)
#:use-module (guix licenses))
(define-public mangowc-git
(package
(name "mangowc")
(version "git")
(source (local-file "." "mangowc-checkout"
#:recursive? #t
#:select? (or (git-predicate (current-source-directory))
(const #t))))
(build-system meson-build-system)
(arguments
(list
#:configure-flags
#~(list (string-append "-Dsysconfdir=" #$output "/etc"))
#:phases
#~(modify-phases %standard-phases
(add-before 'configure 'patch-meson
(lambda _
(substitute* "meson.build"
(("'-DSYSCONFDIR=\\\"@0@\\\"'.format\\('/etc'\\)")
"'-DSYSCONFDIR=\"@0@\"'.format(sysconfdir)")
(("sysconfdir = sysconfdir.substring\\(prefix.length\\(\\)\\)")
"")))))))
(inputs (list wayland
libinput
libdrm
libxkbcommon
pixman
libdisplay-info
libliftoff
hwdata
seatd
pcre2
libxcb
xcb-util-wm
wlroots
scenefx))
(native-inputs (list pkg-config wayland-protocols))
(home-page "https://github.com/DreamMaoMao/mangowc")
(synopsis "Wayland compositor based on wlroots and scenefx")
(description "A Wayland compositor based on wlroots and scenefx,
inspired by dwl but aiming to be more feature-rich.")
(license gpl3)))
mangowc-git

2
meson.build
View File

@@ -1,5 +1,5 @@
project('mango', ['c', 'cpp'], project('mango', ['c', 'cpp'],
version : '0.10.10', version : '0.10.6',
) )
subdir('protocols') subdir('protocols')

4
mmsg/arg.h
View File

@@ -8,13 +8,13 @@
extern char *argv0; extern char *argv0;
/* use main(int32_t argc, char *argv[]) */ /* use main(int argc, char *argv[]) */
#define ARGBEGIN \ #define ARGBEGIN \
for (argv0 = *argv, argv++, argc--; \ for (argv0 = *argv, argv++, argc--; \
argv[0] && argv[0][0] == '-' && argv[0][1]; argc--, argv++) { \ argv[0] && argv[0][0] == '-' && argv[0][1]; argc--, argv++) { \
char argc_; \ char argc_; \
char **argv_; \ char **argv_; \
int32_t brk_; \ int brk_; \
if (argv[0][1] == '-' && argv[0][2] == '\0') { \ if (argv[0][1] == '-' && argv[0][2] == '\0') { \
argv++; \ argv++; \
argc--; \ argc--; \

50
mmsg/mmsg.c
View File

@@ -25,31 +25,31 @@ static enum {
WATCH = 1 << 2 | GET, WATCH = 1 << 2 | GET,
} mode = NONE; } mode = NONE;
static int32_t Oflag; static int Oflag;
static int32_t Tflag; static int Tflag;
static int32_t Lflag; static int Lflag;
static int32_t oflag; static int oflag;
static int32_t tflag; static int tflag;
static int32_t lflag; static int lflag;
static int32_t cflag; static int cflag;
static int32_t vflag; static int vflag;
static int32_t mflag; static int mflag;
static int32_t fflag; static int fflag;
static int32_t qflag; static int qflag;
static int32_t dflag; static int dflag;
static int32_t xflag; static int xflag;
static int32_t eflag; static int eflag;
static int32_t kflag; static int kflag;
static int32_t bflag; static int bflag;
static int32_t Aflag; static int Aflag;
static uint32_t occ, seltags, total_clients, urg; static uint32_t occ, seltags, total_clients, urg;
static char *output_name; static char *output_name;
static int32_t tagcount; static int tagcount;
static char *tagset; static char *tagset;
static char *layout_name; static char *layout_name;
static int32_t layoutcount, layout_idx; static int layoutcount, layout_idx;
static char *client_tags; static char *client_tags;
static char *dispatch_cmd; static char *dispatch_cmd;
static char *dispatch_arg1; static char *dispatch_arg1;
@@ -86,8 +86,8 @@ static void noop_description(void *data, struct wl_output *wl_output,
const char *description) {} const char *description) {}
// 将 n 转换为 9 位二进制字符串，结果存入 buf（至少长度 10） // 将 n 转换为 9 位二进制字符串，结果存入 buf（至少长度 10）
void bin_str_9bits(char *buf, uint32_t n) { void bin_str_9bits(char *buf, unsigned int n) {
for (int32_t i = 8; i >= 0; i--) { for (int i = 8; i >= 0; i--) {
*buf++ = ((n >> i) & 1) ? '1' : '0'; *buf++ = ((n >> i) & 1) ? '1' : '0';
} }
*buf = '\0'; // 字符串结尾 *buf = '\0'; // 字符串结尾
@@ -268,7 +268,7 @@ static void dwl_ipc_output_kb_layout(void *data,
static void static void
dwl_ipc_output_scalefactor(void *data, dwl_ipc_output_scalefactor(void *data,
struct zdwl_ipc_output_v2 *dwl_ipc_output, struct zdwl_ipc_output_v2 *dwl_ipc_output,
const uint32_t scalefactor) { const unsigned int scalefactor) {
if (!Aflag) if (!Aflag)
return; return;
char *output_name = data; char *output_name = data;
@@ -324,7 +324,7 @@ static void dwl_ipc_output_frame(void *data,
if (tflag) { if (tflag) {
uint32_t mask = seltags; uint32_t mask = seltags;
char *t = tagset; char *t = tagset;
int32_t i = 0; int i = 0;
for (; *t && *t >= '0' && *t <= '9'; t++) for (; *t && *t >= '0' && *t <= '9'; t++)
i = *t - '0' + i * 10; i = *t - '0' + i * 10;
@@ -354,7 +354,7 @@ static void dwl_ipc_output_frame(void *data,
if (cflag) { if (cflag) {
uint32_t and = ~0, xor = 0; uint32_t and = ~0, xor = 0;
char *t = client_tags; char *t = client_tags;
int32_t i = 0; int i = 0;
for (; *t && *t >= '0' && *t <= '9'; t++) for (; *t && *t >= '0' && *t <= '9'; t++)
i = *t - '0' + i * 10; i = *t - '0' + i * 10;
@@ -509,7 +509,7 @@ static void usage(void) {
exit(2); exit(2);
} }
int32_t main(int32_t argc, char *argv[]) { int main(int argc, char *argv[]) {
ARGBEGIN { ARGBEGIN {
case 'q': case 'q':
qflag = 1; qflag = 1;

14
nix/default.nix
View File

@@ -13,16 +13,17 @@
wayland-scanner, wayland-scanner,
xcbutilwm, xcbutilwm,
xwayland, xwayland,
enableXWayland ? true,
meson, meson,
ninja, ninja,
scenefx, scenefx,
wlroots_0_19, wlroots_0_19,
libGL, libGL,
enableXWayland ? true, }: let
debug ? false,
}:
stdenv.mkDerivation {
pname = "mango"; pname = "mango";
in
stdenv.mkDerivation {
inherit pname;
version = "nightly"; version = "nightly";
src = builtins.path { src = builtins.path {
@@ -30,11 +31,6 @@ stdenv.mkDerivation {
name = "source"; name = "source";
}; };
mesonFlags = [
(lib.mesonEnable "xwayland" enableXWayland)
(lib.mesonBool "asan" debug)
];
nativeBuildInputs = [ nativeBuildInputs = [
meson meson
ninja ninja

171
src/animation/client.h
View File

@@ -1,10 +1,10 @@
void client_actual_size(Client *c, int32_t *width, int32_t *height) { void client_actual_size(Client *c, unsigned int *width, unsigned int *height) {
*width = c->animation.current.width - 2 * (int32_t)c->bw; *width = c->animation.current.width - c->bw;
*height = c->animation.current.height - 2 * (int32_t)c->bw; *height = c->animation.current.height - c->bw;
} }
void set_rect_size(struct wlr_scene_rect *rect, int32_t width, int32_t height) { void set_rect_size(struct wlr_scene_rect *rect, int width, int height) {
wlr_scene_rect_set_size(rect, GEZERO(width), GEZERO(height)); wlr_scene_rect_set_size(rect, GEZERO(width), GEZERO(height));
} }
@@ -47,7 +47,7 @@ bool is_horizontal_right_stack_layout(Monitor *m) {
return false; return false;
} }
int32_t is_special_animaiton_rule(Client *c) { int is_special_animaiton_rule(Client *c) {
if (is_scroller_layout(c->mon) && !c->isfloating) { if (is_scroller_layout(c->mon) && !c->isfloating) {
return DOWN; return DOWN;
@@ -71,11 +71,11 @@ int32_t is_special_animaiton_rule(Client *c) {
} }
void set_client_open_animaiton(Client *c, struct wlr_box geo) { void set_client_open_animaiton(Client *c, struct wlr_box geo) {
int32_t slide_direction; int slide_direction;
int32_t horizontal, horizontal_value; int horizontal, horizontal_value;
int32_t vertical, vertical_value; int vertical, vertical_value;
int32_t special_direction; int special_direction;
int32_t center_x, center_y; int center_x, center_y;
if ((!c->animation_type_open && strcmp(animation_type_open, "fade") == 0) || if ((!c->animation_type_open && strcmp(animation_type_open, "fade") == 0) ||
(c->animation_type_open && (c->animation_type_open &&
@@ -147,15 +147,15 @@ void set_client_open_animaiton(Client *c, struct wlr_box geo) {
} }
} }
void snap_scene_buffer_apply_effect(struct wlr_scene_buffer *buffer, int32_t sx, void snap_scene_buffer_apply_effect(struct wlr_scene_buffer *buffer, int sx,
int32_t sy, void *data) { int sy, void *data) {
BufferData *buffer_data = (BufferData *)data; BufferData *buffer_data = (BufferData *)data;
wlr_scene_buffer_set_dest_size(buffer, buffer_data->width, wlr_scene_buffer_set_dest_size(buffer, buffer_data->width,
buffer_data->height); buffer_data->height);
} }
void scene_buffer_apply_effect(struct wlr_scene_buffer *buffer, int32_t sx, void scene_buffer_apply_effect(struct wlr_scene_buffer *buffer, int sx, int sy,
int32_t sy, void *data) { void *data) {
BufferData *buffer_data = (BufferData *)data; BufferData *buffer_data = (BufferData *)data;
if (buffer_data->should_scale && buffer_data->height_scale < 1 && if (buffer_data->should_scale && buffer_data->height_scale < 1 &&
@@ -183,8 +183,8 @@ void scene_buffer_apply_effect(struct wlr_scene_buffer *buffer, int32_t sx,
if (buffer_data->should_scale) { if (buffer_data->should_scale) {
int32_t surface_width = surface->current.width; unsigned int surface_width = surface->current.width;
int32_t surface_height = surface->current.height; unsigned int surface_height = surface->current.height;
surface_width = buffer_data->width_scale < 1 surface_width = buffer_data->width_scale < 1
? surface_width ? surface_width
@@ -240,8 +240,7 @@ void buffer_set_effect(Client *c, BufferData data) {
if (c == grabc) if (c == grabc)
data.should_scale = false; data.should_scale = false;
if (c->isnoradius || c->isfullscreen || if (c->isfullscreen || (no_radius_when_single && c->mon &&
(no_radius_when_single && c->mon &&
c->mon->visible_tiling_clients == 1)) { c->mon->visible_tiling_clients == 1)) {
data.corner_location = CORNER_LOCATION_NONE; data.corner_location = CORNER_LOCATION_NONE;
} }
@@ -271,24 +270,24 @@ void client_draw_shadow(Client *c) {
? CORNER_LOCATION_NONE ? CORNER_LOCATION_NONE
: CORNER_LOCATION_ALL; : CORNER_LOCATION_ALL;
int32_t bwoffset = c->bw != 0 && hit_no_border ? (int32_t)c->bw : 0; unsigned int bwoffset = c->bw != 0 && hit_no_border ? c->bw : 0;
int32_t width, height; uint32_t width, height;
client_actual_size(c, &width, &height); client_actual_size(c, &width, &height);
int32_t delta = shadows_size + (int32_t)c->bw - bwoffset; uint32_t delta = shadows_size + c->bw - bwoffset;
/* we calculate where to clip the shadow */ /* we calculate where to clip the shadow */
struct wlr_box client_box = { struct wlr_box client_box = {
.x = bwoffset, .x = bwoffset,
.y = bwoffset, .y = bwoffset,
.width = width + (int32_t)c->bw - bwoffset, .width = width - 2 * bwoffset,
.height = height + (int32_t)c->bw - bwoffset, .height = height - 2 * bwoffset,
}; };
struct wlr_box shadow_box = { struct wlr_box shadow_box = {
.x = shadows_position_x + bwoffset, .x = shadows_position_x,
.y = shadows_position_y + bwoffset, .y = shadows_position_y,
.width = width + 2 * delta, .width = width + 2 * delta,
.height = height + 2 * delta, .height = height + 2 * delta,
}; };
@@ -297,8 +296,8 @@ void client_draw_shadow(Client *c) {
wlr_box_intersection(&intersection_box, &client_box, &shadow_box); wlr_box_intersection(&intersection_box, &client_box, &shadow_box);
/* clipped region takes shadow relative coords, so we translate everything /* clipped region takes shadow relative coords, so we translate everything
* by its position */ * by its position */
intersection_box.x -= shadows_position_x + bwoffset; intersection_box.x -= shadows_position_x;
intersection_box.y -= shadows_position_y + bwoffset; intersection_box.y -= shadows_position_y;
struct clipped_region clipped_region = { struct clipped_region clipped_region = {
.area = intersection_box, .area = intersection_box,
@@ -313,7 +312,7 @@ void client_draw_shadow(Client *c) {
.height = shadow_box.height, .height = shadow_box.height,
}; };
int32_t right_offset, bottom_offset, left_offset, top_offset; int right_offset, bottom_offset, left_offset, top_offset;
if (c == grabc) { if (c == grabc) {
right_offset = 0; right_offset = 0;
@@ -355,13 +354,11 @@ void apply_border(Client *c) {
return; return;
bool hit_no_border = check_hit_no_border(c); bool hit_no_border = check_hit_no_border(c);
enum corner_location current_corner_location; enum corner_location current_corner_location =
if (c->isfullscreen || (no_radius_when_single && c->mon && c->isfullscreen || (no_radius_when_single && c->mon &&
c->mon->visible_tiling_clients == 1)) { c->mon->visible_tiling_clients == 1)
current_corner_location = CORNER_LOCATION_NONE; ? CORNER_LOCATION_NONE
} else { : CORNER_LOCATION_ALL;
current_corner_location = set_client_corner_location(c);
}
// Handle no-border cases // Handle no-border cases
if (hit_no_border && smartgaps) { if (hit_no_border && smartgaps) {
@@ -379,9 +376,9 @@ void apply_border(Client *c) {
struct wlr_box clip_box = c->animation.current; struct wlr_box clip_box = c->animation.current;
// 一但在GEZERO如果使用无符号，那么其他数据也会转换为无符号导致没有负数出错 // 一但在GEZERO如果使用无符号，那么其他数据也会转换为无符号导致没有负数出错
int32_t bw = (int32_t)c->bw; int bw = (int)c->bw;
int32_t right_offset, bottom_offset, left_offset, top_offset; int right_offset, bottom_offset, left_offset, top_offset;
if (c == grabc) { if (c == grabc) {
right_offset = 0; right_offset = 0;
@@ -400,27 +397,25 @@ void apply_border(Client *c) {
top_offset = GEZERO(c->mon->m.y - c->animation.current.y); top_offset = GEZERO(c->mon->m.y - c->animation.current.y);
} }
int32_t inner_surface_width = GEZERO(clip_box.width - 2 * bw); int inner_surface_width = GEZERO(clip_box.width - 2 * bw);
int32_t inner_surface_height = GEZERO(clip_box.height - 2 * bw); int inner_surface_height = GEZERO(clip_box.height - 2 * bw);
int32_t inner_surface_x = GEZERO(bw - left_offset); int inner_surface_x = GEZERO(bw - left_offset);
int32_t inner_surface_y = GEZERO(bw - top_offset); int inner_surface_y = GEZERO(bw - top_offset);
int32_t rect_x = left_offset; int rect_x = left_offset;
int32_t rect_y = top_offset; int rect_y = top_offset;
int32_t rect_width = int rect_width =
GEZERO(c->animation.current.width - left_offset - right_offset); GEZERO(c->animation.current.width - left_offset - right_offset);
int32_t rect_height = int rect_height =
GEZERO(c->animation.current.height - top_offset - bottom_offset); GEZERO(c->animation.current.height - top_offset - bottom_offset);
if (left_offset > c->bw) if (left_offset > c->bw)
inner_surface_width = inner_surface_width = inner_surface_width - left_offset + c->bw;
inner_surface_width - left_offset + (int32_t)c->bw;
if (top_offset > c->bw) if (top_offset > c->bw)
inner_surface_height = inner_surface_height = inner_surface_height - top_offset + c->bw;
inner_surface_height - top_offset + (int32_t)c->bw;
if (right_offset > 0) { if (right_offset > 0) {
inner_surface_width = inner_surface_width =
@@ -448,24 +443,24 @@ void apply_border(Client *c) {
} }
struct ivec2 clip_to_hide(Client *c, struct wlr_box *clip_box) { struct ivec2 clip_to_hide(Client *c, struct wlr_box *clip_box) {
int32_t offsetx = 0, offsety = 0, offsetw = 0, offseth = 0; int offsetx = 0, offsety = 0, offsetw = 0, offseth = 0;
struct ivec2 offset = {0, 0, 0, 0}; struct ivec2 offset = {0, 0, 0, 0};
if (!ISSCROLLTILED(c) && !c->animation.tagining && !c->animation.tagouted && if (!ISSCROLLTILED(c) && !c->animation.tagining && !c->animation.tagouted &&
!c->animation.tagouting) !c->animation.tagouting)
return offset; return offset;
int32_t bottom_out_offset = int bottom_out_offset =
GEZERO(c->animation.current.y + c->animation.current.height - GEZERO(c->animation.current.y + c->animation.current.height -
c->mon->m.y - c->mon->m.height); c->mon->m.y - c->mon->m.height);
int32_t right_out_offset = int right_out_offset =
GEZERO(c->animation.current.x + c->animation.current.width - GEZERO(c->animation.current.x + c->animation.current.width -
c->mon->m.x - c->mon->m.width); c->mon->m.x - c->mon->m.width);
int32_t left_out_offset = GEZERO(c->mon->m.x - c->animation.current.x); int left_out_offset = GEZERO(c->mon->m.x - c->animation.current.x);
int32_t top_out_offset = GEZERO(c->mon->m.y - c->animation.current.y); int top_out_offset = GEZERO(c->mon->m.y - c->animation.current.y);
// 必须转换为int，否计算会没有负数导致判断错误 // 必须转换为int，否计算会没有负数导致判断错误
int32_t bw = (int32_t)c->bw; int bw = (int)c->bw;
/* /*
计算窗口表面超出屏幕四个方向的偏差，避免窗口超出屏幕 计算窗口表面超出屏幕四个方向的偏差，避免窗口超出屏幕
@@ -524,6 +519,8 @@ void client_apply_clip(Client *c, float factor) {
enum corner_location current_corner_location = enum corner_location current_corner_location =
set_client_corner_location(c); set_client_corner_location(c);
int bw = (int)c->bw;
if (!animations) { if (!animations) {
c->animation.running = false; c->animation.running = false;
c->need_output_flush = false; c->need_output_flush = false;
@@ -549,7 +546,7 @@ void client_apply_clip(Client *c, float factor) {
} }
// 获取窗口动画实时位置矩形 // 获取窗口动画实时位置矩形
int32_t width, height; unsigned int width, height;
client_actual_size(c, &width, &height); client_actual_size(c, &width, &height);
// 计算出除了边框的窗口实际剪切大小 // 计算出除了边框的窗口实际剪切大小
@@ -558,8 +555,8 @@ void client_apply_clip(Client *c, float factor) {
clip_box = (struct wlr_box){ clip_box = (struct wlr_box){
.x = geometry.x, .x = geometry.x,
.y = geometry.y, .y = geometry.y,
.width = width, .width = width - bw,
.height = height, .height = height - bw,
}; };
if (client_is_x11(c)) { if (client_is_x11(c)) {
@@ -592,8 +589,8 @@ void client_apply_clip(Client *c, float factor) {
wlr_scene_subsurface_tree_set_clip(&c->scene_surface->node, &clip_box); wlr_scene_subsurface_tree_set_clip(&c->scene_surface->node, &clip_box);
// 获取剪切后的表面的实际大小用于计算缩放 // 获取剪切后的表面的实际大小用于计算缩放
int32_t acutal_surface_width = geometry.width - offset.x - offset.width; int acutal_surface_width = geometry.width - offset.x - offset.width;
int32_t acutal_surface_height = geometry.height - offset.y - offset.height; int acutal_surface_height = geometry.height - offset.y - offset.height;
if (acutal_surface_width <= 0 || acutal_surface_height <= 0) if (acutal_surface_width <= 0 || acutal_surface_height <= 0)
return; return;
@@ -625,23 +622,24 @@ void fadeout_client_animation_next_tick(Client *c) {
struct timespec now; struct timespec now;
clock_gettime(CLOCK_MONOTONIC, &now); clock_gettime(CLOCK_MONOTONIC, &now);
int32_t passed_time = timespec_to_ms(&now) - c->animation.time_started; uint32_t passed_time = timespec_to_ms(&now) - c->animation.time_started;
double animation_passed = double animation_passed =
c->animation.duration c->animation.duration
? (double)passed_time / (double)c->animation.duration ? (double)passed_time / (double)c->animation.duration
: 1.0; : 1.0;
int32_t type = c->animation.action = c->animation.action; int type = c->animation.action = c->animation.action;
double factor = find_animation_curve_at(animation_passed, type); double factor = find_animation_curve_at(animation_passed, type);
unsigned int width =
int32_t width = c->animation.initial.width + c->animation.initial.width +
(c->current.width - c->animation.initial.width) * factor; (c->current.width - c->animation.initial.width) * factor;
int32_t height = c->animation.initial.height + unsigned int height =
c->animation.initial.height +
(c->current.height - c->animation.initial.height) * factor; (c->current.height - c->animation.initial.height) * factor;
int32_t x = c->animation.initial.x + unsigned int x = c->animation.initial.x +
(c->current.x - c->animation.initial.x) * factor; (c->current.x - c->animation.initial.x) * factor;
int32_t y = c->animation.initial.y + unsigned int y = c->animation.initial.y +
(c->current.y - c->animation.initial.y) * factor; (c->current.y - c->animation.initial.y) * factor;
wlr_scene_node_set_position(&c->scene->node, x, y); wlr_scene_node_set_position(&c->scene->node, x, y);
@@ -653,13 +651,7 @@ void fadeout_client_animation_next_tick(Client *c) {
.height = height, .height = height,
}; };
double opacity_eased_progress = double opacity = MAX(fadeout_begin_opacity - animation_passed, 0);
find_animation_curve_at(animation_passed, OPAFADEOUT);
double percent = fadeout_begin_opacity -
(opacity_eased_progress * fadeout_begin_opacity);
double opacity = MAX(percent, 0);
if (animation_fade_out && !c->nofadeout) if (animation_fade_out && !c->nofadeout)
wlr_scene_node_for_each_buffer(&c->scene->node, wlr_scene_node_for_each_buffer(&c->scene->node,
@@ -691,27 +683,29 @@ void client_animation_next_tick(Client *c) {
struct timespec now; struct timespec now;
clock_gettime(CLOCK_MONOTONIC, &now); clock_gettime(CLOCK_MONOTONIC, &now);
int32_t passed_time = timespec_to_ms(&now) - c->animation.time_started; uint32_t passed_time = timespec_to_ms(&now) - c->animation.time_started;
double animation_passed = double animation_passed =
c->animation.duration c->animation.duration
? (double)passed_time / (double)c->animation.duration ? (double)passed_time / (double)c->animation.duration
: 1.0; : 1.0;
int32_t type = c->animation.action == NONE ? MOVE : c->animation.action; int type = c->animation.action == NONE ? MOVE : c->animation.action;
double factor = find_animation_curve_at(animation_passed, type); double factor = find_animation_curve_at(animation_passed, type);
Client *pointer_c = NULL; Client *pointer_c = NULL;
double sx = 0, sy = 0; double sx = 0, sy = 0;
struct wlr_surface *surface = NULL; struct wlr_surface *surface = NULL;
int32_t width = c->animation.initial.width + unsigned int width =
c->animation.initial.width +
(c->current.width - c->animation.initial.width) * factor; (c->current.width - c->animation.initial.width) * factor;
int32_t height = c->animation.initial.height + unsigned int height =
c->animation.initial.height +
(c->current.height - c->animation.initial.height) * factor; (c->current.height - c->animation.initial.height) * factor;
int32_t x = c->animation.initial.x + unsigned int x = c->animation.initial.x +
(c->current.x - c->animation.initial.x) * factor; (c->current.x - c->animation.initial.x) * factor;
int32_t y = c->animation.initial.y + unsigned int y = c->animation.initial.y +
(c->current.y - c->animation.initial.y) * factor; (c->current.y - c->animation.initial.y) * factor;
wlr_scene_node_set_position(&c->scene->node, x, y); wlr_scene_node_set_position(&c->scene->node, x, y);
@@ -908,7 +902,7 @@ void client_set_pending_state(Client *c) {
c->dirty = true; c->dirty = true;
} }
void resize(Client *c, struct wlr_box geo, int32_t interact) { void resize(Client *c, struct wlr_box geo, int interact) {
// 动画设置的起始函数，这里用来计算一些动画的起始值 // 动画设置的起始函数，这里用来计算一些动画的起始值
// 动画起始位置大小是由于c->animainit_geom确定的 // 动画起始位置大小是由于c->animainit_geom确定的
@@ -930,8 +924,8 @@ void resize(Client *c, struct wlr_box geo, int32_t interact) {
if (is_scroller_layout(c->mon) && (!c->isfloating || c == grabc)) { if (is_scroller_layout(c->mon) && (!c->isfloating || c == grabc)) {
c->geom = geo; c->geom = geo;
c->geom.width = MAX(1 + 2 * (int32_t)c->bw, c->geom.width); c->geom.width = MAX(1 + 2 * (int)c->bw, c->geom.width);
c->geom.height = MAX(1 + 2 * (int32_t)c->bw, c->geom.height); c->geom.height = MAX(1 + 2 * (int)c->bw, c->geom.height);
} else { // 这里会限制不允许窗口划出屏幕 } else { // 这里会限制不允许窗口划出屏幕
c->geom = geo; c->geom = geo;
applybounds( applybounds(
@@ -1111,17 +1105,14 @@ bool client_apply_focus_opacity(Client *c) {
struct timespec now; struct timespec now;
clock_gettime(CLOCK_MONOTONIC, &now); clock_gettime(CLOCK_MONOTONIC, &now);
int32_t passed_time = timespec_to_ms(&now) - c->animation.time_started; uint32_t passed_time = timespec_to_ms(&now) - c->animation.time_started;
double linear_progress = double linear_progress =
c->animation.duration c->animation.duration
? (double)passed_time / (double)c->animation.duration ? (double)passed_time / (double)c->animation.duration
: 1.0; : 1.0;
double opacity_eased_progress =
find_animation_curve_at(linear_progress, OPAFADEIN);
float percent = float percent =
animation_fade_in && !c->nofadein ? opacity_eased_progress : 1.0; animation_fade_in && !c->nofadein ? linear_progress : 1.0;
float opacity = float opacity =
c == selmon->sel ? c->focused_opacity : c->unfocused_opacity; c == selmon->sel ? c->focused_opacity : c->unfocused_opacity;
@@ -1136,7 +1127,7 @@ bool client_apply_focus_opacity(Client *c) {
struct timespec now; struct timespec now;
clock_gettime(CLOCK_MONOTONIC, &now); clock_gettime(CLOCK_MONOTONIC, &now);
int32_t passed_time = uint32_t passed_time =
timespec_to_ms(&now) - c->opacity_animation.time_started; timespec_to_ms(&now) - c->opacity_animation.time_started;
double linear_progress = double linear_progress =
c->opacity_animation.duration c->opacity_animation.duration
@@ -1153,7 +1144,7 @@ bool client_apply_focus_opacity(Client *c) {
client_set_opacity(c, c->opacity_animation.current_opacity); client_set_opacity(c, c->opacity_animation.current_opacity);
// Animate border color // Animate border color
for (int32_t i = 0; i < 4; i++) { for (int i = 0; i < 4; i++) {
c->opacity_animation.current_border_color[i] = c->opacity_animation.current_border_color[i] =
c->opacity_animation.initial_border_color[i] + c->opacity_animation.initial_border_color[i] +
(c->opacity_animation.target_border_color[i] - (c->opacity_animation.target_border_color[i] -

43
src/animation/common.h
View File

@@ -1,4 +1,4 @@
struct dvec2 calculate_animation_curve_at(double t, int32_t type) { struct dvec2 calculate_animation_curve_at(double t, int type) {
struct dvec2 point; struct dvec2 point;
double *animation_curve; double *animation_curve;
if (type == MOVE) { if (type == MOVE) {
@@ -11,10 +11,6 @@ struct dvec2 calculate_animation_curve_at(double t, int32_t type) {
animation_curve = animation_curve_close; animation_curve = animation_curve_close;
} else if (type == FOCUS) { } else if (type == FOCUS) {
animation_curve = animation_curve_focus; animation_curve = animation_curve_focus;
} else if (type == OPAFADEIN) {
animation_curve = animation_curve_opafadein;
} else if (type == OPAFADEOUT) {
animation_curve = animation_curve_opafadeout;
} else { } else {
animation_curve = animation_curve_move; animation_curve = animation_curve_move;
} }
@@ -36,46 +32,34 @@ void init_baked_points(void) {
calloc(BAKED_POINTS_COUNT, sizeof(*baked_points_close)); calloc(BAKED_POINTS_COUNT, sizeof(*baked_points_close));
baked_points_focus = baked_points_focus =
calloc(BAKED_POINTS_COUNT, sizeof(*baked_points_focus)); calloc(BAKED_POINTS_COUNT, sizeof(*baked_points_focus));
baked_points_opafadein =
calloc(BAKED_POINTS_COUNT, sizeof(*baked_points_opafadein));
baked_points_opafadeout =
calloc(BAKED_POINTS_COUNT, sizeof(*baked_points_opafadeout));
for (int32_t i = 0; i < BAKED_POINTS_COUNT; i++) { for (unsigned int i = 0; i < BAKED_POINTS_COUNT; i++) {
baked_points_move[i] = calculate_animation_curve_at( baked_points_move[i] = calculate_animation_curve_at(
(double)i / (BAKED_POINTS_COUNT - 1), MOVE); (double)i / (BAKED_POINTS_COUNT - 1), MOVE);
} }
for (int32_t i = 0; i < BAKED_POINTS_COUNT; i++) { for (unsigned int i = 0; i < BAKED_POINTS_COUNT; i++) {
baked_points_open[i] = calculate_animation_curve_at( baked_points_open[i] = calculate_animation_curve_at(
(double)i / (BAKED_POINTS_COUNT - 1), OPEN); (double)i / (BAKED_POINTS_COUNT - 1), OPEN);
} }
for (int32_t i = 0; i < BAKED_POINTS_COUNT; i++) { for (unsigned int i = 0; i < BAKED_POINTS_COUNT; i++) {
baked_points_tag[i] = calculate_animation_curve_at( baked_points_tag[i] = calculate_animation_curve_at(
(double)i / (BAKED_POINTS_COUNT - 1), TAG); (double)i / (BAKED_POINTS_COUNT - 1), TAG);
} }
for (int32_t i = 0; i < BAKED_POINTS_COUNT; i++) { for (unsigned int i = 0; i < BAKED_POINTS_COUNT; i++) {
baked_points_close[i] = calculate_animation_curve_at( baked_points_close[i] = calculate_animation_curve_at(
(double)i / (BAKED_POINTS_COUNT - 1), CLOSE); (double)i / (BAKED_POINTS_COUNT - 1), CLOSE);
} }
for (int32_t i = 0; i < BAKED_POINTS_COUNT; i++) { for (unsigned int i = 0; i < BAKED_POINTS_COUNT; i++) {
baked_points_focus[i] = calculate_animation_curve_at( baked_points_focus[i] = calculate_animation_curve_at(
(double)i / (BAKED_POINTS_COUNT - 1), FOCUS); (double)i / (BAKED_POINTS_COUNT - 1), FOCUS);
} }
for (int32_t i = 0; i < BAKED_POINTS_COUNT; i++) {
baked_points_opafadein[i] = calculate_animation_curve_at(
(double)i / (BAKED_POINTS_COUNT - 1), OPAFADEIN);
}
for (int32_t i = 0; i < BAKED_POINTS_COUNT; i++) {
baked_points_opafadeout[i] = calculate_animation_curve_at(
(double)i / (BAKED_POINTS_COUNT - 1), OPAFADEOUT);
}
} }
double find_animation_curve_at(double t, int32_t type) { double find_animation_curve_at(double t, int type) {
int32_t down = 0; unsigned int down = 0;
int32_t up = BAKED_POINTS_COUNT - 1; unsigned int up = BAKED_POINTS_COUNT - 1;
int32_t middle = (up + down) / 2; unsigned int middle = (up + down) / 2;
struct dvec2 *baked_points; struct dvec2 *baked_points;
if (type == MOVE) { if (type == MOVE) {
baked_points = baked_points_move; baked_points = baked_points_move;
@@ -87,10 +71,6 @@ double find_animation_curve_at(double t, int32_t type) {
baked_points = baked_points_close; baked_points = baked_points_close;
} else if (type == FOCUS) { } else if (type == FOCUS) {
baked_points = baked_points_focus; baked_points = baked_points_focus;
} else if (type == OPAFADEIN) {
baked_points = baked_points_opafadein;
} else if (type == OPAFADEOUT) {
baked_points = baked_points_opafadeout;
} else { } else {
baked_points = baked_points_move; baked_points = baked_points_move;
} }
@@ -106,8 +86,7 @@ double find_animation_curve_at(double t, int32_t type) {
return baked_points[up].y; return baked_points[up].y;
} }
static bool scene_node_snapshot(struct wlr_scene_node *node, int32_t lx, static bool scene_node_snapshot(struct wlr_scene_node *node, int lx, int ly,
int32_t ly,
struct wlr_scene_tree *snapshot_tree) { struct wlr_scene_tree *snapshot_tree) {
if (!node->enabled && node->type != WLR_SCENE_NODE_TREE) { if (!node->enabled && node->type != WLR_SCENE_NODE_TREE) {
return true; return true;

77
src/animation/layer.h
View File

@@ -1,4 +1,5 @@
void layer_actual_size(LayerSurface *l, int32_t *width, int32_t *height) { void layer_actual_size(LayerSurface *l, unsigned int *width,
unsigned int *height) {
struct wlr_box box; struct wlr_box box;
if (l->animation.running) { if (l->animation.running) {
@@ -42,7 +43,7 @@ void get_layer_target_geometry(LayerSurface *l, struct wlr_box *target_box) {
.height = state->desired_height}; .height = state->desired_height};
// 水平方向定位 // 水平方向定位
const int32_t both_horiz = const uint32_t both_horiz =
ZWLR_LAYER_SURFACE_V1_ANCHOR_LEFT | ZWLR_LAYER_SURFACE_V1_ANCHOR_RIGHT; ZWLR_LAYER_SURFACE_V1_ANCHOR_LEFT | ZWLR_LAYER_SURFACE_V1_ANCHOR_RIGHT;
if (box.width == 0) { if (box.width == 0) {
box.x = bounds.x; box.x = bounds.x;
@@ -57,7 +58,7 @@ void get_layer_target_geometry(LayerSurface *l, struct wlr_box *target_box) {
} }
// 垂直方向定位 // 垂直方向定位
const int32_t both_vert = const uint32_t both_vert =
ZWLR_LAYER_SURFACE_V1_ANCHOR_TOP | ZWLR_LAYER_SURFACE_V1_ANCHOR_BOTTOM; ZWLR_LAYER_SURFACE_V1_ANCHOR_TOP | ZWLR_LAYER_SURFACE_V1_ANCHOR_BOTTOM;
if (box.height == 0) { if (box.height == 0) {
box.y = bounds.y; box.y = bounds.y;
@@ -101,10 +102,10 @@ void get_layer_target_geometry(LayerSurface *l, struct wlr_box *target_box) {
} }
void set_layer_dir_animaiton(LayerSurface *l, struct wlr_box *geo) { void set_layer_dir_animaiton(LayerSurface *l, struct wlr_box *geo) {
int32_t slide_direction; int slide_direction;
int32_t horizontal, horizontal_value; int horizontal, horizontal_value;
int32_t vertical, vertical_value; int vertical, vertical_value;
int32_t center_x, center_y; int center_x, center_y;
if (!l) if (!l)
return; return;
@@ -161,10 +162,10 @@ void layer_draw_shadow(LayerSurface *l) {
return; return;
} }
int32_t width, height; uint32_t width, height;
layer_actual_size(l, &width, &height); layer_actual_size(l, &width, &height);
int32_t delta = shadows_size; uint32_t delta = shadows_size;
/* we calculate where to clip the shadow */ /* we calculate where to clip the shadow */
struct wlr_box layer_box = { struct wlr_box layer_box = {
@@ -200,8 +201,8 @@ void layer_draw_shadow(LayerSurface *l) {
wlr_scene_shadow_set_clipped_region(l->shadow, clipped_region); wlr_scene_shadow_set_clipped_region(l->shadow, clipped_region);
} }
void layer_scene_buffer_apply_effect(struct wlr_scene_buffer *buffer, void layer_scene_buffer_apply_effect(struct wlr_scene_buffer *buffer, int sx,
int32_t sx, int32_t sy, void *data) { int sy, void *data) {
BufferData *buffer_data = (BufferData *)data; BufferData *buffer_data = (BufferData *)data;
struct wlr_scene_surface *scene_surface = struct wlr_scene_surface *scene_surface =
@@ -212,8 +213,9 @@ void layer_scene_buffer_apply_effect(struct wlr_scene_buffer *buffer,
struct wlr_surface *surface = scene_surface->surface; struct wlr_surface *surface = scene_surface->surface;
int32_t surface_width = surface->current.width * buffer_data->width_scale; unsigned int surface_width =
int32_t surface_height = surface->current.width * buffer_data->width_scale;
unsigned int surface_height =
surface->current.height * buffer_data->height_scale; surface->current.height * buffer_data->height_scale;
if (surface_height > 0 && surface_width > 0) { if (surface_height > 0 && surface_width > 0) {
@@ -222,8 +224,7 @@ void layer_scene_buffer_apply_effect(struct wlr_scene_buffer *buffer,
} }
void layer_fadeout_scene_buffer_apply_effect(struct wlr_scene_buffer *buffer, void layer_fadeout_scene_buffer_apply_effect(struct wlr_scene_buffer *buffer,
int32_t sx, int32_t sy, int sx, int sy, void *data) {
void *data) {
BufferData *buffer_data = (BufferData *)data; BufferData *buffer_data = (BufferData *)data;
wlr_scene_buffer_set_dest_size(buffer, buffer_data->width, wlr_scene_buffer_set_dest_size(buffer, buffer_data->width,
buffer_data->height); buffer_data->height);
@@ -236,22 +237,24 @@ void fadeout_layer_animation_next_tick(LayerSurface *l) {
struct timespec now; struct timespec now;
clock_gettime(CLOCK_MONOTONIC, &now); clock_gettime(CLOCK_MONOTONIC, &now);
int32_t passed_time = timespec_to_ms(&now) - l->animation.time_started; uint32_t passed_time = timespec_to_ms(&now) - l->animation.time_started;
double animation_passed = double animation_passed =
l->animation.duration l->animation.duration
? (double)passed_time / (double)l->animation.duration ? (double)passed_time / (double)l->animation.duration
: 1.0; : 1.0;
int32_t type = l->animation.action = l->animation.action; int type = l->animation.action = l->animation.action;
double factor = find_animation_curve_at(animation_passed, type); double factor = find_animation_curve_at(animation_passed, type);
int32_t width = l->animation.initial.width + unsigned int width =
l->animation.initial.width +
(l->current.width - l->animation.initial.width) * factor; (l->current.width - l->animation.initial.width) * factor;
int32_t height = l->animation.initial.height + unsigned int height =
l->animation.initial.height +
(l->current.height - l->animation.initial.height) * factor; (l->current.height - l->animation.initial.height) * factor;
int32_t x = l->animation.initial.x + unsigned int x = l->animation.initial.x +
(l->current.x - l->animation.initial.x) * factor; (l->current.x - l->animation.initial.x) * factor;
int32_t y = l->animation.initial.y + unsigned int y = l->animation.initial.y +
(l->current.y - l->animation.initial.y) * factor; (l->current.y - l->animation.initial.y) * factor;
wlr_scene_node_set_position(&l->scene->node, x, y); wlr_scene_node_set_position(&l->scene->node, x, y);
@@ -276,13 +279,7 @@ void fadeout_layer_animation_next_tick(LayerSurface *l) {
.height = height, .height = height,
}; };
double opacity_eased_progress = double opacity = MAX(fadeout_begin_opacity - animation_passed, 0.0f);
find_animation_curve_at(animation_passed, OPAFADEOUT);
double percent = fadeout_begin_opacity -
(opacity_eased_progress * fadeout_begin_opacity);
double opacity = MAX(percent, 0.0f);
if (animation_fade_out) if (animation_fade_out)
wlr_scene_node_for_each_buffer(&l->scene->node, wlr_scene_node_for_each_buffer(&l->scene->node,
@@ -304,31 +301,29 @@ void layer_animation_next_tick(LayerSurface *l) {
struct timespec now; struct timespec now;
clock_gettime(CLOCK_MONOTONIC, &now); clock_gettime(CLOCK_MONOTONIC, &now);
int32_t passed_time = timespec_to_ms(&now) - l->animation.time_started; uint32_t passed_time = timespec_to_ms(&now) - l->animation.time_started;
double animation_passed = double animation_passed =
l->animation.duration l->animation.duration
? (double)passed_time / (double)l->animation.duration ? (double)passed_time / (double)l->animation.duration
: 1.0; : 1.0;
int32_t type = l->animation.action == NONE ? MOVE : l->animation.action; int type = l->animation.action == NONE ? MOVE : l->animation.action;
double factor = find_animation_curve_at(animation_passed, type); double factor = find_animation_curve_at(animation_passed, type);
int32_t width = l->animation.initial.width + unsigned int width =
l->animation.initial.width +
(l->current.width - l->animation.initial.width) * factor; (l->current.width - l->animation.initial.width) * factor;
int32_t height = l->animation.initial.height + unsigned int height =
l->animation.initial.height +
(l->current.height - l->animation.initial.height) * factor; (l->current.height - l->animation.initial.height) * factor;
int32_t x = l->animation.initial.x + unsigned int x = l->animation.initial.x +
(l->current.x - l->animation.initial.x) * factor; (l->current.x - l->animation.initial.x) * factor;
int32_t y = l->animation.initial.y + unsigned int y = l->animation.initial.y +
(l->current.y - l->animation.initial.y) * factor; (l->current.y - l->animation.initial.y) * factor;
double opacity_eased_progress = double opacity = MIN(fadein_begin_opacity +
find_animation_curve_at(animation_passed, OPAFADEIN); animation_passed * (1.0 - fadein_begin_opacity),
double opacity =
MIN(fadein_begin_opacity +
opacity_eased_progress * (1.0 - fadein_begin_opacity),
1.0f); 1.0f);
if (animation_fade_in) if (animation_fade_in)
@@ -466,7 +461,6 @@ void init_fadeout_layers(LayerSurface *l) {
wl_list_insert(&fadeout_layers, &fadeout_layer->fadeout_link); wl_list_insert(&fadeout_layers, &fadeout_layer->fadeout_link);
// 请求刷新屏幕 // 请求刷新屏幕
if (l->mon)
wlr_output_schedule_frame(l->mon->wlr_output); wlr_output_schedule_frame(l->mon->wlr_output);
} }
@@ -550,7 +544,6 @@ void layer_commit(LayerSurface *l) {
l->animation.should_animate = false; l->animation.should_animate = false;
} }
// 请求刷新屏幕 // 请求刷新屏幕
if (l->mon)
wlr_output_schedule_frame(l->mon->wlr_output); wlr_output_schedule_frame(l->mon->wlr_output);
} }

75
src/client/client.h
View File

@@ -6,7 +6,7 @@
*/ */
/* Leave these functions first; they're used in the others */ /* Leave these functions first; they're used in the others */
static inline int32_t client_is_x11(Client *c) { static inline int client_is_x11(Client *c) {
#ifdef XWAYLAND #ifdef XWAYLAND
return c->type == X11; return c->type == X11;
#endif #endif
@@ -21,15 +21,14 @@ static inline struct wlr_surface *client_surface(Client *c) {
return c->surface.xdg->surface; return c->surface.xdg->surface;
} }
static inline int32_t toplevel_from_wlr_surface(struct wlr_surface *s, static inline int toplevel_from_wlr_surface(struct wlr_surface *s, Client **pc,
Client **pc,
LayerSurface **pl) { LayerSurface **pl) {
struct wlr_xdg_surface *xdg_surface, *tmp_xdg_surface; struct wlr_xdg_surface *xdg_surface, *tmp_xdg_surface;
struct wlr_surface *root_surface; struct wlr_surface *root_surface;
struct wlr_layer_surface_v1 *layer_surface; struct wlr_layer_surface_v1 *layer_surface;
Client *c = NULL; Client *c = NULL;
LayerSurface *l = NULL; LayerSurface *l = NULL;
int32_t type = -1; int type = -1;
#ifdef XWAYLAND #ifdef XWAYLAND
struct wlr_xwayland_surface *xsurface; struct wlr_xwayland_surface *xsurface;
#endif #endif
@@ -89,7 +88,7 @@ end:
/* The others */ /* The others */
static inline void client_activate_surface(struct wlr_surface *s, static inline void client_activate_surface(struct wlr_surface *s,
int32_t activated) { int activated) {
struct wlr_xdg_toplevel *toplevel; struct wlr_xdg_toplevel *toplevel;
#ifdef XWAYLAND #ifdef XWAYLAND
struct wlr_xwayland_surface *xsurface; struct wlr_xwayland_surface *xsurface;
@@ -114,7 +113,7 @@ static inline const char *client_get_appid(Client *c) {
: "broken"; : "broken";
} }
static inline int32_t client_get_pid(Client *c) { static inline int client_get_pid(Client *c) {
pid_t pid; pid_t pid;
#ifdef XWAYLAND #ifdef XWAYLAND
if (client_is_x11(c)) if (client_is_x11(c))
@@ -128,8 +127,8 @@ static inline void client_get_clip(Client *c, struct wlr_box *clip) {
*clip = (struct wlr_box){ *clip = (struct wlr_box){
.x = 0, .x = 0,
.y = 0, .y = 0,
.width = c->geom.width - 2 * c->bw, .width = c->geom.width - c->bw,
.height = c->geom.height - 2 * c->bw, .height = c->geom.height - c->bw,
}; };
#ifdef XWAYLAND #ifdef XWAYLAND
@@ -154,6 +153,20 @@ static inline void client_get_geometry(Client *c, struct wlr_box *geom) {
*geom = c->surface.xdg->geometry; *geom = c->surface.xdg->geometry;
} }
static inline Client *get_client_from_surface(struct wlr_surface *surface) {
if (!surface)
return NULL;
// 从 surface 的 data 指针获取 scene tree
struct wlr_scene_tree *scene_tree = surface->data;
if (!scene_tree)
return NULL;
// 从 scene tree 的 node data 获取 Client
Client *c = scene_tree->node.data;
return c;
}
static inline Client *client_get_parent(Client *c) { static inline Client *client_get_parent(Client *c) {
Client *p = NULL; Client *p = NULL;
#ifdef XWAYLAND #ifdef XWAYLAND
@@ -170,7 +183,7 @@ static inline Client *client_get_parent(Client *c) {
return p; return p;
} }
static inline int32_t client_has_children(Client *c) { static inline int client_has_children(Client *c) {
#ifdef XWAYLAND #ifdef XWAYLAND
if (client_is_x11(c)) if (client_is_x11(c))
return !wl_list_empty(&c->surface.xwayland->children); return !wl_list_empty(&c->surface.xwayland->children);
@@ -190,7 +203,7 @@ static inline const char *client_get_title(Client *c) {
: "broken"; : "broken";
} }
static inline int32_t client_is_float_type(Client *c) { static inline int client_is_float_type(Client *c) {
struct wlr_xdg_toplevel *toplevel; struct wlr_xdg_toplevel *toplevel;
struct wlr_xdg_toplevel_state state; struct wlr_xdg_toplevel_state state;
@@ -230,12 +243,12 @@ static inline int32_t client_is_float_type(Client *c) {
state.min_height == state.max_height)); state.min_height == state.max_height));
} }
static inline int32_t client_is_rendered_on_mon(Client *c, Monitor *m) { static inline int client_is_rendered_on_mon(Client *c, Monitor *m) {
/* This is needed for when you don't want to check formal assignment, /* This is needed for when you don't want to check formal assignment,
* but rather actual displaying of the pixels. * but rather actual displaying of the pixels.
* Usually VISIBLEON suffices and is also faster. */ * Usually VISIBLEON suffices and is also faster. */
struct wlr_surface_output *s; struct wlr_surface_output *s;
int32_t unused_lx, unused_ly; int unused_lx, unused_ly;
if (!wlr_scene_node_coords(&c->scene->node, &unused_lx, &unused_ly)) if (!wlr_scene_node_coords(&c->scene->node, &unused_lx, &unused_ly))
return 0; return 0;
wl_list_for_each(s, &client_surface(c)->current_outputs, wl_list_for_each(s, &client_surface(c)->current_outputs,
@@ -243,8 +256,8 @@ static inline int32_t client_is_rendered_on_mon(Client *c, Monitor *m) {
return 0; return 0;
} }
static inline int32_t client_is_stopped(Client *c) { static inline int client_is_stopped(Client *c) {
int32_t pid; int pid;
siginfo_t in = {0}; siginfo_t in = {0};
#ifdef XWAYLAND #ifdef XWAYLAND
if (client_is_x11(c)) if (client_is_x11(c))
@@ -268,7 +281,7 @@ static inline int32_t client_is_stopped(Client *c) {
return 0; return 0;
} }
static inline int32_t client_is_unmanaged(Client *c) { static inline int client_is_unmanaged(Client *c) {
#ifdef XWAYLAND #ifdef XWAYLAND
if (client_is_x11(c)) if (client_is_x11(c))
return c->surface.xwayland->override_redirect; return c->surface.xwayland->override_redirect;
@@ -300,7 +313,7 @@ static inline void client_set_border_color(Client *c,
wlr_scene_rect_set_color(c->border, color); wlr_scene_rect_set_color(c->border, color);
} }
static inline void client_set_fullscreen(Client *c, int32_t fullscreen) { static inline void client_set_fullscreen(Client *c, int fullscreen) {
#ifdef XWAYLAND #ifdef XWAYLAND
if (client_is_x11(c)) { if (client_is_x11(c)) {
wlr_xwayland_surface_set_fullscreen(c->surface.xwayland, fullscreen); wlr_xwayland_surface_set_fullscreen(c->surface.xwayland, fullscreen);
@@ -380,7 +393,7 @@ static inline void client_set_tiled(Client *c, uint32_t edges) {
} }
} }
static inline void client_set_suspended(Client *c, int32_t suspended) { static inline void client_set_suspended(Client *c, int suspended) {
#ifdef XWAYLAND #ifdef XWAYLAND
if (client_is_x11(c)) if (client_is_x11(c))
return; return;
@@ -389,7 +402,7 @@ static inline void client_set_suspended(Client *c, int32_t suspended) {
wlr_xdg_toplevel_set_suspended(c->surface.xdg->toplevel, suspended); wlr_xdg_toplevel_set_suspended(c->surface.xdg->toplevel, suspended);
} }
static inline int32_t client_should_ignore_focus(Client *c) { static inline int client_should_ignore_focus(Client *c) {
#ifdef XWAYLAND #ifdef XWAYLAND
if (client_is_x11(c)) { if (client_is_x11(c)) {
@@ -404,7 +417,7 @@ static inline int32_t client_should_ignore_focus(Client *c) {
return 0; return 0;
} }
static inline int32_t client_is_x11_popup(Client *c) { static inline int client_is_x11_popup(Client *c) {
#ifdef XWAYLAND #ifdef XWAYLAND
if (client_is_x11(c)) { if (client_is_x11(c)) {
@@ -433,7 +446,7 @@ static inline int32_t client_is_x11_popup(Client *c) {
return 0; return 0;
} }
static inline int32_t client_should_global(Client *c) { static inline int client_should_global(Client *c) {
#ifdef XWAYLAND #ifdef XWAYLAND
if (client_is_x11(c)) { if (client_is_x11(c)) {
@@ -446,7 +459,7 @@ static inline int32_t client_should_global(Client *c) {
return 0; return 0;
} }
static inline int32_t client_should_overtop(Client *c) { static inline int client_should_overtop(Client *c) {
#ifdef XWAYLAND #ifdef XWAYLAND
if (client_is_x11(c)) { if (client_is_x11(c)) {
@@ -458,7 +471,7 @@ static inline int32_t client_should_overtop(Client *c) {
return 0; return 0;
} }
static inline int32_t client_wants_focus(Client *c) { static inline int client_wants_focus(Client *c) {
#ifdef XWAYLAND #ifdef XWAYLAND
return client_is_unmanaged(c) && return client_is_unmanaged(c) &&
wlr_xwayland_surface_override_redirect_wants_focus( wlr_xwayland_surface_override_redirect_wants_focus(
@@ -469,7 +482,7 @@ static inline int32_t client_wants_focus(Client *c) {
return 0; return 0;
} }
static inline int32_t client_wants_fullscreen(Client *c) { static inline int client_wants_fullscreen(Client *c) {
#ifdef XWAYLAND #ifdef XWAYLAND
if (client_is_x11(c)) if (client_is_x11(c))
return c->surface.xwayland->fullscreen; return c->surface.xwayland->fullscreen;
@@ -513,16 +526,16 @@ static inline void client_set_size_bound(Client *c) {
if (!size_hints) if (!size_hints)
return; return;
if ((uint32_t)c->geom.width - 2 * c->bw < size_hints->min_width && if ((unsigned int)c->geom.width - 2 * c->bw < size_hints->min_width &&
size_hints->min_width > 0) size_hints->min_width > 0)
c->geom.width = size_hints->min_width + 2 * c->bw; c->geom.width = size_hints->min_width + 2 * c->bw;
if ((uint32_t)c->geom.height - 2 * c->bw < size_hints->min_height && if ((unsigned int)c->geom.height - 2 * c->bw < size_hints->min_height &&
size_hints->min_height > 0) size_hints->min_height > 0)
c->geom.height = size_hints->min_height + 2 * c->bw; c->geom.height = size_hints->min_height + 2 * c->bw;
if ((uint32_t)c->geom.width - 2 * c->bw > size_hints->max_width && if ((unsigned int)c->geom.width - 2 * c->bw > size_hints->max_width &&
size_hints->max_width > 0) size_hints->max_width > 0)
c->geom.width = size_hints->max_width + 2 * c->bw; c->geom.width = size_hints->max_width + 2 * c->bw;
if ((uint32_t)c->geom.height - 2 * c->bw > size_hints->max_height && if ((unsigned int)c->geom.height - 2 * c->bw > size_hints->max_height &&
size_hints->max_height > 0) size_hints->max_height > 0)
c->geom.height = size_hints->max_height + 2 * c->bw; c->geom.height = size_hints->max_height + 2 * c->bw;
return; return;
@@ -531,19 +544,19 @@ static inline void client_set_size_bound(Client *c) {
toplevel = c->surface.xdg->toplevel; toplevel = c->surface.xdg->toplevel;
state = toplevel->current; state = toplevel->current;
if ((uint32_t)c->geom.width - 2 * c->bw < state.min_width && if ((unsigned int)c->geom.width - 2 * c->bw < state.min_width &&
state.min_width > 0) { state.min_width > 0) {
c->geom.width = state.min_width + 2 * c->bw; c->geom.width = state.min_width + 2 * c->bw;
} }
if ((uint32_t)c->geom.height - 2 * c->bw < state.min_height && if ((unsigned int)c->geom.height - 2 * c->bw < state.min_height &&
state.min_height > 0) { state.min_height > 0) {
c->geom.height = state.min_height + 2 * c->bw; c->geom.height = state.min_height + 2 * c->bw;
} }
if ((uint32_t)c->geom.width - 2 * c->bw > state.max_width && if ((unsigned int)c->geom.width - 2 * c->bw > state.max_width &&
state.max_width > 0) { state.max_width > 0) {
c->geom.width = state.max_width + 2 * c->bw; c->geom.width = state.max_width + 2 * c->bw;
} }
if ((uint32_t)c->geom.height - 2 * c->bw > state.max_height && if ((unsigned int)c->geom.height - 2 * c->bw > state.max_height &&
state.max_height > 0) { state.max_height > 0) {
c->geom.height = state.max_height + 2 * c->bw; c->geom.height = state.max_height + 2 * c->bw;
} }

17
src/common/util.c
View File

@@ -36,8 +36,8 @@ void *ecalloc(size_t nmemb, size_t size) {
return p; return p;
} }
int32_t fd_set_nonblock(int32_t fd) { int fd_set_nonblock(int fd) {
int32_t flags = fcntl(fd, F_GETFL); int flags = fcntl(fd, F_GETFL);
if (flags < 0) { if (flags < 0) {
perror("fcntl(F_GETFL):"); perror("fcntl(F_GETFL):");
return -1; return -1;
@@ -50,8 +50,8 @@ int32_t fd_set_nonblock(int32_t fd) {
return 0; return 0;
} }
int32_t regex_match(const char *pattern, const char *str) { int regex_match(const char *pattern, const char *str) {
int32_t errnum; int errnum;
PCRE2_SIZE erroffset; PCRE2_SIZE erroffset;
if (!pattern || !str) { if (!pattern || !str) {
@@ -70,7 +70,7 @@ int32_t regex_match(const char *pattern, const char *str) {
pcre2_match_data *match_data = pcre2_match_data *match_data =
pcre2_match_data_create_from_pattern(re, NULL); pcre2_match_data_create_from_pattern(re, NULL);
int32_t ret = int ret =
pcre2_match(re, (PCRE2_SPTR)str, strlen(str), 0, 0, match_data, NULL); pcre2_match(re, (PCRE2_SPTR)str, strlen(str), 0, 0, match_data, NULL);
pcre2_match_data_free(match_data); pcre2_match_data_free(match_data);
@@ -82,13 +82,14 @@ void wl_list_append(struct wl_list *list, struct wl_list *object) {
wl_list_insert(list->prev, object); wl_list_insert(list->prev, object);
} }
uint32_t get_now_in_ms(void) { unsigned int get_now_in_ms(void) {
struct timespec now; struct timespec now;
clock_gettime(CLOCK_MONOTONIC, &now); clock_gettime(CLOCK_MONOTONIC, &now);
return timespec_to_ms(&now); return timespec_to_ms(&now);
} }
uint32_t timespec_to_ms(struct timespec *ts) { unsigned int timespec_to_ms(struct timespec *ts) {
return (uint32_t)ts->tv_sec * 1000 + (uint32_t)ts->tv_nsec / 1000000; return (unsigned int)ts->tv_sec * 1000 +
(unsigned int)ts->tv_nsec / 1000000;
} }

8
src/common/util.h
View File

@@ -3,8 +3,8 @@
void die(const char *fmt, ...); void die(const char *fmt, ...);
void *ecalloc(size_t nmemb, size_t size); void *ecalloc(size_t nmemb, size_t size);
int32_t fd_set_nonblock(int32_t fd); int fd_set_nonblock(int fd);
int32_t regex_match(const char *pattern_mb, const char *str_mb); int regex_match(const char *pattern_mb, const char *str_mb);
void wl_list_append(struct wl_list *list, struct wl_list *object); void wl_list_append(struct wl_list *list, struct wl_list *object);
uint32_t get_now_in_ms(void); unsigned int get_now_in_ms(void);
uint32_t timespec_to_ms(struct timespec *ts); unsigned int timespec_to_ms(struct timespec *ts);

575
src/config/parse_config.h
View File

File diff suppressed because it is too large Load Diff

162
src/config/preset.h
View File

@@ -12,11 +12,11 @@ char *animation_type_open = "slide"; // 是否启用动画 //slide,zoom
char *animation_type_close = "slide"; // 是否启用动画 //slide,zoom char *animation_type_close = "slide"; // 是否启用动画 //slide,zoom
char *layer_animation_type_open = "slide"; // 是否启用layer动画 //slide,zoom char *layer_animation_type_open = "slide"; // 是否启用layer动画 //slide,zoom
char *layer_animation_type_close = "slide"; // 是否启用layer动画 //slide,zoom char *layer_animation_type_close = "slide"; // 是否启用layer动画 //slide,zoom
int32_t animations = 1; // 是否启用动画 int animations = 1; // 是否启用动画
int32_t layer_animations = 0; // 是否启用layer动画 int layer_animations = 0; // 是否启用layer动画
int32_t tag_animation_direction = HORIZONTAL; // 标签动画方向 int tag_animation_direction = HORIZONTAL; // 标签动画方向
int32_t animation_fade_in = 1; // Enable animation fade in int animation_fade_in = 1; // Enable animation fade in
int32_t animation_fade_out = 1; // Enable animation fade out int animation_fade_out = 1; // Enable animation fade out
float zoom_initial_ratio = 0.3; // 动画起始窗口比例 float zoom_initial_ratio = 0.3; // 动画起始窗口比例
float zoom_end_ratio = 0.8; // 动画结束窗口比例 float zoom_end_ratio = 0.8; // 动画结束窗口比例
float fadein_begin_opacity = 0.5; // Begin opac window ratio for animations float fadein_begin_opacity = 0.5; // Begin opac window ratio for animations
@@ -31,59 +31,57 @@ double animation_curve_open[4] = {0.46, 1.0, 0.29, 0.99}; // 动画曲线
double animation_curve_tag[4] = {0.46, 1.0, 0.29, 0.99}; // 动画曲线 double animation_curve_tag[4] = {0.46, 1.0, 0.29, 0.99}; // 动画曲线
double animation_curve_close[4] = {0.46, 1.0, 0.29, 0.99}; // 动画曲线 double animation_curve_close[4] = {0.46, 1.0, 0.29, 0.99}; // 动画曲线
double animation_curve_focus[4] = {0.46, 1.0, 0.29, 0.99}; // 动画曲线 double animation_curve_focus[4] = {0.46, 1.0, 0.29, 0.99}; // 动画曲线
double animation_curve_opafadein[4] = {0.46, 1.0, 0.29, 0.99}; // 动画曲线
double animation_curve_opafadeout[4] = {0.5, 0.5, 0.5, 0.5}; // 动画曲线
/* appearance */ /* appearance */
uint32_t axis_bind_apply_timeout = 100; // 滚轮绑定动作的触发的时间间隔 unsigned int axis_bind_apply_timeout = 100; // 滚轮绑定动作的触发的时间间隔
uint32_t focus_on_activate = 1; // 收到窗口激活请求是否自动跳转聚焦 unsigned int focus_on_activate = 1; // 收到窗口激活请求是否自动跳转聚焦
uint32_t new_is_master = 1; // 新窗口是否插在头部 unsigned int new_is_master = 1; // 新窗口是否插在头部
double default_mfact = 0.55f; // master 窗口比例 double default_mfact = 0.55f; // master 窗口比例
uint32_t default_nmaster = 1; // 默认master数量 unsigned int default_nmaster = 1; // 默认master数量
int32_t center_master_overspread = 0; // 中心master时是否铺满 int center_master_overspread = 0; // 中心master时是否铺满
int32_t center_when_single_stack = 1; // 单个stack时是否居中 int center_when_single_stack = 1; // 单个stack时是否居中
/* logging */ /* logging */
int32_t log_level = WLR_ERROR; int log_level = WLR_ERROR;
uint32_t numlockon = 0; // 是否打开右边小键盘 unsigned int numlockon = 0; // 是否打开右边小键盘
uint32_t capslock = 0; // 是否启用快捷键 unsigned int capslock = 0; // 是否启用快捷键
uint32_t ov_tab_mode = 0; // alt tab切换模式 unsigned int ov_tab_mode = 0; // alt tab切换模式
uint32_t hotarea_size = 10; // 热区大小,10x10 unsigned int hotarea_size = 10; // 热区大小,10x10
uint32_t enable_hotarea = 1; // 是否启用鼠标热区 unsigned int enable_hotarea = 1; // 是否启用鼠标热区
int32_t smartgaps = 0; /* 1 means no outer gap when there is only one window */ int smartgaps = 0; /* 1 means no outer gap when there is only one window */
int32_t sloppyfocus = 1; /* focus follows mouse */ int sloppyfocus = 1; /* focus follows mouse */
uint32_t gappih = 5; /* horiz inner gap between windows */ unsigned int gappih = 5; /* horiz inner gap between windows */
uint32_t gappiv = 5; /* vert inner gap between windows */ unsigned int gappiv = 5; /* vert inner gap between windows */
uint32_t gappoh = 10; /* horiz outer gap between windows and screen edge */ unsigned int gappoh = 10; /* horiz outer gap between windows and screen edge */
uint32_t gappov = 10; /* vert outer gap between windows and screen edge */ unsigned int gappov = 10; /* vert outer gap between windows and screen edge */
float scratchpad_width_ratio = 0.8; float scratchpad_width_ratio = 0.8;
float scratchpad_height_ratio = 0.9; float scratchpad_height_ratio = 0.9;
int32_t scroller_structs = 20; int scroller_structs = 20;
float scroller_default_proportion = 0.9; float scroller_default_proportion = 0.9;
float scroller_default_proportion_single = 1.0; float scroller_default_proportion_single = 1.0;
int32_t scroller_ignore_proportion_single = 0; int scroller_ignore_proportion_single = 0;
int32_t scroller_focus_center = 0; int scroller_focus_center = 0;
int32_t scroller_prefer_center = 0; int scroller_prefer_center = 0;
int32_t focus_cross_monitor = 0; int focus_cross_monitor = 0;
int32_t focus_cross_tag = 0; int focus_cross_tag = 0;
int32_t exchange_cross_monitor = 0; int exchange_cross_monitor = 0;
int32_t scratchpad_cross_monitor = 0; int scratchpad_cross_monitor = 0;
int32_t view_current_to_back = 0; int view_current_to_back = 1;
int32_t no_border_when_single = 0; int no_border_when_single = 0;
int32_t no_radius_when_single = 0; int no_radius_when_single = 0;
int32_t snap_distance = 30; int snap_distance = 30;
int32_t enable_floating_snap = 0; int enable_floating_snap = 0;
int32_t drag_tile_to_tile = 0; int drag_tile_to_tile = 0;
uint32_t cursor_size = 24; unsigned int cursor_size = 24;
uint32_t cursor_hide_timeout = 0; unsigned int cursor_hide_timeout = 0;
uint32_t swipe_min_threshold = 1; unsigned int swipe_min_threshold = 1;
int32_t idleinhibit_ignore_visible = int inhibit_regardless_of_visibility =
0; /* 1 means idle inhibitors will disable idle tracking even if it's 0; /* 1 means idle inhibitors will disable idle tracking even if it's
surface isn't visible */ surface isn't visible */
uint32_t borderpx = 4; /* border pixel of windows */ unsigned int borderpx = 4; /* border pixel of windows */
float rootcolor[] = COLOR(0x323232ff); float rootcolor[] = COLOR(0x323232ff);
float bordercolor[] = COLOR(0x444444ff); float bordercolor[] = COLOR(0x444444ff);
float focuscolor[] = COLOR(0xc66b25ff); float focuscolor[] = COLOR(0xc66b25ff);
@@ -94,21 +92,21 @@ float globalcolor[] = COLOR(0xb153a7ff);
float overlaycolor[] = COLOR(0x14a57cff); float overlaycolor[] = COLOR(0x14a57cff);
// char *cursor_theme = "Bibata-Modern-Ice"; // char *cursor_theme = "Bibata-Modern-Ice";
int32_t overviewgappi = 5; /* overview时 窗口与边缘 缝隙大小 */ int overviewgappi = 5; /* overview时 窗口与边缘 缝隙大小 */
int32_t overviewgappo = 30; /* overview时 窗口与窗口 缝隙大小 */ int overviewgappo = 30; /* overview时 窗口与窗口 缝隙大小 */
/* To conform the xdg-protocol, set the alpha to zero to restore the old /* To conform the xdg-protocol, set the alpha to zero to restore the old
* behavior */ * behavior */
float fullscreen_bg[] = {0.1, 0.1, 0.1, 1.0}; float fullscreen_bg[] = {0.1, 0.1, 0.1, 1.0};
int32_t warpcursor = 1; /* Warp cursor to focused client */ int warpcursor = 1; /* Warp cursor to focused client */
int32_t xwayland_persistence = 1; /* xwayland persistence */ int xwayland_persistence = 1; /* xwayland persistence */
int32_t syncobj_enable = 0; int syncobj_enable = 0;
int32_t adaptive_sync = 0; int adaptive_sync = 0;
int32_t allow_lock_transparent = 0; int allow_lock_transparent = 0;
double drag_refresh_interval = 16.0; double drag_refresh_interval = 30.0;
int32_t allow_tearing = TEARING_DISABLED; int allow_tearing = TEARING_DISABLED;
int32_t allow_shortcuts_inhibit = SHORTCUTS_INHIBIT_ENABLE; int allow_shortcuts_inhibit = SHORTCUTS_INHIBIT_ENABLE;
/* keyboard */ /* keyboard */
@@ -145,21 +143,21 @@ struct xkb_rule_names xkb_rules = {
.options = xkb_rules_options, .options = xkb_rules_options,
}; };
int32_t repeat_rate = 25; int repeat_rate = 25;
int32_t repeat_delay = 600; int repeat_delay = 600;
/* Trackpad */ /* Trackpad */
int32_t disable_trackpad = 0; int disable_trackpad = 0;
int32_t tap_to_click = 1; int tap_to_click = 1;
int32_t tap_and_drag = 1; int tap_and_drag = 1;
int32_t drag_lock = 1; int drag_lock = 1;
int32_t mouse_natural_scrolling = 0; int mouse_natural_scrolling = 0;
int32_t trackpad_natural_scrolling = 0; int trackpad_natural_scrolling = 0;
int32_t disable_while_typing = 1; int disable_while_typing = 1;
int32_t left_handed = 0; int left_handed = 0;
int32_t middle_button_emulation = 0; int middle_button_emulation = 0;
int32_t single_scratchpad = 1; int single_scratchpad = 1;
int32_t edge_scroller_pointer_focus = 1; int edge_scroller_pointer_focus = 1;
/* You can choose between: /* You can choose between:
LIBINPUT_CONFIG_SCROLL_NO_SCROLL LIBINPUT_CONFIG_SCROLL_NO_SCROLL
@@ -168,7 +166,7 @@ LIBINPUT_CONFIG_SCROLL_EDGE
LIBINPUT_CONFIG_SCROLL_ON_BUTTON_DOWN LIBINPUT_CONFIG_SCROLL_ON_BUTTON_DOWN
*/ */
enum libinput_config_scroll_method scroll_method = LIBINPUT_CONFIG_SCROLL_2FG; enum libinput_config_scroll_method scroll_method = LIBINPUT_CONFIG_SCROLL_2FG;
uint32_t scroll_button = 274; unsigned int scroll_button = 274;
/* You can choose between: /* You can choose between:
LIBINPUT_CONFIG_CLICK_METHOD_NONE LIBINPUT_CONFIG_CLICK_METHOD_NONE
@@ -178,8 +176,6 @@ LIBINPUT_CONFIG_CLICK_METHOD_CLICKFINGER
enum libinput_config_click_method click_method = enum libinput_config_click_method click_method =
LIBINPUT_CONFIG_CLICK_METHOD_BUTTON_AREAS; LIBINPUT_CONFIG_CLICK_METHOD_BUTTON_AREAS;
double axis_scroll_factor = 1.0;
/* You can choose between: /* You can choose between:
LIBINPUT_CONFIG_SEND_EVENTS_ENABLED LIBINPUT_CONFIG_SEND_EVENTS_ENABLED
LIBINPUT_CONFIG_SEND_EVENTS_DISABLED LIBINPUT_CONFIG_SEND_EVENTS_DISABLED
@@ -210,27 +206,27 @@ static const char *tags[] = {
float focused_opacity = 1.0; float focused_opacity = 1.0;
float unfocused_opacity = 1.0; float unfocused_opacity = 1.0;
int32_t border_radius = 0; int border_radius = 0;
int32_t border_radius_location_default = CORNER_LOCATION_ALL; int border_radius_location_default = CORNER_LOCATION_ALL;
int32_t blur = 0; int blur = 0;
int32_t blur_layer = 0; int blur_layer = 0;
int32_t blur_optimized = 1; int blur_optimized = 1;
struct blur_data blur_params; struct blur_data blur_params;
int32_t blur_params_num_passes = 1; int blur_params_num_passes = 1;
int32_t blur_params_radius = 5; int blur_params_radius = 5;
float blur_params_noise = 0.02; float blur_params_noise = 0.02;
float blur_params_brightness = 0.9; float blur_params_brightness = 0.9;
float blur_params_contrast = 0.9; float blur_params_contrast = 0.9;
float blur_params_saturation = 1.2; float blur_params_saturation = 1.2;
int32_t shadows = 0; int shadows = 0;
int32_t shadow_only_floating = 1; int shadow_only_floating = 1;
int32_t layer_shadows = 0; int layer_shadows = 0;
uint32_t shadows_size = 10; unsigned int shadows_size = 10;
double shadows_blur = 15; double shadows_blur = 15;
int32_t shadows_position_x = 0; int shadows_position_x = 0;
int32_t shadows_position_y = 0; int shadows_position_y = 0;
float shadowscolor[] = COLOR(0x000000ff); float shadowscolor[] = COLOR(0x000000ff);
; ;

142
src/dispatch/bind_declare.h
View File

@@ -1,71 +1,71 @@
int32_t minimized(const Arg *arg); int minimized(const Arg *arg);
int32_t restore_minimized(const Arg *arg); int restore_minimized(const Arg *arg);
int32_t toggle_scratchpad(const Arg *arg); int toggle_scratchpad(const Arg *arg);
int32_t focusdir(const Arg *arg); int focusdir(const Arg *arg);
int32_t toggleoverview(const Arg *arg); int toggleoverview(const Arg *arg);
int32_t set_proportion(const Arg *arg); int set_proportion(const Arg *arg);
int32_t switch_proportion_preset(const Arg *arg); int switch_proportion_preset(const Arg *arg);
int32_t zoom(const Arg *arg); int zoom(const Arg *arg);
int32_t tagsilent(const Arg *arg); int tagsilent(const Arg *arg);
int32_t tagtoleft(const Arg *arg); int tagtoleft(const Arg *arg);
int32_t tagtoright(const Arg *arg); int tagtoright(const Arg *arg);
int32_t tagcrossmon(const Arg *arg); int tagcrossmon(const Arg *arg);
int32_t viewtoleft(const Arg *arg); int viewtoleft(const Arg *arg);
int32_t viewtoright(const Arg *arg); int viewtoright(const Arg *arg);
int32_t viewtoleft_have_client(const Arg *arg); int viewtoleft_have_client(const Arg *arg);
int32_t viewtoright_have_client(const Arg *arg); int viewtoright_have_client(const Arg *arg);
int32_t viewcrossmon(const Arg *arg); int viewcrossmon(const Arg *arg);
int32_t togglefloating(const Arg *arg); int togglefloating(const Arg *arg);
int32_t togglefullscreen(const Arg *arg); int togglefullscreen(const Arg *arg);
int32_t togglemaximizescreen(const Arg *arg); int togglemaximizescreen(const Arg *arg);
int32_t togglegaps(const Arg *arg); int togglegaps(const Arg *arg);
int32_t tagmon(const Arg *arg); int tagmon(const Arg *arg);
int32_t spawn(const Arg *arg); int spawn(const Arg *arg);
int32_t spawn_shell(const Arg *arg); int spawn_shell(const Arg *arg);
int32_t spawn_on_empty(const Arg *arg); int spawn_on_empty(const Arg *arg);
int32_t setkeymode(const Arg *arg); int setkeymode(const Arg *arg);
int32_t switch_keyboard_layout(const Arg *arg); int switch_keyboard_layout(const Arg *arg);
int32_t setlayout(const Arg *arg); int setlayout(const Arg *arg);
int32_t switch_layout(const Arg *arg); int switch_layout(const Arg *arg);
int32_t setmfact(const Arg *arg); int setmfact(const Arg *arg);
int32_t quit(const Arg *arg); int quit(const Arg *arg);
int32_t moveresize(const Arg *arg); int moveresize(const Arg *arg);
int32_t exchange_client(const Arg *arg); int exchange_client(const Arg *arg);
int32_t exchange_stack_client(const Arg *arg); int exchange_stack_client(const Arg *arg);
int32_t killclient(const Arg *arg); int killclient(const Arg *arg);
int32_t toggleglobal(const Arg *arg); int toggleglobal(const Arg *arg);
int32_t incnmaster(const Arg *arg); int incnmaster(const Arg *arg);
int32_t focusmon(const Arg *arg); int focusmon(const Arg *arg);
int32_t focusstack(const Arg *arg); int focusstack(const Arg *arg);
int32_t chvt(const Arg *arg); int chvt(const Arg *arg);
int32_t reload_config(const Arg *arg); int reload_config(const Arg *arg);
int32_t smartmovewin(const Arg *arg); int smartmovewin(const Arg *arg);
int32_t smartresizewin(const Arg *arg); int smartresizewin(const Arg *arg);
int32_t centerwin(const Arg *arg); int centerwin(const Arg *arg);
int32_t bind_to_view(const Arg *arg); int bind_to_view(const Arg *arg);
int32_t toggletag(const Arg *arg); int toggletag(const Arg *arg);
int32_t toggleview(const Arg *arg); int toggleview(const Arg *arg);
int32_t tag(const Arg *arg); int tag(const Arg *arg);
int32_t comboview(const Arg *arg); int comboview(const Arg *arg);
int32_t incgaps(const Arg *arg); int incgaps(const Arg *arg);
int32_t incigaps(const Arg *arg); int incigaps(const Arg *arg);
int32_t incihgaps(const Arg *arg); int incihgaps(const Arg *arg);
int32_t incivgaps(const Arg *arg); int incivgaps(const Arg *arg);
int32_t incogaps(const Arg *arg); int incogaps(const Arg *arg);
int32_t incohgaps(const Arg *arg); int incohgaps(const Arg *arg);
int32_t incovgaps(const Arg *arg); int incovgaps(const Arg *arg);
int32_t defaultgaps(const Arg *arg); int defaultgaps(const Arg *arg);
int32_t togglefakefullscreen(const Arg *arg); int togglefakefullscreen(const Arg *arg);
int32_t toggleoverlay(const Arg *arg); int toggleoverlay(const Arg *arg);
int32_t movewin(const Arg *arg); int movewin(const Arg *arg);
int32_t resizewin(const Arg *arg); int resizewin(const Arg *arg);
int32_t toggle_named_scratchpad(const Arg *arg); int toggle_named_scratchpad(const Arg *arg);
int32_t toggle_render_border(const Arg *arg); int toggle_render_border(const Arg *arg);
int32_t create_virtual_output(const Arg *arg); int create_virtual_output(const Arg *arg);
int32_t destroy_all_virtual_output(const Arg *arg); int destroy_all_virtual_output(const Arg *arg);
int32_t focuslast(const Arg *arg); int focuslast(const Arg *arg);
int32_t toggle_trackpad_enable(const Arg *arg); int toggle_trackpad_enable(const Arg *arg);
int32_t setoption(const Arg *arg); int setoption(const Arg *arg);
int32_t disable_monitor(const Arg *arg); int disable_monitor(const Arg *arg);
int32_t enable_monitor(const Arg *arg); int enable_monitor(const Arg *arg);
int32_t toggle_monitor(const Arg *arg); int toggle_monitor(const Arg *arg);

312
src/dispatch/bind_define.h
View File

@@ -1,6 +1,6 @@
int32_t bind_to_view(const Arg *arg) { int bind_to_view(const Arg *arg) {
uint32_t target = arg->ui; unsigned int target = arg->ui;
if (view_current_to_back && selmon->pertag->curtag && if (view_current_to_back && selmon->pertag->curtag &&
(target & TAGMASK) == (selmon->tagset[selmon->seltags])) { (target & TAGMASK) == (selmon->tagset[selmon->seltags])) {
@@ -15,14 +15,14 @@ int32_t bind_to_view(const Arg *arg) {
return 0; return 0;
} }
if ((int32_t)target == INT_MIN && selmon->pertag->curtag == 0) { if ((int)target == INT_MIN && selmon->pertag->curtag == 0) {
if (view_current_to_back && selmon->pertag->prevtag) if (view_current_to_back && selmon->pertag->prevtag)
target = 1 << (selmon->pertag->prevtag - 1); target = 1 << (selmon->pertag->prevtag - 1);
else else
target = 0; target = 0;
} }
if (target == 0 || (int32_t)target == INT_MIN) { if (target == 0 || (int)target == INT_MIN) {
view(&(Arg){.ui = ~0 & TAGMASK, .i = arg->i}, false); view(&(Arg){.ui = ~0 & TAGMASK, .i = arg->i}, false);
} else { } else {
view(&(Arg){.ui = target, .i = arg->i}, true); view(&(Arg){.ui = target, .i = arg->i}, true);
@@ -30,33 +30,12 @@ int32_t bind_to_view(const Arg *arg) {
return 0; return 0;
} }
int32_t chvt(const Arg *arg) { int chvt(const Arg *arg) {
struct timespec ts;
// prevent the animation to rquest the new frame
allow_frame_scheduling = false;
// backup current tag and monitor name
if (selmon) {
chvt_backup_tag = selmon->pertag->curtag;
strncpy(chvt_backup_selmon, selmon->wlr_output->name,
sizeof(chvt_backup_selmon) - 1);
}
wlr_session_change_vt(session, arg->ui); wlr_session_change_vt(session, arg->ui);
return 0;
// wait for DRM device to stabilize and ensure the session state is inactive
ts.tv_sec = 0;
ts.tv_nsec = 100000000; // 200ms
nanosleep(&ts, NULL);
// allow frame scheduling,
// because session state is now inactive, rendermon will not enter
allow_frame_scheduling = true;
return 1;
} }
int32_t create_virtual_output(const Arg *arg) { int create_virtual_output(const Arg *arg) {
if (!wlr_backend_is_multi(backend)) { if (!wlr_backend_is_multi(backend)) {
wlr_log(WLR_ERROR, "Expected a multi backend"); wlr_log(WLR_ERROR, "Expected a multi backend");
@@ -75,7 +54,7 @@ int32_t create_virtual_output(const Arg *arg) {
return 0; return 0;
} }
int32_t destroy_all_virtual_output(const Arg *arg) { int destroy_all_virtual_output(const Arg *arg) {
if (!wlr_backend_is_multi(backend)) { if (!wlr_backend_is_multi(backend)) {
wlr_log(WLR_ERROR, "Expected a multi backend"); wlr_log(WLR_ERROR, "Expected a multi backend");
@@ -94,12 +73,12 @@ int32_t destroy_all_virtual_output(const Arg *arg) {
return 0; return 0;
} }
int32_t defaultgaps(const Arg *arg) { int defaultgaps(const Arg *arg) {
setgaps(gappoh, gappov, gappih, gappiv); setgaps(gappoh, gappov, gappih, gappiv);
return 0; return 0;
} }
int32_t exchange_client(const Arg *arg) { int exchange_client(const Arg *arg) {
Client *c = selmon->sel; Client *c = selmon->sel;
if (!c || c->isfloating) if (!c || c->isfloating)
return 0; return 0;
@@ -111,7 +90,7 @@ int32_t exchange_client(const Arg *arg) {
return 0; return 0;
} }
int32_t exchange_stack_client(const Arg *arg) { int exchange_stack_client(const Arg *arg) {
Client *c = selmon->sel; Client *c = selmon->sel;
Client *tc = NULL; Client *tc = NULL;
if (!c || c->isfloating || c->isfullscreen || c->ismaximizescreen) if (!c || c->isfloating || c->isfullscreen || c->ismaximizescreen)
@@ -126,7 +105,7 @@ int32_t exchange_stack_client(const Arg *arg) {
return 0; return 0;
} }
int32_t focusdir(const Arg *arg) { int focusdir(const Arg *arg) {
Client *c = NULL; Client *c = NULL;
c = direction_select(arg); c = direction_select(arg);
if (c) { if (c) {
@@ -146,12 +125,12 @@ int32_t focusdir(const Arg *arg) {
return 0; return 0;
} }
int32_t focuslast(const Arg *arg) { int focuslast(const Arg *arg) {
Client *c = NULL; Client *c = NULL;
Client *tc = NULL; Client *tc = NULL;
bool begin = false; bool begin = false;
uint32_t target = 0; unsigned int target = 0;
wl_list_for_each(c, &fstack, flink) { wl_list_for_each(c, &fstack, flink) {
if (c->iskilling || c->isminimized || c->isunglobal || if (c->iskilling || c->isminimized || c->isunglobal ||
@@ -178,7 +157,7 @@ int32_t focuslast(const Arg *arg) {
if (!tc || !client_surface(tc)->mapped) if (!tc || !client_surface(tc)->mapped)
return 0; return 0;
if ((int32_t)tc->tags > 0) { if ((int)tc->tags > 0) {
focusclient(tc, 1); focusclient(tc, 1);
target = get_tags_first_tag(tc->tags); target = get_tags_first_tag(tc->tags);
view(&(Arg){.ui = target}, true); view(&(Arg){.ui = target}, true);
@@ -186,25 +165,23 @@ int32_t focuslast(const Arg *arg) {
return 0; return 0;
} }
int32_t toggle_trackpad_enable(const Arg *arg) { int toggle_trackpad_enable(const Arg *arg) {
disable_trackpad = !disable_trackpad; disable_trackpad = !disable_trackpad;
return 0; return 0;
} }
int32_t focusmon(const Arg *arg) { int focusmon(const Arg *arg) {
Client *c = NULL; Client *c = NULL, *old_selmon_sel = NULL;
Monitor *m = NULL; Monitor *m = NULL;
Monitor *tm = NULL;
if (arg->i != UNDIR) { if (arg->i != UNDIR) {
tm = dirtomon(arg->i); m = dirtomon(arg->i);
} else if (arg->v) { } else if (arg->v) {
wl_list_for_each(m, &mons, link) { wl_list_for_each(m, &mons, link) {
if (!m->wlr_output->enabled) { if (!m->wlr_output->enabled) {
continue; continue;
} }
if (regex_match(arg->v, m->wlr_output->name)) { if (regex_match(arg->v, m->wlr_output->name)) {
tm = m;
break; break;
} }
} }
@@ -212,10 +189,11 @@ int32_t focusmon(const Arg *arg) {
return 0; return 0;
} }
if (!tm || !tm->wlr_output->enabled || tm == selmon) if (!m || !m->wlr_output->enabled || m == selmon)
return 0; return 0;
selmon = tm; old_selmon_sel = selmon->sel;
selmon = m;
if (warpcursor) { if (warpcursor) {
warp_cursor_to_selmon(selmon); warp_cursor_to_selmon(selmon);
} }
@@ -224,14 +202,16 @@ int32_t focusmon(const Arg *arg) {
selmon->sel = NULL; selmon->sel = NULL;
wlr_seat_pointer_notify_clear_focus(seat); wlr_seat_pointer_notify_clear_focus(seat);
wlr_seat_keyboard_notify_clear_focus(seat); wlr_seat_keyboard_notify_clear_focus(seat);
focusclient(NULL, 0);
} else } else
focusclient(c, 1); focusclient(c, 1);
if (old_selmon_sel) {
client_set_unfocused_opacity_animation(old_selmon_sel);
}
return 0; return 0;
} }
int32_t focusstack(const Arg *arg) { int focusstack(const Arg *arg) {
/* Focus the next or previous client (in tiling order) on selmon */ /* Focus the next or previous client (in tiling order) on selmon */
Client *sel = focustop(selmon); Client *sel = focustop(selmon);
Client *tc = NULL; Client *tc = NULL;
@@ -254,58 +234,58 @@ int32_t focusstack(const Arg *arg) {
return 0; return 0;
} }
int32_t incnmaster(const Arg *arg) { int incnmaster(const Arg *arg) {
if (!arg || !selmon) if (!arg || !selmon)
return 0; return 0;
selmon->pertag->nmasters[selmon->pertag->curtag] = selmon->pertag->nmasters[selmon->pertag->curtag] =
MAX(selmon->pertag->nmasters[selmon->pertag->curtag] + arg->i, 0); MAX(selmon->pertag->nmasters[selmon->pertag->curtag] + arg->i, 0);
arrange(selmon, false, false); arrange(selmon, false);
return 0; return 0;
} }
int32_t incgaps(const Arg *arg) { int incgaps(const Arg *arg) {
setgaps(selmon->gappoh + arg->i, selmon->gappov + arg->i, setgaps(selmon->gappoh + arg->i, selmon->gappov + arg->i,
selmon->gappih + arg->i, selmon->gappiv + arg->i); selmon->gappih + arg->i, selmon->gappiv + arg->i);
return 0; return 0;
} }
int32_t incigaps(const Arg *arg) { int incigaps(const Arg *arg) {
setgaps(selmon->gappoh, selmon->gappov, selmon->gappih + arg->i, setgaps(selmon->gappoh, selmon->gappov, selmon->gappih + arg->i,
selmon->gappiv + arg->i); selmon->gappiv + arg->i);
return 0; return 0;
} }
int32_t incogaps(const Arg *arg) { int incogaps(const Arg *arg) {
setgaps(selmon->gappoh + arg->i, selmon->gappov + arg->i, selmon->gappih, setgaps(selmon->gappoh + arg->i, selmon->gappov + arg->i, selmon->gappih,
selmon->gappiv); selmon->gappiv);
return 0; return 0;
} }
int32_t incihgaps(const Arg *arg) { int incihgaps(const Arg *arg) {
setgaps(selmon->gappoh, selmon->gappov, selmon->gappih + arg->i, setgaps(selmon->gappoh, selmon->gappov, selmon->gappih + arg->i,
selmon->gappiv); selmon->gappiv);
return 0; return 0;
} }
int32_t incivgaps(const Arg *arg) { int incivgaps(const Arg *arg) {
setgaps(selmon->gappoh, selmon->gappov, selmon->gappih, setgaps(selmon->gappoh, selmon->gappov, selmon->gappih,
selmon->gappiv + arg->i); selmon->gappiv + arg->i);
return 0; return 0;
} }
int32_t incohgaps(const Arg *arg) { int incohgaps(const Arg *arg) {
setgaps(selmon->gappoh + arg->i, selmon->gappov, selmon->gappih, setgaps(selmon->gappoh + arg->i, selmon->gappov, selmon->gappih,
selmon->gappiv); selmon->gappiv);
return 0; return 0;
} }
int32_t incovgaps(const Arg *arg) { int incovgaps(const Arg *arg) {
setgaps(selmon->gappoh, selmon->gappov + arg->i, selmon->gappih, setgaps(selmon->gappoh, selmon->gappov + arg->i, selmon->gappih,
selmon->gappiv); selmon->gappiv);
return 0; return 0;
} }
int32_t setmfact(const Arg *arg) { int setmfact(const Arg *arg) {
float f; float f;
Client *c = NULL; Client *c = NULL;
@@ -323,11 +303,11 @@ int32_t setmfact(const Arg *arg) {
c->master_mfact_per = f; c->master_mfact_per = f;
} }
} }
arrange(selmon, false, false); arrange(selmon, false);
return 0; return 0;
} }
int32_t killclient(const Arg *arg) { int killclient(const Arg *arg) {
Client *c = NULL; Client *c = NULL;
c = selmon->sel; c = selmon->sel;
if (c) { if (c) {
@@ -336,7 +316,7 @@ int32_t killclient(const Arg *arg) {
return 0; return 0;
} }
int32_t moveresize(const Arg *arg) { int moveresize(const Arg *arg) {
if (cursor_mode != CurNormal && cursor_mode != CurPressed) if (cursor_mode != CurNormal && cursor_mode != CurPressed)
return 0; return 0;
xytonode(cursor->x, cursor->y, NULL, &grabc, NULL, NULL, NULL); xytonode(cursor->x, cursor->y, NULL, &grabc, NULL, NULL, NULL);
@@ -374,7 +354,7 @@ int32_t moveresize(const Arg *arg) {
return 0; return 0;
} }
int32_t movewin(const Arg *arg) { int movewin(const Arg *arg) {
Client *c = NULL; Client *c = NULL;
c = selmon->sel; c = selmon->sel;
if (!c || c->isfullscreen) if (!c || c->isfullscreen)
@@ -412,15 +392,15 @@ int32_t movewin(const Arg *arg) {
return 0; return 0;
} }
int32_t quit(const Arg *arg) { int quit(const Arg *arg) {
wl_display_terminate(dpy); wl_display_terminate(dpy);
return 0; return 0;
} }
int32_t resizewin(const Arg *arg) { int resizewin(const Arg *arg) {
Client *c = NULL; Client *c = NULL;
c = selmon->sel; c = selmon->sel;
int32_t offsetx = 0, offsety = 0; int offsetx = 0, offsety = 0;
if (!c || c->isfullscreen || c->ismaximizescreen) if (!c || c->isfullscreen || c->ismaximizescreen)
return 0; return 0;
@@ -483,7 +463,7 @@ int32_t resizewin(const Arg *arg) {
return 0; return 0;
} }
int32_t restore_minimized(const Arg *arg) { int restore_minimized(const Arg *arg) {
Client *c = NULL; Client *c = NULL;
if (selmon && selmon->isoverview) if (selmon && selmon->isoverview)
@@ -506,7 +486,7 @@ int32_t restore_minimized(const Arg *arg) {
c->isnamedscratchpad = 0; c->isnamedscratchpad = 0;
show_hide_client(c); show_hide_client(c);
setborder_color(c); setborder_color(c);
arrange(c->mon, false, false); arrange(c->mon, false);
focusclient(c, 0); focusclient(c, 0);
warp_cursor(c); warp_cursor(c);
return 0; return 0;
@@ -515,14 +495,14 @@ int32_t restore_minimized(const Arg *arg) {
return 0; return 0;
} }
int32_t setlayout(const Arg *arg) { int setlayout(const Arg *arg) {
int32_t jk; int jk;
for (jk = 0; jk < LENGTH(layouts); jk++) { for (jk = 0; jk < LENGTH(layouts); jk++) {
if (strcmp(layouts[jk].name, arg->v) == 0) { if (strcmp(layouts[jk].name, arg->v) == 0) {
selmon->pertag->ltidxs[selmon->pertag->curtag] = &layouts[jk]; selmon->pertag->ltidxs[selmon->pertag->curtag] = &layouts[jk];
clear_fullscreen_and_maximized_state(selmon); clear_fullscreen_and_maximized_state(selmon);
arrange(selmon, false, false); arrange(selmon, false);
printstatus(); printstatus();
return 0; return 0;
} }
@@ -530,7 +510,7 @@ int32_t setlayout(const Arg *arg) {
return 0; return 0;
} }
int32_t setkeymode(const Arg *arg) { int setkeymode(const Arg *arg) {
snprintf(keymode.mode, sizeof(keymode.mode), "%.27s", arg->v); snprintf(keymode.mode, sizeof(keymode.mode), "%.27s", arg->v);
if (strcmp(keymode.mode, "default") == 0) { if (strcmp(keymode.mode, "default") == 0) {
keymode.isdefault = true; keymode.isdefault = true;
@@ -541,7 +521,7 @@ int32_t setkeymode(const Arg *arg) {
return 1; return 1;
} }
int32_t set_proportion(const Arg *arg) { int set_proportion(const Arg *arg) {
if (selmon->isoverview || !is_scroller_layout(selmon)) if (selmon->isoverview || !is_scroller_layout(selmon))
return 0; return 0;
@@ -551,20 +531,20 @@ int32_t set_proportion(const Arg *arg) {
return 0; return 0;
if (selmon->sel) { if (selmon->sel) {
uint32_t max_client_width = unsigned int max_client_width =
selmon->w.width - 2 * scroller_structs - gappih; selmon->w.width - 2 * scroller_structs - gappih;
selmon->sel->scroller_proportion = arg->f; selmon->sel->scroller_proportion = arg->f;
selmon->sel->geom.width = max_client_width * arg->f; selmon->sel->geom.width = max_client_width * arg->f;
// resize(selmon->sel, selmon->sel->geom, 0); // resize(selmon->sel, selmon->sel->geom, 0);
arrange(selmon, false, false); arrange(selmon, false);
} }
return 0; return 0;
} }
int32_t smartmovewin(const Arg *arg) { int smartmovewin(const Arg *arg) {
Client *c = NULL, *tc = NULL; Client *c = NULL, *tc = NULL;
int32_t nx, ny; int nx, ny;
int32_t buttom, top, left, right, tar; int buttom, top, left, right, tar;
c = selmon->sel; c = selmon->sel;
if (!c || c->isfullscreen) if (!c || c->isfullscreen)
return 0; return 0;
@@ -662,10 +642,10 @@ int32_t smartmovewin(const Arg *arg) {
return 0; return 0;
} }
int32_t smartresizewin(const Arg *arg) { int smartresizewin(const Arg *arg) {
Client *c = NULL, *tc = NULL; Client *c = NULL, *tc = NULL;
int32_t nw, nh; int nw, nh;
int32_t buttom, top, left, right, tar; int buttom, top, left, right, tar;
c = selmon->sel; c = selmon->sel;
if (!c || c->isfullscreen) if (!c || c->isfullscreen)
return 0; return 0;
@@ -732,34 +712,22 @@ int32_t smartresizewin(const Arg *arg) {
return 0; return 0;
} }
int32_t centerwin(const Arg *arg) { int centerwin(const Arg *arg) {
Client *c = NULL; Client *c = NULL;
c = selmon->sel; c = selmon->sel;
if (!c || c->isfullscreen || c->ismaximizescreen) if (!c || c->isfullscreen)
return 0; return 0;
if (!c->isfloating)
setfloating(c, true);
if (c->isfloating) { c->float_geom = setclient_coordinate_center(c, c->geom, 0, 0);
c->float_geom = setclient_coordinate_center(c, c->mon, c->geom, 0, 0);
c->iscustomsize = 1; c->iscustomsize = 1;
resize(c, c->float_geom, 1); resize(c, c->float_geom, 1);
return 0; return 0;
} }
if (!is_scroller_layout(selmon)) int spawn_shell(const Arg *arg) {
return 0;
if (selmon->pertag->ltidxs[selmon->pertag->curtag]->id == SCROLLER) {
c->geom.x = selmon->w.x + (selmon->w.width - c->geom.width) / 2;
} else {
c->geom.y = selmon->w.y + (selmon->w.height - c->geom.height) / 2;
}
arrange(selmon, false, false);
return 0;
}
int32_t spawn_shell(const Arg *arg) {
if (!arg->v) if (!arg->v)
return 0; return 0;
@@ -786,7 +754,7 @@ int32_t spawn_shell(const Arg *arg) {
return 0; return 0;
} }
int32_t spawn(const Arg *arg) { int spawn(const Arg *arg) {
if (!arg->v) if (!arg->v)
return 0; return 0;
@@ -802,7 +770,7 @@ int32_t spawn(const Arg *arg) {
// 2. 解析参数 // 2. 解析参数
char *argv[64]; char *argv[64];
int32_t argc = 0; int argc = 0;
char *token = strtok((char *)arg->v, " "); char *token = strtok((char *)arg->v, " ");
while (token != NULL && argc < 63) { while (token != NULL && argc < 63) {
wordexp_t p; wordexp_t p;
@@ -826,7 +794,7 @@ int32_t spawn(const Arg *arg) {
return 0; return 0;
} }
int32_t spawn_on_empty(const Arg *arg) { int spawn_on_empty(const Arg *arg) {
bool is_empty = true; bool is_empty = true;
Client *c = NULL; Client *c = NULL;
@@ -846,7 +814,7 @@ int32_t spawn_on_empty(const Arg *arg) {
return 0; return 0;
} }
int32_t switch_keyboard_layout(const Arg *arg) { int switch_keyboard_layout(const Arg *arg) {
if (!kb_group || !kb_group->wlr_group || !seat) { if (!kb_group || !kb_group->wlr_group || !seat) {
wlr_log(WLR_ERROR, "Invalid keyboard group or seat"); wlr_log(WLR_ERROR, "Invalid keyboard group or seat");
return 0; return 0;
@@ -861,7 +829,7 @@ int32_t switch_keyboard_layout(const Arg *arg) {
// 1. 获取当前布局和计算下一个布局 // 1. 获取当前布局和计算下一个布局
xkb_layout_index_t current = xkb_state_serialize_layout( xkb_layout_index_t current = xkb_state_serialize_layout(
keyboard->xkb_state, XKB_STATE_LAYOUT_EFFECTIVE); keyboard->xkb_state, XKB_STATE_LAYOUT_EFFECTIVE);
const int32_t num_layouts = xkb_keymap_num_layouts(keyboard->keymap); const int num_layouts = xkb_keymap_num_layouts(keyboard->keymap);
if (num_layouts < 2) { if (num_layouts < 2) {
wlr_log(WLR_INFO, "Only one layout available"); wlr_log(WLR_INFO, "Only one layout available");
return 0; return 0;
@@ -869,9 +837,9 @@ int32_t switch_keyboard_layout(const Arg *arg) {
xkb_layout_index_t next = (current + 1) % num_layouts; xkb_layout_index_t next = (current + 1) % num_layouts;
// 6. 应用新 keymap // 6. 应用新 keymap
uint32_t depressed = keyboard->modifiers.depressed; unsigned int depressed = keyboard->modifiers.depressed;
uint32_t latched = keyboard->modifiers.latched; unsigned int latched = keyboard->modifiers.latched;
uint32_t locked = keyboard->modifiers.locked; unsigned int locked = keyboard->modifiers.locked;
wlr_keyboard_set_keymap(keyboard, keyboard->keymap); wlr_keyboard_set_keymap(keyboard, keyboard->keymap);
wlr_keyboard_notify_modifiers(keyboard, depressed, latched, locked, next); wlr_keyboard_notify_modifiers(keyboard, depressed, latched, locked, next);
@@ -902,11 +870,11 @@ int32_t switch_keyboard_layout(const Arg *arg) {
return 0; return 0;
} }
int32_t switch_layout(const Arg *arg) { int switch_layout(const Arg *arg) {
int32_t jk, ji; int jk, ji;
char *target_layout_name = NULL; char *target_layout_name = NULL;
uint32_t len; unsigned int len;
if (config.circle_layout_count != 0) { if (config.circle_layout_count != 0) {
for (jk = 0; jk < config.circle_layout_count; jk++) { for (jk = 0; jk < config.circle_layout_count; jk++) {
@@ -938,7 +906,7 @@ int32_t switch_layout(const Arg *arg) {
} }
} }
clear_fullscreen_and_maximized_state(selmon); clear_fullscreen_and_maximized_state(selmon);
arrange(selmon, false, false); arrange(selmon, false);
printstatus(); printstatus();
return 0; return 0;
} }
@@ -949,7 +917,7 @@ int32_t switch_layout(const Arg *arg) {
selmon->pertag->ltidxs[selmon->pertag->curtag] = selmon->pertag->ltidxs[selmon->pertag->curtag] =
jk == LENGTH(layouts) - 1 ? &layouts[0] : &layouts[jk + 1]; jk == LENGTH(layouts) - 1 ? &layouts[0] : &layouts[jk + 1];
clear_fullscreen_and_maximized_state(selmon); clear_fullscreen_and_maximized_state(selmon);
arrange(selmon, false, false); arrange(selmon, false);
printstatus(); printstatus();
return 0; return 0;
} }
@@ -957,7 +925,7 @@ int32_t switch_layout(const Arg *arg) {
return 0; return 0;
} }
int32_t switch_proportion_preset(const Arg *arg) { int switch_proportion_preset(const Arg *arg) {
float target_proportion = 0; float target_proportion = 0;
if (config.scroller_proportion_preset_count == 0) { if (config.scroller_proportion_preset_count == 0) {
@@ -973,7 +941,7 @@ int32_t switch_proportion_preset(const Arg *arg) {
if (selmon->sel) { if (selmon->sel) {
for (int32_t i = 0; i < config.scroller_proportion_preset_count; i++) { for (int i = 0; i < config.scroller_proportion_preset_count; i++) {
if (config.scroller_proportion_preset[i] == if (config.scroller_proportion_preset[i] ==
selmon->sel->scroller_proportion) { selmon->sel->scroller_proportion) {
if (i == config.scroller_proportion_preset_count - 1) { if (i == config.scroller_proportion_preset_count - 1) {
@@ -991,23 +959,23 @@ int32_t switch_proportion_preset(const Arg *arg) {
target_proportion = config.scroller_proportion_preset[0]; target_proportion = config.scroller_proportion_preset[0];
} }
uint32_t max_client_width = unsigned int max_client_width =
selmon->w.width - 2 * scroller_structs - gappih; selmon->w.width - 2 * scroller_structs - gappih;
selmon->sel->scroller_proportion = target_proportion; selmon->sel->scroller_proportion = target_proportion;
selmon->sel->geom.width = max_client_width * target_proportion; selmon->sel->geom.width = max_client_width * target_proportion;
// resize(selmon->sel, selmon->sel->geom, 0); // resize(selmon->sel, selmon->sel->geom, 0);
arrange(selmon, false, false); arrange(selmon, false);
} }
return 0; return 0;
} }
int32_t tag(const Arg *arg) { int tag(const Arg *arg) {
Client *target_client = selmon->sel; Client *target_client = selmon->sel;
tag_client(arg, target_client); tag_client(arg, target_client);
return 0; return 0;
} }
int32_t tagmon(const Arg *arg) { int tagmon(const Arg *arg) {
Monitor *m = NULL, *cm = NULL; Monitor *m = NULL, *cm = NULL;
Client *c = focustop(selmon); Client *c = focustop(selmon);
@@ -1033,8 +1001,8 @@ int32_t tagmon(const Arg *arg) {
if (!m || !m->wlr_output->enabled) if (!m || !m->wlr_output->enabled)
return 0; return 0;
uint32_t newtags = arg->ui ? arg->ui : arg->i2 ? c->tags : 0; unsigned int newtags = arg->ui ? arg->ui : arg->i2 ? c->tags : 0;
uint32_t target; unsigned int target;
if (c->mon == m) { if (c->mon == m) {
view(&(Arg){.ui = newtags}, true); view(&(Arg){.ui = newtags}, true);
@@ -1051,11 +1019,11 @@ int32_t tagmon(const Arg *arg) {
reset_foreign_tolevel(c); reset_foreign_tolevel(c);
c->float_geom.width = c->float_geom.width =
(int32_t)(c->float_geom.width * c->mon->w.width / selmon->w.width); (int)(c->float_geom.width * c->mon->w.width / selmon->w.width);
c->float_geom.height = c->float_geom.height =
(int32_t)(c->float_geom.height * c->mon->w.height / selmon->w.height); (int)(c->float_geom.height * c->mon->w.height / selmon->w.height);
selmon = c->mon; selmon = c->mon;
c->float_geom = setclient_coordinate_center(c, c->mon, c->float_geom, 0, 0); c->float_geom = setclient_coordinate_center(c, c->float_geom, 0, 0);
// 重新计算居中的坐标 // 重新计算居中的坐标
// 重新计算居中的坐标 // 重新计算居中的坐标
@@ -1070,7 +1038,7 @@ int32_t tagmon(const Arg *arg) {
target = get_tags_first_tag(c->tags); target = get_tags_first_tag(c->tags);
view(&(Arg){.ui = target}, true); view(&(Arg){.ui = target}, true);
focusclient(c, 1); focusclient(c, 1);
arrange(selmon, false, false); arrange(selmon, false);
} }
if (warpcursor) { if (warpcursor) {
warp_cursor_to_selmon(c->mon); warp_cursor_to_selmon(c->mon);
@@ -1078,7 +1046,7 @@ int32_t tagmon(const Arg *arg) {
return 0; return 0;
} }
int32_t tagsilent(const Arg *arg) { int tagsilent(const Arg *arg) {
Client *fc = NULL; Client *fc = NULL;
Client *target_client = NULL; Client *target_client = NULL;
@@ -1094,11 +1062,11 @@ int32_t tagsilent(const Arg *arg) {
} }
} }
focusclient(focustop(selmon), 1); focusclient(focustop(selmon), 1);
arrange(target_client->mon, false, false); arrange(target_client->mon, false);
return 0; return 0;
} }
int32_t tagtoleft(const Arg *arg) { int tagtoleft(const Arg *arg) {
if (selmon->sel != NULL && if (selmon->sel != NULL &&
__builtin_popcount(selmon->tagset[selmon->seltags] & TAGMASK) == 1 && __builtin_popcount(selmon->tagset[selmon->seltags] & TAGMASK) == 1 &&
selmon->tagset[selmon->seltags] > 1) { selmon->tagset[selmon->seltags] > 1) {
@@ -1107,7 +1075,7 @@ int32_t tagtoleft(const Arg *arg) {
return 0; return 0;
} }
int32_t tagtoright(const Arg *arg) { int tagtoright(const Arg *arg) {
if (selmon->sel != NULL && if (selmon->sel != NULL &&
__builtin_popcount(selmon->tagset[selmon->seltags] & TAGMASK) == 1 && __builtin_popcount(selmon->tagset[selmon->seltags] & TAGMASK) == 1 &&
selmon->tagset[selmon->seltags] & (TAGMASK >> 1)) { selmon->tagset[selmon->seltags] & (TAGMASK >> 1)) {
@@ -1116,7 +1084,7 @@ int32_t tagtoright(const Arg *arg) {
return 0; return 0;
} }
int32_t toggle_named_scratchpad(const Arg *arg) { int toggle_named_scratchpad(const Arg *arg) {
Client *target_client = NULL; Client *target_client = NULL;
char *arg_id = arg->v; char *arg_id = arg->v;
char *arg_title = arg->v2; char *arg_title = arg->v2;
@@ -1135,13 +1103,13 @@ int32_t toggle_named_scratchpad(const Arg *arg) {
return 0; return 0;
} }
int32_t toggle_render_border(const Arg *arg) { int toggle_render_border(const Arg *arg) {
render_border = !render_border; render_border = !render_border;
arrange(selmon, false, false); arrange(selmon, false);
return 0; return 0;
} }
int32_t toggle_scratchpad(const Arg *arg) { int toggle_scratchpad(const Arg *arg) {
Client *c = NULL; Client *c = NULL;
bool hit = false; bool hit = false;
Client *tmp = NULL; Client *tmp = NULL;
@@ -1170,14 +1138,14 @@ int32_t toggle_scratchpad(const Arg *arg) {
return 0; return 0;
} }
int32_t togglefakefullscreen(const Arg *arg) { int togglefakefullscreen(const Arg *arg) {
Client *sel = focustop(selmon); Client *sel = focustop(selmon);
if (sel) if (sel)
setfakefullscreen(sel, !sel->isfakefullscreen); setfakefullscreen(sel, !sel->isfakefullscreen);
return 0; return 0;
} }
int32_t togglefloating(const Arg *arg) { int togglefloating(const Arg *arg) {
Client *sel = focustop(selmon); Client *sel = focustop(selmon);
if (selmon && selmon->isoverview) if (selmon && selmon->isoverview)
@@ -1196,7 +1164,7 @@ int32_t togglefloating(const Arg *arg) {
return 0; return 0;
} }
int32_t togglefullscreen(const Arg *arg) { int togglefullscreen(const Arg *arg) {
Client *sel = focustop(selmon); Client *sel = focustop(selmon);
if (!sel) if (!sel)
return 0; return 0;
@@ -1212,7 +1180,7 @@ int32_t togglefullscreen(const Arg *arg) {
return 0; return 0;
} }
int32_t toggleglobal(const Arg *arg) { int toggleglobal(const Arg *arg) {
if (!selmon->sel) if (!selmon->sel)
return 0; return 0;
if (selmon->sel->is_in_scratchpad) { if (selmon->sel->is_in_scratchpad) {
@@ -1228,13 +1196,13 @@ int32_t toggleglobal(const Arg *arg) {
return 0; return 0;
} }
int32_t togglegaps(const Arg *arg) { int togglegaps(const Arg *arg) {
enablegaps ^= 1; enablegaps ^= 1;
arrange(selmon, false, false); arrange(selmon, false);
return 0; return 0;
} }
int32_t togglemaximizescreen(const Arg *arg) { int togglemaximizescreen(const Arg *arg) {
Client *sel = focustop(selmon); Client *sel = focustop(selmon);
if (!sel) if (!sel)
return 0; return 0;
@@ -1252,7 +1220,7 @@ int32_t togglemaximizescreen(const Arg *arg) {
return 0; return 0;
} }
int32_t toggleoverlay(const Arg *arg) { int toggleoverlay(const Arg *arg) {
if (!selmon->sel || !selmon->sel->mon || selmon->sel->isfullscreen) { if (!selmon->sel || !selmon->sel->mon || selmon->sel->isfullscreen) {
return 0; return 0;
} }
@@ -1273,15 +1241,15 @@ int32_t toggleoverlay(const Arg *arg) {
return 0; return 0;
} }
int32_t toggletag(const Arg *arg) { int toggletag(const Arg *arg) {
uint32_t newtags; unsigned int newtags;
Client *sel = focustop(selmon); Client *sel = focustop(selmon);
if (!sel) if (!sel)
return 0; return 0;
if ((int32_t)arg->ui == INT_MIN && sel->tags != (~0 & TAGMASK)) { if ((int)arg->ui == INT_MIN && sel->tags != (~0 & TAGMASK)) {
newtags = ~0 & TAGMASK; newtags = ~0 & TAGMASK;
} else if ((int32_t)arg->ui == INT_MIN && sel->tags == (~0 & TAGMASK)) { } else if ((int)arg->ui == INT_MIN && sel->tags == (~0 & TAGMASK)) {
newtags = 1 << (sel->mon->pertag->curtag - 1); newtags = 1 << (sel->mon->pertag->curtag - 1);
} else { } else {
newtags = sel->tags ^ (arg->ui & TAGMASK); newtags = sel->tags ^ (arg->ui & TAGMASK);
@@ -1290,15 +1258,15 @@ int32_t toggletag(const Arg *arg) {
if (newtags) { if (newtags) {
sel->tags = newtags; sel->tags = newtags;
focusclient(focustop(selmon), 1); focusclient(focustop(selmon), 1);
arrange(selmon, false, false); arrange(selmon, false);
} }
printstatus(); printstatus();
return 0; return 0;
} }
int32_t toggleview(const Arg *arg) { int toggleview(const Arg *arg) {
uint32_t newtagset; unsigned int newtagset;
uint32_t target; unsigned int target;
target = arg->ui == 0 ? ~0 & TAGMASK : arg->ui; target = arg->ui == 0 ? ~0 & TAGMASK : arg->ui;
@@ -1308,14 +1276,14 @@ int32_t toggleview(const Arg *arg) {
if (newtagset) { if (newtagset) {
selmon->tagset[selmon->seltags] = newtagset; selmon->tagset[selmon->seltags] = newtagset;
focusclient(focustop(selmon), 1); focusclient(focustop(selmon), 1);
arrange(selmon, false, false); arrange(selmon, false);
} }
printstatus(); printstatus();
return 0; return 0;
} }
int32_t viewtoleft(const Arg *arg) { int viewtoleft(const Arg *arg) {
uint32_t target = selmon->tagset[selmon->seltags]; unsigned int target = selmon->tagset[selmon->seltags];
if (selmon->isoverview || selmon->pertag->curtag == 0) { if (selmon->isoverview || selmon->pertag->curtag == 0) {
return 0; return 0;
@@ -1334,11 +1302,11 @@ int32_t viewtoleft(const Arg *arg) {
return 0; return 0;
} }
int32_t viewtoright(const Arg *arg) { int viewtoright(const Arg *arg) {
if (selmon->isoverview || selmon->pertag->curtag == 0) { if (selmon->isoverview || selmon->pertag->curtag == 0) {
return 0; return 0;
} }
uint32_t target = selmon->tagset[selmon->seltags]; unsigned int target = selmon->tagset[selmon->seltags];
target <<= 1; target <<= 1;
if (!selmon || (target) == selmon->tagset[selmon->seltags]) if (!selmon || (target) == selmon->tagset[selmon->seltags])
@@ -1351,9 +1319,10 @@ int32_t viewtoright(const Arg *arg) {
return 0; return 0;
} }
int32_t viewtoleft_have_client(const Arg *arg) { int viewtoleft_have_client(const Arg *arg) {
uint32_t n; unsigned int n;
uint32_t current = get_tags_first_tag_num(selmon->tagset[selmon->seltags]); unsigned int current =
get_tags_first_tag_num(selmon->tagset[selmon->seltags]);
bool found = false; bool found = false;
if (selmon->isoverview) { if (selmon->isoverview) {
@@ -1375,9 +1344,10 @@ int32_t viewtoleft_have_client(const Arg *arg) {
return 0; return 0;
} }
int32_t viewtoright_have_client(const Arg *arg) { int viewtoright_have_client(const Arg *arg) {
uint32_t n; unsigned int n;
uint32_t current = get_tags_first_tag_num(selmon->tagset[selmon->seltags]); unsigned int current =
get_tags_first_tag_num(selmon->tagset[selmon->seltags]);
bool found = false; bool found = false;
if (selmon->isoverview) { if (selmon->isoverview) {
@@ -1399,13 +1369,13 @@ int32_t viewtoright_have_client(const Arg *arg) {
return 0; return 0;
} }
int32_t viewcrossmon(const Arg *arg) { int viewcrossmon(const Arg *arg) {
focusmon(&(Arg){.v = arg->v, .i = UNDIR}); focusmon(&(Arg){.v = arg->v, .i = UNDIR});
view_in_mon(arg, true, selmon, true); view_in_mon(arg, true, selmon, true);
return 0; return 0;
} }
int32_t tagcrossmon(const Arg *arg) { int tagcrossmon(const Arg *arg) {
if (!selmon->sel) if (!selmon->sel)
return 0; return 0;
@@ -1413,8 +1383,8 @@ int32_t tagcrossmon(const Arg *arg) {
return 0; return 0;
} }
int32_t comboview(const Arg *arg) { int comboview(const Arg *arg) {
uint32_t newtags = arg->ui & TAGMASK; unsigned int newtags = arg->ui & TAGMASK;
if (!newtags || !selmon) if (!newtags || !selmon)
return 0; return 0;
@@ -1422,7 +1392,7 @@ int32_t comboview(const Arg *arg) {
if (tag_combo) { if (tag_combo) {
selmon->tagset[selmon->seltags] |= newtags; selmon->tagset[selmon->seltags] |= newtags;
focusclient(focustop(selmon), 1); focusclient(focustop(selmon), 1);
arrange(selmon, false, false); arrange(selmon, false);
} else { } else {
tag_combo = true; tag_combo = true;
view(&(Arg){.ui = newtags}, false); view(&(Arg){.ui = newtags}, false);
@@ -1432,7 +1402,7 @@ int32_t comboview(const Arg *arg) {
return 0; return 0;
} }
int32_t zoom(const Arg *arg) { int zoom(const Arg *arg) {
Client *c = NULL, *sel = focustop(selmon); Client *c = NULL, *sel = focustop(selmon);
if (!sel || !selmon || if (!sel || !selmon ||
@@ -1461,18 +1431,18 @@ int32_t zoom(const Arg *arg) {
wl_list_insert(&clients, &sel->link); wl_list_insert(&clients, &sel->link);
focusclient(sel, 1); focusclient(sel, 1);
arrange(selmon, false, false); arrange(selmon, false);
return 0; return 0;
} }
int32_t setoption(const Arg *arg) { int setoption(const Arg *arg) {
parse_option(&config, arg->v, arg->v2); parse_option(&config, arg->v, arg->v2);
override_config(); override_config();
reset_option(); reset_option();
return 0; return 0;
} }
int32_t minimized(const Arg *arg) { int minimized(const Arg *arg) {
if (selmon && selmon->isoverview) if (selmon && selmon->isoverview)
return 0; return 0;
@@ -1483,7 +1453,7 @@ int32_t minimized(const Arg *arg) {
return 0; return 0;
} }
int32_t toggleoverview(const Arg *arg) { int toggleoverview(const Arg *arg) {
Client *c = NULL; Client *c = NULL;
if (selmon->isoverview && ov_tab_mode && arg->i != 1 && selmon->sel) { if (selmon->isoverview && ov_tab_mode && arg->i != 1 && selmon->sel) {
@@ -1492,8 +1462,8 @@ int32_t toggleoverview(const Arg *arg) {
} }
selmon->isoverview ^= 1; selmon->isoverview ^= 1;
uint32_t target; unsigned int target;
uint32_t visible_client_number = 0; unsigned int visible_client_number = 0;
if (selmon->isoverview) { if (selmon->isoverview) {
wl_list_for_each(c, &clients, link) if (c && c->mon == selmon && wl_list_for_each(c, &clients, link) if (c && c->mon == selmon &&
@@ -1541,7 +1511,7 @@ int32_t toggleoverview(const Arg *arg) {
return 0; return 0;
} }
int32_t disable_monitor(const Arg *arg) { int disable_monitor(const Arg *arg) {
Monitor *m = NULL; Monitor *m = NULL;
struct wlr_output_state state = {0}; struct wlr_output_state state = {0};
wl_list_for_each(m, &mons, link) { wl_list_for_each(m, &mons, link) {
@@ -1556,7 +1526,7 @@ int32_t disable_monitor(const Arg *arg) {
return 0; return 0;
} }
int32_t enable_monitor(const Arg *arg) { int enable_monitor(const Arg *arg) {
Monitor *m = NULL; Monitor *m = NULL;
struct wlr_output_state state = {0}; struct wlr_output_state state = {0};
wl_list_for_each(m, &mons, link) { wl_list_for_each(m, &mons, link) {
@@ -1571,7 +1541,7 @@ int32_t enable_monitor(const Arg *arg) {
return 0; return 0;
} }
int32_t toggle_monitor(const Arg *arg) { int toggle_monitor(const Arg *arg) {
Monitor *m = NULL; Monitor *m = NULL;
struct wlr_output_state state = {0}; struct wlr_output_state state = {0};
wl_list_for_each(m, &mons, link) { wl_list_for_each(m, &mons, link) {

44
src/ext-protocol/dwl-ipc.h
View File

@@ -1,11 +1,12 @@
#include "dwl-ipc-unstable-v2-protocol.h" #include "dwl-ipc-unstable-v2-protocol.h"
static void dwl_ipc_manager_bind(struct wl_client *client, void *data, static void dwl_ipc_manager_bind(struct wl_client *client, void *data,
uint32_t version, uint32_t id); unsigned int version, unsigned int id);
static void dwl_ipc_manager_destroy(struct wl_resource *resource); static void dwl_ipc_manager_destroy(struct wl_resource *resource);
static void dwl_ipc_manager_get_output(struct wl_client *client, static void dwl_ipc_manager_get_output(struct wl_client *client,
struct wl_resource *resource, struct wl_resource *resource,
uint32_t id, struct wl_resource *output); unsigned int id,
struct wl_resource *output);
static void dwl_ipc_manager_release(struct wl_client *client, static void dwl_ipc_manager_release(struct wl_client *client,
struct wl_resource *resource); struct wl_resource *resource);
static void dwl_ipc_output_destroy(struct wl_resource *resource); static void dwl_ipc_output_destroy(struct wl_resource *resource);
@@ -13,14 +14,15 @@ static void dwl_ipc_output_printstatus(Monitor *monitor);
static void dwl_ipc_output_printstatus_to(DwlIpcOutput *ipc_output); static void dwl_ipc_output_printstatus_to(DwlIpcOutput *ipc_output);
static void dwl_ipc_output_set_client_tags(struct wl_client *client, static void dwl_ipc_output_set_client_tags(struct wl_client *client,
struct wl_resource *resource, struct wl_resource *resource,
uint32_t and_tags, unsigned int and_tags,
uint32_t xor_tags); unsigned int xor_tags);
static void dwl_ipc_output_set_layout(struct wl_client *client, static void dwl_ipc_output_set_layout(struct wl_client *client,
struct wl_resource *resource, struct wl_resource *resource,
uint32_t index); unsigned int index);
static void dwl_ipc_output_set_tags(struct wl_client *client, static void dwl_ipc_output_set_tags(struct wl_client *client,
struct wl_resource *resource, struct wl_resource *resource,
uint32_t tagmask, uint32_t toggle_tagset); unsigned int tagmask,
unsigned int toggle_tagset);
static void dwl_ipc_output_quit(struct wl_client *client, static void dwl_ipc_output_quit(struct wl_client *client,
struct wl_resource *resource); struct wl_resource *resource);
static void dwl_ipc_output_dispatch(struct wl_client *client, static void dwl_ipc_output_dispatch(struct wl_client *client,
@@ -44,7 +46,7 @@ static struct zdwl_ipc_output_v2_interface dwl_output_implementation = {
.set_client_tags = dwl_ipc_output_set_client_tags}; .set_client_tags = dwl_ipc_output_set_client_tags};
void dwl_ipc_manager_bind(struct wl_client *client, void *data, void dwl_ipc_manager_bind(struct wl_client *client, void *data,
uint32_t version, uint32_t id) { unsigned int version, unsigned int id) {
struct wl_resource *manager_resource = struct wl_resource *manager_resource =
wl_resource_create(client, &zdwl_ipc_manager_v2_interface, version, id); wl_resource_create(client, &zdwl_ipc_manager_v2_interface, version, id);
if (!manager_resource) { if (!manager_resource) {
@@ -57,7 +59,7 @@ void dwl_ipc_manager_bind(struct wl_client *client, void *data,
zdwl_ipc_manager_v2_send_tags(manager_resource, LENGTH(tags)); zdwl_ipc_manager_v2_send_tags(manager_resource, LENGTH(tags));
for (uint32_t i = 0; i < LENGTH(layouts); i++) for (unsigned int i = 0; i < LENGTH(layouts); i++)
zdwl_ipc_manager_v2_send_layout(manager_resource, layouts[i].symbol); zdwl_ipc_manager_v2_send_layout(manager_resource, layouts[i].symbol);
} }
@@ -66,7 +68,7 @@ void dwl_ipc_manager_destroy(struct wl_resource *resource) {
} }
void dwl_ipc_manager_get_output(struct wl_client *client, void dwl_ipc_manager_get_output(struct wl_client *client,
struct wl_resource *resource, uint32_t id, struct wl_resource *resource, unsigned int id,
struct wl_resource *output) { struct wl_resource *output) {
DwlIpcOutput *ipc_output; DwlIpcOutput *ipc_output;
struct wlr_output *op = wlr_output_from_resource(output); struct wlr_output *op = wlr_output_from_resource(output);
@@ -99,20 +101,18 @@ static void dwl_ipc_output_destroy(struct wl_resource *resource) {
free(ipc_output); free(ipc_output);
} }
// 修改IPC输出函数，接受掩码参数
void dwl_ipc_output_printstatus(Monitor *monitor) { void dwl_ipc_output_printstatus(Monitor *monitor) {
DwlIpcOutput *ipc_output; DwlIpcOutput *ipc_output;
wl_list_for_each(ipc_output, &monitor->dwl_ipc_outputs, link) wl_list_for_each(ipc_output, &monitor->dwl_ipc_outputs, link)
dwl_ipc_output_printstatus_to(ipc_output); dwl_ipc_output_printstatus_to(ipc_output);
} }
// 修改主IPC输出函数，根据掩码发送相应事件
void dwl_ipc_output_printstatus_to(DwlIpcOutput *ipc_output) { void dwl_ipc_output_printstatus_to(DwlIpcOutput *ipc_output) {
Monitor *monitor = ipc_output->mon; Monitor *monitor = ipc_output->mon;
Client *c = NULL, *focused = NULL; Client *c = NULL, *focused = NULL;
struct wlr_keyboard *keyboard; struct wlr_keyboard *keyboard;
xkb_layout_index_t current; xkb_layout_index_t current;
int32_t tagmask, state, numclients, focused_client, tag; int tagmask, state, numclients, focused_client, tag;
const char *title, *appid, *symbol; const char *title, *appid, *symbol;
char kb_layout[32]; char kb_layout[32];
focused = focustop(monitor); focused = focustop(monitor);
@@ -216,11 +216,12 @@ void dwl_ipc_output_printstatus_to(DwlIpcOutput *ipc_output) {
void dwl_ipc_output_set_client_tags(struct wl_client *client, void dwl_ipc_output_set_client_tags(struct wl_client *client,
struct wl_resource *resource, struct wl_resource *resource,
uint32_t and_tags, uint32_t xor_tags) { unsigned int and_tags,
unsigned int xor_tags) {
DwlIpcOutput *ipc_output; DwlIpcOutput *ipc_output;
Monitor *monitor = NULL; Monitor *monitor = NULL;
Client *selected_client = NULL; Client *selected_client = NULL;
uint32_t newtags = 0; unsigned int newtags = 0;
ipc_output = wl_resource_get_user_data(resource); ipc_output = wl_resource_get_user_data(resource);
if (!ipc_output) if (!ipc_output)
@@ -238,12 +239,13 @@ void dwl_ipc_output_set_client_tags(struct wl_client *client,
selected_client->tags = newtags; selected_client->tags = newtags;
if (selmon == monitor) if (selmon == monitor)
focusclient(focustop(monitor), 1); focusclient(focustop(monitor), 1);
arrange(selmon, false, false); arrange(selmon, false);
printstatus(); printstatus();
} }
void dwl_ipc_output_set_layout(struct wl_client *client, void dwl_ipc_output_set_layout(struct wl_client *client,
struct wl_resource *resource, uint32_t index) { struct wl_resource *resource,
unsigned int index) {
DwlIpcOutput *ipc_output; DwlIpcOutput *ipc_output;
Monitor *monitor = NULL; Monitor *monitor = NULL;
@@ -257,16 +259,16 @@ void dwl_ipc_output_set_layout(struct wl_client *client,
monitor->pertag->ltidxs[monitor->pertag->curtag] = &layouts[index]; monitor->pertag->ltidxs[monitor->pertag->curtag] = &layouts[index];
clear_fullscreen_and_maximized_state(monitor); clear_fullscreen_and_maximized_state(monitor);
arrange(monitor, false, false); arrange(monitor, false);
printstatus(); printstatus();
} }
void dwl_ipc_output_set_tags(struct wl_client *client, void dwl_ipc_output_set_tags(struct wl_client *client,
struct wl_resource *resource, uint32_t tagmask, struct wl_resource *resource, unsigned int tagmask,
uint32_t toggle_tagset) { unsigned int toggle_tagset) {
DwlIpcOutput *ipc_output; DwlIpcOutput *ipc_output;
Monitor *monitor = NULL; Monitor *monitor = NULL;
uint32_t newtags = tagmask & TAGMASK; unsigned int newtags = tagmask & TAGMASK;
ipc_output = wl_resource_get_user_data(resource); ipc_output = wl_resource_get_user_data(resource);
if (!ipc_output) if (!ipc_output)
@@ -287,7 +289,7 @@ void dwl_ipc_output_dispatch(struct wl_client *client,
const char *arg3, const char *arg4, const char *arg3, const char *arg4,
const char *arg5) { const char *arg5) {
int32_t (*func)(const Arg *); int (*func)(const Arg *);
Arg arg; Arg arg;
func = parse_func_name((char *)dispatch, &arg, (char *)arg1, (char *)arg2, func = parse_func_name((char *)dispatch, &arg, (char *)arg1, (char *)arg2,
(char *)arg3, (char *)arg4, (char *)arg5); (char *)arg3, (char *)arg4, (char *)arg5);

20
src/ext-protocol/ext-workspace.h
View File

@@ -1,14 +1,14 @@
#include "wlr_ext_workspace_v1.h" #include "wlr_ext_workspace_v1.h"
#define EXT_WORKSPACE_ENABLE_CAPS \ #define EXT_WORKSPACE_ENABLE_CAPS \
EXT_WORKSPACE_HANDLE_V1_WORKSPACE_CAPABILITIES_ACTIVATE | \ WLR_EXT_WORKSPACE_HANDLE_V1_CAP_ACTIVATE | \
EXT_WORKSPACE_HANDLE_V1_WORKSPACE_CAPABILITIES_DEACTIVATE WLR_EXT_WORKSPACE_HANDLE_V1_CAP_DEACTIVATE
typedef struct Monitor Monitor; typedef struct Monitor Monitor;
struct workspace { struct workspace {
struct wl_list link; // Link in global workspaces list struct wl_list link; // Link in global workspaces list
uint32_t tag; // Numeric identifier (1-9, 0=overview) unsigned int tag; // Numeric identifier (1-9, 0=overview)
Monitor *m; // Associated monitor Monitor *m; // Associated monitor
struct wlr_ext_workspace_handle_v1 *ext_workspace; // Protocol object struct wlr_ext_workspace_handle_v1 *ext_workspace; // Protocol object
/* Event listeners */ /* Event listeners */
@@ -22,7 +22,7 @@ struct wlr_ext_workspace_manager_v1 *ext_manager;
struct wl_list workspaces; struct wl_list workspaces;
void goto_workspace(struct workspace *target) { void goto_workspace(struct workspace *target) {
uint32_t tag; unsigned int tag;
tag = 1 << (target->tag - 1); tag = 1 << (target->tag - 1);
if (target->tag == 0) { if (target->tag == 0) {
toggleoverview(&(Arg){.i = -1}); toggleoverview(&(Arg){.i = -1});
@@ -33,7 +33,7 @@ void goto_workspace(struct workspace *target) {
} }
void toggle_workspace(struct workspace *target) { void toggle_workspace(struct workspace *target) {
uint32_t tag; unsigned int tag;
tag = 1 << (target->tag - 1); tag = 1 << (target->tag - 1);
if (target->tag == 0) { if (target->tag == 0) {
toggleview(&(Arg){.i = -1}); toggleview(&(Arg){.i = -1});
@@ -69,7 +69,7 @@ static void handle_ext_workspace_deactivate(struct wl_listener *listener,
wlr_log(WLR_INFO, "ext deactivating workspace %d", workspace->tag); wlr_log(WLR_INFO, "ext deactivating workspace %d", workspace->tag);
} }
static const char *get_name_from_tag(uint32_t tag) { static const char *get_name_from_tag(unsigned int tag) {
static const char *names[] = {"overview", "1", "2", "3", "4", static const char *names[] = {"overview", "1", "2", "3", "4",
"5", "6", "7", "8", "9"}; "5", "6", "7", "8", "9"};
return (tag < sizeof(names) / sizeof(names[0])) ? names[tag] : NULL; return (tag < sizeof(names) / sizeof(names[0])) ? names[tag] : NULL;
@@ -92,7 +92,7 @@ void cleanup_workspaces_by_monitor(Monitor *m) {
} }
} }
static void remove_workspace_by_tag(uint32_t tag, Monitor *m) { static void remove_workspace_by_tag(unsigned int tag, Monitor *m) {
struct workspace *workspace, *tmp; struct workspace *workspace, *tmp;
wl_list_for_each_safe(workspace, tmp, &workspaces, link) { wl_list_for_each_safe(workspace, tmp, &workspaces, link) {
if (workspace->tag == tag && workspace->m == m) { if (workspace->tag == tag && workspace->m == m) {
@@ -102,7 +102,7 @@ static void remove_workspace_by_tag(uint32_t tag, Monitor *m) {
} }
} }
static void add_workspace_by_tag(int32_t tag, Monitor *m) { static void add_workspace_by_tag(int tag, Monitor *m) {
const char *name = get_name_from_tag(tag); const char *name = get_name_from_tag(tag);
struct workspace *workspace = ecalloc(1, sizeof(*workspace)); struct workspace *workspace = ecalloc(1, sizeof(*workspace));
@@ -127,7 +127,7 @@ static void add_workspace_by_tag(int32_t tag, Monitor *m) {
void dwl_ext_workspace_printstatus(Monitor *m) { void dwl_ext_workspace_printstatus(Monitor *m) {
struct workspace *w; struct workspace *w;
uint32_t tag_status = 0; unsigned int tag_status = 0;
wl_list_for_each(w, &workspaces, link) { wl_list_for_each(w, &workspaces, link) {
if (w && w->m == m) { if (w && w->m == m) {
@@ -162,7 +162,7 @@ void dwl_ext_workspace_printstatus(Monitor *m) {
} }
void refresh_monitors_workspaces_status(Monitor *m) { void refresh_monitors_workspaces_status(Monitor *m) {
int32_t i; int i;
if (m->isoverview) { if (m->isoverview) {
for (i = 1; i <= LENGTH(tags); i++) { for (i = 1; i <= LENGTH(tags); i++) {

78
src/ext-protocol/foreign-toplevel.h
View File

@@ -4,101 +4,53 @@ static struct wlr_foreign_toplevel_manager_v1 *foreign_toplevel_manager;
void handle_foreign_activate_request(struct wl_listener *listener, void *data) { void handle_foreign_activate_request(struct wl_listener *listener, void *data) {
Client *c = wl_container_of(listener, c, foreign_activate_request); Client *c = wl_container_of(listener, c, foreign_activate_request);
uint32_t target; unsigned int target;
if (c->swallowing) if (c && c->swallowing)
return; return;
if (c && !c->isminimized && c == selmon->sel) {
set_minimized(c);
return;
}
if (c->isminimized) { if (c->isminimized) {
c->is_in_scratchpad = 0; c->is_in_scratchpad = 0;
c->isnamedscratchpad = 0; c->isnamedscratchpad = 0;
c->is_scratchpad_show = 0; c->is_scratchpad_show = 0;
setborder_color(c); setborder_color(c);
show_hide_client(c); show_hide_client(c);
arrange(c->mon, true, false); arrange(c->mon, true);
return; return;
} }
target = get_tags_first_tag(c->tags); target = get_tags_first_tag(c->tags);
view_in_mon(&(Arg){.ui = target}, true, c->mon, true); view_in_mon(&(Arg){.ui = target}, true, c->mon, true);
focusclient(c, 1); focusclient(c, 1);
} wlr_foreign_toplevel_handle_v1_set_activated(c->foreign_toplevel, true);
void handle_foreign_maximize_request(struct wl_listener *listener, void *data) {
Client *c = wl_container_of(listener, c, foreign_maximize_request);
struct wlr_foreign_toplevel_handle_v1_maximized_event *event = data;
if (c->swallowing)
return;
if (c->ismaximizescreen && !event->maximized) {
setmaximizescreen(c, 0);
return;
}
if (!c->ismaximizescreen && event->maximized) {
setmaximizescreen(c, 1);
return;
}
}
void handle_foreign_minimize_request(struct wl_listener *listener, void *data) {
Client *c = wl_container_of(listener, c, foreign_minimize_request);
struct wlr_foreign_toplevel_handle_v1_minimized_event *event = data;
if (c->swallowing)
return;
if (!c->isminimized && event->minimized) {
set_minimized(c);
return;
}
if (c->isminimized && !event->minimized) {
c->is_in_scratchpad = 0;
c->isnamedscratchpad = 0;
c->is_scratchpad_show = 0;
setborder_color(c);
show_hide_client(c);
arrange(c->mon, true, false);
return;
}
} }
void handle_foreign_fullscreen_request(struct wl_listener *listener, void handle_foreign_fullscreen_request(struct wl_listener *listener,
void *data) { void *data) {
Client *c = wl_container_of(listener, c, foreign_fullscreen_request);
struct wlr_foreign_toplevel_handle_v1_fullscreen_event *event = data;
if (c->swallowing)
return; return;
if (c->isfullscreen && !event->fullscreen) {
setfullscreen(c, 0);
return;
}
if (!c->isfullscreen && event->fullscreen) {
setfullscreen(c, 1);
return;
}
} }
void handle_foreign_close_request(struct wl_listener *listener, void *data) { void handle_foreign_close_request(struct wl_listener *listener, void *data) {
Client *c = wl_container_of(listener, c, foreign_close_request); Client *c = wl_container_of(listener, c, foreign_close_request);
if (c) {
pending_kill_client(c); pending_kill_client(c);
} }
}
void handle_foreign_destroy(struct wl_listener *listener, void *data) { void handle_foreign_destroy(struct wl_listener *listener, void *data) {
Client *c = wl_container_of(listener, c, foreign_destroy); Client *c = wl_container_of(listener, c, foreign_destroy);
if (c) {
wl_list_remove(&c->foreign_activate_request.link); wl_list_remove(&c->foreign_activate_request.link);
wl_list_remove(&c->foreign_minimize_request.link);
wl_list_remove(&c->foreign_maximize_request.link);
wl_list_remove(&c->foreign_fullscreen_request.link); wl_list_remove(&c->foreign_fullscreen_request.link);
wl_list_remove(&c->foreign_close_request.link); wl_list_remove(&c->foreign_close_request.link);
wl_list_remove(&c->foreign_destroy.link); wl_list_remove(&c->foreign_destroy.link);
} }
}
void remove_foreign_topleve(Client *c) { void remove_foreign_topleve(Client *c) {
wlr_foreign_toplevel_handle_v1_destroy(c->foreign_toplevel); wlr_foreign_toplevel_handle_v1_destroy(c->foreign_toplevel);
@@ -115,10 +67,6 @@ void add_foreign_toplevel(Client *c) {
if (c->foreign_toplevel) { if (c->foreign_toplevel) {
LISTEN(&(c->foreign_toplevel->events.request_activate), LISTEN(&(c->foreign_toplevel->events.request_activate),
&c->foreign_activate_request, handle_foreign_activate_request); &c->foreign_activate_request, handle_foreign_activate_request);
LISTEN(&(c->foreign_toplevel->events.request_minimize),
&c->foreign_minimize_request, handle_foreign_minimize_request);
LISTEN(&(c->foreign_toplevel->events.request_maximize),
&c->foreign_maximize_request, handle_foreign_maximize_request);
LISTEN(&(c->foreign_toplevel->events.request_fullscreen), LISTEN(&(c->foreign_toplevel->events.request_fullscreen),
&c->foreign_fullscreen_request, &c->foreign_fullscreen_request,
handle_foreign_fullscreen_request); handle_foreign_fullscreen_request);

5
src/ext-protocol/tearing.h
View File

@@ -13,10 +13,7 @@ static void handle_controller_set_hint(struct wl_listener *listener,
void *data) { void *data) {
struct tearing_controller *controller = struct tearing_controller *controller =
wl_container_of(listener, controller, set_hint); wl_container_of(listener, controller, set_hint);
Client *c = NULL; Client *c = get_client_from_surface(controller->tearing_control->surface);
toplevel_from_wlr_surface(controller->tearing_control->surface, &c, NULL);
if (c) { if (c) {
/* /*
* tearing_control->current is actually an enum: * tearing_control->current is actually an enum:

4
src/ext-protocol/text-input.h
View File

@@ -77,7 +77,7 @@ Monitor *output_from_wlr_output(struct wlr_output *wlr_output) {
return NULL; return NULL;
} }
Monitor *output_nearest_to(int32_t lx, int32_t ly) { Monitor *output_nearest_to(int lx, int ly) {
double closest_x, closest_y; double closest_x, closest_y;
wlr_output_layout_closest_point(output_layout, NULL, lx, ly, &closest_x, wlr_output_layout_closest_point(output_layout, NULL, lx, ly, &closest_x,
&closest_y); &closest_y);
@@ -225,7 +225,7 @@ static void update_popup_position(struct dwl_input_method_popup *popup) {
Monitor *output = NULL; Monitor *output = NULL;
struct wlr_xdg_positioner_rules pointer_rules; struct wlr_xdg_positioner_rules pointer_rules;
struct wlr_box output_box; struct wlr_box output_box;
int32_t lx, ly; int lx, ly;
struct wlr_box popup_box; struct wlr_box popup_box;
if (!text_input || !relay->focused_surface || if (!text_input || !relay->focused_surface ||

476
src/ext-protocol/wlr_ext_workspace_v1.c
View File

@@ -29,7 +29,7 @@ struct wlr_ext_workspace_v1_request {
// ACTIVATE / DEACTIVATE / ASSIGN / REMOVE // ACTIVATE / DEACTIVATE / ASSIGN / REMOVE
struct wlr_ext_workspace_handle_v1 *workspace; struct wlr_ext_workspace_handle_v1 *workspace;
struct wl_list link; // wlr_ext_workspace_manager_v1_resource.requests struct wl_list link; // wlr_ext_workspace_manager_client_v1.requests
}; };
struct wlr_ext_workspace_v1_group_output { struct wlr_ext_workspace_v1_group_output {
@@ -41,40 +41,33 @@ struct wlr_ext_workspace_v1_group_output {
}; };
// These structs wrap wl_resource of each interface to access the request queue // These structs wrap wl_resource of each interface to access the request queue
// (wlr_ext_workspace_manager_v1_resource.requests) assigned per manager // (wlr_ext_workspace_manager_client_v1.requests) assigned per manager resource
// resource
struct wlr_ext_workspace_manager_v1_resource { struct wlr_ext_workspace_manager_client_v1 {
struct wl_resource *resource; struct wl_resource *resource;
struct wlr_ext_workspace_manager_v1 *manager; struct wlr_ext_workspace_manager_v1 *manager;
struct wl_list requests; // wlr_ext_workspace_v1_request.link struct wl_list requests; // wlr_ext_workspace_v1_request.link
struct wl_list workspace_resources; // wlr_ext_workspace_v1_resource.link struct wl_list link; // wlr_ext_workspace_manager_v1.clients
struct wl_list group_resources; // wlr_ext_workspace_group_v1_resource.link
struct wl_list link; // wlr_ext_workspace_manager_v1.resources
}; };
struct wlr_ext_workspace_group_v1_resource { struct wlr_ext_workspace_group_client_v1 {
struct wl_resource *resource; struct wl_resource *resource;
struct wlr_ext_workspace_group_handle_v1 *group; struct wlr_ext_workspace_group_handle_v1 *group;
struct wlr_ext_workspace_manager_v1_resource *manager; struct wlr_ext_workspace_manager_client_v1 *manager;
struct wl_list link; // wlr_ext_workspace_group_v1.resources struct wl_list link; // wlr_ext_workspace_group_v1.clients
struct wl_list
manager_resource_link; // wlr_ext_workspace_manager_v1_resource.group_resources
}; };
struct wlr_ext_workspace_v1_resource { struct wlr_ext_workspace_client_v1 {
struct wl_resource *resource; struct wl_resource *resource;
struct wlr_ext_workspace_handle_v1 *workspace; struct wlr_ext_workspace_handle_v1 *workspace;
struct wlr_ext_workspace_manager_v1_resource *manager; struct wlr_ext_workspace_manager_client_v1 *manager;
struct wl_list link; // wlr_ext_workspace_v1.resources struct wl_list link; // wlr_ext_workspace_v1.clients
struct wl_list
manager_resource_link; // wlr_ext_workspace_manager_v1_resource.workspace_resources
}; };
static const struct ext_workspace_group_handle_v1_interface group_impl; static const struct ext_workspace_group_handle_v1_interface group_impl;
static struct wlr_ext_workspace_group_v1_resource * static struct wlr_ext_workspace_group_client_v1 *
group_resource_from_resource(struct wl_resource *resource) { group_client_from_resource(struct wl_resource *resource) {
assert(wl_resource_instance_of( assert(wl_resource_instance_of(
resource, &ext_workspace_group_handle_v1_interface, &group_impl)); resource, &ext_workspace_group_handle_v1_interface, &group_impl));
return wl_resource_get_user_data(resource); return wl_resource_get_user_data(resource);
@@ -82,8 +75,8 @@ group_resource_from_resource(struct wl_resource *resource) {
static const struct ext_workspace_handle_v1_interface workspace_impl; static const struct ext_workspace_handle_v1_interface workspace_impl;
static struct wlr_ext_workspace_v1_resource * static struct wlr_ext_workspace_client_v1 *
workspace_resource_from_resource(struct wl_resource *resource) { workspace_client_from_resource(struct wl_resource *resource) {
assert(wl_resource_instance_of(resource, &ext_workspace_handle_v1_interface, assert(wl_resource_instance_of(resource, &ext_workspace_handle_v1_interface,
&workspace_impl)); &workspace_impl));
return wl_resource_get_user_data(resource); return wl_resource_get_user_data(resource);
@@ -91,8 +84,8 @@ workspace_resource_from_resource(struct wl_resource *resource) {
static const struct ext_workspace_manager_v1_interface manager_impl; static const struct ext_workspace_manager_v1_interface manager_impl;
static struct wlr_ext_workspace_manager_v1_resource * static struct wlr_ext_workspace_manager_client_v1 *
manager_resource_from_resource(struct wl_resource *resource) { manager_client_from_resource(struct wl_resource *resource) {
assert(wl_resource_instance_of( assert(wl_resource_instance_of(
resource, &ext_workspace_manager_v1_interface, &manager_impl)); resource, &ext_workspace_manager_v1_interface, &manager_impl));
return wl_resource_get_user_data(resource); return wl_resource_get_user_data(resource);
@@ -105,9 +98,9 @@ static void workspace_handle_destroy(struct wl_client *client,
static void workspace_handle_activate(struct wl_client *client, static void workspace_handle_activate(struct wl_client *client,
struct wl_resource *workspace_resource) { struct wl_resource *workspace_resource) {
struct wlr_ext_workspace_v1_resource *workspace_res = struct wlr_ext_workspace_client_v1 *workspace =
workspace_resource_from_resource(workspace_resource); workspace_client_from_resource(workspace_resource);
if (!workspace_res) { if (!workspace) {
return; return;
} }
@@ -117,16 +110,16 @@ static void workspace_handle_activate(struct wl_client *client,
return; return;
} }
req->type = WLR_EXT_WORKSPACE_V1_REQUEST_ACTIVATE; req->type = WLR_EXT_WORKSPACE_V1_REQUEST_ACTIVATE;
req->workspace = workspace_res->workspace; req->workspace = workspace->workspace;
wl_list_insert(workspace_res->manager->requests.prev, &req->link); wl_list_insert(workspace->manager->requests.prev, &req->link);
} }
static void static void
workspace_handle_deactivate(struct wl_client *client, workspace_handle_deactivate(struct wl_client *client,
struct wl_resource *workspace_resource) { struct wl_resource *workspace_resource) {
struct wlr_ext_workspace_v1_resource *workspace_res = struct wlr_ext_workspace_client_v1 *workspace =
workspace_resource_from_resource(workspace_resource); workspace_client_from_resource(workspace_resource);
if (!workspace_res) { if (!workspace) {
return; return;
} }
@@ -136,18 +129,18 @@ workspace_handle_deactivate(struct wl_client *client,
return; return;
} }
req->type = WLR_EXT_WORKSPACE_V1_REQUEST_DEACTIVATE; req->type = WLR_EXT_WORKSPACE_V1_REQUEST_DEACTIVATE;
req->workspace = workspace_res->workspace; req->workspace = workspace->workspace;
wl_list_insert(workspace_res->manager->requests.prev, &req->link); wl_list_insert(workspace->manager->requests.prev, &req->link);
} }
static void workspace_handle_assign(struct wl_client *client, static void workspace_handle_assign(struct wl_client *client,
struct wl_resource *workspace_resource, struct wl_resource *workspace_resource,
struct wl_resource *group_resource) { struct wl_resource *group_resource) {
struct wlr_ext_workspace_v1_resource *workspace_res = struct wlr_ext_workspace_client_v1 *workspace =
workspace_resource_from_resource(workspace_resource); workspace_client_from_resource(workspace_resource);
struct wlr_ext_workspace_group_v1_resource *group_res = struct wlr_ext_workspace_group_client_v1 *group =
group_resource_from_resource(group_resource); group_client_from_resource(group_resource);
if (!workspace_res || !group_res) { if (!workspace || !group) {
return; return;
} }
@@ -157,16 +150,16 @@ static void workspace_handle_assign(struct wl_client *client,
return; return;
} }
req->type = WLR_EXT_WORKSPACE_V1_REQUEST_ASSIGN; req->type = WLR_EXT_WORKSPACE_V1_REQUEST_ASSIGN;
req->group = group_res->group; req->group = group->group;
req->workspace = workspace_res->workspace; req->workspace = workspace->workspace;
wl_list_insert(workspace_res->manager->requests.prev, &req->link); wl_list_insert(workspace->manager->requests.prev, &req->link);
} }
static void workspace_handle_remove(struct wl_client *client, static void workspace_handle_remove(struct wl_client *client,
struct wl_resource *workspace_resource) { struct wl_resource *workspace_resource) {
struct wlr_ext_workspace_v1_resource *workspace_res = struct wlr_ext_workspace_client_v1 *workspace =
workspace_resource_from_resource(workspace_resource); workspace_client_from_resource(workspace_resource);
if (!workspace_res) { if (!workspace) {
return; return;
} }
@@ -176,8 +169,8 @@ static void workspace_handle_remove(struct wl_client *client,
return; return;
} }
req->type = WLR_EXT_WORKSPACE_V1_REQUEST_REMOVE; req->type = WLR_EXT_WORKSPACE_V1_REQUEST_REMOVE;
req->workspace = workspace_res->workspace; req->workspace = workspace->workspace;
wl_list_insert(workspace_res->manager->requests.prev, &req->link); wl_list_insert(workspace->manager->requests.prev, &req->link);
} }
static const struct ext_workspace_handle_v1_interface workspace_impl = { static const struct ext_workspace_handle_v1_interface workspace_impl = {
@@ -191,9 +184,9 @@ static const struct ext_workspace_handle_v1_interface workspace_impl = {
static void group_handle_create_workspace(struct wl_client *client, static void group_handle_create_workspace(struct wl_client *client,
struct wl_resource *group_resource, struct wl_resource *group_resource,
const char *name) { const char *name) {
struct wlr_ext_workspace_group_v1_resource *group_res = struct wlr_ext_workspace_group_client_v1 *group =
group_resource_from_resource(group_resource); group_client_from_resource(group_resource);
if (!group_res) { if (!group) {
return; return;
} }
@@ -202,15 +195,9 @@ static void group_handle_create_workspace(struct wl_client *client,
wl_resource_post_no_memory(group_resource); wl_resource_post_no_memory(group_resource);
return; return;
} }
req->name = strdup(name);
if (!req->name) {
free(req);
wl_resource_post_no_memory(group_resource);
return;
}
req->type = WLR_EXT_WORKSPACE_V1_REQUEST_CREATE_WORKSPACE; req->type = WLR_EXT_WORKSPACE_V1_REQUEST_CREATE_WORKSPACE;
req->group = group_res->group; req->group = group->group;
wl_list_insert(group_res->manager->requests.prev, &req->link); wl_list_insert(group->manager->requests.prev, &req->link);
} }
static void group_handle_destroy(struct wl_client *client, static void group_handle_destroy(struct wl_client *client,
@@ -223,94 +210,89 @@ static const struct ext_workspace_group_handle_v1_interface group_impl = {
.destroy = group_handle_destroy, .destroy = group_handle_destroy,
}; };
static void destroy_workspace_resource( static void
struct wlr_ext_workspace_v1_resource *workspace_res) { destroy_workspace_client(struct wlr_ext_workspace_client_v1 *workspace_client) {
wl_list_remove(&workspace_res->link); wl_list_remove(&workspace_client->link);
wl_list_remove(&workspace_res->manager_resource_link); wl_resource_set_user_data(workspace_client->resource, NULL);
wl_resource_set_user_data(workspace_res->resource, NULL); free(workspace_client);
free(workspace_res);
} }
static void workspace_resource_destroy(struct wl_resource *resource) { static void workspace_resource_destroy(struct wl_resource *resource) {
struct wlr_ext_workspace_v1_resource *workspace_res = struct wlr_ext_workspace_client_v1 *workspace_client =
workspace_resource_from_resource(resource); workspace_client_from_resource(resource);
if (workspace_res) { if (workspace_client) {
destroy_workspace_resource(workspace_res); destroy_workspace_client(workspace_client);
} }
} }
static struct wlr_ext_workspace_v1_resource *create_workspace_resource( static struct wlr_ext_workspace_client_v1 *create_workspace_client(
struct wlr_ext_workspace_handle_v1 *workspace, struct wlr_ext_workspace_handle_v1 *workspace,
struct wlr_ext_workspace_manager_v1_resource *manager_res) { struct wlr_ext_workspace_manager_client_v1 *manager_client) {
struct wlr_ext_workspace_v1_resource *workspace_res = struct wlr_ext_workspace_client_v1 *workspace_client =
calloc(1, sizeof(*workspace_res)); calloc(1, sizeof(*workspace_client));
if (!workspace_res) { if (!workspace_client) {
return NULL; return NULL;
} }
struct wl_client *client = wl_resource_get_client(manager_res->resource); struct wl_client *client = wl_resource_get_client(manager_client->resource);
workspace_res->resource = workspace_client->resource = wl_resource_create(
wl_resource_create(client, &ext_workspace_handle_v1_interface, client, &ext_workspace_handle_v1_interface,
wl_resource_get_version(manager_res->resource), 0); wl_resource_get_version(manager_client->resource), 0);
if (!workspace_res->resource) { if (!workspace_client->resource) {
free(workspace_res); free(workspace_client);
return NULL; return NULL;
} }
wl_resource_set_implementation(workspace_res->resource, &workspace_impl, wl_resource_set_implementation(workspace_client->resource, &workspace_impl,
workspace_res, workspace_resource_destroy); workspace_client,
workspace_resource_destroy);
workspace_res->workspace = workspace; workspace_client->workspace = workspace;
workspace_res->manager = manager_res; workspace_client->manager = manager_client;
wl_list_insert(&workspace->resources, &workspace_res->link); wl_list_insert(&workspace->clients, &workspace_client->link);
wl_list_insert(&manager_res->workspace_resources,
&workspace_res->manager_resource_link);
return workspace_res; return workspace_client;
} }
static void static void
destroy_group_resource(struct wlr_ext_workspace_group_v1_resource *group_res) { destroy_group_client(struct wlr_ext_workspace_group_client_v1 *group_client) {
wl_list_remove(&group_res->link); wl_list_remove(&group_client->link);
wl_list_remove(&group_res->manager_resource_link); wl_resource_set_user_data(group_client->resource, NULL);
wl_resource_set_user_data(group_res->resource, NULL); free(group_client);
free(group_res);
} }
static void group_handle_resource_destroy(struct wl_resource *resource) { static void group_handle_resource_destroy(struct wl_resource *resource) {
struct wlr_ext_workspace_group_v1_resource *group_res = struct wlr_ext_workspace_group_client_v1 *group_client =
group_resource_from_resource(resource); group_client_from_resource(resource);
if (group_res) { if (group_client) {
destroy_group_resource(group_res); destroy_group_client(group_client);
} }
} }
static struct wlr_ext_workspace_group_v1_resource *create_group_resource( static struct wlr_ext_workspace_group_client_v1 *create_group_client(
struct wlr_ext_workspace_group_handle_v1 *group, struct wlr_ext_workspace_group_handle_v1 *group,
struct wlr_ext_workspace_manager_v1_resource *manager_res) { struct wlr_ext_workspace_manager_client_v1 *manager_client) {
struct wlr_ext_workspace_group_v1_resource *group_res = struct wlr_ext_workspace_group_client_v1 *group_client =
calloc(1, sizeof(*group_res)); calloc(1, sizeof(*group_client));
if (!group_res) { if (!group_client) {
return NULL; return NULL;
} }
struct wl_client *client = wl_resource_get_client(manager_res->resource); struct wl_client *client = wl_resource_get_client(manager_client->resource);
uint32_t version = wl_resource_get_version(manager_res->resource); uint32_t version = wl_resource_get_version(manager_client->resource);
group_res->resource = wl_resource_create( group_client->resource = wl_resource_create(
client, &ext_workspace_group_handle_v1_interface, version, 0); client, &ext_workspace_group_handle_v1_interface, version, 0);
if (group_res->resource == NULL) { if (group_client->resource == NULL) {
free(group_res); free(group_client);
return NULL; return NULL;
} }
wl_resource_set_implementation(group_res->resource, &group_impl, group_res, wl_resource_set_implementation(group_client->resource, &group_impl,
group_handle_resource_destroy); group_client, group_handle_resource_destroy);
group_res->group = group; group_client->group = group;
group_res->manager = manager_res; group_client->manager = manager_client;
wl_list_insert(&group->resources, &group_res->link); wl_list_insert(&group->clients, &group_client->link);
wl_list_insert(&manager_res->group_resources,
&group_res->manager_resource_link);
return group_res; return group_client;
} }
static void destroy_request(struct wlr_ext_workspace_v1_request *req) { static void destroy_request(struct wlr_ext_workspace_v1_request *req) {
@@ -321,22 +303,18 @@ static void destroy_request(struct wlr_ext_workspace_v1_request *req) {
static void manager_handle_commit(struct wl_client *client, static void manager_handle_commit(struct wl_client *client,
struct wl_resource *resource) { struct wl_resource *resource) {
struct wlr_ext_workspace_manager_v1_resource *manager_res = struct wlr_ext_workspace_manager_client_v1 *manager =
manager_resource_from_resource(resource); manager_client_from_resource(resource);
if (!manager_res) { if (!manager) {
return; return;
} }
struct wlr_ext_workspace_v1_request *req, *tmp; struct wlr_ext_workspace_v1_request *req, *tmp;
wl_list_for_each_safe(req, tmp, &manager_res->requests, link) { wl_list_for_each_safe(req, tmp, &manager->requests, link) {
switch (req->type) { switch (req->type) {
case WLR_EXT_WORKSPACE_V1_REQUEST_CREATE_WORKSPACE:; case WLR_EXT_WORKSPACE_V1_REQUEST_CREATE_WORKSPACE:
struct wlr_ext_workspace_group_handle_v1_create_workspace_event
event = {
.name = req->name,
};
wl_signal_emit_mutable(&req->group->events.create_workspace, wl_signal_emit_mutable(&req->group->events.create_workspace,
&event); req->name);
break; break;
case WLR_EXT_WORKSPACE_V1_REQUEST_ACTIVATE: case WLR_EXT_WORKSPACE_V1_REQUEST_ACTIVATE:
wl_signal_emit_mutable(&req->workspace->events.activate, NULL); wl_signal_emit_mutable(&req->workspace->events.activate, NULL);
@@ -345,11 +323,13 @@ static void manager_handle_commit(struct wl_client *client,
wl_signal_emit_mutable(&req->workspace->events.deactivate, NULL); wl_signal_emit_mutable(&req->workspace->events.deactivate, NULL);
break; break;
case WLR_EXT_WORKSPACE_V1_REQUEST_ASSIGN: case WLR_EXT_WORKSPACE_V1_REQUEST_ASSIGN:
wl_signal_emit_mutable(&req->workspace->events.assign, req->group); wl_signal_emit_mutable(&req->workspace->events.assign, &req->group);
break; break;
case WLR_EXT_WORKSPACE_V1_REQUEST_REMOVE: case WLR_EXT_WORKSPACE_V1_REQUEST_REMOVE:
wl_signal_emit_mutable(&req->workspace->events.remove, NULL); wl_signal_emit_mutable(&req->workspace->events.remove, NULL);
break; break;
default:
abort();
} }
destroy_request(req); destroy_request(req);
} }
@@ -358,9 +338,9 @@ static void manager_handle_commit(struct wl_client *client,
static void handle_idle(void *data) { static void handle_idle(void *data) {
struct wlr_ext_workspace_manager_v1 *manager = data; struct wlr_ext_workspace_manager_v1 *manager = data;
struct wlr_ext_workspace_manager_v1_resource *manager_res; struct wlr_ext_workspace_manager_client_v1 *manager_client;
wl_list_for_each(manager_res, &manager->resources, link) { wl_list_for_each(manager_client, &manager->clients, link) {
ext_workspace_manager_v1_send_done(manager_res->resource); ext_workspace_manager_v1_send_done(manager_client->resource);
} }
manager->idle_source = NULL; manager->idle_source = NULL;
} }
@@ -374,9 +354,9 @@ manager_schedule_done(struct wlr_ext_workspace_manager_v1 *manager) {
} }
static void static void
workspace_send_details(struct wlr_ext_workspace_v1_resource *workspace_res) { workspace_send_details(struct wlr_ext_workspace_client_v1 *workspace_client) {
struct wlr_ext_workspace_handle_v1 *workspace = workspace_res->workspace; struct wlr_ext_workspace_handle_v1 *workspace = workspace_client->workspace;
struct wl_resource *resource = workspace_res->resource; struct wl_resource *resource = workspace_client->resource;
ext_workspace_handle_v1_send_capabilities(resource, workspace->caps); ext_workspace_handle_v1_send_capabilities(resource, workspace->caps);
if (workspace->coordinates.size > 0) { if (workspace->coordinates.size > 0) {
@@ -404,41 +384,29 @@ static const struct ext_workspace_manager_v1_interface manager_impl = {
.stop = manager_handle_stop, .stop = manager_handle_stop,
}; };
static void destroy_manager_resource( static void destroy_manager_client(
struct wlr_ext_workspace_manager_v1_resource *manager_res) { struct wlr_ext_workspace_manager_client_v1 *manager_client) {
struct wlr_ext_workspace_v1_request *req, *tmp; struct wlr_ext_workspace_v1_request *req, *tmp;
wl_list_for_each_safe(req, tmp, &manager_res->requests, link) { wl_list_for_each_safe(req, tmp, &manager_client->requests, link) {
destroy_request(req); destroy_request(req);
} }
struct wlr_ext_workspace_v1_resource *workspace_res, *tmp2; wl_list_remove(&manager_client->link);
wl_list_for_each_safe(workspace_res, tmp2, wl_resource_set_user_data(manager_client->resource, NULL);
&manager_res->workspace_resources, free(manager_client);
manager_resource_link) {
destroy_workspace_resource(workspace_res);
}
struct wlr_ext_workspace_group_v1_resource *group_res, *tmp3;
wl_list_for_each_safe(group_res, tmp3, &manager_res->group_resources,
manager_resource_link) {
destroy_group_resource(group_res);
}
wl_list_remove(&manager_res->link);
wl_resource_set_user_data(manager_res->resource, NULL);
free(manager_res);
} }
static void manager_resource_destroy(struct wl_resource *resource) { static void manager_resource_destroy(struct wl_resource *resource) {
struct wlr_ext_workspace_manager_v1_resource *manager_res = struct wlr_ext_workspace_manager_client_v1 *manager_client =
manager_resource_from_resource(resource); manager_client_from_resource(resource);
if (manager_res) { if (manager_client) {
destroy_manager_resource(manager_res); destroy_manager_client(manager_client);
} }
} }
static void static void
group_send_details(struct wlr_ext_workspace_group_v1_resource *group_res) { group_send_details(struct wlr_ext_workspace_group_client_v1 *group_client) {
struct wlr_ext_workspace_group_handle_v1 *group = group_res->group; struct wlr_ext_workspace_group_handle_v1 *group = group_client->group;
struct wl_resource *resource = group_res->resource; struct wl_resource *resource = group_client->resource;
struct wl_client *client = wl_resource_get_client(resource); struct wl_client *client = wl_resource_get_client(resource);
ext_workspace_group_handle_v1_send_capabilities(resource, group->caps); ext_workspace_group_handle_v1_send_capabilities(resource, group->caps);
@@ -462,67 +430,65 @@ static void manager_bind(struct wl_client *client, void *data, uint32_t version,
uint32_t id) { uint32_t id) {
struct wlr_ext_workspace_manager_v1 *manager = data; struct wlr_ext_workspace_manager_v1 *manager = data;
struct wlr_ext_workspace_manager_v1_resource *manager_res = struct wlr_ext_workspace_manager_client_v1 *manager_client =
calloc(1, sizeof(*manager_res)); calloc(1, sizeof(*manager_client));
if (!manager_res) { if (!manager_client) {
wl_client_post_no_memory(client); wl_client_post_no_memory(client);
return; return;
} }
manager_res->manager = manager; manager_client->manager = manager;
wl_list_init(&manager_res->requests); wl_list_init(&manager_client->requests);
wl_list_init(&manager_res->workspace_resources); wl_list_insert(&manager->clients, &manager_client->link);
wl_list_init(&manager_res->group_resources);
manager_res->resource = wl_resource_create( manager_client->resource = wl_resource_create(
client, &ext_workspace_manager_v1_interface, version, id); client, &ext_workspace_manager_v1_interface, version, id);
if (!manager_res->resource) { if (!manager_client->resource) {
free(manager_res); free(manager_client);
wl_client_post_no_memory(client); wl_client_post_no_memory(client);
return; return;
} }
wl_resource_set_implementation(manager_res->resource, &manager_impl, wl_resource_set_implementation(manager_client->resource, &manager_impl,
manager_res, manager_resource_destroy); manager_client, manager_resource_destroy);
wl_list_insert(&manager->resources, &manager_res->link);
struct wlr_ext_workspace_group_handle_v1 *group; struct wlr_ext_workspace_group_handle_v1 *group;
wl_list_for_each(group, &manager->groups, link) { wl_list_for_each(group, &manager->groups, link) {
struct wlr_ext_workspace_group_v1_resource *group_res = struct wlr_ext_workspace_group_client_v1 *group_client =
create_group_resource(group, manager_res); create_group_client(group, manager_client);
if (!group_res) { if (!group_client) {
wl_resource_post_no_memory(manager_res->resource); wl_resource_post_no_memory(manager_client->resource);
continue; continue;
} }
ext_workspace_manager_v1_send_workspace_group(manager_res->resource, ext_workspace_manager_v1_send_workspace_group(manager_client->resource,
group_res->resource); group_client->resource);
group_send_details(group_res); group_send_details(group_client);
} }
struct wlr_ext_workspace_handle_v1 *workspace; struct wlr_ext_workspace_handle_v1 *workspace;
wl_list_for_each(workspace, &manager->workspaces, link) { wl_list_for_each(workspace, &manager->workspaces, link) {
struct wlr_ext_workspace_v1_resource *workspace_res = struct wlr_ext_workspace_client_v1 *workspace_client =
create_workspace_resource(workspace, manager_res); create_workspace_client(workspace, manager_client);
if (!workspace_res) { if (!workspace) {
wl_resource_post_no_memory(manager_res->resource); wl_client_post_no_memory(client);
continue; continue;
} }
ext_workspace_manager_v1_send_workspace(manager_res->resource, ext_workspace_manager_v1_send_workspace(manager_client->resource,
workspace_res->resource); workspace_client->resource);
workspace_send_details(workspace_res); workspace_send_details(workspace_client);
if (!workspace->group) { if (!workspace->group) {
continue; continue;
} }
struct wlr_ext_workspace_group_v1_resource *group_res; struct wlr_ext_workspace_group_client_v1 *group_client;
wl_list_for_each(group_res, &workspace->group->resources, link) { wl_list_for_each(group_client, &workspace->group->clients, link) {
if (group_res->manager == manager_res) { if (group_client->manager == manager_client) {
ext_workspace_group_handle_v1_send_workspace_enter( ext_workspace_group_handle_v1_send_workspace_enter(
group_res->resource, workspace_res->resource); group_client->resource, workspace_client->resource);
} }
} }
} }
ext_workspace_manager_v1_send_done(manager_res->resource); manager_schedule_done(manager);
} }
static void manager_handle_display_destroy(struct wl_listener *listener, static void manager_handle_display_destroy(struct wl_listener *listener,
@@ -543,9 +509,9 @@ static void manager_handle_display_destroy(struct wl_listener *listener,
wlr_ext_workspace_handle_v1_destroy(workspace); wlr_ext_workspace_handle_v1_destroy(workspace);
} }
struct wlr_ext_workspace_manager_v1_resource *manager_res, *tmp3; struct wlr_ext_workspace_manager_client_v1 *manager_client, *tmp3;
wl_list_for_each_safe(manager_res, tmp3, &manager->resources, link) { wl_list_for_each_safe(manager_client, tmp3, &manager->clients, link) {
destroy_manager_resource(manager_res); destroy_manager_client(manager_client);
} }
if (manager->idle_source) { if (manager->idle_source) {
@@ -582,7 +548,7 @@ wlr_ext_workspace_manager_v1_create(struct wl_display *display,
wl_list_init(&manager->groups); wl_list_init(&manager->groups);
wl_list_init(&manager->workspaces); wl_list_init(&manager->workspaces);
wl_list_init(&manager->resources); wl_list_init(&manager->clients);
wl_signal_init(&manager->events.destroy); wl_signal_init(&manager->events.destroy);
return manager; return manager;
@@ -600,22 +566,22 @@ wlr_ext_workspace_group_handle_v1_create(
group->caps = caps; group->caps = caps;
wl_list_init(&group->outputs); wl_list_init(&group->outputs);
wl_list_init(&group->resources); wl_list_init(&group->clients);
wl_signal_init(&group->events.create_workspace); wl_signal_init(&group->events.create_workspace);
wl_signal_init(&group->events.destroy); wl_signal_init(&group->events.destroy);
wl_list_insert(manager->groups.prev, &group->link); wl_list_insert(manager->groups.prev, &group->link);
struct wlr_ext_workspace_manager_v1_resource *manager_res; struct wlr_ext_workspace_manager_client_v1 *manager_client;
wl_list_for_each(manager_res, &manager->resources, link) { wl_list_for_each(manager_client, &manager->clients, link) {
struct wlr_ext_workspace_group_v1_resource *group_res = struct wlr_ext_workspace_group_client_v1 *group_client =
create_group_resource(group, manager_res); create_group_client(group, manager_client);
if (!group_res) { if (!group_client) {
continue; continue;
} }
ext_workspace_manager_v1_send_workspace_group(manager_res->resource, ext_workspace_manager_v1_send_workspace_group(manager_client->resource,
group_res->resource); group_client->resource);
group_send_details(group_res); group_send_details(group_client);
} }
manager_schedule_done(manager); manager_schedule_done(manager);
@@ -628,19 +594,19 @@ workspace_send_group(struct wlr_ext_workspace_handle_v1 *workspace,
struct wlr_ext_workspace_group_handle_v1 *group, struct wlr_ext_workspace_group_handle_v1 *group,
bool enter) { bool enter) {
struct wlr_ext_workspace_v1_resource *workspace_res; struct wlr_ext_workspace_client_v1 *workspace_client;
wl_list_for_each(workspace_res, &workspace->resources, link) { wl_list_for_each(workspace_client, &workspace->clients, link) {
struct wlr_ext_workspace_group_v1_resource *group_res; struct wlr_ext_workspace_group_client_v1 *group_client;
wl_list_for_each(group_res, &group->resources, link) { wl_list_for_each(group_client, &group->clients, link) {
if (group_res->manager != workspace_res->manager) { if (group_client->manager != workspace_client->manager) {
continue; continue;
} }
if (enter) { if (enter) {
ext_workspace_group_handle_v1_send_workspace_enter( ext_workspace_group_handle_v1_send_workspace_enter(
group_res->resource, workspace_res->resource); group_client->resource, workspace_client->resource);
} else { } else {
ext_workspace_group_handle_v1_send_workspace_leave( ext_workspace_group_handle_v1_send_workspace_leave(
group_res->resource, workspace_res->resource); group_client->resource, workspace_client->resource);
} }
} }
} }
@@ -659,9 +625,10 @@ destroy_group_output(struct wlr_ext_workspace_v1_group_output *group_output) {
static void group_send_output(struct wlr_ext_workspace_group_handle_v1 *group, static void group_send_output(struct wlr_ext_workspace_group_handle_v1 *group,
struct wlr_output *output, bool enter) { struct wlr_output *output, bool enter) {
struct wlr_ext_workspace_group_v1_resource *group_res; struct wlr_ext_workspace_group_client_v1 *group_client;
wl_list_for_each(group_res, &group->resources, link) { wl_list_for_each(group_client, &group->clients, link) {
struct wl_client *client = wl_resource_get_client(group_res->resource); struct wl_client *client =
wl_resource_get_client(group_client->resource);
struct wl_resource *output_resource; struct wl_resource *output_resource;
wl_resource_for_each(output_resource, &output->resources) { wl_resource_for_each(output_resource, &output->resources) {
@@ -670,10 +637,10 @@ static void group_send_output(struct wlr_ext_workspace_group_handle_v1 *group,
} }
if (enter) { if (enter) {
ext_workspace_group_handle_v1_send_output_enter( ext_workspace_group_handle_v1_send_output_enter(
group_res->resource, output_resource); group_client->resource, output_resource);
} else { } else {
ext_workspace_group_handle_v1_send_output_leave( ext_workspace_group_handle_v1_send_output_leave(
group_res->resource, output_resource); group_client->resource, output_resource);
} }
} }
} }
@@ -683,10 +650,6 @@ static void group_send_output(struct wlr_ext_workspace_group_handle_v1 *group,
void wlr_ext_workspace_group_handle_v1_destroy( void wlr_ext_workspace_group_handle_v1_destroy(
struct wlr_ext_workspace_group_handle_v1 *group) { struct wlr_ext_workspace_group_handle_v1 *group) {
if (!group) {
return;
}
wl_signal_emit_mutable(&group->events.destroy, NULL); wl_signal_emit_mutable(&group->events.destroy, NULL);
assert(wl_list_empty(&group->events.create_workspace.listener_list)); assert(wl_list_empty(&group->events.create_workspace.listener_list));
@@ -700,16 +663,16 @@ void wlr_ext_workspace_group_handle_v1_destroy(
} }
} }
struct wlr_ext_workspace_group_v1_resource *group_res, *tmp; struct wlr_ext_workspace_group_client_v1 *group_client, *tmp;
wl_list_for_each_safe(group_res, tmp, &group->resources, link) { wl_list_for_each_safe(group_client, tmp, &group->clients, link) {
ext_workspace_group_handle_v1_send_removed(group_res->resource); ext_workspace_group_handle_v1_send_removed(group_client->resource);
destroy_group_resource(group_res); destroy_group_client(group_client);
} }
struct wlr_ext_workspace_manager_v1_resource *manager_res; struct wlr_ext_workspace_manager_client_v1 *manager_client;
wl_list_for_each(manager_res, &group->manager->resources, link) { wl_list_for_each(manager_client, &group->manager->clients, link) {
struct wlr_ext_workspace_v1_request *req, *tmp2; struct wlr_ext_workspace_v1_request *req, *tmp2;
wl_list_for_each_safe(req, tmp2, &manager_res->requests, link) { wl_list_for_each_safe(req, tmp2, &manager_client->requests, link) {
if (req->group == group) { if (req->group == group) {
destroy_request(req); destroy_request(req);
} }
@@ -734,11 +697,11 @@ static void handle_output_bind(struct wl_listener *listener, void *data) {
struct wlr_output_event_bind *event = data; struct wlr_output_event_bind *event = data;
struct wl_client *client = wl_resource_get_client(event->resource); struct wl_client *client = wl_resource_get_client(event->resource);
struct wlr_ext_workspace_group_v1_resource *group_res; struct wlr_ext_workspace_group_client_v1 *group_client;
wl_list_for_each(group_res, &group_output->group->resources, link) { wl_list_for_each(group_client, &group_output->group->clients, link) {
if (wl_resource_get_client(group_res->resource) == client) { if (wl_resource_get_client(group_client->resource) == client) {
ext_workspace_group_handle_v1_send_output_enter(group_res->resource, ext_workspace_group_handle_v1_send_output_enter(
event->resource); group_client->resource, event->resource);
} }
} }
@@ -815,12 +778,11 @@ wlr_ext_workspace_handle_v1_create(struct wlr_ext_workspace_manager_v1 *manager,
if (id) { if (id) {
workspace->id = strdup(id); workspace->id = strdup(id);
if (!workspace->id) { if (!workspace->id) {
free(workspace);
return NULL; return NULL;
} }
} }
wl_list_init(&workspace->resources); wl_list_init(&workspace->clients);
wl_array_init(&workspace->coordinates); wl_array_init(&workspace->coordinates);
wl_signal_init(&workspace->events.activate); wl_signal_init(&workspace->events.activate);
wl_signal_init(&workspace->events.deactivate); wl_signal_init(&workspace->events.deactivate);
@@ -830,16 +792,16 @@ wlr_ext_workspace_handle_v1_create(struct wlr_ext_workspace_manager_v1 *manager,
wl_list_insert(&manager->workspaces, &workspace->link); wl_list_insert(&manager->workspaces, &workspace->link);
struct wlr_ext_workspace_manager_v1_resource *manager_res; struct wlr_ext_workspace_manager_client_v1 *manager_client;
wl_list_for_each(manager_res, &manager->resources, link) { wl_list_for_each(manager_client, &manager->clients, link) {
struct wlr_ext_workspace_v1_resource *workspace_res = struct wlr_ext_workspace_client_v1 *workspace_client =
create_workspace_resource(workspace, manager_res); create_workspace_client(workspace, manager_client);
if (!workspace_res) { if (!workspace_client) {
continue; continue;
} }
ext_workspace_manager_v1_send_workspace(manager_res->resource, ext_workspace_manager_v1_send_workspace(manager_client->resource,
workspace_res->resource); workspace_client->resource);
workspace_send_details(workspace_res); workspace_send_details(workspace_client);
} }
manager_schedule_done(manager); manager_schedule_done(manager);
@@ -849,10 +811,6 @@ wlr_ext_workspace_handle_v1_create(struct wlr_ext_workspace_manager_v1 *manager,
void wlr_ext_workspace_handle_v1_destroy( void wlr_ext_workspace_handle_v1_destroy(
struct wlr_ext_workspace_handle_v1 *workspace) { struct wlr_ext_workspace_handle_v1 *workspace) {
if (!workspace) {
return;
}
wl_signal_emit_mutable(&workspace->events.destroy, NULL); wl_signal_emit_mutable(&workspace->events.destroy, NULL);
assert(wl_list_empty(&workspace->events.activate.listener_list)); assert(wl_list_empty(&workspace->events.activate.listener_list));
@@ -865,16 +823,16 @@ void wlr_ext_workspace_handle_v1_destroy(
workspace_send_group(workspace, workspace->group, false); workspace_send_group(workspace, workspace->group, false);
} }
struct wlr_ext_workspace_v1_resource *workspace_res, *tmp; struct wlr_ext_workspace_client_v1 *workspace_client, *tmp;
wl_list_for_each_safe(workspace_res, tmp, &workspace->resources, link) { wl_list_for_each_safe(workspace_client, tmp, &workspace->clients, link) {
ext_workspace_handle_v1_send_removed(workspace_res->resource); ext_workspace_handle_v1_send_removed(workspace_client->resource);
destroy_workspace_resource(workspace_res); destroy_workspace_client(workspace_client);
} }
struct wlr_ext_workspace_manager_v1_resource *manager_res; struct wlr_ext_workspace_manager_client_v1 *manager_client;
wl_list_for_each(manager_res, &workspace->manager->resources, link) { wl_list_for_each(manager_client, &workspace->manager->clients, link) {
struct wlr_ext_workspace_v1_request *req, *tmp2; struct wlr_ext_workspace_v1_request *req, *tmp2;
wl_list_for_each_safe(req, tmp2, &manager_res->requests, link) { wl_list_for_each_safe(req, tmp2, &manager_client->requests, link) {
if (req->workspace == workspace) { if (req->workspace == workspace) {
destroy_request(req); destroy_request(req);
} }
@@ -898,7 +856,7 @@ void wlr_ext_workspace_handle_v1_set_group(
} }
if (workspace->group) { if (workspace->group) {
workspace_send_group(workspace, workspace->group, false); workspace_send_group(workspace, group, false);
} }
workspace->group = group; workspace->group = group;
if (group) { if (group) {
@@ -920,9 +878,9 @@ void wlr_ext_workspace_handle_v1_set_name(
return; return;
} }
struct wlr_ext_workspace_v1_resource *workspace_res; struct wlr_ext_workspace_client_v1 *workspace_client;
wl_list_for_each(workspace_res, &workspace->resources, link) { wl_list_for_each(workspace_client, &workspace->clients, link) {
ext_workspace_handle_v1_send_name(workspace_res->resource, ext_workspace_handle_v1_send_name(workspace_client->resource,
workspace->name); workspace->name);
} }
@@ -947,9 +905,9 @@ void wlr_ext_workspace_handle_v1_set_coordinates(
wl_array_init(&workspace->coordinates); wl_array_init(&workspace->coordinates);
wl_array_copy(&workspace->coordinates, coordinates); wl_array_copy(&workspace->coordinates, coordinates);
struct wlr_ext_workspace_v1_resource *workspace_res; struct wlr_ext_workspace_client_v1 *workspace_client;
wl_list_for_each(workspace_res, &workspace->resources, link) { wl_list_for_each(workspace_client, &workspace->clients, link) {
ext_workspace_handle_v1_send_coordinates(workspace_res->resource, ext_workspace_handle_v1_send_coordinates(workspace_client->resource,
&workspace->coordinates); &workspace->coordinates);
} }
@@ -969,9 +927,9 @@ static void workspace_set_state(struct wlr_ext_workspace_handle_v1 *workspace,
return; return;
} }
struct wlr_ext_workspace_v1_resource *workspace_res; struct wlr_ext_workspace_client_v1 *workspace_client;
wl_list_for_each(workspace_res, &workspace->resources, link) { wl_list_for_each(workspace_client, &workspace->clients, link) {
ext_workspace_handle_v1_send_state(workspace_res->resource, ext_workspace_handle_v1_send_state(workspace_client->resource,
workspace->state); workspace->state);
} }

50
src/ext-protocol/wlr_ext_workspace_v1.h
View File

@@ -2,11 +2,32 @@
// TODO: remove this file // TODO: remove this file
// refer: https://gitlab.freedesktop.org/wlroots/wlroots/-/merge_requests/5115 // refer: https://gitlab.freedesktop.org/wlroots/wlroots/-/merge_requests/5115
#include <wayland-protocols/ext-workspace-v1-enum.h> /*
* This an unstable interface of wlroots. No guarantees are made regarding the
* future consistency of this API.
*/
#ifndef WLR_USE_UNSTABLE
#error "Add -DWLR_USE_UNSTABLE to enable unstable wlroots features"
#endif
#ifndef WLR_TYPES_WLR_EXT_WORKSPACE_V1_H
#define WLR_TYPES_WLR_EXT_WORKSPACE_V1_H
#include <wayland-server-core.h> #include <wayland-server-core.h>
struct wlr_output; struct wlr_output;
enum wlr_ext_workspace_group_handle_v1_cap {
WLR_EXT_WORKSPACE_GROUP_HANDLE_V1_CAP_CREATE_WORKSPACE = 1 << 0,
};
enum wlr_ext_workspace_handle_v1_cap {
WLR_EXT_WORKSPACE_HANDLE_V1_CAP_ACTIVATE = 1 << 0,
WLR_EXT_WORKSPACE_HANDLE_V1_CAP_DEACTIVATE = 1 << 1,
WLR_EXT_WORKSPACE_HANDLE_V1_CAP_REMOVE = 1 << 2,
WLR_EXT_WORKSPACE_HANDLE_V1_CAP_ASSIGN = 1 << 3,
};
struct wlr_ext_workspace_manager_v1 { struct wlr_ext_workspace_manager_v1 {
struct wl_global *global; struct wl_global *global;
struct wl_list groups; // wlr_ext_workspace_group_handle_v1.link struct wl_list groups; // wlr_ext_workspace_group_handle_v1.link
@@ -16,33 +37,24 @@ struct wlr_ext_workspace_manager_v1 {
struct wl_signal destroy; struct wl_signal destroy;
} events; } events;
struct { struct wl_list clients; // wlr_ext_workspace_manager_client_v1.link
struct wl_list resources; // wlr_ext_workspace_manager_v1_resource.link
struct wl_event_source *idle_source; struct wl_event_source *idle_source;
struct wl_event_loop *event_loop; struct wl_event_loop *event_loop;
struct wl_listener display_destroy; struct wl_listener display_destroy;
}; };
};
struct wlr_ext_workspace_group_handle_v1_create_workspace_event {
const char *name;
};
struct wlr_ext_workspace_group_handle_v1 { struct wlr_ext_workspace_group_handle_v1 {
struct wlr_ext_workspace_manager_v1 *manager; struct wlr_ext_workspace_manager_v1 *manager;
uint32_t caps; // ext_workspace_group_handle_v1_group_capabilities uint32_t caps; // wlr_ext_workspace_group_handle_v1_cap
struct { struct {
struct wl_signal struct wl_signal create_workspace; // const char *
create_workspace; // wlr_ext_workspace_group_handle_v1_create_workspace_event
struct wl_signal destroy; struct wl_signal destroy;
} events; } events;
struct wl_list link; // wlr_ext_workspace_manager_v1.groups struct wl_list link; // wlr_ext_workspace_manager_v1.groups
struct {
struct wl_list outputs; // wlr_ext_workspace_v1_group_output.link struct wl_list outputs; // wlr_ext_workspace_v1_group_output.link
struct wl_list resources; // wlr_ext_workspace_manager_v1_resource.link struct wl_list clients; // wlr_ext_workspace_manager_client_v1.link
};
}; };
struct wlr_ext_workspace_handle_v1 { struct wlr_ext_workspace_handle_v1 {
@@ -51,7 +63,7 @@ struct wlr_ext_workspace_handle_v1 {
char *id; char *id;
char *name; char *name;
struct wl_array coordinates; struct wl_array coordinates;
uint32_t caps; // ext_workspace_handle_v1_workspace_capabilities uint32_t caps; // wlr_ext_workspace_handle_v1_cap
uint32_t state; // ext_workspace_handle_v1_state uint32_t state; // ext_workspace_handle_v1_state
struct { struct {
@@ -62,11 +74,9 @@ struct wlr_ext_workspace_handle_v1 {
struct wl_signal destroy; struct wl_signal destroy;
} events; } events;
struct wl_list link; // wlr_ext_workspace_manager_v1.workspaces struct wl_list link; // wlr_ext_workspace_manager_v1.workspaces;
struct { struct wl_list clients;
struct wl_list resources; // wlr_ext_workspace_v1_resource.link
};
}; };
struct wlr_ext_workspace_manager_v1 * struct wlr_ext_workspace_manager_v1 *
@@ -104,3 +114,5 @@ void wlr_ext_workspace_handle_v1_set_urgent(
struct wlr_ext_workspace_handle_v1 *workspace, bool enabled); struct wlr_ext_workspace_handle_v1 *workspace, bool enabled);
void wlr_ext_workspace_handle_v1_set_hidden( void wlr_ext_workspace_handle_v1_set_hidden(
struct wlr_ext_workspace_handle_v1 *workspace, bool enabled); struct wlr_ext_workspace_handle_v1 *workspace, bool enabled);
#endif

168
src/fetch/client.h
View File

@@ -1,5 +1,5 @@
bool check_hit_no_border(Client *c) { bool check_hit_no_border(Client *c) {
int32_t i; int i;
bool hit_no_border = false; bool hit_no_border = false;
if (!render_border) { if (!render_border) {
hit_no_border = true; hit_no_border = true;
@@ -41,21 +41,10 @@ Client *get_client_by_id_or_title(const char *arg_id, const char *arg_title) {
continue; continue;
} }
if (c->swallowedby) { if (!(appid = client_get_appid(c)))
appid = client_get_appid(c->swallowedby);
title = client_get_title(c->swallowedby);
} else {
appid = client_get_appid(c);
title = client_get_title(c);
}
if (!appid) {
appid = broken; appid = broken;
} if (!(title = client_get_title(c)))
if (!title) {
title = broken; title = broken;
}
if (arg_id && strncmp(arg_id, "none", 4) == 0) if (arg_id && strncmp(arg_id, "none", 4) == 0)
arg_id = NULL; arg_id = NULL;
@@ -74,16 +63,16 @@ Client *get_client_by_id_or_title(const char *arg_id, const char *arg_title) {
return target_client; return target_client;
} }
struct wlr_box // 计算客户端居中坐标 struct wlr_box // 计算客户端居中坐标
setclient_coordinate_center(Client *c, Monitor *tm, struct wlr_box geom, setclient_coordinate_center(Client *c, struct wlr_box geom, int offsetx,
int32_t offsetx, int32_t offsety) { int offsety) {
struct wlr_box tempbox; struct wlr_box tempbox;
int32_t offset = 0; int offset = 0;
int32_t len = 0; int len = 0;
Monitor *m = tm ? tm : selmon; Monitor *m = c->mon ? c->mon : selmon;
uint32_t cbw = check_hit_no_border(c) ? c->bw : 0; unsigned int cbw = check_hit_no_border(c) ? c->bw : 0;
if (!c->no_force_center && m) { if (!c->no_force_center) {
tempbox.x = m->w.x + (m->w.width - geom.width) / 2; tempbox.x = m->w.x + (m->w.width - geom.width) / 2;
tempbox.y = m->w.y + (m->w.height - geom.height) / 2; tempbox.y = m->w.y + (m->w.height - geom.height) / 2;
} else { } else {
@@ -135,13 +124,12 @@ static bool is_window_rule_matches(const ConfigWinRule *r, const char *appid,
Client *center_tiled_select(Monitor *m) { Client *center_tiled_select(Monitor *m) {
Client *c = NULL; Client *c = NULL;
Client *target_c = NULL; Client *target_c = NULL;
int64_t mini_distance = -1; long int mini_distance = -1;
int32_t dirx, diry; int dirx, diry;
int64_t distance; long int distance;
wl_list_for_each(c, &clients, link) { wl_list_for_each(c, &clients, link) {
if (c && VISIBLEON(c, m) && ISSCROLLTILED(c) && if (c && VISIBLEON(c, m) && ISTILED(c) && client_surface(c)->mapped &&
client_surface(c)->mapped && !c->isfloating && !c->isfloating && !client_is_unmanaged(c)) {
!client_is_unmanaged(c)) {
dirx = c->geom.x + c->geom.width / 2 - (m->w.x + m->w.width / 2); dirx = c->geom.x + c->geom.width / 2 - (m->w.x + m->w.width / 2);
diry = c->geom.y + c->geom.height / 2 - (m->w.y + m->w.height / 2); diry = c->geom.y + c->geom.height / 2 - (m->w.y + m->w.height / 2);
distance = dirx * dirx + diry * diry; distance = dirx * dirx + diry * diry;
@@ -157,7 +145,7 @@ Client *find_client_by_direction(Client *tc, const Arg *arg, bool findfloating,
bool ignore_align) { bool ignore_align) {
Client *c = NULL; Client *c = NULL;
Client **tempClients = NULL; // 初始化为 NULL Client **tempClients = NULL; // 初始化为 NULL
int32_t last = -1; int last = -1;
// 第一次遍历，计算客户端数量 // 第一次遍历，计算客户端数量
wl_list_for_each(c, &clients, link) { wl_list_for_each(c, &clients, link) {
@@ -190,23 +178,21 @@ Client *find_client_by_direction(Client *tc, const Arg *arg, bool findfloating,
} }
} }
int32_t sel_x = tc->geom.x; int sel_x = tc->geom.x;
int32_t sel_y = tc->geom.y; int sel_y = tc->geom.y;
int64_t distance = LLONG_MAX; long long int distance = LLONG_MAX;
int64_t same_monitor_distance = LLONG_MAX;
Client *tempFocusClients = NULL; Client *tempFocusClients = NULL;
Client *tempSameMonitorFocusClients = NULL;
switch (arg->i) { switch (arg->i) {
case UP: case UP:
if (!ignore_align) { if (!ignore_align) {
for (int32_t _i = 0; _i <= last; _i++) { for (int _i = 0; _i <= last; _i++) {
if (tempClients[_i]->geom.y < sel_y && if (tempClients[_i]->geom.y < sel_y &&
tempClients[_i]->geom.x == sel_x && tempClients[_i]->geom.x == sel_x &&
tempClients[_i]->mon == tc->mon) { tempClients[_i]->mon == tc->mon) {
int32_t dis_x = tempClients[_i]->geom.x - sel_x; int dis_x = tempClients[_i]->geom.x - sel_x;
int32_t dis_y = tempClients[_i]->geom.y - sel_y; int dis_y = tempClients[_i]->geom.y - sel_y;
int64_t tmp_distance = long long int tmp_distance =
dis_x * dis_x + dis_y * dis_y; // 计算距离 dis_x * dis_x + dis_y * dis_y; // 计算距离
if (tmp_distance < distance) { if (tmp_distance < distance) {
distance = tmp_distance; distance = tmp_distance;
@@ -216,34 +202,29 @@ Client *find_client_by_direction(Client *tc, const Arg *arg, bool findfloating,
} }
} }
if (!tempFocusClients) { if (!tempFocusClients) {
for (int32_t _i = 0; _i <= last; _i++) { for (int _i = 0; _i <= last; _i++) {
if (tempClients[_i]->geom.y < sel_y) { if (tempClients[_i]->geom.y < sel_y) {
int32_t dis_x = tempClients[_i]->geom.x - sel_x; int dis_x = tempClients[_i]->geom.x - sel_x;
int32_t dis_y = tempClients[_i]->geom.y - sel_y; int dis_y = tempClients[_i]->geom.y - sel_y;
int64_t tmp_distance = long long int tmp_distance =
dis_x * dis_x + dis_y * dis_y; // 计算距离 dis_x * dis_x + dis_y * dis_y; // 计算距离
if (tmp_distance < distance) { if (tmp_distance < distance) {
distance = tmp_distance; distance = tmp_distance;
tempFocusClients = tempClients[_i]; tempFocusClients = tempClients[_i];
} }
if (tempClients[_i]->mon == tc->mon &&
tmp_distance < same_monitor_distance) {
same_monitor_distance = tmp_distance;
tempSameMonitorFocusClients = tempClients[_i];
}
} }
} }
} }
break; break;
case DOWN: case DOWN:
if (!ignore_align) { if (!ignore_align) {
for (int32_t _i = 0; _i <= last; _i++) { for (int _i = 0; _i <= last; _i++) {
if (tempClients[_i]->geom.y > sel_y && if (tempClients[_i]->geom.y > sel_y &&
tempClients[_i]->geom.x == sel_x && tempClients[_i]->geom.x == sel_x &&
tempClients[_i]->mon == tc->mon) { tempClients[_i]->mon == tc->mon) {
int32_t dis_x = tempClients[_i]->geom.x - sel_x; int dis_x = tempClients[_i]->geom.x - sel_x;
int32_t dis_y = tempClients[_i]->geom.y - sel_y; int dis_y = tempClients[_i]->geom.y - sel_y;
int64_t tmp_distance = long long int tmp_distance =
dis_x * dis_x + dis_y * dis_y; // 计算距离 dis_x * dis_x + dis_y * dis_y; // 计算距离
if (tmp_distance < distance) { if (tmp_distance < distance) {
distance = tmp_distance; distance = tmp_distance;
@@ -253,34 +234,29 @@ Client *find_client_by_direction(Client *tc, const Arg *arg, bool findfloating,
} }
} }
if (!tempFocusClients) { if (!tempFocusClients) {
for (int32_t _i = 0; _i <= last; _i++) { for (int _i = 0; _i <= last; _i++) {
if (tempClients[_i]->geom.y > sel_y) { if (tempClients[_i]->geom.y > sel_y) {
int32_t dis_x = tempClients[_i]->geom.x - sel_x; int dis_x = tempClients[_i]->geom.x - sel_x;
int32_t dis_y = tempClients[_i]->geom.y - sel_y; int dis_y = tempClients[_i]->geom.y - sel_y;
int64_t tmp_distance = long long int tmp_distance =
dis_x * dis_x + dis_y * dis_y; // 计算距离 dis_x * dis_x + dis_y * dis_y; // 计算距离
if (tmp_distance < distance) { if (tmp_distance < distance) {
distance = tmp_distance; distance = tmp_distance;
tempFocusClients = tempClients[_i]; tempFocusClients = tempClients[_i];
} }
if (tempClients[_i]->mon == tc->mon &&
tmp_distance < same_monitor_distance) {
same_monitor_distance = tmp_distance;
tempSameMonitorFocusClients = tempClients[_i];
}
} }
} }
} }
break; break;
case LEFT: case LEFT:
if (!ignore_align) { if (!ignore_align) {
for (int32_t _i = 0; _i <= last; _i++) { for (int _i = 0; _i <= last; _i++) {
if (tempClients[_i]->geom.x < sel_x && if (tempClients[_i]->geom.x < sel_x &&
tempClients[_i]->geom.y == sel_y && tempClients[_i]->geom.y == sel_y &&
tempClients[_i]->mon == tc->mon) { tempClients[_i]->mon == tc->mon) {
int32_t dis_x = tempClients[_i]->geom.x - sel_x; int dis_x = tempClients[_i]->geom.x - sel_x;
int32_t dis_y = tempClients[_i]->geom.y - sel_y; int dis_y = tempClients[_i]->geom.y - sel_y;
int64_t tmp_distance = long long int tmp_distance =
dis_x * dis_x + dis_y * dis_y; // 计算距离 dis_x * dis_x + dis_y * dis_y; // 计算距离
if (tmp_distance < distance) { if (tmp_distance < distance) {
distance = tmp_distance; distance = tmp_distance;
@@ -290,34 +266,29 @@ Client *find_client_by_direction(Client *tc, const Arg *arg, bool findfloating,
} }
} }
if (!tempFocusClients) { if (!tempFocusClients) {
for (int32_t _i = 0; _i <= last; _i++) { for (int _i = 0; _i <= last; _i++) {
if (tempClients[_i]->geom.x < sel_x) { if (tempClients[_i]->geom.x < sel_x) {
int32_t dis_x = tempClients[_i]->geom.x - sel_x; int dis_x = tempClients[_i]->geom.x - sel_x;
int32_t dis_y = tempClients[_i]->geom.y - sel_y; int dis_y = tempClients[_i]->geom.y - sel_y;
int64_t tmp_distance = long long int tmp_distance =
dis_x * dis_x + dis_y * dis_y; // 计算距离 dis_x * dis_x + dis_y * dis_y; // 计算距离
if (tmp_distance < distance) { if (tmp_distance < distance) {
distance = tmp_distance; distance = tmp_distance;
tempFocusClients = tempClients[_i]; tempFocusClients = tempClients[_i];
} }
if (tempClients[_i]->mon == tc->mon &&
tmp_distance < same_monitor_distance) {
same_monitor_distance = tmp_distance;
tempSameMonitorFocusClients = tempClients[_i];
}
} }
} }
} }
break; break;
case RIGHT: case RIGHT:
if (!ignore_align) { if (!ignore_align) {
for (int32_t _i = 0; _i <= last; _i++) { for (int _i = 0; _i <= last; _i++) {
if (tempClients[_i]->geom.x > sel_x && if (tempClients[_i]->geom.x > sel_x &&
tempClients[_i]->geom.y == sel_y && tempClients[_i]->geom.y == sel_y &&
tempClients[_i]->mon == tc->mon) { tempClients[_i]->mon == tc->mon) {
int32_t dis_x = tempClients[_i]->geom.x - sel_x; int dis_x = tempClients[_i]->geom.x - sel_x;
int32_t dis_y = tempClients[_i]->geom.y - sel_y; int dis_y = tempClients[_i]->geom.y - sel_y;
int64_t tmp_distance = long long int tmp_distance =
dis_x * dis_x + dis_y * dis_y; // 计算距离 dis_x * dis_x + dis_y * dis_y; // 计算距离
if (tmp_distance < distance) { if (tmp_distance < distance) {
distance = tmp_distance; distance = tmp_distance;
@@ -327,21 +298,16 @@ Client *find_client_by_direction(Client *tc, const Arg *arg, bool findfloating,
} }
} }
if (!tempFocusClients) { if (!tempFocusClients) {
for (int32_t _i = 0; _i <= last; _i++) { for (int _i = 0; _i <= last; _i++) {
if (tempClients[_i]->geom.x > sel_x) { if (tempClients[_i]->geom.x > sel_x) {
int32_t dis_x = tempClients[_i]->geom.x - sel_x; int dis_x = tempClients[_i]->geom.x - sel_x;
int32_t dis_y = tempClients[_i]->geom.y - sel_y; int dis_y = tempClients[_i]->geom.y - sel_y;
int64_t tmp_distance = long long int tmp_distance =
dis_x * dis_x + dis_y * dis_y; // 计算距离 dis_x * dis_x + dis_y * dis_y; // 计算距离
if (tmp_distance < distance) { if (tmp_distance < distance) {
distance = tmp_distance; distance = tmp_distance;
tempFocusClients = tempClients[_i]; tempFocusClients = tempClients[_i];
} }
if (tempClients[_i]->mon == tc->mon &&
tmp_distance < same_monitor_distance) {
same_monitor_distance = tmp_distance;
tempSameMonitorFocusClients = tempClients[_i];
}
} }
} }
} }
@@ -349,12 +315,8 @@ Client *find_client_by_direction(Client *tc, const Arg *arg, bool findfloating,
} }
free(tempClients); // 释放内存 free(tempClients); // 释放内存
if (tempSameMonitorFocusClients) {
return tempSameMonitorFocusClients;
} else {
return tempFocusClients; return tempFocusClients;
} }
}
Client *direction_select(const Arg *arg) { Client *direction_select(const Arg *arg) {
@@ -388,26 +350,29 @@ Client *focustop(Monitor *m) {
Client *get_next_stack_client(Client *c, bool reverse) { Client *get_next_stack_client(Client *c, bool reverse) {
if (!c || !c->mon) if (!c || !c->mon)
return NULL; return NULL; // 添加输入检查
Client *next = NULL; Client *next = NULL;
if (reverse) { if (reverse) {
wl_list_for_each_reverse(next, &c->link, link) { wl_list_for_each_reverse(next, &c->link, link) {
if (&next->link == &clients) if (!next)
continue; /* wrap past the sentinel node */ continue; // 安全检查
if (next->isunglobal) if (c->mon->has_visible_fullscreen_client && !next->isfloating &&
!next->isfullscreen)
continue; continue;
// 添加更安全的 VISIBLEON 检查
if (next != c && next->mon && VISIBLEON(next, c->mon)) if (next != c && next->mon && VISIBLEON(next, c->mon))
return next; return next;
} }
} else { } else {
wl_list_for_each(next, &c->link, link) { wl_list_for_each(next, &c->link, link) {
if (&next->link == &clients) if (!next)
continue; /* wrap past the sentinel node */ continue; // 安全检查
if (next->isunglobal) if (c->mon->has_visible_fullscreen_client && !next->isfloating &&
!next->isfullscreen)
continue; continue;
if (next != c && next->mon && VISIBLEON(next, c->mon)) if (next != c && next->mon && VISIBLEON(next, c->mon))
@@ -437,14 +402,3 @@ float *get_border_color(Client *c) {
return bordercolor; return bordercolor;
} }
} }
int32_t is_single_bit_set(uint32_t x) { return x && !(x & (x - 1)); }
bool client_only_in_one_tag(Client *c) {
uint32_t masked = c->tags & TAGMASK;
if (is_single_bit_set(masked)) {
return true;
} else {
return false;
}
}

39
src/fetch/common.h
View File

@@ -1,5 +1,5 @@
pid_t getparentprocess(pid_t p) { pid_t getparentprocess(pid_t p) {
uint32_t v = 0; unsigned int v = 0;
FILE *f; FILE *f;
char buf[256]; char buf[256];
@@ -19,11 +19,29 @@ pid_t getparentprocess(pid_t p) {
return (pid_t)v; return (pid_t)v;
} }
int32_t isdescprocess(pid_t p, pid_t c) { int isdescprocess(pid_t p, pid_t c) {
while (p != c && c != 0) while (p != c && c != 0)
c = getparentprocess(c); c = getparentprocess(c);
return (int32_t)c; return (int)c;
}
char *get_autostart_path(char *autostart_path, unsigned int buf_size) {
const char *mangoconfig = getenv("MANGOCONFIG");
if (mangoconfig && mangoconfig[0] != '\0') {
snprintf(autostart_path, buf_size, "%s/autostart.sh", mangoconfig);
} else {
const char *homedir = getenv("HOME");
if (!homedir) {
fprintf(stderr, "Error: HOME environment variable not set.\n");
return NULL;
}
snprintf(autostart_path, buf_size, "%s/.config/mango/autostart.sh",
homedir);
}
return autostart_path;
} }
void get_layout_abbr(char *abbr, const char *full_name) { void get_layout_abbr(char *abbr, const char *full_name) {
@@ -31,7 +49,7 @@ void get_layout_abbr(char *abbr, const char *full_name) {
abbr[0] = '\0'; abbr[0] = '\0';
// 1. 尝试在映射表中查找 // 1. 尝试在映射表中查找
for (int32_t i = 0; layout_mappings[i].full_name != NULL; i++) { for (int i = 0; layout_mappings[i].full_name != NULL; i++) {
if (strcmp(full_name, layout_mappings[i].full_name) == 0) { if (strcmp(full_name, layout_mappings[i].full_name) == 0) {
strcpy(abbr, layout_mappings[i].abbr); strcpy(abbr, layout_mappings[i].abbr);
return; return;
@@ -42,10 +60,10 @@ void get_layout_abbr(char *abbr, const char *full_name) {
const char *open = strrchr(full_name, '('); const char *open = strrchr(full_name, '(');
const char *close = strrchr(full_name, ')'); const char *close = strrchr(full_name, ')');
if (open && close && close > open) { if (open && close && close > open) {
uint32_t len = close - open - 1; unsigned int len = close - open - 1;
if (len > 0 && len <= 4) { if (len > 0 && len <= 4) {
// 提取并转换为小写 // 提取并转换为小写
for (uint32_t j = 0; j < len; j++) { for (unsigned int j = 0; j < len; j++) {
abbr[j] = tolower(open[j + 1]); abbr[j] = tolower(open[j + 1]);
} }
abbr[len] = '\0'; abbr[len] = '\0';
@@ -54,8 +72,8 @@ void get_layout_abbr(char *abbr, const char *full_name) {
} }
// 3. 提取前2-3个字母并转换为小写 // 3. 提取前2-3个字母并转换为小写
uint32_t j = 0; unsigned int j = 0;
for (uint32_t i = 0; full_name[i] != '\0' && j < 3; i++) { for (unsigned int i = 0; full_name[i] != '\0' && j < 3; i++) {
if (isalpha(full_name[i])) { if (isalpha(full_name[i])) {
abbr[j++] = tolower(full_name[i]); abbr[j++] = tolower(full_name[i]);
} }
@@ -83,7 +101,7 @@ void xytonode(double x, double y, struct wlr_surface **psurface, Client **pc,
struct wlr_surface *surface = NULL; struct wlr_surface *surface = NULL;
Client *c = NULL; Client *c = NULL;
LayerSurface *l = NULL; LayerSurface *l = NULL;
int32_t layer; int layer;
for (layer = NUM_LAYERS - 1; !surface && layer >= 0; layer--) { for (layer = NUM_LAYERS - 1; !surface && layer >= 0; layer--) {
@@ -93,9 +111,6 @@ void xytonode(double x, double y, struct wlr_surface **psurface, Client **pc,
if (!(node = wlr_scene_node_at(&layers[layer]->node, x, y, nx, ny))) if (!(node = wlr_scene_node_at(&layers[layer]->node, x, y, nx, ny)))
continue; continue;
if (!node->enabled)
continue;
if (node->type == WLR_SCENE_NODE_BUFFER) if (node->type == WLR_SCENE_NODE_BUFFER)
surface = wlr_scene_surface_try_from_buffer( surface = wlr_scene_surface_try_from_buffer(
wlr_scene_buffer_from_node(node)) wlr_scene_buffer_from_node(node))

12
src/fetch/monitor.h
View File

@@ -26,9 +26,9 @@ bool is_scroller_layout(Monitor *m) {
return false; return false;
} }
uint32_t get_tag_status(uint32_t tag, Monitor *m) { unsigned int get_tag_status(unsigned int tag, Monitor *m) {
Client *c = NULL; Client *c = NULL;
uint32_t status = 0; unsigned int status = 0;
wl_list_for_each(c, &clients, link) { wl_list_for_each(c, &clients, link) {
if (c->mon == m && c->tags & 1 << (tag - 1) & TAGMASK) { if (c->mon == m && c->tags & 1 << (tag - 1) & TAGMASK) {
if (c->isurgent) { if (c->isurgent) {
@@ -41,8 +41,8 @@ uint32_t get_tag_status(uint32_t tag, Monitor *m) {
return status; return status;
} }
uint32_t get_tags_first_tag_num(uint32_t source_tags) { unsigned int get_tags_first_tag_num(unsigned int source_tags) {
uint32_t i, tag; unsigned int i, tag;
tag = 0; tag = 0;
if (!source_tags) { if (!source_tags) {
@@ -63,8 +63,8 @@ uint32_t get_tags_first_tag_num(uint32_t source_tags) {
} }
// 获取tags中最前面的tag的tagmask // 获取tags中最前面的tag的tagmask
uint32_t get_tags_first_tag(uint32_t source_tags) { unsigned int get_tags_first_tag(unsigned int source_tags) {
uint32_t i, tag; unsigned int i, tag;
tag = 0; tag = 0;
if (!source_tags) { if (!source_tags) {

150
src/layout/arrange.h
View File

@@ -1,15 +1,11 @@
void set_size_per(Monitor *m, Client *c) { void set_size_per(Monitor *m, Client *c) {
Client *fc = NULL; Client *fc = NULL;
bool found = false; bool found = false;
if (!m || !c)
return;
wl_list_for_each(fc, &clients, link) { wl_list_for_each(fc, &clients, link) {
if (VISIBLEON(fc, m) && ISTILED(fc) && fc != c) { if (VISIBLEON(fc, m) && ISTILED(fc) && fc != c) {
c->master_mfact_per = fc->master_mfact_per; c->master_mfact_per = fc->master_mfact_per;
c->master_inner_per = fc->master_inner_per; c->master_inner_per = fc->master_inner_per;
c->stack_inner_per = fc->stack_inner_per; c->stack_innder_per = fc->stack_innder_per;
found = true; found = true;
break; break;
} }
@@ -18,13 +14,12 @@ void set_size_per(Monitor *m, Client *c) {
if (!found) { if (!found) {
c->master_mfact_per = m->pertag->mfacts[m->pertag->curtag]; c->master_mfact_per = m->pertag->mfacts[m->pertag->curtag];
c->master_inner_per = 1.0f; c->master_inner_per = 1.0f;
c->stack_inner_per = 1.0f; c->stack_innder_per = 1.0f;
} }
} }
void resize_tile_master_horizontal(Client *grabc, bool isdrag, int32_t offsetx, void resize_tile_master_horizontal(Client *grabc, bool isdrag, int offsetx,
int32_t offsety, uint32_t time, int offsety, unsigned int time, int type) {
int32_t type) {
Client *tc = NULL; Client *tc = NULL;
float delta_x, delta_y; float delta_x, delta_y;
Client *next = NULL; Client *next = NULL;
@@ -75,7 +70,7 @@ void resize_tile_master_horizontal(Client *grabc, bool isdrag, int32_t offsetx,
// 记录初始状态 // 记录初始状态
grabc->old_master_mfact_per = grabc->master_mfact_per; grabc->old_master_mfact_per = grabc->master_mfact_per;
grabc->old_master_inner_per = grabc->master_inner_per; grabc->old_master_inner_per = grabc->master_inner_per;
grabc->old_stack_inner_per = grabc->stack_inner_per; grabc->old_stack_innder_per = grabc->stack_innder_per;
grabc->cursor_in_upper_half = grabc->cursor_in_upper_half =
cursor->y < grabc->geom.y + grabc->geom.height / 2; cursor->y < grabc->geom.y + grabc->geom.height / 2;
grabc->cursor_in_left_half = grabc->cursor_in_left_half =
@@ -91,7 +86,7 @@ void resize_tile_master_horizontal(Client *grabc, bool isdrag, int32_t offsetx,
} else { } else {
grabc->old_master_mfact_per = grabc->master_mfact_per; grabc->old_master_mfact_per = grabc->master_mfact_per;
grabc->old_master_inner_per = grabc->master_inner_per; grabc->old_master_inner_per = grabc->master_inner_per;
grabc->old_stack_inner_per = grabc->stack_inner_per; grabc->old_stack_innder_per = grabc->stack_innder_per;
grabc->drag_begin_geom = grabc->geom; grabc->drag_begin_geom = grabc->geom;
grabc->cursor_in_upper_half = true; grabc->cursor_in_upper_half = true;
grabc->cursor_in_left_half = false; grabc->cursor_in_left_half = false;
@@ -105,7 +100,7 @@ void resize_tile_master_horizontal(Client *grabc, bool isdrag, int32_t offsetx,
} else { } else {
delta_x = (float)(offsetx) * (1 - grabc->old_master_mfact_per) / delta_x = (float)(offsetx) * (1 - grabc->old_master_mfact_per) /
grabc->drag_begin_geom.width; grabc->drag_begin_geom.width;
delta_y = (float)(offsety) * (grabc->old_stack_inner_per) / delta_y = (float)(offsety) * (grabc->old_stack_innder_per) /
grabc->drag_begin_geom.height; grabc->drag_begin_geom.height;
} }
bool moving_up; bool moving_up;
@@ -187,12 +182,12 @@ void resize_tile_master_horizontal(Client *grabc, bool isdrag, int32_t offsetx,
// 直接设置新的比例，基于初始值 + 变化量 // 直接设置新的比例，基于初始值 + 变化量
float new_master_mfact_per = grabc->old_master_mfact_per + delta_x; float new_master_mfact_per = grabc->old_master_mfact_per + delta_x;
float new_master_inner_per = grabc->old_master_inner_per + delta_y; float new_master_inner_per = grabc->old_master_inner_per + delta_y;
float new_stack_inner_per = grabc->old_stack_inner_per + delta_y; float new_stack_innder_per = grabc->old_stack_innder_per + delta_y;
// 应用限制，确保比例在合理范围内 // 应用限制，确保比例在合理范围内
new_master_mfact_per = fmaxf(0.1f, fminf(0.9f, new_master_mfact_per)); new_master_mfact_per = fmaxf(0.1f, fminf(0.9f, new_master_mfact_per));
new_master_inner_per = fmaxf(0.1f, fminf(0.9f, new_master_inner_per)); new_master_inner_per = fmaxf(0.1f, fminf(0.9f, new_master_inner_per));
new_stack_inner_per = fmaxf(0.1f, fminf(0.9f, new_stack_inner_per)); new_stack_innder_per = fmaxf(0.1f, fminf(0.9f, new_stack_innder_per));
// 应用到所有平铺窗口 // 应用到所有平铺窗口
wl_list_for_each(tc, &clients, link) { wl_list_for_each(tc, &clients, link) {
@@ -202,23 +197,23 @@ void resize_tile_master_horizontal(Client *grabc, bool isdrag, int32_t offsetx,
} }
grabc->master_inner_per = new_master_inner_per; grabc->master_inner_per = new_master_inner_per;
grabc->stack_inner_per = new_stack_inner_per; grabc->stack_innder_per = new_stack_innder_per;
if (!isdrag) { if (!isdrag) {
arrange(grabc->mon, false, false); arrange(grabc->mon, false);
return; return;
} }
if (last_apply_drap_time == 0 || if (last_apply_drap_time == 0 ||
time - last_apply_drap_time > drag_refresh_interval) { time - last_apply_drap_time > drag_refresh_interval) {
arrange(grabc->mon, false, false); arrange(grabc->mon, false);
last_apply_drap_time = time; last_apply_drap_time = time;
} }
} }
} }
void resize_tile_master_vertical(Client *grabc, bool isdrag, int32_t offsetx, void resize_tile_master_vertical(Client *grabc, bool isdrag, int offsetx,
int32_t offsety, uint32_t time, int32_t type) { int offsety, unsigned int time, int type) {
Client *tc = NULL; Client *tc = NULL;
float delta_x, delta_y; float delta_x, delta_y;
Client *next = NULL; Client *next = NULL;
@@ -255,7 +250,7 @@ void resize_tile_master_vertical(Client *grabc, bool isdrag, int32_t offsetx,
// 记录初始状态 // 记录初始状态
grabc->old_master_mfact_per = grabc->master_mfact_per; grabc->old_master_mfact_per = grabc->master_mfact_per;
grabc->old_master_inner_per = grabc->master_inner_per; grabc->old_master_inner_per = grabc->master_inner_per;
grabc->old_stack_inner_per = grabc->stack_inner_per; grabc->old_stack_innder_per = grabc->stack_innder_per;
grabc->cursor_in_upper_half = grabc->cursor_in_upper_half =
cursor->y < grabc->geom.y + grabc->geom.height / 2; cursor->y < grabc->geom.y + grabc->geom.height / 2;
grabc->cursor_in_left_half = grabc->cursor_in_left_half =
@@ -272,7 +267,7 @@ void resize_tile_master_vertical(Client *grabc, bool isdrag, int32_t offsetx,
} else { } else {
grabc->old_master_mfact_per = grabc->master_mfact_per; grabc->old_master_mfact_per = grabc->master_mfact_per;
grabc->old_master_inner_per = grabc->master_inner_per; grabc->old_master_inner_per = grabc->master_inner_per;
grabc->old_stack_inner_per = grabc->stack_inner_per; grabc->old_stack_innder_per = grabc->stack_innder_per;
grabc->drag_begin_geom = grabc->geom; grabc->drag_begin_geom = grabc->geom;
grabc->cursor_in_upper_half = true; grabc->cursor_in_upper_half = true;
grabc->cursor_in_left_half = false; grabc->cursor_in_left_half = false;
@@ -285,7 +280,7 @@ void resize_tile_master_vertical(Client *grabc, bool isdrag, int32_t offsetx,
delta_y = (float)(offsety) * (grabc->old_master_mfact_per) / delta_y = (float)(offsety) * (grabc->old_master_mfact_per) /
grabc->drag_begin_geom.height; grabc->drag_begin_geom.height;
} else { } else {
delta_x = (float)(offsetx) * (grabc->old_stack_inner_per) / delta_x = (float)(offsetx) * (grabc->old_stack_innder_per) /
grabc->drag_begin_geom.width; grabc->drag_begin_geom.width;
delta_y = (float)(offsety) * (1 - grabc->old_master_mfact_per) / delta_y = (float)(offsety) * (1 - grabc->old_master_mfact_per) /
grabc->drag_begin_geom.height; grabc->drag_begin_geom.height;
@@ -343,13 +338,13 @@ void resize_tile_master_vertical(Client *grabc, bool isdrag, int32_t offsetx,
delta_y; // 垂直：delta_y调整主区域高度 delta_y; // 垂直：delta_y调整主区域高度
float new_master_inner_per = grabc->old_master_inner_per + float new_master_inner_per = grabc->old_master_inner_per +
delta_x; // 垂直：delta_x调整主区域内部宽度 delta_x; // 垂直：delta_x调整主区域内部宽度
float new_stack_inner_per = grabc->old_stack_inner_per + float new_stack_innder_per = grabc->old_stack_innder_per +
delta_x; // 垂直：delta_x调整栈区域内部宽度 delta_x; // 垂直：delta_x调整栈区域内部宽度
// 应用限制，确保比例在合理范围内 // 应用限制，确保比例在合理范围内
new_master_mfact_per = fmaxf(0.1f, fminf(0.9f, new_master_mfact_per)); new_master_mfact_per = fmaxf(0.1f, fminf(0.9f, new_master_mfact_per));
new_master_inner_per = fmaxf(0.1f, fminf(0.9f, new_master_inner_per)); new_master_inner_per = fmaxf(0.1f, fminf(0.9f, new_master_inner_per));
new_stack_inner_per = fmaxf(0.1f, fminf(0.9f, new_stack_inner_per)); new_stack_innder_per = fmaxf(0.1f, fminf(0.9f, new_stack_innder_per));
// 应用到所有平铺窗口 // 应用到所有平铺窗口
wl_list_for_each(tc, &clients, link) { wl_list_for_each(tc, &clients, link) {
@@ -359,23 +354,23 @@ void resize_tile_master_vertical(Client *grabc, bool isdrag, int32_t offsetx,
} }
grabc->master_inner_per = new_master_inner_per; grabc->master_inner_per = new_master_inner_per;
grabc->stack_inner_per = new_stack_inner_per; grabc->stack_innder_per = new_stack_innder_per;
if (!isdrag) { if (!isdrag) {
arrange(grabc->mon, false, false); arrange(grabc->mon, false);
return; return;
} }
if (last_apply_drap_time == 0 || if (last_apply_drap_time == 0 ||
time - last_apply_drap_time > drag_refresh_interval) { time - last_apply_drap_time > drag_refresh_interval) {
arrange(grabc->mon, false, false); arrange(grabc->mon, false);
last_apply_drap_time = time; last_apply_drap_time = time;
} }
} }
} }
void resize_tile_scroller(Client *grabc, bool isdrag, int32_t offsetx, void resize_tile_scroller(Client *grabc, bool isdrag, int offsetx, int offsety,
int32_t offsety, uint32_t time, bool isvertical) { unsigned int time, bool isvertical) {
float delta_x, delta_y; float delta_x, delta_y;
float new_scroller_proportion; float new_scroller_proportion;
@@ -407,7 +402,7 @@ void resize_tile_scroller(Client *grabc, bool isdrag, int32_t offsetx,
} else { } else {
grabc->old_master_mfact_per = grabc->master_mfact_per; grabc->old_master_mfact_per = grabc->master_mfact_per;
grabc->old_master_inner_per = grabc->master_inner_per; grabc->old_master_inner_per = grabc->master_inner_per;
grabc->old_stack_inner_per = grabc->stack_inner_per; grabc->old_stack_innder_per = grabc->stack_innder_per;
grabc->drag_begin_geom = grabc->geom; grabc->drag_begin_geom = grabc->geom;
grabc->old_scroller_pproportion = grabc->scroller_proportion; grabc->old_scroller_pproportion = grabc->scroller_proportion;
grabc->cursor_in_upper_half = false; grabc->cursor_in_upper_half = false;
@@ -466,20 +461,20 @@ void resize_tile_scroller(Client *grabc, bool isdrag, int32_t offsetx,
grabc->scroller_proportion = new_scroller_proportion; grabc->scroller_proportion = new_scroller_proportion;
if (!isdrag) { if (!isdrag) {
arrange(grabc->mon, false, false); arrange(grabc->mon, false);
return; return;
} }
if (last_apply_drap_time == 0 || if (last_apply_drap_time == 0 ||
time - last_apply_drap_time > drag_refresh_interval) { time - last_apply_drap_time > drag_refresh_interval) {
arrange(grabc->mon, false, false); arrange(grabc->mon, false);
last_apply_drap_time = time; last_apply_drap_time = time;
} }
} }
} }
void resize_tile_client(Client *grabc, bool isdrag, int32_t offsetx, void resize_tile_client(Client *grabc, bool isdrag, int offsetx, int offsety,
int32_t offsety, uint32_t time) { unsigned int time) {
if (!grabc || grabc->isfullscreen || grabc->ismaximizescreen) if (!grabc || grabc->isfullscreen || grabc->ismaximizescreen)
return; return;
@@ -490,8 +485,7 @@ void resize_tile_client(Client *grabc, bool isdrag, int32_t offsetx,
const Layout *current_layout = const Layout *current_layout =
grabc->mon->pertag->ltidxs[grabc->mon->pertag->curtag]; grabc->mon->pertag->ltidxs[grabc->mon->pertag->curtag];
if (current_layout->id == TILE || current_layout->id == DECK || if (current_layout->id == TILE || current_layout->id == DECK ||
current_layout->id == CENTER_TILE || current_layout->id == RIGHT_TILE || current_layout->id == CENTER_TILE || current_layout->id == RIGHT_TILE
(current_layout->id == TGMIX && grabc->mon->visible_tiling_clients <= 3)
) { ) {
resize_tile_master_horizontal(grabc, isdrag, offsetx, offsety, time, resize_tile_master_horizontal(grabc, isdrag, offsetx, offsety, time,
@@ -507,33 +501,35 @@ void resize_tile_client(Client *grabc, bool isdrag, int32_t offsetx,
} }
} }
void reset_size_per_mon(Monitor *m, int32_t tile_cilent_num, void reset_size_per_mon(Monitor *m, int tile_cilent_num,
double total_left_stack_hight_percent, double total_left_stack_hight_percent,
double total_right_stack_hight_percent, double total_right_stack_hight_percent,
double total_stack_hight_percent, double total_stack_hight_percent,
double total_master_inner_percent, int32_t master_num, double total_master_inner_percent, int master_num,
int32_t stack_num) { int stack_num) {
Client *c = NULL; Client *c = NULL;
int32_t i = 0; int i = 0;
uint32_t stack_index = 0; unsigned int stack_index = 0;
uint32_t nmasters = m->pertag->nmasters[m->pertag->curtag]; unsigned int nmasters = m->pertag->nmasters[m->pertag->curtag];
if (m->pertag->ltidxs[m->pertag->curtag]->id != CENTER_TILE) { if (m->pertag->ltidxs[m->pertag->curtag]->id != CENTER_TILE) {
wl_list_for_each(c, &clients, link) { wl_list_for_each(c, &clients, link) {
if (VISIBLEON(c, m) && ISTILED(c)) { if (VISIBLEON(c, m) && ISTILED(c)) {
if (total_master_inner_percent > 0.0 && i < nmasters) {
if (total_master_inner_percent <= 0.0)
return;
if (i < m->pertag->nmasters[m->pertag->curtag]) {
c->ismaster = true; c->ismaster = true;
c->stack_inner_per = stack_num ? 1.0f / stack_num : 1.0f; c->stack_innder_per = stack_num ? 1.0f / stack_num : 1.0f;
c->master_inner_per = c->master_inner_per =
c->master_inner_per / total_master_inner_percent; c->master_inner_per / total_master_inner_percent;
} else { } else {
c->ismaster = false; c->ismaster = false;
c->master_inner_per = c->master_inner_per = 1.0f / master_num;
master_num > 0 ? 1.0f / master_num : 1.0f; c->stack_innder_per =
c->stack_inner_per =
total_stack_hight_percent total_stack_hight_percent
? c->stack_inner_per / total_stack_hight_percent ? c->stack_innder_per / total_stack_hight_percent
: 1.0f; : 1.0f;
} }
i++; i++;
@@ -542,14 +538,17 @@ void reset_size_per_mon(Monitor *m, int32_t tile_cilent_num,
} else { } else {
wl_list_for_each(c, &clients, link) { wl_list_for_each(c, &clients, link) {
if (VISIBLEON(c, m) && ISTILED(c)) { if (VISIBLEON(c, m) && ISTILED(c)) {
if (total_master_inner_percent > 0.0 && i < nmasters) {
if (total_master_inner_percent <= 0.0)
return;
if (i < m->pertag->nmasters[m->pertag->curtag]) {
c->ismaster = true; c->ismaster = true;
if ((stack_index % 2) ^ (tile_cilent_num % 2 == 0)) { if ((stack_index % 2) ^ (tile_cilent_num % 2 == 0)) {
c->stack_inner_per = c->stack_innder_per =
stack_num > 1 ? 1.0f / ((stack_num - 1) / 2) : 1.0f; stack_num > 1 ? 1.0f / ((stack_num - 1) / 2) : 1.0f;
} else { } else {
c->stack_inner_per = c->stack_innder_per =
stack_num > 1 ? 2.0f / stack_num : 1.0f; stack_num > 1 ? 2.0f / stack_num : 1.0f;
} }
@@ -559,18 +558,17 @@ void reset_size_per_mon(Monitor *m, int32_t tile_cilent_num,
stack_index = i - nmasters; stack_index = i - nmasters;
c->ismaster = false; c->ismaster = false;
c->master_inner_per = c->master_inner_per = 1.0f / master_num;
master_num > 0 ? 1.0f / master_num : 1.0f;
if ((stack_index % 2) ^ (tile_cilent_num % 2 == 0)) { if ((stack_index % 2) ^ (tile_cilent_num % 2 == 0)) {
c->stack_inner_per = c->stack_innder_per =
total_right_stack_hight_percent total_right_stack_hight_percent
? c->stack_inner_per / ? c->stack_innder_per /
total_right_stack_hight_percent total_right_stack_hight_percent
: 1.0f; : 1.0f;
} else { } else {
c->stack_inner_per = c->stack_innder_per =
total_left_stack_hight_percent total_left_stack_hight_percent
? c->stack_inner_per / ? c->stack_innder_per /
total_left_stack_hight_percent total_left_stack_hight_percent
: 1.0f; : 1.0f;
} }
@@ -582,17 +580,17 @@ void reset_size_per_mon(Monitor *m, int32_t tile_cilent_num,
} }
void // 17 void // 17
arrange(Monitor *m, bool want_animation, bool from_view) { arrange(Monitor *m, bool want_animation) {
Client *c = NULL; Client *c = NULL;
double total_stack_inner_percent = 0; double total_stack_innder_percent = 0;
double total_master_inner_percent = 0; double total_master_inner_percent = 0;
double total_right_stack_hight_percent = 0; double total_right_stack_hight_percent = 0;
double total_left_stack_hight_percent = 0; double total_left_stack_hight_percent = 0;
int32_t i = 0; int i = 0;
int32_t nmasters = 0; int nmasters = 0;
int32_t stack_index = 0; int stack_index = 0;
int32_t master_num = 0; int master_num = 0;
int32_t stack_num = 0; int stack_num = 0;
if (!m) if (!m)
return; return;
@@ -602,13 +600,10 @@ arrange(Monitor *m, bool want_animation, bool from_view) {
m->visible_clients = 0; m->visible_clients = 0;
m->visible_tiling_clients = 0; m->visible_tiling_clients = 0;
m->visible_scroll_tiling_clients = 0; m->visible_scroll_tiling_clients = 0;
m->has_visible_fullscreen_client = false;
wl_list_for_each(c, &clients, link) { wl_list_for_each(c, &clients, link) {
if (from_view && (c->isglobal || c->isunglobal)) {
set_size_per(m, c);
}
if (c->mon == m && (c->isglobal || c->isunglobal)) { if (c->mon == m && (c->isglobal || c->isunglobal)) {
c->tags = m->tagset[m->seltags]; c->tags = m->tagset[m->seltags];
if (c->mon->sel == NULL) if (c->mon->sel == NULL)
@@ -616,13 +611,12 @@ arrange(Monitor *m, bool want_animation, bool from_view) {
} }
if (VISIBLEON(c, m)) { if (VISIBLEON(c, m)) {
if (from_view && !client_only_in_one_tag(c)) {
set_size_per(m, c);
}
if (!c->isunglobal) if (!c->isunglobal)
m->visible_clients++; m->visible_clients++;
if (c->isfullscreen)
m->has_visible_fullscreen_client = true;
if (ISTILED(c)) { if (ISTILED(c)) {
m->visible_tiling_clients++; m->visible_tiling_clients++;
} }
@@ -643,22 +637,22 @@ arrange(Monitor *m, bool want_animation, bool from_view) {
if (VISIBLEON(c, m)) { if (VISIBLEON(c, m)) {
if (ISTILED(c)) { if (ISTILED(c)) {
if (i < nmasters) { if (i < m->pertag->nmasters[m->pertag->curtag]) {
master_num++; master_num++;
total_master_inner_percent += c->master_inner_per; total_master_inner_percent += c->master_inner_per;
} else { } else {
stack_num++; stack_num++;
total_stack_inner_percent += c->stack_inner_per; total_stack_innder_percent += c->stack_innder_per;
stack_index = i - nmasters; stack_index = i - nmasters;
if ((stack_index % 2) ^ if ((stack_index % 2) ^
(m->visible_tiling_clients % 2 == 0)) { (m->visible_tiling_clients % 2 == 0)) {
c->isleftstack = false; c->isleftstack = false;
total_right_stack_hight_percent += total_right_stack_hight_percent +=
c->stack_inner_per; c->stack_innder_per;
} else { } else {
c->isleftstack = true; c->isleftstack = true;
total_left_stack_hight_percent += total_left_stack_hight_percent +=
c->stack_inner_per; c->stack_innder_per;
} }
} }
@@ -679,7 +673,7 @@ arrange(Monitor *m, bool want_animation, bool from_view) {
reset_size_per_mon( reset_size_per_mon(
m, m->visible_tiling_clients, total_left_stack_hight_percent, m, m->visible_tiling_clients, total_left_stack_hight_percent,
total_right_stack_hight_percent, total_stack_inner_percent, total_right_stack_hight_percent, total_stack_innder_percent,
total_master_inner_percent, master_num, stack_num); total_master_inner_percent, master_num, stack_num);
if (m->isoverview) { if (m->isoverview) {
@@ -692,6 +686,4 @@ arrange(Monitor *m, bool want_animation, bool from_view) {
motionnotify(0, NULL, 0, 0, 0, 0); motionnotify(0, NULL, 0, 0, 0, 0);
checkidleinhibitor(NULL); checkidleinhibitor(NULL);
} }
printstatus();
} }

244
src/layout/horizontal.h
View File

@@ -1,15 +1,13 @@
// 网格布局窗口大小和位置计算 // 网格布局窗口大小和位置计算
void grid(Monitor *m) { void grid(Monitor *m) {
int32_t i, n; unsigned int i, n;
int32_t cx, cy, cw, ch; unsigned int cx, cy, cw, ch;
int32_t dx; unsigned int dx;
int32_t cols, rows, overcols; unsigned int cols, rows, overcols;
Client *c = NULL; Client *c = NULL;
n = 0; n = 0;
int32_t target_gappo = int target_gappo = enablegaps ? m->isoverview ? overviewgappo : gappoh : 0;
enablegaps ? m->isoverview ? overviewgappo : gappoh : 0; int target_gappi = enablegaps ? m->isoverview ? overviewgappi : gappih : 0;
int32_t target_gappi =
enablegaps ? m->isoverview ? overviewgappi : gappih : 0;
float single_width_ratio = m->isoverview ? 0.7 : 0.9; float single_width_ratio = m->isoverview ? 0.7 : 0.9;
float single_height_ratio = m->isoverview ? 0.8 : 0.9; float single_height_ratio = m->isoverview ? 0.8 : 0.9;
@@ -25,6 +23,10 @@ void grid(Monitor *m) {
if (c->mon != m) if (c->mon != m)
continue; continue;
c->bw = m->visible_tiling_clients == 1 && no_border_when_single &&
smartgaps
? 0
: borderpx;
if (VISIBLEON(c, m) && !c->isunglobal && if (VISIBLEON(c, m) && !c->isunglobal &&
((m->isoverview && !client_is_x11_popup(c)) || ISTILED(c))) { ((m->isoverview && !client_is_x11_popup(c)) || ISTILED(c))) {
cw = (m->w.width - 2 * target_gappo) * single_width_ratio; cw = (m->w.width - 2 * target_gappo) * single_width_ratio;
@@ -47,6 +49,10 @@ void grid(Monitor *m) {
if (c->mon != m) if (c->mon != m)
continue; continue;
c->bw = m->visible_tiling_clients == 1 && no_border_when_single &&
smartgaps
? 0
: borderpx;
if (VISIBLEON(c, m) && !c->isunglobal && if (VISIBLEON(c, m) && !c->isunglobal &&
((m->isoverview && !client_is_x11_popup(c)) || ISTILED(c))) { ((m->isoverview && !client_is_x11_popup(c)) || ISTILED(c))) {
if (i == 0) { if (i == 0) {
@@ -93,7 +99,10 @@ void grid(Monitor *m) {
if (c->mon != m) if (c->mon != m)
continue; continue;
c->bw =
m->visible_tiling_clients == 1 && no_border_when_single && smartgaps
? 0
: borderpx;
if (VISIBLEON(c, m) && !c->isunglobal && if (VISIBLEON(c, m) && !c->isunglobal &&
((m->isoverview && !client_is_x11_popup(c)) || ISTILED(c))) { ((m->isoverview && !client_is_x11_popup(c)) || ISTILED(c))) {
cx = m->w.x + (i % cols) * (cw + target_gappi); cx = m->w.x + (i % cols) * (cw + target_gappi);
@@ -112,15 +121,15 @@ void grid(Monitor *m) {
} }
void deck(Monitor *m) { void deck(Monitor *m) {
int32_t mw, my; unsigned int mw, my;
int32_t i, n = 0; int i, n = 0;
Client *c = NULL; Client *c = NULL;
Client *fc = NULL; Client *fc = NULL;
float mfact; float mfact;
int32_t cur_gappih = enablegaps ? m->gappih : 0; unsigned int cur_gappih = enablegaps ? m->gappih : 0;
int32_t cur_gappoh = enablegaps ? m->gappoh : 0; unsigned int cur_gappoh = enablegaps ? m->gappoh : 0;
int32_t cur_gappov = enablegaps ? m->gappov : 0; unsigned int cur_gappov = enablegaps ? m->gappov : 0;
cur_gappih = smartgaps && m->visible_tiling_clients == 1 ? 0 : cur_gappih; cur_gappih = smartgaps && m->visible_tiling_clients == 1 ? 0 : cur_gappih;
cur_gappoh = smartgaps && m->visible_tiling_clients == 1 ? 0 : cur_gappoh; cur_gappoh = smartgaps && m->visible_tiling_clients == 1 ? 0 : cur_gappoh;
@@ -183,9 +192,9 @@ void deck(Monitor *m) {
void horizontal_scroll_adjust_fullandmax(Client *c, void horizontal_scroll_adjust_fullandmax(Client *c,
struct wlr_box *target_geom) { struct wlr_box *target_geom) {
Monitor *m = c->mon; Monitor *m = c->mon;
int32_t cur_gappih = enablegaps ? m->gappih : 0; unsigned int cur_gappih = enablegaps ? m->gappih : 0;
int32_t cur_gappoh = enablegaps ? m->gappoh : 0; unsigned int cur_gappoh = enablegaps ? m->gappoh : 0;
int32_t cur_gappov = enablegaps ? m->gappov : 0; unsigned int cur_gappov = enablegaps ? m->gappov : 0;
cur_gappih = cur_gappih =
smartgaps && m->visible_scroll_tiling_clients == 1 ? 0 : cur_gappih; smartgaps && m->visible_scroll_tiling_clients == 1 ? 0 : cur_gappih;
@@ -214,17 +223,17 @@ void horizontal_scroll_adjust_fullandmax(Client *c,
// 滚动布局 // 滚动布局
void scroller(Monitor *m) { void scroller(Monitor *m) {
int32_t i, n, j; unsigned int i, n, j;
float single_proportion = 1.0; float single_proportion = 1.0;
Client *c = NULL, *root_client = NULL; Client *c = NULL, *root_client = NULL;
Client **tempClients = NULL; // 初始化为 NULL Client **tempClients = NULL; // 初始化为 NULL
struct wlr_box target_geom; struct wlr_box target_geom;
int32_t focus_client_index = 0; int focus_client_index = 0;
bool need_scroller = false; bool need_scroller = false;
int32_t cur_gappih = enablegaps ? m->gappih : 0; unsigned int cur_gappih = enablegaps ? m->gappih : 0;
int32_t cur_gappoh = enablegaps ? m->gappoh : 0; unsigned int cur_gappoh = enablegaps ? m->gappoh : 0;
int32_t cur_gappov = enablegaps ? m->gappov : 0; unsigned int cur_gappov = enablegaps ? m->gappov : 0;
cur_gappih = cur_gappih =
smartgaps && m->visible_scroll_tiling_clients == 1 ? 0 : cur_gappih; smartgaps && m->visible_scroll_tiling_clients == 1 ? 0 : cur_gappih;
@@ -233,7 +242,8 @@ void scroller(Monitor *m) {
cur_gappov = cur_gappov =
smartgaps && m->visible_scroll_tiling_clients == 1 ? 0 : cur_gappov; smartgaps && m->visible_scroll_tiling_clients == 1 ? 0 : cur_gappov;
int32_t max_client_width = m->w.width - 2 * scroller_structs - cur_gappih; unsigned int max_client_width =
m->w.width - 2 * scroller_structs - cur_gappih;
n = m->visible_scroll_tiling_clients; n = m->visible_scroll_tiling_clients;
@@ -274,7 +284,7 @@ void scroller(Monitor *m) {
return; return;
} }
if (m->sel && !client_is_unmanaged(m->sel) && ISSCROLLTILED(m->sel)) { if (m->sel && !client_is_unmanaged(m->sel) && !m->sel->isfloating) {
root_client = m->sel; root_client = m->sel;
} else if (m->prevsel && ISSCROLLTILED(m->prevsel) && } else if (m->prevsel && ISSCROLLTILED(m->prevsel) &&
VISIBLEON(m->prevsel, m) && !client_is_unmanaged(m->prevsel)) { VISIBLEON(m->prevsel, m) && !client_is_unmanaged(m->prevsel)) {
@@ -368,17 +378,15 @@ void scroller(Monitor *m) {
} }
void center_tile(Monitor *m) { void center_tile(Monitor *m) {
int32_t i, n = 0, h, r, ie = enablegaps, mw, mx, my, oty, ety, tw; unsigned int i, n = 0, h, r, ie = enablegaps, mw, mx, my, oty, ety, tw;
Client *c = NULL; Client *c = NULL;
Client *fc = NULL; Client *fc = NULL;
double mfact = 0; double mfact = 0;
int32_t master_num = 0; int master_num = 0;
int32_t stack_num = 0; int stack_num = 0;
n = m->visible_tiling_clients; n = m->visible_tiling_clients;
master_num = m->pertag->nmasters[m->pertag->curtag]; master_num = m->pertag->nmasters[m->pertag->curtag];
master_num = n > master_num ? master_num : n;
stack_num = n - master_num; stack_num = n - master_num;
if (n == 0) if (n == 0)
@@ -391,10 +399,10 @@ void center_tile(Monitor *m) {
} }
// 间隙参数处理 // 间隙参数处理
int32_t cur_gappiv = enablegaps ? m->gappiv : 0; // 内部垂直间隙 unsigned int cur_gappiv = enablegaps ? m->gappiv : 0; // 内部垂直间隙
int32_t cur_gappih = enablegaps ? m->gappih : 0; // 内部水平间隙 unsigned int cur_gappih = enablegaps ? m->gappih : 0; // 内部水平间隙
int32_t cur_gappov = enablegaps ? m->gappov : 0; // 外部垂直间隙 unsigned int cur_gappov = enablegaps ? m->gappov : 0; // 外部垂直间隙
int32_t cur_gappoh = enablegaps ? m->gappoh : 0; // 外部水平间隙 unsigned int cur_gappoh = enablegaps ? m->gappoh : 0; // 外部水平间隙
// 智能间隙处理 // 智能间隙处理
cur_gappiv = smartgaps && m->visible_tiling_clients == 1 ? 0 : cur_gappiv; cur_gappiv = smartgaps && m->visible_tiling_clients == 1 ? 0 : cur_gappiv;
@@ -402,7 +410,7 @@ void center_tile(Monitor *m) {
cur_gappov = smartgaps && m->visible_tiling_clients == 1 ? 0 : cur_gappov; cur_gappov = smartgaps && m->visible_tiling_clients == 1 ? 0 : cur_gappov;
cur_gappoh = smartgaps && m->visible_tiling_clients == 1 ? 0 : cur_gappoh; cur_gappoh = smartgaps && m->visible_tiling_clients == 1 ? 0 : cur_gappoh;
int32_t nmasters = m->pertag->nmasters[m->pertag->curtag]; unsigned int nmasters = m->pertag->nmasters[m->pertag->curtag];
mfact = fc->master_mfact_per > 0.0f ? fc->master_mfact_per mfact = fc->master_mfact_per > 0.0f ? fc->master_mfact_per
: m->pertag->mfacts[m->pertag->curtag]; : m->pertag->mfacts[m->pertag->curtag];
@@ -413,20 +421,7 @@ void center_tile(Monitor *m) {
tw = mw; tw = mw;
// 判断是否需要主区域铺满 // 判断是否需要主区域铺满
int32_t should_overspread = center_master_overspread && (n <= nmasters); int should_overspread = center_master_overspread && (n <= nmasters);
int32_t master_surplus_height =
(m->w.height - 2 * cur_gappov - cur_gappiv * ie * (master_num - 1));
float master_surplus_ratio = 1.0;
int32_t slave_left_surplus_height =
(m->w.height - 2 * cur_gappov - cur_gappiv * ie * (stack_num / 2 - 1));
float slave_left_surplus_ratio = 1.0;
int32_t slave_right_surplus_height =
(m->w.height - 2 * cur_gappov -
cur_gappiv * ie * ((stack_num + 1) / 2 - 1));
float slave_right_surplus_ratio = 1.0;
if (n > nmasters || !should_overspread) { if (n > nmasters || !should_overspread) {
// 计算主区域宽度（居中模式） // 计算主区域宽度（居中模式）
@@ -472,11 +467,9 @@ void center_tile(Monitor *m) {
// 主区域窗口 // 主区域窗口
r = MIN(n, nmasters) - i; r = MIN(n, nmasters) - i;
if (c->master_inner_per > 0.0f) { if (c->master_inner_per > 0.0f) {
h = master_surplus_height * c->master_inner_per / h = (m->w.height - 2 * cur_gappov -
master_surplus_ratio; cur_gappiv * ie * (master_num - 1)) *
master_surplus_height = master_surplus_height - h; c->master_inner_per;
master_surplus_ratio =
master_surplus_ratio - c->master_inner_per;
c->master_mfact_per = mfact; c->master_mfact_per = mfact;
} else { } else {
h = (m->w.height - my - cur_gappov - h = (m->w.height - my - cur_gappov -
@@ -496,26 +489,26 @@ void center_tile(Monitor *m) {
my += c->geom.height + cur_gappiv * ie; my += c->geom.height + cur_gappiv * ie;
} else { } else {
// 堆叠区域窗口 // 堆叠区域窗口
int32_t stack_index = i - nmasters; unsigned int stack_index = i - nmasters;
if (n - nmasters == 1) { if (n - nmasters == 1) {
// 单个堆叠窗口 // 单个堆叠窗口
r = n - i; r = n - i;
if (c->stack_inner_per > 0.0f) { if (c->stack_innder_per > 0.0f) {
h = (m->w.height - 2 * cur_gappov - h = (m->w.height - 2 * cur_gappov -
cur_gappiv * ie * (stack_num - 1)) * cur_gappiv * ie * (stack_num - 1)) *
c->stack_inner_per; c->stack_innder_per;
c->master_mfact_per = mfact; c->master_mfact_per = mfact;
} else { } else {
h = (m->w.height - ety - cur_gappov - h = (m->w.height - ety - cur_gappov -
cur_gappiv * ie * (r - 1)) / cur_gappiv * ie * (r - 1)) /
r; r;
c->stack_inner_per = h / (m->w.height - ety - cur_gappov - c->stack_innder_per = h / (m->w.height - ety - cur_gappov -
cur_gappiv * ie * (r - 1)); cur_gappiv * ie * (r - 1));
c->master_mfact_per = mfact; c->master_mfact_per = mfact;
} }
int32_t stack_x; int stack_x;
if (center_when_single_stack) { if (center_when_single_stack) {
// 放在右侧（master居中时，stack在右边） // 放在右侧（master居中时，stack在右边）
stack_x = m->w.x + mx + mw + cur_gappih * ie; stack_x = m->w.x + mx + mw + cur_gappih * ie;
@@ -537,25 +530,22 @@ void center_tile(Monitor *m) {
if ((stack_index % 2) ^ (n % 2 == 0)) { if ((stack_index % 2) ^ (n % 2 == 0)) {
// 右侧堆叠窗口 // 右侧堆叠窗口
if (c->stack_inner_per > 0.0f) { if (c->stack_innder_per > 0.0f) {
h = slave_right_surplus_height * c->stack_inner_per / h = (m->w.height - 2 * cur_gappov -
slave_right_surplus_ratio; cur_gappiv * ie * ((stack_num + 1) / 2 - 1)) *
slave_right_surplus_height = c->stack_innder_per;
slave_right_surplus_height - h;
slave_right_surplus_ratio =
slave_right_surplus_ratio - c->stack_inner_per;
c->master_mfact_per = mfact; c->master_mfact_per = mfact;
} else { } else {
h = (m->w.height - ety - cur_gappov - h = (m->w.height - ety - cur_gappov -
cur_gappiv * ie * (r - 1)) / cur_gappiv * ie * (r - 1)) /
r; r;
c->stack_inner_per = c->stack_innder_per =
h / (m->w.height - ety - cur_gappov - h / (m->w.height - ety - cur_gappov -
cur_gappiv * ie * (r - 1)); cur_gappiv * ie * (r - 1));
c->master_mfact_per = mfact; c->master_mfact_per = mfact;
} }
int32_t stack_x = m->w.x + mx + mw + cur_gappih * ie; int stack_x = m->w.x + mx + mw + cur_gappih * ie;
resize(c, resize(c,
(struct wlr_box){.x = stack_x, (struct wlr_box){.x = stack_x,
@@ -566,25 +556,22 @@ void center_tile(Monitor *m) {
ety += c->geom.height + cur_gappiv * ie; ety += c->geom.height + cur_gappiv * ie;
} else { } else {
// 左侧堆叠窗口 // 左侧堆叠窗口
if (c->stack_inner_per > 0.0f) { if (c->stack_innder_per > 0.0f) {
h = slave_left_surplus_height * c->stack_inner_per / h = (m->w.height - 2 * cur_gappov -
slave_left_surplus_ratio; cur_gappiv * ie * (stack_num / 2 - 1)) *
slave_left_surplus_height = c->stack_innder_per;
slave_left_surplus_height - h;
slave_left_surplus_ratio =
slave_left_surplus_ratio - c->stack_inner_per;
c->master_mfact_per = mfact; c->master_mfact_per = mfact;
} else { } else {
h = (m->w.height - oty - cur_gappov - h = (m->w.height - oty - cur_gappov -
cur_gappiv * ie * (r - 1)) / cur_gappiv * ie * (r - 1)) /
r; r;
c->stack_inner_per = c->stack_innder_per =
h / (m->w.height - oty - cur_gappov - h / (m->w.height - oty - cur_gappov -
cur_gappiv * ie * (r - 1)); cur_gappiv * ie * (r - 1));
c->master_mfact_per = mfact; c->master_mfact_per = mfact;
} }
int32_t stack_x = m->w.x + cur_gappoh; int stack_x = m->w.x + cur_gappoh;
resize(c, resize(c,
(struct wlr_box){.x = stack_x, (struct wlr_box){.x = stack_x,
.y = m->w.y + oty, .y = m->w.y + oty,
@@ -600,25 +587,24 @@ void center_tile(Monitor *m) {
} }
void tile(Monitor *m) { void tile(Monitor *m) {
int32_t i, n = 0, h, r, ie = enablegaps, mw, my, ty; unsigned int i, n = 0, h, r, ie = enablegaps, mw, my, ty;
Client *c = NULL; Client *c = NULL;
Client *fc = NULL; Client *fc = NULL;
double mfact = 0; double mfact = 0;
int32_t master_num = 0; int master_num = 0;
int32_t stack_num = 0; int stack_num = 0;
n = m->visible_tiling_clients; n = m->visible_tiling_clients;
master_num = m->pertag->nmasters[m->pertag->curtag]; master_num = m->pertag->nmasters[m->pertag->curtag];
master_num = n > master_num ? master_num : n;
stack_num = n - master_num; stack_num = n - master_num;
if (n == 0) if (n == 0)
return; return;
int32_t cur_gappiv = enablegaps ? m->gappiv : 0; unsigned int cur_gappiv = enablegaps ? m->gappiv : 0;
int32_t cur_gappih = enablegaps ? m->gappih : 0; unsigned int cur_gappih = enablegaps ? m->gappih : 0;
int32_t cur_gappov = enablegaps ? m->gappov : 0; unsigned int cur_gappov = enablegaps ? m->gappov : 0;
int32_t cur_gappoh = enablegaps ? m->gappoh : 0; unsigned int cur_gappoh = enablegaps ? m->gappoh : 0;
cur_gappiv = smartgaps && m->visible_tiling_clients == 1 ? 0 : cur_gappiv; cur_gappiv = smartgaps && m->visible_tiling_clients == 1 ? 0 : cur_gappiv;
cur_gappih = smartgaps && m->visible_tiling_clients == 1 ? 0 : cur_gappih; cur_gappih = smartgaps && m->visible_tiling_clients == 1 ? 0 : cur_gappih;
@@ -642,26 +628,15 @@ void tile(Monitor *m) {
mw = m->w.width - 2 * cur_gappoh + cur_gappih * ie; mw = m->w.width - 2 * cur_gappoh + cur_gappih * ie;
i = 0; i = 0;
my = ty = cur_gappov; my = ty = cur_gappov;
int32_t master_surplus_height =
(m->w.height - 2 * cur_gappov - cur_gappiv * ie * (master_num - 1));
float master_surplus_ratio = 1.0;
int32_t slave_surplus_height =
(m->w.height - 2 * cur_gappov - cur_gappiv * ie * (stack_num - 1));
float slave_surplus_ratio = 1.0;
wl_list_for_each(c, &clients, link) { wl_list_for_each(c, &clients, link) {
if (!VISIBLEON(c, m) || !ISTILED(c)) if (!VISIBLEON(c, m) || !ISTILED(c))
continue; continue;
if (i < m->pertag->nmasters[m->pertag->curtag]) { if (i < m->pertag->nmasters[m->pertag->curtag]) {
r = MIN(n, m->pertag->nmasters[m->pertag->curtag]) - i; r = MIN(n, m->pertag->nmasters[m->pertag->curtag]) - i;
if (c->master_inner_per > 0.0f) { if (c->master_inner_per > 0.0f) {
h = master_surplus_height * c->master_inner_per / h = (m->w.height - 2 * cur_gappov -
master_surplus_ratio; cur_gappiv * ie * (master_num - 1)) *
master_surplus_height = master_surplus_height - h; c->master_inner_per;
master_surplus_ratio =
master_surplus_ratio - c->master_inner_per;
c->master_mfact_per = mfact; c->master_mfact_per = mfact;
} else { } else {
h = (m->w.height - my - cur_gappov - h = (m->w.height - my - cur_gappov -
@@ -680,22 +655,21 @@ void tile(Monitor *m) {
my += c->geom.height + cur_gappiv * ie; my += c->geom.height + cur_gappiv * ie;
} else { } else {
r = n - i; r = n - i;
if (c->stack_inner_per > 0.0f) { if (c->stack_innder_per > 0.0f) {
h = slave_surplus_height * c->stack_inner_per / h = (m->w.height - 2 * cur_gappov -
slave_surplus_ratio; cur_gappiv * ie * (stack_num - 1)) *
slave_surplus_height = slave_surplus_height - h; c->stack_innder_per;
slave_surplus_ratio = slave_surplus_ratio - c->stack_inner_per;
c->master_mfact_per = mfact; c->master_mfact_per = mfact;
} else { } else {
h = (m->w.height - ty - cur_gappov - h = (m->w.height - ty - cur_gappov -
cur_gappiv * ie * (r - 1)) / cur_gappiv * ie * (r - 1)) /
r; r;
c->stack_inner_per = h / (m->w.height - ty - cur_gappov - c->stack_innder_per = h / (m->w.height - ty - cur_gappov -
cur_gappiv * ie * (r - 1)); cur_gappiv * ie * (r - 1));
c->master_mfact_per = mfact; c->master_mfact_per = mfact;
} }
// wlr_log(WLR_ERROR, "stack_inner_per: %f", c->stack_inner_per); // wlr_log(WLR_ERROR, "stack_innder_per: %f", c->stack_innder_per);
resize(c, resize(c,
(struct wlr_box){.x = m->w.x + mw + cur_gappoh, (struct wlr_box){.x = m->w.x + mw + cur_gappoh,
@@ -710,25 +684,24 @@ void tile(Monitor *m) {
} }
void right_tile(Monitor *m) { void right_tile(Monitor *m) {
int32_t i, n = 0, h, r, ie = enablegaps, mw, my, ty; unsigned int i, n = 0, h, r, ie = enablegaps, mw, my, ty;
Client *c = NULL; Client *c = NULL;
Client *fc = NULL; Client *fc = NULL;
double mfact = 0; double mfact = 0;
int32_t master_num = 0; int master_num = 0;
int32_t stack_num = 0; int stack_num = 0;
n = m->visible_tiling_clients; n = m->visible_tiling_clients;
master_num = m->pertag->nmasters[m->pertag->curtag]; master_num = m->pertag->nmasters[m->pertag->curtag];
master_num = n > master_num ? master_num : n;
stack_num = n - master_num; stack_num = n - master_num;
if (n == 0) if (n == 0)
return; return;
int32_t cur_gappiv = enablegaps ? m->gappiv : 0; unsigned int cur_gappiv = enablegaps ? m->gappiv : 0;
int32_t cur_gappih = enablegaps ? m->gappih : 0; unsigned int cur_gappih = enablegaps ? m->gappih : 0;
int32_t cur_gappov = enablegaps ? m->gappov : 0; unsigned int cur_gappov = enablegaps ? m->gappov : 0;
int32_t cur_gappoh = enablegaps ? m->gappoh : 0; unsigned int cur_gappoh = enablegaps ? m->gappoh : 0;
cur_gappiv = smartgaps && m->visible_tiling_clients == 1 ? 0 : cur_gappiv; cur_gappiv = smartgaps && m->visible_tiling_clients == 1 ? 0 : cur_gappiv;
cur_gappih = smartgaps && m->visible_tiling_clients == 1 ? 0 : cur_gappih; cur_gappih = smartgaps && m->visible_tiling_clients == 1 ? 0 : cur_gappih;
@@ -752,26 +725,15 @@ void right_tile(Monitor *m) {
mw = m->w.width - 2 * cur_gappoh + cur_gappih * ie; mw = m->w.width - 2 * cur_gappoh + cur_gappih * ie;
i = 0; i = 0;
my = ty = cur_gappov; my = ty = cur_gappov;
int32_t master_surplus_height =
(m->w.height - 2 * cur_gappov - cur_gappiv * ie * (master_num - 1));
float master_surplus_ratio = 1.0;
int32_t slave_surplus_height =
(m->w.height - 2 * cur_gappov - cur_gappiv * ie * (stack_num - 1));
float slave_surplus_ratio = 1.0;
wl_list_for_each(c, &clients, link) { wl_list_for_each(c, &clients, link) {
if (!VISIBLEON(c, m) || !ISTILED(c)) if (!VISIBLEON(c, m) || !ISTILED(c))
continue; continue;
if (i < m->pertag->nmasters[m->pertag->curtag]) { if (i < m->pertag->nmasters[m->pertag->curtag]) {
r = MIN(n, m->pertag->nmasters[m->pertag->curtag]) - i; r = MIN(n, m->pertag->nmasters[m->pertag->curtag]) - i;
if (c->master_inner_per > 0.0f) { if (c->master_inner_per > 0.0f) {
h = master_surplus_height * c->master_inner_per / h = (m->w.height - 2 * cur_gappov -
master_surplus_ratio; cur_gappiv * ie * (master_num - 1)) *
master_surplus_height = master_surplus_height - h; c->master_inner_per;
master_surplus_ratio =
master_surplus_ratio - c->master_inner_per;
c->master_mfact_per = mfact; c->master_mfact_per = mfact;
} else { } else {
h = (m->w.height - my - cur_gappov - h = (m->w.height - my - cur_gappov -
@@ -791,22 +753,21 @@ void right_tile(Monitor *m) {
my += c->geom.height + cur_gappiv * ie; my += c->geom.height + cur_gappiv * ie;
} else { } else {
r = n - i; r = n - i;
if (c->stack_inner_per > 0.0f) { if (c->stack_innder_per > 0.0f) {
h = slave_surplus_height * c->stack_inner_per / h = (m->w.height - 2 * cur_gappov -
slave_surplus_ratio; cur_gappiv * ie * (stack_num - 1)) *
slave_surplus_height = slave_surplus_height - h; c->stack_innder_per;
slave_surplus_ratio = slave_surplus_ratio - c->stack_inner_per;
c->master_mfact_per = mfact; c->master_mfact_per = mfact;
} else { } else {
h = (m->w.height - ty - cur_gappov - h = (m->w.height - ty - cur_gappov -
cur_gappiv * ie * (r - 1)) / cur_gappiv * ie * (r - 1)) /
r; r;
c->stack_inner_per = h / (m->w.height - ty - cur_gappov - c->stack_innder_per = h / (m->w.height - ty - cur_gappov -
cur_gappiv * ie * (r - 1)); cur_gappiv * ie * (r - 1));
c->master_mfact_per = mfact; c->master_mfact_per = mfact;
} }
// wlr_log(WLR_ERROR, "stack_inner_per: %f", c->stack_inner_per); // wlr_log(WLR_ERROR, "stack_innder_per: %f", c->stack_innder_per);
resize(c, resize(c,
(struct wlr_box){.x = m->w.x + cur_gappoh, (struct wlr_box){.x = m->w.x + cur_gappoh,
@@ -825,8 +786,8 @@ monocle(Monitor *m) {
Client *c = NULL; Client *c = NULL;
struct wlr_box geom; struct wlr_box geom;
int32_t cur_gappov = enablegaps ? m->gappov : 0; unsigned int cur_gappov = enablegaps ? m->gappov : 0;
int32_t cur_gappoh = enablegaps ? m->gappoh : 0; unsigned int cur_gappoh = enablegaps ? m->gappoh : 0;
cur_gappoh = smartgaps && m->visible_tiling_clients == 1 ? 0 : cur_gappoh; cur_gappoh = smartgaps && m->visible_tiling_clients == 1 ? 0 : cur_gappoh;
cur_gappov = smartgaps && m->visible_tiling_clients == 1 ? 0 : cur_gappov; cur_gappov = smartgaps && m->visible_tiling_clients == 1 ? 0 : cur_gappov;
@@ -843,14 +804,3 @@ monocle(Monitor *m) {
if ((c = focustop(m))) if ((c = focustop(m)))
wlr_scene_node_raise_to_top(&c->scene->node); wlr_scene_node_raise_to_top(&c->scene->node);
} }
void tgmix(Monitor *m) {
int32_t n = m->visible_tiling_clients;
if (n <= 3) {
tile(m);
return;
} else {
grid(m);
return;
}
}

3
src/layout/layout.h
View File

@@ -11,7 +11,6 @@ static void vertical_overview(Monitor *m);
static void vertical_grid(Monitor *m); static void vertical_grid(Monitor *m);
static void vertical_scroller(Monitor *m); static void vertical_scroller(Monitor *m);
static void vertical_deck(Monitor *mon); static void vertical_deck(Monitor *mon);
static void tgmix(Monitor *m);
/* layout(s) */ /* layout(s) */
Layout overviewlayout = {"󰃇", overview, "overview"}; Layout overviewlayout = {"󰃇", overview, "overview"};
@@ -28,7 +27,6 @@ enum {
VERTICAL_GRID, VERTICAL_GRID,
VERTICAL_DECK, VERTICAL_DECK,
RIGHT_TILE, RIGHT_TILE,
TGMIX,
}; };
Layout layouts[] = { Layout layouts[] = {
@@ -46,5 +44,4 @@ Layout layouts[] = {
{"VT", vertical_tile, "vertical_tile", VERTICAL_TILE}, // 垂直平铺布局 {"VT", vertical_tile, "vertical_tile", VERTICAL_TILE}, // 垂直平铺布局
{"VG", vertical_grid, "vertical_grid", VERTICAL_GRID}, // 垂直格子布局 {"VG", vertical_grid, "vertical_grid", VERTICAL_GRID}, // 垂直格子布局
{"VK", vertical_deck, "vertical_deck", VERTICAL_DECK}, // 垂直卡片布局 {"VK", vertical_deck, "vertical_deck", VERTICAL_DECK}, // 垂直卡片布局
{"TG", tgmix, "tgmix", TGMIX}, // 混合布局
}; };

102
src/layout/vertical.h
View File

@@ -1,23 +1,22 @@
void vertical_tile(Monitor *m) { void vertical_tile(Monitor *m) {
int32_t i, n = 0, w, r, ie = enablegaps, mh, mx, tx; unsigned int i, n = 0, w, r, ie = enablegaps, mh, mx, tx;
Client *c = NULL; Client *c = NULL;
Client *fc = NULL; Client *fc = NULL;
double mfact = 0; double mfact = 0;
int32_t master_num = 0; int master_num = 0;
int32_t stack_num = 0; int stack_num = 0;
n = m->visible_tiling_clients; n = m->visible_tiling_clients;
master_num = m->pertag->nmasters[m->pertag->curtag]; master_num = m->pertag->nmasters[m->pertag->curtag];
master_num = n > master_num ? master_num : n;
stack_num = n - master_num; stack_num = n - master_num;
if (n == 0) if (n == 0)
return; return;
int32_t cur_gapih = enablegaps ? m->gappih : 0; unsigned int cur_gapih = enablegaps ? m->gappih : 0;
int32_t cur_gapiv = enablegaps ? m->gappiv : 0; unsigned int cur_gapiv = enablegaps ? m->gappiv : 0;
int32_t cur_gapoh = enablegaps ? m->gappoh : 0; unsigned int cur_gapoh = enablegaps ? m->gappoh : 0;
int32_t cur_gapov = enablegaps ? m->gappov : 0; unsigned int cur_gapov = enablegaps ? m->gappov : 0;
cur_gapih = smartgaps && m->visible_tiling_clients == 1 ? 0 : cur_gapih; cur_gapih = smartgaps && m->visible_tiling_clients == 1 ? 0 : cur_gapih;
cur_gapiv = smartgaps && m->visible_tiling_clients == 1 ? 0 : cur_gapiv; cur_gapiv = smartgaps && m->visible_tiling_clients == 1 ? 0 : cur_gapiv;
@@ -40,27 +39,16 @@ void vertical_tile(Monitor *m) {
mh = m->w.height - 2 * cur_gapov + cur_gapiv * ie; mh = m->w.height - 2 * cur_gapov + cur_gapiv * ie;
i = 0; i = 0;
mx = tx = cur_gapoh; mx = tx = cur_gapih;
int32_t master_surplus_width =
(m->w.width - 2 * cur_gapoh - cur_gapih * ie * (master_num - 1));
float master_surplus_ratio = 1.0;
int32_t slave_surplus_width =
(m->w.width - 2 * cur_gapoh - cur_gapih * ie * (stack_num - 1));
float slave_surplus_ratio = 1.0;
wl_list_for_each(c, &clients, link) { wl_list_for_each(c, &clients, link) {
if (!VISIBLEON(c, m) || !ISTILED(c)) if (!VISIBLEON(c, m) || !ISTILED(c))
continue; continue;
if (i < m->pertag->nmasters[m->pertag->curtag]) { if (i < m->pertag->nmasters[m->pertag->curtag]) {
r = MIN(n, m->pertag->nmasters[m->pertag->curtag]) - i; r = MIN(n, m->pertag->nmasters[m->pertag->curtag]) - i;
if (c->master_inner_per > 0.0f) { if (c->master_inner_per > 0.0f) {
w = master_surplus_width * c->master_inner_per / w = (m->w.width - 2 * cur_gapih -
master_surplus_ratio; cur_gapih * ie * (master_num - 1)) *
master_surplus_width = master_surplus_width - w; c->master_inner_per;
master_surplus_ratio =
master_surplus_ratio - c->master_inner_per;
c->master_mfact_per = mfact; c->master_mfact_per = mfact;
} else { } else {
w = (m->w.width - mx - cur_gapih - cur_gapih * ie * (r - 1)) / w = (m->w.width - mx - cur_gapih - cur_gapih * ie * (r - 1)) /
@@ -78,16 +66,15 @@ void vertical_tile(Monitor *m) {
mx += c->geom.width + cur_gapih * ie; mx += c->geom.width + cur_gapih * ie;
} else { } else {
r = n - i; r = n - i;
if (c->stack_inner_per > 0.0f) { if (c->stack_innder_per > 0.0f) {
w = slave_surplus_width * c->stack_inner_per / w = (m->w.width - 2 * cur_gapih -
slave_surplus_ratio; cur_gapih * ie * (stack_num - 1)) *
slave_surplus_width = slave_surplus_width - w; c->stack_innder_per;
slave_surplus_ratio = slave_surplus_ratio - c->stack_inner_per;
c->master_mfact_per = mfact; c->master_mfact_per = mfact;
} else { } else {
w = (m->w.width - tx - cur_gapih - cur_gapih * ie * (r - 1)) / w = (m->w.width - tx - cur_gapih - cur_gapih * ie * (r - 1)) /
r; r;
c->stack_inner_per = w / (m->w.width - tx - cur_gapih - c->stack_innder_per = w / (m->w.width - tx - cur_gapih -
cur_gapih * ie * (r - 1)); cur_gapih * ie * (r - 1));
c->master_mfact_per = mfact; c->master_mfact_per = mfact;
} }
@@ -105,15 +92,15 @@ void vertical_tile(Monitor *m) {
} }
void vertical_deck(Monitor *m) { void vertical_deck(Monitor *m) {
int32_t mh, mx; unsigned int mh, mx;
int32_t i, n = 0; int i, n = 0;
Client *c = NULL; Client *c = NULL;
Client *fc = NULL; Client *fc = NULL;
float mfact; float mfact;
int32_t cur_gappiv = enablegaps ? m->gappiv : 0; unsigned int cur_gappiv = enablegaps ? m->gappiv : 0;
int32_t cur_gappoh = enablegaps ? m->gappoh : 0; unsigned int cur_gappoh = enablegaps ? m->gappoh : 0;
int32_t cur_gappov = enablegaps ? m->gappov : 0; unsigned int cur_gappov = enablegaps ? m->gappov : 0;
cur_gappiv = smartgaps && m->visible_tiling_clients == 1 ? 0 : cur_gappiv; cur_gappiv = smartgaps && m->visible_tiling_clients == 1 ? 0 : cur_gappiv;
cur_gappoh = smartgaps && m->visible_tiling_clients == 1 ? 0 : cur_gappoh; cur_gappoh = smartgaps && m->visible_tiling_clients == 1 ? 0 : cur_gappoh;
@@ -170,9 +157,9 @@ void vertical_deck(Monitor *m) {
void vertical_scroll_adjust_fullandmax(Client *c, struct wlr_box *target_geom) { void vertical_scroll_adjust_fullandmax(Client *c, struct wlr_box *target_geom) {
Monitor *m = c->mon; Monitor *m = c->mon;
int32_t cur_gappiv = enablegaps ? m->gappiv : 0; unsigned int cur_gappiv = enablegaps ? m->gappiv : 0;
int32_t cur_gappov = enablegaps ? m->gappov : 0; unsigned int cur_gappov = enablegaps ? m->gappov : 0;
int32_t cur_gappoh = enablegaps ? m->gappoh : 0; unsigned int cur_gappoh = enablegaps ? m->gappoh : 0;
cur_gappiv = cur_gappiv =
smartgaps && m->visible_scroll_tiling_clients == 1 ? 0 : cur_gappiv; smartgaps && m->visible_scroll_tiling_clients == 1 ? 0 : cur_gappiv;
@@ -201,17 +188,17 @@ void vertical_scroll_adjust_fullandmax(Client *c, struct wlr_box *target_geom) {
// 竖屏滚动布局 // 竖屏滚动布局
void vertical_scroller(Monitor *m) { void vertical_scroller(Monitor *m) {
int32_t i, n, j; unsigned int i, n, j;
float single_proportion = 1.0; float single_proportion = 1.0;
Client *c = NULL, *root_client = NULL; Client *c = NULL, *root_client = NULL;
Client **tempClients = NULL; Client **tempClients = NULL;
struct wlr_box target_geom; struct wlr_box target_geom;
int32_t focus_client_index = 0; int focus_client_index = 0;
bool need_scroller = false; bool need_scroller = false;
int32_t cur_gappiv = enablegaps ? m->gappiv : 0; unsigned int cur_gappiv = enablegaps ? m->gappiv : 0;
int32_t cur_gappov = enablegaps ? m->gappov : 0; unsigned int cur_gappov = enablegaps ? m->gappov : 0;
int32_t cur_gappoh = enablegaps ? m->gappoh : 0; unsigned int cur_gappoh = enablegaps ? m->gappoh : 0;
cur_gappiv = cur_gappiv =
smartgaps && m->visible_scroll_tiling_clients == 1 ? 0 : cur_gappiv; smartgaps && m->visible_scroll_tiling_clients == 1 ? 0 : cur_gappiv;
@@ -220,7 +207,8 @@ void vertical_scroller(Monitor *m) {
cur_gappoh = cur_gappoh =
smartgaps && m->visible_scroll_tiling_clients == 1 ? 0 : cur_gappoh; smartgaps && m->visible_scroll_tiling_clients == 1 ? 0 : cur_gappoh;
int32_t max_client_height = m->w.height - 2 * scroller_structs - cur_gappiv; unsigned int max_client_height =
m->w.height - 2 * scroller_structs - cur_gappiv;
n = m->visible_scroll_tiling_clients; n = m->visible_scroll_tiling_clients;
@@ -258,7 +246,7 @@ void vertical_scroller(Monitor *m) {
return; return;
} }
if (m->sel && !client_is_unmanaged(m->sel) && ISSCROLLTILED(m->sel)) { if (m->sel && !client_is_unmanaged(m->sel) && !m->sel->isfloating) {
root_client = m->sel; root_client = m->sel;
} else if (m->prevsel && ISSCROLLTILED(m->prevsel) && } else if (m->prevsel && ISSCROLLTILED(m->prevsel) &&
VISIBLEON(m->prevsel, m) && !client_is_unmanaged(m->prevsel)) { VISIBLEON(m->prevsel, m) && !client_is_unmanaged(m->prevsel)) {
@@ -353,15 +341,13 @@ void vertical_scroller(Monitor *m) {
} }
void vertical_grid(Monitor *m) { void vertical_grid(Monitor *m) {
int32_t i, n; unsigned int i, n;
int32_t cx, cy, cw, ch; unsigned int cx, cy, cw, ch;
int32_t dy; unsigned int dy;
int32_t rows, cols, overrows; unsigned int rows, cols, overrows;
Client *c = NULL; Client *c = NULL;
int32_t target_gappo = int target_gappo = enablegaps ? m->isoverview ? overviewgappo : gappov : 0;
enablegaps ? m->isoverview ? overviewgappo : gappov : 0; int target_gappi = enablegaps ? m->isoverview ? overviewgappi : gappiv : 0;
int32_t target_gappi =
enablegaps ? m->isoverview ? overviewgappi : gappiv : 0;
float single_width_ratio = m->isoverview ? 0.7 : 0.9; float single_width_ratio = m->isoverview ? 0.7 : 0.9;
float single_height_ratio = m->isoverview ? 0.8 : 0.9; float single_height_ratio = m->isoverview ? 0.8 : 0.9;
@@ -377,6 +363,10 @@ void vertical_grid(Monitor *m) {
if (c->mon != m) if (c->mon != m)
continue; continue;
c->bw = m->visible_tiling_clients == 1 && no_border_when_single &&
smartgaps
? 0
: borderpx;
if (VISIBLEON(c, m) && !c->isunglobal && if (VISIBLEON(c, m) && !c->isunglobal &&
((m->isoverview && !client_is_x11_popup(c)) || ISTILED(c))) { ((m->isoverview && !client_is_x11_popup(c)) || ISTILED(c))) {
ch = (m->w.height - 2 * target_gappo) * single_height_ratio; ch = (m->w.height - 2 * target_gappo) * single_height_ratio;
@@ -400,6 +390,10 @@ void vertical_grid(Monitor *m) {
if (c->mon != m) if (c->mon != m)
continue; continue;
c->bw = m->visible_tiling_clients == 1 && no_border_when_single &&
smartgaps
? 0
: borderpx;
if (VISIBLEON(c, m) && !c->isunglobal && if (VISIBLEON(c, m) && !c->isunglobal &&
((m->isoverview && !client_is_x11_popup(c)) || ISTILED(c))) { ((m->isoverview && !client_is_x11_popup(c)) || ISTILED(c))) {
if (i == 0) { if (i == 0) {
@@ -442,6 +436,10 @@ void vertical_grid(Monitor *m) {
if (c->mon != m) if (c->mon != m)
continue; continue;
c->bw =
m->visible_tiling_clients == 1 && no_border_when_single && smartgaps
? 0
: borderpx;
if (VISIBLEON(c, m) && !c->isunglobal && if (VISIBLEON(c, m) && !c->isunglobal &&
((m->isoverview && !client_is_x11_popup(c)) || ISTILED(c))) { ((m->isoverview && !client_is_x11_popup(c)) || ISTILED(c))) {
cx = m->w.x + (i / rows) * (cw + target_gappi); cx = m->w.x + (i / rows) * (cw + target_gappi);

900
src/mango.c
View File

File diff suppressed because it is too large Load Diff