kill _CWM_GRP atom setting. The netwm stuff does us well enough now that

it's superfluous.

ok okan@

3 files changed, 21 insertions, 38 deletions

diff --git a/app/cwm/calmwm.h b/app/cwm/calmwm.h
index 902ea57b5..4657a9482 100644
--- a/app/cwm/calmwm.h
+++ b/app/cwm/calmwm.h
@@ -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.
  *
- * $Id: calmwm.h,v 1.109 2009/12/11 18:09:16 oga Exp $
+ * $Id: calmwm.h,v 1.110 2009/12/14 16:39:01 oga Exp $
  */
 
 #ifndef _CALMWM_H_
@@ -522,29 +522,28 @@ extern struct conf			 Conf;
 #define WM_TAKE_FOCUS			 cwm_atoms[2]
 #define WM_PROTOCOLS			 cwm_atoms[3]
 #define _MOTIF_WM_HINTS			 cwm_atoms[4]
-#define	_CWM_GRP			 cwm_atoms[5]
-#define	UTF8_STRING			 cwm_atoms[6]
+#define	UTF8_STRING			 cwm_atoms[5]
 /*
  * please make all hints below this point netwm hints, starting with
  * _NET_SUPPORTED. If you change other hints make sure you update
  * CWM_NETWM_START
  */
-#define	_NET_SUPPORTED			 cwm_atoms[7]
-#define	_NET_SUPPORTING_WM_CHECK	 cwm_atoms[8]
-#define	_NET_WM_NAME			 cwm_atoms[9]
-#define	_NET_ACTIVE_WINDOW		 cwm_atoms[10]
-#define	_NET_CLIENT_LIST		 cwm_atoms[11]
-#define	_NET_NUMBER_OF_DESKTOPS		 cwm_atoms[12]
-#define	_NET_CURRENT_DESKTOP		 cwm_atoms[13]
-#define	_NET_DESKTOP_VIEWPORT		 cwm_atoms[14]
-#define	_NET_DESKTOP_GEOMETRY		 cwm_atoms[15]
-#define	_NET_VIRTUAL_ROOTS		 cwm_atoms[16]
-#define	_NET_SHOWING_DESKTOP		 cwm_atoms[17]
-#define	_NET_DESKTOP_NAMES		 cwm_atoms[18]
-#define _NET_WM_DESKTOP			 cwm_atoms[19]
-#define	_NET_WORKAREA			 cwm_atoms[20]
-#define CWM_NO_ATOMS			 21
-#define CWM_NETWM_START			 7
+#define	_NET_SUPPORTED			 cwm_atoms[6]
+#define	_NET_SUPPORTING_WM_CHECK	 cwm_atoms[7]
+#define	_NET_WM_NAME			 cwm_atoms[8]
+#define	_NET_ACTIVE_WINDOW		 cwm_atoms[9]
+#define	_NET_CLIENT_LIST		 cwm_atoms[10]
+#define	_NET_NUMBER_OF_DESKTOPS		 cwm_atoms[11]
+#define	_NET_CURRENT_DESKTOP		 cwm_atoms[12]
+#define	_NET_DESKTOP_VIEWPORT		 cwm_atoms[13]
+#define	_NET_DESKTOP_GEOMETRY		 cwm_atoms[14]
+#define	_NET_VIRTUAL_ROOTS		 cwm_atoms[15]
+#define	_NET_SHOWING_DESKTOP		 cwm_atoms[16]
+#define	_NET_DESKTOP_NAMES		 cwm_atoms[17]
+#define	_NET_WM_DESKTOP			 cwm_atoms[18]
+#define	_NET_WORKAREA			 cwm_atoms[19]
+#define CWM_NO_ATOMS			 20
+#define CWM_NETWM_START			 6
 
 extern Atom				 cwm_atoms[CWM_NO_ATOMS];
 
diff --git a/app/cwm/group.c b/app/cwm/group.c
index 1554b31b7..cd996ed0a 100644
--- a/app/cwm/group.c
+++ b/app/cwm/group.c
@@ -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.
  *
- * $Id: group.c,v 1.38 2009/12/11 17:55:42 oga Exp $
+ * $Id: group.c,v 1.39 2009/12/14 16:39:01 oga Exp $
  */
 
 #include "headers.h"
@@ -50,9 +50,6 @@ group_add(struct group_ctx *gc, struct client_ctx *cc)
 	if (cc->group != NULL)
 		TAILQ_REMOVE(&cc->group->clients, cc, group_entry);
 
-	XChangeProperty(X_Dpy, cc->win, _CWM_GRP, XA_STRING,
-	    8, PropModeReplace, shortcut_to_name[gc->shortcut],
-	    strlen(shortcut_to_name[gc->shortcut]));
 	XChangeProperty(X_Dpy, cc->win, _NET_WM_DESKTOP, XA_CARDINAL,
 	    32, PropModeReplace, (unsigned char *)&no, 1);
 
@@ -68,9 +65,6 @@ group_remove(struct client_ctx *cc)
 	if (cc == NULL || cc->group == NULL)
 		errx(1, "group_remove: a ctx is NULL");
 
-	XChangeProperty(X_Dpy, cc->win, _CWM_GRP, XA_STRING, 8,
-	    PropModeReplace, shortcut_to_name[0],
-	    strlen(shortcut_to_name[0]));
 	XChangeProperty(X_Dpy, cc->win, _NET_WM_DESKTOP, XA_CARDINAL,
 	    32, PropModeReplace, (unsigned char *)&no, 1);
 
@@ -418,9 +412,8 @@ group_autogroup(struct client_ctx *cc)
 	struct screen_ctx	*sc = cc->sc;
 	struct autogroupwin	*aw;
 	struct group_ctx	*gc;
-	int			 no = -1, i;
+	int			 no = -1;
 	long			*grpno;
-	unsigned char		*grpstr = NULL;
 
 	if (cc->app_class == NULL || cc->app_name == NULL)
 		return;
@@ -433,14 +426,6 @@ group_autogroup(struct client_ctx *cc)
 		else
 			no = *grpno + 1;
 		XFree(grpno);
-	} else if (xu_getprop(cc, _CWM_GRP,  XA_STRING,
-	    (CALMWM_MAXNAMELEN - 1)/sizeof(long), &grpstr) > 0) {
-		for (i = 0; i < sizeof(shortcut_to_name) /
-		    sizeof(shortcut_to_name[0]); i++) {
-			if (strcmp(shortcut_to_name[i], grpstr) == 0)
-				no = i;
-		}
-		XFree(grpstr);
 	} else {
 		TAILQ_FOREACH(aw, &Conf.autogroupq, entry) {
 			if (strcmp(aw->class, cc->app_class) == 0 &&
diff --git a/app/cwm/xutil.c b/app/cwm/xutil.c
index 635eb2e98..f0d3d715f 100644
--- a/app/cwm/xutil.c
+++ b/app/cwm/xutil.c
@@ -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.
  *
- * $Id: xutil.c,v 1.26 2009/12/11 18:09:16 oga Exp $
+ * $Id: xutil.c,v 1.27 2009/12/14 16:39:01 oga Exp $
  */
 
 #include "headers.h"
@@ -176,7 +176,6 @@ char 		*atoms[CWM_NO_ATOMS] = {
 	"WM_TAKE_FOCUS",
 	"WM_PROTOCOLS",
 	"_MOTIF_WM_HINTS",
-	"_CWM_GRP",
 	"UTF8_STRING",
 	"_NET_SUPPORTED",
 	"_NET_SUPPORTING_WM_CHECK",