pure-x11 0.0.12 → 0.0.14

data/example/test.rb

@@ -73,7 +73,8 @@ def update_keymap(dpy)
         (c-0x01000100).
         chr(Encoding::UTF_32) rescue c.to_s(16)
       else
-        raise "unknown_#{c.to_s(16)}"
+        #raise "unknown_#{c.to_s(16)}"
+        STDERR.puts "UNKNOWN: #{c.to_s(16)}"
       end
     end.each_slice(reply.keysyms_per_keycode).to_a
     #ks = ks.map {|s| s.compact.sort_by{|x| x.to_s}.uniq }.to_a # This is for testing/ease of reading only

data/example/test_change_property.rb

@@ -0,0 +1,100 @@
+#!/usr/bin/env ruby
+
+require 'rubygems'
+require 'bundler'
+Bundler.setup(:default, :development)
+
+$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
+$LOAD_PATH.unshift(File.dirname(__FILE__))
+
+require 'X11'
+
+# Connect to the X server
+display = X11::Display.new
+root = display.default_root
+puts "Connected to X server, root window: #{root}"
+
+# Test 8-bit format (bytes)
+puts "\nTesting format=8:"
+property_name = "TEST_PROPERTY_8BIT"
+property_atom = display.atom(property_name)
+type_atom = display.atom(:cardinal)
+
+# Create test data and ensure it's padded to a multiple of 4 bytes
+test_string = "Hello"
+test_data = test_string.bytes
+# Calculate padding needed to make length a multiple of 4
+padding_needed = (4 - (test_data.length % 4)) % 4
+test_data += [0] * padding_needed if padding_needed > 0
+puts "Test data with padding: #{test_data.inspect}"
+
+# Set the property
+display.change_property(X11::Form::Replace, root, property_atom, type_atom, 8, test_data)
+puts "Successfully set 8-bit property '#{property_name}' on root window"
+
+# Read it back
+result = display.get_property(root, property_name, type_atom, length: test_data.length)
+puts "Got result: #{result.value.inspect}"
+# For 8-bit format, the result might include padding zeros, so let's just verify the actual content
+if result && result.value.is_a?(String) && result.value.start_with?(test_string)
+  puts "✓ Property format=8 verified"
+else
+  puts "✗ Property format=8 verification failed"
+end
+
+# Test 32-bit format (integers) - single value
+puts "\nTesting format=32 (single value):"
+property_name = "TEST_PROPERTY_32BIT_1"
+property_atom = display.atom(property_name)
+
+# Single 32-bit integer (already a multiple of 4 bytes)
+test_int = 123456
+test_data = [test_int].pack("L").bytes
+puts "Test data (32-bit): #{test_data.inspect}"
+
+# Set the property
+display.change_property(X11::Form::Replace, root, property_atom, type_atom, 32, test_data)
+puts "Successfully set 32-bit property '#{property_name}' on root window"
+
+# Read it back
+result = display.get_property(root, property_name, type_atom)
+puts "Got result: #{result.value.inspect}"
+if result && result.value == test_int
+  puts "✓ Property format=32 (single value) verified"
+else
+  puts "✗ Property format=32 (single value) verification failed"
+end
+
+# Test 32-bit format (integers) - two values
+puts "\nTesting format=32 (two values):"
+property_name = "TEST_PROPERTY_32BIT_2"
+property_atom = display.atom(property_name)
+
+# Two 32-bit integers (8 bytes total - already a multiple of 4)
+test_ints = [123456, 654321]
+test_data = test_ints.pack("L*").bytes
+puts "Test data (32-bit, two values): #{test_data.inspect}"
+
+# Set the property
+display.change_property(X11::Form::Replace, root, property_atom, type_atom, 32, test_data)
+puts "Successfully set 32-bit property '#{property_name}' with two values on root window"
+
+# Read it back - need to explicitly set length to get both values
+# Try with a larger length to ensure we get all values
+result = display.get_property(root, property_name, type_atom, length: 8)
+puts "Got result: #{result.value.inspect}"
+
+# The result might be a single value or an array, handle both cases
+if result
+  got_values = result.value.is_a?(Array) ? result.value : [result.value]
+  if got_values[0] == test_ints[0] && (got_values.length < 2 || got_values[1] == test_ints[1])
+    puts "✓ Property format=32 (two values) verified first value: #{got_values[0]}"
+    puts "  Note: Only received #{got_values.length} values" if got_values.length < 2
+  else
+    puts "✗ Property format=32 (two values) verification failed"
+  end
+else
+  puts "✗ Property format=32 (two values) verification failed - no result"
+end
+
+puts "\nTest completed"

