opt: optimize selmon judge

This commit is contained in:
DreamMaoMao 2025-03-25 21:05:26 +08:00
parent c8dbe8bba4
commit 4102bd7dab

View file

@ -3487,7 +3487,7 @@ keypress(struct wl_listener *listener, void *data)
event->state == WL_KEYBOARD_KEY_STATE_RELEASED && event->state == WL_KEYBOARD_KEY_STATE_RELEASED &&
(keycode == 133 || keycode == 37 || keycode == 64 || keycode == 50 || (keycode == 133 || keycode == 37 || keycode == 64 || keycode == 50 ||
keycode == 134 || keycode == 105 || keycode == 108 || keycode == 62) && keycode == 134 || keycode == 105 || keycode == 108 || keycode == 62) &&
selmon->sel) { selmon && selmon->sel) {
if (selmon->isoverview && selmon->sel) { if (selmon->isoverview && selmon->sel) {
toggleoverview(&(Arg){.i = -1}); toggleoverview(&(Arg){.i = -1});
} }
@ -3497,7 +3497,7 @@ keypress(struct wl_listener *listener, void *data)
if (!locked && event->state == WL_KEYBOARD_KEY_STATE_RELEASED && if (!locked && event->state == WL_KEYBOARD_KEY_STATE_RELEASED &&
(keycode == 133 || keycode == 37 || keycode == 64 || keycode == 50 || (keycode == 133 || keycode == 37 || keycode == 64 || keycode == 50 ||
keycode == 134 || keycode == 105 || keycode == 108 || keycode == 62) && keycode == 134 || keycode == 105 || keycode == 108 || keycode == 62) &&
selmon->sel) { selmon && selmon->sel) {
dwl_input_method_relay_set_focus(input_relay, client_surface(selmon->sel)); dwl_input_method_relay_set_focus(input_relay, client_surface(selmon->sel));
} }
#endif #endif
@ -4908,7 +4908,9 @@ void setsmfact(const Arg *arg) {
arrange(selmon, false); arrange(selmon, false);
} }
void setmon(Client *c, Monitor *m, uint32_t newtags) { void
setmon(Client *c, Monitor *m, uint32_t newtags)
{
Monitor *oldmon = c->mon; Monitor *oldmon = c->mon;
if (oldmon == m) if (oldmon == m)
@ -4922,9 +4924,7 @@ void setmon(Client *c, Monitor *m, uint32_t newtags) {
if (m) { if (m) {
/* Make sure window actually overlaps with the monitor */ /* Make sure window actually overlaps with the monitor */
resize(c, c->geom, 0); resize(c, c->geom, 0);
c->tags = newtags c->tags = newtags ? newtags : m->tagset[m->seltags]; /* assign tags of target monitor */
? newtags
: m->tagset[m->seltags]; /* assign tags of target monitor */
setfullscreen(c, c->isfullscreen); /* This will call arrange(c->mon) */ setfullscreen(c, c->isfullscreen); /* This will call arrange(c->mon) */
setfloating(c, c->isfloating); setfloating(c, c->isfloating);
} }