xlib-objects 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 618e5374b429ba0d48824d30e13d755e4664408e
-  data.tar.gz: 915a8a62603ae84bab9a479f6298a38a3417f3bd
+  metadata.gz: 22f4f88902d97b0d31c2610f90bfa14b2378571a
+  data.tar.gz: 0139801c5a443d34350d5ac3aeed21d87d58d3e4
 SHA512:
-  metadata.gz: 25ee4211bff0abea0ae06c1e9d19501e21128580207afc41cfa049d7d1e5b79a9b261202025eed789746634c9266ff97f9c761aef65aeb7c94868f065d172740
-  data.tar.gz: 02387a2ad113840131cf87501f433746e10e4eb9759e11c87953ce6df0f83fb4f3f8afcb2d665782c352f2f1c66bdc813555e4659e112eb77794fe474b4bafb7
+  metadata.gz: a409bdbcfbd75f89e9fb0fe4ac8a3b2c72790d9dbb857a0a7f38dec73efe4b00309291b8005bfb31e30efa58e865ade4c4dd035b0262312631f8365906a8471e
+  data.tar.gz: fcdabd70932efe480f6a8a18e98da2544de3bac50b52311ee8a706c35142df89082519d376da418c0e12af9d75e0733bbdea724c80be4caba26fb42a0fa522ed

data/lib/display.rb

@@ -41,10 +41,20 @@ module XlibObj
       (0..@struct[:nscreens]-1).map{ |number| screen(number) }
     end
 
+    def focused_window
+      screens.reduce(nil){ |focused_window, s| focused_window or s.focused_window }
+    end
+
     def handle_events
       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)
+      self
+    end
+
     def on_error(&callback)
       @error_handler = if callback
         FFI::Function.new(:pointer, [:pointer, :pointer]) do |display_ptr, error_ptr|
@@ -85,7 +95,7 @@ module XlibObj
     end
 
     def handle_event(event)
-      handling_window_id = event.event || event.parent || event.window
+      handling_window_id = event.event || event.parent || event.window || event.requestor
       handling_window = Window.new(self, handling_window_id)
       handling_window.handle(event)
     end
@@ -94,7 +104,7 @@ module XlibObj
       @struct[:screens] + number*Xlib::Screen.size
     end
 
-    def screen(number)
+    def screen(number = 0)
       Screen.new(self, screen_pointer(number))
     end
   end

data/lib/error.rb

@@ -72,7 +72,7 @@ module XlibObj
       if [Xlib::BadWindow, Xlib::BadPixmap, Xlib::BadCursor, Xlib::BadFont, Xlib::BadDrawable,
         Xlib::BadColor, Xlib::BadGC, Xlib::BadIDChoice].include?(code)
         Xlib.XGetErrorDatabaseText(@display.to_native, @display.name, "ResourceID",
-          "ResourceID 0x%x", message, message_size)
+          "ResourceID %x", message, message_size)
       elsif code == Xlib::BadValue
         Xlib.XGetErrorDatabaseText(@display.to_native, @display.name, "Value", "Value 0x%x",
           message, message_size)

data/lib/event/client_message.rb

@@ -21,12 +21,12 @@ module XlibObj
         raise "The client message needs a type at least." unless @type
         @receiver = receiver
         Xlib.XSendEvent(@receiver.display.to_native, @receiver.to_native, false,
-          Xlib::SubstructureNotifyMask | Xlib::SubstructureRedirectMask,
-          to_native)
+          Xlib::SubstructureNotifyMask | Xlib::SubstructureRedirectMask, to_native)
         Xlib.XFlush(@receiver.display.to_native)
       end
 
       private
+
       def to_native
         event = Xlib::XEvent.new
         event[:xclient][:type]         = Xlib::ClientMessage

data/lib/screen.rb

@@ -40,6 +40,21 @@ module XlibObj
       @root_window ||= Window.new(@display, Xlib.XRootWindowOfScreen(to_native))
     end
 
+    def focused_window
+      window_ptr = FFI::MemoryPointer.new :Window
+      trash_ptr  = FFI::MemoryPointer.new :int
+      Xlib.XGetInputFocus(@display.to_native, window_ptr, trash_ptr)
+      window = window_ptr.read_int
+
+      if window == Xlib::PointerRoot
+        root_window
+      elsif window == Xlib::None
+        nil
+      else
+        Window.new(@display, window)
+      end
+    end
+
     def crtcs
       (0..resources[:ncrtc]-1).map do |crtc_number|
         crtc_id(resources[:crtcs], crtc_number)
