pure-x11 0.0.5 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0ecd289a7ec4a0a7f44bba1d05a437774ca6ed3d4c403b572b28a8691ef2a950
-  data.tar.gz: ac9460f0c0db0635e33358550176802119db88c9bb4dee097807f21c970f68ba
+  metadata.gz: 37b5a813f478de65ecb12e89bafd332ef219baabac729a1baf29cf016d055347
+  data.tar.gz: 357ef8cd392bad30e9c2d8a7b6771c5c4fd1dd68f3e77da1544cf93f22df14f0
 SHA512:
-  metadata.gz: db23062260daabe75bfe5a9f419772be329023777c405ae7bb3a08125b9942f63ec8d635c1c11869648272d2c3ecad16a432fbca2d4d584d80ad2dbf15250d5a
-  data.tar.gz: f303d01e2c4b43fa2c5d44af4e469288684887c3efe71ee644275f233d584b9e342f9ebd80374632afe1199ad0d4182cebb515a95a7408b79aa36d239c9c9ffb
+  metadata.gz: 81d50a93f9df23fe424f4dd62fe10fa09f840ab16eccb5de4d83b0d2f681b3cdb8fc9416e2b818f230399276974cac7455f38bfa1fe66c55968f70fc5c1661bb
+  data.tar.gz: 00bc7b7851c843a92988c23feacba461e6b9e1c2ef1f27b025c363f452f759492a30d4c1ff5d8117ba6bb4940eaebb19234c5fef9012d6cf8339a2ee143bf875

data/.gitignore

@@ -1,3 +1,5 @@
+vendor/
+
 # rcov generated
 coverage
 

data/Gemfile.lock

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

data/example/client_message.rb

@@ -0,0 +1,13 @@
+
+$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
+
+require 'X11'
+
+display = X11::Display.new
+
+display.client_message(
+  mask: X11::Form::SubstructureNotifyMask | X11::Form::SubstructureRedirectMask,
+  type: :_NET_CURRENT_DESKTOP,
+  data: ARGV.shift.to_i
+)
+

data/example/test.rb

@@ -143,7 +143,7 @@ def render_glyph(display, wid, x,y, ch)
 #p img
 #  p ch
  display.put_image(
-    X11::Form::ZPixmap, wid, $gc2,
+    :ZPixmap, wid, $gc2,
     mtx.min_width,mtx.min_height,
     x, y - mtx.y_offset, 0, depth, data
   )
@@ -158,12 +158,12 @@ def render_str(display, wid, x,y, str)
 end
 
 def redraw(dpy, wid, gc)
-  dpy.poly_fill_rectangle(wid, gc, [X11::Form::Rectangle.new(20,20, 60, 80)])
+  dpy.poly_fill_rectangle(wid, gc, [20,20, 60, 80])
   dpy.clear_area(false, wid, 30, 30, 5, 5)
   dpy.image_text16(wid, $gc2, 30, 70, "ΑΒΓΔΕΖΗΘΙΚΛΜΝΞΟΠΡΣΤΥΦΧΨΩ")
   #"\u25f0\u25ef Hello World")
   dpy.put_image(
-    X11::Form::ZPixmap, wid, $gc2,
+    :ZPixmap, wid, $gc2,
     $png.width, $png.height, 80, 120, 0, 24, $data
   )
   render_str(dpy, wid, 30,90, 'HelloWorld')

data/lib/X11/auth.rb

@@ -11,14 +11,14 @@ module X11
     AUTHENTICATE = 2
 
     ADDRESS_TYPES = {
-      256 => :Local,
+      0     => :Internet,
+      1     => :DECnet,
+      2     => :Chaos,
+      252   => :LocalHost,
+      253   => :Krb5Principal,
+      254   => :Netname,
+      256   => :Local,
       65535 => :Wild,
-      254 => :Netname,
-      253 => :Krb5Principal,
-      252 => :LocalHost,
-      0 => :Internet,
-      1 => :DECnet,
-      2 => :Chaos
     }
 
     AuthInfo = Struct.new :family, :address, :display, :auth_name, :auth_data
@@ -52,18 +52,15 @@ module X11
 
     # returns one entry from Xauthority file
     def read
-      auth_info = [] << ADDRESS_TYPES[ @file.read(2).unpack('n').first ]
+      auth_info = [] << ADDRESS_TYPES[ @file.read(2).unpack1('n') ]
 
       4.times do
-        length = @file.read(2).unpack('n').first
+        length = @file.read(2).unpack1('n')
         auth_info << @file.read(length)
       end
       AuthInfo[*auth_info]
     end
 
