x11 0.0.1a1 → 0.0.1a2

data/lib/X11/Xlib/c/types.rb

@@ -34,6 +34,8 @@ require 'X11/Xlib/c/type/gc'
 require 'X11/Xlib/c/type/screen'
 require 'X11/Xlib/c/type/window_attributes'
 require 'X11/Xlib/c/type/visual'
+require 'X11/Xlib/c/type/key_sym'
+require 'X11/Xlib/c/type/status'
 
 require 'X11/Xlib/c/type/any_event'
 require 'X11/Xlib/c/type/key_event'

data/lib/X11/Xlib/display.rb

@@ -29,26 +29,72 @@
 module X11
 
 class Display
-  def initialize (name=nil)
-    pointer  = (name.is_a?(String) or !name) ? X11::C::XOpenDisplay(name) : name
-    @display = pointer.is_a?(C::Display) ? pointer : pointer.typecast(C::Display)
+  def self.from (pointer, options={})
+    Display.new(pointer, options.merge(:close => false))
   end
 
-  def ungrab_pointer (time=0)
-    C::XUngrabPointer(to_c, time)
+  def self.all
+    @displays ||= []
   end
 
-  def keysym_to_keycode (keysym)
-    C::XKeysymToKeycode(to_c, keysym)
+  def self.finalizer (display)
+    proc {
+      C::XCloseDisplay(FFI::Pointer.new(display))
+    }
   end
 
-  def check_typed_event (event)
-    event = Event.index(event)
-    ev    = FFI::MemoryPointer.new(C::XEvent)
+  at_exit do
+    Display.all.each {|d|
+      Display.finalizer(d).call
+    }
+  end
 
-    C::XCheckTypedEvent(to_c, event, ev) or return
+  attr_reader :options
 
-    Event.new(ev)
+  def initialize (*args)
+    name, options = if args.first.is_a?(Hash)
+      [nil, args.first]
+    else
+      args
+    end
+
+    @display = if name.is_a?(FFI::Pointer)
+      name
+    elsif name.is_a?(C::Display)
+      name.pointer
+    else
+      X11::C::XOpenDisplay(name)
+    end.typecast(C::Display)
+
+    if @display.pointer.null?
+      raise ArgumentError, "could not connect to display #{name}"
+    end
+
+    @options = {
+      :flush => true
+    }.merge(options || {})
+
+    if @options[:close]
+      ObjectSpace.define_finalizer self, self.class.finalizer(to_ffi.to_i)
+    else
+      (Display.all << to_ffi.to_i).uniq!
+    end
+  end
+
+  C::Display.layout.members.each_with_index {|name, index|
+    define_method name do
+      @display[name]
+    end
+  }
+
+  def flush
+    return unless options[:flush]
+    
+    flush!
+  end
+
+  def flush!
+    C::XFlush(to_ffi)
   end
 
   def screen (which)
@@ -60,40 +106,94 @@ class Display
   end
 
   def screens
