Browse Source

Ewmh: Fix wmfs_statustext_x placement in net_atom enum

Martin Duquesnoy 14 years ago
parent
commit
ba45a360f7
4 changed files with 7 additions and 5 deletions
  1. 2 2
      src/event.c
  2. 1 1
      src/ewmh.c
  3. 1 1
      src/structs.h
  4. 3 1
      src/wmfs.c

+ 2 - 2
src/event.c

@@ -206,10 +206,10 @@ clientmessageevent(XClientMessageEvent *ev)
         || (mess_t == wmfs_cmd && ev->data.l[4] == True))
      {
           XGetWindowProperty(dpy, ROOT, net_atom[wmfs_function], 0, 4096,
-                             False, net_atom[utf8_string], &rt, &rf, &ir, &il, &ret);
+                    False, net_atom[utf8_string], &rt, &rf, &ir, &il, &ret);
 
           XGetWindowProperty(dpy, ROOT, net_atom[wmfs_cmd], 0, 4096,
-                             False, net_atom[utf8_string], &rt, &rf, &ir, &il, &ret_cmd);
+                    False, net_atom[utf8_string], &rt, &rf, &ir, &il, &ret_cmd);
 
           if((func = name_to_func((char*)ret, func_list)))
                func((uicb_t)ret_cmd);

+ 1 - 1
src/ewmh.c

@@ -43,7 +43,7 @@ void
 ewmh_init_hints(void)
 {
      int i = 1, j, showing_desk = 0;
-     char root_name[] = "WMFS "WMFS_VERSION;
+     char root_name[] = WMFS_VERSION;
      char class[] = "wmfs", st[64];
      long pid = (long)getpid();
 

+ 1 - 1
src/structs.h

@@ -127,9 +127,9 @@ enum
      wmfs_nmaster,
      wmfs_set_screen,
      wmfs_screen_count,
-     wmfs_statustext,
      wmfs_function,
      wmfs_cmd,
+     wmfs_statustext,
      net_last
 };
 

+ 3 - 1
src/wmfs.c

@@ -302,7 +302,9 @@ 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");
+     /* send_client_event(data, "_WMFS_FUNCTION"); */
+     send_client_event(data, "_WMFS_CMD");
+
 
      return;
 }