ruby-wmctrl 0.0.5 → 0.0.6

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 4cf9848c86b0484717aa10282cad3b80d6fe4ea7
+  data.tar.gz: 893e41f4b1da558a574473149ba4109a1a13f351
+SHA512:
+  metadata.gz: b208af445e7333c390ea5ef42780e8f9738070520599ce4ee1957b09c5e130b8393ff0572f3ac5c933cf6bcd22d0ebc27e710af0d07e914c9488f0a62ac9a544
+  data.tar.gz: 8286f7c16f86ffad0169ede09ce432a926fca52d8bc02e5c63121c089711b1d035ee8d0114606567be12458ec21eaefc15cee8dd2cd6e3aa619cf35ad0ce480d

data/bin/rwmctrl

@@ -168,7 +168,7 @@ end
 
 case options[:mode]
 when :list_windows
-  windows = wm.list_windows(true)
+  windows = wm.windows
   str_class_size = windows.map { |w| w[:class].to_s.size }.max
   windows.each do |win|
     s = ''

data/ext/wmctrl.c

@@ -238,6 +238,129 @@ static gchar *get_window_title (Display *disp, Window win)
   return title_utf8;
 }
 
+static VALUE get_window_hash_data (Window win, Display *disp, Window window_active, int get_state)
+{
+  VALUE window_obj = rb_hash_new();
+  gchar *title_utf8 = get_window_title(disp, win); /* UTF8 */
+  gchar *client_machine;
+  gchar *class_out = get_window_class(disp, win); /* UTF8 */
+  unsigned long *desktop;
+
+  if ((int) window_active < 0) {
+    window_active = get_active_window(disp);
+  }
+
+  rb_hash_aset(window_obj, key_id, INT2NUM(win));
+  rb_hash_aset(window_obj, key_title, (title_utf8 ? RB_UTF8_STRING_NEW2(title_utf8) : Qnil));
+  rb_hash_aset(window_obj, key_class, (class_out ? RB_UTF8_STRING_NEW2(class_out) : Qnil));
+
+  if (window_active == win) {
+    rb_hash_aset(window_obj, key_active, Qtrue);
+  } else {
+    rb_hash_aset(window_obj, key_active, Qnil);
+  }
+
+  /* desktop ID */
+  if ((desktop = (unsigned long *)get_property(disp, win,
+                                               XA_CARDINAL, "_NET_WM_DESKTOP", NULL)) == NULL) {
+    desktop = (unsigned long *)get_property(disp, win, XA_CARDINAL, "_WIN_WORKSPACE", NULL);
+  }
+  /* special desktop ID -1 means "all desktops", so we
+     have to convert the desktop value to signed long */
+  rb_hash_aset(window_obj, key_desktop, INT2NUM(desktop ? (signed long)*desktop : 0));
+
+  /* client machine */
+  client_machine = get_property(disp, win, XA_STRING, "WM_CLIENT_MACHINE", NULL);
+  rb_hash_aset(window_obj, key_client_machine, (client_machine ? RB_UTF8_STRING_NEW2(client_machine) : Qnil));
+
+  if (get_state) {
+    unsigned long *pid;
+    int x, y, junkx, junky;
+    unsigned long j;
+    unsigned int wwidth, wheight, bw, depth;
+    Window junkroot;
+    unsigned long state_size;
+    Atom *window_state;
+    gchar *state_name;
+    VALUE state_ary;
+    Atom *extents;
+    unsigned long extents_size;
+    VALUE extents_ary;
+    Atom *strut;
+    unsigned long strut_size;
+    VALUE strut_ary;
+
+    /* pid */
+    pid = (unsigned long *)get_property(disp, win, XA_CARDINAL, "_NET_WM_PID", NULL);
+    rb_hash_aset(window_obj, key_pid, (pid ? ULONG2NUM(*pid) : Qnil));
+    g_free(pid);
+
+    /* geometry */
+    XGetGeometry (disp, win, &junkroot, &junkx, &junky, &wwidth, &wheight, &bw, &depth);
+    XTranslateCoordinates (disp, win, junkroot, -bw, -bw, &x, &y, &junkroot);
+
+    rb_hash_aset(window_obj, key_geometry,
+                 rb_ary_new3(4, INT2NUM(x), INT2NUM(y), INT2NUM(wwidth), INT2NUM(wheight)));
+
+    /* state */
+    if ((window_state = (Atom *)get_property(disp, win,
+                                             XA_ATOM, "_NET_WM_STATE", &state_size)) != NULL) {
+      state_ary = rb_ary_new();
+      for (j = 0; j < state_size / sizeof(Atom); j++) {
+        state_name = XGetAtomName(disp, window_state[j]);
+        rb_ary_push(state_ary, rb_str_new2(state_name));
+        g_free(state_name);
+      }
+      g_free(window_state);
+    } else {
+      state_ary = Qnil;
+    }
+    rb_hash_aset(window_obj, key_state, state_ary);
+
+    /* frame extents */
+    if ((extents = (unsigned long *)get_property(disp, win,
+                                                 XA_CARDINAL, "_NET_FRAME_EXTENTS", &extents_size)) != NULL) {
+      extents_ary = rb_ary_new();
+      for (j = 0; j < extents_size / sizeof(unsigned long); j++) {
+        rb_ary_push(extents_ary, ULONG2NUM(extents[j]));
+      }
+      /* exterior frame */
+      if (extents) {
+        rb_hash_aset(window_obj, key_exterior_frame,
+                     rb_ary_new3(4, INT2NUM(x - (int)extents[0]), INT2NUM(y - (int)extents[2]),
+                                 INT2NUM(wwidth + (int)extents[0] + (int)extents[1]),
+                                 INT2NUM(wheight + (int)extents[2] + (int)extents[3])));
+      }
+      g_free(extents);
+    } else {
+      extents_ary = Qnil;
+    }
+    rb_hash_aset(window_obj, key_frame_extents, extents_ary);
+
+    /* strut partial or strut */
+    if ((strut = (unsigned long *)get_property(disp, win,
+                                               XA_CARDINAL, "_NET_WM_STRUT_PARTIAL", &strut_size)) == NULL) {
+      strut = (unsigned long *)get_property(disp, win, XA_CARDINAL, "_NET_WM_STRUT", &strut_size);
+    }
+    if (strut) {
+      strut_ary = rb_ary_new();
+      for (j = 0; j < strut_size / sizeof(unsigned long); j++) {
+        rb_ary_push(strut_ary, ULONG2NUM(strut[j]));
+      }
+      g_free(strut);
+    } else {
+      strut_ary = Qnil;
+    }
+    rb_hash_aset(window_obj, key_strut, strut_ary);
+  }
+
+  g_free(title_utf8);
+  g_free(desktop);
+  g_free(client_machine);
+  g_free(class_out);
+  return window_obj;
+}
+
 /*
   @overload list_windows(get_state = nil)
 
@@ -268,128 +391,25 @@ static VALUE rb_wmctrl_list_windows (int argc, VALUE *argv, VALUE self) {
   window_ary = rb_ary_new2(client_list_size);
 
   for (i = 0; i < client_list_size / sizeof(Window); i++) {
-    VALUE window_obj = rb_hash_new();
-    gchar *title_utf8 = get_window_title(disp, client_list[i]); /* UTF8 */
-    gchar *client_machine;
-    gchar *class_out = get_window_class(disp, client_list[i]); /* UTF8 */
-    unsigned long *desktop;
-
-    rb_hash_aset(window_obj, key_id, INT2NUM(client_list[i]));
-    rb_hash_aset(window_obj, key_title, (title_utf8 ? RB_UTF8_STRING_NEW2(title_utf8) : Qnil));
-    rb_hash_aset(window_obj, key_class, (class_out ? RB_UTF8_STRING_NEW2(class_out) : Qnil));
-
-    if (window_active == client_list[i]) {
-      rb_hash_aset(window_obj, key_active, Qtrue);
-    } else {
-      rb_hash_aset(window_obj, key_active, Qnil);
-    }
-
-    /* desktop ID */
-    if ((desktop = (unsigned long *)get_property(disp, client_list[i],
-  						 XA_CARDINAL, "_NET_WM_DESKTOP", NULL)) == NULL) {
-      desktop = (unsigned long *)get_property(disp, client_list[i], XA_CARDINAL, "_WIN_WORKSPACE", NULL);
-    }
-    /* special desktop ID -1 means "all desktops", so we
-       have to convert the desktop value to signed long */
-    rb_hash_aset(window_obj, key_desktop, INT2NUM(desktop ? (signed long)*desktop : 0));
-
-    /* client machine */
-    client_machine = get_property(disp, client_list[i], XA_STRING, "WM_CLIENT_MACHINE", NULL);
-    rb_hash_aset(window_obj, key_client_machine, (client_machine ? RB_UTF8_STRING_NEW2(client_machine) : Qnil));
-
-    if (get_state) {
-      unsigned long *pid;
-      int x, y, junkx, junky;
-      unsigned long j;
-      unsigned int wwidth, wheight, bw, depth;
-      Window junkroot;
-      unsigned long state_size;
-      Atom *window_state;
-      gchar *state_name;
-      VALUE state_ary;
-      Atom *extents;
-      unsigned long extents_size;
-      VALUE extents_ary;
-      Atom *strut;
-      unsigned long strut_size;
-      VALUE strut_ary;
-
-      /* pid */
-      pid = (unsigned long *)get_property(disp, client_list[i], XA_CARDINAL, "_NET_WM_PID", NULL);
-      rb_hash_aset(window_obj, key_pid, (pid ? ULONG2NUM(*pid) : Qnil));
-      g_free(pid);
-
-      /* geometry */
-      XGetGeometry (disp, client_list[i], &junkroot, &junkx, &junky, &wwidth, &wheight, &bw, &depth);
-      XTranslateCoordinates (disp, client_list[i], junkroot, -bw, -bw, &x, &y, &junkroot);
-
-      rb_hash_aset(window_obj, key_geometry,
-		   rb_ary_new3(4, INT2NUM(x), INT2NUM(y), INT2NUM(wwidth), INT2NUM(wheight)));
-
-      /* state */
-      if ((window_state = (Atom *)get_property(disp, client_list[i],
-					       XA_ATOM, "_NET_WM_STATE", &state_size)) != NULL) {
-	state_ary = rb_ary_new();
-	for (j = 0; j < state_size / sizeof(Atom); j++) {
-	  state_name = XGetAtomName(disp, window_state[j]);
-	  rb_ary_push(state_ary, rb_str_new2(state_name));
-	  g_free(state_name);
-	}
-	g_free(window_state);
-      } else {
-	state_ary = Qnil;
-      }
-      rb_hash_aset(window_obj, key_state, state_ary);
-
-      /* frame extents */
-      if ((extents = (unsigned long *)get_property(disp, client_list[i],
-      						   XA_CARDINAL, "_NET_FRAME_EXTENTS", &extents_size)) != NULL) {
-	extents_ary = rb_ary_new();
-      	for (j = 0; j < extents_size / sizeof(unsigned long); j++) {
-      	  rb_ary_push(extents_ary, ULONG2NUM(extents[j]));
-      	}
-	/* exterior frame */
-	if (extents) {
-	  rb_hash_aset(window_obj, key_exterior_frame,
-		       rb_ary_new3(4, INT2NUM(x - (int)extents[0]), INT2NUM(y - (int)extents[2]),
-				   INT2NUM(wwidth + (int)extents[0] + (int)extents[1]),
-				   INT2NUM(wheight + (int)extents[2] + (int)extents[3])));
-	}
-      	g_free(extents);
-      } else {
-      	extents_ary = Qnil;
-      }
-      rb_hash_aset(window_obj, key_frame_extents, extents_ary);
-
-      /* strut partial or strut */
-      if ((strut = (unsigned long *)get_property(disp, client_list[i],
-						 XA_CARDINAL, "_NET_WM_STRUT_PARTIAL", &strut_size)) == NULL) {
-	strut = (unsigned long *)get_property(disp, client_list[i], XA_CARDINAL, "_NET_WM_STRUT", &strut_size);
-      }
-      if (strut) {
-	strut_ary = rb_ary_new();
-      	for (j = 0; j < strut_size / sizeof(unsigned long); j++) {
-      	  rb_ary_push(strut_ary, ULONG2NUM(strut[j]));
-      	}
-      	g_free(strut);
-      } else {
-      	strut_ary = Qnil;
-      }
-      rb_hash_aset(window_obj, key_strut, strut_ary);
-    }
-
-    rb_ary_push(window_ary, window_obj);
-
-    g_free(title_utf8);
-    g_free(desktop);
-    g_free(client_machine);
-    g_free(class_out);
+    rb_ary_push(window_ary, get_window_hash_data(client_list[i], disp, window_active, get_state));
   }
   g_free(client_list);
 
   return window_ary;
 }
 