-    (0 ... @display[:nscreens]).map {|i|
-      screen(i)
+    Enumerator.new {
+      (0 ... @display[:nscreens]).map {|i|
+        yield screen(i)
+      }
     }
   end
 
-  def width (index=nil)
-    if index
-      screen(index).width
-    else
-      default_screen.width
+  [:root_window, :width, :height].each {|name|
+    define_method name do
+      default_screen.__send__ name
     end
+  }
+
+  def grab_pointer (*args)
+    default_screen.root_window.grab_pointer(*args)
   end
 
-  def next_event
-    ev = FFI::MemoryPointer.new(C::XEvent)
+  def ungrab_pointer (time=0)
+    C::XUngrabPointer(to_ffi, time)
+  end
+
+  def keysym_to_keycode (keysym)
+    C::XKeysymToKeycode(to_ffi, keysym)
+  end
+
+  def focused
+    window = FFI::MemoryPointer.new :Window
+    revert = FFI::MemoryPointer.new :int
+
+    C::XGetInputFocus(to_ffi, window, revert)
+
+    Window.new(self, window.typecast(:Window)).tap {|w|
+      w.revert_to = revert.typecast(:int)
+    }
+  end
+
+  def focus (window, revert=:ToParent, time=0)
+    C::XSetInputFocus(to_ffi, window.to_ffi, revert.is_a?(Integer) ? revert : RevertTo[revert], time)
+  end
+
+  def allow_events (mode, time=0)
+    C::XAllowEvents(to_ffi, mode, time)
+  end
 
-    C::XNextEvent(to_c, ev)
+  def check_typed_event (event)
+    event = Event.index(event)
+    ev    = FFI::MemoryPointer.new(C::XEvent)
+
+    C::XCheckTypedEvent(to_ffi, event, ev) or return
 
     Event.new(ev)
   end
 
-  def each_event
-    loop {
-      next_event.tap {|ev|
-        yield ev if block_given?
+  def next_event (mask=nil)
+    event = FFI::MemoryPointer.new(C::XEvent)
+
+    if mask
+      C::XMaskEvent(to_ffi, mask.to_ffi, event)
+    else
+      C::XNextEvent(to_ffi, event)
+    end
+
+    Event.new(event)
+  end
+
+  def each_event (mask=nil, &block)
+    return unless block
+
+    catch(:skip) {
+      loop {
+        next_event(mask).tap {|event|
+          block.call event
+        }
       }
     }
   end
 
   def close
-    C::XCloseDisplay(to_c)
+    pointer, @display = to_ffi, nil
+
+    Display.all.delete pointer.to_i
+
+    C::XCloseDisplay(pointer)
   end
 
-  def to_c
+  def to_ffi
+    raise RuntimeError, 'this Display is unusable because it has been closed' unless @display
+
     @display.pointer
   end
 end

data/lib/X11/Xlib/event.rb

@@ -31,6 +31,21 @@ require 'X11/Xlib/events'
 module X11
 
 class Event
+  module Mode
+    AsyncPointer   = 0
+    SyncPointer    = 1
+    ReplayPointer  = 2
+    AsyncKeyboard  = 3
+    SyncKeyboard   = 4
+    ReplayKeyboard = 5
+    AsyncBoth      = 6
+    SyncBoth       = 7
+
+    def self.[] (name)
+      const_get name
+    end
+  end
+
   def self.index (event)
     Events.to_a.index(event)
   end

data/lib/X11/Xlib/event/generic_event.rb

@@ -29,7 +29,7 @@
 class X11::Event::GenericEvent < X11::Event::Helper
   attribute :xgeneric
 
-  manage :display, X11::Display
+  manage :display, X11::Event::Display
   manage :resourceid
   manage :serial
   manage :error_code

data/lib/X11/Xlib/event/helper.rb

@@ -36,7 +36,11 @@ class Helper
   end
 
   def self.attribute (which=nil)
-    @attribute = which.to_s.to_sym if which
+    if which
+      @attribute = which.to_s.to_sym
+    else
+      @attribute
+    end
   end
 
   def self.attach_method (meth, &block)
@@ -59,31 +63,31 @@ class Helper
     case args.size
     when 0
       attach_method(new) {
-        struct[@attribute][original]
+        to_ffi[self.class.attribute][original]
       }
 
       attach_method("#{new}=") {|x|
-        struct[@attribute][original] = x
+        to_ffi[self.class.attribute][original] = x
       }
     when 1
       if args.first.is_a?(Class)
         attach_method(new) {
-          args.first.new(struct[@attribute][original])
+          args.first.new(to_ffi[self.class.attribute][original])
         }
 
         attach_method("#{new}=") {|x|
-          struct[@attribute][original] = x.to_c
+          to_ffi[self.class.attribute][original] = x.to_ffi
         }
       else
         manage([original, new], args.first, nil)
       end
     when 2
       attach_method(new) {
-        self.instance_exec(struct[@attribute][original], &args[0])
+        instance_exec(to_ffi[self.class.attribute][original], &args[0])
       } if args[0]
 
       attach_method("#{new}=") {|x|
-        struct[attribute][original] = self.instance_exec(x, &args[1])
+        to_ffi[attribute][original] = instance_exec(x, &args[1])
       } if args[1]
     end
   end
@@ -92,23 +96,25 @@ class Helper
     @struct = struct
   end
 
-  def struct
+  def to_ffi
     @struct
   end
-
-  alias to_c struct
 end
 
 X11::Event::Window = [lambda {|w|
-  X11::Event::Window.new(display, w)
-}, lambda(&:to_c)]
+  X11::Window.new(display, w)
+}, lambda(&:to_ffi)]
+
+X11::Event::Display = [lambda {|pointer|
+  X11::Display.from(pointer)
+}, lambda(&:to_ffi)]
 
 module X11::Event::Common
   def self.included (klass)
     klass.class_eval {
       manage :serial
       manage [:send_event, :send_event?]
-      manage :display, X11::Display
+      manage :display, X11::Event::Display
       manage :window, X11::Event::Window
     }
   end

data/lib/X11/Xlib/exceptions.rb

@@ -0,0 +1,37 @@
+#--
+# Copyleft meh. [http://meh.paranoid.pk | meh@paranoici.org]
+# 
+# Redistribution and use in source and binary forms, with or without modification, are
+# permitted provided that the following conditions are met:
+# 
+#    1. Redistributions of source code must retain the above copyright notice, this list of
+#       conditions and the following disclaimer.
+# 
+#    2. Redistributions in binary form must reproduce the above copyright notice, this list
+#       of conditions and the following disclaimer in the documentation and/or other materials
+#       provided with the distribution.
+# 
+# THIS SOFTWARE IS PROVIDED BY <COPYRIGHT HOLDER> ''AS IS'' AND ANY EXPRESS OR IMPLIED
+# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+# FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL <COPYRIGHT HOLDER> OR
+# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+# SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+# ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+# NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# 
+# The views and conclusions contained in the software and documentation are those of the
+# authors and should not be interpreted as representing official policies, either expressed
+# or implied.
+#++
+
+module X11; module Exceptions
+
+class InvalidKeysym < Exception
+  def initialize
+    super('Invalid keysym')
+  end
+end
+
+end; end

data/lib/X11/Xlib/hints.rb

@@ -0,0 +1,49 @@
+#--
+# Copyleft meh. [http://meh.paranoid.pk | meh@paranoici.org]
+# 
+# Redistribution and use in source and binary forms, with or without modification, are
+# permitted provided that the following conditions are met:
+# 
+#    1. Redistributions of source code must retain the above copyright notice, this list of
+#       conditions and the following disclaimer.
+# 
+#    2. Redistributions in binary form must reproduce the above copyright notice, this list
+#       of conditions and the following disclaimer in the documentation and/or other materials
+#       provided with the distribution.
+# 
+# THIS SOFTWARE IS PROVIDED BY <COPYRIGHT HOLDER> ''AS IS'' AND ANY EXPRESS OR IMPLIED
+# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+# FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL <COPYRIGHT HOLDER> OR
+# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+# SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+# ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+# NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# 
+# The views and conclusions contained in the software and documentation are those of the
+# authors and should not be interpreted as representing official policies, either expressed
+# or implied.
+#++
+
+require 'X11/Xlib/hints/icon'
+
+module X11
+
+class Hints
+  attr_reader :flags, :state, :icon, :group
+
+  def initialize (flags, input, state, icon, group)
+    @flags = flags
+    @input = input
+    @state = state
+    @icon  = icon
+    @group = group
+  end
+
+  def input?
+    @input
+  end
+end
+
+end

data/lib/X11/Xlib/hints/flags.rb

@@ -0,0 +1,42 @@
+#--
+# Copyleft meh. [http://meh.paranoid.pk | meh@paranoici.org]
+# 
+# Redistribution and use in source and binary forms, with or without modification, are
+# permitted provided that the following conditions are met:
+# 
+#    1. Redistributions of source code must retain the above copyright notice, this list of
+#       conditions and the following disclaimer.
+# 
+#    2. Redistributions in binary form must reproduce the above copyright notice, this list
+#       of conditions and the following disclaimer in the documentation and/or other materials
+#       provided with the distribution.
+# 
+# THIS SOFTWARE IS PROVIDED BY <COPYRIGHT HOLDER> ''AS IS'' AND ANY EXPRESS OR IMPLIED
+# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+# FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL <COPYRIGHT HOLDER> OR
+# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+# SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+# ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+# NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# 
+# The views and conclusions contained in the software and documentation are those of the
+# authors and should not be interpreted as representing official policies, either expressed
+# or implied.
+#++
+
+module X11; class Hints
+
+Flags = Bitmap.new(
+  :Input        => (1 << 0),
+  :State        => (1 << 1),
+  :IconPixmap   => (1 << 2),
+  :IconWindow   => (1 << 3),
+  :IconPosition => (1 << 4),
+  :IconMask     => (1 << 5),
+  :WindowGroup  => (1 << 6),
+  :Urgency      => (1 << 8)
+)
+
+end; end