-    def reset
-      @file.seek(0, IO::SEEK_SET)
-    end
-
+    def reset = @file.seek(0, IO::SEEK_SET)
   end
 end

data/lib/X11/display.rb

@@ -17,6 +17,8 @@ module X11
       host, display_id, screen_id = $1, $2, $3
       family = nil
 
+      @debug = ENV["PUREX_DEBUG"].to_s.strip == "true"
+      
       if host.empty?
         @socket = UNIXSocket.new("/tmp/.X11-unix/X#{display_id}")
         family = :Local
@@ -26,22 +28,27 @@ module X11
         family = :Internet
       end
 
-      # FIXME
-      authorize(host, family, display_id) rescue nil
+      authorize(host, family, display_id)
 
       @requestseq = 1
-      @queue = []
-
-      @extensions = {}
+      @rqueue = Queue.new       # Read but not returned events
+      @wqueue = Queue.new
+      @extensions = {}  # Known extensions
+      @atoms = {}       # Interned atoms
 
-      # Interned atoms
-      @atoms = {}
+      start_io
     end
 
     def event_handler= block
       @event_handler= block
     end
 
+    def flush
+      while !@wqueue.empty?
+        sleep(0.01)
+      end
+    end
+
     def display_info
       @internal
     end
@@ -67,8 +74,15 @@ module X11
 
     def read_error data
       error = Form::Error.from_packet(StringIO.new(data))
+      # FIXME: Maybe make this configurable, as it means potentially
+      # keeping along really heavy requests. or alternative purge them
+      # more aggressively also when there are no errors, as otherwise
+      # the growth might be unbounded
+      error.request = @requests[error.sequence_number]
+      @requests.keys.find_all{|s| s <= error.sequence_number}.each do |s|
+        @requests.delete(s)
+      end
       STDERR.puts "ERROR: #{error.inspect}"
-      raise error.inspect
       error
     end
 
@@ -116,7 +130,7 @@ module X11
       # FIXME: 30: SelectionRequest
       # FIXME: 31: SelectionNotify
       # FIXME: 32: ColormapNotify
-      when 33 then return Form::ClientMessage.from_packet(StringIO.new(data))
+      when 33 then return Form::ClientMessage.from_packet(io)
       # FIXME: 34: MappingNotify
       else
         STDERR.puts "FIXME: Event: #{type}"
@@ -126,22 +140,24 @@ module X11
     end
 
     def read_full_packet(len = 32)
-      data = @socket.read_nonblock(32)
+      data = @socket.read(32)
       return nil if data.nil?
       while data.length < 32
         IO.select([@socket],nil,nil,0.001)
         data.concat(@socket.read_nonblock(32 - data.length))
       end
       return data
-    rescue IO::WaitReadable
-      return nil
     end
 
-    def read_packet timeout=5.0
-      IO.select([@socket],nil,nil, timeout)
+    def read_packet
       data = read_full_packet(32)
       return nil if data.nil?
 
+      # FIXME: Make it configurable.
+      @requests.keys.find_all{|s| s <= @requestseq - 50}.each do |s|
+        @requests.delete(s)
+      end
+
       # FIXME: What is bit 8 for? Synthentic?
       type = data.unpack("C").first & 0x7f
       case type
@@ -153,61 +169,100 @@ module X11
       end
     end
 
-    def write_raw_packet(pkt)
-      @requestseq += 1
-      @socket.write(pkt)
-    end
-    
     def write_packet(*args)
       pkt = args.join
       pkt[2..3] = u16(pkt.length/4)
-      write_raw_packet(pkt)
+      @wqueue << [nil,nil,pkt]
     end
     
     def write_request ob
-      #p data
-      #p [:write_request, @requestseq, ob.class]
-      data = ob.to_packet if ob.respond_to?(:to_packet)
-      #p [:AddGlyph,data] if ob.is_a?(X11::Form::XRenderAddGlyphs)
-      #p [ob.request_length.to_i*4, data.size]
+      data = ob.to_packet(self) if ob.respond_to?(:to_packet)
       raise "BAD LENGTH for #{ob.inspect} (#{ob.request_length.to_i*4} ! #{data.size} " if ob.request_length && ob.request_length.to_i*4 != data.size