data/example/test_intern_atom.rb

@@ -0,0 +1,34 @@
+#!/usr/bin/env ruby
+
+require 'rubygems'
+require 'bundler'
+Bundler.setup(:default, :development)
+
+$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
+$LOAD_PATH.unshift(File.dirname(__FILE__))
+
+require 'X11'
+
+# Connect to the X server
+display = X11::Display.new
+puts "Connected to X server"
+
+# Test interning a new atom
+atom_name = "TEST_ATOM_#{Time.now.to_i}"
+puts "Testing interning a new atom: #{atom_name}"
+
+# This internally uses the InternAtom request
+atom_id = display.atom(atom_name)
+puts "Successfully interned atom, got ID: #{atom_id}"
+
+# Verify it worked by retrieving the atom name
+retrieved_name = display.get_atom_name(atom_id)
+puts "Retrieved atom name: #{retrieved_name.inspect}"
+
+if retrieved_name == atom_name
+  puts "✓ Atom verification successful"
+else
+  puts "✗ Atom verification failed: got #{retrieved_name.inspect}, expected #{atom_name.inspect}"
+end
+
+puts "Test completed successfully!"

data/example/xinerama_info.rb

@@ -0,0 +1,58 @@
+#!/usr/bin/env ruby
+require_relative '../lib/X11'
+
+display = X11::Display.new
+
+puts "Querying Xinerama extension..."
+
+# Check if Xinerama is available
+begin
+  xinerama_opcode = display.xinerama_opcode
+  if !xinerama_opcode
+    puts "Xinerama extension not available."
+    exit 1
+  end
+  puts "Xinerama extension found with opcode: #{xinerama_opcode}"
+rescue => e
+  puts "Error querying Xinerama extension: #{e.message}"
+  exit 1
+end
+
+# Query version
+begin
+  version = display.xinerama_query_version
+  puts "Xinerama version: #{version.major_version}.#{version.minor_version}"
+rescue => e
+  puts "Error querying Xinerama version: #{e.message}"
+  exit 1
+end
+
+# Check if Xinerama is active
+begin
+  active = display.xinerama_is_active
+  puts "Xinerama active: #{active}"
+rescue => e
+  puts "Error checking if Xinerama is active: #{e.message}"
+  exit 1
+end
+
+if active
+  # Query the screen information
+  begin
+    screens_info = display.xinerama_query_screens
+    puts "\nDetected #{screens_info.screens.length} screen(s):"
+    puts "-" * 50
+    
+    screens_info.screens.each_with_index do |screen, index|
+      puts "Screen ##{index + 1}:"
+      puts "  Position: (#{screen.x_org}, #{screen.y_org})"
+      puts "  Size:     #{screen.width} x #{screen.height}"
+      puts "-" * 50
+    end
+  rescue => e
+    puts "Error querying Xinerama screens: #{e.message}"
+    exit 1
+  end
+else
+  puts "Xinerama is not active. Unable to query screen information."
+end

data/lib/X11/auth.rb

@@ -36,7 +36,7 @@ module X11
     # If no data is found, returns nil
     def get_by_hostname(host, family, display_id)
       host = `hostname`.chomp if host == 'localhost' or host == '127.0.0.1' or host.nil?
-      address = TCPSocket.gethostbyname(host) if family == :Internet # this line does nothing for now
+      # address = TCPSocket.gethostbyname(host) if family == :Internet # this line does nothing for now
 
       auth_data = nil
 

data/lib/X11/display.rb

@@ -20,7 +20,7 @@ module X11
     # Open a connection to the specified display (numbered from 0) on the specified host
     def initialize(target = ENV['DISPLAY'])
       target =~ /^([\w.-]*):(\d+)(?:.(\d+))?$/
-      host, display_id, screen_id = $1, $2, $3
+      host, display_id, _screen_id = $1, $2, $3
       family = nil
 
       @debug = ENV["PUREX_DEBUG"].to_s.strip == "true"
