x11 0.0.1a2 → 0.0.1a3

data/lib/X11/Xlib/c/type/status.rb

@@ -1,26 +1,26 @@
 #--
 # 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
+#
+# THIS SOFTWARE IS PROVIDED BY meh ''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
+# FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL meh 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.
@@ -29,17 +29,17 @@
 module X11; module C
 
 module Status
-  extend FFI::DataConverter
+	extend FFI::DataConverter
 
-  native_type :int
+	native_type :int
 
-  def self.to_native (value, ctx)
-    value.to_i
-  end
+	def self.to_native (value, ctx)
+		value.to_i
+	end
 
-  def self.from_native (value, ctx)
-    X11::Status.new(value)
-  end
+	def self.from_native (value, ctx)
+		X11::Status.new(value)
+	end
 end
 
 FFI.typedef Status, :Status

data/lib/X11/Xlib/c/type/unmap_event.rb

@@ -1,38 +1,38 @@
 #--
 # 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
+#
+# THIS SOFTWARE IS PROVIDED BY meh ''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
+# FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL meh 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.
 #++
 
 class X11::C::XUnmapEvent < FFI::Struct
-  layout \
-    :type,           :int,
-    :serial,         :ulong,
-    :send_event,     :Bool,
-    :display,        :pointer,
-    :event,          :Window,
-    :window,         :Window,
-    :from_configure, :Bool
+	layout \
+		:type,           :int,
+		:serial,         :ulong,
+		:send_event,     :Bool,
+		:display,        :pointer,
+		:event,          :Window,
+		:window,         :Window,
+		:from_configure, :Bool
 end

data/lib/X11/Xlib/c/type/visibility_event.rb

@@ -1,37 +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
+#
+# THIS SOFTWARE IS PROVIDED BY meh ''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
+# FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL meh 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.
 #++
 
 class X11::C::XVisibilityEvent < FFI::Struct
-  layout \
-    :type,       :int,
-    :serial,     :ulong,
-    :send_event, :Bool,
-    :display,    :pointer,
-    :window,     :Window,
-    :state,      :int
+	layout \
+		:type,       :int,
+		:serial,     :ulong,
+		:send_event, :Bool,
+		:display,    :pointer,
+		:window,     :Window,
+		:state,      :int
 end

data/lib/X11/Xlib/c/type/visual.rb

@@ -1,39 +1,39 @@
 #--
 # 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
+#
+# THIS SOFTWARE IS PROVIDED BY meh ''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
+# FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL meh 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.
 #++
 
 class X11::C::Visual < FFI::Struct
-  layout \
-    :ext_data,     :pointer,
-    :visualid,     :VisualID,
-    :class,        :int,
-    :read_mask,    :ulong,
-    :green_mask,   :ulong,
-    :blue_mask,    :ulong,
-    :buts_per_rgb, :int,
-    :map_entries,  :int
+	layout \
+		:ext_data,     :pointer,
+		:visualid,     :VisualID,
+		:class,        :int,
+		:read_mask,    :ulong,
+		:green_mask,   :ulong,
+		:blue_mask,    :ulong,
+		:buts_per_rgb, :int,
+		:map_entries,  :int
 end

data/lib/X11/Xlib/c/type/window_attributes.rb

@@ -1,54 +1,54 @@
 #--
 # 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
+#
+# THIS SOFTWARE IS PROVIDED BY meh ''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
+# FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL meh 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.
 #++
 
 class X11::C::XWindowAttributes < FFI::Struct
-  layout \
-    :x,                     :int,
-    :y,                     :int,
-    :width,                 :int,
-    :height,                :int,
-    :border_width,          :int,
-    :depth,                 :int,
-    :visual,                :pointer,
-    :root,                  :Window,
-    :class,                 :int,
-    :bit_gravity,           :int,
-    :win_gravity,           :int,
-    :backing_store,         :int,
-    :backing_planes,        :ulong,
-    :backing_pixel,         :ulong,
-    :save_under,            :Bool,
-    :colormap,              :Colormap,
-    :map_installed,         :Bool,
-    :map_state,             :int,
-    :all_event_masks,       :long,
-    :your_event_masks,      :long,
-    :do_not_propagate_mask, :long,
-    :override_redirect,     :Bool,
-    :screen,                :pointer
+	layout \
+		:x,                     :int,
+		:y,                     :int,
+		:width,                 :int,
+		:height,                :int,
+		:border_width,          :int,
+		:depth,                 :int,
+		:visual,                :pointer,
+		:root,                  :Window,
+		:class,                 :int,
+		:bit_gravity,           :int,
+		:win_gravity,           :int,
+		:backing_store,         :int,
+		:backing_planes,        :ulong,
+		:backing_pixel,         :ulong,
+		:save_under,            :Bool,
+		:colormap,              :Colormap,
+		:map_installed,         :Bool,
+		:map_state,             :int,
+		:all_event_masks,       :long,
+		:your_event_masks,      :long,
+		:do_not_propagate_mask, :long,
+		:override_redirect,     :Bool,
+		:screen,                :pointer
 end

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