-      write_raw_packet(data)
-    end
-
-    def write_sync(data, reply=nil)
-      seq = @requestseq
-      write_request(data)
-      pkt = next_reply(seq)
-      return nil if !pkt
-      return pkt if pkt.is_a?(X11::Form::Error)
-      pp reply
+      STDERR.puts "write_req: #{ob.inspect}" if @debug
+      @wqueue << [ob,nil,data]
+    end
+
+    def write_sync(ob, reply=nil)
+      data = ob.to_packet(self) if ob.respond_to?(:to_packet)
+      q = Queue.new
+      @wqueue << [ob,q,data]
+      STDERR.puts "write_sync_req: #{ob.inspect}" if @debug
+      pkt = q.shift
+      STDERR.puts "write_sync_rep: #{pkt.inspect}" if @debug
+      raise(pkt) if pkt.is_a?(X11::Form::Error)
+      return pkt if !pkt.is_a?(String)
       reply ? reply.from_packet(StringIO.new(pkt)) : pkt
     end
 
-    def peek_packet
-      !@queue.empty?
-    end
+    def peek_packet = !@rqueue.empty?
+    def next_packet = @rqueue.shift
 
-    def next_packet
-      @queue.shift || read_packet
-    end
+    def close  = @rqueue.close
+      
+    def start_io
+      @replies ||= {}
+      @requests ||= {}
+      # Read thread.
+      # FIXME: Drop the select.
+      rt = Thread.new do
+        while pkt = read_packet
+          #STDERR.puts "read: #{pkt.inspect}"
+          if !pkt
+            sleep 0.1
+          elsif pkt.is_a?(String)
+            # This is a reply. We need the sequence number.
+            #
+            seq = pkt.unpack1("@2S")
+            STDERR.puts "  - seq= #{seq}" if @debug
+            STDERR.puts @replies.inspect if @debug
+            if @replies[seq]
+              q = @replies.delete(seq)
+              STDERR.puts "  - reply to #{q}" if @debug
+              q << pkt
+            end
+          elsif pkt.is_a?(X11::Form::Error)
+            if @replies[pkt.sequence_number]
+              q = @replies.delete(pkt.sequence_number)
+              q << pkt
+            else
+              @rqueue << pkt
+            end
+          else
+            @rqueue << pkt
+          end
+        end
+        @rqueue.close
+        @replies.values.each(&:close)
+      end
 
-    def next_reply(errseq)
-      # FIXME: This is totally broken
-      while pkt = read_packet
-        if pkt.is_a?(String)
-          return pkt
-        elsif pkt.is_a?(X11::Form::Error) && pkt.sequence_number == errseq
-          return pkt
-        else
-          @queue.push(pkt)
+      # Write thread
+      wt = Thread.new do
+        while msg = @wqueue.shift
+          ob, q, data = *msg
+          @requests[@requestseq] = ob
+          @replies[@requestseq] = q if q
+          @requestseq = (@requestseq + 1) % 65536
+          @socket.write(data)
         end
       end
+
+      at_exit do
+        flush
+        @rqueue.close
+        @wqueue.close
+        # We kill this because it may be stuck in a read
+        # we'll never care about
+        Thread.kill(rt)
+        
+        # We wait for this to finish because otherwise we may
+        # lose side-effects
+        wt.join
+      end
     end
- 
+    
     def run
       loop do
-        pkt = read_packet
+        pkt = next_packet
         return if !pkt
         yield(pkt)
       end
@@ -218,13 +273,15 @@ module X11
         d.depth == depth }.visuals.find{|v| v.qlass = qlass }
     end
 
+    def default_root = screens.first.root
+      
     # Requests
     def create_window(x,y,w,h,
       values: {},
       depth: 32, parent: nil, border_width: 0, wclass: X11::Form::InputOutput, visual: nil
     )
       wid = new_id
-      parent ||= screens.first.root
+      parent ||= default_root
 
       if visual.nil?
         visual = find_visual(0, depth).visual_id
@@ -252,24 +309,27 @@ module X11
       values = values.sort_by{_1[0]}
       mask =   values.inject(0) {|acc,v| (acc | v[0]) }
       values = values.map{_1[1]}
-      write_request(
-        X11::Form::ChangeWindowAttributes.new(wid, mask, values)
-      )
+      write_request(Form::ChangeWindowAttributes.new(wid, mask, values))
     end
 
     def select_input(w, events) = change_window_attributes(w, values: {Form::CWEventMask => events})
 
     def atom(name)
+      return name if name.is_a?(Integer) # Allow atom(atom_integer_or_symbol)
+      begin
+        return Form::Atoms.const_get(name.to_sym) if Form::Atoms.const_defined?(name.to_sym)
+      rescue
+        # const_defined? will throw if name isn't a valid constant name, but
+        # that's fine
+      end
       name = name.to_sym
       intern_atom(false, name) if !@atoms[name]
       @atoms[name]
     end
 
     def query_extension(name)