@@ -358,6 +358,41 @@ module X11
     def destroy_window(window) = write_request(Form::DestroyWindow.new(window))
     def get_geometry(drawable) = write_sync(Form::GetGeometry.new(drawable), Form::Geometry)
     
+    # Set the owner of a selection
+    # selection: the selection atom
+    # owner: the window ID of the new owner, or None (0) to indicate no owner
+    # time: the server time when ownership should take effect, or CurrentTime (0)
+    def set_selection_owner(selection, owner, time = 0)
+      # Convert selection to atom ID if necessary
+      selection = atom(selection) if selection.is_a?(Symbol) || selection.is_a?(String)
+      owner = owner || 0  # Allow nil for owner to mean None (0)
+      
+      # Create and send the SetSelectionOwner request using the Form
+      req = Form::SetSelectionOwner.new(owner, selection, time)
+      write_request(req)
+      
+      true # Always returns true; check get_selection_owner to verify
+    end
+    
+    # Get the current owner of a selection
+    # selection: the selection atom
+    # Returns: the window ID of the owner, or None (0) if there is no owner
+    def get_selection_owner(selection)
+      # Convert selection to atom ID if necessary
+      selection = atom(selection) if selection.is_a?(Symbol) || selection.is_a?(String)
+      
+      # Use the form-based approach for reading
+      req = Form::GetSelectionOwner.new(selection)
+      
+      begin
+        reply = write_sync(req, Form::SelectionOwner)
+        reply ? reply.owner : 0
+      rescue => e
+        STDERR.puts "Error getting selection owner: #{e.message}" if @debug
+        0  # Return 0 (None) on error
+      end
+    end
+    
     def get_keyboard_mapping(min_keycode=display_info.min_keycode, count= display_info.max_keycode - min_keycode)
       write_sync(Form::GetKeyboardMapping.new(min_keycode, count), Form::GetKeyboardMappingReply)
     end
@@ -371,19 +406,20 @@ module X11
     def get_property(window, property, type, offset: 0, length: 4, delete: false)
       property = atom(property)
       type     = atom_enum(type)
+      window_id = window.is_a?(X11::Window) ? window.wid : window
       
       result = write_sync(Form::GetProperty.new(
-        delete, window, property, type, offset, length
+        delete, window_id, property, type, offset, length
       ), Form::Property)
 
       if result && result.format != 0
         case result.format
         when 16
-          result.value = result.value.unpack("v")
-          result.value = result.value.first if length == 2
+          result.value = result.value.unpack("v*")
+          result.value = result.value.first if result.value.length == 1
         when 32
-          result.value = result.value.unpack("V")
-          result.value = result.value.first if length == 4
+          result.value = result.value.unpack("V*")
+          result.value = result.value.first if result.value.length == 1
         end
       elsif result
         result.value = nil
@@ -393,10 +429,11 @@ module X11
     
     def change_property(mode, window, property, type, format, data)
       property = atom(property.to_sym) if property.is_a?(Symbol) || property.is_a?(String)
+      window_id = window.is_a?(X11::Window) ? window.wid : window
 
       mode = open_enum(mode, {replace: 0, prepend: 1, append: 2})
       type = atom_enum(type)
-      write_request(Form::ChangeProperty.new(mode, window, property, type, format, data))
+      write_request(Form::ChangeProperty.new(mode, window_id, property, type, format, data))
     end
 
     def list_fonts(...)     = write_sync(Form::ListFonts.new(...), Form::ListFontsReply)
@@ -515,8 +552,8 @@ module X11
     def send_event(...) = write_request(Form::SendEvent.new(...))
     def client_message(window: default_root, type: :ClientMessage, format: 32, destination: default_root, mask: 0, data: [], propagate: true)
       f = {8 => "C20", 16 => "S10", 32 => "L5"}[format]
-      p f
-      data = (Array(data).map{|item|atom(item)} +[0]*20).pack(f)
+      # p f
+      data = (Array(data).map{|item|atom(item)} + [0]*20).pack(f)
       event = Form::ClientMessage.new(
         format, 0, window, atom(type), data
       )
@@ -660,6 +697,37 @@ module X11
       write_request(Form::XRenderFreePicture.new(render_opcode, picture))
     end
     