@@ -1,26 +1,26 @@
 #--
 # 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
+#
+# THIS SOFTWARE IS PROVIDED BY meh ''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
+# FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL meh 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.
@@ -31,11 +31,13 @@ require 'X11/Xdefs'
 
 require 'X11/Xlib/c/type/display'
 require 'X11/Xlib/c/type/gc'
+require 'X11/Xlib/c/type/gc_values'
 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/point'
 
 require 'X11/Xlib/c/type/any_event'
 require 'X11/Xlib/c/type/key_event'

data/lib/X11/Xlib/display.rb

@@ -1,201 +1,284 @@
 #--
 # 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
+#
+# THIS SOFTWARE IS PROVIDED BY meh ''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
+# FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL meh 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/display/extensions'
+
 module X11
 
 class Display
-  def self.from (pointer, options={})
-    Display.new(pointer, options.merge(:close => false))
-  end
-
-  def self.all
-    @displays ||= []
-  end
-
-  def self.finalizer (display)
-    proc {
-      C::XCloseDisplay(FFI::Pointer.new(display))
-    }
-  end
-
-  at_exit do
-    Display.all.each {|d|
-      Display.finalizer(d).call
-    }
-  end
-
-  attr_reader :options
-
-  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)
-    Screen.new(self, @display[:screens] + (which * C::Screen.size))
-  end
-
-  def default_screen
-    screen(@display[:default_screen])
-  end
-
-  def screens
-    Enumerator.new {
-      (0 ... @display[:nscreens]).map {|i|
-        yield screen(i)
-      }
-    }
-  end
-
-  [: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 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
-
-  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 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
-    pointer, @display = to_ffi, nil
-
-    Display.all.delete pointer.to_i
-
-    C::XCloseDisplay(pointer)
-  end
-
-  def to_ffi
-    raise RuntimeError, 'this Display is unusable because it has been closed' unless @display
-
-    @display.pointer
-  end
+	def self.open (*args)
+		name, options = if args.first.is_a?(Hash)
+			[nil, args.first]
+		else
+			args
+		end
+
+		X11::C::XOpenDisplay(name).tap! {|pointer|
+			raise ArgumentError, "could not connect to display #{name}" if pointer.null?
+
+			Display.new(pointer, options)
+		}.tap {|display|
+			X11::Extension.list.each {|extension|
+				display.extensions.load(extension)
+			}
+		}
+	end
+
+	include ForwardTo
+
+	attr_reader :options, :extensions
+	forward_to  :default_screen
+
+	def initialize (pointer, options={})
+		@internal   = pointer.is_a?(C::Display) ? pointer : C::Display.new(pointer)
+		@extensions = Extensions.new(self)
+
+		@options = {
+			:flush => true
+		}.merge(options || {})
+	end
+
+	C::Display.layout.members.each {|name|
+		define_method name do
+			@internal[name]
+		end
+	}
+
+	def name
+		C::XDisplayString(to_ffi)
+	end
+
+	def autoflush?;    !!options[:flush];       end
+	def autoflush!;    options[:flush] = true;  end
+	def no_autoflush!; options[:flush] = false; end
+
+	def flush
+		flush! if options[:flush]
+	end
+
+	def flush!
+		C::XFlush(to_ffi)
+	end
+
+	def sync! (discard=false)
+		C::XSync(to_ffi, discard)
+	end
+
+	def pending
+		C::XPending(to_ffi)
+	end
+
+	def screen (which)
+		Screen.new(self, @internal[:screens] + (which * C::Screen.size))
+	end
+
+	def default_screen
+		screen(@internal[:default_screen])
+	end
+
+	def screens
+		Enumerator.new {|e|
+			(0 ... @internal[:nscreens]).map {|i|
+				e.yield screen(i)
+			}
+		}
+	end
+
+	def window (id)
+		X11::Window.new(self, id.to_i)
+	end
+
+	def create_window (*args)
+		if args.first.is_a?(Hash)
+			X11::Window.create(args.first.tap {|args|
+				args[:display] = self
+			})
+		else
+			X11::Window.create(self, *args)
+		end
+	end
+
+	def grab_pointer (*args, &block)
+		default_screen.root_window.grab_pointer(*args, &block)
+	end
+
+	def ungrab_pointer (time=0)
+		C::XUngrabPointer(to_ffi, time)
+	end
+
+	def ungrab_key (*args, &block)
+		default_screen.root_window.ungrab_key(*args, &block)
+	end
+
+	def keysym_to_keycode (keysym)
+		return keysym if keysym.is_a?(Integer)
+
+		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
+
+	def next_event (what=nil, options=nil, &block)
+		what, options = if what.is_a?(Hash)
+			[Mask::Event.all, what]
+		else
+			[what, options || {}]
+		end
+
+		event = FFI::MemoryPointer.new(C::XEvent)
+
+# this would be cool, but it's slow as hell, if anyone finds a way to optimize it, let me know
+=begin
+		callback = FFI::Function.new(:Bool, [:pointer, :pointer, :pointer]) {|_, event|
+			event = Event.new(event)
+
+			if event.matches?(what)
+				block ? block.call(event) : true
+			end
+		}
+
+		unless options[:blocking?] == false
+			unless options[:delete] == false
+				C::XIfEvent(to_ffi, event, callback, nil)
+			else
+				C::XPeekIfEvent(to_ffi, event, callback, nil)
+			end
+		else
+			if options[:delete] == true
+				raise ArgumentError, 'cannot delete and not block at the same time'
+			end
+
+			C::XCheckIfEvent(to_ffi, event, callback, nil) or return
+		end
+=end
+
+		if block
+			callback = FFI::Function.new(:Bool, [:pointer, :pointer, :pointer]) do |_, event|
+				block.call Event.new(event)
+			end
+
+			if options[:blocking?] == false
+				C::XCheckIfEvent(to_ffi, event, callback, nil) or return
+
+				if options[:delete] == false
+					C::XPutBackEvent(to_ffi, event.to_ffi)
+				end
+			else
+				if options[:delete] != false
+					C::XIfEvent(to_ffi, event, callback, nil)
+				else
+					C::XPeekIfEvent(to_ffi, event, callback, nil)
+				end
+			end
+		else
+			if what.is_a?(Symbol) && options[:blocking?] != false
+				raise ArgumentError, 'cannot look for event by type and block'
+			end
+
+			if !what.is_a?(Symbol) && options[:blocking?] != false
+				if options[:delete] != false
+					if what
+						C::XMaskEvent(to_ffi, what.to_ffi, event)
+					else
+						C::XNextEvent(to_ffi, event)
+					end
+				else
+					C::XPeekEvent(to_ffi, event)
+				end
+			else
+				if what.is_a?(Symbol)
+					C::XCheckTypedEvent(to_ffi, Event.index(what), event) or return
+				else
+					C::XCheckMaskEvent(to_ffi, what.to_ffi, event) or return
+				end
+
+				if options[:delete] == false
+					C::XPutBackEvent(to_ffi, event.to_ffi)
+				end
+			end
+		end
+
+		Event.new(event)
+	end
+
+	def each_event (what=nil, options=nil, &block)
+		return unless block
+
+		catch(:skip) {
+			loop {
+				next_event(what, options).tap {|event|
+					if !event
+						return if options[:blocking] == false
+						next
+					end
+
+					block.call event
+				}
+			}
+		}
+	end
+
+	def close
+		C::XCloseDisplay(to_ffi)
+
+		methods.each {|name|
+			next if (Object.instance_method(name) rescue false)
+
+			define_singleton_method name do |*|
+				raise RuntimeError, 'this Display is unusable because it has been closed'
+			end
+		}
+	end
+
+	def atom (name)
+		Atom[name, self]
+	end
+
+	def to_ffi
+		@internal.pointer
+	end
 end
 
 end