Update _NET_CURRENT_DESKTOP with the screen's group_active->num.

This commit is contained in:
okan
2014-09-23 14:25:08 +00:00
parent b9aa350408
commit 9cd0504ba3
3 changed files with 11 additions and 9 deletions

View File

@@ -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.280 2014/09/23 13:45:48 okan Exp $
* $OpenBSD: calmwm.h,v 1.281 2014/09/23 14:25:08 okan Exp $
*/
#ifndef _CALMWM_H_
@@ -544,7 +544,7 @@ 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_showing_desktop(struct screen_ctx *);
void xu_ewmh_net_virtual_roots(struct screen_ctx *);
void xu_ewmh_net_current_desktop(struct screen_ctx *, long);
void xu_ewmh_net_current_desktop(struct screen_ctx *);
void xu_ewmh_net_desktop_names(struct screen_ctx *);
void xu_ewmh_net_wm_desktop(struct client_ctx *);

View File

@@ -16,7 +16,7 @@
* ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*
* $OpenBSD: group.c,v 1.105 2014/09/23 13:45:48 okan Exp $
* $OpenBSD: group.c,v 1.106 2014/09/23 14:25:08 okan Exp $
*/
#include <sys/param.h>
@@ -34,7 +34,7 @@
static void group_assign(struct group_ctx *, struct client_ctx *);
static void group_restack(struct group_ctx *);
static void group_setactive(struct screen_ctx *, long);
static void group_setactive(struct screen_ctx *, int);
const char *num_to_name[] = {
"nogroup", "one", "two", "three", "four", "five", "six",
@@ -132,7 +132,7 @@ group_init(struct screen_ctx *sc)
}
static void
group_setactive(struct screen_ctx *sc, long idx)
group_setactive(struct screen_ctx *sc, int idx)
{
struct group_ctx *gc;
@@ -142,7 +142,7 @@ group_setactive(struct screen_ctx *sc, long idx)
}
sc->group_active = gc;
xu_ewmh_net_current_desktop(sc, idx);
xu_ewmh_net_current_desktop(sc);
}
void

View File

@@ -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.95 2014/09/17 18:41:44 okan Exp $
* $OpenBSD: xutil.c,v 1.96 2014/09/23 14:25:08 okan Exp $
*/
#include <sys/param.h>
@@ -274,10 +274,12 @@ xu_ewmh_net_virtual_roots(struct screen_ctx *sc)
}
void
xu_ewmh_net_current_desktop(struct screen_ctx *sc, long idx)
xu_ewmh_net_current_desktop(struct screen_ctx *sc)
{
long num = sc->group_active->num;
XChangeProperty(X_Dpy, sc->rootwin, ewmh[_NET_CURRENT_DESKTOP],
XA_CARDINAL, 32, PropModeReplace, (unsigned char *)&idx, 1);
XA_CARDINAL, 32, PropModeReplace, (unsigned char *)&num, 1);
}
void