mirrors/maomaowm
1
0
Fork 0
mirror of https://github.com/DreamMaoMao/maomaowm.git synced 2025-10-31 22:25:29 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

change: isopenscratchpad windowrule change name to isnamedscratchpad

Browse source
This commit is contained in:
DreamMaoMao 2025-07-06 14:02:26 +08:00
parent 64682c1bd4
commit 3a5cd857f0
3 changed files with 38 additions and 40 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/config/parse_config.h
View file

@ -44,7 +44,7 @@ typedef struct {
const char *animation_type_close; const char *animation_type_close;
int isnoborder; int isnoborder;
int isopensilent; int isopensilent;
int isopenscratchpad; int isnamedscratchpad;
int isunglobal; int isunglobal;
int isglobal; int isglobal;
int isoverlay; int isoverlay;
@ -1384,7 +1384,7 @@ void parse_config_line(Config *config, const char *line) {
rule->isfullscreen = -1; rule->isfullscreen = -1;
rule->isnoborder = -1; rule->isnoborder = -1;
rule->isopensilent = -1; rule->isopensilent = -1;
rule->isopenscratchpad = -1; rule->isnamedscratchpad = -1;
rule->isunglobal = -1; rule->isunglobal = -1;
rule->isglobal = -1; rule->isglobal = -1;
rule->isoverlay = -1; rule->isoverlay = -1;
@ -1457,8 +1457,8 @@ void parse_config_line(Config *config, const char *line) {
rule->isnoborder = atoi(val); rule->isnoborder = atoi(val);
} else if (strcmp(key, "isopensilent") == 0) { } else if (strcmp(key, "isopensilent") == 0) {
rule->isopensilent = atoi(val); rule->isopensilent = atoi(val);
} else if (strcmp(key, "isopenscratchpad") == 0) { } else if (strcmp(key, "isnamedscratchpad") == 0) {
rule->isopenscratchpad = atoi(val); rule->isnamedscratchpad = atoi(val);
} else if (strcmp(key, "isunglobal") == 0) { } else if (strcmp(key, "isunglobal") == 0) {
rule->isunglobal = atoi(val); rule->isunglobal = atoi(val);
} else if (strcmp(key, "isglobal") == 0) { } else if (strcmp(key, "isglobal") == 0) {

2
src/ext-protocol/foreign-toplevel.h
View file

@ -24,7 +24,7 @@ void handle_foreign_activate_request(struct wl_listener *listener, void *data) {
if (c->isminied) { if (c->isminied) {
c->is_in_scratchpad = 0; c->is_in_scratchpad = 0;
c->isnamedscratchpand = 0; c->isnamedscratchpad = 0;
c->is_scratchpad_show = 0; c->is_scratchpad_show = 0;
setborder_color(c); setborder_color(c);
show_hide_client(c); show_hide_client(c);

68
src/maomao.c
View file

@ -225,8 +225,8 @@ typedef struct Client Client;
struct Client { struct Client {
/* Must keep these three elements in this order */ /* Must keep these three elements in this order */
unsigned int type; /* XDGShell or X11* */ unsigned int type; /* XDGShell or X11* */
struct wlr_box geom, pending, oldgeom, scratchpad_geom, animainit_geom, struct wlr_box geom, pending, oldgeom, animainit_geom, overview_backup_geom,
overview_backup_geom, current; /* layout-relative, includes border */ current; /* layout-relative, includes border */
Monitor *mon; Monitor *mon;
struct wlr_scene_tree *scene; struct wlr_scene_tree *scene;
struct wlr_scene_rect *border; /* top, bottom, left, right */ struct wlr_scene_rect *border; /* top, bottom, left, right */
@ -284,9 +284,8 @@ struct Client {
int isglobal; int isglobal;
int isnoborder; int isnoborder;
int isopensilent; int isopensilent;
int isopenscratchpad;
int iskilling; int iskilling;
int isnamedscratchpand; int isnamedscratchpad;
struct wlr_box bounds; struct wlr_box bounds;
bool is_open_animation; bool is_open_animation;
bool is_restoring_from_ov; bool is_restoring_from_ov;
@ -306,6 +305,7 @@ struct Client {
float focused_opacity; float focused_opacity;
float unfocused_opacity; float unfocused_opacity;
char oldmonname[128]; char oldmonname[128];
int scratchpad_width, scratchpad_height;
}; };
typedef struct { typedef struct {
@ -1714,7 +1714,7 @@ void restore_minized(const Arg *arg) {
selmon->sel->isminied = 0; selmon->sel->isminied = 0;
selmon->sel->is_scratchpad_show = 0; selmon->sel->is_scratchpad_show = 0;
selmon->sel->is_in_scratchpad = 0; selmon->sel->is_in_scratchpad = 0;
selmon->sel->isnamedscratchpand = 0; selmon->sel->isnamedscratchpad = 0;
setborder_color(selmon->sel); setborder_color(selmon->sel);
return; return;
} }
@ -1725,7 +1725,7 @@ void restore_minized(const Arg *arg) {
show_hide_client(c); show_hide_client(c);
c->is_scratchpad_show = 0; c->is_scratchpad_show = 0;
c->is_in_scratchpad = 0; c->is_in_scratchpad = 0;
c->isnamedscratchpand = 0; c->isnamedscratchpad = 0;
setborder_color(c); setborder_color(c);
break; break;
} }
@ -1743,11 +1743,11 @@ void show_scratchpad(Client *c) {
/* return if fullscreen */ /* return if fullscreen */
if (!c->isfloating) { if (!c->isfloating) {
setfloating(c, 1); setfloating(c, 1);
c->geom.width = c->scratchpad_geom.width c->geom.width = c->scratchpad_width
? c->scratchpad_geom.width ? c->scratchpad_width
: c->mon->w.width * scratchpad_width_ratio; : c->mon->w.width * scratchpad_width_ratio;
c->geom.height = c->scratchpad_geom.height c->geom.height = c->scratchpad_height
? c->scratchpad_geom.height ? c->scratchpad_height
: c->mon->w.height * scratchpad_height_ratio; : c->mon->w.height * scratchpad_height_ratio;
// 重新计算居中的坐标 // 重新计算居中的坐标
c->oldgeom = c->geom = c->animainit_geom = c->animation.current = c->oldgeom = c->geom = c->animainit_geom = c->animation.current =
@ -1924,9 +1924,9 @@ void toggle_named_scratchpad(const Arg *arg) {
return; return;
} }
target_client->isnamedscratchpand = 1; target_client->isnamedscratchpad = 1;
target_client->scratchpad_geom.width = arg->ui; target_client->scratchpad_width = arg->ui;
target_client->scratchpad_geom.height = arg->ui2; target_client->scratchpad_height = arg->ui2;
apply_named_scratchpad(target_client); apply_named_scratchpad(target_client);
} }
@ -1940,12 +1940,12 @@ void toggle_scratchpad(const Arg *arg) {
continue; continue;
} }
if (single_scratchpad && c->isnamedscratchpand && !c->isminied) { if (single_scratchpad && c->isnamedscratchpad && !c->isminied) {
set_minized(c); set_minized(c);
continue; continue;
} }
if (c->isnamedscratchpand) if (c->isnamedscratchpad)
continue; continue;
if (hit) if (hit)
@ -2086,30 +2086,21 @@ static void apply_rule_properties(Client *c, const ConfigWinRule *r) {
APPLY_INT_PROP(isfullscreen, >= 0); APPLY_INT_PROP(isfullscreen, >= 0);
APPLY_INT_PROP(isnoborder, >= 0); APPLY_INT_PROP(isnoborder, >= 0);
APPLY_INT_PROP(isopensilent, >= 0); APPLY_INT_PROP(isopensilent, >= 0);
APPLY_INT_PROP(isopenscratchpad, >= 0); APPLY_INT_PROP(isnamedscratchpad, >= 0);
APPLY_INT_PROP(isglobal, >= 0); APPLY_INT_PROP(isglobal, >= 0);
APPLY_INT_PROP(isoverlay, >= 0); APPLY_INT_PROP(isoverlay, >= 0);
APPLY_INT_PROP(isunglobal, >= 0); APPLY_INT_PROP(isunglobal, >= 0);
APPLY_INT_PROP(scratchpad_width, >= 0);
APPLY_INT_PROP(scratchpad_height, >= 0);
APPLY_FLOAT_PROP(scroller_proportion, > 0.0f); APPLY_FLOAT_PROP(scroller_proportion, > 0.0f);
APPLY_FLOAT_PROP(focused_opacity, > 0.0f); APPLY_FLOAT_PROP(focused_opacity, > 0.0f);
APPLY_FLOAT_PROP(unfocused_opacity, > 0.0f); APPLY_FLOAT_PROP(unfocused_opacity, > 0.0f);
if (r->scratchpad_width > 0)
c->scratchpad_geom.width = r->scratchpad_width;
if (r->scratchpad_height > 0)
c->scratchpad_geom.height = r->scratchpad_height;
if (r->animation_type_open) if (r->animation_type_open)
c->animation_type_open = r->animation_type_open; c->animation_type_open = r->animation_type_open;
if (r->animation_type_close) if (r->animation_type_close)
c->animation_type_close = r->animation_type_close; c->animation_type_close = r->animation_type_close;
if (c->isopenscratchpad == 1) {
c->isfloating = 1;
} else if (c->isopenscratchpad == 2) {
c->isnamedscratchpand = 1;
}
} }
int applyrulesgeom(Client *c) { int applyrulesgeom(Client *c) {
@ -2232,7 +2223,12 @@ void applyrules(Client *c) {
} }
} }
// set mon and floating and fullscreen state // set mon and floating, fullscreen and scratchpad state
if (c->isnamedscratchpad) {
c->isfloating = 1;
}
int fullscreen_state_backup = c->isfullscreen; int fullscreen_state_backup = c->isfullscreen;
setmon(c, mon, newtags, !c->isopensilent); setmon(c, mon, newtags, !c->isopensilent);
@ -2256,7 +2252,7 @@ void applyrules(Client *c) {
} }
// apply named scratchpad rule // apply named scratchpad rule
if (c->isopenscratchpad) { if (c->isnamedscratchpad) {
apply_named_scratchpad(c); apply_named_scratchpad(c);
} }
@ -5075,7 +5071,7 @@ mapnotify(struct wl_listener *listener, void *data) {
c->isoverlay = 0; c->isoverlay = 0;
c->isunglobal = 0; c->isunglobal = 0;
c->is_in_scratchpad = 0; c->is_in_scratchpad = 0;
c->isnamedscratchpand = 0; c->isnamedscratchpad = 0;
c->is_scratchpad_show = 0; c->is_scratchpad_show = 0;
c->need_float_size_reduce = 0; c->need_float_size_reduce = 0;
c->is_clip_to_hide = 0; c->is_clip_to_hide = 0;
@ -5091,6 +5087,8 @@ mapnotify(struct wl_listener *listener, void *data) {
c->nofadein = 0; c->nofadein = 0;
c->nofadeout = 0; c->nofadeout = 0;
c->no_force_center = 0; c->no_force_center = 0;
c->scratchpad_width = 0;
c->scratchpad_height = 0;
if (new_is_master && selmon && !is_scroller_layout(selmon)) if (new_is_master && selmon && !is_scroller_layout(selmon))
// tile at the top // tile at the top
@ -6179,7 +6177,7 @@ setfloating(Client *c, int floating) {
c->need_float_size_reduce = 1; c->need_float_size_reduce = 1;
c->is_scratchpad_show = 0; c->is_scratchpad_show = 0;
c->is_in_scratchpad = 0; c->is_in_scratchpad = 0;
c->isnamedscratchpand = 0; c->isnamedscratchpad = 0;
// 让当前tag中的全屏窗口退出全屏参与平铺 // 让当前tag中的全屏窗口退出全屏参与平铺
wl_list_for_each(fc, &clients, link) if (fc && fc != c && wl_list_for_each(fc, &clients, link) if (fc && fc != c &&
c->tags & fc->tags && c->tags & fc->tags &&
@ -7486,7 +7484,7 @@ void togglefullscreen(const Arg *arg) {
sel->is_scratchpad_show = 0; sel->is_scratchpad_show = 0;
sel->is_in_scratchpad = 0; sel->is_in_scratchpad = 0;
sel->isnamedscratchpand = 0; sel->isnamedscratchpad = 0;
} }
void togglemaxmizescreen(const Arg *arg) { void togglemaxmizescreen(const Arg *arg) {
@ -7504,7 +7502,7 @@ void togglemaxmizescreen(const Arg *arg) {
sel->is_scratchpad_show = 0; sel->is_scratchpad_show = 0;
sel->is_in_scratchpad = 0; sel->is_in_scratchpad = 0;
sel->isnamedscratchpand = 0; sel->isnamedscratchpad = 0;
} }
void togglegaps(const Arg *arg) { void togglegaps(const Arg *arg) {
@ -8266,7 +8264,7 @@ void toggleglobal(const Arg *arg) {
if (selmon->sel->is_in_scratchpad) { if (selmon->sel->is_in_scratchpad) {
selmon->sel->is_in_scratchpad = 0; selmon->sel->is_in_scratchpad = 0;
selmon->sel->is_scratchpad_show = 0; selmon->sel->is_scratchpad_show = 0;
selmon->sel->isnamedscratchpand = 0; selmon->sel->isnamedscratchpad = 0;
} }
selmon->sel->isglobal ^= 1; selmon->sel->isglobal ^= 1;
// selmon->sel->tags = // selmon->sel->tags =
@ -8564,7 +8562,7 @@ void activatex11(struct wl_listener *listener, void *data) {
c->tags = c->mini_restore_tag; c->tags = c->mini_restore_tag;
c->is_scratchpad_show = 0; c->is_scratchpad_show = 0;
c->is_in_scratchpad = 0; c->is_in_scratchpad = 0;
c->isnamedscratchpand = 0; c->isnamedscratchpad = 0;
wlr_foreign_toplevel_handle_v1_set_minimized(c->foreign_toplevel, wlr_foreign_toplevel_handle_v1_set_minimized(c->foreign_toplevel,
false); false);
setborder_color(c); setborder_color(c);