+    # Xinerama extension
+    
+    def xinerama_opcode
+      return @xinerama_opcode if @xinerama_opcode
+      @xinerama_opcode = major_opcode("XINERAMA")
+      @xinerama_opcode
+    end
+    
+    def xinerama_query_version
+      return @xinerama_version if @xinerama_version
+      @xinerama_version = write_sync(
+        X11::Form::XineramaQueryVersion.new(xinerama_opcode),
+        X11::Form::XineramaQueryVersionReply
+      )
+    end
+    
+    def xinerama_is_active
+      result = write_sync(
+        X11::Form::XineramaIsActive.new(xinerama_opcode),
+        X11::Form::XineramaIsActiveReply
+      )
+      result.state != 0
+    end
+    
+    def xinerama_query_screens
+      write_sync(
+        X11::Form::XineramaQueryScreens.new(xinerama_opcode),
+        X11::Form::XineramaQueryScreensReply
+      )
+    end
+    
     def query_pointer(window)
       write_sync(Form::QueryPointer.new(window), Form::QueryPointerReply)
     end

data/lib/X11/form.rb

@@ -48,7 +48,7 @@ module X11
         # fetch class level instance variable holding defined fields
         structs = self.class.structs
 
-        packet = structs.map do |s|
+        structs.map do |s|
           # fetch value of field set in initialization
 
           value = s.type == :unused ? nil : instance_variable_get("@#{s.name}")
@@ -158,7 +158,7 @@ module X11
           class_eval do
             if value && value.respond_to?(:call)
               define_method(name.to_sym) { value.call(self) }
-            else
+            elsif type != :length && type != :format_length
               attr_accessor name
             end
           end
@@ -404,7 +404,7 @@ module X11
     class CreateWindow < BaseForm
       field :opcode, Uint8, value: 1
       field :depth,  Uint8
-      field :request_length, Uint16, value: ->(cw) { len = 8 + cw.value_list.length }
+      field :request_length, Uint16, value: ->(cw) { 8 + cw.value_list.length }
       field :wid, Window
       field :parent, Window
       field :x, Int16
@@ -654,6 +654,30 @@ module X11
       field :event, Uint32 # FIXME: This is wrong, and will break on parsing.
     end
     
+    class SetSelectionOwner < BaseForm
+      field :opcode, Uint8, value: 22
+      unused 1
+      field :request_length, Uint16, value: 4
+      field :owner, Window      # Window - NOTE: order corrected, owner comes first
+      field :selection, Atom    # Selection atom
+      field :time, Uint32
+    end
+    
+    class GetSelectionOwner < BaseForm
+      field :opcode, Uint8, value: 23
+      unused 1
+      field :request_length, Uint16, value: 2
+      field :selection, Atom    # Selection atom
+    end
+    
+    class SelectionOwner < Reply
+      unused 1
+      field :sequence_number, Uint16
+      field :reply_length, Uint32
+      field :owner, Window
+      unused 20
+    end
+    
     class GrabButton < BaseForm
       field :opcode, Uint8, value: 28
       field :owner_events, Bool
@@ -753,7 +777,7 @@ module X11
       field :opcode, Uint8, value: 55
       unused 1
       field :request_length, Uint16, value: ->(cw) {
-        len = 4 + cw.value_list.length
+        4 + cw.value_list.length
       }
       field :cid, Gcontext
       field :drawable, Drawable
@@ -802,7 +826,7 @@ module X11
       field :opcode, Uint8, value: 70
       unused 1
       field :request_length, Uint16, value: ->(ob) {
-        len = 3 + 2*(Array(ob.rectangles).length)
+        3 + 2*(Array(ob.rectangles).length)
       }
       field :drawable, Drawable
       field :gc, Uint32
@@ -1140,7 +1164,7 @@ module X11
       field :formats, PictFormInfo, :list
       field :screens, PictScreen, :list
       field :subpixels, Uint32, :list
-     end
+    end
 
      class XRenderCreatePicture < BaseForm
        field :req_type, Uint8
@@ -1252,5 +1276,60 @@ module X11
        field :request_length, Uint16, value: 2
        field :picture, Uint32
      end
+     
+     # Xinerama extension
+     # From https://gitlab.freedesktop.org/xorg/proto/xineramaproto/-/blob/master/panoramiXproto.h
+     class XineramaQueryVersion < BaseForm
+       field :req_type, Uint8
+       field :xinerama_req_type, Uint8, value: 0
+       field :request_length, Uint16, value: 2
+       field :major_version, Uint16, value: 1
+       field :minor_version, Uint16, value: 0
+     end
+
+     class XineramaQueryVersionReply < Reply
+       unused 1
+       field :sequence_number, Uint16
+       field :reply_length, Uint32
+       field :major_version, Uint16
+       field :minor_version, Uint16
+       unused 20
+     end
+
+     class XineramaIsActive < BaseForm
+       field :req_type, Uint8
+       field :xinerama_req_type, Uint8, value: 4
+       field :request_length, Uint16, value: 1
+     end
+
+     class XineramaIsActiveReply < Reply
+       unused 1
+       field :sequence_number, Uint16
+       field :reply_length, Uint32
+       field :state, Uint32
+       unused 20
+     end
+
+     class XineramaScreenInfo < BaseForm
+       field :x_org, Int16
+       field :y_org, Int16
+       field :width, Uint16
+       field :height, Uint16
+     end
+
+     class XineramaQueryScreens < BaseForm
+       field :req_type, Uint8
+       field :xinerama_req_type, Uint8, value: 5
+       field :request_length, Uint16, value: 1
+     end
+
+     class XineramaQueryScreensReply < Reply
+       unused 1
+       field :sequence_number, Uint16
+       field :reply_length, Uint32
+       field :screens, Uint32, :length
+       unused 20
+       field :screens, XineramaScreenInfo, :list
+     end
   end
 end

data/lib/X11/screen.rb

@@ -12,8 +12,10 @@ module X11
     def root_visual = @internal.root_visual
     def width       = @internal.width_in_pixels
     def height      = @internal.height_in_pixels
+    def black_pixel = @internal.black_pixel
+    def white_pixel = @internal.white_pixel
 
-    def to_s
+    def inspect
       "#<X11::Screen(#{id}) width=#{width} height=#{height}>"
     end
   end

data/lib/X11/type.rb

@@ -18,7 +18,7 @@ module X11
           end
         end
         [x].pack(@directive)
-      rescue TypeError => e
+      rescue TypeError
         raise "Expected #{self.name}, got #{x.class} (value: #{x})"
       end
 

data/lib/X11/version.rb

@@ -1,3 +1,3 @@
 module X11
-  VERSION = "0.0.12"
+  VERSION = "0.0.14"
 end

data/test/core_test.rb

@@ -9,7 +9,7 @@ describe X11 do
     it "should generate a unique id" do
       collection = 1000.times.collect { @display.new_id }
       expected = collection.size
-      collection.uniq.size.must_equal expected
+      _(collection.uniq.size).must_equal expected
     end
   end
 end

data/test/form_test.rb

@@ -50,12 +50,14 @@ describe X11::Form::BaseForm do
     parent.children << Child.new
     parent.children << Child.new
 
-    assert_equal parent.children.size, 2
+    _(parent.children.size).must_equal 2
   end
 
   it "should encode/decode a packet" do
     parent = Parent.new(255,Point.new(23,17), "Parent Form", [])
-    socket = MockSocket.new(parent.to_packet)
+    # Create a mock display object to pass to to_packet
+    mock_display = Object.new
+    socket = MockSocket.new(parent.to_packet(mock_display))
 
     decoded = Parent.from_packet(socket)
     _(decoded.value).must_equal 255

data/test/helper.rb

@@ -2,10 +2,11 @@ require 'rubygems'
 require 'bundler'
 Bundler.setup(:default, :development)
 
-require 'minitest/spec'
-require 'minitest/autorun'
-
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 
+# Load minitest before application code to avoid circular require
+require 'minitest/autorun'
+
+# Then load application code
 require 'X11'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pure-x11
 version: !ruby/object:Gem::Version
-  version: 0.0.12
+  version: 0.0.14
 platform: ruby
 authors:
 - Vidar Hokstad
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2025-04-05 00:00:00.000000000 Z
+date: 2025-05-05 00:00:00.000000000 Z
 dependencies: []
 description: Pure Ruby X11 bindings
 email:
@@ -30,7 +30,11 @@ files:
 - example/genie.png
 - example/query_pointer.rb
 - example/query_pointer_simple.rb
+- example/systray.rb
 - example/test.rb
+- example/test_change_property.rb
+- example/test_intern_atom.rb
+- example/xinerama_info.rb
 - lib/X11.rb
 - lib/X11/auth.rb
 - lib/X11/display.rb