ruby-wmctrl 0.0.6 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 4cf9848c86b0484717aa10282cad3b80d6fe4ea7
-  data.tar.gz: 893e41f4b1da558a574473149ba4109a1a13f351
+SHA256:
+  metadata.gz: 64b85024233d08a600bd914867fcf4e3250aa4c21e8ec45eb7bf31644c3a317c
+  data.tar.gz: d42e156ef9c64fd3b43664b3cc4738295528541c12cae7dd7d4897c34e9496e4
 SHA512:
-  metadata.gz: b208af445e7333c390ea5ef42780e8f9738070520599ce4ee1957b09c5e130b8393ff0572f3ac5c933cf6bcd22d0ebc27e710af0d07e914c9488f0a62ac9a544
-  data.tar.gz: 8286f7c16f86ffad0169ede09ce432a926fca52d8bc02e5c63121c089711b1d035ee8d0114606567be12458ec21eaefc15cee8dd2cd6e3aa619cf35ad0ce480d
+  metadata.gz: b83996d39afbf0b47c6b964673f0a147ac6dc10d49670f3dfac051092fb45684e9e114ec07378034e443b04c539fff7bb7cc564773484efc8931dc771b8e134b
+  data.tar.gz: 412805d6b06f93ba5fad169dc2192204cdfcbb410778c1459421a11c6d3d5891d9f6aab9507f265d96abd4342af2f8603ff6959936448794ad8d56e954e734f7

data/ext/extconf.rb

@@ -8,6 +8,7 @@ $CFLAGS << " " << glib.cflags
 $libs << " " << glib.libs
 
 dir_config("X11")
-if have_header('X11/Xlib.h') && have_library('X11')
+if have_header('X11/Xlib.h') && have_library('X11') && 
+   have_header('X11/Xmu/WinUtil.h') && have_library('Xmu')
   create_makefile("wmctrl")
 end

data/ext/wmctrl.c

