mirrors/maomaowm
1
0
Fork 0
mirror of https://github.com/DreamMaoMao/maomaowm.git synced 2026-05-04 06:46:38 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

feat: echange_two_clients now accepts mode param

Browse source 
for compatibility with previous functionality on scroller layout,
defaults to that and if passed >=1 then the natural exchange occurs.
This commit is contained in:
Andrej Novikov 2025-12-16 10:48:25 +02:00
parent 8cc811b198
commit 141cdee06f
No known key found for this signature in database
GPG key ID: 0B3D7DD3D63C5E4C
3 changed files with 8 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/config/parse_config.h
View file

@ -833,9 +833,11 @@ FuncType parse_func_name(char *func_name, Arg *arg, char *arg_value,
} else if (strcmp(func_name, "exchange_client") == 0) {
func = exchange_client;
(*arg).i = parse_direction(arg_value);
(*arg).ui = arg_value2 && arg_value2[0] != '\0' ? atoi(arg_value2) : 0;
} else if (strcmp(func_name, "exchange_stack_client") == 0) {
func = exchange_stack_client;
(*arg).i = parse_circle_direction(arg_value);
(*arg).ui = arg_value2 && arg_value2[0] != '\0' ? atoi(arg_value2) : 0;
} else if (strcmp(func_name, "toggleglobal") == 0) {
func = toggleglobal;
} else if (strcmp(func_name, "toggleoverview") == 0) {

4
src/dispatch/bind_define.h
View file

@ -86,7 +86,7 @@ int exchange_client(const Arg *arg) {
if ((c->isfullscreen || c->ismaximizescreen) && !is_scroller_layout(c->mon))
return 0;
exchange_two_client(c, direction_select(arg));
exchange_two_client(c, direction_select(arg), arg->ui);
return 0;
}
@ -101,7 +101,7 @@ int exchange_stack_client(const Arg *arg) {
tc = get_next_stack_client(c, true);
}
if (tc)
exchange_two_client(c, tc);
exchange_two_client(c, tc, arg->ui);
return 0;
}

8
src/mango.c
View file

@ -625,7 +625,7 @@ static void motionrelative(struct wl_listener *listener, void *data);
static void reset_foreign_tolevel(Client *c);
static void remove_foreign_topleve(Client *c);
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, uint8_t mode);
static void outputmgrapply(struct wl_listener *listener, void *data);
static void outputmgrapplyortest(struct wlr_output_configuration_v1 *config,
int test);
@ -1862,7 +1862,7 @@ void place_drag_tile_client(Client *c) {
closest_client->link.prev->next = &c->link;
closest_client->link.prev = &c->link;
} else if (closest_client) {
exchange_two_client(c, closest_client);
exchange_two_client(c, closest_client, 0);
}
setfloating(c, 0);
}
@ -4307,7 +4307,7 @@ void setborder_color(Client *c) {
client_set_border_color(c, border_color);
}
void exchange_two_client(Client *c1, Client *c2) {
void exchange_two_client(Client *c1, Client *c2, uint8_t mode) {
Monitor *tmp_mon = NULL;
uint32_t tmp_tags;
@ -4379,7 +4379,7 @@ void exchange_two_client(Client *c1, Client *c2) {
focusclient(c1, 0);
} else {
// For scroller layouts, swap geometry to maintain visual positions
if (is_scroller_layout(c1->mon)) {
if (mode && is_scroller_layout(c1->mon)) {
struct wlr_box tmp_geom = c1->geom;
c1->geom = c2->geom;
c2->geom = tmp_geom;