From e6fc0a4976ef6e3d2afc0ed21b20ad6a2354adcc Mon Sep 17 00:00:00 2001
From: Martin Duquesnoy <xorg62@gmail.com>
Date: Mon, 26 Jul 2010 11:32:26 +0200
Subject: [PATCH] Event: Remove send_client_message function

---
 src/client.c  |  2 +-
 src/event.c   | 26 --------------------------
 src/getinfo.c |  6 +-----
 src/wmfs.c    | 19 ++++---------------
 src/wmfs.h    |  1 -
 5 files changed, 6 insertions(+), 48 deletions(-)

diff --git a/src/client.c b/src/client.c
index 9a28bb2..2a9f466 100644
--- a/src/client.c
+++ b/src/client.c
@@ -830,7 +830,7 @@ client_moveresize(Client *c, XRectangle geo, Bool r)
 
      frame_moveresize(c, c->geo);
 
-     XMoveResizeWindow(dpy, c->win, BORDH, TBARH, geo.width, geo.height);
+     XMoveResizeWindow(dpy, c->win, BORDH, TBARH, c->geo.width, c->geo.height);
 
      client_update_attributes(c);
      client_configure(c);
diff --git a/src/event.c b/src/event.c
index 1ba3511..551c0a7 100644
--- a/src/event.c
+++ b/src/event.c
@@ -647,32 +647,6 @@ unmapnotify(XUnmapEvent *ev)
      return;
 }
 
-/** Send a client event
- *\param data Event data
- *\param atom_name Event atom name
- */
-void
-send_client_event(long data[5], char *atom_name)
-{
-     XEvent ev;
-     int i;
-
-     ev.xclient.type = ClientMessage;
-     ev.xclient.serial = 0;
-     ev.xclient.send_event = True;
-     ev.xclient.message_type = ATOM(atom_name);
-     ev.xclient.window = ROOT;
-     ev.xclient.format = 32;
-
-     for(i = 0; i < 5; ++i, ev.xclient.data.l[i] = data[i]);
-
-     XSendEvent(dpy, ROOT, False, SubstructureRedirectMask | SubstructureNotifyMask, &ev);
-     XSync(dpy, False);
-
-
-     return;
-}
-
 /** Event handle function: execute every function
  * handle by event
  * \param ev Event
diff --git a/src/getinfo.c b/src/getinfo.c
index 34e8782..b3b66e2 100644
--- a/src/getinfo.c
+++ b/src/getinfo.c
@@ -173,14 +173,10 @@ getinfo_nmaster(void)
 void
 getinfo(char *info)
 {
-     long data[5];
-
      if(!check_wmfs_running())
           return;
 
-     data[4] = True;
-
-     send_client_event(data, "_WMFS_UPDATE_HINTS");
+     ewmh_send_message(ROOT, ROOT, "_WMFS_UPDATE_HINTS", 0, 0, 0, 0, True);
 
      if(!strcmp(info, "tag"))
           getinfo_tag();
diff --git a/src/wmfs.c b/src/wmfs.c
index 2433359..9150397 100644
--- a/src/wmfs.c
+++ b/src/wmfs.c
@@ -330,15 +330,11 @@ check_wmfs_running(void)
 void
 exec_uicb_function(char *func, char *cmd)
 {
-     long data[5];
-
      /* Check if wmfs is running (this function is executed when wmfs
       is already running normally...) */
      if(!check_wmfs_running())
           return;
 
-     data[4] = True;
-
      XChangeProperty(dpy, ROOT, ATOM("_WMFS_FUNCTION"), ATOM("UTF8_STRING"),
                      8, PropModeReplace, (uchar*)func, strlen(func));
 
@@ -348,7 +344,7 @@ exec_uicb_function(char *func, char *cmd)
      XChangeProperty(dpy, ROOT, ATOM("_WMFS_CMD"), ATOM("UTF8_STRING"),
                      8, PropModeReplace, (uchar*)cmd, strlen(cmd));
 
-     send_client_event(data, "_WMFS_FUNCTION");
+     ewmh_send_message(ROOT, ROOT, "_WMFS_FUNCTION", 0, 0, 0, 0, True);
 
      return;
 }
@@ -360,11 +356,8 @@ void
 set_statustext(int s, char *str)
 {
      int i;
-     long data[5];
      char atom_name[64];
 
-     data[4] = True;
-
      if(!str)
           return;
 
@@ -377,7 +370,7 @@ set_statustext(int s, char *str)
                XChangeProperty(dpy, ROOT, ATOM(atom_name), ATOM("UTF8_STRING"),
                          8, PropModeReplace, (uchar*)str, strlen(str));
 
-               send_client_event(data, atom_name);
+               ewmh_send_message(ROOT, ROOT, atom_name, 0, 0, 0, 0, True);
           }
      }
      else
@@ -387,7 +380,7 @@ set_statustext(int s, char *str)
           XChangeProperty(dpy, ROOT, ATOM(atom_name), ATOM("UTF8_STRING"),
                          8, PropModeReplace, (uchar*)str, strlen(str));
 
-          send_client_event(data, atom_name);
+               ewmh_send_message(ROOT, ROOT, atom_name, 0, 0, 0, 0, True);
      }
 
      return;
@@ -398,14 +391,10 @@ set_statustext(int s, char *str)
 void
 update_status(void)
 {
-     long data[5];
-
      if(!check_wmfs_running())
           return;
 
-     data[4] = True;
-
-     send_client_event(data, "_WMFS_UPDATE_STATUS");
+     ewmh_send_message(ROOT, ROOT, "_WMFS_UPDATE_STATUS", 0, 0, 0, 0, True);
 
      return;
 }
diff --git a/src/wmfs.h b/src/wmfs.h
index 824f923..a4087f0 100644
--- a/src/wmfs.h
+++ b/src/wmfs.h
@@ -248,7 +248,6 @@ void reparentnotify(XReparentEvent *ev);
 void selectionclearevent(XSelectionClearEvent *ev);
 void propertynotify(XPropertyEvent *ev);
 void unmapnotify(XUnmapEvent *ev);
-void send_client_event(long data[5], char *atom_name);
 void getevent(XEvent ev);
 
 /* menu.c */