pure-x11 0.0.14 → 0.0.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bfea2e2042ed90f291727231b653878eb36f6f42b79dcdea63a247c912a663c3
-  data.tar.gz: 0f1a025486ca695ed9941cf9061f082f1c3838cff15b4c559720f64d28b228b3
+  metadata.gz: 111eb03062f78f89280bc44425a4557b2f97527738d9d6fb93d0407f75050ff1
+  data.tar.gz: fbc1a6071fde31ed383b173dd45c8472c2ed1efa536037fd4d976d35a078e687
 SHA512:
-  metadata.gz: d27618c1fb2c908ce4c9f2f4a4b7692f369d61ec968b7d9664f021cabc0fd032d7b8df11fb773631d49ce6d876c3eb75584c9bda28f4237bb581dc04b7928176
-  data.tar.gz: 063be0a3b3dce1b4b15e57e2121b9c76ed5b65cac5369f9fc3032e133b8cd742d91907f94511d9805f6147d9f8b94b9a2d563e1645dcc94fd2cc507311b18133
+  metadata.gz: 02fc5f04906935f25afbd52443f1cc33b6d7f97bf95b145cf814adfc88ca8f1b1de635042d6c8854db2413b203af985076d25e7fbf7f8d1c6f92f904d9c5edd2
+  data.tar.gz: 8fe22103b7991e534d334d055325c0a93853878875af12bcfd5173720d1e05cf4ad484f69b4508ba2e84993a36176167ecbd29d64aa5481b6cf42c0e0f2c155c

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    pure-x11 (0.0.13)
+    pure-x11 (0.0.15)
 
 GEM
   remote: https://rubygems.org/

data/lib/X11/display.rb

@@ -19,6 +19,10 @@ module X11
 
     # Open a connection to the specified display (numbered from 0) on the specified host
     def initialize(target = ENV['DISPLAY'])
+      # With no DISPLAY set (nil or empty), fall back to the conventional
+      # default display ":0" rather than letting the regex below leave host
+      # nil and crash on host.empty?.
+      target = ":0" if target.nil? || target.empty?
       target =~ /^([\w.-]*):(\d+)(?:.(\d+))?$/
       host, display_id, _screen_id = $1, $2, $3
       family = nil
@@ -495,6 +499,22 @@ module X11
       )
     end
 
+    # Actively grab the keyboard for grab_window. Returns the reply (status 0 =
+    # Success). Modes default to async so key events flow normally to the focus.
+    def grab_keyboard(grab_window, owner_events: true, pointer_mode: :async,
+      keyboard_mode: :async, time: 0)
+      write_sync(Form::GrabKeyboard.new(
+        owner_events ? 1 : 0,
+        grab_window, time,
+        pointer_mode  == :async ? 1 : 0,
+        keyboard_mode == :async ? 1 : 0
+      ), Form::GrabKeyboardReply)
+    end
+
+    def ungrab_keyboard(time = 0)
+      write_request(Form::UngrabKeyboard.new(time))
+    end
+
     def set_value(values, mask, x)
       if x
         values << x
@@ -732,6 +752,10 @@ module X11
       write_sync(Form::QueryPointer.new(window), Form::QueryPointerReply)
     end
 
+    def get_input_focus
+      write_sync(Form::GetInputFocus.new, Form::GetInputFocusReply)
+    end
+
     private
 
     def authorize(host, family, display_id)

data/lib/X11/form.rb

@@ -484,6 +484,20 @@ module X11
       unused 6
     end
 
+    class GetInputFocus < BaseForm
+      field :opcode, Uint8, value: 43
+      unused 1
+      field :request_length, Uint16, value: 1
+    end
+    
+    class GetInputFocusReply < Reply
+      field :revert_to, Uint8
+      field :sequence_number, Uint16
+      field :reply_length, Uint32
+      field :focus, Window
+      unused 20
+    end
+
     class ChangeSaveSet < BaseForm
       field :opcode, Uint8, value: 6
       field :mode, Uint8
@@ -620,6 +634,10 @@ module X11
       unused 3
       field :data, Uint32, value: ->(cp) { cp.data.length / (cp.format/8) }
       field :data, Uint8, :list
+      # The protocol pads the data to a 4-byte boundary; request_length already
+      # accounts for it, so emit the pad bytes (otherwise format-8/16 data whose
+      # length isn't a multiple of 4 produces a short packet).
+      unused ->(cp) { (4 - cp.data.length % 4) % 4 }
     end
 
     class GetProperty < BaseForm
@@ -705,6 +723,31 @@ module X11
       unused 3
     end
 
+    class GrabKeyboard < BaseForm
+      field :opcode, Uint8, value: 31
+      field :owner_events, Bool
+      field :request_length, Uint16, value: 4
+      field :grab_window, Window
+      field :time, Uint32
+      field :pointer_mode, Uint8
+      field :keyboard_mode, Uint8
+      unused 2
+    end
+
+    class GrabKeyboardReply < Reply
+      field :status, Uint8
+      field :sequence_number, Uint16
+      field :reply_length, Uint32
+      unused 24
+    end
+
+    class UngrabKeyboard < BaseForm
+      field :opcode, Uint8, value: 32
+      unused 1
+      field :request_length, Uint16, value: 2
+      field :time, Uint32
+    end
+
     class OpenFont < BaseForm
       field :opcode, Uint8, value: 45
       unused 1

data/lib/X11/version.rb

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

data/lib/X11/window.rb

@@ -24,6 +24,8 @@ module X11
     def get_property(...)          = dpy.get_property(@wid,...)
     def grab_key(arg, ...)         = dpy.grab_key(arg, @wid, ...)
     def grab_button(arg,...)       = dpy.grab_button(arg, @wid, ...)
+    def grab_keyboard(...)         = dpy.grab_keyboard(@wid, ...)
+    def ungrab_keyboard(...)       = dpy.ungrab_keyboard(...)
     def change_property(mode, ...) = dpy.change_property(mode, @wid, ...)
     def set_input_focus(mode)      = dpy.set_input_focus(mode, @wid)
     def select_input(...)          = dpy.select_input(@wid,...)

data/test/core_test.rb

@@ -11,5 +11,22 @@ describe X11 do
       expected = collection.size
       _(collection.uniq.size).must_equal expected
     end
+
+    it "falls back to :0 instead of crashing when DISPLAY is empty or unset" do
+      original = ENV["DISPLAY"]
+      ["", nil].each do |value|
+        value.nil? ? ENV.delete("DISPLAY") : ENV["DISPLAY"] = value
+        begin
+          X11::Display.new
+        rescue NoMethodError => e
+          flunk "DISPLAY=#{value.inspect} regressed to a crash: #{e.message}"
+        rescue StandardError
+          # A connection/socket error is fine here — the point is that parsing
+          # got past the empty DISPLAY and attempted the default display :0.
+        end
+      end
+    ensure
+      ENV["DISPLAY"] = original
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pure-x11
 version: !ruby/object:Gem::Version
-  version: 0.0.14
+  version: 0.0.15
 platform: ruby
 authors:
 - Vidar Hokstad
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2025-05-05 00:00:00.000000000 Z
+date: 2026-06-22 00:00:00.000000000 Z
 dependencies: []
 description: Pure Ruby X11 bindings
 email: