mirrors/maomaowm
1
0
Fork 0
mirror of https://github.com/DreamMaoMao/maomaowm.git synced 2026-02-10 04:27:57 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

fix: remove useless code

Browse source
This commit is contained in:
DreamMaoMao 2026-01-17 19:35:29 +08:00
parent db54b4eff4
commit 2466dd6649
2 changed files with 8 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/dispatch/bind_define.h
View file

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

14
src/mango.c
View file

@ -630,7 +630,7 @@ static void motionrelative(struct wl_listener *listener, void *data);
static void reset_foreign_tolevel(Client *c); static void reset_foreign_tolevel(Client *c);
static void remove_foreign_topleve(Client *c); static void remove_foreign_topleve(Client *c);
static void add_foreign_topleve(Client *c); static void add_foreign_topleve(Client *c);
static void exchange_two_client(Client *c1, Client *c2, bool samemon); 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,
int32_t test); int32_t test);
@ -1848,7 +1848,7 @@ void place_drag_tile_client(Client *c) {
closest_client->link.prev->next = &c->link; closest_client->link.prev->next = &c->link;
closest_client->link.prev = &c->link; closest_client->link.prev = &c->link;
} else if (closest_client) { } else if (closest_client) {
exchange_two_client(c, closest_client, false); exchange_two_client(c, closest_client);
} }
setfloating(c, 0); setfloating(c, 0);
} }
@ -4357,7 +4357,7 @@ void setborder_color(Client *c) {
client_set_border_color(c, border_color); client_set_border_color(c, border_color);
} }
void exchange_two_client(Client *c1, Client *c2, bool samemon) { void exchange_two_client(Client *c1, Client *c2) {
Monitor *tmp_mon = NULL; Monitor *tmp_mon = NULL;
uint32_t tmp_tags; uint32_t tmp_tags;
@ -4370,10 +4370,8 @@ void exchange_two_client(Client *c1, Client *c2, bool samemon) {
return; return;
} }
if (samemon && c1->mon != c2->mon) if (c1->mon != c2->mon && (c1->prev_in_stack || c2->prev_in_stack ||
return; c1->next_in_stack || c2->next_in_stack))
if(c1->mon != c2->mon && (c1->prev_in_stack || c2->prev_in_stack||c1->next_in_stack||c2->next_in_stack))
return; return;
// 交换布局参数 // 交换布局参数
@ -4417,7 +4415,7 @@ void exchange_two_client(Client *c1, Client *c2, bool samemon) {
} else if (c1->prev_in_stack || c2->prev_in_stack) { } else if (c1->prev_in_stack || c2->prev_in_stack) {
Client *c1head = get_scroll_stack_head(c1); Client *c1head = get_scroll_stack_head(c1);
Client *c2head = get_scroll_stack_head(c2); Client *c2head = get_scroll_stack_head(c2);
exchange_two_client(c1head, c2head, true); exchange_two_client(c1head, c2head);
focusclient(c1, 0); focusclient(c1, 0);
return; return;
} }