diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/config.h | 4 | ||||
| -rw-r--r-- | src/config_libconfig.c | 49 | ||||
| -rw-r--r-- | src/event.c | 18 | ||||
| -rw-r--r-- | src/picom.c | 4 |
4 files changed, 36 insertions, 39 deletions
diff --git a/src/config.h b/src/config.h index 2664435..e495d6e 100644 --- a/src/config.h +++ b/src/config.h @@ -80,8 +80,8 @@ typedef struct win_option { bool clip_shadow_above; enum open_window_animation animation; enum open_window_animation animation_unmap; - enum open_window_animation animation_workspace_in; - enum open_window_animation animation_workspace_out; + // enum open_window_animation animation_workspace_in; + // enum open_window_animation animation_workspace_out; } win_option_t; enum blur_method { diff --git a/src/config_libconfig.c b/src/config_libconfig.c index 02db3ef..f44049e 100644 --- a/src/config_libconfig.c +++ b/src/config_libconfig.c @@ -532,14 +532,13 @@ char *parse_config_libconfig(options_t *opt, const char *config_file, bool *shad opt->animation_for_open_window = animation; } // --animation-for-transient-window - // if (config_lookup_string(&cfg, "animation-for-transient-window", &sval)) { - // enum open_window_animation animation = parse_open_window_animation(sval); - // if (animation >= OPEN_WINDOW_ANIMATION_INVALID) { - // log_fatal("Invalid transient-window animation %s", sval); - // goto err; - // } - // opt->animation_for_transient_window = animation; - // } + if (config_lookup_string(&cfg, "animation-for-transient-window", &sval)) { + enum open_window_animation animation = parse_open_window_animation(sval); + if (animation) { + log_fatal("animation-for-transient-window is deprecated and can no longer be used. Please remove it remove your config. %s", sval); + goto err; + } + } // --animation-for-unmap-window if (config_lookup_string(&cfg, "animation-for-unmap-window", &sval)) { enum open_window_animation animation = parse_open_window_animation(sval); @@ -549,24 +548,22 @@ char *parse_config_libconfig(options_t *opt, const char *config_file, bool *shad } opt->animation_for_unmap_window = animation; } - // // --animation-for-workspace-switch-in - // if (config_lookup_string(&cfg, "animation-for-workspace-switch-in", &sval)) { - // enum open_window_animation animation = parse_open_window_animation(sval); - // if (animation >= OPEN_WINDOW_ANIMATION_INVALID) { - // log_fatal("Invalid workspace-switch-in animation %s", sval); - // goto err; - // } - // opt->animation_for_workspace_switch_in = animation; - // } - // // --animation-for-workspace-switch-out - // if (config_lookup_string(&cfg, "animation-for-workspace-switch-out", &sval)) { - // enum open_window_animation animation = parse_open_window_animation(sval); - // if (animation >= OPEN_WINDOW_ANIMATION_INVALID) { - // log_fatal("Invalid workspace-switch-out animation %s", sval); - // goto err; - // } - // opt->animation_for_workspace_switch_out = animation; - // } + // --animation-for-workspace-switch-in + if (config_lookup_string(&cfg, "animation-for-workspace-switch-in", &sval)) { + enum open_window_animation animation = parse_open_window_animation(sval); + if (animation) { + log_fatal("animation-for-workspace-switch-in is deprecated and can no longer be used. Please remove it remove your config. %s", sval); + goto err; + } + } + // --animation-for-workspace-switch-out + if (config_lookup_string(&cfg, "animation-for-workspace-switch-out", &sval)) { + enum open_window_animation animation = parse_open_window_animation(sval); + if (animation) { + log_fatal("animation-for-workspace-switch-out is deprecated and can no longer be used. Please remove it remove your config. %s", sval); + goto err; + } + } // --animation-stiffness config_lookup_float(&cfg, "animation-stiffness", &opt->animation_stiffness); // --animation-window-mass diff --git a/src/event.c b/src/event.c index e42001e..62f35e2 100644 --- a/src/event.c +++ b/src/event.c @@ -450,15 +450,15 @@ static inline void ev_property_notify(session_t *ps, xcb_property_notify_event_t if (ps->root == ev->window) { // If desktop number property changes - if (ev->atom == ps->atoms->a_NET_CURRENT_DESKTOP) { - auto prop = x_get_prop(ps->c, ps->root, ps->atoms->a_NET_CURRENT_DESKTOP, - 1L, XCB_ATOM_CARDINAL, 32); - - // if (prop.nitems) { - // ps->root_desktop_switch_direction = ((int)*prop.c32) - ps->root_desktop_num; - // ps->root_desktop_num = (int)*prop.c32; - // } - } + // if (ev->atom == ps->atoms->a_NET_CURRENT_DESKTOP) { + // auto prop = x_get_prop(ps->c, ps->root, ps->atoms->a_NET_CURRENT_DESKTOP, + // 1L, XCB_ATOM_CARDINAL, 32); + + // if (prop.nitems) { + // ps->root_desktop_switch_direction = ((int)*prop.c32) - ps->root_desktop_num; + // ps->root_desktop_num = (int)*prop.c32; + // } + // } if (ps->o.use_ewmh_active_win && ps->atoms->a_NET_ACTIVE_WINDOW == ev->atom) { // to update focus diff --git a/src/picom.c b/src/picom.c index bf49361..08a671a 100644 --- a/src/picom.c +++ b/src/picom.c @@ -607,8 +607,8 @@ static void configure_root(session_t *ps) { ps->root_width = r->width; ps->root_height = r->height; - auto prop = x_get_prop(ps->c, ps->root, ps->atoms->a_NET_CURRENT_DESKTOP, - 1L, XCB_ATOM_CARDINAL, 32); + // auto prop = x_get_prop(ps->c, ps->root, ps->atoms->a_NET_CURRENT_DESKTOP, + // 1L, XCB_ATOM_CARDINAL, 32); // ps->root_desktop_switch_direction = 0; // if (prop.nitems) { |