+/*
+  @return [Hash] Hash of specified window data
+*/
+static VALUE rb_wmctrl_get_window_data (VALUE self, VALUE win_id_obj) {
+  Display **ptr, *disp;
+  Window win_id;
+  win_id = (Window) NUM2LONG(win_id_obj);
+  Data_Get_Struct(self, Display*, ptr);
+  disp = *ptr;
+  return get_window_hash_data(win_id, disp, -1, TRUE);
+}
+
 /*
   Get list of information of desktops.
   
@@ -1272,6 +1292,7 @@ void Init_wmctrl()
   rb_define_private_method(rb_wmctrl_class, "initialize", rb_wmctrl_initialize, -1);
 
   rb_define_method(rb_wmctrl_class, "list_windows", rb_wmctrl_list_windows, -1);
+  rb_define_method(rb_wmctrl_class, "get_window_data", rb_wmctrl_get_window_data, 1);
   rb_define_method(rb_wmctrl_class, "list_desktops", rb_wmctrl_list_desktops, 0);
   rb_define_method(rb_wmctrl_class, "switch_desktop", rb_wmctrl_switch_desktop, 1);
   rb_define_method(rb_wmctrl_class, "info", rb_wmctrl_info, 0);

data/lib/wmctrl/version.rb

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

data/lib/wmctrl/wmctrl.rb

@@ -16,13 +16,41 @@ class WMCtrl
   end
 
   class Desktop < DataHash
+    # Valid keys of the method [] are :id, :current, :title, :geometry, :viewport, and :workarea.
+
     [:id, :current, :title, :geometry, :viewport, :workarea].each do |key|
       define_method(key) do
         self[key]
       end
     end
 
-    # Valid keys of the method[] are :id, :current, :title, :geometry, :viewport, and :workarea.
+    def geometry_width
+      self[:geometry][0]
+    end
+
+    def geometry_height
+      self[:geometry][1]
+    end
+
+    # @return [Integer] X coordinate of Top left corner of workarea
+    def workarea_x
+      self[:workarea][0]
+    end
+
+    # @return [Integer] Y coordinate of Top left corner of workarea
+    def workarea_y
+      self[:workarea][1]
+    end
+
+    # @return [Integer] Width of workarea
+    def workarea_width
+      self[:workarea][2]
+    end
+
+    # @return [Integer] Height of workarea
+    def workarea_height
+      self[:workarea][3]
+    end
   end
 
   class Window < DataHash
@@ -57,8 +85,16 @@ class WMCtrl
       self[:active]
     end
 
+    STATE_FULLSCREEN = "_NET_WM_STATE_FULLSCREEN"
+
+    def fullscreen?
+      self[:state].include?(STATE_FULLSCREEN)
+    end
+
     def action(*args)
       WMCtrl.instance.action_window(self[:id], *args)
+      @data = WMCtrl.instance.get_window_data(self[:id])
+      self
     end
     private :action
 
@@ -100,6 +136,11 @@ class WMCtrl
       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)
     end
+
+    def position
+      a = self[:exterior_frame]
+      { :x => a[0], :y => a[1], :width => a[2], :height => a[3] }
+    end
   end
 
   # @return [Array] An array of WMCtrl::Desktop

data/ruby-wmctrl.gemspec

@@ -2,25 +2,24 @@
 $:.push File.expand_path("../lib", __FILE__)
 require "wmctrl/version"
 
-Gem::Specification.new do |s|
-  s.name        = "ruby-wmctrl"
-  s.version     = WMCtrl::VERSION
-  s.authors     = ["Takayuki YAMAGUCHI"]
-  s.email       = ["d@ytak.info"]
-  s.homepage    = ""
-  s.summary     = "Ruby bindings to control windows"
-  s.description = "Ruby bindings to control windows in EWMH and NetWM compatible X Window manager, which is created from source code of wmctrl command."
+Gem::Specification.new do |spec|
+  spec.name        = "ruby-wmctrl"
+  spec.version     = WMCtrl::VERSION
+  spec.authors     = ["Takayuki YAMAGUCHI"]
+  spec.email       = ["d@ytak.info"]
+  spec.homepage    = ""
+  spec.summary     = "Ruby bindings to control windows"
+  spec.description = "Ruby bindings to control windows in EWMH and NetWM compatible X Window manager, which is created from source code of wmctrl command."
+  spec.license = "GPLv2"
 
-  s.rubyforge_project = "ruby-wmctrl"
-
-  s.files         = `git ls-files`.split("\n")
-  s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
-  s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
-  s.require_paths = ["lib", "ext"]
-  s.extensions    = Dir.glob("ext/**/extconf.rb")
+  spec.files         = `git ls-files`.split("\n")
+  spec.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
+  spec.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
+  spec.require_paths = ["lib", "ext"]
+  spec.extensions    = Dir.glob("ext/**/extconf.rb")
 
   # specify any dependencies here; for example:
