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

opt: animations logic all use the int type

Browse Source 
avoid the coordinates being forcibly limited to positive numbers
This commit is contained in:
DreamMaoMao
2026-01-03 09:37:34 +08:00
parent 0d13b1002e
commit 2771053ee6
21 changed files with 876 additions and 861 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
mmsg/arg.h
View File

@@ -8,13 +8,13 @@
extern char *argv0; extern char *argv0;
/* use main(int argc, char *argv[]) */ /* use main(int32_t 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_; \
int brk_; \ int32_t brk_; \
if (argv[0][1] == '-' && argv[0][2] == '\0') { \ if (argv[0][1] == '-' && argv[0][2] == '\0') { \
argv++; \ argv++; \
argc--; \ argc--; \

46
mmsg/mmsg.c
View File

@@ -25,31 +25,31 @@ static enum {
WATCH = 1 << 2 | GET, WATCH = 1 << 2 | GET,
} mode = NONE; } mode = NONE;
static int Oflag; static int32_t Oflag;
static int Tflag; static int32_t Tflag;
static int Lflag; static int32_t Lflag;
static int oflag; static int32_t oflag;
static int tflag; static int32_t tflag;
static int lflag; static int32_t lflag;
static int cflag; static int32_t cflag;
static int vflag; static int32_t vflag;
static int mflag; static int32_t mflag;
static int fflag; static int32_t fflag;
static int qflag; static int32_t qflag;
static int dflag; static int32_t dflag;
static int xflag; static int32_t xflag;
static int eflag; static int32_t eflag;
static int kflag; static int32_t kflag;
static int bflag; static int32_t bflag;
static int Aflag; static int32_t 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 int tagcount; static int32_t tagcount;
static char *tagset; static char *tagset;
static char *layout_name; static char *layout_name;
static int layoutcount, layout_idx; static int32_t 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;
@@ -87,7 +87,7 @@ static void noop_description(void *data, struct wl_output *wl_output,
// 将 n 转换为 9 位二进制字符串，结果存入 buf（至少长度 10） // 将 n 转换为 9 位二进制字符串，结果存入 buf（至少长度 10）
void bin_str_9bits(char *buf, uint32_t n) { void bin_str_9bits(char *buf, uint32_t n) {
for (int i = 8; i >= 0; i--) { for (int32_t i = 8; i >= 0; i--) {
*buf++ = ((n >> i) & 1) ? '1' : '0'; *buf++ = ((n >> i) & 1) ? '1' : '0';
} }
*buf = '\0'; // 字符串结尾 *buf = '\0'; // 字符串结尾
@@ -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;
int i = 0; int32_t 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;
int i = 0; int32_t 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);
} }
int main(int argc, char *argv[]) { int32_t main(int32_t argc, char *argv[]) {
ARGBEGIN { ARGBEGIN {
case 'q': case 'q':
qflag = 1; qflag = 1;

134
src/animation/client.h
View File

@@ -1,10 +1,10 @@
void client_actual_size(Client *c, uint32_t *width, uint32_t *height) { void client_actual_size(Client *c, int32_t *width, int32_t *height) {
*width = c->animation.current.width - 2 * c->bw; *width = c->animation.current.width - 2 * (int32_t)c->bw;
*height = c->animation.current.height - 2 * c->bw; *height = c->animation.current.height - 2 * (int32_t)c->bw;
} }
void set_rect_size(struct wlr_scene_rect *rect, int width, int height) { void set_rect_size(struct wlr_scene_rect *rect, int32_t width, int32_t 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;
} }
int is_special_animaiton_rule(Client *c) { int32_t 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 @@ int 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) {
int slide_direction; int32_t slide_direction;
int horizontal, horizontal_value; int32_t horizontal, horizontal_value;
int vertical, vertical_value; int32_t vertical, vertical_value;
int special_direction; int32_t special_direction;
int center_x, center_y; int32_t 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, int sx, void snap_scene_buffer_apply_effect(struct wlr_scene_buffer *buffer, int32_t sx,
int sy, void *data) { int32_t 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, int sx, int sy, void scene_buffer_apply_effect(struct wlr_scene_buffer *buffer, int32_t sx,
void *data) { int32_t sy, 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, int sx, int sy,
if (buffer_data->should_scale) { if (buffer_data->should_scale) {
uint32_t surface_width = surface->current.width; int32_t surface_width = surface->current.width;
uint32_t surface_height = surface->current.height; int32_t surface_height = surface->current.height;
surface_width = buffer_data->width_scale < 1 surface_width = buffer_data->width_scale < 1
? surface_width ? surface_width
@@ -271,19 +271,19 @@ void client_draw_shadow(Client *c) {
? CORNER_LOCATION_NONE ? CORNER_LOCATION_NONE
: CORNER_LOCATION_ALL; : CORNER_LOCATION_ALL;
int bwoffset = c->bw != 0 && hit_no_border ? (int)c->bw : 0; int32_t bwoffset = c->bw != 0 && hit_no_border ? (int32_t)c->bw : 0;
uint32_t width, height; int32_t width, height;
client_actual_size(c, &width, &height); client_actual_size(c, &width, &height);
uint32_t delta = shadows_size + c->bw - bwoffset; int32_t delta = shadows_size + (int32_t)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 + (int)c->bw - bwoffset, .width = width + (int32_t)c->bw - bwoffset,
.height = height + (int)c->bw - bwoffset, .height = height + (int32_t)c->bw - bwoffset,
}; };
struct wlr_box shadow_box = { struct wlr_box shadow_box = {
@@ -313,7 +313,7 @@ void client_draw_shadow(Client *c) {
.height = shadow_box.height, .height = shadow_box.height,
}; };
int right_offset, bottom_offset, left_offset, top_offset; int32_t right_offset, bottom_offset, left_offset, top_offset;
if (c == grabc) { if (c == grabc) {
right_offset = 0; right_offset = 0;
@@ -379,9 +379,9 @@ void apply_border(Client *c) {
struct wlr_box clip_box = c->animation.current; struct wlr_box clip_box = c->animation.current;
// 一但在GEZERO如果使用无符号，那么其他数据也会转换为无符号导致没有负数出错 // 一但在GEZERO如果使用无符号，那么其他数据也会转换为无符号导致没有负数出错
int bw = (int)c->bw; int32_t bw = (int32_t)c->bw;
int right_offset, bottom_offset, left_offset, top_offset; int32_t right_offset, bottom_offset, left_offset, top_offset;
if (c == grabc) { if (c == grabc) {
right_offset = 0; right_offset = 0;
@@ -400,25 +400,27 @@ 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);
} }
int inner_surface_width = GEZERO(clip_box.width - 2 * bw); int32_t inner_surface_width = GEZERO(clip_box.width - 2 * bw);
int inner_surface_height = GEZERO(clip_box.height - 2 * bw); int32_t inner_surface_height = GEZERO(clip_box.height - 2 * bw);
int inner_surface_x = GEZERO(bw - left_offset); int32_t inner_surface_x = GEZERO(bw - left_offset);
int inner_surface_y = GEZERO(bw - top_offset); int32_t inner_surface_y = GEZERO(bw - top_offset);
int rect_x = left_offset; int32_t rect_x = left_offset;
int rect_y = top_offset; int32_t rect_y = top_offset;
int rect_width = int32_t rect_width =
GEZERO(c->animation.current.width - left_offset - right_offset); GEZERO(c->animation.current.width - left_offset - right_offset);
int rect_height = int32_t 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 - left_offset + c->bw; inner_surface_width =
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 - top_offset + c->bw; inner_surface_height =
inner_surface_height - top_offset + (int32_t)c->bw;
if (right_offset > 0) { if (right_offset > 0) {
inner_surface_width = inner_surface_width =
@@ -446,24 +448,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) {
int offsetx = 0, offsety = 0, offsetw = 0, offseth = 0; int32_t 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;
int bottom_out_offset = int32_t 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);
int right_out_offset = int32_t 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);
int left_out_offset = GEZERO(c->mon->m.x - c->animation.current.x); int32_t left_out_offset = GEZERO(c->mon->m.x - c->animation.current.x);
int top_out_offset = GEZERO(c->mon->m.y - c->animation.current.y); int32_t top_out_offset = GEZERO(c->mon->m.y - c->animation.current.y);
// 必须转换为int，否计算会没有负数导致判断错误 // 必须转换为int，否计算会没有负数导致判断错误
int bw = (int)c->bw; int32_t bw = (int32_t)c->bw;
/* /*
计算窗口表面超出屏幕四个方向的偏差，避免窗口超出屏幕 计算窗口表面超出屏幕四个方向的偏差，避免窗口超出屏幕
@@ -547,7 +549,7 @@ void client_apply_clip(Client *c, float factor) {
} }
// 获取窗口动画实时位置矩形 // 获取窗口动画实时位置矩形
uint32_t width, height; int32_t width, height;
client_actual_size(c, &width, &height); client_actual_size(c, &width, &height);
// 计算出除了边框的窗口实际剪切大小 // 计算出除了边框的窗口实际剪切大小
@@ -590,8 +592,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);
// 获取剪切后的表面的实际大小用于计算缩放 // 获取剪切后的表面的实际大小用于计算缩放
int acutal_surface_width = geometry.width - offset.x - offset.width; int32_t acutal_surface_width = geometry.width - offset.x - offset.width;
int acutal_surface_height = geometry.height - offset.y - offset.height; int32_t 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;
@@ -623,25 +625,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);
uint32_t passed_time = timespec_to_ms(&now) - c->animation.time_started; int32_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;
int type = c->animation.action = c->animation.action; int32_t 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);
uint32_t width = c->animation.initial.width + int32_t width = c->animation.initial.width +
(c->current.width - c->animation.initial.width) * factor; (c->current.width - c->animation.initial.width) * factor;
uint32_t height = int32_t height = c->animation.initial.height +
c->animation.initial.height + (c->current.height - c->animation.initial.height) * factor;
(c->current.height - c->animation.initial.height) * factor;
uint32_t x = c->animation.initial.x + int32_t x = c->animation.initial.x +
(c->current.x - c->animation.initial.x) * factor; (c->current.x - c->animation.initial.x) * factor;
uint32_t y = c->animation.initial.y + int32_t 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);
@@ -690,24 +691,23 @@ void client_animation_next_tick(Client *c) {
struct timespec now; struct timespec now;
clock_gettime(CLOCK_MONOTONIC, &now); clock_gettime(CLOCK_MONOTONIC, &now);
uint32_t passed_time = timespec_to_ms(&now) - c->animation.time_started; int32_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;
int type = c->animation.action == NONE ? MOVE : c->animation.action; int32_t 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;
uint32_t width = c->animation.initial.width + int32_t width = c->animation.initial.width +
(c->current.width - c->animation.initial.width) * factor; (c->current.width - c->animation.initial.width) * factor;
uint32_t height = int32_t height = c->animation.initial.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 + int32_t x = c->animation.initial.x +
(c->current.x - c->animation.initial.x) * factor; (c->current.x - c->animation.initial.x) * factor;
@@ -910,7 +910,7 @@ void client_set_pending_state(Client *c) {
c->dirty = true; c->dirty = true;
} }
void resize(Client *c, struct wlr_box geo, int interact) { void resize(Client *c, struct wlr_box geo, int32_t interact) {
// 动画设置的起始函数，这里用来计算一些动画的起始值 // 动画设置的起始函数，这里用来计算一些动画的起始值
// 动画起始位置大小是由于c->animainit_geom确定的 // 动画起始位置大小是由于c->animainit_geom确定的
@@ -932,8 +932,8 @@ void resize(Client *c, struct wlr_box geo, int 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 * (int)c->bw, c->geom.width); c->geom.width = MAX(1 + 2 * (int32_t)c->bw, c->geom.width);
c->geom.height = MAX(1 + 2 * (int)c->bw, c->geom.height); c->geom.height = MAX(1 + 2 * (int32_t)c->bw, c->geom.height);
} else { // 这里会限制不允许窗口划出屏幕 } else { // 这里会限制不允许窗口划出屏幕
c->geom = geo; c->geom = geo;
applybounds( applybounds(
@@ -1113,7 +1113,7 @@ bool client_apply_focus_opacity(Client *c) {
struct timespec now; struct timespec now;
clock_gettime(CLOCK_MONOTONIC, &now); clock_gettime(CLOCK_MONOTONIC, &now);
uint32_t passed_time = timespec_to_ms(&now) - c->animation.time_started; int32_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
@@ -1138,7 +1138,7 @@ bool client_apply_focus_opacity(Client *c) {
struct timespec now; struct timespec now;
clock_gettime(CLOCK_MONOTONIC, &now); clock_gettime(CLOCK_MONOTONIC, &now);
uint32_t passed_time = int32_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
@@ -1155,7 +1155,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 (int i = 0; i < 4; i++) { for (int32_t 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] -

27
src/animation/common.h
View File

@@ -1,4 +1,4 @@
struct dvec2 calculate_animation_curve_at(double t, int type) { struct dvec2 calculate_animation_curve_at(double t, int32_t type) {
struct dvec2 point; struct dvec2 point;
double *animation_curve; double *animation_curve;
if (type == MOVE) { if (type == MOVE) {
@@ -41,41 +41,41 @@ void init_baked_points(void) {
baked_points_opafadeout = baked_points_opafadeout =
calloc(BAKED_POINTS_COUNT, sizeof(*baked_points_opafadeout)); calloc(BAKED_POINTS_COUNT, sizeof(*baked_points_opafadeout));
for (uint32_t i = 0; i < BAKED_POINTS_COUNT; i++) { for (int32_t 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 (uint32_t i = 0; i < BAKED_POINTS_COUNT; i++) { for (int32_t 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 (uint32_t i = 0; i < BAKED_POINTS_COUNT; i++) { for (int32_t 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 (uint32_t i = 0; i < BAKED_POINTS_COUNT; i++) { for (int32_t 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 (uint32_t i = 0; i < BAKED_POINTS_COUNT; i++) { for (int32_t 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 (uint32_t i = 0; i < BAKED_POINTS_COUNT; i++) { for (int32_t i = 0; i < BAKED_POINTS_COUNT; i++) {
baked_points_opafadein[i] = calculate_animation_curve_at( baked_points_opafadein[i] = calculate_animation_curve_at(
(double)i / (BAKED_POINTS_COUNT - 1), OPAFADEIN); (double)i / (BAKED_POINTS_COUNT - 1), OPAFADEIN);
} }
for (uint32_t i = 0; i < BAKED_POINTS_COUNT; i++) { for (int32_t i = 0; i < BAKED_POINTS_COUNT; i++) {
baked_points_opafadeout[i] = calculate_animation_curve_at( baked_points_opafadeout[i] = calculate_animation_curve_at(
(double)i / (BAKED_POINTS_COUNT - 1), OPAFADEOUT); (double)i / (BAKED_POINTS_COUNT - 1), OPAFADEOUT);
} }
} }
double find_animation_curve_at(double t, int type) { double find_animation_curve_at(double t, int32_t type) {
uint32_t down = 0; int32_t down = 0;
uint32_t up = BAKED_POINTS_COUNT - 1; int32_t up = BAKED_POINTS_COUNT - 1;
uint32_t middle = (up + down) / 2; int32_t 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;
@@ -106,7 +106,8 @@ double find_animation_curve_at(double t, int type) {
return baked_points[up].y; return baked_points[up].y;
} }
static bool scene_node_snapshot(struct wlr_scene_node *node, int lx, int ly, static bool scene_node_snapshot(struct wlr_scene_node *node, int32_t lx,
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;

63
src/animation/layer.h
View File

@@ -1,4 +1,4 @@
void layer_actual_size(LayerSurface *l, uint32_t *width, uint32_t *height) { void layer_actual_size(LayerSurface *l, int32_t *width, int32_t *height) {
struct wlr_box box; struct wlr_box box;
if (l->animation.running) { if (l->animation.running) {
@@ -42,7 +42,7 @@ void get_layer_target_geometry(LayerSurface *l, struct wlr_box *target_box) {
.height = state->desired_height}; .height = state->desired_height};
// 水平方向定位 // 水平方向定位
const uint32_t both_horiz = const int32_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 +57,7 @@ void get_layer_target_geometry(LayerSurface *l, struct wlr_box *target_box) {
} }
// 垂直方向定位 // 垂直方向定位
const uint32_t both_vert = const int32_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 +101,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) {
int slide_direction; int32_t slide_direction;
int horizontal, horizontal_value; int32_t horizontal, horizontal_value;
int vertical, vertical_value; int32_t vertical, vertical_value;
int center_x, center_y; int32_t center_x, center_y;
if (!l) if (!l)
return; return;
@@ -161,10 +161,10 @@ void layer_draw_shadow(LayerSurface *l) {
return; return;
} }
uint32_t width, height; int32_t width, height;
layer_actual_size(l, &width, &height); layer_actual_size(l, &width, &height);
uint32_t delta = shadows_size; int32_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 +200,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, int sx, void layer_scene_buffer_apply_effect(struct wlr_scene_buffer *buffer,
int sy, void *data) { int32_t sx, int32_t 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 +212,8 @@ void layer_scene_buffer_apply_effect(struct wlr_scene_buffer *buffer, int sx,
struct wlr_surface *surface = scene_surface->surface; struct wlr_surface *surface = scene_surface->surface;
uint32_t surface_width = surface->current.width * buffer_data->width_scale; int32_t surface_width = surface->current.width * buffer_data->width_scale;
uint32_t surface_height = int32_t 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,7 +222,8 @@ void layer_scene_buffer_apply_effect(struct wlr_scene_buffer *buffer, int sx,
} }
void layer_fadeout_scene_buffer_apply_effect(struct wlr_scene_buffer *buffer, void layer_fadeout_scene_buffer_apply_effect(struct wlr_scene_buffer *buffer,
int sx, int sy, void *data) { int32_t sx, int32_t 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);
@@ -235,24 +236,23 @@ void fadeout_layer_animation_next_tick(LayerSurface *l) {
struct timespec now; struct timespec now;
clock_gettime(CLOCK_MONOTONIC, &now); clock_gettime(CLOCK_MONOTONIC, &now);
uint32_t passed_time = timespec_to_ms(&now) - l->animation.time_started; int32_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;
int type = l->animation.action = l->animation.action; int32_t 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);
uint32_t width = l->animation.initial.width + int32_t width = l->animation.initial.width +
(l->current.width - l->animation.initial.width) * factor; (l->current.width - l->animation.initial.width) * factor;
uint32_t height = int32_t height = l->animation.initial.height +
l->animation.initial.height + (l->current.height - l->animation.initial.height) * factor;
(l->current.height - l->animation.initial.height) * factor;
uint32_t x = l->animation.initial.x + int32_t x = l->animation.initial.x +
(l->current.x - l->animation.initial.x) * factor; (l->current.x - l->animation.initial.x) * factor;
uint32_t y = l->animation.initial.y + int32_t 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);
@@ -304,20 +304,19 @@ void layer_animation_next_tick(LayerSurface *l) {
struct timespec now; struct timespec now;
clock_gettime(CLOCK_MONOTONIC, &now); clock_gettime(CLOCK_MONOTONIC, &now);
uint32_t passed_time = timespec_to_ms(&now) - l->animation.time_started; int32_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;
int type = l->animation.action == NONE ? MOVE : l->animation.action; int32_t 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);
uint32_t width = l->animation.initial.width + int32_t width = l->animation.initial.width +
(l->current.width - l->animation.initial.width) * factor; (l->current.width - l->animation.initial.width) * factor;
uint32_t height = int32_t height = l->animation.initial.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 + int32_t x = l->animation.initial.x +
(l->current.x - l->animation.initial.x) * factor; (l->current.x - l->animation.initial.x) * factor;

43
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 int client_is_x11(Client *c) { static inline int32_t client_is_x11(Client *c) {
#ifdef XWAYLAND #ifdef XWAYLAND
return c->type == X11; return c->type == X11;
#endif #endif
@@ -21,14 +21,15 @@ static inline struct wlr_surface *client_surface(Client *c) {
return c->surface.xdg->surface; return c->surface.xdg->surface;
} }
static inline int toplevel_from_wlr_surface(struct wlr_surface *s, Client **pc, static inline int32_t toplevel_from_wlr_surface(struct wlr_surface *s,
LayerSurface **pl) { Client **pc,
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;
int type = -1; int32_t type = -1;
#ifdef XWAYLAND #ifdef XWAYLAND
struct wlr_xwayland_surface *xsurface; struct wlr_xwayland_surface *xsurface;
#endif #endif
@@ -88,7 +89,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,
int activated) { int32_t 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;
@@ -113,7 +114,7 @@ static inline const char *client_get_appid(Client *c) {
: "broken"; : "broken";
} }
static inline int client_get_pid(Client *c) { static inline int32_t 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))
@@ -169,7 +170,7 @@ static inline Client *client_get_parent(Client *c) {
return p; return p;
} }
static inline int client_has_children(Client *c) { static inline int32_t 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);
@@ -189,7 +190,7 @@ static inline const char *client_get_title(Client *c) {
: "broken"; : "broken";
} }
static inline int client_is_float_type(Client *c) { static inline int32_t 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;
@@ -229,12 +230,12 @@ static inline int client_is_float_type(Client *c) {
state.min_height == state.max_height)); state.min_height == state.max_height));
} }
static inline int client_is_rendered_on_mon(Client *c, Monitor *m) { static inline int32_t 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;
int unused_lx, unused_ly; int32_t 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,
@@ -242,8 +243,8 @@ static inline int client_is_rendered_on_mon(Client *c, Monitor *m) {
return 0; return 0;
} }
static inline int client_is_stopped(Client *c) { static inline int32_t client_is_stopped(Client *c) {
int pid; int32_t pid;
siginfo_t in = {0}; siginfo_t in = {0};
#ifdef XWAYLAND #ifdef XWAYLAND
if (client_is_x11(c)) if (client_is_x11(c))
@@ -267,7 +268,7 @@ static inline int client_is_stopped(Client *c) {
return 0; return 0;
} }
static inline int client_is_unmanaged(Client *c) { static inline int32_t 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;
@@ -299,7 +300,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, int fullscreen) { static inline void client_set_fullscreen(Client *c, int32_t 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);
@@ -379,7 +380,7 @@ static inline void client_set_tiled(Client *c, uint32_t edges) {
} }
} }
static inline void client_set_suspended(Client *c, int suspended) { static inline void client_set_suspended(Client *c, int32_t suspended) {
#ifdef XWAYLAND #ifdef XWAYLAND
if (client_is_x11(c)) if (client_is_x11(c))
return; return;
@@ -388,7 +389,7 @@ static inline void client_set_suspended(Client *c, int suspended) {
wlr_xdg_toplevel_set_suspended(c->surface.xdg->toplevel, suspended); wlr_xdg_toplevel_set_suspended(c->surface.xdg->toplevel, suspended);
} }
static inline int client_should_ignore_focus(Client *c) { static inline int32_t client_should_ignore_focus(Client *c) {
#ifdef XWAYLAND #ifdef XWAYLAND
if (client_is_x11(c)) { if (client_is_x11(c)) {
@@ -403,7 +404,7 @@ static inline int client_should_ignore_focus(Client *c) {
return 0; return 0;
} }
static inline int client_is_x11_popup(Client *c) { static inline int32_t client_is_x11_popup(Client *c) {
#ifdef XWAYLAND #ifdef XWAYLAND
if (client_is_x11(c)) { if (client_is_x11(c)) {
@@ -432,7 +433,7 @@ static inline int client_is_x11_popup(Client *c) {
return 0; return 0;
} }
static inline int client_should_global(Client *c) { static inline int32_t client_should_global(Client *c) {
#ifdef XWAYLAND #ifdef XWAYLAND
if (client_is_x11(c)) { if (client_is_x11(c)) {
@@ -445,7 +446,7 @@ static inline int client_should_global(Client *c) {
return 0; return 0;
} }
static inline int client_should_overtop(Client *c) { static inline int32_t client_should_overtop(Client *c) {
#ifdef XWAYLAND #ifdef XWAYLAND
if (client_is_x11(c)) { if (client_is_x11(c)) {
@@ -457,7 +458,7 @@ static inline int client_should_overtop(Client *c) {
return 0; return 0;
} }
static inline int client_wants_focus(Client *c) { static inline int32_t 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(
@@ -468,7 +469,7 @@ static inline int client_wants_focus(Client *c) {
return 0; return 0;
} }
static inline int client_wants_fullscreen(Client *c) { static inline int32_t 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;

10
src/common/util.c
View File

@@ -36,8 +36,8 @@ void *ecalloc(size_t nmemb, size_t size) {
return p; return p;
} }
int fd_set_nonblock(int fd) { int32_t fd_set_nonblock(int32_t fd) {
int flags = fcntl(fd, F_GETFL); int32_t 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 @@ int fd_set_nonblock(int fd) {
return 0; return 0;
} }
int regex_match(const char *pattern, const char *str) { int32_t regex_match(const char *pattern, const char *str) {
int errnum; int32_t errnum;
PCRE2_SIZE erroffset; PCRE2_SIZE erroffset;
if (!pattern || !str) { if (!pattern || !str) {
@@ -70,7 +70,7 @@ int 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);
int ret = int32_t 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);

4
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);
int fd_set_nonblock(int fd); int32_t fd_set_nonblock(int32_t fd);
int regex_match(const char *pattern_mb, const char *str_mb); int32_t 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); uint32_t get_now_in_ms(void);
uint32_t timespec_to_ms(struct timespec *ts); uint32_t timespec_to_ms(struct timespec *ts);

387
src/config/parse_config.h
View File

@@ -10,8 +10,9 @@
// 整数版本 - 截断小数部分 // 整数版本 - 截断小数部分
#define CLAMP_INT(x, min, max) \ #define CLAMP_INT(x, min, max) \
((int)(x) < (int)(min) ? (int)(min) \ ((int32_t)(x) < (int32_t)(min) \
: ((int)(x) > (int)(max) ? (int)(max) : (int)(x))) ? (int32_t)(min) \
: ((int32_t)(x) > (int32_t)(max) ? (int32_t)(max) : (int32_t)(x)))
// 浮点数版本 - 保留小数部分 // 浮点数版本 - 保留小数部分
#define CLAMP_FLOAT(x, min, max) \ #define CLAMP_FLOAT(x, min, max) \
@@ -30,13 +31,13 @@ typedef struct {
typedef struct { typedef struct {
xkb_keysym_t keysym; xkb_keysym_t keysym;
MultiKeycode keycode; MultiKeycode keycode;
int type; int32_t type;
} KeySymCode; } KeySymCode;
typedef struct { typedef struct {
uint32_t mod; uint32_t mod;
KeySymCode keysymcode; KeySymCode keysymcode;
int (*func)(const Arg *); int32_t (*func)(const Arg *);
Arg arg; Arg arg;
char mode[28]; char mode[28];
bool iscommonmode; bool iscommonmode;
@@ -55,42 +56,42 @@ typedef struct {
const char *id; const char *id;
const char *title; const char *title;
uint32_t tags; uint32_t tags;
int isfloating; int32_t isfloating;
int isfullscreen; int32_t isfullscreen;
float scroller_proportion; float scroller_proportion;
const char *animation_type_open; const char *animation_type_open;
const char *animation_type_close; const char *animation_type_close;
const char *layer_animation_type_open; const char *layer_animation_type_open;
const char *layer_animation_type_close; const char *layer_animation_type_close;
int isnoborder; int32_t isnoborder;
int isnoshadow; int32_t isnoshadow;
int isnoradius; int32_t isnoradius;
int isnoanimation; int32_t isnoanimation;
int isopensilent; int32_t isopensilent;
int istagsilent; int32_t istagsilent;
int isnamedscratchpad; int32_t isnamedscratchpad;
int isunglobal; int32_t isunglobal;
int isglobal; int32_t isglobal;
int isoverlay; int32_t isoverlay;
int allow_shortcuts_inhibit; int32_t allow_shortcuts_inhibit;
int ignore_maximize; int32_t ignore_maximize;
int ignore_minimize; int32_t ignore_minimize;
int isnosizehint; int32_t isnosizehint;
const char *monitor; const char *monitor;
int offsetx; int32_t offsetx;
int offsety; int32_t offsety;
int width; int32_t width;
int height; int32_t height;
int nofocus; int32_t nofocus;
int nofadein; int32_t nofadein;
int nofadeout; int32_t nofadeout;
int no_force_center; int32_t no_force_center;
int isterm; int32_t isterm;
int allow_csd; int32_t allow_csd;
int force_maximize; int32_t force_maximize;
int force_tearing; int32_t force_tearing;
int noswallow; int32_t noswallow;
int noblur; int32_t noblur;
float focused_opacity; float focused_opacity;
float unfocused_opacity; float unfocused_opacity;
float scroller_proportion_single; float scroller_proportion_single;
@@ -100,15 +101,15 @@ typedef struct {
} ConfigWinRule; } ConfigWinRule;
typedef struct { typedef struct {
const char *name; // 显示器名称 const char *name; // 显示器名称
float mfact; // 主区域比例 float mfact; // 主区域比例
int nmaster; // 主区域窗口数量 int32_t nmaster; // 主区域窗口数量
const char *layout; // 布局名称（字符串） const char *layout; // 布局名称（字符串）
int rr; // 旋转和翻转（假设为整数） int32_t rr; // 旋转和翻转（假设为整数）
float scale; // 显示器缩放比例 float scale; // 显示器缩放比例
int x, y; // 显示器位置 int32_t x, y; // 显示器位置
int width, height; // 显示器分辨率 int32_t width, height; // 显示器分辨率
float refresh; // 刷新率 float refresh; // 刷新率
} ConfigMonitorRule; } ConfigMonitorRule;
// 修改后的宏定义 // 修改后的宏定义
@@ -129,20 +130,20 @@ KeyBinding default_key_bindings[] = {CHVT(1), CHVT(2), CHVT(3), CHVT(4),
typedef struct { typedef struct {
uint32_t mod; uint32_t mod;
uint32_t button; uint32_t button;
int (*func)(const Arg *); int32_t (*func)(const Arg *);
Arg arg; Arg arg;
} MouseBinding; } MouseBinding;
typedef struct { typedef struct {
uint32_t mod; uint32_t mod;
uint32_t dir; uint32_t dir;
int (*func)(const Arg *); int32_t (*func)(const Arg *);
Arg arg; Arg arg;
} AxisBinding; } AxisBinding;
typedef struct { typedef struct {
uint32_t fold; uint32_t fold;
int (*func)(const Arg *); int32_t (*func)(const Arg *);
Arg arg; Arg arg;
} SwitchBinding; } SwitchBinding;
@@ -150,37 +151,37 @@ typedef struct {
uint32_t mod; uint32_t mod;
uint32_t motion; uint32_t motion;
uint32_t fingers_count; uint32_t fingers_count;
int (*func)(const Arg *); int32_t (*func)(const Arg *);
Arg arg; Arg arg;
} GestureBinding; } GestureBinding;
typedef struct { typedef struct {
int id; // 标签ID (1-9) int32_t id; // 标签ID (1-9)
char *layout_name; // 布局名称 char *layout_name; // 布局名称
char *monitor_name; char *monitor_name;
int no_render_border; int32_t no_render_border;
int no_hide; int32_t no_hide;
} ConfigTagRule; } ConfigTagRule;
typedef struct { typedef struct {
char *layer_name; // 布局名称 char *layer_name; // 布局名称
char *animation_type_open; char *animation_type_open;
char *animation_type_close; char *animation_type_close;
int noblur; int32_t noblur;
int noanim; int32_t noanim;
int noshadow; int32_t noshadow;
} ConfigLayerRule; } ConfigLayerRule;
typedef struct { typedef struct {
int animations; int32_t animations;
int layer_animations; int32_t layer_animations;
char animation_type_open[10]; char animation_type_open[10];
char animation_type_close[10]; char animation_type_close[10];
char layer_animation_type_open[10]; char layer_animation_type_open[10];
char layer_animation_type_close[10]; char layer_animation_type_close[10];
int animation_fade_in; int32_t animation_fade_in;
int animation_fade_out; int32_t animation_fade_out;
int tag_animation_direction; int32_t tag_animation_direction;
float zoom_initial_ratio; float zoom_initial_ratio;
float zoom_end_ratio; float zoom_end_ratio;
float fadein_begin_opacity; float fadein_begin_opacity;
@@ -198,66 +199,66 @@ typedef struct {
double animation_curve_opafadein[4]; double animation_curve_opafadein[4];
double animation_curve_opafadeout[4]; double animation_curve_opafadeout[4];
int scroller_structs; int32_t scroller_structs;
float scroller_default_proportion; float scroller_default_proportion;
float scroller_default_proportion_single; float scroller_default_proportion_single;
int scroller_ignore_proportion_single; int32_t scroller_ignore_proportion_single;
int scroller_focus_center; int32_t scroller_focus_center;
int scroller_prefer_center; int32_t scroller_prefer_center;
int edge_scroller_pointer_focus; int32_t edge_scroller_pointer_focus;
int focus_cross_monitor; int32_t focus_cross_monitor;
int exchange_cross_monitor; int32_t exchange_cross_monitor;
int scratchpad_cross_monitor; int32_t scratchpad_cross_monitor;
int focus_cross_tag; int32_t focus_cross_tag;
int view_current_to_back; int32_t view_current_to_back;
int no_border_when_single; int32_t no_border_when_single;
int no_radius_when_single; int32_t no_radius_when_single;
int snap_distance; int32_t snap_distance;
int enable_floating_snap; int32_t enable_floating_snap;
int drag_tile_to_tile; int32_t drag_tile_to_tile;
uint32_t swipe_min_threshold; uint32_t swipe_min_threshold;
float focused_opacity; float focused_opacity;
float unfocused_opacity; float unfocused_opacity;
float *scroller_proportion_preset; float *scroller_proportion_preset;
int scroller_proportion_preset_count; int32_t scroller_proportion_preset_count;
char **circle_layout; char **circle_layout;
int circle_layout_count; int32_t circle_layout_count;
uint32_t new_is_master; uint32_t new_is_master;
float default_mfact; float default_mfact;
uint32_t default_nmaster; uint32_t default_nmaster;
int center_master_overspread; int32_t center_master_overspread;
int center_when_single_stack; int32_t center_when_single_stack;
uint32_t hotarea_size; uint32_t hotarea_size;
uint32_t enable_hotarea; uint32_t enable_hotarea;
uint32_t ov_tab_mode; uint32_t ov_tab_mode;
int overviewgappi; int32_t overviewgappi;
int overviewgappo; int32_t overviewgappo;
uint32_t cursor_hide_timeout; uint32_t cursor_hide_timeout;
uint32_t axis_bind_apply_timeout; uint32_t axis_bind_apply_timeout;
uint32_t focus_on_activate; uint32_t focus_on_activate;
int idleinhibit_ignore_visible; int32_t idleinhibit_ignore_visible;
int sloppyfocus; int32_t sloppyfocus;
int warpcursor; int32_t warpcursor;
/* keyboard */ /* keyboard */
int repeat_rate; int32_t repeat_rate;
int repeat_delay; int32_t repeat_delay;
uint32_t numlockon; uint32_t numlockon;
/* Trackpad */ /* Trackpad */
int disable_trackpad; int32_t disable_trackpad;
int tap_to_click; int32_t tap_to_click;
int tap_and_drag; int32_t tap_and_drag;
int drag_lock; int32_t drag_lock;
int mouse_natural_scrolling; int32_t mouse_natural_scrolling;
int trackpad_natural_scrolling; int32_t trackpad_natural_scrolling;
int disable_while_typing; int32_t disable_while_typing;
int left_handed; int32_t left_handed;
int middle_button_emulation; int32_t middle_button_emulation;
uint32_t accel_profile; uint32_t accel_profile;
double accel_speed; double accel_speed;
uint32_t scroll_method; uint32_t scroll_method;
@@ -268,21 +269,21 @@ typedef struct {
double axis_scroll_factor; double axis_scroll_factor;
int blur; int32_t blur;
int blur_layer; int32_t blur_layer;
int blur_optimized; int32_t blur_optimized;
int border_radius; int32_t border_radius;
struct blur_data blur_params; struct blur_data blur_params;
int shadows; int32_t shadows;
int shadow_only_floating; int32_t shadow_only_floating;
int layer_shadows; int32_t layer_shadows;
uint32_t shadows_size; uint32_t shadows_size;
float shadows_blur; float shadows_blur;
int shadows_position_x; int32_t shadows_position_x;
int shadows_position_y; int32_t shadows_position_y;
float shadowscolor[4]; float shadowscolor[4];
int smartgaps; int32_t smartgaps;
uint32_t gappih; uint32_t gappih;
uint32_t gappiv; uint32_t gappiv;
uint32_t gappoh; uint32_t gappoh;
@@ -302,51 +303,51 @@ typedef struct {
char autostart[3][256]; char autostart[3][256];
ConfigTagRule *tag_rules; // 动态数组 ConfigTagRule *tag_rules; // 动态数组
int tag_rules_count; // 数量 int32_t tag_rules_count; // 数量
ConfigLayerRule *layer_rules; // 动态数组 ConfigLayerRule *layer_rules; // 动态数组
int layer_rules_count; // 数量 int32_t layer_rules_count; // 数量
ConfigWinRule *window_rules; ConfigWinRule *window_rules;
int window_rules_count; int32_t window_rules_count;
ConfigMonitorRule *monitor_rules; // 动态数组 ConfigMonitorRule *monitor_rules; // 动态数组
int monitor_rules_count; // 条数 int32_t monitor_rules_count; // 条数
KeyBinding *key_bindings; KeyBinding *key_bindings;
int key_bindings_count; int32_t key_bindings_count;
MouseBinding *mouse_bindings; MouseBinding *mouse_bindings;
int mouse_bindings_count; int32_t mouse_bindings_count;
AxisBinding *axis_bindings; AxisBinding *axis_bindings;
int axis_bindings_count; int32_t axis_bindings_count;
SwitchBinding *switch_bindings; SwitchBinding *switch_bindings;
int switch_bindings_count; int32_t switch_bindings_count;
GestureBinding *gesture_bindings; GestureBinding *gesture_bindings;
int gesture_bindings_count; int32_t gesture_bindings_count;
ConfigEnv **env; ConfigEnv **env;
int env_count; int32_t env_count;
char **exec; char **exec;
int exec_count; int32_t exec_count;
char **exec_once; char **exec_once;
int exec_once_count; int32_t exec_once_count;
char *cursor_theme; char *cursor_theme;
uint32_t cursor_size; uint32_t cursor_size;
int single_scratchpad; int32_t single_scratchpad;
int xwayland_persistence; int32_t xwayland_persistence;
int syncobj_enable; int32_t syncobj_enable;
int adaptive_sync; int32_t adaptive_sync;
int allow_tearing; int32_t allow_tearing;
int allow_shortcuts_inhibit; int32_t allow_shortcuts_inhibit;
int allow_lock_transparent; int32_t allow_lock_transparent;
struct xkb_rule_names xkb_rules; struct xkb_rule_names xkb_rules;
@@ -356,7 +357,7 @@ typedef struct {
struct xkb_keymap *keymap; struct xkb_keymap *keymap;
} Config; } Config;
typedef int (*FuncType)(const Arg *); typedef int32_t (*FuncType)(const Arg *);
Config config; Config config;
void parse_config_file(Config *config, const char *file_path); void parse_config_file(Config *config, const char *file_path);
@@ -387,10 +388,11 @@ void trim_whitespace(char *str) {
} }
} }
int parse_double_array(const char *input, double *output, int max_count) { int32_t parse_double_array(const char *input, double *output,
int32_t max_count) {
char *dup = strdup(input); char *dup = strdup(input);
char *token; char *token;
int count = 0; int32_t count = 0;
// 先清空整个数组 // 先清空整个数组
memset(output, 0, max_count * sizeof(double)); memset(output, 0, max_count * sizeof(double));
@@ -438,7 +440,7 @@ void parse_bind_flags(const char *str, KeyBinding *kb) {
const char *suffix = str + 4; // 跳过"bind" const char *suffix = str + 4; // 跳过"bind"
// 遍历后缀字符 // 遍历后缀字符
for (int i = 0; suffix[i] != '\0'; i++) { for (int32_t i = 0; suffix[i] != '\0'; i++) {
switch (suffix[i]) { switch (suffix[i]) {
case 's': case 's':
kb->keysymcode.type = KEY_TYPE_SYM; kb->keysymcode.type = KEY_TYPE_SYM;
@@ -459,10 +461,10 @@ void parse_bind_flags(const char *str, KeyBinding *kb) {
} }
} }
int parse_circle_direction(const char *str) { int32_t parse_circle_direction(const char *str) {
// 将输入字符串转换为小写 // 将输入字符串转换为小写
char lowerStr[10]; char lowerStr[10];
int i = 0; int32_t i = 0;
while (str[i] && i < 9) { while (str[i] && i < 9) {
lowerStr[i] = tolower(str[i]); lowerStr[i] = tolower(str[i]);
i++; i++;
@@ -477,10 +479,10 @@ int parse_circle_direction(const char *str) {
} }
} }
int parse_direction(const char *str) { int32_t parse_direction(const char *str) {
// 将输入字符串转换为小写 // 将输入字符串转换为小写
char lowerStr[10]; char lowerStr[10];
int i = 0; int32_t i = 0;
while (str[i] && i < 9) { while (str[i] && i < 9) {
lowerStr[i] = tolower(str[i]); lowerStr[i] = tolower(str[i]);
i++; i++;
@@ -501,10 +503,10 @@ int parse_direction(const char *str) {
} }
} }
int parse_fold_state(const char *str) { int32_t parse_fold_state(const char *str) {
// 将输入字符串转换为小写 // 将输入字符串转换为小写
char lowerStr[10]; char lowerStr[10];
int i = 0; int32_t i = 0;
while (str[i] && i < 9) { while (str[i] && i < 9) {
lowerStr[i] = tolower(str[i]); lowerStr[i] = tolower(str[i]);
i++; i++;
@@ -520,9 +522,9 @@ int parse_fold_state(const char *str) {
return INVALIDFOLD; return INVALIDFOLD;
} }
} }
long int parse_color(const char *hex_str) { int64_t parse_color(const char *hex_str) {
char *endptr; char *endptr;
long int hex_num = strtol(hex_str, &endptr, 16); int64_t hex_num = strtol(hex_str, &endptr, 16);
if (*endptr != '\0') { if (*endptr != '\0') {
return -1; return -1;
} }
@@ -620,8 +622,9 @@ uint32_t parse_mod(const char *mod_str) {
} }
// 定义辅助函数：在 keymap 中查找 keysym 对应的多个 keycode // 定义辅助函数：在 keymap 中查找 keysym 对应的多个 keycode
static int find_keycodes_for_keysym(struct xkb_keymap *keymap, xkb_keysym_t sym, static int32_t find_keycodes_for_keysym(struct xkb_keymap *keymap,
MultiKeycode *multi_kc) { xkb_keysym_t sym,
MultiKeycode *multi_kc) {
xkb_keycode_t min_keycode = xkb_keymap_min_keycode(keymap); xkb_keycode_t min_keycode = xkb_keymap_min_keycode(keymap);
xkb_keycode_t max_keycode = xkb_keymap_max_keycode(keymap); xkb_keycode_t max_keycode = xkb_keymap_max_keycode(keymap);
@@ -629,16 +632,16 @@ static int find_keycodes_for_keysym(struct xkb_keymap *keymap, xkb_keysym_t sym,
multi_kc->keycode2 = 0; multi_kc->keycode2 = 0;
multi_kc->keycode3 = 0; multi_kc->keycode3 = 0;
int found_count = 0; int32_t found_count = 0;
for (xkb_keycode_t keycode = min_keycode; for (xkb_keycode_t keycode = min_keycode;
keycode <= max_keycode && found_count < 3; keycode++) { keycode <= max_keycode && found_count < 3; keycode++) {
// 使用布局0和层级0 // 使用布局0和层级0
const xkb_keysym_t *syms; const xkb_keysym_t *syms;
int num_syms = int32_t num_syms =
xkb_keymap_key_get_syms_by_level(keymap, keycode, 0, 0, &syms); xkb_keymap_key_get_syms_by_level(keymap, keycode, 0, 0, &syms);
for (int i = 0; i < num_syms; i++) { for (int32_t i = 0; i < num_syms; i++) {
if (syms[i] == sym) { if (syms[i] == sym) {
switch (found_count) { switch (found_count) {
case 0: case 0:
@@ -716,7 +719,7 @@ KeySymCode parse_key(const char *key_str, bool isbindsym) {
if (sym != XKB_KEY_NoSymbol) { if (sym != XKB_KEY_NoSymbol) {
// 尝试找到对应的多个 keycode // 尝试找到对应的多个 keycode
int found_count = int32_t found_count =
find_keycodes_for_keysym(config.keymap, sym, &kc.keycode); find_keycodes_for_keysym(config.keymap, sym, &kc.keycode);
if (found_count > 0) { if (found_count > 0) {
kc.type = KEY_TYPE_CODE; kc.type = KEY_TYPE_CODE;
@@ -736,10 +739,10 @@ KeySymCode parse_key(const char *key_str, bool isbindsym) {
return kc; return kc;
} }
int parse_button(const char *str) { int32_t parse_button(const char *str) {
// 将输入字符串转换为小写 // 将输入字符串转换为小写
char lowerStr[20]; char lowerStr[20];
int i = 0; int32_t i = 0;
while (str[i] && i < 19) { while (str[i] && i < 19) {
lowerStr[i] = tolower(str[i]); lowerStr[i] = tolower(str[i]);
i++; i++;
@@ -768,10 +771,10 @@ int parse_button(const char *str) {
} }
} }
int parse_mouse_action(const char *str) { int32_t parse_mouse_action(const char *str) {
// 将输入字符串转换为小写 // 将输入字符串转换为小写
char lowerStr[20]; char lowerStr[20];
int i = 0; int32_t i = 0;
while (str[i] && i < 19) { while (str[i] && i < 19) {
lowerStr[i] = tolower(str[i]); lowerStr[i] = tolower(str[i]);
i++; i++;
@@ -792,7 +795,7 @@ int parse_mouse_action(const char *str) {
} }
} }
void convert_hex_to_rgba(float *color, unsigned long int hex) { void convert_hex_to_rgba(float *color, uint32_t hex) {
color[0] = ((hex >> 24) & 0xFF) / 255.0f; color[0] = ((hex >> 24) & 0xFF) / 255.0f;
color[1] = ((hex >> 16) & 0xFF) / 255.0f; color[1] = ((hex >> 16) & 0xFF) / 255.0f;
color[2] = ((hex >> 8) & 0xFF) / 255.0f; color[2] = ((hex >> 8) & 0xFF) / 255.0f;
@@ -879,7 +882,7 @@ FuncType parse_func_name(char *func_name, Arg *arg, char *arg_value,
// 收集需要拼接的参数 // 收集需要拼接的参数
const char *non_empty_params[4] = {NULL}; const char *non_empty_params[4] = {NULL};
int param_index = 0; int32_t param_index = 0;
if (arg_value2 && arg_value2[0] != '\0') if (arg_value2 && arg_value2[0] != '\0')
non_empty_params[param_index++] = arg_value2; non_empty_params[param_index++] = arg_value2;
@@ -896,7 +899,7 @@ FuncType parse_func_name(char *func_name, Arg *arg, char *arg_value,
} else { } else {
// 计算总长度 // 计算总长度
size_t len = 0; size_t len = 0;
for (int i = 0; i < param_index; i++) { for (int32_t i = 0; i < param_index; i++) {
len += strlen(non_empty_params[i]); len += strlen(non_empty_params[i]);
} }
len += (param_index - 1) + 1; // 逗号数 + null终止符 len += (param_index - 1) + 1; // 逗号数 + null终止符
@@ -904,7 +907,7 @@ FuncType parse_func_name(char *func_name, Arg *arg, char *arg_value,
char *temp = malloc(len); char *temp = malloc(len);
if (temp) { if (temp) {
char *cursor = temp; char *cursor = temp;
for (int i = 0; i < param_index; i++) { for (int32_t i = 0; i < param_index; i++) {
if (i > 0) { if (i > 0) {
*cursor++ = ','; *cursor++ = ',';
} }
@@ -1008,7 +1011,7 @@ FuncType parse_func_name(char *func_name, Arg *arg, char *arg_value,
token = strtok_r(arg_copy, "|", &saveptr); token = strtok_r(arg_copy, "|", &saveptr);
while (token != NULL) { while (token != NULL) {
int num = atoi(token); int32_t num = atoi(token);
if (num > 0 && num <= LENGTH(tags)) { if (num > 0 && num <= LENGTH(tags)) {
mask |= (1 << (num - 1)); mask |= (1 << (num - 1));
} }
@@ -1084,7 +1087,7 @@ FuncType parse_func_name(char *func_name, Arg *arg, char *arg_value,
} }
void set_env() { void set_env() {
for (int i = 0; i < config.env_count; i++) { for (int32_t i = 0; i < config.env_count; i++) {
setenv(config.env[i]->type, config.env[i]->value, 1); setenv(config.env[i]->type, config.env[i]->value, 1);
} }
} }
@@ -1092,7 +1095,7 @@ void set_env() {
void run_exec() { void run_exec() {
Arg arg; Arg arg;
for (int i = 0; i < config.exec_count; i++) { for (int32_t i = 0; i < config.exec_count; i++) {
arg.v = config.exec[i]; arg.v = config.exec[i];
spawn_shell(&arg); spawn_shell(&arg);
} }
@@ -1101,7 +1104,7 @@ void run_exec() {
void run_exec_once() { void run_exec_once() {
Arg arg; Arg arg;
for (int i = 0; i < config.exec_once_count; i++) { for (int32_t i = 0; i < config.exec_once_count; i++) {
arg.v = config.exec_once[i]; arg.v = config.exec_once[i];
spawn_shell(&arg); spawn_shell(&arg);
} }
@@ -1155,39 +1158,43 @@ void parse_option(Config *config, char *key, char *value) {
} else if (strcmp(key, "animation_duration_focus") == 0) { } else if (strcmp(key, "animation_duration_focus") == 0) {
config->animation_duration_focus = atoi(value); config->animation_duration_focus = atoi(value);
} else if (strcmp(key, "animation_curve_move") == 0) { } else if (strcmp(key, "animation_curve_move") == 0) {
int num = parse_double_array(value, config->animation_curve_move, 4); int32_t num =
parse_double_array(value, config->animation_curve_move, 4);
if (num != 4) { if (num != 4) {
fprintf(stderr, "Error: Failed to parse animation_curve_move: %s\n", fprintf(stderr, "Error: Failed to parse animation_curve_move: %s\n",
value); value);
} }
} else if (strcmp(key, "animation_curve_open") == 0) { } else if (strcmp(key, "animation_curve_open") == 0) {
int num = parse_double_array(value, config->animation_curve_open, 4); int32_t num =
parse_double_array(value, config->animation_curve_open, 4);
if (num != 4) { if (num != 4) {
fprintf(stderr, "Error: Failed to parse animation_curve_open: %s\n", fprintf(stderr, "Error: Failed to parse animation_curve_open: %s\n",
value); value);
} }
} else if (strcmp(key, "animation_curve_tag") == 0) { } else if (strcmp(key, "animation_curve_tag") == 0) {
int num = parse_double_array(value, config->animation_curve_tag, 4); int32_t num = parse_double_array(value, config->animation_curve_tag, 4);
if (num != 4) { if (num != 4) {
fprintf(stderr, "Error: Failed to parse animation_curve_tag: %s\n", fprintf(stderr, "Error: Failed to parse animation_curve_tag: %s\n",
value); value);
} }
} else if (strcmp(key, "animation_curve_close") == 0) { } else if (strcmp(key, "animation_curve_close") == 0) {
int num = parse_double_array(value, config->animation_curve_close, 4); int32_t num =
parse_double_array(value, config->animation_curve_close, 4);
if (num != 4) { if (num != 4) {
fprintf(stderr, fprintf(stderr,
"Error: Failed to parse animation_curve_close: %s\n", "Error: Failed to parse animation_curve_close: %s\n",
value); value);
} }
} else if (strcmp(key, "animation_curve_focus") == 0) { } else if (strcmp(key, "animation_curve_focus") == 0) {
int num = parse_double_array(value, config->animation_curve_focus, 4); int32_t num =
parse_double_array(value, config->animation_curve_focus, 4);
if (num != 4) { if (num != 4) {
fprintf(stderr, fprintf(stderr,
"Error: Failed to parse animation_curve_focus: %s\n", "Error: Failed to parse animation_curve_focus: %s\n",
value); value);
} }
} else if (strcmp(key, "animation_curve_opafadein") == 0) { } else if (strcmp(key, "animation_curve_opafadein") == 0) {
int num = int32_t num =
parse_double_array(value, config->animation_curve_opafadein, 4); parse_double_array(value, config->animation_curve_opafadein, 4);
if (num != 4) { if (num != 4) {
fprintf(stderr, fprintf(stderr,
@@ -1195,7 +1202,7 @@ void parse_option(Config *config, char *key, char *value) {
value); value);
} }
} else if (strcmp(key, "animation_curve_opafadeout") == 0) { } else if (strcmp(key, "animation_curve_opafadeout") == 0) {
int num = int32_t num =
parse_double_array(value, config->animation_curve_opafadeout, 4); parse_double_array(value, config->animation_curve_opafadeout, 4);
if (num != 4) { if (num != 4) {
fprintf(stderr, fprintf(stderr,
@@ -1312,12 +1319,12 @@ void parse_option(Config *config, char *key, char *value) {
'\0'; // 确保字符串以 null 结尾 '\0'; // 确保字符串以 null 结尾
} else if (strcmp(key, "scroller_proportion_preset") == 0) { } else if (strcmp(key, "scroller_proportion_preset") == 0) {
// 1. 统计 value 中有多少个逗号，确定需要解析的浮点数个数 // 1. 统计 value 中有多少个逗号，确定需要解析的浮点数个数
int count = 0; // 初始化为 0 int32_t count = 0; // 初始化为 0
for (const char *p = value; *p; p++) { for (const char *p = value; *p; p++) {
if (*p == ',') if (*p == ',')
count++; count++;
} }
int float_count = count + 1; // 浮点数的数量是逗号数量加 1 int32_t float_count = count + 1; // 浮点数的数量是逗号数量加 1
// 2. 动态分配内存，存储浮点数 // 2. 动态分配内存，存储浮点数
config->scroller_proportion_preset = config->scroller_proportion_preset =
@@ -1331,7 +1338,7 @@ void parse_option(Config *config, char *key, char *value) {
char *value_copy = char *value_copy =
strdup(value); // 复制 value，因为 strtok 会修改原字符串 strdup(value); // 复制 value，因为 strtok 会修改原字符串
char *token = strtok(value_copy, ","); char *token = strtok(value_copy, ",");
int i = 0; int32_t i = 0;
float value_set; float value_set;
while (token != NULL && i < float_count) { while (token != NULL && i < float_count) {
@@ -1371,12 +1378,12 @@ void parse_option(Config *config, char *key, char *value) {
free(value_copy); free(value_copy);
} else if (strcmp(key, "circle_layout") == 0) { } else if (strcmp(key, "circle_layout") == 0) {
// 1. 统计 value 中有多少个逗号，确定需要解析的字符串个数 // 1. 统计 value 中有多少个逗号，确定需要解析的字符串个数
int count = 0; // 初始化为 0 int32_t count = 0; // 初始化为 0
for (const char *p = value; *p; p++) { for (const char *p = value; *p; p++) {
if (*p == ',') if (*p == ',')
count++; count++;
} }
int string_count = count + 1; // 字符串的数量是逗号数量加 1 int32_t string_count = count + 1; // 字符串的数量是逗号数量加 1
// 2. 动态分配内存，存储字符串指针 // 2. 动态分配内存，存储字符串指针
config->circle_layout = (char **)malloc(string_count * sizeof(char *)); config->circle_layout = (char **)malloc(string_count * sizeof(char *));
@@ -1390,7 +1397,7 @@ void parse_option(Config *config, char *key, char *value) {
char *value_copy = char *value_copy =
strdup(value); // 复制 value，因为 strtok 会修改原字符串 strdup(value); // 复制 value，因为 strtok 会修改原字符串
char *token = strtok(value_copy, ","); char *token = strtok(value_copy, ",");
int i = 0; int32_t i = 0;
char *cleaned_token; char *cleaned_token;
while (token != NULL && i < string_count) { while (token != NULL && i < string_count) {
// 为每个字符串分配内存并复制内容 // 为每个字符串分配内存并复制内容
@@ -1401,7 +1408,7 @@ void parse_option(Config *config, char *key, char *value) {
"Error: Memory allocation failed for string: %s\n", "Error: Memory allocation failed for string: %s\n",
token); token);
// 释放之前分配的内存 // 释放之前分配的内存
for (int j = 0; j < i; j++) { for (int32_t j = 0; j < i; j++) {
free(config->circle_layout[j]); free(config->circle_layout[j]);
} }
free(config->circle_layout); free(config->circle_layout);
@@ -1418,7 +1425,7 @@ void parse_option(Config *config, char *key, char *value) {
if (i != string_count) { if (i != string_count) {
fprintf(stderr, "Error: Invalid circle_layout format: %s\n", value); fprintf(stderr, "Error: Invalid circle_layout format: %s\n", value);
// 释放之前分配的内存 // 释放之前分配的内存
for (int j = 0; j < i; j++) { for (int32_t j = 0; j < i; j++) {
free(config->circle_layout[j]); free(config->circle_layout[j]);
} }
free(config->circle_layout); free(config->circle_layout);
@@ -1524,7 +1531,7 @@ void parse_option(Config *config, char *key, char *value) {
} else if (strcmp(key, "borderpx") == 0) { } else if (strcmp(key, "borderpx") == 0) {
config->borderpx = atoi(value); config->borderpx = atoi(value);
} else if (strcmp(key, "rootcolor") == 0) { } else if (strcmp(key, "rootcolor") == 0) {
long int color = parse_color(value); int64_t color = parse_color(value);
if (color == -1) { if (color == -1) {
fprintf(stderr, "Error: Invalid rootcolor format: %s\n", value); fprintf(stderr, "Error: Invalid rootcolor format: %s\n", value);
} else { } else {
@@ -1532,28 +1539,28 @@ void parse_option(Config *config, char *key, char *value) {
} }
} else if (strcmp(key, "shadowscolor") == 0) { } else if (strcmp(key, "shadowscolor") == 0) {
long int color = parse_color(value); int64_t color = parse_color(value);
if (color == -1) { if (color == -1) {
fprintf(stderr, "Error: Invalid shadowscolor format: %s\n", value); fprintf(stderr, "Error: Invalid shadowscolor format: %s\n", value);
} else { } else {
convert_hex_to_rgba(config->shadowscolor, color); convert_hex_to_rgba(config->shadowscolor, color);
} }
} else if (strcmp(key, "bordercolor") == 0) { } else if (strcmp(key, "bordercolor") == 0) {
long int color = parse_color(value); int64_t color = parse_color(value);
if (color == -1) { if (color == -1) {
fprintf(stderr, "Error: Invalid bordercolor format: %s\n", value); fprintf(stderr, "Error: Invalid bordercolor format: %s\n", value);
} else { } else {
convert_hex_to_rgba(config->bordercolor, color); convert_hex_to_rgba(config->bordercolor, color);
} }
} else if (strcmp(key, "focuscolor") == 0) { } else if (strcmp(key, "focuscolor") == 0) {
long int color = parse_color(value); int64_t color = parse_color(value);
if (color == -1) { if (color == -1) {
fprintf(stderr, "Error: Invalid focuscolor format: %s\n", value); fprintf(stderr, "Error: Invalid focuscolor format: %s\n", value);
} else { } else {
convert_hex_to_rgba(config->focuscolor, color); convert_hex_to_rgba(config->focuscolor, color);
} }
} else if (strcmp(key, "maximizescreencolor") == 0) { } else if (strcmp(key, "maximizescreencolor") == 0) {
long int color = parse_color(value); int64_t color = parse_color(value);
if (color == -1) { if (color == -1) {
fprintf(stderr, "Error: Invalid maximizescreencolor format: %s\n", fprintf(stderr, "Error: Invalid maximizescreencolor format: %s\n",
value); value);
@@ -1561,14 +1568,14 @@ void parse_option(Config *config, char *key, char *value) {
convert_hex_to_rgba(config->maximizescreencolor, color); convert_hex_to_rgba(config->maximizescreencolor, color);
} }
} else if (strcmp(key, "urgentcolor") == 0) { } else if (strcmp(key, "urgentcolor") == 0) {
long int color = parse_color(value); int64_t color = parse_color(value);
if (color == -1) { if (color == -1) {
fprintf(stderr, "Error: Invalid urgentcolor format: %s\n", value); fprintf(stderr, "Error: Invalid urgentcolor format: %s\n", value);
} else { } else {
convert_hex_to_rgba(config->urgentcolor, color); convert_hex_to_rgba(config->urgentcolor, color);
} }
} else if (strcmp(key, "scratchpadcolor") == 0) { } else if (strcmp(key, "scratchpadcolor") == 0) {
long int color = parse_color(value); int64_t color = parse_color(value);
if (color == -1) { if (color == -1) {
fprintf(stderr, "Error: Invalid scratchpadcolor format: %s\n", fprintf(stderr, "Error: Invalid scratchpadcolor format: %s\n",
value); value);
@@ -1576,14 +1583,14 @@ void parse_option(Config *config, char *key, char *value) {
convert_hex_to_rgba(config->scratchpadcolor, color); convert_hex_to_rgba(config->scratchpadcolor, color);
} }
} else if (strcmp(key, "globalcolor") == 0) { } else if (strcmp(key, "globalcolor") == 0) {
long int color = parse_color(value); int64_t color = parse_color(value);
if (color == -1) { if (color == -1) {
fprintf(stderr, "Error: Invalid globalcolor format: %s\n", value); fprintf(stderr, "Error: Invalid globalcolor format: %s\n", value);
} else { } else {
convert_hex_to_rgba(config->globalcolor, color); convert_hex_to_rgba(config->globalcolor, color);
} }
} else if (strcmp(key, "overlaycolor") == 0) { } else if (strcmp(key, "overlaycolor") == 0) {
long int color = parse_color(value); int64_t color = parse_color(value);
if (color == -1) { if (color == -1) {
fprintf(stderr, "Error: Invalid overlaycolor format: %s\n", value); fprintf(stderr, "Error: Invalid overlaycolor format: %s\n", value);
} else { } else {
@@ -1701,7 +1708,7 @@ void parse_option(Config *config, char *key, char *value) {
ConfigWinRule *rule = &config->window_rules[config->window_rules_count]; ConfigWinRule *rule = &config->window_rules[config->window_rules_count];
memset(rule, 0, sizeof(ConfigWinRule)); memset(rule, 0, sizeof(ConfigWinRule));
// int rule value, relay to a client property // int32_t rule value, relay to a client property
rule->isfloating = -1; rule->isfloating = -1;
rule->isfullscreen = -1; rule->isfullscreen = -1;
rule->isnoborder = -1; rule->isnoborder = -1;
@@ -1876,7 +1883,7 @@ void parse_option(Config *config, char *key, char *value) {
raw_height[256], raw_refresh[256]; raw_height[256], raw_refresh[256];
// 先读取所有字段为字符串 // 先读取所有字段为字符串
int parsed = int32_t parsed =
sscanf(value, sscanf(value,
"%255[^,],%255[^,],%255[^,],%255[^,],%255[^,],%255[" "%255[^,],%255[^,],%255[^,],%255[^,],%255[^,],%255["
"^,],%255[^,],%255[^,],%255[^,],%255[^,],%255s", "^,],%255[^,],%255[^,],%255[^,],%255[^,],%255s",
@@ -2390,7 +2397,7 @@ void parse_config_file(Config *config, const char *file_path) {
void free_circle_layout(Config *config) { void free_circle_layout(Config *config) {
if (config->circle_layout) { if (config->circle_layout) {
// 释放每个字符串 // 释放每个字符串
for (int i = 0; i < config->circle_layout_count; i++) { for (int32_t i = 0; i < config->circle_layout_count; i++) {
if (config->circle_layout[i]) { if (config->circle_layout[i]) {
free(config->circle_layout[i]); // 释放单个字符串 free(config->circle_layout[i]); // 释放单个字符串
config->circle_layout[i] = NULL; // 防止野指针 config->circle_layout[i] = NULL; // 防止野指针
@@ -2436,11 +2443,11 @@ void free_baked_points(void) {
void free_config(void) { void free_config(void) {
// 释放内存 // 释放内存
int i; int32_t i;
// 释放 window_rules // 释放 window_rules
if (config.window_rules) { if (config.window_rules) {
for (int i = 0; i < config.window_rules_count; i++) { for (int32_t i = 0; i < config.window_rules_count; i++) {
ConfigWinRule *rule = &config.window_rules[i]; ConfigWinRule *rule = &config.window_rules[i];
if (rule->id) if (rule->id)
free((void *)rule->id); free((void *)rule->id);
@@ -2469,7 +2476,7 @@ void free_config(void) {
// 释放 monitor_rules // 释放 monitor_rules
if (config.monitor_rules) { if (config.monitor_rules) {
for (int i = 0; i < config.monitor_rules_count; i++) { for (int32_t i = 0; i < config.monitor_rules_count; i++) {
ConfigMonitorRule *rule = &config.monitor_rules[i]; ConfigMonitorRule *rule = &config.monitor_rules[i];
free((void *)rule->name); free((void *)rule->name);
free((void *)rule->layout); free((void *)rule->layout);
@@ -2586,7 +2593,7 @@ void free_config(void) {
// 释放 tag_rules // 释放 tag_rules
if (config.tag_rules) { if (config.tag_rules) {
for (int i = 0; i < config.tag_rules_count; i++) { for (int32_t i = 0; i < config.tag_rules_count; i++) {
if (config.tag_rules[i].layout_name) if (config.tag_rules[i].layout_name)
free((void *)config.tag_rules[i].layout_name); free((void *)config.tag_rules[i].layout_name);
if (config.tag_rules[i].monitor_name) if (config.tag_rules[i].monitor_name)
@@ -2599,7 +2606,7 @@ void free_config(void) {
// 释放 layer_rules // 释放 layer_rules
if (config.layer_rules) { if (config.layer_rules) {
for (int i = 0; i < config.layer_rules_count; i++) { for (int32_t i = 0; i < config.layer_rules_count; i++) {
if (config.layer_rules[i].layer_name) if (config.layer_rules[i].layer_name)
free((void *)config.layer_rules[i].layer_name); free((void *)config.layer_rules[i].layer_name);
if (config.layer_rules[i].animation_type_open) if (config.layer_rules[i].animation_type_open)
@@ -2614,7 +2621,7 @@ void free_config(void) {
// 释放 env // 释放 env
if (config.env) { if (config.env) {
for (int i = 0; i < config.env_count; i++) { for (int32_t i = 0; i < config.env_count; i++) {
if (config.env[i]->type) { if (config.env[i]->type) {
free((void *)config.env[i]->type); free((void *)config.env[i]->type);
} }
@@ -3144,7 +3151,7 @@ void reset_blur_params(void) {
void reapply_monitor_rules(void) { void reapply_monitor_rules(void) {
ConfigMonitorRule *mr; ConfigMonitorRule *mr;
Monitor *m = NULL; Monitor *m = NULL;
int ji, jk; int32_t ji, jk;
struct wlr_output_state state; struct wlr_output_state state;
struct wlr_output_mode *internal_mode = NULL; struct wlr_output_mode *internal_mode = NULL;
wlr_output_state_init(&state); wlr_output_state_init(&state);
@@ -3182,7 +3189,7 @@ void reapply_monitor_rules(void) {
} else if (wlr_output_is_headless(m->wlr_output)) { } else if (wlr_output_is_headless(m->wlr_output)) {
wlr_output_state_set_custom_mode( wlr_output_state_set_custom_mode(
&state, mr->width, mr->height, &state, mr->width, mr->height,
(int)roundf(mr->refresh * 1000)); (int32_t)roundf(mr->refresh * 1000));
} }
} }
@@ -3279,7 +3286,7 @@ void reapply_pointer(void) {
void reapply_master(void) { void reapply_master(void) {
int i; int32_t i;
Monitor *m = NULL; Monitor *m = NULL;
for (i = 0; i <= LENGTH(tags); i++) { for (i = 0; i <= LENGTH(tags); i++) {
wl_list_for_each(m, &mons, link) { wl_list_for_each(m, &mons, link) {
@@ -3297,7 +3304,7 @@ void reapply_master(void) {
} }
void parse_tagrule(Monitor *m) { void parse_tagrule(Monitor *m) {
int i, jk; int32_t i, jk;
ConfigTagRule tr; ConfigTagRule tr;
for (i = 0; i < config.tag_rules_count; i++) { for (i = 0; i < config.tag_rules_count; i++) {
@@ -3350,7 +3357,7 @@ void reset_option(void) {
arrange(selmon, false, false); arrange(selmon, false, false);
} }
int reload_config(const Arg *arg) { int32_t reload_config(const Arg *arg) {
parse_config(); parse_config();
reset_option(); reset_option();
printstatus(); printstatus();

138
src/config/preset.h
View File

@@ -8,17 +8,17 @@
((hex >> 8) & 0xFF) / 255.0f, (hex & 0xFF) / 255.0f} ((hex >> 8) & 0xFF) / 255.0f, (hex & 0xFF) / 255.0f}
/* animaion */ /* animaion */
char *animation_type_open = "slide"; // 是否启用动画 //slide,zoom 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
int animations = 1; // 是否启用动画 int32_t animations = 1; // 是否启用动画
int layer_animations = 0; // 是否启用layer动画 int32_t layer_animations = 0; // 是否启用layer动画
int tag_animation_direction = HORIZONTAL; // 标签动画方向 int32_t tag_animation_direction = HORIZONTAL; // 标签动画方向
int animation_fade_in = 1; // Enable animation fade in int32_t animation_fade_in = 1; // Enable animation fade in
int animation_fade_out = 1; // Enable animation fade out int32_t 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
float fadeout_begin_opacity = 0.5; // Begin opac window ratio for animations float fadeout_begin_opacity = 0.5; // Begin opac window ratio for animations
uint32_t animation_duration_move = 500; // Animation move speed uint32_t animation_duration_move = 500; // Animation move speed
@@ -40,47 +40,47 @@ uint32_t focus_on_activate = 1; // 收到窗口激活请求是否自动跳转
uint32_t new_is_master = 1; // 新窗口是否插在头部 uint32_t new_is_master = 1; // 新窗口是否插在头部
double default_mfact = 0.55f; // master 窗口比例 double default_mfact = 0.55f; // master 窗口比例
uint32_t default_nmaster = 1; // 默认master数量 uint32_t default_nmaster = 1; // 默认master数量
int center_master_overspread = 0; // 中心master时是否铺满 int32_t center_master_overspread = 0; // 中心master时是否铺满
int center_when_single_stack = 1; // 单个stack时是否居中 int32_t center_when_single_stack = 1; // 单个stack时是否居中
/* logging */ /* logging */
int log_level = WLR_ERROR; int32_t log_level = WLR_ERROR;
uint32_t numlockon = 0; // 是否打开右边小键盘 uint32_t numlockon = 0; // 是否打开右边小键盘
uint32_t capslock = 0; // 是否启用快捷键 uint32_t capslock = 0; // 是否启用快捷键
uint32_t ov_tab_mode = 0; // alt tab切换模式 uint32_t ov_tab_mode = 0; // alt tab切换模式
uint32_t hotarea_size = 10; // 热区大小,10x10 uint32_t hotarea_size = 10; // 热区大小,10x10
uint32_t enable_hotarea = 1; // 是否启用鼠标热区 uint32_t enable_hotarea = 1; // 是否启用鼠标热区
int smartgaps = 0; /* 1 means no outer gap when there is only one window */ int32_t smartgaps = 0; /* 1 means no outer gap when there is only one window */
int sloppyfocus = 1; /* focus follows mouse */ int32_t sloppyfocus = 1; /* focus follows mouse */
uint32_t gappih = 5; /* horiz inner gap between windows */ uint32_t gappih = 5; /* horiz inner gap between windows */
uint32_t gappiv = 5; /* vert inner gap between windows */ uint32_t gappiv = 5; /* vert inner gap between windows */
uint32_t gappoh = 10; /* horiz outer gap between windows and screen edge */ uint32_t gappoh = 10; /* horiz outer gap between windows and screen edge */
uint32_t gappov = 10; /* vert outer gap between windows and screen edge */ uint32_t 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;
int scroller_structs = 20; int32_t 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;
int scroller_ignore_proportion_single = 0; int32_t scroller_ignore_proportion_single = 0;
int scroller_focus_center = 0; int32_t scroller_focus_center = 0;
int scroller_prefer_center = 0; int32_t scroller_prefer_center = 0;
int focus_cross_monitor = 0; int32_t focus_cross_monitor = 0;
int focus_cross_tag = 0; int32_t focus_cross_tag = 0;
int exchange_cross_monitor = 0; int32_t exchange_cross_monitor = 0;
int scratchpad_cross_monitor = 0; int32_t scratchpad_cross_monitor = 0;
int view_current_to_back = 0; int32_t view_current_to_back = 0;
int no_border_when_single = 0; int32_t no_border_when_single = 0;
int no_radius_when_single = 0; int32_t no_radius_when_single = 0;
int snap_distance = 30; int32_t snap_distance = 30;
int enable_floating_snap = 0; int32_t enable_floating_snap = 0;
int drag_tile_to_tile = 0; int32_t drag_tile_to_tile = 0;
uint32_t cursor_size = 24; uint32_t cursor_size = 24;
uint32_t cursor_hide_timeout = 0; uint32_t cursor_hide_timeout = 0;
uint32_t swipe_min_threshold = 1; uint32_t swipe_min_threshold = 1;
int idleinhibit_ignore_visible = int32_t idleinhibit_ignore_visible =
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 */ uint32_t borderpx = 4; /* border pixel of windows */
@@ -94,21 +94,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";
int overviewgappi = 5; /* overview时 窗口与边缘 缝隙大小 */ int32_t overviewgappi = 5; /* overview时 窗口与边缘 缝隙大小 */
int overviewgappo = 30; /* overview时 窗口与窗口 缝隙大小 */ int32_t 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};
int warpcursor = 1; /* Warp cursor to focused client */ int32_t warpcursor = 1; /* Warp cursor to focused client */
int xwayland_persistence = 1; /* xwayland persistence */ int32_t xwayland_persistence = 1; /* xwayland persistence */
int syncobj_enable = 0; int32_t syncobj_enable = 0;
int adaptive_sync = 0; int32_t adaptive_sync = 0;
int allow_lock_transparent = 0; int32_t allow_lock_transparent = 0;
double drag_refresh_interval = 16.0; double drag_refresh_interval = 16.0;
int allow_tearing = TEARING_DISABLED; int32_t allow_tearing = TEARING_DISABLED;
int allow_shortcuts_inhibit = SHORTCUTS_INHIBIT_ENABLE; int32_t allow_shortcuts_inhibit = SHORTCUTS_INHIBIT_ENABLE;
/* keyboard */ /* keyboard */
@@ -145,21 +145,21 @@ struct xkb_rule_names xkb_rules = {
.options = xkb_rules_options, .options = xkb_rules_options,
}; };
int repeat_rate = 25; int32_t repeat_rate = 25;
int repeat_delay = 600; int32_t repeat_delay = 600;
/* Trackpad */ /* Trackpad */
int disable_trackpad = 0; int32_t disable_trackpad = 0;
int tap_to_click = 1; int32_t tap_to_click = 1;
int tap_and_drag = 1; int32_t tap_and_drag = 1;
int drag_lock = 1; int32_t drag_lock = 1;
int mouse_natural_scrolling = 0; int32_t mouse_natural_scrolling = 0;
int trackpad_natural_scrolling = 0; int32_t trackpad_natural_scrolling = 0;
int disable_while_typing = 1; int32_t disable_while_typing = 1;
int left_handed = 0; int32_t left_handed = 0;
int middle_button_emulation = 0; int32_t middle_button_emulation = 0;
int single_scratchpad = 1; int32_t single_scratchpad = 1;
int edge_scroller_pointer_focus = 1; int32_t edge_scroller_pointer_focus = 1;
/* You can choose between: /* You can choose between:
LIBINPUT_CONFIG_SCROLL_NO_SCROLL LIBINPUT_CONFIG_SCROLL_NO_SCROLL
@@ -210,27 +210,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;
int border_radius = 0; int32_t border_radius = 0;
int border_radius_location_default = CORNER_LOCATION_ALL; int32_t border_radius_location_default = CORNER_LOCATION_ALL;
int blur = 0; int32_t blur = 0;
int blur_layer = 0; int32_t blur_layer = 0;
int blur_optimized = 1; int32_t blur_optimized = 1;
struct blur_data blur_params; struct blur_data blur_params;
int blur_params_num_passes = 1; int32_t blur_params_num_passes = 1;
int blur_params_radius = 5; int32_t 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;
int shadows = 0; int32_t shadows = 0;
int shadow_only_floating = 1; int32_t shadow_only_floating = 1;
int layer_shadows = 0; int32_t layer_shadows = 0;
uint32_t shadows_size = 10; uint32_t shadows_size = 10;
double shadows_blur = 15; double shadows_blur = 15;
int shadows_position_x = 0; int32_t shadows_position_x = 0;
int shadows_position_y = 0; int32_t shadows_position_y = 0;
float shadowscolor[] = COLOR(0x000000ff); float shadowscolor[] = COLOR(0x000000ff);
; ;

142
src/dispatch/bind_declare.h
View File

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

174
src/dispatch/bind_define.h
View File

@@ -1,4 +1,4 @@
int bind_to_view(const Arg *arg) { int32_t bind_to_view(const Arg *arg) {
uint32_t target = arg->ui; uint32_t target = arg->ui;
@@ -15,14 +15,14 @@ int bind_to_view(const Arg *arg) {
return 0; return 0;
} }
if ((int)target == INT_MIN && selmon->pertag->curtag == 0) { if ((int32_t)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 || (int)target == INT_MIN) { if (target == 0 || (int32_t)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,7 +30,7 @@ int bind_to_view(const Arg *arg) {
return 0; return 0;
} }
int chvt(const Arg *arg) { int32_t chvt(const Arg *arg) {
if (selmon) { if (selmon) {
chvt_backup_tag = selmon->pertag->curtag; chvt_backup_tag = selmon->pertag->curtag;
@@ -41,7 +41,7 @@ int chvt(const Arg *arg) {
return 1; return 1;
} }
int create_virtual_output(const Arg *arg) { int32_t 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");
@@ -60,7 +60,7 @@ int create_virtual_output(const Arg *arg) {
return 0; return 0;
} }
int destroy_all_virtual_output(const Arg *arg) { int32_t 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");
@@ -79,12 +79,12 @@ int destroy_all_virtual_output(const Arg *arg) {
return 0; return 0;
} }
int defaultgaps(const Arg *arg) { int32_t defaultgaps(const Arg *arg) {
setgaps(gappoh, gappov, gappih, gappiv); setgaps(gappoh, gappov, gappih, gappiv);
return 0; return 0;
} }
int exchange_client(const Arg *arg) { int32_t 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;
@@ -96,7 +96,7 @@ int exchange_client(const Arg *arg) {
return 0; return 0;
} }
int exchange_stack_client(const Arg *arg) { int32_t 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)
@@ -111,7 +111,7 @@ int exchange_stack_client(const Arg *arg) {
return 0; return 0;
} }
int focusdir(const Arg *arg) { int32_t focusdir(const Arg *arg) {
Client *c = NULL; Client *c = NULL;
c = direction_select(arg); c = direction_select(arg);
if (c) { if (c) {
@@ -131,7 +131,7 @@ int focusdir(const Arg *arg) {
return 0; return 0;
} }
int focuslast(const Arg *arg) { int32_t focuslast(const Arg *arg) {
Client *c = NULL; Client *c = NULL;
Client *tc = NULL; Client *tc = NULL;
@@ -163,7 +163,7 @@ int focuslast(const Arg *arg) {
if (!tc || !client_surface(tc)->mapped) if (!tc || !client_surface(tc)->mapped)
return 0; return 0;
if ((int)tc->tags > 0) { if ((int32_t)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);
@@ -171,12 +171,12 @@ int focuslast(const Arg *arg) {
return 0; return 0;
} }
int toggle_trackpad_enable(const Arg *arg) { int32_t toggle_trackpad_enable(const Arg *arg) {
disable_trackpad = !disable_trackpad; disable_trackpad = !disable_trackpad;
return 0; return 0;
} }
int focusmon(const Arg *arg) { int32_t focusmon(const Arg *arg) {
Client *c = NULL; Client *c = NULL;
Monitor *m = NULL; Monitor *m = NULL;
Monitor *tm = NULL; Monitor *tm = NULL;
@@ -216,7 +216,7 @@ int focusmon(const Arg *arg) {
return 0; return 0;
} }
int focusstack(const Arg *arg) { int32_t 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;
@@ -239,7 +239,7 @@ int focusstack(const Arg *arg) {
return 0; return 0;
} }
int incnmaster(const Arg *arg) { int32_t 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] =
@@ -248,49 +248,49 @@ int incnmaster(const Arg *arg) {
return 0; return 0;
} }
int incgaps(const Arg *arg) { int32_t 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;
} }
int incigaps(const Arg *arg) { int32_t 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;
} }
int incogaps(const Arg *arg) { int32_t 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;
} }
int incihgaps(const Arg *arg) { int32_t 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;
} }
int incivgaps(const Arg *arg) { int32_t 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;
} }
int incohgaps(const Arg *arg) { int32_t 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;
} }
int incovgaps(const Arg *arg) { int32_t 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;
} }
int setmfact(const Arg *arg) { int32_t setmfact(const Arg *arg) {
float f; float f;
Client *c = NULL; Client *c = NULL;
@@ -312,7 +312,7 @@ int setmfact(const Arg *arg) {
return 0; return 0;
} }
int killclient(const Arg *arg) { int32_t killclient(const Arg *arg) {
Client *c = NULL; Client *c = NULL;
c = selmon->sel; c = selmon->sel;
if (c) { if (c) {
@@ -321,7 +321,7 @@ int killclient(const Arg *arg) {
return 0; return 0;
} }
int moveresize(const Arg *arg) { int32_t 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);
@@ -359,7 +359,7 @@ int moveresize(const Arg *arg) {
return 0; return 0;
} }
int movewin(const Arg *arg) { int32_t movewin(const Arg *arg) {
Client *c = NULL; Client *c = NULL;
c = selmon->sel; c = selmon->sel;
if (!c || c->isfullscreen) if (!c || c->isfullscreen)
@@ -397,15 +397,15 @@ int movewin(const Arg *arg) {
return 0; return 0;
} }
int quit(const Arg *arg) { int32_t quit(const Arg *arg) {
wl_display_terminate(dpy); wl_display_terminate(dpy);
return 0; return 0;
} }
int resizewin(const Arg *arg) { int32_t resizewin(const Arg *arg) {
Client *c = NULL; Client *c = NULL;
c = selmon->sel; c = selmon->sel;
int offsetx = 0, offsety = 0; int32_t offsetx = 0, offsety = 0;
if (!c || c->isfullscreen || c->ismaximizescreen) if (!c || c->isfullscreen || c->ismaximizescreen)
return 0; return 0;
@@ -468,7 +468,7 @@ int resizewin(const Arg *arg) {
return 0; return 0;
} }
int restore_minimized(const Arg *arg) { int32_t restore_minimized(const Arg *arg) {
Client *c = NULL; Client *c = NULL;
if (selmon && selmon->isoverview) if (selmon && selmon->isoverview)
@@ -500,8 +500,8 @@ int restore_minimized(const Arg *arg) {
return 0; return 0;
} }
int setlayout(const Arg *arg) { int32_t setlayout(const Arg *arg) {
int jk; int32_t 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) {
@@ -515,7 +515,7 @@ int setlayout(const Arg *arg) {
return 0; return 0;
} }
int setkeymode(const Arg *arg) { int32_t 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;
@@ -526,7 +526,7 @@ int setkeymode(const Arg *arg) {
return 1; return 1;
} }
int set_proportion(const Arg *arg) { int32_t set_proportion(const Arg *arg) {
if (selmon->isoverview || !is_scroller_layout(selmon)) if (selmon->isoverview || !is_scroller_layout(selmon))
return 0; return 0;
@@ -546,10 +546,10 @@ int set_proportion(const Arg *arg) {
return 0; return 0;
} }
int smartmovewin(const Arg *arg) { int32_t smartmovewin(const Arg *arg) {
Client *c = NULL, *tc = NULL; Client *c = NULL, *tc = NULL;
int nx, ny; int32_t nx, ny;
int buttom, top, left, right, tar; int32_t buttom, top, left, right, tar;
c = selmon->sel; c = selmon->sel;
if (!c || c->isfullscreen) if (!c || c->isfullscreen)
return 0; return 0;
@@ -647,10 +647,10 @@ int smartmovewin(const Arg *arg) {
return 0; return 0;
} }
int smartresizewin(const Arg *arg) { int32_t smartresizewin(const Arg *arg) {
Client *c = NULL, *tc = NULL; Client *c = NULL, *tc = NULL;
int nw, nh; int32_t nw, nh;
int buttom, top, left, right, tar; int32_t buttom, top, left, right, tar;
c = selmon->sel; c = selmon->sel;
if (!c || c->isfullscreen) if (!c || c->isfullscreen)
return 0; return 0;
@@ -717,7 +717,7 @@ int smartresizewin(const Arg *arg) {
return 0; return 0;
} }
int centerwin(const Arg *arg) { int32_t centerwin(const Arg *arg) {
Client *c = NULL; Client *c = NULL;
c = selmon->sel; c = selmon->sel;
@@ -744,7 +744,7 @@ int centerwin(const Arg *arg) {
return 0; return 0;
} }
int spawn_shell(const Arg *arg) { int32_t spawn_shell(const Arg *arg) {
if (!arg->v) if (!arg->v)
return 0; return 0;
@@ -771,7 +771,7 @@ int spawn_shell(const Arg *arg) {
return 0; return 0;
} }
int spawn(const Arg *arg) { int32_t spawn(const Arg *arg) {
if (!arg->v) if (!arg->v)
return 0; return 0;
@@ -787,7 +787,7 @@ int spawn(const Arg *arg) {
// 2. 解析参数 // 2. 解析参数
char *argv[64]; char *argv[64];
int argc = 0; int32_t 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;
@@ -811,7 +811,7 @@ int spawn(const Arg *arg) {
return 0; return 0;
} }
int spawn_on_empty(const Arg *arg) { int32_t spawn_on_empty(const Arg *arg) {
bool is_empty = true; bool is_empty = true;
Client *c = NULL; Client *c = NULL;
@@ -831,7 +831,7 @@ int spawn_on_empty(const Arg *arg) {
return 0; return 0;
} }
int switch_keyboard_layout(const Arg *arg) { int32_t 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;
@@ -846,7 +846,7 @@ int 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 int num_layouts = xkb_keymap_num_layouts(keyboard->keymap); const int32_t 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;
@@ -887,9 +887,9 @@ int switch_keyboard_layout(const Arg *arg) {
return 0; return 0;
} }
int switch_layout(const Arg *arg) { int32_t switch_layout(const Arg *arg) {
int jk, ji; int32_t jk, ji;
char *target_layout_name = NULL; char *target_layout_name = NULL;
uint32_t len; uint32_t len;
@@ -942,7 +942,7 @@ int switch_layout(const Arg *arg) {
return 0; return 0;
} }
int switch_proportion_preset(const Arg *arg) { int32_t 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) {
@@ -958,7 +958,7 @@ int switch_proportion_preset(const Arg *arg) {
if (selmon->sel) { if (selmon->sel) {
for (int i = 0; i < config.scroller_proportion_preset_count; i++) { for (int32_t 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) {
@@ -986,13 +986,13 @@ int switch_proportion_preset(const Arg *arg) {
return 0; return 0;
} }
int tag(const Arg *arg) { int32_t 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;
} }
int tagmon(const Arg *arg) { int32_t tagmon(const Arg *arg) {
Monitor *m = NULL, *cm = NULL; Monitor *m = NULL, *cm = NULL;
Client *c = focustop(selmon); Client *c = focustop(selmon);
@@ -1036,9 +1036,9 @@ int tagmon(const Arg *arg) {
reset_foreign_tolevel(c); reset_foreign_tolevel(c);
c->float_geom.width = c->float_geom.width =
(int)(c->float_geom.width * c->mon->w.width / selmon->w.width); (int32_t)(c->float_geom.width * c->mon->w.width / selmon->w.width);
c->float_geom.height = c->float_geom.height =
(int)(c->float_geom.height * c->mon->w.height / selmon->w.height); (int32_t)(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->float_geom, 0, 0); c->float_geom = setclient_coordinate_center(c, c->float_geom, 0, 0);
@@ -1063,7 +1063,7 @@ int tagmon(const Arg *arg) {
return 0; return 0;
} }
int tagsilent(const Arg *arg) { int32_t tagsilent(const Arg *arg) {
Client *fc = NULL; Client *fc = NULL;
Client *target_client = NULL; Client *target_client = NULL;
@@ -1083,7 +1083,7 @@ int tagsilent(const Arg *arg) {
return 0; return 0;
} }
int tagtoleft(const Arg *arg) { int32_t 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) {
@@ -1092,7 +1092,7 @@ int tagtoleft(const Arg *arg) {
return 0; return 0;
} }
int tagtoright(const Arg *arg) { int32_t 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)) {
@@ -1101,7 +1101,7 @@ int tagtoright(const Arg *arg) {
return 0; return 0;
} }
int toggle_named_scratchpad(const Arg *arg) { int32_t 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;
@@ -1120,13 +1120,13 @@ int toggle_named_scratchpad(const Arg *arg) {
return 0; return 0;
} }
int toggle_render_border(const Arg *arg) { int32_t toggle_render_border(const Arg *arg) {
render_border = !render_border; render_border = !render_border;
arrange(selmon, false, false); arrange(selmon, false, false);
return 0; return 0;
} }
int toggle_scratchpad(const Arg *arg) { int32_t toggle_scratchpad(const Arg *arg) {
Client *c = NULL; Client *c = NULL;
bool hit = false; bool hit = false;
Client *tmp = NULL; Client *tmp = NULL;
@@ -1155,14 +1155,14 @@ int toggle_scratchpad(const Arg *arg) {
return 0; return 0;
} }
int togglefakefullscreen(const Arg *arg) { int32_t 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;
} }
int togglefloating(const Arg *arg) { int32_t togglefloating(const Arg *arg) {
Client *sel = focustop(selmon); Client *sel = focustop(selmon);
if (selmon && selmon->isoverview) if (selmon && selmon->isoverview)
@@ -1181,7 +1181,7 @@ int togglefloating(const Arg *arg) {
return 0; return 0;
} }
int togglefullscreen(const Arg *arg) { int32_t togglefullscreen(const Arg *arg) {
Client *sel = focustop(selmon); Client *sel = focustop(selmon);
if (!sel) if (!sel)
return 0; return 0;
@@ -1197,7 +1197,7 @@ int togglefullscreen(const Arg *arg) {
return 0; return 0;
} }
int toggleglobal(const Arg *arg) { int32_t 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) {
@@ -1213,13 +1213,13 @@ int toggleglobal(const Arg *arg) {
return 0; return 0;
} }
int togglegaps(const Arg *arg) { int32_t togglegaps(const Arg *arg) {
enablegaps ^= 1; enablegaps ^= 1;
arrange(selmon, false, false); arrange(selmon, false, false);
return 0; return 0;
} }
int togglemaximizescreen(const Arg *arg) { int32_t togglemaximizescreen(const Arg *arg) {
Client *sel = focustop(selmon); Client *sel = focustop(selmon);
if (!sel) if (!sel)
return 0; return 0;
@@ -1237,7 +1237,7 @@ int togglemaximizescreen(const Arg *arg) {
return 0; return 0;
} }
int toggleoverlay(const Arg *arg) { int32_t 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;
} }
@@ -1258,15 +1258,15 @@ int toggleoverlay(const Arg *arg) {
return 0; return 0;
} }
int toggletag(const Arg *arg) { int32_t toggletag(const Arg *arg) {
uint32_t newtags; uint32_t newtags;
Client *sel = focustop(selmon); Client *sel = focustop(selmon);
if (!sel) if (!sel)
return 0; return 0;
if ((int)arg->ui == INT_MIN && sel->tags != (~0 & TAGMASK)) { if ((int32_t)arg->ui == INT_MIN && sel->tags != (~0 & TAGMASK)) {
newtags = ~0 & TAGMASK; newtags = ~0 & TAGMASK;
} else if ((int)arg->ui == INT_MIN && sel->tags == (~0 & TAGMASK)) { } else if ((int32_t)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);
@@ -1281,7 +1281,7 @@ int toggletag(const Arg *arg) {
return 0; return 0;
} }
int toggleview(const Arg *arg) { int32_t toggleview(const Arg *arg) {
uint32_t newtagset; uint32_t newtagset;
uint32_t target; uint32_t target;
@@ -1299,7 +1299,7 @@ int toggleview(const Arg *arg) {
return 0; return 0;
} }
int viewtoleft(const Arg *arg) { int32_t viewtoleft(const Arg *arg) {
uint32_t target = selmon->tagset[selmon->seltags]; uint32_t target = selmon->tagset[selmon->seltags];
if (selmon->isoverview || selmon->pertag->curtag == 0) { if (selmon->isoverview || selmon->pertag->curtag == 0) {
@@ -1319,7 +1319,7 @@ int viewtoleft(const Arg *arg) {
return 0; return 0;
} }
int viewtoright(const Arg *arg) { int32_t viewtoright(const Arg *arg) {
if (selmon->isoverview || selmon->pertag->curtag == 0) { if (selmon->isoverview || selmon->pertag->curtag == 0) {
return 0; return 0;
} }
@@ -1336,7 +1336,7 @@ int viewtoright(const Arg *arg) {
return 0; return 0;
} }
int viewtoleft_have_client(const Arg *arg) { int32_t viewtoleft_have_client(const Arg *arg) {
uint32_t n; uint32_t n;
uint32_t current = get_tags_first_tag_num(selmon->tagset[selmon->seltags]); uint32_t current = get_tags_first_tag_num(selmon->tagset[selmon->seltags]);
bool found = false; bool found = false;
@@ -1360,7 +1360,7 @@ int viewtoleft_have_client(const Arg *arg) {
return 0; return 0;
} }
int viewtoright_have_client(const Arg *arg) { int32_t viewtoright_have_client(const Arg *arg) {
uint32_t n; uint32_t n;
uint32_t current = get_tags_first_tag_num(selmon->tagset[selmon->seltags]); uint32_t current = get_tags_first_tag_num(selmon->tagset[selmon->seltags]);
bool found = false; bool found = false;
@@ -1384,13 +1384,13 @@ int viewtoright_have_client(const Arg *arg) {
return 0; return 0;
} }
int viewcrossmon(const Arg *arg) { int32_t 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;
} }
int tagcrossmon(const Arg *arg) { int32_t tagcrossmon(const Arg *arg) {
if (!selmon->sel) if (!selmon->sel)
return 0; return 0;
@@ -1398,7 +1398,7 @@ int tagcrossmon(const Arg *arg) {
return 0; return 0;
} }
int comboview(const Arg *arg) { int32_t comboview(const Arg *arg) {
uint32_t newtags = arg->ui & TAGMASK; uint32_t newtags = arg->ui & TAGMASK;
if (!newtags || !selmon) if (!newtags || !selmon)
@@ -1417,7 +1417,7 @@ int comboview(const Arg *arg) {
return 0; return 0;
} }
int zoom(const Arg *arg) { int32_t zoom(const Arg *arg) {
Client *c = NULL, *sel = focustop(selmon); Client *c = NULL, *sel = focustop(selmon);
if (!sel || !selmon || if (!sel || !selmon ||
@@ -1450,14 +1450,14 @@ int zoom(const Arg *arg) {
return 0; return 0;
} }
int setoption(const Arg *arg) { int32_t 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;
} }
int minimized(const Arg *arg) { int32_t minimized(const Arg *arg) {
if (selmon && selmon->isoverview) if (selmon && selmon->isoverview)
return 0; return 0;
@@ -1468,7 +1468,7 @@ int minimized(const Arg *arg) {
return 0; return 0;
} }
int toggleoverview(const Arg *arg) { int32_t 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) {
@@ -1526,7 +1526,7 @@ int toggleoverview(const Arg *arg) {
return 0; return 0;
} }
int disable_monitor(const Arg *arg) { int32_t 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) {
@@ -1541,7 +1541,7 @@ int disable_monitor(const Arg *arg) {
return 0; return 0;
} }
int enable_monitor(const Arg *arg) { int32_t 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) {
@@ -1556,7 +1556,7 @@ int enable_monitor(const Arg *arg) {
return 0; return 0;
} }
int toggle_monitor(const Arg *arg) { int32_t 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) {

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

@@ -112,7 +112,7 @@ void dwl_ipc_output_printstatus_to(DwlIpcOutput *ipc_output) {
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;
int tagmask, state, numclients, focused_client, tag; int32_t 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);
@@ -287,7 +287,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) {
int (*func)(const Arg *); int32_t (*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);

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

@@ -102,7 +102,7 @@ static void remove_workspace_by_tag(uint32_t tag, Monitor *m) {
} }
} }
static void add_workspace_by_tag(int tag, Monitor *m) { static void add_workspace_by_tag(int32_t 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));
@@ -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) {
int i; int32_t i;
if (m->isoverview) { if (m->isoverview) {
for (i = 1; i <= LENGTH(tags); i++) { for (i = 1; i <= LENGTH(tags); i++) {

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(int lx, int ly) { Monitor *output_nearest_to(int32_t lx, int32_t 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;
int lx, ly; int32_t lx, ly;
struct wlr_box popup_box; struct wlr_box popup_box;
if (!text_input || !relay->focused_surface || if (!text_input || !relay->focused_surface ||

92
src/fetch/client.h
View File

@@ -1,5 +1,5 @@
bool check_hit_no_border(Client *c) { bool check_hit_no_border(Client *c) {
int i; int32_t 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;
@@ -74,11 +74,11 @@ 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, struct wlr_box geom, int offsetx, setclient_coordinate_center(Client *c, struct wlr_box geom, int32_t offsetx,
int offsety) { int32_t offsety) {
struct wlr_box tempbox; struct wlr_box tempbox;
int offset = 0; int32_t offset = 0;
int len = 0; int32_t len = 0;
Monitor *m = c->mon ? c->mon : selmon; Monitor *m = c->mon ? c->mon : selmon;
uint32_t cbw = check_hit_no_border(c) ? c->bw : 0; uint32_t cbw = check_hit_no_border(c) ? c->bw : 0;
@@ -135,9 +135,9 @@ 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;
long int mini_distance = -1; int64_t mini_distance = -1;
int dirx, diry; int32_t dirx, diry;
long int distance; int64_t 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) && ISSCROLLTILED(c) &&
client_surface(c)->mapped && !c->isfloating && client_surface(c)->mapped && !c->isfloating &&
@@ -157,7 +157,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
int last = -1; int32_t last = -1;
// 第一次遍历，计算客户端数量 // 第一次遍历，计算客户端数量
wl_list_for_each(c, &clients, link) { wl_list_for_each(c, &clients, link) {
@@ -190,23 +190,23 @@ Client *find_client_by_direction(Client *tc, const Arg *arg, bool findfloating,
} }
} }
int sel_x = tc->geom.x; int32_t sel_x = tc->geom.x;
int sel_y = tc->geom.y; int32_t sel_y = tc->geom.y;
long long int distance = LLONG_MAX; int64_t distance = LLONG_MAX;
long long int same_monitor_distance = LLONG_MAX; int64_t same_monitor_distance = LLONG_MAX;
Client *tempFocusClients = NULL; Client *tempFocusClients = NULL;
Client *tempSameMonitorFocusClients = NULL; Client *tempSameMonitorFocusClients = NULL;
switch (arg->i) { switch (arg->i) {
case UP: case UP:
if (!ignore_align) { if (!ignore_align) {
for (int _i = 0; _i <= last; _i++) { for (int32_t _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) {
int dis_x = tempClients[_i]->geom.x - sel_x; int32_t dis_x = tempClients[_i]->geom.x - sel_x;
int dis_y = tempClients[_i]->geom.y - sel_y; int32_t dis_y = tempClients[_i]->geom.y - sel_y;
long long int tmp_distance = int64_t 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,11 +216,11 @@ Client *find_client_by_direction(Client *tc, const Arg *arg, bool findfloating,
} }
} }
if (!tempFocusClients) { if (!tempFocusClients) {
for (int _i = 0; _i <= last; _i++) { for (int32_t _i = 0; _i <= last; _i++) {
if (tempClients[_i]->geom.y < sel_y) { if (tempClients[_i]->geom.y < sel_y) {
int dis_x = tempClients[_i]->geom.x - sel_x; int32_t dis_x = tempClients[_i]->geom.x - sel_x;
int dis_y = tempClients[_i]->geom.y - sel_y; int32_t dis_y = tempClients[_i]->geom.y - sel_y;
long long int tmp_distance = int64_t 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;
@@ -237,13 +237,13 @@ Client *find_client_by_direction(Client *tc, const Arg *arg, bool findfloating,
break; break;
case DOWN: case DOWN:
if (!ignore_align) { if (!ignore_align) {
for (int _i = 0; _i <= last; _i++) { for (int32_t _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) {
int dis_x = tempClients[_i]->geom.x - sel_x; int32_t dis_x = tempClients[_i]->geom.x - sel_x;
int dis_y = tempClients[_i]->geom.y - sel_y; int32_t dis_y = tempClients[_i]->geom.y - sel_y;
long long int tmp_distance = int64_t 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,11 +253,11 @@ Client *find_client_by_direction(Client *tc, const Arg *arg, bool findfloating,
} }
} }
if (!tempFocusClients) { if (!tempFocusClients) {
for (int _i = 0; _i <= last; _i++) { for (int32_t _i = 0; _i <= last; _i++) {
if (tempClients[_i]->geom.y > sel_y) { if (tempClients[_i]->geom.y > sel_y) {
int dis_x = tempClients[_i]->geom.x - sel_x; int32_t dis_x = tempClients[_i]->geom.x - sel_x;
int dis_y = tempClients[_i]->geom.y - sel_y; int32_t dis_y = tempClients[_i]->geom.y - sel_y;
long long int tmp_distance = int64_t 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;
@@ -274,13 +274,13 @@ Client *find_client_by_direction(Client *tc, const Arg *arg, bool findfloating,
break; break;
case LEFT: case LEFT:
if (!ignore_align) { if (!ignore_align) {
for (int _i = 0; _i <= last; _i++) { for (int32_t _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) {
int dis_x = tempClients[_i]->geom.x - sel_x; int32_t dis_x = tempClients[_i]->geom.x - sel_x;
int dis_y = tempClients[_i]->geom.y - sel_y; int32_t dis_y = tempClients[_i]->geom.y - sel_y;
long long int tmp_distance = int64_t 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,11 +290,11 @@ Client *find_client_by_direction(Client *tc, const Arg *arg, bool findfloating,
} }
} }
if (!tempFocusClients) { if (!tempFocusClients) {
for (int _i = 0; _i <= last; _i++) { for (int32_t _i = 0; _i <= last; _i++) {
if (tempClients[_i]->geom.x < sel_x) { if (tempClients[_i]->geom.x < sel_x) {
int dis_x = tempClients[_i]->geom.x - sel_x; int32_t dis_x = tempClients[_i]->geom.x - sel_x;
int dis_y = tempClients[_i]->geom.y - sel_y; int32_t dis_y = tempClients[_i]->geom.y - sel_y;
long long int tmp_distance = int64_t 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;
@@ -311,13 +311,13 @@ Client *find_client_by_direction(Client *tc, const Arg *arg, bool findfloating,
break; break;
case RIGHT: case RIGHT:
if (!ignore_align) { if (!ignore_align) {
for (int _i = 0; _i <= last; _i++) { for (int32_t _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) {
int dis_x = tempClients[_i]->geom.x - sel_x; int32_t dis_x = tempClients[_i]->geom.x - sel_x;
int dis_y = tempClients[_i]->geom.y - sel_y; int32_t dis_y = tempClients[_i]->geom.y - sel_y;
long long int tmp_distance = int64_t 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,11 +327,11 @@ Client *find_client_by_direction(Client *tc, const Arg *arg, bool findfloating,
} }
} }
if (!tempFocusClients) { if (!tempFocusClients) {
for (int _i = 0; _i <= last; _i++) { for (int32_t _i = 0; _i <= last; _i++) {
if (tempClients[_i]->geom.x > sel_x) { if (tempClients[_i]->geom.x > sel_x) {
int dis_x = tempClients[_i]->geom.x - sel_x; int32_t dis_x = tempClients[_i]->geom.x - sel_x;
int dis_y = tempClients[_i]->geom.y - sel_y; int32_t dis_y = tempClients[_i]->geom.y - sel_y;
long long int tmp_distance = int64_t 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;
@@ -438,7 +438,7 @@ float *get_border_color(Client *c) {
} }
} }
int is_single_bit_set(uint32_t x) { return x && !(x & (x - 1)); } int32_t is_single_bit_set(uint32_t x) { return x && !(x & (x - 1)); }
bool client_only_in_one_tag(Client *c) { bool client_only_in_one_tag(Client *c) {
uint32_t masked = c->tags & TAGMASK; uint32_t masked = c->tags & TAGMASK;

8
src/fetch/common.h
View File

@@ -19,11 +19,11 @@ pid_t getparentprocess(pid_t p) {
return (pid_t)v; return (pid_t)v;
} }
int isdescprocess(pid_t p, pid_t c) { int32_t isdescprocess(pid_t p, pid_t c) {
while (p != c && c != 0) while (p != c && c != 0)
c = getparentprocess(c); c = getparentprocess(c);
return (int)c; return (int32_t)c;
} }
void get_layout_abbr(char *abbr, const char *full_name) { void get_layout_abbr(char *abbr, const char *full_name) {
@@ -31,7 +31,7 @@ void get_layout_abbr(char *abbr, const char *full_name) {
abbr[0] = '\0'; abbr[0] = '\0';
// 1. 尝试在映射表中查找 // 1. 尝试在映射表中查找
for (int i = 0; layout_mappings[i].full_name != NULL; i++) { for (int32_t 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;
@@ -83,7 +83,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;
int layer; int32_t layer;
for (layer = NUM_LAYERS - 1; !surface && layer >= 0; layer--) { for (layer = NUM_LAYERS - 1; !surface && layer >= 0; layer--) {

35
src/layout/arrange.h
View File

@@ -22,8 +22,9 @@ void set_size_per(Monitor *m, Client *c) {
} }
} }
void resize_tile_master_horizontal(Client *grabc, bool isdrag, int offsetx, void resize_tile_master_horizontal(Client *grabc, bool isdrag, int32_t offsetx,
int offsety, uint32_t time, int type) { int32_t offsety, uint32_t time,
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;
@@ -216,8 +217,8 @@ void resize_tile_master_horizontal(Client *grabc, bool isdrag, int offsetx,
} }
} }
void resize_tile_master_vertical(Client *grabc, bool isdrag, int offsetx, void resize_tile_master_vertical(Client *grabc, bool isdrag, int32_t offsetx,
int offsety, uint32_t time, int type) { int32_t offsety, uint32_t time, 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;
@@ -373,8 +374,8 @@ void resize_tile_master_vertical(Client *grabc, bool isdrag, int offsetx,
} }
} }
void resize_tile_scroller(Client *grabc, bool isdrag, int offsetx, int offsety, void resize_tile_scroller(Client *grabc, bool isdrag, int32_t offsetx,
uint32_t time, bool isvertical) { int32_t offsety, uint32_t time, bool isvertical) {
float delta_x, delta_y; float delta_x, delta_y;
float new_scroller_proportion; float new_scroller_proportion;
@@ -477,8 +478,8 @@ void resize_tile_scroller(Client *grabc, bool isdrag, int offsetx, int offsety,
} }
} }
void resize_tile_client(Client *grabc, bool isdrag, int offsetx, int offsety, void resize_tile_client(Client *grabc, bool isdrag, int32_t offsetx,
uint32_t time) { int32_t offsety, uint32_t time) {
if (!grabc || grabc->isfullscreen || grabc->ismaximizescreen) if (!grabc || grabc->isfullscreen || grabc->ismaximizescreen)
return; return;
@@ -506,14 +507,14 @@ void resize_tile_client(Client *grabc, bool isdrag, int offsetx, int offsety,
} }
} }
void reset_size_per_mon(Monitor *m, int tile_cilent_num, void reset_size_per_mon(Monitor *m, int32_t 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, int master_num, double total_master_inner_percent, int32_t master_num,
int stack_num) { int32_t stack_num) {
Client *c = NULL; Client *c = NULL;
int i = 0; int32_t i = 0;
uint32_t stack_index = 0; uint32_t stack_index = 0;
uint32_t nmasters = m->pertag->nmasters[m->pertag->curtag]; uint32_t nmasters = m->pertag->nmasters[m->pertag->curtag];
@@ -587,11 +588,11 @@ arrange(Monitor *m, bool want_animation, bool from_view) {
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;
int i = 0; int32_t i = 0;
int nmasters = 0; int32_t nmasters = 0;
int stack_index = 0; int32_t stack_index = 0;
int master_num = 0; int32_t master_num = 0;
int stack_num = 0; int32_t stack_num = 0;
if (!m) if (!m)
return; return;

30
src/layout/horizontal.h
View File

@@ -6,8 +6,10 @@ void grid(Monitor *m) {
uint32_t cols, rows, overcols; uint32_t cols, rows, overcols;
Client *c = NULL; Client *c = NULL;
n = 0; n = 0;
int target_gappo = enablegaps ? m->isoverview ? overviewgappo : gappoh : 0; int32_t target_gappo =
int target_gappi = enablegaps ? m->isoverview ? overviewgappi : gappih : 0; enablegaps ? m->isoverview ? overviewgappo : gappoh : 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;
@@ -111,7 +113,7 @@ void grid(Monitor *m) {
void deck(Monitor *m) { void deck(Monitor *m) {
uint32_t mw, my; uint32_t mw, my;
int i, n = 0; int32_t i, n = 0;
Client *c = NULL; Client *c = NULL;
Client *fc = NULL; Client *fc = NULL;
float mfact; float mfact;
@@ -218,7 +220,7 @@ void scroller(Monitor *m) {
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;
int focus_client_index = 0; int32_t focus_client_index = 0;
bool need_scroller = false; bool need_scroller = false;
uint32_t cur_gappih = enablegaps ? m->gappih : 0; uint32_t cur_gappih = enablegaps ? m->gappih : 0;
uint32_t cur_gappoh = enablegaps ? m->gappoh : 0; uint32_t cur_gappoh = enablegaps ? m->gappoh : 0;
@@ -370,8 +372,8 @@ void center_tile(Monitor *m) {
Client *c = NULL; Client *c = NULL;
Client *fc = NULL; Client *fc = NULL;
double mfact = 0; double mfact = 0;
int master_num = 0; int32_t master_num = 0;
int stack_num = 0; int32_t 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];
@@ -411,7 +413,7 @@ void center_tile(Monitor *m) {
tw = mw; tw = mw;
// 判断是否需要主区域铺满 // 判断是否需要主区域铺满
int should_overspread = center_master_overspread && (n <= nmasters); int32_t should_overspread = center_master_overspread && (n <= nmasters);
uint32_t master_surplus_height = uint32_t master_surplus_height =
(m->w.height - 2 * cur_gappov - cur_gappiv * ie * (master_num - 1)); (m->w.height - 2 * cur_gappov - cur_gappiv * ie * (master_num - 1));
@@ -513,7 +515,7 @@ void center_tile(Monitor *m) {
c->master_mfact_per = mfact; c->master_mfact_per = mfact;
} }
int stack_x; int32_t 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;
@@ -553,7 +555,7 @@ void center_tile(Monitor *m) {
c->master_mfact_per = mfact; c->master_mfact_per = mfact;
} }
int stack_x = m->w.x + mx + mw + cur_gappih * ie; int32_t 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,
@@ -582,7 +584,7 @@ void center_tile(Monitor *m) {
c->master_mfact_per = mfact; c->master_mfact_per = mfact;
} }
int stack_x = m->w.x + cur_gappoh; int32_t 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,
@@ -602,8 +604,8 @@ void tile(Monitor *m) {
Client *c = NULL; Client *c = NULL;
Client *fc = NULL; Client *fc = NULL;
double mfact = 0; double mfact = 0;
int master_num = 0; int32_t master_num = 0;
int stack_num = 0; int32_t 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];
@@ -712,8 +714,8 @@ void right_tile(Monitor *m) {
Client *c = NULL; Client *c = NULL;
Client *fc = NULL; Client *fc = NULL;
double mfact = 0; double mfact = 0;
int master_num = 0; int32_t master_num = 0;
int stack_num = 0; int32_t 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];

14
src/layout/vertical.h
View File

@@ -3,8 +3,8 @@ void vertical_tile(Monitor *m) {
Client *c = NULL; Client *c = NULL;
Client *fc = NULL; Client *fc = NULL;
double mfact = 0; double mfact = 0;
int master_num = 0; int32_t master_num = 0;
int stack_num = 0; int32_t 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];
@@ -106,7 +106,7 @@ void vertical_tile(Monitor *m) {
void vertical_deck(Monitor *m) { void vertical_deck(Monitor *m) {
uint32_t mh, mx; uint32_t mh, mx;
int i, n = 0; int32_t i, n = 0;
Client *c = NULL; Client *c = NULL;
Client *fc = NULL; Client *fc = NULL;
float mfact; float mfact;
@@ -207,7 +207,7 @@ void vertical_scroller(Monitor *m) {
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;
int focus_client_index = 0; int32_t focus_client_index = 0;
bool need_scroller = false; bool need_scroller = false;
uint32_t cur_gappiv = enablegaps ? m->gappiv : 0; uint32_t cur_gappiv = enablegaps ? m->gappiv : 0;
uint32_t cur_gappov = enablegaps ? m->gappov : 0; uint32_t cur_gappov = enablegaps ? m->gappov : 0;
@@ -359,8 +359,10 @@ void vertical_grid(Monitor *m) {
uint32_t dy; uint32_t dy;
uint32_t rows, cols, overrows; uint32_t rows, cols, overrows;
Client *c = NULL; Client *c = NULL;
int target_gappo = enablegaps ? m->isoverview ? overviewgappo : gappov : 0; int32_t target_gappo =
int target_gappi = enablegaps ? m->isoverview ? overviewgappi : gappiv : 0; enablegaps ? m->isoverview ? overviewgappo : gappov : 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;

374
src/mango.c
View File

@@ -212,12 +212,12 @@ struct dvec2 {
}; };
struct ivec2 { struct ivec2 {
int x, y, width, height; int32_t x, y, width, height;
}; };
typedef struct { typedef struct {
int i; int32_t i;
int i2; int32_t i2;
float f; float f;
float f2; float f2;
char *v; char *v;
@@ -230,7 +230,7 @@ typedef struct {
typedef struct { typedef struct {
uint32_t mod; uint32_t mod;
uint32_t button; uint32_t button;
int (*func)(const Arg *); int32_t (*func)(const Arg *);
const Arg arg; const Arg arg;
} Button; // 鼠标按键 } Button; // 鼠标按键
@@ -242,7 +242,7 @@ typedef struct {
typedef struct { typedef struct {
uint32_t mod; uint32_t mod;
uint32_t dir; uint32_t dir;
int (*func)(const Arg *); int32_t (*func)(const Arg *);
const Arg arg; const Arg arg;
} Axis; } Axis;
@@ -273,7 +273,7 @@ struct dwl_animation {
uint32_t duration; uint32_t duration;
struct wlr_box initial; struct wlr_box initial;
struct wlr_box current; struct wlr_box current;
int action; int32_t action;
}; };
struct dwl_opacity_animation { struct dwl_opacity_animation {
@@ -291,8 +291,8 @@ struct dwl_opacity_animation {
typedef struct { typedef struct {
float width_scale; float width_scale;
float height_scale; float height_scale;
int width; int32_t width;
int height; int32_t height;
enum corner_location corner_location; enum corner_location corner_location;
bool should_scale; bool should_scale;
} BufferData; } BufferData;
@@ -336,14 +336,14 @@ struct Client {
bool dirty; bool dirty;
uint32_t configure_serial; uint32_t configure_serial;
struct wlr_foreign_toplevel_handle_v1 *foreign_toplevel; struct wlr_foreign_toplevel_handle_v1 *foreign_toplevel;
int isfloating, isurgent, isfullscreen, isfakefullscreen, int32_t isfloating, isurgent, isfullscreen, isfakefullscreen,
need_float_size_reduce, isminimized, isoverlay, isnosizehint, need_float_size_reduce, isminimized, isoverlay, isnosizehint,
ignore_maximize, ignore_minimize; ignore_maximize, ignore_minimize;
int ismaximizescreen; int32_t ismaximizescreen;
int overview_backup_bw; int32_t overview_backup_bw;
int fullscreen_backup_x, fullscreen_backup_y, fullscreen_backup_w, int32_t fullscreen_backup_x, fullscreen_backup_y, fullscreen_backup_w,
fullscreen_backup_h; fullscreen_backup_h;
int overview_isfullscreenbak, overview_ismaximizescreenbak, int32_t overview_isfullscreenbak, overview_ismaximizescreenbak,
overview_isfloatingbak; overview_isfloatingbak;
struct wlr_xdg_toplevel_decoration_v1 *decoration; struct wlr_xdg_toplevel_decoration_v1 *decoration;
@@ -358,53 +358,53 @@ struct Client {
const char *animation_type_open; const char *animation_type_open;
const char *animation_type_close; const char *animation_type_close;
int is_in_scratchpad; int32_t is_in_scratchpad;
int iscustomsize; int32_t iscustomsize;
int iscustompos; int32_t iscustompos;
int is_scratchpad_show; int32_t is_scratchpad_show;
int isglobal; int32_t isglobal;
int isnoborder; int32_t isnoborder;
int isnoshadow; int32_t isnoshadow;
int isnoradius; int32_t isnoradius;
int isnoanimation; int32_t isnoanimation;
int isopensilent; int32_t isopensilent;
int istagsilent; int32_t istagsilent;
int iskilling; int32_t iskilling;
int istagswitching; int32_t istagswitching;
int isnamedscratchpad; int32_t isnamedscratchpad;
bool is_pending_open_animation; bool is_pending_open_animation;
bool is_restoring_from_ov; bool is_restoring_from_ov;
float scroller_proportion; float scroller_proportion;
bool need_output_flush; bool need_output_flush;
struct dwl_animation animation; struct dwl_animation animation;
struct dwl_opacity_animation opacity_animation; struct dwl_opacity_animation opacity_animation;
int isterm, noswallow; int32_t isterm, noswallow;
int allow_csd; int32_t allow_csd;
int force_maximize; int32_t force_maximize;
pid_t pid; pid_t pid;
Client *swallowing, *swallowedby; Client *swallowing, *swallowedby;
bool is_clip_to_hide; bool is_clip_to_hide;
bool drag_to_tile; bool drag_to_tile;
bool scratchpad_switching_mon; bool scratchpad_switching_mon;
bool fake_no_border; bool fake_no_border;
int nofocus; int32_t nofocus;
int nofadein; int32_t nofadein;
int nofadeout; int32_t nofadeout;
int no_force_center; int32_t no_force_center;
int isunglobal; int32_t isunglobal;
float focused_opacity; float focused_opacity;
float unfocused_opacity; float unfocused_opacity;
char oldmonname[128]; char oldmonname[128];
int noblur; int32_t noblur;
double master_mfact_per, master_inner_per, stack_inner_per; double master_mfact_per, master_inner_per, stack_inner_per;
double old_master_mfact_per, old_master_inner_per, old_stack_inner_per; double old_master_mfact_per, old_master_inner_per, old_stack_inner_per;
double old_scroller_pproportion; double old_scroller_pproportion;
bool ismaster; bool ismaster;
bool cursor_in_upper_half, cursor_in_left_half; bool cursor_in_upper_half, cursor_in_left_half;
bool isleftstack; bool isleftstack;
int tearing_hint; int32_t tearing_hint;
int force_tearing; int32_t force_tearing;
int allow_shortcuts_inhibit; int32_t allow_shortcuts_inhibit;
float scroller_proportion_single; float scroller_proportion_single;
bool isfocusing; bool isfocusing;
}; };
@@ -418,14 +418,14 @@ typedef struct {
typedef struct { typedef struct {
uint32_t mod; uint32_t mod;
xkb_keysym_t keysym; xkb_keysym_t keysym;
int (*func)(const Arg *); int32_t (*func)(const Arg *);
const Arg arg; const Arg arg;
} Key; } Key;
typedef struct { typedef struct {
struct wlr_keyboard_group *wlr_group; struct wlr_keyboard_group *wlr_group;
int nsyms; int32_t nsyms;
const xkb_keysym_t *keysyms; /* invalid if nsyms == 0 */ const xkb_keysym_t *keysyms; /* invalid if nsyms == 0 */
uint32_t mods; /* invalid if nsyms == 0 */ uint32_t mods; /* invalid if nsyms == 0 */
uint32_t keycode; uint32_t keycode;
@@ -453,7 +453,7 @@ typedef struct {
struct wlr_scene_layer_surface_v1 *scene_layer; struct wlr_scene_layer_surface_v1 *scene_layer;
struct wl_list link; struct wl_list link;
struct wl_list fadeout_link; struct wl_list fadeout_link;
int mapped; int32_t mapped;
struct wlr_layer_surface_v1 *layer_surface; struct wlr_layer_surface_v1 *layer_surface;
struct wl_listener destroy; struct wl_listener destroy;
@@ -463,9 +463,9 @@ typedef struct {
struct dwl_animation animation; struct dwl_animation animation;
bool dirty; bool dirty;
int noblur; int32_t noblur;
int noanim; int32_t noanim;
int noshadow; int32_t noshadow;
char *animation_type_open; char *animation_type_open;
char *animation_type_close; char *animation_type_close;
bool need_output_flush; bool need_output_flush;
@@ -495,18 +495,18 @@ struct Monitor {
uint32_t seltags; uint32_t seltags;
uint32_t tagset[2]; uint32_t tagset[2];
double mfact; double mfact;
int nmaster; int32_t nmaster;
struct wl_list dwl_ipc_outputs; struct wl_list dwl_ipc_outputs;
int gappih; /* horizontal gap between windows */ int32_t gappih; /* horizontal gap between windows */
int gappiv; /* vertical gap between windows */ int32_t gappiv; /* vertical gap between windows */
int gappoh; /* horizontal outer gaps */ int32_t gappoh; /* horizontal outer gaps */
int gappov; /* vertical outer gaps */ int32_t gappov; /* vertical outer gaps */
Pertag *pertag; Pertag *pertag;
Client *sel, *prevsel; Client *sel, *prevsel;
int isoverview; int32_t isoverview;
int is_in_hotarea; int32_t is_in_hotarea;
int asleep; int32_t asleep;
uint32_t visible_clients; uint32_t visible_clients;
uint32_t visible_tiling_clients; uint32_t visible_tiling_clients;
uint32_t visible_scroll_tiling_clients; uint32_t visible_scroll_tiling_clients;
@@ -537,14 +537,14 @@ static void applyrules(Client *c); // 窗口规则应用,应用config.h中定义
static void arrange(Monitor *m, bool want_animation, static void arrange(Monitor *m, bool want_animation,
bool from_view); // 布局函数,让窗口俺平铺规则移动和重置大小 bool from_view); // 布局函数,让窗口俺平铺规则移动和重置大小
static void arrangelayer(Monitor *m, struct wl_list *list, static void arrangelayer(Monitor *m, struct wl_list *list,
struct wlr_box *usable_area, int exclusive); struct wlr_box *usable_area, int32_t exclusive);
static void arrangelayers(Monitor *m); static void arrangelayers(Monitor *m);
static void handle_print_status(struct wl_listener *listener, void *data); static void handle_print_status(struct wl_listener *listener, void *data);
static void axisnotify(struct wl_listener *listener, static void axisnotify(struct wl_listener *listener,
void *data); // 滚轮事件处理 void *data); // 滚轮事件处理
static void buttonpress(struct wl_listener *listener, static void buttonpress(struct wl_listener *listener,
void *data); // 鼠标按键事件处理 void *data); // 鼠标按键事件处理
static int ongesture(struct wlr_pointer_swipe_end_event *event); static int32_t ongesture(struct wlr_pointer_swipe_end_event *event);
static void swipe_begin(struct wl_listener *listener, void *data); static void swipe_begin(struct wl_listener *listener, void *data);
static void swipe_update(struct wl_listener *listener, void *data); static void swipe_update(struct wl_listener *listener, void *data);
static void swipe_end(struct wl_listener *listener, void *data); static void swipe_end(struct wl_listener *listener, void *data);
@@ -558,7 +558,7 @@ static void cleanup(void); // 退出清理
static void cleanupmon(struct wl_listener *listener, void *data); // 退出清理 static void cleanupmon(struct wl_listener *listener, void *data); // 退出清理
static void closemon(Monitor *m); static void closemon(Monitor *m);
static void cleanuplisteners(void); static void cleanuplisteners(void);
static void toggle_hotarea(int x_root, int y_root); // 触发热区 static void toggle_hotarea(int32_t x_root, int32_t y_root); // 触发热区
static void maplayersurfacenotify(struct wl_listener *listener, void *data); static void maplayersurfacenotify(struct wl_listener *listener, void *data);
static void commitlayersurfacenotify(struct wl_listener *listener, void *data); static void commitlayersurfacenotify(struct wl_listener *listener, void *data);
static void commitnotify(struct wl_listener *listener, void *data); static void commitnotify(struct wl_listener *listener, void *data);
@@ -585,7 +585,7 @@ static void destroydecoration(struct wl_listener *listener, void *data);
static void destroydragicon(struct wl_listener *listener, void *data); static void destroydragicon(struct wl_listener *listener, void *data);
static void destroyidleinhibitor(struct wl_listener *listener, void *data); static void destroyidleinhibitor(struct wl_listener *listener, void *data);
static void destroylayersurfacenotify(struct wl_listener *listener, void *data); static void destroylayersurfacenotify(struct wl_listener *listener, void *data);
static void destroylock(SessionLock *lock, int unlocked); static void destroylock(SessionLock *lock, int32_t unlocked);
static void destroylocksurface(struct wl_listener *listener, void *data); static void destroylocksurface(struct wl_listener *listener, void *data);
static void destroynotify(struct wl_listener *listener, void *data); static void destroynotify(struct wl_listener *listener, void *data);
static void destroypointerconstraint(struct wl_listener *listener, void *data); static void destroypointerconstraint(struct wl_listener *listener, void *data);
@@ -594,18 +594,18 @@ static void destroykeyboardgroup(struct wl_listener *listener, void *data);
static Monitor *dirtomon(enum wlr_direction dir); static Monitor *dirtomon(enum wlr_direction dir);
static void setcursorshape(struct wl_listener *listener, void *data); static void setcursorshape(struct wl_listener *listener, void *data);
static void focusclient(Client *c, int lift); static void focusclient(Client *c, int32_t lift);
static void setborder_color(Client *c); static void setborder_color(Client *c);
static Client *focustop(Monitor *m); static Client *focustop(Monitor *m);
static void fullscreennotify(struct wl_listener *listener, void *data); static void fullscreennotify(struct wl_listener *listener, void *data);
static void gpureset(struct wl_listener *listener, void *data); static void gpureset(struct wl_listener *listener, void *data);
static int keyrepeat(void *data); static int32_t keyrepeat(void *data);
static void inputdevice(struct wl_listener *listener, void *data); static void inputdevice(struct wl_listener *listener, void *data);
static int keybinding(uint32_t state, bool locked, uint32_t mods, static int32_t keybinding(uint32_t state, bool locked, uint32_t mods,
xkb_keysym_t sym, uint32_t keycode); xkb_keysym_t sym, uint32_t keycode);
static void keypress(struct wl_listener *listener, void *data); static void keypress(struct wl_listener *listener, void *data);
static void keypressmod(struct wl_listener *listener, void *data); static void keypressmod(struct wl_listener *listener, void *data);
static bool keypressglobal(struct wlr_surface *last_surface, static bool keypressglobal(struct wlr_surface *last_surface,
@@ -628,26 +628,26 @@ static void add_foreign_topleve(Client *c);
static void exchange_two_client(Client *c1, Client *c2); static void exchange_two_client(Client *c1, Client *c2);
static void outputmgrapply(struct wl_listener *listener, void *data); static void outputmgrapply(struct wl_listener *listener, void *data);
static void outputmgrapplyortest(struct wlr_output_configuration_v1 *config, static void outputmgrapplyortest(struct wlr_output_configuration_v1 *config,
int test); int32_t test);
static void outputmgrtest(struct wl_listener *listener, void *data); static void outputmgrtest(struct wl_listener *listener, void *data);
static void pointerfocus(Client *c, struct wlr_surface *surface, double sx, static void pointerfocus(Client *c, struct wlr_surface *surface, double sx,
double sy, uint32_t time); double sy, uint32_t time);
static void printstatus(void); static void printstatus(void);
static void quitsignal(int signo); static void quitsignal(int32_t signo);
static void powermgrsetmode(struct wl_listener *listener, void *data); static void powermgrsetmode(struct wl_listener *listener, void *data);
static void rendermon(struct wl_listener *listener, void *data); static void rendermon(struct wl_listener *listener, void *data);
static void requestdecorationmode(struct wl_listener *listener, void *data); static void requestdecorationmode(struct wl_listener *listener, void *data);
static void requestdrmlease(struct wl_listener *listener, void *data); static void requestdrmlease(struct wl_listener *listener, void *data);
static void requeststartdrag(struct wl_listener *listener, void *data); static void requeststartdrag(struct wl_listener *listener, void *data);
static void resize(Client *c, struct wlr_box geo, int interact); static void resize(Client *c, struct wlr_box geo, int32_t interact);
static void run(char *startup_cmd); static void run(char *startup_cmd);
static void setcursor(struct wl_listener *listener, void *data); static void setcursor(struct wl_listener *listener, void *data);
static void setfloating(Client *c, int floating); static void setfloating(Client *c, int32_t floating);
static void setfakefullscreen(Client *c, int fakefullscreen); static void setfakefullscreen(Client *c, int32_t fakefullscreen);
static void setfullscreen(Client *c, int fullscreen); static void setfullscreen(Client *c, int32_t fullscreen);
static void setmaximizescreen(Client *c, int maximizescreen); static void setmaximizescreen(Client *c, int32_t maximizescreen);
static void reset_maximizescreen_size(Client *c); static void reset_maximizescreen_size(Client *c);
static void setgaps(int oh, int ov, int ih, int iv); static void setgaps(int32_t oh, int32_t ov, int32_t ih, int32_t iv);
static void setmon(Client *c, Monitor *m, uint32_t newtags, bool focus); static void setmon(Client *c, Monitor *m, uint32_t newtags, bool focus);
static void setpsel(struct wl_listener *listener, void *data); static void setpsel(struct wl_listener *listener, void *data);
@@ -663,7 +663,7 @@ static void updatetitle(struct wl_listener *listener, void *data);
static void urgent(struct wl_listener *listener, void *data); static void urgent(struct wl_listener *listener, void *data);
static void view(const Arg *arg, bool want_animation); static void view(const Arg *arg, bool want_animation);
static void handlesig(int signo); static void handlesig(int32_t signo);
static void static void
handle_keyboard_shortcuts_inhibit_new_inhibitor(struct wl_listener *listener, handle_keyboard_shortcuts_inhibit_new_inhibitor(struct wl_listener *listener,
void *data); void *data);
@@ -675,7 +675,7 @@ static void xytonode(double x, double y, struct wlr_surface **psurface,
Client **pc, LayerSurface **pl, double *nx, double *ny); Client **pc, LayerSurface **pl, double *nx, double *ny);
static void clear_fullscreen_flag(Client *c); static void clear_fullscreen_flag(Client *c);
static pid_t getparentprocess(pid_t p); static pid_t getparentprocess(pid_t p);
static int isdescprocess(pid_t p, pid_t c); static int32_t isdescprocess(pid_t p, pid_t c);
static Client *termforwin(Client *w); static Client *termforwin(Client *w);
static void swallow(Client *c, Client *w); static void swallow(Client *c, Client *w);
@@ -691,20 +691,21 @@ static void tag_client(const Arg *arg, Client *target_client);
static struct wlr_box setclient_coordinate_center(Client *c, static struct wlr_box setclient_coordinate_center(Client *c,
struct wlr_box geom, struct wlr_box geom,
int offsetx, int offsety); int32_t offsetx,
int32_t offsety);
static uint32_t get_tags_first_tag(uint32_t tags); static uint32_t get_tags_first_tag(uint32_t tags);
static struct wlr_output_mode * static struct wlr_output_mode *
get_nearest_output_mode(struct wlr_output *output, int width, int height, get_nearest_output_mode(struct wlr_output *output, int32_t width,
float refresh); int32_t height, float refresh);
static void client_commit(Client *c); static void client_commit(Client *c);
static void layer_commit(LayerSurface *l); static void layer_commit(LayerSurface *l);
static void apply_border(Client *c); static void apply_border(Client *c);
static void client_set_opacity(Client *c, double opacity); static void client_set_opacity(Client *c, double opacity);
static void init_baked_points(void); static void init_baked_points(void);
static void scene_buffer_apply_opacity(struct wlr_scene_buffer *buffer, int sx, static void scene_buffer_apply_opacity(struct wlr_scene_buffer *buffer,
int sy, void *data); int32_t sx, int32_t sy, void *data);
static Client *direction_select(const Arg *arg); static Client *direction_select(const Arg *arg);
static void view_in_mon(const Arg *arg, bool want_animation, Monitor *m, static void view_in_mon(const Arg *arg, bool want_animation, Monitor *m,
@@ -712,13 +713,14 @@ static void view_in_mon(const Arg *arg, bool want_animation, Monitor *m,
static void buffer_set_effect(Client *c, BufferData buffer_data); static void buffer_set_effect(Client *c, BufferData buffer_data);
static void snap_scene_buffer_apply_effect(struct wlr_scene_buffer *buffer, static void snap_scene_buffer_apply_effect(struct wlr_scene_buffer *buffer,
int sx, int sy, void *data); int32_t sx, int32_t sy, void *data);
static void client_set_pending_state(Client *c); static void client_set_pending_state(Client *c);
static void layer_set_pending_state(LayerSurface *l); static void layer_set_pending_state(LayerSurface *l);
static void set_rect_size(struct wlr_scene_rect *rect, int width, int height); static void set_rect_size(struct wlr_scene_rect *rect, int32_t width,
int32_t height);
static Client *center_tiled_select(Monitor *m); static Client *center_tiled_select(Monitor *m);
static void handlecursoractivity(void); static void handlecursoractivity(void);
static int hidecursor(void *data); static int32_t hidecursor(void *data);
static bool check_hit_no_border(Client *c); static bool check_hit_no_border(Client *c);
static void reset_keyboard_layout(void); static void reset_keyboard_layout(void);
static void client_update_oldmonname_record(Client *c, Monitor *m); static void client_update_oldmonname_record(Client *c, Monitor *m);
@@ -726,13 +728,12 @@ static void pending_kill_client(Client *c);
static uint32_t get_tags_first_tag_num(uint32_t source_tags); static uint32_t get_tags_first_tag_num(uint32_t source_tags);
static void set_layer_open_animaiton(LayerSurface *l, struct wlr_box geo); static void set_layer_open_animaiton(LayerSurface *l, struct wlr_box geo);
static void init_fadeout_layers(LayerSurface *l); static void init_fadeout_layers(LayerSurface *l);
static void layer_actual_size(LayerSurface *l, uint32_t *width, static void layer_actual_size(LayerSurface *l, int32_t *width, int32_t *height);
uint32_t *height);
static void get_layer_target_geometry(LayerSurface *l, static void get_layer_target_geometry(LayerSurface *l,
struct wlr_box *target_box); struct wlr_box *target_box);
static void scene_buffer_apply_effect(struct wlr_scene_buffer *buffer, int sx, static void scene_buffer_apply_effect(struct wlr_scene_buffer *buffer,
int sy, void *data); int32_t sx, int32_t sy, void *data);
static double find_animation_curve_at(double t, int type); static double find_animation_curve_at(double t, int32_t type);
static void apply_opacity_to_rect_nodes(Client *c, struct wlr_scene_node *node, static void apply_opacity_to_rect_nodes(Client *c, struct wlr_scene_node *node,
double animation_passed); double animation_passed);
@@ -754,8 +755,8 @@ static void enable_adaptive_sync(Monitor *m, struct wlr_output_state *state);
static Client *get_next_stack_client(Client *c, bool reverse); static Client *get_next_stack_client(Client *c, bool reverse);
static void set_float_malposition(Client *tc); static void set_float_malposition(Client *tc);
static void set_size_per(Monitor *m, Client *c); static void set_size_per(Monitor *m, Client *c);
static void resize_tile_client(Client *grabc, bool isdrag, int offsetx, static void resize_tile_client(Client *grabc, bool isdrag, int32_t offsetx,
int offsety, uint32_t time); int32_t offsety, uint32_t time);
static void refresh_monitors_workspaces_status(Monitor *m); static void refresh_monitors_workspaces_status(Monitor *m);
static void init_client_properties(Client *c); static void init_client_properties(Client *c);
static float *get_border_color(Client *c); static float *get_border_color(Client *c);
@@ -768,7 +769,7 @@ static void clear_fullscreen_and_maximized_state(Monitor *m);
/* variables */ /* variables */
static const char broken[] = "broken"; static const char broken[] = "broken";
static pid_t child_pid = -1; static pid_t child_pid = -1;
static int locked; static int32_t locked;
static uint32_t locked_mods = 0; static uint32_t locked_mods = 0;
static void *exclusive_focus; static void *exclusive_focus;
static struct wl_display *dpy; static struct wl_display *dpy;
@@ -809,7 +810,7 @@ static struct wlr_scene_rect *root_bg;
static struct wlr_session_lock_manager_v1 *session_lock_mgr; static struct wlr_session_lock_manager_v1 *session_lock_mgr;
static struct wlr_scene_rect *locked_bg; static struct wlr_scene_rect *locked_bg;
static struct wlr_session_lock_v1 *cur_lock; static struct wlr_session_lock_v1 *cur_lock;
static const int layermap[] = {LyrBg, LyrBottom, LyrTop, LyrOverlay}; static const int32_t layermap[] = {LyrBg, LyrBottom, LyrTop, LyrOverlay};
static struct wlr_scene_tree *drag_icon; static struct wlr_scene_tree *drag_icon;
static struct wlr_cursor_shape_manager_v1 *cursor_shape_mgr; static struct wlr_cursor_shape_manager_v1 *cursor_shape_mgr;
static struct wlr_pointer_constraints_v1 *pointer_constraints; static struct wlr_pointer_constraints_v1 *pointer_constraints;
@@ -822,20 +823,20 @@ static struct wl_list inputdevices;
static struct wl_list keyboard_shortcut_inhibitors; static struct wl_list keyboard_shortcut_inhibitors;
static uint32_t cursor_mode; static uint32_t cursor_mode;
static Client *grabc; static Client *grabc;
static int grabcx, grabcy; /* client-relative */ static int32_t grabcx, grabcy; /* client-relative */
static int drag_begin_cursorx, drag_begin_cursory; /* client-relative */ static int32_t drag_begin_cursorx, drag_begin_cursory; /* client-relative */
static bool start_drag_window = false; static bool start_drag_window = false;
static int last_apply_drap_time = 0; static int32_t last_apply_drap_time = 0;
static struct wlr_output_layout *output_layout; static struct wlr_output_layout *output_layout;
static struct wlr_box sgeom; static struct wlr_box sgeom;
static struct wl_list mons; static struct wl_list mons;
static Monitor *selmon; static Monitor *selmon;
static int enablegaps = 1; /* enables gaps, used by togglegaps */ static int32_t enablegaps = 1; /* enables gaps, used by togglegaps */
static int axis_apply_time = 0; static int32_t axis_apply_time = 0;
static int axis_apply_dir = 0; static int32_t axis_apply_dir = 0;
static int scroller_focus_lock = 0; static int32_t scroller_focus_lock = 0;
static uint32_t swipe_fingers = 0; static uint32_t swipe_fingers = 0;
static double swipe_dx = 0; static double swipe_dx = 0;
@@ -865,18 +866,18 @@ static KeyMode keymode = {
static struct { static struct {
enum wp_cursor_shape_device_v1_shape shape; enum wp_cursor_shape_device_v1_shape shape;
struct wlr_surface *surface; struct wlr_surface *surface;
int hotspot_x; int32_t hotspot_x;
int hotspot_y; int32_t hotspot_y;
} last_cursor; } last_cursor;
#include "client/client.h" #include "client/client.h"
#include "config/preset.h" #include "config/preset.h"
struct Pertag { struct Pertag {
uint32_t curtag, prevtag; /* current and previous tag */ uint32_t curtag, prevtag; /* current and previous tag */
int nmasters[LENGTH(tags) + 1]; /* number of windows in master area */ int32_t nmasters[LENGTH(tags) + 1]; /* number of windows in master area */
float mfacts[LENGTH(tags) + 1]; /* mfacts per tag */ float mfacts[LENGTH(tags) + 1]; /* mfacts per tag */
bool no_hide[LENGTH(tags) + 1]; /* no_hide per tag */ bool no_hide[LENGTH(tags) + 1]; /* no_hide per tag */
const Layout const Layout
*ltidxs[LENGTH(tags) + 1]; /* matrix of tags and layouts indexes */ *ltidxs[LENGTH(tags) + 1]; /* matrix of tags and layouts indexes */
}; };
@@ -955,8 +956,8 @@ void client_change_mon(Client *c, Monitor *m) {
void applybounds(Client *c, struct wlr_box *bbox) { void applybounds(Client *c, struct wlr_box *bbox) {
/* set minimum possible */ /* set minimum possible */
c->geom.width = MAX(1 + 2 * (int)c->bw, c->geom.width); c->geom.width = MAX(1 + 2 * (int32_t)c->bw, c->geom.width);
c->geom.height = MAX(1 + 2 * (int)c->bw, c->geom.height); c->geom.height = MAX(1 + 2 * (int32_t)c->bw, c->geom.height);
if (c->geom.x >= bbox->x + bbox->width) if (c->geom.x >= bbox->x + bbox->width)
c->geom.x = bbox->x + bbox->width - c->geom.width; c->geom.x = bbox->x + bbox->width - c->geom.width;
@@ -1082,9 +1083,9 @@ bool switch_scratchpad_client_state(Client *c) {
// 根据新monitor调整窗口尺寸 // 根据新monitor调整窗口尺寸
c->float_geom.width = c->float_geom.width =
(int)(c->float_geom.width * c->mon->w.width / oldmon->w.width); (int32_t)(c->float_geom.width * c->mon->w.width / oldmon->w.width);
c->float_geom.height = c->float_geom.height = (int32_t)(c->float_geom.height *
(int)(c->float_geom.height * c->mon->w.height / oldmon->w.height); c->mon->w.height / oldmon->w.height);
c->float_geom = setclient_coordinate_center(c, c->float_geom, 0, 0); c->float_geom = setclient_coordinate_center(c, c->float_geom, 0, 0);
@@ -1167,7 +1168,7 @@ void gpureset(struct wl_listener *listener, void *data) {
wlr_renderer_destroy(old_drw); wlr_renderer_destroy(old_drw);
} }
void handlesig(int signo) { void handlesig(int32_t signo) {
if (signo == SIGCHLD) if (signo == SIGCHLD)
while (waitpid(-1, NULL, WNOHANG) > 0) while (waitpid(-1, NULL, WNOHANG) > 0)
; ;
@@ -1175,7 +1176,7 @@ void handlesig(int signo) {
quit(NULL); quit(NULL);
} }
void toggle_hotarea(int x_root, int y_root) { void toggle_hotarea(int32_t x_root, int32_t y_root) {
// 左下角热区坐标计算,兼容多显示屏 // 左下角热区坐标计算,兼容多显示屏
Arg arg = {0}; Arg arg = {0};
@@ -1241,7 +1242,7 @@ static void apply_rule_properties(Client *c, const ConfigWinRule *r) {
void set_float_malposition(Client *tc) { void set_float_malposition(Client *tc) {
Client *c = NULL; Client *c = NULL;
int x, y, offset, xreverse, yreverse; int32_t x, y, offset, xreverse, yreverse;
x = tc->geom.x; x = tc->geom.x;
y = tc->geom.y; y = tc->geom.y;
xreverse = 1; xreverse = 1;
@@ -1389,7 +1390,8 @@ void applyrules(Client *c) {
} }
} }
int fullscreen_state_backup = c->isfullscreen || client_wants_fullscreen(c); int32_t fullscreen_state_backup =
c->isfullscreen || client_wants_fullscreen(c);
setmon(c, mon, newtags, setmon(c, mon, newtags,
!c->isopensilent && !c->isopensilent &&
!(client_is_x11_popup(c) && client_should_ignore_focus(c)) && !(client_is_x11_popup(c) && client_should_ignore_focus(c)) &&
@@ -1436,7 +1438,7 @@ void applyrules(Client *c) {
} }
void arrangelayer(Monitor *m, struct wl_list *list, struct wlr_box *usable_area, void arrangelayer(Monitor *m, struct wl_list *list, struct wlr_box *usable_area,
int exclusive) { int32_t exclusive) {
LayerSurface *l = NULL; LayerSurface *l = NULL;
struct wlr_box full_area = m->m; struct wlr_box full_area = m->m;
@@ -1455,14 +1457,14 @@ void arrangelayer(Monitor *m, struct wl_list *list, struct wlr_box *usable_area,
} }
void apply_window_snap(Client *c) { void apply_window_snap(Client *c) {
int snap_up = 99999, snap_down = 99999, snap_left = 99999, int32_t snap_up = 99999, snap_down = 99999, snap_left = 99999,
snap_right = 99999; snap_right = 99999;
int snap_up_temp = 0, snap_down_temp = 0, snap_left_temp = 0, int32_t snap_up_temp = 0, snap_down_temp = 0, snap_left_temp = 0,
snap_right_temp = 0; snap_right_temp = 0;
int snap_up_screen = 0, snap_down_screen = 0, snap_left_screen = 0, int32_t snap_up_screen = 0, snap_down_screen = 0, snap_left_screen = 0,
snap_right_screen = 0; snap_right_screen = 0;
int snap_up_mon = 0, snap_down_mon = 0, snap_left_mon = 0, int32_t snap_up_mon = 0, snap_down_mon = 0, snap_left_mon = 0,
snap_right_mon = 0; snap_right_mon = 0;
uint32_t cbw = !render_border || c->fake_no_border ? borderpx : 0; uint32_t cbw = !render_border || c->fake_no_border ? borderpx : 0;
uint32_t tcbw; uint32_t tcbw;
@@ -1565,7 +1567,7 @@ void focuslayer(LayerSurface *l) {
void reset_exclusive_layer(Monitor *m) { void reset_exclusive_layer(Monitor *m) {
LayerSurface *l = NULL; LayerSurface *l = NULL;
int i; int32_t i;
uint32_t layers_above_shell[] = { uint32_t layers_above_shell[] = {
ZWLR_LAYER_SHELL_V1_LAYER_OVERLAY, ZWLR_LAYER_SHELL_V1_LAYER_OVERLAY,
ZWLR_LAYER_SHELL_V1_LAYER_TOP, ZWLR_LAYER_SHELL_V1_LAYER_TOP,
@@ -1575,7 +1577,7 @@ void reset_exclusive_layer(Monitor *m) {
if (!m) if (!m)
return; return;
for (i = 0; i < (int)LENGTH(layers_above_shell); i++) { for (i = 0; i < (int32_t)LENGTH(layers_above_shell); i++) {
wl_list_for_each_reverse(l, &m->layers[layers_above_shell[i]], link) { wl_list_for_each_reverse(l, &m->layers[layers_above_shell[i]], link) {
if (l == exclusive_focus && if (l == exclusive_focus &&
l->layer_surface->current.keyboard_interactive != l->layer_surface->current.keyboard_interactive !=
@@ -1601,7 +1603,7 @@ void reset_exclusive_layer(Monitor *m) {
} }
void arrangelayers(Monitor *m) { void arrangelayers(Monitor *m) {
int i; int32_t i;
struct wlr_box usable_area = m->m; struct wlr_box usable_area = m->m;
if (!m->wlr_output->enabled) if (!m->wlr_output->enabled)
@@ -1633,7 +1635,7 @@ axisnotify(struct wl_listener *listener, void *data) {
struct wlr_keyboard *keyboard, *hard_keyboard; struct wlr_keyboard *keyboard, *hard_keyboard;
uint32_t mods, hard_mods; uint32_t mods, hard_mods;
AxisBinding *a; AxisBinding *a;
int ji; int32_t ji;
uint32_t adir; uint32_t adir;
// IDLE_NOTIFY_ACTIVITY; // IDLE_NOTIFY_ACTIVITY;
handlecursoractivity(); handlecursoractivity();
@@ -1687,15 +1689,15 @@ axisnotify(struct wl_listener *listener, void *data) {
event->relative_direction); event->relative_direction);
} }
int ongesture(struct wlr_pointer_swipe_end_event *event) { int32_t ongesture(struct wlr_pointer_swipe_end_event *event) {
struct wlr_keyboard *keyboard, *hard_keyboard; struct wlr_keyboard *keyboard, *hard_keyboard;
uint32_t mods, hard_mods; uint32_t mods, hard_mods;
const GestureBinding *g; const GestureBinding *g;
uint32_t motion; uint32_t motion;
uint32_t adx = (int)round(fabs(swipe_dx)); uint32_t adx = (int32_t)round(fabs(swipe_dx));
uint32_t ady = (int)round(fabs(swipe_dy)); uint32_t ady = (int32_t)round(fabs(swipe_dy));
int handled = 0; int32_t handled = 0;
int ji; int32_t ji;
if (event->cancelled) { if (event->cancelled) {
return handled; return handled;
@@ -1811,12 +1813,12 @@ void place_drag_tile_client(Client *c) {
Client *closest_client = NULL; Client *closest_client = NULL;
long min_distant = LONG_MAX; long min_distant = LONG_MAX;
long temp_distant; long temp_distant;
int x, y; int32_t x, y;
wl_list_for_each(tc, &clients, link) { wl_list_for_each(tc, &clients, link) {
if (tc != c && ISTILED(tc) && VISIBLEON(tc, c->mon)) { if (tc != c && ISTILED(tc) && VISIBLEON(tc, c->mon)) {
x = tc->geom.x + (int)(tc->geom.width / 2) - cursor->x; x = tc->geom.x + (int32_t)(tc->geom.width / 2) - cursor->x;
y = tc->geom.y + (int)(tc->geom.height / 2) - cursor->y; y = tc->geom.y + (int32_t)(tc->geom.height / 2) - cursor->y;
temp_distant = x * x + y * y; temp_distant = x * x + y * y;
if (temp_distant < min_distant) { if (temp_distant < min_distant) {
min_distant = temp_distant; min_distant = temp_distant;
@@ -1863,7 +1865,7 @@ buttonpress(struct wl_listener *listener, void *data) {
LayerSurface *l = NULL; LayerSurface *l = NULL;
struct wlr_surface *surface; struct wlr_surface *surface;
Client *tmpc = NULL; Client *tmpc = NULL;
int ji; int32_t ji;
const MouseBinding *m; const MouseBinding *m;
struct wlr_surface *old_pointer_focus_surface = struct wlr_surface *old_pointer_focus_surface =
seat->pointer_state.focused_surface; seat->pointer_state.focused_surface;
@@ -1971,7 +1973,7 @@ buttonpress(struct wl_listener *listener, void *data) {
} }
void checkidleinhibitor(struct wlr_surface *exclude) { void checkidleinhibitor(struct wlr_surface *exclude) {
int inhibited = 0; int32_t inhibited = 0;
Client *c = NULL; Client *c = NULL;
struct wlr_surface *surface = NULL; struct wlr_surface *surface = NULL;
struct wlr_idle_inhibitor_v1 *inhibitor; struct wlr_idle_inhibitor_v1 *inhibitor;
@@ -2125,7 +2127,7 @@ void closemon(Monitor *m) {
/* update selmon if needed and /* update selmon if needed and
* move closed monitor's clients to the focused one */ * move closed monitor's clients to the focused one */
Client *c = NULL; Client *c = NULL;
int i = 0, nmons = wl_list_length(&mons); int32_t i = 0, nmons = wl_list_length(&mons);
if (!nmons) { if (!nmons) {
selmon = NULL; selmon = NULL;
} else if (m == selmon) { } else if (m == selmon) {
@@ -2158,8 +2160,8 @@ void closemon(Monitor *m) {
} }
} }
static void iter_layer_scene_buffers(struct wlr_scene_buffer *buffer, int sx, static void iter_layer_scene_buffers(struct wlr_scene_buffer *buffer,
int sy, void *user_data) { int32_t sx, int32_t sy, void *user_data) {
struct wlr_scene_surface *scene_surface = struct wlr_scene_surface *scene_surface =
wlr_scene_surface_try_from_buffer(buffer); wlr_scene_surface_try_from_buffer(buffer);
if (!scene_surface) { if (!scene_surface) {
@@ -2178,7 +2180,7 @@ static void iter_layer_scene_buffers(struct wlr_scene_buffer *buffer, int sx,
void maplayersurfacenotify(struct wl_listener *listener, void *data) { void maplayersurfacenotify(struct wl_listener *listener, void *data) {
LayerSurface *l = wl_container_of(listener, l, map); LayerSurface *l = wl_container_of(listener, l, map);
struct wlr_layer_surface_v1 *layer_surface = l->layer_surface; struct wlr_layer_surface_v1 *layer_surface = l->layer_surface;
int ji; int32_t ji;
ConfigLayerRule *r; ConfigLayerRule *r;
l->mapped = 1; l->mapped = 1;
@@ -2409,7 +2411,7 @@ void commitpopup(struct wl_listener *listener, void *data) {
LayerSurface *l = NULL; LayerSurface *l = NULL;
Client *c = NULL; Client *c = NULL;
struct wlr_box box; struct wlr_box box;
int type = -1; int32_t type = -1;
if (!popup->base->initial_commit) if (!popup->base->initial_commit)
return; return;
@@ -2596,7 +2598,7 @@ void createlocksurface(struct wl_listener *listener, void *data) {
} }
struct wlr_output_mode *get_nearest_output_mode(struct wlr_output *output, struct wlr_output_mode *get_nearest_output_mode(struct wlr_output *output,
int width, int height, int32_t width, int32_t height,
float refresh) { float refresh) {
struct wlr_output_mode *mode, *nearest_mode = NULL; struct wlr_output_mode *mode, *nearest_mode = NULL;
float min_diff = 99999.0f; float min_diff = 99999.0f;
@@ -2634,7 +2636,7 @@ void createmon(struct wl_listener *listener, void *data) {
struct wlr_output *wlr_output = data; struct wlr_output *wlr_output = data;
const ConfigMonitorRule *r; const ConfigMonitorRule *r;
uint32_t i; uint32_t i;
int ji, jk; int32_t ji, jk;
struct wlr_output_state state; struct wlr_output_state state;
Monitor *m = NULL; Monitor *m = NULL;
struct wlr_output_mode *internal_mode = NULL; struct wlr_output_mode *internal_mode = NULL;
@@ -2707,7 +2709,7 @@ void createmon(struct wl_listener *listener, void *data) {
custom_monitor_mode = true; custom_monitor_mode = true;
wlr_output_state_set_custom_mode( wlr_output_state_set_custom_mode(
&state, r->width, r->height, &state, r->width, r->height,
(int)roundf(r->refresh * 1000)); (int32_t)roundf(r->refresh * 1000));
} }
} }
wlr_output_state_set_scale(&state, r->scale); wlr_output_state_set_scale(&state, r->scale);
@@ -2928,7 +2930,7 @@ void switch_toggle(struct wl_listener *listener, void *data) {
// 处理切换事件 // 处理切换事件
struct wlr_switch_toggle_event *event = data; struct wlr_switch_toggle_event *event = data;
SwitchBinding *s; SwitchBinding *s;
int ji; int32_t ji;
for (ji = 0; ji < config.switch_bindings_count; ji++) { for (ji = 0; ji < config.switch_bindings_count; ji++) {
if (config.switch_bindings_count < 1) if (config.switch_bindings_count < 1)
@@ -3053,7 +3055,7 @@ void destroylayersurfacenotify(struct wl_listener *listener, void *data) {
free(l); free(l);
} }
void destroylock(SessionLock *lock, int unlock) { void destroylock(SessionLock *lock, int32_t unlock) {
wlr_seat_keyboard_notify_clear_focus(seat); wlr_seat_keyboard_notify_clear_focus(seat);
if ((locked = !unlock)) if ((locked = !unlock))
goto destroy; goto destroy;
@@ -3157,7 +3159,7 @@ void destroykeyboardgroup(struct wl_listener *listener, void *data) {
free(group); free(group);
} }
void focusclient(Client *c, int lift) { void focusclient(Client *c, int32_t lift) {
Client *last_focus_client = NULL; Client *last_focus_client = NULL;
Monitor *um = NULL; Monitor *um = NULL;
@@ -3248,7 +3250,7 @@ void focusclient(Client *c, int lift) {
* layer is closed. */ * layer is closed. */
Client *w = NULL; Client *w = NULL;
LayerSurface *l = NULL; LayerSurface *l = NULL;
int type = int32_t type =
toplevel_from_wlr_surface(old_keyboard_focus_surface, &w, &l); toplevel_from_wlr_surface(old_keyboard_focus_surface, &w, &l);
if (type == LayerShell && l->scene->node.enabled && if (type == LayerShell && l->scene->node.enabled &&
l->layer_surface->current.layer >= ZWLR_LAYER_SHELL_V1_LAYER_TOP && l->layer_surface->current.layer >= ZWLR_LAYER_SHELL_V1_LAYER_TOP &&
@@ -3364,9 +3366,9 @@ void inputdevice(struct wl_listener *listener, void *data) {
wlr_seat_set_capabilities(seat, caps); wlr_seat_set_capabilities(seat, caps);
} }
int keyrepeat(void *data) { int32_t keyrepeat(void *data) {
KeyboardGroup *group = data; KeyboardGroup *group = data;
int i; int32_t i;
if (!group->nsyms || group->wlr_group->keyboard.repeat_info.rate <= 0) if (!group->nsyms || group->wlr_group->keyboard.repeat_info.rate <= 0)
return 0; return 0;
@@ -3392,7 +3394,7 @@ bool is_keyboard_shortcut_inhibitor(struct wlr_surface *surface) {
return false; return false;
} }
int // 17 int32_t // 17
keybinding(uint32_t state, bool locked, uint32_t mods, xkb_keysym_t sym, keybinding(uint32_t state, bool locked, uint32_t mods, xkb_keysym_t sym,
uint32_t keycode) { uint32_t keycode) {
/* /*
@@ -3400,10 +3402,10 @@ keybinding(uint32_t state, bool locked, uint32_t mods, xkb_keysym_t sym,
* processing keys, rather than passing them on to the client for its * processing keys, rather than passing them on to the client for its
* own processing. * own processing.
*/ */
int handled = 0; int32_t handled = 0;
const KeyBinding *k; const KeyBinding *k;
int ji; int32_t ji;
int isbreak = 0; int32_t isbreak = 0;
// not allow modifier keys to be used as a keybinding // not allow modifier keys to be used as a keybinding
if (keycode == 50 || keycode == 37 || keycode == 133 || keycode == 64 || if (keycode == 50 || keycode == 37 || keycode == 133 || keycode == 64 ||
@@ -3466,10 +3468,10 @@ bool keypressglobal(struct wlr_surface *last_surface,
xkb_keysym_t keysym, uint32_t keycode) { xkb_keysym_t keysym, uint32_t keycode) {
Client *c = NULL, *lastc = focustop(selmon); Client *c = NULL, *lastc = focustop(selmon);
uint32_t keycodes[32] = {0}; uint32_t keycodes[32] = {0};
int reset = false; int32_t reset = false;
const char *appid = NULL; const char *appid = NULL;
const char *title = NULL; const char *title = NULL;
int ji; int32_t ji;
const ConfigWinRule *r; const ConfigWinRule *r;
for (ji = 0; ji < config.window_rules_count; ji++) { for (ji = 0; ji < config.window_rules_count; ji++) {
@@ -3523,7 +3525,7 @@ done:
} }
void keypress(struct wl_listener *listener, void *data) { void keypress(struct wl_listener *listener, void *data) {
int i; int32_t i;
/* This event is raised when a key is pressed or released. */ /* This event is raised when a key is pressed or released. */
KeyboardGroup *group = wl_container_of(listener, group, key); KeyboardGroup *group = wl_container_of(listener, group, key);
struct wlr_keyboard_key_event *event = data; struct wlr_keyboard_key_event *event = data;
@@ -3532,7 +3534,7 @@ void keypress(struct wl_listener *listener, void *data) {
struct wlr_xdg_surface *xdg_surface = struct wlr_xdg_surface *xdg_surface =
last_surface ? wlr_xdg_surface_try_from_wlr_surface(last_surface) last_surface ? wlr_xdg_surface_try_from_wlr_surface(last_surface)
: NULL; : NULL;
int pass = 0; int32_t pass = 0;
bool hit_global = false; bool hit_global = false;
#ifdef XWAYLAND #ifdef XWAYLAND
struct wlr_xwayland_surface *xsurface = struct wlr_xwayland_surface *xsurface =
@@ -3544,10 +3546,10 @@ void keypress(struct wl_listener *listener, void *data) {
uint32_t keycode = event->keycode + 8; uint32_t keycode = event->keycode + 8;
/* Get a list of keysyms based on the keymap for this keyboard */ /* Get a list of keysyms based on the keymap for this keyboard */
const xkb_keysym_t *syms; const xkb_keysym_t *syms;
int nsyms = xkb_state_key_get_syms(group->wlr_group->keyboard.xkb_state, int32_t nsyms = xkb_state_key_get_syms(group->wlr_group->keyboard.xkb_state,
keycode, &syms); keycode, &syms);
int handled = 0; int32_t handled = 0;
uint32_t mods = wlr_keyboard_get_modifiers(&group->wlr_group->keyboard); uint32_t mods = wlr_keyboard_get_modifiers(&group->wlr_group->keyboard);
wlr_idle_notifier_v1_notify_activity(idle_notifier, seat); wlr_idle_notifier_v1_notify_activity(idle_notifier, seat);
@@ -3658,8 +3660,8 @@ void locksession(struct wl_listener *listener, void *data) {
wlr_session_lock_v1_send_locked(session_lock); wlr_session_lock_v1_send_locked(session_lock);
} }
static void iter_xdg_scene_buffers(struct wlr_scene_buffer *buffer, int sx, static void iter_xdg_scene_buffers(struct wlr_scene_buffer *buffer, int32_t sx,
int sy, void *user_data) { int32_t sy, void *user_data) {
Client *c = user_data; Client *c = user_data;
struct wlr_scene_surface *scene_surface = struct wlr_scene_surface *scene_surface =
@@ -4013,16 +4015,16 @@ void motionnotify(uint32_t time, struct wlr_input_device *device, double dx,
} }
/* Update drag icon's position */ /* Update drag icon's position */
wlr_scene_node_set_position(&drag_icon->node, (int)round(cursor->x), wlr_scene_node_set_position(&drag_icon->node, (int32_t)round(cursor->x),
(int)round(cursor->y)); (int32_t)round(cursor->y));
/* If we are currently grabbing the mouse, handle and return */ /* If we are currently grabbing the mouse, handle and return */
if (cursor_mode == CurMove) { if (cursor_mode == CurMove) {
/* Move the grabbed client to the new position. */ /* Move the grabbed client to the new position. */
grabc->iscustomsize = 1; grabc->iscustomsize = 1;
grabc->float_geom = grabc->float_geom =
(struct wlr_box){.x = (int)round(cursor->x) - grabcx, (struct wlr_box){.x = (int32_t)round(cursor->x) - grabcx,
.y = (int)round(cursor->y) - grabcy, .y = (int32_t)round(cursor->y) - grabcy,
.width = grabc->geom.width, .width = grabc->geom.width,
.height = grabc->geom.height}; .height = grabc->geom.height};
resize(grabc, grabc->float_geom, 1); resize(grabc, grabc->float_geom, 1);
@@ -4033,8 +4035,8 @@ void motionnotify(uint32_t time, struct wlr_input_device *device, double dx,
grabc->float_geom = (struct wlr_box){ grabc->float_geom = (struct wlr_box){
.x = grabc->geom.x, .x = grabc->geom.x,
.y = grabc->geom.y, .y = grabc->geom.y,
.width = (int)round(cursor->x) - grabc->geom.x, .width = (int32_t)round(cursor->x) - grabc->geom.x,
.height = (int)round(cursor->y) - grabc->geom.y}; .height = (int32_t)round(cursor->y) - grabc->geom.y};
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) {
resize(grabc, grabc->float_geom, 1); resize(grabc, grabc->float_geom, 1);
@@ -4097,7 +4099,7 @@ void outputmgrapply(struct wl_listener *listener, void *data) {
} }
void // 0.7 custom void // 0.7 custom
outputmgrapplyortest(struct wlr_output_configuration_v1 *config, int test) { outputmgrapplyortest(struct wlr_output_configuration_v1 *config, int32_t test) {
/* /*
* Called when a client such as wlr-randr requests a change in output * Called when a client such as wlr-randr requests a change in output
* configuration. This is only one way that the layout can be changed, * configuration. This is only one way that the layout can be changed,
@@ -4105,7 +4107,7 @@ outputmgrapplyortest(struct wlr_output_configuration_v1 *config, int test) {
* output_layout.change event, not here. * output_layout.change event, not here.
*/ */
struct wlr_output_configuration_head_v1 *config_head; struct wlr_output_configuration_head_v1 *config_head;
int ok = 1; int32_t ok = 1;
wl_list_for_each(config_head, &config->heads, link) { wl_list_for_each(config_head, &config->heads, link) {
struct wlr_output *wlr_output = config_head->state.output; struct wlr_output *wlr_output = config_head->state.output;
@@ -4208,10 +4210,10 @@ void powermgrsetmode(struct wl_listener *listener, void *data) {
updatemons(NULL, NULL); updatemons(NULL, NULL);
} }
void quitsignal(int signo) { quit(NULL); } void quitsignal(int32_t signo) { quit(NULL); }
void scene_buffer_apply_opacity(struct wlr_scene_buffer *buffer, int sx, int sy, void scene_buffer_apply_opacity(struct wlr_scene_buffer *buffer, int32_t sx,
void *data) { int32_t sy, void *data) {
wlr_scene_buffer_set_opacity(buffer, *(double *)data); wlr_scene_buffer_set_opacity(buffer, *(double *)data);
} }
@@ -4225,7 +4227,7 @@ void rendermon(struct wl_listener *listener, void *data) {
Client *c = NULL, *tmp = NULL; Client *c = NULL, *tmp = NULL;
struct wlr_output_state pending = {0}; struct wlr_output_state pending = {0};
LayerSurface *l = NULL, *tmpl = NULL; LayerSurface *l = NULL, *tmpl = NULL;
int i; int32_t i;
struct wl_list *layer_list; struct wl_list *layer_list;
bool frame_allow_tearing = false; bool frame_allow_tearing = false;
struct timespec now; struct timespec now;
@@ -4433,7 +4435,7 @@ run(char *startup_cmd) {
* startup command */ * startup command */
if (startup_cmd) { if (startup_cmd) {
int piperw[2]; int32_t piperw[2];
if (pipe(piperw) < 0) if (pipe(piperw) < 0)
die("startup: pipe:"); die("startup: pipe:");
if ((child_pid = fork()) < 0) if ((child_pid = fork()) < 0)
@@ -4509,7 +4511,7 @@ void setcursor(struct wl_listener *listener, void *data) {
} }
void // 0.5 void // 0.5
setfloating(Client *c, int floating) { setfloating(Client *c, int32_t floating) {
Client *fc = NULL; Client *fc = NULL;
struct wlr_box target_box; struct wlr_box target_box;
@@ -4599,7 +4601,7 @@ void reset_maximizescreen_size(Client *c) {
resize(c, c->geom, 0); resize(c, c->geom, 0);
} }
void setmaximizescreen(Client *c, int maximizescreen) { void setmaximizescreen(Client *c, int32_t maximizescreen) {
struct wlr_box maximizescreen_box; struct wlr_box maximizescreen_box;
if (!c || !c->mon || !client_surface(c)->mapped || c->iskilling) if (!c || !c->mon || !client_surface(c)->mapped || c->iskilling)
return; return;
@@ -4647,7 +4649,7 @@ void setmaximizescreen(Client *c, int maximizescreen) {
arrange(c->mon, false, false); arrange(c->mon, false, false);
} }
void setfakefullscreen(Client *c, int fakefullscreen) { void setfakefullscreen(Client *c, int32_t fakefullscreen) {
c->isfakefullscreen = fakefullscreen; c->isfakefullscreen = fakefullscreen;
if (!c->mon) if (!c->mon)
return; return;
@@ -4657,7 +4659,7 @@ void setfakefullscreen(Client *c, int fakefullscreen) {
client_set_fullscreen(c, fakefullscreen); client_set_fullscreen(c, fakefullscreen);
} }
void setfullscreen(Client *c, int fullscreen) // 用自定义全屏代理自带全屏 void setfullscreen(Client *c, int32_t fullscreen) // 用自定义全屏代理自带全屏
{ {
if (!c || !c->mon || !client_surface(c)->mapped || c->iskilling) if (!c || !c->mon || !client_surface(c)->mapped || c->iskilling)
@@ -4707,7 +4709,7 @@ void setfullscreen(Client *c, int fullscreen) // 用自定义全屏代理自带
arrange(c->mon, false, false); arrange(c->mon, false, false);
} }
void setgaps(int oh, int ov, int ih, int iv) { void setgaps(int32_t oh, int32_t ov, int32_t ih, int32_t iv) {
selmon->gappoh = MAX(oh, 0); selmon->gappoh = MAX(oh, 0);
selmon->gappov = MAX(ov, 0); selmon->gappov = MAX(ov, 0);
selmon->gappih = MAX(ih, 0); selmon->gappih = MAX(ih, 0);
@@ -4730,7 +4732,7 @@ void reset_keyboard_layout(void) {
// Get current layout // Get current layout
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 int num_layouts = xkb_keymap_num_layouts(keyboard->keymap); const int32_t num_layouts = xkb_keymap_num_layouts(keyboard->keymap);
if (num_layouts < 1) { if (num_layouts < 1) {
wlr_log(WLR_INFO, "No layouts available"); wlr_log(WLR_INFO, "No layouts available");
return; return;
@@ -4754,7 +4756,7 @@ void reset_keyboard_layout(void) {
} }
// 验证新keymap是否有布局 // 验证新keymap是否有布局
const int new_num_layouts = xkb_keymap_num_layouts(new_keymap); const int32_t new_num_layouts = xkb_keymap_num_layouts(new_keymap);
if (new_num_layouts < 1) { if (new_num_layouts < 1) {
wlr_log(WLR_ERROR, "New keymap has no layouts"); wlr_log(WLR_ERROR, "New keymap has no layouts");
xkb_keymap_unref(new_keymap); xkb_keymap_unref(new_keymap);
@@ -4937,7 +4939,7 @@ void setup(void) {
parse_config(); parse_config();
init_baked_points(); init_baked_points();
int drm_fd, i, sig[] = {SIGCHLD, SIGINT, SIGTERM, SIGPIPE}; int32_t drm_fd, i, sig[] = {SIGCHLD, SIGINT, SIGTERM, SIGPIPE};
struct sigaction sa = {.sa_flags = SA_RESTART, .sa_handler = handlesig}; struct sigaction sa = {.sa_flags = SA_RESTART, .sa_handler = handlesig};
sigemptyset(&sa.sa_mask); sigemptyset(&sa.sa_mask);
@@ -5361,7 +5363,7 @@ void handlecursoractivity(void) {
last_cursor.hotspot_x, last_cursor.hotspot_y); last_cursor.hotspot_x, last_cursor.hotspot_y);
} }
int hidecursor(void *data) { int32_t hidecursor(void *data) {
wlr_cursor_unset_image(cursor); wlr_cursor_unset_image(cursor);
cursor_hidden = true; cursor_hidden = true;
return 1; return 1;
@@ -5488,7 +5490,7 @@ void updatemons(struct wl_listener *listener, void *data) {
Client *c = NULL; Client *c = NULL;
struct wlr_output_configuration_head_v1 *config_head; struct wlr_output_configuration_head_v1 *config_head;
Monitor *m = NULL; Monitor *m = NULL;
int mon_pos_offsetx, mon_pos_offsety, oldx, oldy; int32_t mon_pos_offsetx, mon_pos_offsety, oldx, oldy;
/* First remove from the layout the disabled monitors */ /* First remove from the layout the disabled monitors */
wl_list_for_each(m, &mons, link) { wl_list_for_each(m, &mons, link) {
@@ -5738,7 +5740,7 @@ void handle_keyboard_shortcuts_inhibit_new_inhibitor(
Client *c = NULL; Client *c = NULL;
LayerSurface *l = NULL; LayerSurface *l = NULL;
int type = toplevel_from_wlr_surface(inhibitor->surface, &c, &l); int32_t type = toplevel_from_wlr_surface(inhibitor->surface, &c, &l);
if (type < 0) if (type < 0)
return; return;
@@ -5945,9 +5947,9 @@ static void setgeometrynotify(struct wl_listener *listener, void *data) {
} }
#endif #endif
int main(int argc, char *argv[]) { int32_t main(int32_t argc, char *argv[]) {
char *startup_cmd = NULL; char *startup_cmd = NULL;
int c; int32_t c;
while ((c = getopt(argc, argv, "s:c:hdv")) != -1) { while ((c = getopt(argc, argv, "s:c:hdv")) != -1) {
if (c == 's') if (c == 's')