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

opt: optimize scroller insert reset

Browse source
This commit is contained in:
DreamMaoMao 2026-05-12 16:30:26 +08:00
parent 3a1920f024
commit 30f00ba50a
3 changed files with 59 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

25
src/dispatch/bind_define.h
View file

@ -1838,14 +1838,26 @@ int32_t scroller_apply_stack(Client *c, Client *target_client,
struct ScrollerStackNode *move_out_refer_node =
cnode->prev_in_stack ? cnode->prev_in_stack : cnode->next_in_stack;
scroller_node_remove(st, cnode);
// 必须先更新，不然里面节点还存着的是cnode的信息，
// 会造成stach_head/stack_tail指向的客户端不对
update_scroller_state(c->mon);
Client *stack_head =
scroll_get_stack_head_client(move_out_refer_node->client);
Client *stack_tail =
scroll_get_stack_tail_client(move_out_refer_node->client);
if (direction == LEFT || direction == UP) {
wl_list_remove(&c->link);
wl_list_insert(stack_head->link.prev, &c->link);
if (c != stack_head) {
wl_list_remove(&c->link);
wl_list_insert(stack_head->link.prev, &c->link);
}
} else if (direction == RIGHT || direction == DOWN) {
wl_list_remove(&c->link);
wl_list_insert(&stack_head->link, &c->link);
if (c != stack_tail) {
wl_list_remove(&c->link);
wl_list_insert(&stack_tail->link, &c->link);
}
}
sync_scroller_state_to_clients(m, tag);
arrange(m, false, false);
@ -1862,6 +1874,11 @@ int32_t scroller_apply_stack(Client *c, Client *target_client,
/* 通过封装好的插入函数实现（尾部插入） */
scroller_insert_stack(c, tail->client, false);
if (c != tail->client) {
wl_list_remove(&c->link);
wl_list_insert(&tail->client->link, &c->link);
}
return 0;
}

45
src/layout/scroll.h
View file

@ -793,7 +793,12 @@ void scroller_insert_stack(Client *c, Client *target_client,
void scroller_drop_tile(Client *c, Client *closest, int vertical) {
// 必须先更新，不然里面节点还存着的是cnode的信息，
// 会造成stach_head/stack_tail指向的客户端不对
update_scroller_state(c->mon);
Client *stack_head = scroll_get_stack_head_client(closest);
Client *stack_tail = scroll_get_stack_tail_client(closest);
if (vertical) {
if (closest->drop_direction == LEFT) {
@ -805,11 +810,15 @@ void scroller_drop_tile(Client *c, Client *closest, int vertical) {
scroller_insert_stack(c, closest, false);
return;
} else if (closest->drop_direction == UP) {
wl_list_remove(&c->link);
wl_list_insert(stack_head->link.prev, &c->link);
if (c != stack_head) {
wl_list_remove(&c->link);
wl_list_insert(stack_head->link.prev, &c->link);
}
} else if (closest->drop_direction == DOWN) {
wl_list_remove(&c->link);
wl_list_insert(&stack_head->link, &c->link);
if (c != stack_tail) {
wl_list_remove(&c->link);
wl_list_insert(&stack_head->link, &c->link);
}
}
} else {
if (closest->drop_direction == UP) {
@ -821,11 +830,15 @@ void scroller_drop_tile(Client *c, Client *closest, int vertical) {
scroller_insert_stack(c, closest, false);
return;
} else if (closest->drop_direction == LEFT) {
wl_list_remove(&c->link);
wl_list_insert(stack_head->link.prev, &c->link);
if (c != stack_head) {
wl_list_remove(&c->link);
wl_list_insert(stack_head->link.prev, &c->link);
}
} else if (closest->drop_direction == RIGHT) {
wl_list_remove(&c->link);
wl_list_insert(&stack_head->link, &c->link);
if (c != stack_tail) {
wl_list_remove(&c->link);
wl_list_insert(&stack_head->link, &c->link);
}
}
}
@ -848,6 +861,22 @@ Client *scroll_get_stack_head_client(Client *c) {
return c;
}
Client *scroll_get_stack_tail_client(Client *c) {
if (!c || !c->mon)
return c;
uint32_t tag = c->mon->pertag->curtag;
struct TagScrollerState *st = c->mon->pertag->scroller_state[tag];
if (st) {
struct ScrollerStackNode *n = find_scroller_node(st, c);
if (n) {
while (n->next_in_stack)
n = n->next_in_stack;
return n->client;
}
}
return c;
}
static void update_scroller_state(Monitor *m) {
uint32_t tag = m->pertag->curtag;
struct TagScrollerState *st = ensure_scroller_state(m, tag);

1
src/mango.c
View file

@ -847,6 +847,7 @@ static void scroller_node_remove(struct TagScrollerState *st,
static struct ScrollerStackNode *
scroller_node_create(struct TagScrollerState *st, Client *c);
static void update_scroller_state(Monitor *m);
Client *scroll_get_stack_tail_client(Client *c);
#include "data/static_keymap.h"
#include "dispatch/bind_declare.h"