From 22295948ecf72686eae62738ab1e6531e50c66a2 Mon Sep 17 00:00:00 2001
From: Martin Duquesnoy <xorg62@gmail.com>
Date: Thu, 18 Nov 2010 19:12:10 +0100
Subject: [PATCH] Ewmh: Remove _NET_WORKAREA support, Fix bug #58 signaled by
 Kernald.

---
 src/event.c   |  1 -
 src/ewmh.c    | 33 ---------------------------------
 src/infobar.c |  1 -
 src/screen.c  |  1 -
 src/structs.h |  1 -
 src/wmfs.h    |  1 -
 6 files changed, 38 deletions(-)

diff --git a/src/event.c b/src/event.c
index d7da88e..94eb603 100644
--- a/src/event.c
+++ b/src/event.c
@@ -275,7 +275,6 @@ clientmessageevent(XClientMessageEvent *ev)
           ewmh_get_client_list();
           ewmh_get_desktop_names();
           ewmh_set_desktop_geometry();
-          ewmh_set_workarea();
           screen_count();
           screen_get_sel();
      }
diff --git a/src/ewmh.c b/src/ewmh.c
index eae2d50..90acb21 100644
--- a/src/ewmh.c
+++ b/src/ewmh.c
@@ -60,7 +60,6 @@ ewmh_init_hints(void)
      net_atom[net_current_desktop]            = ATOM("_NET_CURRENT_DESKTOP");
      net_atom[net_desktop_names]              = ATOM("_NET_DESKTOP_NAMES");
      net_atom[net_desktop_geometry]           = ATOM("_NET_DESKTOP_GEOMETRY");
-     net_atom[net_workarea]                   = ATOM("_NET_WORKAREA");
      net_atom[net_active_window]              = ATOM("_NET_ACTIVE_WINDOW");
      net_atom[net_close_window]               = ATOM("_NET_CLOSE_WINDOW");
      net_atom[net_wm_name]                    = ATOM("_NET_WM_NAME");
@@ -319,38 +318,6 @@ ewmh_set_desktop_geometry(void)
      return;
 }
 
-/** Manage _NET_WORKAREA
-*/
-void
-ewmh_set_workarea(void)
-{
-     long *data;
-     int i, s, j, tag_c = 0, pos = 0;
-
-     s = screen_count();
-
-     for(i = 0; i < s; ++i)
-          tag_c += conf.ntag[i];
-
-     data = emalloc(tag_c * 4, sizeof(long));
-
-     for(i = 0; i < s; ++i)
-          for(j = 0; j < conf.ntag[i]; ++j)
-          {
-               data[pos++] = spgeo[i].x;
-               data[pos++] = spgeo[i].y;
-               data[pos++] = spgeo[i].width;
-               data[pos++] = spgeo[i].height;
-          }
-
-     XChangeProperty(dpy, ROOT, net_atom[net_workarea], XA_CARDINAL, 32,
-                     PropModeReplace, (uchar*)data, 4 * tag_c);
-
-     free(data);
-
-     return;
-}
-
 /** Manage _NET_WM_STATE_* ewmh
  */
 void
diff --git a/src/infobar.c b/src/infobar.c
index 42678da..41e7c17 100644
--- a/src/infobar.c
+++ b/src/infobar.c
@@ -381,7 +381,6 @@ infobar_set_position(int pos)
 
      barwin_move(infobar[selscreen].bar, sgeo[selscreen].x - BORDH, infobar[selscreen].geo.y);
      infobar_draw(selscreen);
-     ewmh_set_workarea();
      arrange(selscreen, True);
 
      return;
diff --git a/src/screen.c b/src/screen.c
index 2798208..8428aa2 100644
--- a/src/screen.c
+++ b/src/screen.c
@@ -215,7 +215,6 @@ screen_init_geo(void)
 #endif /* HAVE_XRANDR */
 
      ewmh_set_desktop_geometry();
-     ewmh_set_workarea();
 
      return;
 }
diff --git a/src/structs.h b/src/structs.h
index 64eeab8..19288a6 100644
--- a/src/structs.h
+++ b/src/structs.h
@@ -108,7 +108,6 @@ enum
      net_current_desktop,
      net_desktop_names,
      net_desktop_geometry,
-     net_workarea,
      net_active_window,
      net_close_window,
      net_wm_icon_name,
diff --git a/src/wmfs.h b/src/wmfs.h
index d6c88b9..779ecc2 100644
--- a/src/wmfs.h
+++ b/src/wmfs.h
@@ -220,7 +220,6 @@ void ewmh_update_current_tag_prop(void);
 void ewmh_get_client_list(void);
 void ewmh_get_desktop_names(void);
 void ewmh_set_desktop_geometry(void);
-void ewmh_set_workarea(void);
 void ewmh_manage_net_wm_state(long data_l[], Client *c);
 void ewmh_manage_window_type(Client *c);