pure-x11 0.0.12 → 0.0.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a54ae04997fddd16eaeea021a1b8141649b94c01fc4da4172395432fb119b768
-  data.tar.gz: 67a426e9ecd3befd4e4d33c74a63a2504b1aff720c6a871cdf69c9900637b7eb
+  metadata.gz: a246edf65b1a46b6c5e81c24757ca4f48fd5ca8bf4e8ae07c02226728e5ffd32
+  data.tar.gz: 3f38198bc1e2c7aa77b95ce4069558c616244ce2985589baad32d9af9103d411
 SHA512:
-  metadata.gz: 4c71571ad6cb34be6d9aa6d60871bba90efcc29931829035c93a11f7de9fa45741e4851179b03bf00ba2eff7aad26f2362c1323f35bf2f3f34eb2f787ca0a3f4
-  data.tar.gz: 3b727bf9aa3be18791b50178a64766626655ce8c48f743333e142fe3b2cece7c4ecbb65a78e77dd54ea7c5ebb11959493ffcd1e265d247acc34e63a423ede4c8
+  metadata.gz: 6e422c72294013117c23c2b85b3f85f7272b0abb0114762f98b94e079cbdaaaaac3d420d0313fb8464ab2698c5e476444cfec01cd45346252ab0701d74c6c310
+  data.tar.gz: 5fc3dfe0aaa23985fa2cb3d2bfa62f94b9d6e902501890f4f8ea43205bbe907cfb0060965846b359ef24de0201776046577d1cb16e097f114db345edef6ec755

data/Gemfile

@@ -2,7 +2,9 @@ source "https://rubygems.org"
 
 gemspec
 
-gem 'rake'
+gem 'rake', '~> 13.2.1'
 
 group :development do
 end
+
+gem "minitest", "~> 5.0", :group => :test

data/Gemfile.lock

@@ -1,19 +1,21 @@
 PATH
   remote: .
   specs:
-    pure-x11 (0.0.12)
+    pure-x11 (0.0.13)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    rake (13.0.6)
+    minitest (5.25.5)
+    rake (13.2.1)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
+  minitest (~> 5.0)
   pure-x11!
-  rake
+  rake (~> 13.2.1)
 
 BUNDLED WITH
    2.4.19

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"
@@ -371,19 +371,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 +394,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 +517,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 +662,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
@@ -753,7 +753,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 +802,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 +1140,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 +1252,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/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.13"
 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.13
 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-04 00:00:00.000000000 Z
 dependencies: []
 description: Pure Ruby X11 bindings
 email:
@@ -31,6 +31,9 @@ files:
 - example/query_pointer.rb
 - example/query_pointer_simple.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