-  s.add_development_dependency "rspec"
-  s.add_development_dependency "yard"
-  s.add_runtime_dependency "pkg-config"
+  spec.add_development_dependency "rspec"
+  spec.add_development_dependency "yard"
+  spec.add_runtime_dependency "pkg-config"
 end

metadata

@@ -1,62 +1,55 @@
 --- !ruby/object:Gem::Specification
 name: ruby-wmctrl
 version: !ruby/object:Gem::Version
-  version: 0.0.5
-  prerelease: 
+  version: 0.0.6
 platform: ruby
 authors:
 - Takayuki YAMAGUCHI
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-08 00:00:00.000000000 Z
+date: 2013-11-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: pkg-config
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: Ruby bindings to control windows in EWMH and NetWM compatible X Window
@@ -69,8 +62,8 @@ extensions:
 - ext/extconf.rb
 extra_rdoc_files: []
 files:
-- .gitignore
-- .yardopts
+- ".gitignore"
+- ".yardopts"
 - COPYING
 - Gemfile
 - README.md
@@ -99,29 +92,29 @@ files:
 - spec/spec_helper.rb
 - spec/wmctrl_spec.rb
 homepage: ''
-licenses: []
+licenses:
+- GPLv2
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 - ext
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: ruby-wmctrl
-rubygems_version: 1.8.25
+rubyforge_project: 
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Ruby bindings to control windows
 test_files: []
 has_rdoc: