mirrors/maomaowm
1
0
Fork 0
mirror of https://github.com/DreamMaoMao/maomaowm.git synced 2025-11-21 06:59:53 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

opt:The minimization and activation request logic is more robust

Browse source
This commit is contained in:
DreamMaoMao 2025-04-16 23:15:58 +08:00
parent bfe792a00b
commit d3412dd91e
1 changed files with 12 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

14
maomao.c
View file

@ -219,7 +219,7 @@ struct Client {
struct wl_listener set_hints;
#endif
unsigned int bw;
unsigned int tags, oldtags;
unsigned int tags, oldtags, mini_restore_tag;
bool dirty;
uint32_t configure_serial;
struct wlr_foreign_toplevel_handle_v1 *foreign_toplevel;
@ -4166,6 +4166,7 @@ void set_minized(Client *c) {
}
c->is_scratchpad_show = 0;
c->oldtags = c->mon->sel->tags;
c->mini_restore_tag = c->tags;
c->tags = 0;
c->isminied = 1;
c->is_in_scratchpad = 1;
@ -4195,7 +4196,7 @@ minimizenotify(struct wl_listener *listener, void *data) {
// togglemaxmizescreen(&(Arg){0});
Client *c = wl_container_of(listener, c, minimize);
if (!c || !c->mon || c->iskilling)
if (!c || !c->mon || c->iskilling || c->isminied)
return;
set_minized(c);
@ -7305,6 +7306,15 @@ void activatex11(struct wl_listener *listener, void *data) {
return;
if (focus_on_activate && c != selmon->sel) {
if(c->isminied) {
c->isminied = 0;
c->tags = c->mini_restore_tag;
c->is_scratchpad_show = 0;
c->is_in_scratchpad = 0;
wlr_foreign_toplevel_handle_v1_set_minimized(c->foreign_toplevel, false);
wlr_foreign_toplevel_handle_v1_set_activated(c->foreign_toplevel, true);
setborder_color(c);
}
view(&(Arg){.ui = c->tags}, true);
focusclient(c, 1);
} else if (c != focustop(selmon)) {