x11 0.0.1a2 → 0.0.1a3

data/lib/X11/Xlib/window/attributes.rb

@@ -1,67 +1,100 @@
 #--
 # 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.
 #++
 
-module X11; class Window
+module X11; class Window < Drawable
 
 class Attributes
-  def initialize (attributes)
-    @attributes = attributes.is_a?(C::XWindowAttributes) ? attributes : attributes.typecast(C::XWindowAttributes)
-  end
-
-  C::XWindowAttributes.layout.members.each_with_index {|name, index|
-    define_method name do
-      @attributes[name]
-    end
-  }
-
-  def override_redirect?
-    @attributes[:override_redirect]
-  end
-
-  def save_under?
-    @attributes[:save_under]
-  end
-
-  def map_installed?
-    @attributes[:map_installed]
-  end
-
-  def root
-    Window.new(@attributes[:root])
-  end
-
-  def visual
-    Visual.new(@attributes[:visual])
-  end
-
-  def screen
-    Screen.new(@attributes[:screen])
-  end
+	attr_reader :window
+
+	def initialize (window, attributes=nil)
+		@window     = window
+		@attributes = if attributes
+			attributes.is_a?(C::XWindowAttributes) ? attributes : attributes.typecast(C::XWindowAttributes)
+		else
+			C::XWindowAttributes.new
+		end
+	end
+
+	C::XWindowAttributes.layout.members.each {|name|
+		next if respond_to? name
+
+		define_method name do
+			@attributes[name]
+		end
+	}
+
+	def input_only?
+		@attributes[:class] == 2
+	end
+
+	def unmapped?
+		@attributes[:map_state] == 0
+	end
+
+	def unviewable?
+		@attributes[:map_state] == 1
+	end
+
+	def viewable?
+		@attributes[:map_state] == 2
+	end
+
+	def override_redirect?
+		@attributes[:override_redirect]
+	end
+
+	def save_under?
+		@attributes[:save_under]
+	end
+
+	def map_installed?
+		@attributes[:map_installed]
+	end
+
+	def root
+		Window.new(window.display, @attributes[:root])
+	end
+
+	def visual
+		Visual.new(window.display, @attributes[:visual])
+	end
+
+	def screen
+		Screen.new(window.display, @attributes[:screen])
+	end
+
+	def save
+
+	end
+
+	def to_ffi
+		@attributes
+	end
 end
 
 end; end

data/lib/X11/Xlib/window/properties.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.
@@ -28,39 +28,58 @@
 
 require 'X11/Xlib/window/properties/property'
 
-module X11; class Window
+module X11; class Window < Drawable
 
 class Properties
-  include Enumerable
-  extend  Forwardable
-
-  attr_reader    :window
-  def_delegators :@window, :display
-  
-  def initialize (window)
-    @window = window
-  end
-
-  def each (&block)
-    number = FFI::MemoryPointer.new :int
-    list   = C::XListProperties(display.to_ffi, window.to_ffi, number)
-    
-    return if list.null?
-      
-    list.read_array_of(:Atom, number.typecast(:int)).each {|atom|
-      block.call Property.new(window, Atom.new(atom.to_i, display))
-    }
-
-    C::XFree(list)
-
-    self
-  end
-
-  def [] (name)
-    find {|property|
-      property.name == name.to_s
-    }
-  end
+	include Enumerable
+	extend  Forwardable
+
+	attr_reader    :window
+	def_delegators :@window, :display
+
+	def initialize (window)
+		@window = window
+	end
+
+	def [] (atom)
+		if !(property = Property.new(window, Atom[atom, display])).nil?
+			property
+		end
+	end
+
+	def []= (atom, value, type=nil)
+		Property.new(window, Atom[atom, display]).value = value, type
+	end
+
+	def has? (atom)
+		!!self[atom]
+	end
+
+	def delete (atom)
+		C::XDeleteProperty(display.to_ffi, window.to_ffi, Atom[atom, display].to_ffi)
+	end
+
+	def rotate (properties, positions=1)
+		array = FFI::MemoryPointer.new(:Atom, properties.length)
+		array.write_array_of(:Atom, properties.map { |name| name.to_ffi })
+
+		C::XRotateWindowProperties(display.to_ffi, window.to_ffi, array, properties.length, positions)
+	end
+
+	def each (&block)
+		number = FFI::MemoryPointer.new :int
+		list   = C::XListProperties(display.to_ffi, window.to_ffi, number)
+
+		return self if list.null?
+
+		list.read_array_of(:Atom, number.typecast(:int)).each {|atom|
+			block.call Property.new(window, Atom.new(atom.to_i, display))
+		}
+
+		C::XFree(list)
+
+		self
+	end
 end
 
 end; end

data/lib/X11/Xlib/window/properties/property.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.
@@ -28,71 +28,136 @@
 
 require 'X11/Xlib/window/properties/property/parser'
 
-module X11; class Window; class Properties
+module X11; class Window < Drawable; class Properties
 
 class Property
