xlib-objects 0.4.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4658e68ce4cbae5cf14d45379d8866754d0b230a
-  data.tar.gz: 933215482798422789ccaf799af996960d2e8eed
+  metadata.gz: 88f009cd9b2bead97318e62d2dc2eb5398156d2e
+  data.tar.gz: 038d2d50a883a97dfda1442a046b86f420905e20
 SHA512:
-  metadata.gz: a303e9c96e74040b2d2a6a2731adcece55911d818046d093d22de2af2dfe7fc09bb10c09d769d0935971526e241b59185d6481ca8e125db3d46285db5b7a62cb
-  data.tar.gz: f6d1fadb43dc41a79f7a19b55c422e64d90fc935ae16316261d09c4eb2f28239ed0bc1ca8f8941f0a2175827cfdb6d00365bb7c7b7a8cda91440619b1a6f69b0
+  metadata.gz: 1ef8e3f5832173185ec963d433a90ad7e64b3669caba19517a93e58ecca8390a07af1344e4d545e207eb4be6603b94906f0bd184624d03b7fb9721369d064e51
+  data.tar.gz: 8f5b9e742bff08d20c45e989938886a5f8c1a3a756da3ec3f131429e0b2cf9735f880c43e2ea540cd2095d895c2e59abdabd87ff642290a06ee59539897614c4

data/lib/display.rb

@@ -49,9 +49,13 @@ module XlibObj
       handle_event(next_event) while pending_events > 0
     end
 
-    def clipboard(type = :CLIPBOARD, &on_receive)
-      @internal_window ||= screen.root_window.create_window
-      @internal_window.request_selection(type: type, &on_receive)
+    def selection(*args, &on_receive)
+      internal_window.request_selection(*args, &on_receive)
+      self
+    end
+
+    def set_selection(*args, &on_request)
+      internal_window.set_selection(*args, &on_request)
       self
     end
 
@@ -84,6 +88,10 @@ module XlibObj
 
     private
 
+    def internal_window
+      @internal_window ||= screen.root_window.create_window
+    end
+
     def pending_events
       Xlib.XPending(to_native)
     end
@@ -95,7 +103,7 @@ module XlibObj
     end
 
     def handle_event(event)
-      handling_window_id = event.event || event.parent || event.window || event.requestor
+      handling_window_id = event.event || event.parent || event.window || event.owner || event.requestor
       handling_window = Window.new(self, handling_window_id)
       handling_window.handle(event)
     end

data/lib/event/selection_notify.rb

@@ -0,0 +1,35 @@
+#
+# Copyright (c) 2015 Christopher Aue <mail@christopheraue.net>
+#
+# This file is part of the ruby xlib-objects gem. It is subject to the license
+# terms in the LICENSE file found in the top-level directory of this
+# distribution and at http://github.com/christopheraue/ruby-xlib-objects.
+#
+
+module XlibObj
+  class Event
+    class SelectionNotify
+      def initialize(type:, target:, property:)
+        @type, @target, @property = type, target, property
+      end
+
+      def send_to(receiver)
+        Xlib.XSendEvent(receiver.display.to_native, receiver.to_native, false, 0, event(receiver))
+        Xlib.XFlush(receiver.display.to_native)
+      end
+
+      private
+
+      def event(receiver)
+        event = Xlib::XEvent.new
+        event[:xselection][:type]      = Xlib::SelectionNotify
+        event[:xselection][:requestor] = receiver.to_native
+        event[:xselection][:selection] = Atom.new(receiver.display, @type).to_native
+        event[:xselection][:target]    = Atom.new(receiver.display, @target).to_native
+        event[:xselection][:property]  = Atom.new(receiver.display, @property).to_native
+        event[:xselection][:time]      = Xlib::CurrentTime
+        event.pointer
+      end
+    end
+  end
+end

data/lib/window/event_handler.rb

@@ -34,7 +34,7 @@ module XlibObj
         add_event_handler(mask, event, &handler)
       end
 
-      def off(mask, type, handler)
+      def off(mask, type, handler = nil)
         remove_event_handler(mask, type, handler)
         remove_event_mask(mask)
       end
@@ -84,8 +84,8 @@ module XlibObj
         check_event(event)
         return unless mask_in_use?(mask)
         return unless @event_handlers[event]
-        @event_handlers[event][mask].delete(handler)
-        @event_handlers[event].delete(mask) if @event_handlers[event][mask].empty?
+        @event_handlers[event][mask].delete(handler) if handler
+        @event_handlers[event].delete(mask) if @event_handlers[event][mask].empty? or handler.nil?
         @event_handlers.delete(event) if @event_handlers[event].empty?
       end
 

data/lib/window.rb

@@ -38,14 +38,6 @@ module XlibObj
       Property.new(self, name).get
     end
 
-    def set_property(name, value)
-      Property.new(self, name).set(value)
-    end
-
-    def delete_property(name)
-      Property.new(self, name).delete
-    end
-
     def absolute_position
       x_abs = FFI::MemoryPointer.new :int
       y_abs = FFI::MemoryPointer.new :int
@@ -58,7 +50,22 @@ module XlibObj
       { x: x_abs.read_int, y: y_abs.read_int }
     end
 