@@ -49,6 +64,7 @@ module XlibObj
     end
 
     private
+
     def resources
       unless @resources
         resources_ptr = Xlib.XRRGetScreenResources(@display.to_native,

data/lib/window.rb

@@ -20,8 +20,7 @@ module XlibObj
 
     def attribute(name)
       attributes = Xlib::WindowAttributes.new
-      Xlib.XGetWindowAttributes(@display.to_native, @to_native, attributes.
-        pointer)
+      Xlib.XGetWindowAttributes(@display.to_native, @to_native, attributes.pointer)
       attributes[name.to_sym]
     rescue
       nil
@@ -43,22 +42,25 @@ module XlibObj
       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
       child = FFI::MemoryPointer.new :Window
       root_win = screen.root_window
 
-      Xlib.XTranslateCoordinates(@display.to_native, @to_native,
-        root_win.to_native, 0, 0, x_abs, y_abs, child)
+      Xlib.XTranslateCoordinates(@display.to_native, @to_native, root_win.to_native, 0, 0, x_abs,
+        y_abs, child)
 
       { x: x_abs.read_int, y: y_abs.read_int }
     end
 
     # Commands
     def move_resize(x, y, width, height)
-      Xlib.XMoveResizeWindow(@display.to_native, @to_native, x, y, width,
-        height)
+      Xlib.XMoveResizeWindow(@display.to_native, @to_native, x, y, width, height)
       Xlib.XFlush(@display.to_native)
       self
     end
@@ -87,6 +89,12 @@ module XlibObj
       self
     end
 
+    def focus
+      Xlib.XSetInputFocus(@display.to_native, @to_native, Xlib::RevertToParent, Xlib::CurrentTime)
+      Xlib.XFlush(@display.to_native)
+      self
+    end
+
     def on(mask, type, &callback)
       @event_handler.on(mask, type, &callback)
     end
@@ -103,6 +111,43 @@ module XlibObj
 
     def send_to_itself(type, data = nil, subject = nil)
       Event::ClientMessage.new(type, data, subject).send_to(self)
+      self
+    end
+
+    def request_selection(type: :PRIMARY, format: :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
+
+        if event.property == Xlib::None
+          selection = nil
+        else
+          selection = property(event.property)
+          delete_property(event.property)
+        end
+        on_receive.call(selection, type)
+        off(:no_event, :selection_notify, selection_handler)
+      end
+
+      type_atom = Atom.new(@display, type)
+      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,
+        property_atom.to_native, @to_native, Xlib::CurrentTime)
+      Xlib.XFlush(@display.to_native)
+      self
+    end
+
+    def create_window
+      black = Xlib.XBlackPixel(@display.to_native, 0)
+      win_id = Xlib.XCreateSimpleWindow(@display.to_native, to_native, 0, 0, 1, 1, 0, black, black)
+      XlibObj::Window.new(@display, win_id)
+    end
+
+    def destroy
+      @event_handler.destroy
+      Xlib.XDestroyWindow(@display.to_native, to_native)
     end
   end
 end

data/lib/window/event_handler.rb

@@ -15,6 +15,10 @@ module XlibObj
           @handlers[display] ||= {}
           @handlers[display][window_id] ||= new(display, window_id)
         end
+
+        def remove(display, window_id)
+          @handlers[display].delete(window_id) if @handlers and @handlers[display]
+        end
       end
 
       def initialize(display, window_id)
@@ -46,6 +50,10 @@ module XlibObj
         end
       end
 
+      def destroy
+        self.class.remove(@display, @window_id)
+      end
+
       private
       def add_event_mask(mask)
         check_mask(mask)
@@ -91,7 +99,7 @@ module XlibObj
       end
 
       def check_mask(mask)
-        if normalize_mask(mask).zero? && normalize_rr_mask(mask).zero?
+        if XlibObj::Event::MASK[mask].nil? && XlibObj::Event::RR_MASK[mask].nil?
           raise("Unknown event mask #{mask}.")
         end
       end

data/lib/window/property.rb

@@ -73,6 +73,10 @@ module XlibObj
         self
       end
 
+      def delete
+        Xlib.XDeleteProperty(@window.display.to_native, @window.to_native, @atom.to_native)
+      end
+
       private
       def read_bytes(pointer, width, count)
         pointer.read_pointer.read_string(count*native_width(width))

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: xlib-objects
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Christopher Aue
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-13 00:00:00.000000000 Z
+date: 2015-05-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: xlib