@@ -35,16 +35,13 @@ static gchar *get_property (Display *disp, Window win,
 static Window *get_client_list (Display *disp, unsigned long *size);
 static gchar *get_window_class (Display *disp, Window win);
 static gchar *get_window_title (Display *disp, Window win);
-static int activate_window (Display *disp, Window win, gboolean switch_desktop);
-static int close_window (Display *disp, Window win);
+static VALUE activate_window (Display *disp, Window win, gboolean switch_desktop);
+static VALUE close_window (Display *disp, Window win);
 static gboolean wm_supports (Display *disp, const gchar *prop);
-static int window_move_resize (Display *disp, Window win, signed long grav,
-			       signed long x, signed long y, signed long w, signed long h);
-static int window_state (Display *disp, Window win,
-			 const char *action_str, const char *prop1_str, const char *prop2_str);
+static VALUE window_move_resize (Display *disp, Window win, signed long grav, signed long x, signed long y, signed long w, signed long h);
+static VALUE change_window_state (Display *disp, Window win, const char *action_str, const char *prop1_str, const char *prop2_str);
 static int window_to_desktop (Display *disp, Window win, int desktop);
-static void window_set_title (Display *disp, Window win, char *title, char mode);
-static int action_window (Display *disp, Window win, char mode, int argc, VALUE *argv);
+static VALUE window_set_title (Display *disp, Window win, char *title, ID sym_id);
 static Window Select_Window(Display *dpy);
 static Window get_active_window(Display *disp);
 static Window get_target_window (Display *disp, VALUE obj);
@@ -53,7 +50,7 @@ static Window get_target_window (Display *disp, VALUE obj);
 static VALUE rb_wmctrl_class, key_id, key_title, key_pid, key_geometry,
   key_active, key_class, key_client_machine, key_desktop,
   key_viewport, key_workarea, key_current, key_showing_desktop, key_name,
-  key_state, key_frame_extents, key_strut, key_exterior_frame;
+  key_state, key_window_type, key_frame_extents, key_strut, key_exterior_frame;
 
 static ID id_select, id_active, id_activate, id_close, id_move_resize,
   id_change_state, id_move_to_desktop, id_move_to_current,
@@ -283,6 +280,10 @@ static VALUE get_window_hash_data (Window win, Display *disp, Window window_acti
     Atom *window_state;
     gchar *state_name;
     VALUE state_ary;
+    unsigned long window_type_size;
+    Atom *window_type;
+    gchar *window_type_name;
+    VALUE window_type_ary;
     Atom *extents;
     unsigned long extents_size;
     VALUE extents_ary;
@@ -317,6 +318,21 @@ static VALUE get_window_hash_data (Window win, Display *disp, Window window_acti
     }
     rb_hash_aset(window_obj, key_state, state_ary);
 
+    /* window type */
+    if ((window_type = (Atom *)get_property(disp, win,
+                                            XA_ATOM, "_NET_WM_WINDOW_TYPE", &window_type_size)) != NULL) {
+      window_type_ary = rb_ary_new();
+      for (j = 0; j < window_type_size / sizeof(Atom); j++) {
+        window_type_name = XGetAtomName(disp, window_type[j]);
+        rb_ary_push(window_type_ary, rb_str_new2(window_type_name));
+        g_free(window_type_name);
+      }
+      g_free(window_type);
+    } else {
+      window_type_ary = Qnil;
+    }
+    rb_hash_aset(window_obj, key_window_type, window_type_ary);
+
     /* frame extents */
     if ((extents = (unsigned long *)get_property(disp, win,
                                                  XA_CARDINAL, "_NET_FRAME_EXTENTS", &extents_size)) != NULL) {
@@ -828,7 +844,7 @@ static VALUE rb_wmctrl_change_number_of_desktops (VALUE self, VALUE num) {
   return Qtrue;
 }
 
-static int activate_window (Display *disp, Window win, gboolean switch_desktop)
+static VALUE activate_window (Display *disp, Window win, gboolean switch_desktop)
 {
   unsigned long *desktop;
 
@@ -853,12 +869,15 @@ static int activate_window (Display *disp, Window win, gboolean switch_desktop)
   client_msg(disp, win, "_NET_ACTIVE_WINDOW", 0, 0, 0, 0, 0);
   XMapRaised(disp, win);
 
-  return True;
+  return Qtrue;
 }
 
-static int close_window (Display *disp, Window win)
+static VALUE close_window (Display *disp, Window win)
 {
-  return client_msg(disp, win, "_NET_CLOSE_WINDOW", 0, 0, 0, 0, 0);
+  if (client_msg(disp, win, "_NET_CLOSE_WINDOW", 0, 0, 0, 0, 0)) {
+    return Qtrue;
+  }
+  return Qfalse;
 }
 
 static gboolean wm_supports (Display *disp, const gchar *prop)
@@ -885,39 +904,42 @@ static gboolean wm_supports (Display *disp, const gchar *prop)
   return FALSE;
 }
 
-static int window_move_resize (Display *disp, Window win, signed long grav,
-			       signed long x, signed long y, signed long w, signed long h)
+static VALUE window_move_resize (Display *disp, Window win, signed long grav, signed long x, signed long y, signed long w, signed long h)
 {
-  unsigned long grflags;
-  grflags = grav;
-  if (x != -1) grflags |= (1 << 8);
-  if (y != -1) grflags |= (1 << 9);
-  if (w != -1) grflags |= (1 << 10);
-  if (h != -1) grflags |= (1 << 11);
-
-  p_verbose("move_resize: %lu %ld %ld %ld %ld\n", grflags, x, y, w, h);
-
-  if (wm_supports(disp, "_NET_MOVERESIZE_WINDOW")){
-    return client_msg(disp, win, "_NET_MOVERESIZE_WINDOW",
-		      grflags, (unsigned long)x, (unsigned long)y, (unsigned long)w, (unsigned long)h);
-  }
-  else {
+  p_verbose("move_resize: %lu %ld %ld %ld %ld\n", grav, x, y, w, h);
+  if ((grav >= 0) && wm_supports(disp, "_NET_MOVERESIZE_WINDOW")) {
+    unsigned long grflags;
+    grflags = grav;
+    if (x != -1) {
+      grflags |= (1 << 8);
+    }
+    if (y != -1) {
+      grflags |= (1 << 9);
+    }
+    if (w != -1) {
+      grflags |= (1 << 10);
+    }
+    if (h != -1) {
+      grflags |= (1 << 11);
+    }
+    if (client_msg(disp, win, "_NET_MOVERESIZE_WINDOW", grflags, (unsigned long) x, (unsigned long) y, (unsigned long) w, (unsigned long) h)) {
+      return Qtrue;
+    }
+    return Qfalse;
+  } else {
     p_verbose("WM doesn't support _NET_MOVERESIZE_WINDOW. Gravity will be ignored.\n");
     if ((w < 1 || h < 1) && (x >= 0 && y >= 0)) {
       XMoveWindow(disp, win, x, y);
-    }
-    else if ((x < 0 || y < 0) && (w >= 1 && h >= -1)) {
+    } else if ((x < 0 || y < 0) && (w >= 1 && h >= -1)) {
       XResizeWindow(disp, win, w, h);
-    }
-    else if (x >= 0 && y >= 0 && w >= 1 && h >= 1) {
+    } else if (x >= 0 && y >= 0 && w >= 1 && h >= 1) {
       XMoveResizeWindow(disp, win, x, y, w, h);
     }
-    return EXIT_SUCCESS;
+    return Qtrue;
   }
 }
 
-static int window_state (Display *disp, Window win,
-			 const char *action_str, const char *prop1_str, const char *prop2_str)
+static VALUE change_window_state (Display *disp, Window win, const char *action_str, const char *prop1_str, const char *prop2_str)
 {
   unsigned long action;
   Atom prop1 = 0;
@@ -927,14 +949,11 @@ static int window_state (Display *disp, Window win,
   /* action */
   if (strcmp(action_str, "remove") == 0) {
     action = _NET_WM_STATE_REMOVE;
-  }
-  else if (strcmp(action_str, "add") == 0) {
+  } else if (strcmp(action_str, "add") == 0) {
     action = _NET_WM_STATE_ADD;
-  }
-  else if (strcmp(action_str, "toggle") == 0) {
+  } else if (strcmp(action_str, "toggle") == 0) {
     action = _NET_WM_STATE_TOGGLE;
-  }
-  else {
+  } else {
     rb_raise(rb_eArgError, "Invalid action. Use either remove, add or toggle.");
   }
 
@@ -953,7 +972,10 @@ static int window_state (Display *disp, Window win,
     g_free(tmp2);
     g_free(tmp_prop2);
   }
-  return client_msg(disp, win, "_NET_WM_STATE", action, (unsigned long)prop1, (unsigned long)prop2, 0, 0);
+  if (client_msg(disp, win, "_NET_WM_STATE", action, (unsigned long) prop1, (unsigned long) prop2, 0, 0)) {
+    return Qtrue;
+  }
+  return Qnil;
 }
 
 static int window_to_desktop (Display *disp, Window win, int desktop)
@@ -979,7 +1001,7 @@ static int window_to_desktop (Display *disp, Window win, int desktop)
   return client_msg(disp, win, "_NET_WM_DESKTOP", (unsigned long)desktop, 0, 0, 0, 0);
 }
 
-static void window_set_title (Display *disp, Window win, char *title, char mode)
+static VALUE window_set_title (Display *disp, Window win, char *title, ID sym_id)
 {
   gchar *title_utf8;
   gchar *title_local;
@@ -987,109 +1009,38 @@ static void window_set_title (Display *disp, Window win, char *title, char mode)
   if (envir_utf8) {
     title_utf8 = g_strdup(title);
     title_local = NULL;
-  }
-  else {
-    if (! (title_utf8 = g_locale_to_utf8(title, -1, NULL, NULL, NULL))) {
+  } else {
+    if (!(title_utf8 = g_locale_to_utf8(title, -1, NULL, NULL, NULL))) {
       title_utf8 = g_strdup(title);
     }
     title_local = g_strdup(title);
   }
 
-  if (mode == 'T' || mode == 'N') {
+  if ((sym_id == id_set_title_both) || (sym_id == id_set_title_long)) {
     /* set name */
     if (title_local) {
-      XChangeProperty(disp, win, XA_WM_NAME, XA_STRING, 8, PropModeReplace,
-		      (const unsigned char *)title_local, strlen(title_local));
-    }
-    else {
+      XChangeProperty(disp, win, XA_WM_NAME, XA_STRING, 8, PropModeReplace, (const unsigned char *) title_local, strlen(title_local));
+    } else {
       XDeleteProperty(disp, win, XA_WM_NAME);
     }
-    XChangeProperty(disp, win, XInternAtom(disp, "_NET_WM_NAME", False),
-		    XInternAtom(disp, "UTF8_STRING", False), 8, PropModeReplace,
-		    (const unsigned char *)title_utf8, strlen(title_utf8));
+    XChangeProperty(disp, win, XInternAtom(disp, "_NET_WM_NAME", False), XInternAtom(disp, "UTF8_STRING", False), 8, PropModeReplace, (const unsigned char *) title_utf8, strlen(title_utf8));
   }
 
-  if (mode == 'T' || mode == 'I') {
+  if ((sym_id == id_set_title_both) || (sym_id == id_set_title_short)) {
     /* set icon name */
     if (title_local) {
-      XChangeProperty(disp, win, XA_WM_ICON_NAME, XA_STRING, 8, PropModeReplace,
-		      (const unsigned char *)title_local, strlen(title_local));
-    }
-    else {
+      XChangeProperty(disp, win, XA_WM_ICON_NAME, XA_STRING, 8, PropModeReplace, (const unsigned char *) title_local, strlen(title_local));
+    } else {
       XDeleteProperty(disp, win, XA_WM_ICON_NAME);
     }
-    XChangeProperty(disp, win, XInternAtom(disp, "_NET_WM_ICON_NAME", False),
-		    XInternAtom(disp, "UTF8_STRING", False), 8, PropModeReplace,
-		    (const unsigned char *)title_utf8, strlen(title_utf8));
+    XChangeProperty(disp, win, XInternAtom(disp, "_NET_WM_ICON_NAME", False), XInternAtom(disp, "UTF8_STRING", False), 8, PropModeReplace, (const unsigned char *) title_utf8, strlen(title_utf8));
   }
 
   g_free(title_utf8);
-  g_free(title_local);
-}
-
-static int action_window (Display *disp, Window win, char mode, int argc, VALUE *argv)
-{
-  p_verbose("Using window: 0x%.8lx\n", win);
-  switch (mode) {
-  case 'a':
-    if (argc == 0) {
-      return activate_window(disp, win, TRUE);
-    }
-  case 'c':
-    if (argc == 0) {
-      return close_window(disp, win);
-    }
-  case 'e':
-    /* resize/move the window around the desktop => -r -e */
-    if (argc == 5) {
-      int grav, x, y, w, h;
-      grav = FIX2INT(argv[0]);
-      x = FIX2INT(argv[1]);
-      y = FIX2INT(argv[2]);
-      w = FIX2INT(argv[3]);
-      h = FIX2INT(argv[4]);
-      if (grav >= 0) {
-	return window_move_resize(disp, win, grav, x, y, w, h);
-      }
-    }
-    break;
-  case 'b':
-    /* change state of a window => -r -b */
-    if (argc == 2 || argc == 3) {
-      const char *action, *prop1, *prop2;
-      action = StringValuePtr(argv[0]);
-      prop1 = StringValuePtr(argv[1]);
-      if (argc == 3) {
-	prop2 = StringValuePtr(argv[2]);	
-      } else {
-	prop2 = NULL;
-      }
-      return window_state(disp, win, action, prop1, prop2);
-    }
-  case 't':
-    /* move the window to the specified desktop => -r -t */
-    if (argc == 1) {
-      return window_to_desktop(disp, win, FIX2INT(argv[0]));
-    }
-  case 'R':
-    /* move the window to the current desktop and activate it => -r */
-    if (argc == 0) {
-      if (window_to_desktop(disp, win, -1)) {
-	usleep(100000); /* 100 ms - make sure the WM has enough
-			   time to move the window, before we activate it */
-	return activate_window(disp, win, FALSE);
-      }
-      else {
-	return False;
-      }
-    }
-  case 'N': case 'I': case 'T':
-    if (argc == 1) {
-      window_set_title(disp, win, StringValuePtr(argv[0]), mode);
-      return True;
-    }
+  if (title_local) {
+    g_free(title_local);
   }
-  rb_raise(rb_eArgError, "Invalid argument of action_window.");
+  return Qtrue;
 }
 
 static Window Select_Window(Display *dpy)
@@ -1191,31 +1142,63 @@ static Window get_target_window (Display *disp, VALUE obj)
 }
 
 /*
-  @overload action_window(wid, cmd, *args)
-  
-  Manage windows.
-  @param wid Window ID
-  @param cmd [Symbol] Symbol of command
-  @param args [Array] Arguments for the command
-
-  @return [boolean] true if succeeded. Otherwise, false.
-  
-  @example
-    wm.action_window(wid, :activate)
-    wm.action_window(wid, :close)
-    wm.action_window(wid, :move_resize, grav, x, y, w, h)
-    wm.action_window(wid, :change_state, add, prop1, prop2 = nil)
-    wm.action_window(wid, :change_state, remove, prop1, prop2 = nil)
-    wm.action_window(wid, :change_state, toggle, prop1, prop2 = nil)
-    wm.action_window(wid, :move_to_desktop, desktop_id)
-    wm.action_window(wid, :move_to_current)
-    wm.action_window(wid, :set_title_long, str)
-    wm.action_window(wid, :set_title_short, str)
-    wm.action_window(wid, :set_title_both, str)
+  Manage a window.
+  @overload action_window(wid, :activate)
+    Activate a window.
+    @param [Integer] wid Window ID
+    @return [boolean] true if succeeded. Otherwise, false.
+  @overload action_window(wid, :close)
+    Close a window
+    @param [Integer] wid Window ID
+    @return [boolean] true if succeeded. Otherwise, false.
+  @overload action_window(wid, :move_resize, grav, x, y, w, h)
+    @param [Integer] wid Window ID
+    @param [Integer] grav Gravity
+    @param [Integer] x    X coordinate
+    @param [Integer] y    Y coordinate
+    @param [Integer] w    Width
+    @param [Integer] h    Height
+    @return [boolean] true if succeeded. Otherwise, false.
+  @overload action_window(wid, :change_state, "add", prop1, prop2 = nil)
+    @param [Integer] wid Window ID
+    @param [String] prop1 String of _NET_WM_STATE type.
+    @param [String] prop2 String of _NET_WM_STATE type.
+    @return [boolean] true if succeeded. Otherwise, false.
+  @overload action_window(wid, :change_state, "remove", prop1, prop2 = nil)
+    @param [Integer] wid Window ID
+    @param [String] prop1 String of _NET_WM_STATE type.
+    @param [String] prop2 String of _NET_WM_STATE type.
+    @return [boolean] true if succeeded. Otherwise, false.
+  @overload action_window(wid, :change_state, "toggle", prop1, prop2 = nil)
+    @param [Integer] wid Window ID
+    @param [String] prop1 String of _NET_WM_STATE type.
+    @param [String] prop2 String of _NET_WM_STATE type.
+    @return [boolean] true if succeeded. Otherwise, false.
+  @overload action_window(wid, :move_to_desktop, desktop_id)
+    @param [Integer] wid Window ID
+    @param [Integer] desktop_id Desktop ID
+    @return [boolean] true if succeeded. Otherwise, false.
+  @overload action_window(wid, :move_to_current)
+    @param [Integer] wid Window ID
+    @return [boolean] true if succeeded. Otherwise, false.
+  @overload action_window(wid, :set_title_long, str)
+    @param [Integer] wid Window ID
+    @return [boolean] true if succeeded. Otherwise, false.
+  @overload action_window(wid, :set_title_short, str)
+    @param [Integer] wid Window ID
+    @return [boolean] true if succeeded. Otherwise, false.
+  @overload action_window(wid, :set_title_both, str)
+    @param [Integer] wid Window ID
+    @return [boolean] true if succeeded. Otherwise, false.
+
+  @note
+    The arguments of prop1 and prop2 for :change_state command are strings
+    that mean type of _NET_WM_STATE.
+    For example, For example, we use "modal" or "MODAL" for _NET_WM_STATE_MODAL.
+    See also http://standards.freedesktop.org/wm-spec/wm-spec-latest.html
 */
 static VALUE rb_wmctrl_action_window(int argc, VALUE *argv, VALUE self) {
-  Window wid;
-  int mode;
+  Window win;
   ID sym_id;
   Display **ptr, *disp;
   Data_Get_Struct(self, Display*, ptr);
@@ -1223,34 +1206,67 @@ static VALUE rb_wmctrl_action_window(int argc, VALUE *argv, VALUE self) {
   if (argc < 2) {
     rb_raise(rb_eArgError, "Need more than one argument.");
   }
-  wid = get_target_window(disp, argv[0]);
+  win = get_target_window(disp, argv[0]);
   sym_id = SYM2ID(argv[1]);
+  argc = argc - 2;
+  argv = argv + 2;
+  p_verbose("Using window: 0x%.8lx\n", win);
   if (sym_id == id_activate) {
-    mode = 'a';
+    if (argc == 0) {
+      return activate_window(disp, win, TRUE);
+    }
   } else if (sym_id == id_close) {
-    mode = 'c';
+    if (argc == 0) {
+      return close_window(disp, win);
+    }
   } else if (sym_id == id_move_resize) {
-    mode = 'e';
+    /* resize/move the window around the desktop => -r -e */
+    if (argc == 5) {
+      int grav, x, y, w, h;
+      grav = FIX2INT(argv[0]);
+      x = FIX2INT(argv[1]);
+      y = FIX2INT(argv[2]);
+      w = FIX2INT(argv[3]);
+      h = FIX2INT(argv[4]);
+      return window_move_resize(disp, win, grav, x, y, w, h);
+    }
   } else if (sym_id == id_change_state) {
-    mode = 'b';
+    /* change state of a window => -r -b */
+    if (argc == 2 || argc == 3) {
+      const char *action, *prop1, *prop2;
+      action = StringValuePtr(argv[0]);
+      prop1 = StringValuePtr(argv[1]);
+      if (argc == 3) {
+	prop2 = StringValuePtr(argv[2]);
+      } else {
+	prop2 = NULL;
+      }
+      return change_window_state(disp, win, action, prop1, prop2);
+    }
   } else if (sym_id == id_move_to_desktop) {
-    mode = 't';
+    /* move the window to the specified desktop => -r -t */
+    if (argc == 1) {
+      if (window_to_desktop(disp, win, FIX2INT(argv[0]))) {
+        return Qtrue;
+      }
+      return Qfalse;
+    }
   } else if (sym_id == id_move_to_current) {
-    mode = 'R';
-  } else if (sym_id == id_set_title_long) {
-    mode = 'N';
-  } else if (sym_id == id_set_title_short) {
-    mode = 'I';
-  } else if (sym_id == id_set_title_both) {
-    mode = 'T';
-  } else {
-    rb_raise(rb_eStandardError, "Invalid argument of action_window.");
-  }
-  if (action_window(disp, wid, mode, argc - 2, (argv + 2))) {
-    return Qtrue;
-  } else {
-    return Qfalse;
+    /* move the window to the current desktop and activate it => -r */
+    if (argc == 0) {
+      if (window_to_desktop(disp, win, -1)) {
+	usleep(100000);
+        /* 100 ms - make sure the WM has enough time to move the window, before we activate it */
+	return activate_window(disp, win, FALSE);
+      }
+      return Qfalse;
+    }
+  } else if (sym_id == id_set_title_long || sym_id == id_set_title_short || sym_id == id_set_title_both) {
+    if (argc == 1) {
+      return window_set_title(disp, win, StringValuePtr(argv[0]), sym_id);
+    }
   }
+  rb_raise(rb_eStandardError, "Invalid argument of action_window.");
 }
 
 /*
@@ -1317,6 +1333,7 @@ void Init_wmctrl()
   key_showing_desktop = ID2SYM(rb_intern("showing_desktop"));
   key_name = ID2SYM(rb_intern("name"));
   key_state = ID2SYM(rb_intern("state"));
+  key_window_type = ID2SYM(rb_intern("window_type"));
   key_frame_extents = ID2SYM(rb_intern("frame_extents"));
   key_strut = ID2SYM(rb_intern("strut"));
   key_exterior_frame = ID2SYM(rb_intern("exterior_frame"));

data/lib/wmctrl/version.rb

@@ -1,3 +1,3 @@
 class WMCtrl
-  VERSION = "0.0.6"
+  VERSION = "0.0.7"
 end

data/lib/wmctrl/wmctrl.rb

@@ -1,6 +1,19 @@
 require 'wmctrl.so'
 
 class WMCtrl
+  NOT_USE_NET_MOVERESIZE_WINDOW = -1
+  GRAVITY_DEFAULT = 0
+  GRAVITY_NORTH_WEST = 1
+  GRAVITY_NORTH = 2
+  GRAVITY_NORTH_EAST = 3
+  GRAVITY_WEST = 4
+  GRAVITY_CENTER = 5
+  GRAVITY_EAST = 6
+  GRAVITY_SOUTH_WEST = 7
+  GRAVITY_SOUTH = 8
+  GRAVITY_SOUTH_EAST = 9
+  GRAVITY_STATIC = 10
+
   def self.instance
     @wmctrl ||= self.new
   end
@@ -85,10 +98,36 @@ class WMCtrl
       self[:active]
     end
 
-    STATE_FULLSCREEN = "_NET_WM_STATE_FULLSCREEN"
-
     def fullscreen?
-      self[:state].include?(STATE_FULLSCREEN)
+      self[:state].include?("_NET_WM_STATE_FULLSCREEN")
+    end
+
+    def modal?
+      self[:state].include?("_NET_WM_STATE_MODAL")
+    end
+
+    def maximized_vertically?
+      self[:state].include?("_NET_WM_STATE_MAXIMIZED_VERT")
+    end
+
+    def maximized_horizontally?
+      self[:state].include?("_NET_WM_STATE_MAXIMIZED_HORZ")
+    end
+
+    def shaded?
+      self[:state].include?("_NET_WM_STATE_SHADED")
+    end
+
+    def hidden?
+      self[:state].include?("_NET_WM_STATE_HIDDEN")
+    end
+
+    def skipped_by_taskbar?
+      self[:state].include?("_NET_WM_STATE_SKIP_TASKBAR")
+    end
+
+    def skipped_by_pager?
+      self[:state].include?("_NET_WM_STATE_SKIP_PAGER")
     end
 
     def action(*args)
@@ -116,6 +155,9 @@ class WMCtrl
     # @option opts [Integer] :width Width of window
     # @option opts [Integer] :height Height of window
     # @option opts [Integer,:current] :desktop Desktop number
+    # @option opts [Integer] :gravity Number meaning gravity: NOT_USE_NET_MOVERESIZE_WINDOW,
+    #   GRAVITY_DEFAULT, GRAVITY_NORTH_WEST, GRAVITY_NORTH, GRAVITY_NORTH_EAST, GRAVITY_WEST, GRAVITY_CENTER,
+    #   GRAVITY_EAST, GRAVITY_SOUTH_WEST, GRAVITY_SOUTH, GRAVITY_SOUTH_EAST, GRAVITY_STATIC
     def place(opts = {})
       if opts[:desktop]
         if opts[:desktop] == :current
@@ -124,6 +166,7 @@ class WMCtrl
           action(:move_to_desktop, opts[:desktop])
         end
       end
+      gravity = opts[:gravity] || GRAVITY_DEFAULT
       x = self[:exterior_frame][0]
       y = self[:exterior_frame][1]
       width = self[:exterior_frame][2]
@@ -134,7 +177,7 @@ class WMCtrl
       height = opts[:height] if opts[:height] && (opts[:height] != height)
       x = opts[:x] if opts[:x] && (opts[:x] != x)
       y = opts[:y] if opts[:y] && (opts[:y] != y)
-      action(:move_resize, 0, x + self[:frame_extents][0], y + self[:frame_extents][1], width - extent_horizontal, height - extent_vertical)
+      action(:move_resize, gravity, x + self[:frame_extents][0], y + self[:frame_extents][1], width - extent_horizontal, height - extent_vertical)
     end
 
     def position
@@ -148,9 +191,15 @@ class WMCtrl
     list_desktops.map { |hash| WMCtrl::Desktop.new(hash) }
   end
 
-  # @param [Array] conditions An array of condition hash. The values of hash are tested by the method ===.
-  # @return [Array] An array of WMCtrl::Window
-  def windows(*conditions)
+  # @param [Array] conditions An array of condition hash.
+  #   The keys of the hash are keys of WMCtrl::Window#[].
+  #   The values of the hash are tested by the method ===.
+  #   Keys of each condition are combined by logical product and
+  #   all conditions are combined by logical sum.
+  # @yield [WMCtrl::Window] Test window by block
+  # @return [Array] An array of WMCtrl::Window including windows
+  #   matched by the conditions and the block.
+  def windows(*conditions, &block)
     wins = list_windows(true).map { |hash| WMCtrl::Window.new(hash) }
     unless conditions.empty?
       wins_selected = []
@@ -167,6 +216,9 @@ class WMCtrl
       end
       wins = wins_selected
     end
+    if block_given?
+      wins.delete_if { |win| !yield(win) }
+    end
     wins
   end
 end

data/spec/wmctrl_spec.rb

@@ -11,29 +11,29 @@ describe WMCtrl do
 
   it "should get an array of hashes." do
     wins = wm.list_windows
-    wins.should be_an_instance_of Array
+    expect(wins).to be_an_instance_of Array
     wins.each do |w|
-      w.should be_an_instance_of Hash
+      expect(w).to be_an_instance_of Hash
     end
   end
 
   it "should get an array of hashes." do
     desktops = wm.list_desktops
-    desktops.should be_an_instance_of Array
+    expect(desktops).to be_an_instance_of Array
     desktops.each do |w|
-      w.should be_an_instance_of Hash
+      expect(w).to be_an_instance_of Hash
     end
   end
 
   it "should get information of window manager." do
-    wm.info.should be_an_instance_of Hash
+    expect(wm.info).to be_an_instance_of Hash
   end
 
   it "should get an array." do
     sp = wm.supported
-    sp.should be_an_instance_of Array
+    expect(sp).to be_an_instance_of Array
     sp.each do |prop|
-      prop.should be_an_instance_of String
+      expect(prop).to be_an_instance_of String
     end
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby-wmctrl
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors:
 - Takayuki YAMAGUCHI
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-05 00:00:00.000000000 Z
+date: 2018-06-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -112,9 +112,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.7.3
 signing_key: 
 specification_version: 4
 summary: Ruby bindings to control windows
 test_files: []
-has_rdoc: