active_window_x 0.1.2 → 0.2.0

data/ext/active_window_x/extconf.rb

@@ -1,7 +1,20 @@
 require "mkmf"
 
+map = {
+  '1.8.' => 'RUBY_1_8',
+  '1.9.' => 'RUBY_1_9',
+}
+version, micro = map.find do |v, m|
+  RUBY_VERSION.start_with? v
+end
+
+if micro.nil?
+then abort "Not supported ruby version: #{RUBY_VERSION}"
+else $defs << "-D#{micro}"
+end
+
 if have_library('X11')
   create_makefile "active_window_x/xlib"
 else
-  raise "Cannot found X11"
+  abort "Cannot found X11"
 end

data/ext/active_window_x/xlib.c

@@ -324,7 +324,6 @@ VALUE x_event_new(XEvent *xevent) {
 VALUE xlib_x_next_event(VALUE self, VALUE display_obj) {
   Display *display;
   XEvent *event_return;
-  VALUE event_obj;
 
   GetDisplay(display_obj, display);
   event_return = ALLOC(XEvent);
@@ -345,13 +344,15 @@ VALUE xlib_x_set_wm_protocols(VALUE self, VALUE display_obj, VALUE w_obj,
   Display *display;
   Window w;
   Atom *atom_ary;
-  int count, s, len, i;
+  int count, s, i;
 
   GetDisplay(display_obj, display);
+  count = RARRAY_LEN(atom_ary_obj);
+  atom_ary = ALLOC_N(Atom, count);
+  for (i=0; i<count; i++)
+    atom_ary[i] = RARRAY_PTR(atom_ary_obj)[i];
+
   w = (Window) NUM2ULONG(w_obj);
-  count = RARRAY(atom_ary_obj)->len;
-  atom_ary = ALLOC_N(Atom, len);
-  for (i=0; i<count; i++) atom_ary[i] = RARRAY(atom_ary_obj)->ptr[i];
 
   s = XSetWMProtocols(display, w, atom_ary, count);
   raise_if_xerror_occurred();

data/lib/active_window_x.rb

@@ -1,4 +1,4 @@
-# -*- coding:undecided-unix; mode:ruby; -*-
+# -*- coding:utf-8; mode:ruby; -*-
 
 require "active_window_x/version"
 require "active_window_x/xlib"

data/lib/active_window_x/version.rb

@@ -1,3 +1,3 @@
 module ActiveWindowX
-  VERSION = "0.1.2"
+  VERSION = "0.2.0"
 end

data/spec/atom_spec.rb

@@ -6,8 +6,8 @@ include ActiveWindowX
 
 describe Atom do
   before do
-    @raw_display = mock Xlib::Display
-    @display = mock Display
+    @raw_display = double Xlib::Display
+    @display = double Display
     @display.stub(:raw){@raw_display}
     @display.stub(:kind_of?).with(Display).and_return(true)
     @id = 123

data/spec/display_spec.rb

@@ -6,7 +6,7 @@ include ActiveWindowX
 
 describe Display do
   before do
-    @display_raw = mock Xlib::Display
+    @display_raw = double Xlib::Display
     Xlib.stub(:x_open_display).and_return(@display_raw)
     @display = Display.new nil
     @root_id = 9999
@@ -26,7 +26,7 @@ describe Display do
     before do
       @root = @display.root_window
       @root.select_input Xlib::PropertyChangeMask
-      @event = mock Xlib::XPropertyEvent
+      @event = double Xlib::XPropertyEvent
       @event.stub(:type){@type}
       @event.stub(:serial){1000}
       @event.stub(:send_event){0}

data/spec/root_window_spec.rb

@@ -6,7 +6,7 @@ include ActiveWindowX
 
 describe RootWindow do
   before do
-    @display_raw = mock Xlib::Display
+    @display_raw = double Xlib::Display
     @display_raw.stub(:kind_of?).with(Data).and_return(true)
     Xlib.stub(:x_open_display).and_return(@display_raw)
     @display = Display.new

data/spec/window_spec.rb

@@ -6,8 +6,8 @@ include ActiveWindowX
 
 describe Window do
   before do
-    @raw_display = mock Xlib::Display
-    @display = mock Display
+    @raw_display = double Xlib::Display
+    @display = double Display
     @display.stub(:raw){@raw_display}
     @display.stub(:kind_of?).with(Display).and_return(true)
     @id = 123456

data/spec/xlib_spec.rb

@@ -1,7 +1,6 @@
 # -*- coding:utf-8; mode:ruby; -*-
 
 require 'active_window_x'
-require 'dl'
 
 include ActiveWindowX
 
@@ -149,14 +148,13 @@ describe Xlib do
       it 'should return a Array such as [Xlib::None, ]' do
         r = Xlib::x_get_window_property(@display, @window, @atom, 0, @length, false, 10)
         p r
-        r.shift.should == @window_atom
-        r.shift.should == 32
-        r.shift.should == 0
-        r.shift.should # == DL::sizeof('l')
-        r.length.should == 1
+        r[0].should == @window_atom
+        r[1].should == 32
+        r[2].should == 0
+        r.length.should == 5
       end
     end
-    context 'with an validi type and a propery named as "_NET_ACTIVE_WINDOW"' do
+    context 'with an valid type and a propery named as "_NET_ACTIVE_WINDOW"' do
       before do
         @name = "_NET_ACTIVE_WINDOW"
         @atom = Xlib::x_intern_atom @display, @name, false
@@ -165,11 +163,10 @@ describe Xlib do
       it 'should return a Array such as [Xlib::None, ]' do
         r = Xlib::x_get_window_property(@display, @window, @atom, 0, @length, false, @window_atom)
         p r
-        r.shift.should == @window_atom
-        r.shift.should == 32
-        l = r.shift
-        r.shift.should
-        r.shift.length == DL::sizeof('l') * l
+        r[0].should == @window_atom
+        r[1].should == 32
+        r[2].should == 1
+        r.length.should == 5
       end
     end
   end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: active_window_x
 version: !ruby/object:Gem::Version 
-  hash: 31
+  hash: 23
   prerelease: 
   segments: 
   - 0
-  - 1
   - 2
-  version: 0.1.2
+  - 0
+  version: 0.2.0
 platform: ruby
 authors: 
 - Keiichiro Ui
@@ -15,7 +15,8 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-06-06 00:00:00 Z
+date: 2014-02-11 00:00:00 +09:00
+default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rake
@@ -95,6 +96,7 @@ files:
 - spec/root_window_spec.rb
 - spec/window_spec.rb
 - spec/xlib_spec.rb
+has_rdoc: true
 homepage: https://github.com/kui/active_window_x
 licenses: []
 
@@ -124,7 +126,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.8.15
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: observer an active window on Linux (X Window System).