-  @transforms = {
-    :default => Transform.new(:default) {
-      input do |property, data|
-        data
-      end
-
-      output do |property, data|
-        data
-      end
-    }
-  }
-
-  def self.register (name, &block)
-    @transforms[name.to_s] = Transform.new(name, &block)    
-  end
-
-  def self.transform (property)
-    (@transforms[property.name] || @transforms[:default]).for(property)
-  end
-
-  MaxLength = 500000
-
-  extend Forwardable
-
-  attr_reader    :window, :atom, :value
-  def_delegators :@window, :display
-  def_delegators :@atom, :to_s, :to_i, :to_ffi
-  def_delegator  :@atom, :to_s, :name
-
-  def initialize (window, atom)
-    @window = window
-    @atom   = atom
-
-    @value = Retarded.new {
-      type     = FFI::MemoryPointer.new :Atom
-      format   = FFI::MemoryPointer.new :int
-      length   = FFI::MemoryPointer.new :ulong
-      after    = FFI::MemoryPointer.new :ulong
-      property = FFI::MemoryPointer.new :pointer
-
-      return unless C::XGetWindowProperty(display.to_ffi, window.to_ffi, atom.to_ffi,
-        0, (MaxLength + 3) / 4, false, AnyProperty, type, format, length, after, property).ok?
-
-      size   = format.typecast(:int)
-      length = [length.typecast(:ulong) * FFI.type_size({ 8 => :char, 16 => :short, 32 => :long }[size]), MaxLength].min
-        
-      @type = Atom.new(type.typecast(:Atom).to_i, display)
-
-      Property.transform(self).output(Property::Parser.parse(self, property.typecast(:pointer).read_string(length)))
-    }
-  end
-
-  def type
-    @type or (~@value; @type)
-  end
-
-  def inspect
-    "#<X11::Window::Property(#{name}): #{type}#{" #{value.inspect}" unless value.nil?}>"
-  end
+	module Mode
+		Replace = 0
+		Prepend = 1
+		Append  = 2
+
+		def self.[] (what)
+			what.is_a?(Integer) ? what : const_get(what.to_s.downcase.capitalize)
+		end
+	end
+		
+	Transforms = {
+		default: Transform.new(:default) {
+			output do |property, data|
+				data
+			end
+
+			input do |property, value, type|
+				[value, type]
+			end
+		}
+	}
+
+	def self.register (name, &block)
+		Transforms[name.to_s] = Transform.new(name, &block)
+	end
+
+	def self.transform (property)
+		(Transforms[property.name] || Transforms[:default]).for(property)
+	end
+
+	MaxLength = 500000
+
+	extend Forwardable
+
+	attr_reader    :window, :value
+	def_delegators :@window, :display
+	def_delegators :@atom, :to_s, :to_i, :to_ffi
+	def_delegator  :@atom, :to_s, :name
+
+	def initialize (window, name)
+		@window = window
+		@atom   = name
+	end
+
+	def nil?
+		value.nil?
+	end
+
+	def value
+		type     = FFI::MemoryPointer.new :Atom
+		format   = FFI::MemoryPointer.new :int
+		length   = FFI::MemoryPointer.new :ulong
+		after    = FFI::MemoryPointer.new :ulong
+		property = FFI::MemoryPointer.new :pointer
+
+		return unless C::XGetWindowProperty(display.to_ffi, window.to_ffi, to_ffi,
+			0, (MaxLength + 3) / 4, false, AnyProperty, type, format, length, after, property).ok?
+
+		return if property.typecast(:pointer).null?
+
+		Property.transform(self).output(Property::Parser.parse(self).output(
+			property.typecast(:pointer).read_string(
+				[length.typecast(:ulong) * FFI.type_size(
+					{ 0 => :void, 8 => :char, 16 => :short, 32 => :long }[format.typecast(:int)]), MaxLength].min)))
+	end
+
+	def value= (value, type=nil, mode=:replace)
+		type ||= self.type
+
+		format, data, length = Property::Parser.parse(self).input(*Property.transform(self).input(
+			value.is_a?(Array) ? value : [value], type))
+
+		C::XChangeProperty(display.to_ffi, window.to_ffi, to_ffi, type.to_ffi, format, Mode[mode], data, length)
+
+		display.flush
+	end
+
+	def << (value, type=nil)
+		self.value = value, type, :append
+	end
+
+	def >> (value, type=nil)
+		self.value = value, type, :prepend
+	end
+
+	def type
+		@type ? @type : type?
+	end
+
+	def type?
+		type     = FFI::MemoryPointer.new :Atom
+		format   = FFI::MemoryPointer.new :int
+		length   = FFI::MemoryPointer.new :ulong
+		after    = FFI::MemoryPointer.new :ulong
+		property = FFI::MemoryPointer.new :pointer
+
+		return unless C::XGetWindowProperty(display.to_ffi, window.to_ffi, to_ffi,
+			0, (MaxLength + 3) / 4, false, AnyProperty, type, format, length, after, property).ok?
+
+		return if property.typecast(:pointer).null?
+
+		Atom.new(type.typecast(:Atom).to_i, display)
+	end
+
+	def type!
+		@type = nil
+		type?
+	end
+
+	def type= (type)
+		@type = type
+	end
+
+	def rotate (positions=1)
+		array = FFI::MemoryPointer.new(:Atom)
+		array.write(to_ffi, :Atom)
+
+		C::XRotateWindowProperties(display.to_ffi, window.to_ffi, array, 1, positions)
+	end
+
+	def inspect
+		if nil?
+			"#<X11::Window::Property(#{name})>"
+		else
+			"#<X11::Window::Property(#{name}): #{type}#{" #{value.inspect}" unless value.nil?}>"
+		end
+	end
 end
 
 end; end; end
-
-require 'X11/Xlib/window/properties/property/class'
-require 'X11/Xlib/window/properties/property/command'