diff options
| -rw-r--r-- | calmwm.h | 6 | ||||
| -rw-r--r-- | screen.c | 6 | ||||
| -rw-r--r-- | xutil.c | 24 |
3 files changed, 18 insertions, 18 deletions
@@ -15,7 +15,7 @@ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * - * $OpenBSD: calmwm.h,v 1.366 2019/03/01 14:32:01 okan Exp $ + * $OpenBSD: calmwm.h,v 1.367 2019/03/04 14:48:59 okan Exp $ */ #ifndef _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 *); @@ -15,7 +15,7 @@ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * - * $OpenBSD: screen.c,v 1.90 2019/03/04 14:36:02 okan Exp $ + * $OpenBSD: screen.c,v 1.91 2019/03/04 14:48:59 okan Exp $ */ #include <sys/types.h> @@ -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); } @@ -15,7 +15,7 @@ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * - * $OpenBSD: xutil.c,v 1.109 2017/12/19 14:30:53 okan Exp $ + * $OpenBSD: xutil.c,v 1.110 2019/03/04 14:48:59 okan Exp $ */ #include <sys/types.h> @@ -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; |