-      r = write_sync(X11::Form::QueryExtension.new(name), X11::Form::QueryExtensionReply)
-      @extensions[name] = {
-        major: r.major_opcode
-      }
+      r = write_sync(Form::QueryExtension.new(name), Form::QueryExtensionReply)
+      @extensions[name] = { major: r.major_opcode }
       r
     end
 
@@ -282,38 +342,33 @@ module X11
     end
     
     def intern_atom(flag, name)
-      reply = write_sync(X11::Form::InternAtom.new(flag, name.to_s),
-      X11::Form::InternAtomReply)
+      reply = write_sync(Form::InternAtom.new(flag, name.to_s),Form::InternAtomReply)
       if reply
         @atoms[name.to_sym] = reply.atom
       end
     end
 
-    def get_atom_name(atom)
-      reply = write_sync(X11::Form::GetAtomName.new(atom), X11::Form::AtomName)
-      reply&.name
-    end
-
-    def destroy_window(window) = write_request(X11::Form::DestroyWindow.new(window))
-    def get_geometry(drawable) = write_sync(X11::Form::GetGeometry.new(drawable), X11::Form::Geometry)
+    def get_atom_name(atom)    = write_sync(Form::GetAtomName.new(atom), Form::AtomName)&.name
+    def destroy_window(window) = write_request(Form::DestroyWindow.new(window))
+    def get_geometry(drawable) = write_sync(Form::GetGeometry.new(drawable), Form::Geometry)
     
     def get_keyboard_mapping(min_keycode=display_info.min_keycode, count= display_info.max_keycode - min_keycode)
-      write_sync(X11::Form::GetKeyboardMapping.new(min_keycode, count), X11::Form::GetKeyboardMappingReply)
+      write_sync(Form::GetKeyboardMapping.new(min_keycode, count), Form::GetKeyboardMappingReply)
     end
 
     def create_colormap(alloc, window, visual)
       mid = new_id
-      write_request(X11::Form::CreateColormap.new(alloc, mid, window, visual))
+      write_request(Form::CreateColormap.new(alloc, mid, window, visual))
       mid
     end
 
     def get_property(window, property, type, offset: 0, length: 4, delete: false)
-      property = atom(property) if !property.is_a?(Integer)
+      property = atom(property)
       type     = atom_enum(type)
       
-      result = write_sync(X11::Form::GetProperty.new(
+      result = write_sync(Form::GetProperty.new(
         delete, window, property, type, offset, length
-      ), X11::Form::Property)
+      ), Form::Property)
 
       if result && result.format != 0
         case result.format
@@ -335,30 +390,30 @@ module X11
 
       mode = open_enum(mode, {replace: 0, prepend: 1, append: 2})
       type = atom_enum(type)
-      write_request(X11::Form::ChangeProperty.new(mode, window, property, type, format, data))
-    end
-
-    def list_fonts(*args)
-      write_sync(X11::Form::ListFonts.new(*args),
-        X11::Form::ListFontsReply)
+      write_request(Form::ChangeProperty.new(mode, window, property, type, format, data))
     end
 
-    def open_font(*args)    = write_request(X11::Form::OpenFont.new(*args))
-    def change_gc(*args)    = write_request(X11::Form::ChangeGC.new(*args))
-    def change_save_set(...)= write_request(X11::Form::ChangeSaveSet.new(...))
+    def list_fonts(...)     = write_sync(Form::ListFonts.new(...), Form::ListFontsReply)
+    def open_font(...)      = write_request(Form::OpenFont.new(...))
+    def change_gc(...)      = write_request(Form::ChangeGC.new(...))
+    def change_save_set(...)= write_request(Form::ChangeSaveSet.new(...))
+      
     def reparent_window(window, parent, x, y, save: true)
       # You so almost always want this that it should've been a single request
       change_save_set(0, window) if save
-      write_request(X11::Form::ReparentWindow.new(window, parent, x,y))
+      write_request(Form::ReparentWindow.new(window, parent, x,y))
     end
     
-    def map_window(*args)   = write_request(X11::Form::MapWindow.new(*args))
-    def unmap_window(*args) = write_request(X11::Form::UnmapWindow.new(*args))
+    def map_window(...)   = write_request(Form::MapWindow.new(...))
+    def unmap_window(...) = write_request(Form::UnmapWindow.new(...))
 
     def u8(*args)  = args.pack("c*")
     def u16(*args) = args.pack("v*")
     def u32(*args) = args.pack("V*")
