diff options
| author | okan <okan> | 2019-03-04 14:48:59 +0000 |
|---|---|---|
| committer | okan <okan> | 2019-03-04 14:48:59 +0000 |
| commit | 9d5b0e5d22fca1b6fb37a8df906bdad0317238c9 (patch) | |
| tree | 18434df273f1c57b7815b0c23dd7057bf86d6069 | |
| parent | fda68a40de36baebe1c27b91a49c7ee062555103 (diff) | |
| download | cwm-9d5b0e5d22fca1b6fb37a8df906bdad0317238c9.tar.gz cwm-9d5b0e5d22fca1b6fb37a8df906bdad0317238c9.tar.xz cwm-9d5b0e5d22fca1b6fb37a8df906bdad0317238c9.zip | |
fix a few misplaced (and misnamed) ewmh root window functions
| -rw-r--r-- | calmwm.h | 4 | ||||
| -rw-r--r-- | screen.c | 4 | ||||
| -rw-r--r-- | xutil.c | 22 |
3 files changed, 15 insertions, 15 deletions
diff --git a/calmwm.h b/calmwm.h index b6fa48f..32b7341 100644 --- a/calmwm.h +++ b/calmwm.h @@ -568,13 +568,13 @@ void xu_xorcolor(XftColor, XftColor, XftColor *); void xu_ewmh_net_supported(struct screen_ctx *); void xu_ewmh_net_supported_wm_check(struct screen_ctx *); void xu_ewmh_net_desktop_geometry(struct screen_ctx *); +void xu_ewmh_net_desktop_viewport(struct screen_ctx *); void xu_ewmh_net_workarea(struct screen_ctx *); void xu_ewmh_net_client_list(struct screen_ctx *); void xu_ewmh_net_client_list_stacking(struct screen_ctx *); void xu_ewmh_net_active_window(struct screen_ctx *, Window); Window xu_ewmh_get_net_active_window(struct screen_ctx *); -void xu_ewmh_net_wm_desktop_viewport(struct screen_ctx *); -void xu_ewmh_net_wm_number_of_desktops(struct screen_ctx *); +void xu_ewmh_net_number_of_desktops(struct screen_ctx *); void xu_ewmh_net_showing_desktop(struct screen_ctx *); void xu_ewmh_net_virtual_roots(struct screen_ctx *); void xu_ewmh_net_current_desktop(struct screen_ctx *); diff --git a/screen.c b/screen.c index f70c02e..a449219 100644 --- a/screen.c +++ b/screen.c @@ -63,8 +63,7 @@ screen_init(int which) screen_update_geometry(sc); xu_ewmh_net_desktop_names(sc); - xu_ewmh_net_wm_desktop_viewport(sc); - xu_ewmh_net_wm_number_of_desktops(sc); + xu_ewmh_net_number_of_desktops(sc); xu_ewmh_net_showing_desktop(sc); xu_ewmh_net_virtual_roots(sc); active = xu_ewmh_get_net_active_window(sc); @@ -214,6 +213,7 @@ screen_update_geometry(struct screen_ctx *sc) } xu_ewmh_net_desktop_geometry(sc); + xu_ewmh_net_desktop_viewport(sc); xu_ewmh_net_workarea(sc); } diff --git a/xutil.c b/xutil.c index 7fd3115..d0b5111 100644 --- a/xutil.c +++ b/xutil.c @@ -129,6 +129,16 @@ xu_ewmh_net_desktop_geometry(struct screen_ctx *sc) } void +xu_ewmh_net_desktop_viewport(struct screen_ctx *sc) +{ + long viewports[2] = {0, 0}; + + /* We don't support large desktops, so this is (0, 0). */ + XChangeProperty(X_Dpy, sc->rootwin, ewmh[_NET_DESKTOP_VIEWPORT], + XA_CARDINAL, 32, PropModeReplace, (unsigned char *)viewports, 2); +} + +void xu_ewmh_net_workarea(struct screen_ctx *sc) { unsigned long *workarea; @@ -212,17 +222,7 @@ xu_ewmh_get_net_active_window(struct screen_ctx *sc) } void -xu_ewmh_net_wm_desktop_viewport(struct screen_ctx *sc) -{ - long viewports[2] = {0, 0}; - - /* We don't support large desktops, so this is (0, 0). */ - XChangeProperty(X_Dpy, sc->rootwin, ewmh[_NET_DESKTOP_VIEWPORT], - XA_CARDINAL, 32, PropModeReplace, (unsigned char *)viewports, 2); -} - -void -xu_ewmh_net_wm_number_of_desktops(struct screen_ctx *sc) +xu_ewmh_net_number_of_desktops(struct screen_ctx *sc) { long ndesks = Conf.ngroups; |