+    def focused?
+      focused_window = FFI::MemoryPointer.new :Window
+      focus_state = FFI::MemoryPointer.new :int
+      Xlib.XGetInputFocus(@display.to_native, focused_window, focus_state)
+      focused_window.read_int == @to_native
+    end
+
     # Commands
+    def set_property(name, value)
+      Property.new(self, name).set(value)
+    end
+
+    def delete_property(name)
+      Property.new(self, name).delete
+    end
+
     def move_resize(x, y, width, height)
       Xlib.XMoveResizeWindow(@display.to_native, @to_native, x, y, width, height)
       Xlib.XFlush(@display.to_native)
@@ -99,7 +106,13 @@ module XlibObj
       @event_handler.on(mask, type, &callback)
     end
 
-    def off(mask, type, callback)
+    def until_true(mask, type, &callback)
+      handler = on(mask, type) do |*args|
+        off(mask, type, handler) if callback.call(*args)
+      end
+    end
+
+    def off(mask, type, callback = nil)
       @event_handler.off(mask, type, callback)
       self
     end
@@ -114,30 +127,76 @@ module XlibObj
       self
     end
 
-    def request_selection(type: :PRIMARY, format: :UTF8_STRING, property: :XSEL_DATA, &on_receive)
+    def request_selection(type = :PRIMARY, target: :UTF8_STRING, property: :XSEL_DATA, &on_receive)
       # will only receive the selection notify event, if the window has been created by the process
       # running this very code
-      selection_handler = on(:no_event, :selection_notify) do |event|
-        next if Atom.new(@display, event.selection).name != type
-        next if Atom.new(@display, event.target).name != format
+      until_true(:no_event, :selection_notify) do |event|
+        break false if Atom.new(@display, event.selection).name != type
+        break false if Atom.new(@display, event.target).name != target
 
+        # query selection content
         if event.property == Xlib::None
           selection = nil
         else
           selection = property(event.property)
           delete_property(event.property)
         end
-        selection_owner = Window.new(@display, Xlib.XGetSelectionOwner(@display, event.selection))
+
+        # send selection to callback
+        selection_owner = Window.new(@display, Xlib.XGetSelectionOwner(@display.to_native, event.selection))
         on_receive.call(selection, type, selection_owner)
-        off(:no_event, :selection_notify, selection_handler)
+
+        true
       end
 
+      # request the selection
       type_atom = Atom.new(@display, type)
+      target_atom = Atom.new(@display, target)
       property_atom = Atom.new(@display, property)
-      format_atom = Atom.new(@display, format)
-      Xlib.XConvertSelection(@display.to_native, type_atom.to_native, format_atom.to_native,
+      Xlib.XConvertSelection(@display.to_native, type_atom.to_native, target_atom.to_native,
         property_atom.to_native, @to_native, Xlib::CurrentTime)
       Xlib.XFlush(@display.to_native)
+
+      self
+    end
+
+    def set_selection(type = :PRIMARY, targets: [:UTF8_STRING, :STRING, :TEXT], &on_request)
+      type_atom = Atom.new(@display, type)
+      Xlib.XSetSelectionOwner(@display.to_native, type_atom.to_native, to_native, Xlib::CurrentTime)
+
+      request_handler = on(:no_event, :selection_request) do |event|
+        break if Atom.new(@display, event.selection).name != type
+
+        # convert selection
+        target = Atom.new(@display, event.target).name
+        selection = if target == :TARGETS
+                      (targets + [:TARGETS]).map{ |t| Atom.new(@display, t) }
+                    elsif targets.include? target
+                      on_request.call(target)
+                    end
+
+        # set property on requestor
+        requestor = Window.new(@display, event.requestor)
+        if selection
+          property = event.property == Xlib::None ? event.target : event.property
+          requestor.set_property(property, selection)
+
+          # notify requestor of set property
+          Event::SelectionNotify.new(type: event.selection, target: event.target, property: property).
+            send_to(requestor)
+        else
+          # notify requestor of failed conversion
+          Event::SelectionNotify.new(type: event.selection, target: event.target, property: Xlib::None).
+            send_to(requestor)
+        end
+      end
+
+      until_true(:no_event, :selection_clear) do |event|
+        break false if Atom.new(@display, event.selection).name != type
+        off(:no_event, :selection_request, request_handler)
+        true
+      end
+
       self
     end
 

data/lib/xlib-objects.rb

@@ -15,6 +15,7 @@ require_relative 'display'
 require_relative 'event'
 require_relative 'error'
 require_relative 'event/client_message'
+require_relative 'event/selection_notify'
 require_relative 'screen'
 require_relative 'screen/crtc'
 require_relative 'screen/crtc/output'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: xlib-objects
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors:
 - Christopher Aue
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-16 00:00:00.000000000 Z
+date: 2015-05-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: xlib
@@ -77,6 +77,7 @@ files:
 - lib/error.rb
 - lib/event.rb
 - lib/event/client_message.rb
+- lib/event/selection_notify.rb
 - lib/screen.rb
 - lib/screen/crtc.rb
 - lib/screen/crtc/output.rb