-    def atom_enum(val) = open_enum(val, {cardinal: Form::CardinalAtom, atom: Form::AtomAtom, window: Form::WindowAtom})
+    def atom_enum(val)
+      open_enum(val, {cardinal: Form::CardinalAtom, atom: Form::AtomAtom, window: Form::WindowAtom}) || atom(val)
+    end
+    
     def window(*args)
       args.each {|a| raise "Window expected" if a.nil? }
       u32(*args)
@@ -369,15 +424,15 @@ module X11
     def set_input_focus(revert_to, focus, time=:now)
       # FIXME: This is an experiment.
       # Upside: Simpler. Downside: Doesn't work server-side.
-      # 
+      # Probably a bad idea.
       revert_to = open_enum(revert_to, {none: 0, pointer_root: 1, parent: 2})
       focus     = open_enum(focus,     {none: 0, pointer_root: 1 })
       time      = open_enum(time,      {current_time: 0, now: 0})
       write_packet(u8(42,revert_to), u16(3), window(focus), u32(time))
     end
-      
+
     def grab_key(owner_events, grab_window, modifiers, keycode, pointer_mode, keyboard_mode)
-      write_request(X11::Form::GrabKey.new(
+      write_request(Form::GrabKey.new(
         owner_events,
         grab_window,
         modifiers,
@@ -389,7 +444,7 @@ module X11
 
     def grab_button(owner_events, grab_window, event_mask, pointer_mode,
       keyboard_mode, confine_to, cursor, button, modifiers)
-      write_request(X11::Form::GrabButton.new(
+      write_request(Form::GrabButton.new(
         owner_events, grab_window, event_mask,
         pointer_mode == :async ? 1 : 0,
         keyboard_mode == :async ? 1 : 0,
@@ -397,41 +452,26 @@ module X11
       )
     end
 
-    def configure_window(window, x: nil, y: nil, width: nil, height: nil,
-      border_width: nil, sibling: nil, stack_mode: nil)
-
-      mask = 0
-      values = []
-
+    def set_value(values, mask, x)
       if x
-        mask |= 0x001
         values << x
+        mask
+      else
+        0
       end
+    end
+      
+    def configure_window(window, x: nil, y: nil, width: nil, height: nil,
+      border_width: nil, sibling: nil, stack_mode: nil)
 
-      if y
-        mask |= 0x002
-        values << y
-      end
-
-      if width
-        mask |= 0x004
-        values << width
-      end
-
-      if height
-        mask |= 0x008
-        values << height
-      end
-
-      if border_width
-        mask |= 0x010
-        values << border_width
-      end
-
-      if sibling
-        mask |= 0x020
-        values << sibling
-      end
+      values = []
+      mask  = 0
+      mask |= set_value(values, 0x001, x)
+      mask |= set_value(values, 0x002, y)
+      mask |= set_value(values, 0x004, width)
+      mask |= set_value(values, 0x008, height)
+      mask |= set_value(values, 0x010, border_width)
+      mask |= set_value(values, 0x020, sibling)
 
       if stack_mode
         mask |= 0x040
@@ -448,39 +488,50 @@ module X11
     end
 
 
-    def create_gc(window, foreground: nil, background: nil)
+    def create_gc(window, foreground: nil, background: nil,
+      graphics_exposures: nil
+    )
       mask = 0
       args = []
 
       # FIXME:
       # The rest can be found here:
       # https://tronche.com/gui/x/xlib/GC/manipulating.html#XGCValues
-      if foreground
-        mask |= 0x04
-        args << foreground
-      end
-      if background
-        mask |= 0x08
-        args << background
-      end
-
+      mask |= set_value(args, 0x04, foreground)
+      mask |= set_value(args, 0x08, background)
+      mask |= set_value(args, 0x10000, graphics_exposures)
       
       gc = new_id
       write_request(X11::Form::CreateGC.new(gc, window, mask, args))
       gc
     end
 
+    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)
+      event = Form::ClientMessage.new(
+        format, 0, window, atom(type), data
+      )
+      event.code =33
+      pp event
+        
+      send_event(propagate, destination, mask, event)
+    end
+      
     def put_image(*args)   = write_request(X11::Form::PutImage.new(*args))
     def clear_area(*args)  = write_request(X11::Form::ClearArea.new(*args))
     def copy_area(*args)   = write_request(X11::Form::CopyArea.new(*args))
     def image_text8(*args) = write_request(X11::Form::ImageText8.new(*args))
     def image_text16(*args)= write_request(X11::Form::ImageText16.new(*args))
-    def poly_fill_rectangle(*args) = write_request(X11::Form::PolyFillRectangle.new(*args))
+    def poly_fill_rectangle(wid, gc, *rects)
+      rects = rects.map{|r| r.is_a?(Array) ? Form::Rectangle.new(*r) : r}
+      write_request(X11::Form::PolyFillRectangle.new(wid, gc, rects))
+    end
 
     def create_pixmap(depth, drawable, w,h)
-      pid = new_id
-      write_request(X11::Form::CreatePixmap.new(depth, pid, drawable, w,h))
-      pid
+      new_id.tap{|pid| write_request(Form::CreatePixmap.new(depth, pid, drawable, w,h)) }
     end
 
     # XRender
@@ -506,8 +557,8 @@ module X11
 
     def render_query_pict_formats
       @render_formats ||= write_sync(
-        X11::Form::XRenderQueryPictFormats.new(render_opcode),
-        X11::Form::XRenderQueryPictFormatsReply
+        Form::XRenderQueryPictFormats.new(render_opcode),
+        Form::XRenderQueryPictFormatsReply
       )
     end
 
@@ -528,26 +579,26 @@ module X11
       case sym
       when :a8
         @a8 ||= formats.formats.find do |f|
-          f.type == 1 &&
+          f.type  == 1 &&
           f.depth == 8 &&
           f.direct.alpha_mask == 255
         end
       when :rgb24
         @rgb24 ||= formats.formats.find do |f|
-          f.type == 1 &&
-          f.depth == 24 &&
-          f.direct.red == 16 &&
-          f.direct.green == 8 &&
-          f.direct.blue == 0
+          f.type         == 1  &&
+          f.depth        == 24 &&
+          f.direct.red   == 16 &&
+          f.direct.green == 8  &&
+          f.direct.blue  == 0
         end
       when :argb24
         @argb24 ||= formats.formats.find do |f|
-          f.type == 1 &&
-          f.depth == 32 &&
+          f.type         == 1  &&
+          f.depth        == 32 &&
           f.direct.alpha == 24 &&
-          f.direct.red == 16 &&
-          f.direct.green == 8 &&
-          f.direct.blue == 0
+          f.direct.red   == 16 &&
+          f.direct.green == 8  &&
+          f.direct.blue  == 0
         end
       else
         raise "Unsupported format (a4/a1 by omission)"
@@ -605,7 +656,6 @@ module X11
         auth_name = ""
         auth_data = ""
       end
-      p [auth_name, auth_data]
 
       handshake = Form::ClientHandshake.new(
         Protocol::BYTE_ORDER,
@@ -615,7 +665,7 @@ module X11
         auth_data
       )
 
-      @socket.write(handshake.to_packet)
+      @socket.write(handshake.to_packet(self))
 
       data = @socket.read(1)
       raise AuthorizationError, "Failed to read response from server" if !data

data/lib/X11/form.rb

@@ -44,7 +44,7 @@ module X11
         end
       end
 
-      def to_packet
+      def to_packet(dpy)
         # fetch class level instance variable holding defined fields
         structs = self.class.structs
 
@@ -64,17 +64,10 @@ module X11
             #p [s,value]
 
             if value.is_a?(BaseForm)
-              v = value.to_packet
-            elsif value.is_a?(Symbol)
-              #if !@atoms[value]
-              #  reply = write_sync(X11::Forms::InternAtom.new(false, value.to_s), X11::Forms::InternAtomReply)
-              #  @
-              #end
-              #value = @atoms[value]
-              raise "FIXME"
+              v = value.to_packet(dpy)
             else
               #p [s,value]
-              v = s.type_klass.pack(value)
+              v = s.type_klass.pack(value, dpy)
             end
             #p v
             v
@@ -84,15 +77,15 @@ module X11
           when :length, :format_length
             #p [s,value]
             #p [value.size]
-            s.type_klass.pack(value.size)
+            s.type_klass.pack(value.size, dpy)
           when :string
-            s.type_klass.pack(value)
+            s.type_klass.pack(value, dpy)
           when :list
             Array(value).collect do |obj|
               if obj.is_a?(BaseForm)
-                obj.to_packet
+                obj.to_packet(dpy)
               else
-                s.type_klass.pack(obj)
+                s.type_klass.pack(obj, dpy)
               end
             end
           end
@@ -191,6 +184,29 @@ module X11
       end
     end
 
+    # # Predefined constants, that can be used in the form of symbols
+    
+    module Atoms
+      PRIMARY   = 1
+      SECONDARY = 2
+      ARC = 3
+      ATOM = 4
+      BITMAP = 5
+      CARDINAL = 6
+      COLORMAP = 7
+      CURSOR = 8
+      #...
+      STRING = 31
+      VISUALID = 32
+      WINDOW = 33
+      WM_COMMAND = 34
+      WM_HINTS = 35
+    end
+
+    PointerWindow = 0
+    InputFocus = 1
+    
+    # FIXME: Deprecated in favour of the Constants module
     AtomAtom=4
     CardinalAtom=6
     WindowAtom=33
@@ -293,6 +309,9 @@ module X11
       field :minor_opcode, Uint16
       field :major_opcode, Uint8
       unused 21
+
+      # The original request
+      attr_accessor :request
     end
 
     # XRender structures
@@ -336,8 +355,9 @@ module X11
       field :colormap, Colormap
     end
     
-    # Requests
+    # # Requests
 
+    # Constants, p112 onwards
     CopyFromParent = 0
     InputOutput    = 1
     InputOnly      = 2
@@ -365,12 +385,17 @@ module X11
     PointerMotionMask      = 0x000040
     PointerMotionHintMask  = 0x000080
     Button1MotionMask      = 0x000100
+    # 0x200 .. 0x40000; page 113
     ExposureMask           = 0x008000
+    VisibilityChangeMask   = 0x010000
     StructureNotifyMask    = 0x020000
+    ResizeRedirectMask     = 0x040000
     SubstructureNotifyMask = 0x080000
     SubstructureRedirectMask=0x100000
     FocusChangeMask        = 0x200000
     PropertyChangeMask     = 0x400000
+    ColormapChangeMask     = 0x800000
+    OwnerGrabButtonMask    = 0x100000
 
     class CreateWindow < BaseForm
       field :opcode, Uint8, value: 1
@@ -599,6 +624,15 @@ module X11
       field :value, String8, :string
     end
 
+    class SendEvent < BaseForm
+      field :opcode, Uint8, value: 25
+      field :propagate, Bool
+      field :request_length, Uint16, value: 11
+      field :destination, Window
+      field :event_mask, Uint32
+      field :event, Uint32 # FIXME: This is wrong, and will break on parsing.
+    end
+    
     class GrabButton < BaseForm
       field :opcode, Uint8, value: 28
       field :owner_events, Bool
@@ -685,6 +719,7 @@ module X11
     ForegroundMask = 0x04
     BackgroundMask = 0x08
     FontMask = 0x4000
+    GraphicsExposures = 0x10000
 
     class CreateGC < BaseForm
       field :opcode, Uint8, value: 55
@@ -1009,6 +1044,7 @@ module X11
       unused 1
       field :sequence_number, Uint16
       field :event, Window
+      field :window, Window
       field :above_sibling, Window
       field :x, Int16
       field :y, Int16

data/lib/X11/protocol.rb

@@ -1,14 +1,12 @@
 module X11
   module Protocol
-    # endiness of your machine
+    # endianess of your machine
     BYTE_ORDER = case [1].pack("L")
-      when "\0\0\0\1"
-        "B".ord
-      when "\1\0\0\0"
-        "l".ord
+      when "\0\0\0\1" then "B".ord
+      when "\1\0\0\0" then "l".ord
       else
         raise ByteOrderError.new "Cannot determine byte order"
-    end
+      end
 
     MAJOR = 11
     MINOR = 0

data/lib/X11/screen.rb

@@ -7,25 +7,11 @@ module X11
       @internal = data
     end
 
-    def root
-      @internal.root
-    end
-
-    def root_depth
-      @internal.root_depth
-    end
-
-    def root_visual
-      @internal.root_visual
-    end
-
-    def width
-      @internal.width_in_pixels
-    end
-
-    def height
-      @internal.height_in_pixels
-    end
+    def root        = @internal.root
+    def root_depth  = @internal.root_depth
+    def root_visual = @internal.root_visual
+    def width       = @internal.width_in_pixels
+    def height      = @internal.height_in_pixels
 
     def to_s
       "#<X11::Screen(#{id}) width=#{width} height=#{height}>"

data/lib/X11/type.rb

@@ -1,55 +1,48 @@
 # This module is used for encoding Ruby Objects to binary
 # data. The types Int8, Int16, etc. are data-types defined
-# in the X11 protocol. We wrap each data-type in a lambda expression
-# which gets evaluated when a packet is created.
+# in the X11 protocol.
 
 module X11
   module Type
 
-    def self.define(type, directive, bytesize)
-      eval %{
-        class X11::Type::#{type}
-          def self.pack(x)
-            [x].pack(\"#{directive}\")
-          end
-
-          def self.unpack(x)
-            x.unpack(\"#{directive}\").first
-          end
+    class BaseType
+      @directive = nil
+      @bytesize = nil
 
-          def self.size
-            #{bytesize}
-          end
-
-          def self.from_packet(sock)
-            r = sock.read(size)
-            r ? unpack(r) : nil
+      def self.config(d,b) = (@directive, @bytesize = d,b)
+        
+      def self.pack(x, dpy)
+        if x.is_a?(Symbol)
+          if (t = X11::Form.const_get(x)) && t.is_a?(Numeric)
+            x = t
           end
         end
-      }
-    end
+        [x].pack(@directive)
+      rescue TypeError => e
+        raise "Expected #{self.name}, got #{x.class} (value: #{x})"
+      end
 
-    # Primitive Types
-    define "Int8", "c", 1
-    define "Int16", "s", 2
-    define "Int32", "l", 4
-    define "Uint8", "C", 1
-    define "Uint16", "S", 2
-    define "Uint32", "L", 4
+      def self.unpack(x) = x.nil? ? nil  : x.unpack1(@directive)
+      def self.size = @bytesize
+      def self.from_packet(sock) = unpack(sock.read(size))
+    end
+    
+    class Int8   < BaseType; config("c",1); end
+    class Int16  < BaseType; config("s",2); end
+    class Int32  < BaseType; config("l",4); end
+    class Uint8  < BaseType; config("C",1); end
+    class Uint16 < BaseType; config("S",2); end
+    class Uint32 < BaseType; config("L",4); end
     
-    define "Message", "c*", 20
-
     class Message
-      def self.pack(x) = x.b
-      def self.unpack(x) = x.b
-      def self.size = 20
+      def self.pack(x,dpy) = x.b
+      def self.unpack(x)   = x.b
+      def self.size        = 20
       def self.from_packet(sock) = sock.read(2).b
     end
 
     class String8
-      def self.pack(x)
-        x.force_encoding("ASCII-8BIT") + "\x00"*(-x.length & 3)
-      end
+      def self.pack(x, dpy) = (x.b + "\x00"*(-x.length & 3))
 
       def self.unpack(socket, size)
         raise "Expected size for String8" if size.nil?
@@ -61,8 +54,8 @@ module X11
     end
 
     class String16
-      def self.pack(x)
-        x.encode("UTF-16BE").force_encoding("ASCII-8BIT") + "\x00\x00"*(-x.length & 1)
+      def self.pack(x, dpy)
+        x.encode("UTF-16BE").b + "\x00\x00"*(-x.length & 1)
       end
 
       def self.unpack(socket, size)
@@ -75,28 +68,14 @@ module X11
 
 
     class String8Unpadded
-      def self.pack(x)
-        x
-      end
-
-
-      def self.unpack(socket, size)
-        val = socket.read(size)
-      end
+      def self.pack(x,dpy) = x
+      def self.unpack(socket, size) = socket.read(size)
     end
-    
+      
     class Bool
-      def self.pack(x)
-        x ? "\x01" : "\x00"
-      end
-
-      def self.unpack(str)
-        str[0] == "\x01"
-      end
-
-      def self.size
-        1
-      end
+      def self.pack(x, dpy) = (x ? "\x01" : "\x00")
+      def self.unpack(str)  = (str[0] == "\x01")
+      def self.size = 1
     end
     
     KeyCode      = Uint8
@@ -114,10 +93,16 @@ module X11
     Colormap     = Uint32
     Drawable     = Uint32
     Fontable     = Uint32
-    Atom         = Uint32
     VisualID     = Uint32
     Mask         = Uint32
     Timestamp    = Uint32
     Keysym       = Uint32
+
+    class Atom
+      def self.pack(x,dpy) = [dpy.atom(x)].pack("L")
+      def self.unpack(x)   = x.nil? ? nil : x.unpack1("L")
+      def self.size = 4
+      def self.from_packet(sock) = unpack(sock.read(size))
+    end
   end
 end

data/lib/X11/version.rb

@@ -1,3 +1,3 @@
 module X11
-  VERSION = "0.0.5"
+  VERSION = "0.0.7"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pure-x11
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.7
 platform: ruby
 authors:
 - Vidar Hokstad
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-12-16 00:00:00.000000000 Z
+date: 2024-01-11 00:00:00.000000000 Z
 dependencies: []
 description: Pure Ruby X11 bindings
 email:
@@ -25,6 +25,7 @@ files:
 - README.md
 - Rakefile
 - docs/protocol.pdf
+- example/client_message.rb
 - example/genie.png
 - example/test.rb
 - lib/X11.rb