diff --git a/maomao.c b/maomao.c index 98bff527..ef7ce5f0 100644 --- a/maomao.c +++ b/maomao.c @@ -3487,7 +3487,7 @@ keypress(struct wl_listener *listener, void *data) event->state == WL_KEYBOARD_KEY_STATE_RELEASED && (keycode == 133 || keycode == 37 || keycode == 64 || keycode == 50 || keycode == 134 || keycode == 105 || keycode == 108 || keycode == 62) && - selmon->sel) { + selmon && selmon->sel) { if (selmon->isoverview && selmon->sel) { toggleoverview(&(Arg){.i = -1}); } @@ -6337,8 +6337,10 @@ updatemons(struct wl_listener *listener, void *data) if (selmon && selmon->wlr_output->enabled) { wl_list_for_each(c, &clients, link) { - if (!c->mon && client_surface(c)->mapped) + if (!c->mon && client_surface(c)->mapped) { setmon(c, selmon, c->tags); + reset_foreign_tolevel(c); + } } focusclient(focustop(selmon), 1); if (selmon->lock_surface) { diff --git a/preset_config.h b/preset_config.h index 9073eac6..535655cd 100644 --- a/preset_config.h +++ b/preset_config.h @@ -29,7 +29,7 @@ double default_mfact = 0.55f; // master 窗口比例 double default_smfact = 0.5f; // 第一个stack窗口比例 unsigned int default_nmaster = 1; // 默认master数量 /* logging */ -int log_level = WLR_DEBUG; +int log_level = WLR_ERROR; unsigned int numlockon = 1; // 是否打开右边小键盘 unsigned int capslock = 0; // 是否启用快捷键