pure-x11 0.0.4 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 51d974fee51d60b334a5e5f26bb5e0d90f8628e09930da7bb6c97145b3718ed9
-  data.tar.gz: 2312f1c9f7e0d2b5391bb15aab15805e802635d53d6fe1d90cf22f0c2112b117
+  metadata.gz: 927c52f35913e7d8bc466563bb5d238919c4a43d6a9f9fb1be8a6df4735cc5fb
+  data.tar.gz: 3b92ed556881c32486ed189c9de27fdd373988379118fefdbd6f40ff6268c0e7
 SHA512:
-  metadata.gz: 226fbfc35ff75f2fa95fabf09a7d0e4c72cd99f1678cd607e8421ed26750118e40291686a582c01b0ae296dfcefc5e7038bd3d3025f9b678e5a1fa35c2465135
-  data.tar.gz: 69363b78df087ea43799f06c8477d008d15b721bcd604a52e1eb3b33411a102fcf4d33f3262ac0c0de5fa76de9262d489eaaca85e043f5251bb41563959970fd
+  metadata.gz: 580ab719f597acaecfa467389f26526dc50c1d25cacb14dbda9d63f61e3cb63f3665fd010408fc093501893a229a4b6a6f314734f6cf35786c58d965d0ec51cd
+  data.tar.gz: 211b56d642b773c29769e9620c746a657596b6314e1d5a89487ace79bf29c6f01f4675ec2456a8668b8723912b2c81f2c95309dcdaf9eac459682150b884f726

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/test.rb

@@ -13,37 +13,37 @@ require 'X11'
 dpy = display = X11::Display.new
 screen = dpy.screens.first
 root = screen.root
-wid = display.new_id
 
-dpy.create_window(
-  screen.root_depth, wid, root,
+wid = dpy.create_window(
   0, 0, # x,y
   1000, 600, # w,h
-  0,
-  X11::Form::InputOutput,
-  X11::Form::CopyFromParent,
-  X11::Form::CWBackPixel |
-    X11::Form::CWEventMask,
-  [0x0, # RGB background
-   X11::Form::SubstructureNotifyMask |
-   X11::Form::StructureNotifyMask    | ## Move
-   X11::Form::ExposureMask           |
-   X11::Form::KeyPressMask           |
-   X11::Form::ButtonPressMask
-  ]
+  # FIXME: WTH isn't depth: 32 working here?
+  depth: 24,
+  values: {
+    X11::Form::CWBackPixel => 0x0,
+    X11::Form::CWEventMask =>
+      (X11::Form::SubstructureNotifyMask |
+       X11::Form::StructureNotifyMask    | ## Move
+       X11::Form::ExposureMask           |
+       X11::Form::KeyPressMask           |
+       X11::Form::ButtonPressMask)
+   }
 )
+#dpy.next_packet
+#exit(0)
 
 def set_window_opacity(dpy, wid, opacity)
   dpy.change_property(
-    X11::Form::Replace,
-    wid, dpy.atom(:_NET_WM_WINDOW_OPACITY),
-    X11::Form::CardinalAtom, 32,
-    [(0xffffffff * opacity).to_i].pack("N").split(//).map(&:ord)
+    :replace,
+    wid, "_NET_WM_WINDOW_OPACITY",
+    :cardinal, 32,
+    [(0xffffffff * opacity).to_i].pack("V").unpack("C*")
   )
 end
 
 
 set_window_opacity(dpy, wid, 0.8)
+
 #p dpy.display_info
 
 #reply = dpy.query_extension("XKEYBOARD")
@@ -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/display.rb

@@ -68,6 +68,7 @@ module X11
     def read_error data
       error = Form::Error.from_packet(StringIO.new(data))
       STDERR.puts "ERROR: #{error.inspect}"
+      raise error.inspect
       error
     end
 
@@ -80,28 +81,47 @@ module X11
     end
 
     def read_event type, data, event_class
+      io = StringIO.new(data)
       case type
-      when 2
-        return Form::KeyPress.from_packet(StringIO.new(data))
-      when 3
-        return Form::KeyRelease.from_packet(StringIO.new(data))
-      when 4
-        return Form::ButtonPress.from_packet(StringIO.new(data))
-      when 5
-        return Form::ButtonRelease.from_packet(StringIO.new(data))
-      when 6
-        return Form::MotionNotify.from_packet(StringIO.new(data))
-      when 12
-        return Form::Expose.from_packet(StringIO.new(data))
-      when 14
-        return Form::NoExposure.from_packet(StringIO.new(data))
-      when 19
-        return Form::MapNotify.from_packet(StringIO.new(data))
-      when 22
-        return Form::ConfigureNotify.from_packet(StringIO.new(data))
+      # 0 is error, not handled here
+      # 1 is reply, not handled here
+      when 2  then return Form::KeyPress.from_packet(io)
+      when 3  then return Form::KeyRelease.from_packet(io)
+      when 4  then return Form::ButtonPress.from_packet(io)
+      when 5  then return Form::ButtonRelease.from_packet(io)
+      when 6  then return Form::MotionNotify.from_packet(io)
+      when 7  then return Form::EnterNotify.from_packet(io)
+      when 8  then return Form::LeaveNotify.from_packet(io)
+      when 9  then return Form::FocusIn.from_packet(io)
+      when 10 then return Form::FocusOut.from_packet(io)
+      # FIXME 11: KeymapNotify
+      when 12 then return Form::Expose.from_packet(io)
+      # FIXME 13: GraphicsExposure
+      when 14 then return Form::NoExposure.from_packet(io)
+      # FIXME: 15: VisibilityNotify
+      when 16 then return Form::CreateNotify.from_packet(io)
+      when 17 then return Form::DestroyNotify.from_packet(io)
+      when 18 then return Form::UnmapNotify.from_packet(io)
+      when 19 then return Form::MapNotify.from_packet(io)
+      when 20 then return Form::MapRequest.from_packet(io)
+      when 21 then return Form::ReparentNotify.from_packet(io)
+      when 22 then return Form::ConfigureNotify.from_packet(io)
+      when 23 then return Form::ConfigureRequest.from_packet(io)
+      # FIXME: 24: GravityNotify
+      # FIXME: 25: ResizeRequest
+      # FIXME: 26: CirculateNotify
+      # FIXME: 27: CirculateRequest
+      when 28 then return Form::PropertyNotify.from_packet(io)
+      # FIXME: 29: SelectionClear
+      # FIXME: 30: SelectionRequest
+      # FIXME: 31: SelectionNotify
+      # FIXME: 32: ColormapNotify
+      when 33 then return Form::ClientMessage.from_packet(io)
+      # FIXME: 34: MappingNotify
       else
         STDERR.puts "FIXME: Event: #{type}"
         STDERR.puts "EVENT: #{data.inspect}"
+        data
       end
     end
 
@@ -122,34 +142,41 @@ module X11
       data = read_full_packet(32)
       return nil if data.nil?
 
-      type = data.unpack("C").first
+      # FIXME: What is bit 8 for? Synthentic?
+      type = data.unpack("C").first & 0x7f
       case type
-      when 0
-        read_error(data)
-      when 1
-        read_reply(data)
-      when 2..34
-        read_event(type, data, nil)
+      when 0 then read_error(data)
+      when 1 then read_reply(data)
+      when 2..34 then read_event(type, data, nil)
       else
-        raise ProtocolError, "Unsupported reply type: #{type}"
+        raise ProtocolError, "Unsupported reply type: #{type} #{data.inspect}"
       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)
+    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]
       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
-      @requestseq += 1
-      @socket.write(data)
+      write_raw_packet(data)
     end
 
     def write_sync(data, reply=nil)
+      seq = @requestseq
       write_request(data)
-      pkt = next_reply
+      pkt = next_reply(seq)
       return nil if !pkt
+      return pkt if pkt.is_a?(X11::Form::Error)
+      pp reply
       reply ? reply.from_packet(StringIO.new(pkt)) : pkt
     end
 
@@ -161,17 +188,19 @@ module X11
       @queue.shift || read_packet
     end
 
-    def next_reply
+    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)
         end
       end
     end
-
+ 
     def run
       loop do
         pkt = read_packet
@@ -193,12 +222,10 @@ module X11
       wid = new_id
       parent ||= screens.first.root
 
-
       if visual.nil?
         visual = find_visual(0, depth).visual_id
       end
 
-
       values[X11::Form::CWColorMap] ||= create_colormap(0, parent, visual)
 
       values = values.sort_by{_1[0]}
@@ -212,26 +239,30 @@ module X11
       return wid
     end
 
+    def get_window_attributes(wid)
+      write_sync( Form::GetWindowAttributes.new(wid), Form::WindowAttributes )
+    end
+
     def change_window_attributes(wid,
       values: {})
       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)
+      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
 
@@ -244,66 +275,106 @@ 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 destroy_window(window)
-      write_request(X11::Form::DestroyWindow.new(window))
-    end
-    
-    def get_geometry(drawable)
-      write_sync(X11::Form::GetGeometry.new(drawable), X11::Form::Geometry)
-    end
+    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 change_property(*args)
-      write_request(X11::Form::ChangeProperty.new(*args))
+    def get_property(window, property, type, offset: 0, length: 4, delete: false)
+      property = atom(property)
+      type     = atom_enum(type)
+      
+      result = write_sync(Form::GetProperty.new(
+        delete, window, 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
+        when 32
+          result.value = result.value.unpack("V")
+          result.value = result.value.first if length == 4
+        end
+      elsif result
+        result.value = nil
+      end
+      result
     end
+    
+    def change_property(mode, window, property, type, format, data)
+      property = atom(property.to_sym) if property.is_a?(Symbol) || property.is_a?(String)
 
-    def list_fonts(*args)
-      write_sync(X11::Form::ListFonts.new(*args),
-        X11::Form::ListFontsReply)
+      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))
     end
 
-    def open_font(*args)
-      write_request(X11::Form::OpenFont.new(*args))
+    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(Form::ReparentWindow.new(window, parent, x,y))
     end
+    
+    def map_window(...)   = write_request(Form::MapWindow.new(...))
+    def unmap_window(...) = write_request(Form::UnmapWindow.new(...))
 
-    def change_gc(*args)
-      write_request(X11::Form::ChangeGC.new(*args))
+    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 window(*args)
+      args.each {|a| raise "Window expected" if a.nil? }
+      u32(*args)
     end
 
-    def map_window(*args)
-      write_request(X11::Form::MapWindow.new(*args))
+    def open_enum(val, map) = (map[val].nil? ? val : map[val])
+      
+    def set_input_focus(revert_to, focus, time=:now)
+      # FIXME: This is an experiment.
+      # Upside: Simpler. Downside: Doesn't work server-side.
+      # 
+      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,
         keycode,
-        pointer_mode == :async ? 1 : 0,
+        pointer_mode  == :async ? 1 : 0,
         keyboard_mode == :async ? 1 : 0
       ))
     end
 
     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,
@@ -311,41 +382,27 @@ module X11
       )
     end
 
+    def set_value(values, mask, x)
+      if x
+        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)
 
       mask = 0
       values = []
 
-      if x
-        mask |= 0x001
-        values << x
-      end
-
-      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
+      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
@@ -354,7 +411,7 @@ module X11
                   when :below then 1
                   when :top_if then 2
                   when :bottom_if then 3
-                  when  :opposite then 4
+                  when :opposite then 4
                   else raise "Unknown stack_mode #{stack_mode.inspect}"
                   end
       end
@@ -369,49 +426,26 @@ module X11
       # 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)
       
       gc = new_id
       write_request(X11::Form::CreateGC.new(gc, window, mask, args))
       gc
     end
 
-    def put_image(*args)
-      write_request(X11::Form::PutImage.new(*args))
-    end
-
-    def clear_area(*args)
-      write_request(X11::Form::ClearArea.new(*args))
-    end
-
-    def copy_area(*args)
-      write_request(X11::Form::CopyArea.new(*args))
-    end
-
-    def image_text8(*args)
-      write_request(X11::Form::ImageText8.new(*args))
-    end
-
-    def image_text16(*args)
-      write_request(X11::Form::ImageText16.new(*args))
-    end
-
-    def poly_fill_rectangle(*args)
-      write_request(X11::Form::PolyFillRectangle.new(*args))
+    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(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
@@ -437,8 +471,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
 
@@ -459,26 +493,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.type         == 1 &&
+          f.depth        == 24 &&
+          f.direct.red   == 16 &&
           f.direct.green == 8 &&
-          f.direct.blue == 0
+          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.red   == 16 &&
           f.direct.green == 8 &&
-          f.direct.blue == 0
+          f.direct.blue  == 0
         end
       else
         raise "Unsupported format (a4/a1 by omission)"

data/lib/X11/form.rb

@@ -65,13 +65,6 @@ module X11
 
             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"
             else
               #p [s,value]
               v = s.type_klass.pack(value)
@@ -81,14 +74,14 @@ module X11
           when :unused
             sz = s.size.respond_to?(:call) ? s.size.call(self) : s.size
             "\x00" * sz
-          when :length
+          when :length, :format_length
             #p [s,value]
             #p [value.size]
             s.type_klass.pack(value.size)
           when :string
             s.type_klass.pack(value)
           when :list
-            value.collect do |obj|
+            Array(value).collect do |obj|
               if obj.is_a?(BaseForm)
                 obj.to_packet
               else
@@ -127,8 +120,17 @@ module X11
             when :length
               size = s.type_klass.unpack( socket.read(s.type_klass.size) )
               lengths[s.name] = size
+            when :format_length
+              size = s.type_klass.unpack( socket.read(s.type_klass.size) )
+              lengths[s.name] = case form.format
+                                when 8 then size
+                                when 16 then size*2
+                                when 32 then size*4
+                                else 0
+                                end
             when :string
-              val = s.type_klass.unpack(socket, lengths[s.name])
+              len = lengths[s.name]
+              val = s.type_klass.unpack(socket, len)
               form.instance_variable_set("@#{s.name}", val)
             when :list
               len = lengths[s.name]
@@ -177,12 +179,14 @@ module X11
         end
 
         def fields
-          super+Array(@structs).dup.delete_if{|s| s.type == :unused or s.type == :length }
+          super+Array(@structs).dup.delete_if{|s| s.type == :unused or s.type == :length or s.type == :format_length}
         end
       end
     end
 
+    AtomAtom=4
     CardinalAtom=6
+    WindowAtom=33
     
     ##
     ## X11 Packet Defintions
@@ -247,9 +251,9 @@ module X11
     end
 
     class DisplayInfo < BaseForm
-      field :release_number, Uint32
-      field :resource_id_base, Uint32
-      field :resource_id_mask, Uint32
+      field :release_number,     Uint32
+      field :resource_id_base,   Uint32
+      field :resource_id_mask,   Uint32
       field :motion_buffer_size, Uint32
       field :vendor, Uint16, :length
       field :maximum_request_length, Uint16
@@ -258,11 +262,11 @@ module X11
       field :image_byte_order, Signifigance
       field :bitmap_bit_order, Signifigance
       field :bitmap_format_scanline_unit, Uint8
-      field :bitmap_format_scanline_pad, Uint8
+      field :bitmap_format_scanline_pad,  Uint8
       field :min_keycode, KeyCode
       field :max_keycode, KeyCode
       unused 4
-      field :vendor, String8, :string
+      field :vendor,  String8,    :string
       field :formats, FormatInfo, :list
       field :screens, ScreenInfo, :list
     end
@@ -287,13 +291,13 @@ module X11
     # XRender structures
 
     class DirectFormat < BaseForm
-      field :red, Uint16
-      field :red_mask, Uint16
-      field :green, Uint16
+      field :red,        Uint16
+      field :red_mask,   Uint16
+      field :green,      Uint16
       field :green_mask, Uint16
-      field :blue, Uint16
-      field :blue_mask, Uint16
-      field :alpha, Uint16
+      field :blue,       Uint16
+      field :blue_mask,  Uint16
+      field :alpha,      Uint16
       field :alpha_mask, Uint16
     end
 
@@ -328,8 +332,8 @@ module X11
     # Requests
 
     CopyFromParent = 0
-    InputOutput = 1
-    InputOnly = 2
+    InputOutput    = 1
+    InputOnly      = 2
 
     CWBackPixmap  = 0x0001
     CWBackPixel   = 0x0002
@@ -337,23 +341,29 @@ module X11
     CWBorderPixel = 0x0008
     CWBitGravity  = 0x0010
     CWWinGravity  = 0x0020
-    CWBackingStore= 0x0040
-    CWSaveUnder   = 0x0400
-    CWEventMask   = 0x0800
-    CWColorMap    = 0x2000
-
-    KeyPressMask           = 0x00001
-    KeyReleaseMask         = 0x00002
-    ButtonPressMask        = 0x00004
-    ButtonReleaseMask      = 0x00008
-    EnterWindowMask        = 0x00010
-    LeaveWindowMask        = 0x00020
-    PointerMotionMask      = 0x00040
-    PointerMotionHintMask  = 0x00080
-    Button1MotionMask      = 0x00100
-    ExposureMask           = 0x08000
-    StructureNotifyMask    = 0x20000
-    SubstructureNotifyMask = 0x80000
+    CWBackingStore     = 0x0040
+    CWBackingPlanes    = 0x0080
+    CWBackingPixel     = 0x0100
+    CWOverrideRedirect = 0x0200
+    CWSaveUnder        = 0x0400
+    CWEventMask        = 0x0800
+    CWColorMap         = 0x2000
+
+    KeyPressMask           = 0x000001
+    KeyReleaseMask         = 0x000002
+    ButtonPressMask        = 0x000004
+    ButtonReleaseMask      = 0x000008
+    EnterWindowMask        = 0x000010
+    LeaveWindowMask        = 0x000020
+    PointerMotionMask      = 0x000040
+    PointerMotionHintMask  = 0x000080
+    Button1MotionMask      = 0x000100
+    ExposureMask           = 0x008000
+    StructureNotifyMask    = 0x020000
+    SubstructureNotifyMask = 0x080000
+    SubstructureRedirectMask=0x100000
+    FocusChangeMask        = 0x200000
+    PropertyChangeMask     = 0x400000
 
     class CreateWindow < BaseForm
       field :opcode, Uint8, value: 1
@@ -394,14 +404,14 @@ module X11
       field :sequence_number, Uint16
       field :reply_length, Uint32
       field :visual, VisualID
-      field :class, Uint16
+      field :wclass, Uint16
       field :bit_gravity, Uint8
       field :win_gravity, Uint8
       field :backing_planes, Uint32
       field :backing_pixel, Uint32
       field :save_under, Bool
       field :map_is_installed, Bool
-      field :map_state, Bool
+      field :map_state, Uint8
       field :override_redirect, Bool
       field :colormap, Colormap
       field :all_event_masks, Uint32
@@ -417,6 +427,23 @@ module X11
       field :window, Window
     end
 
+    class ChangeSaveSet < BaseForm
+      field :opcode, Uint8, value: 6
+      field :mode, Uint8
+      field :request_length, Uint16, value: 2
+      field :window, Window
+    end
+    
+    class ReparentWindow < BaseForm
+      field :opcode, Uint8, value: 7
+      unused 1
+      field :request_length, Uint16, value: 4
+      field :window, Window
+      field :parent, Window
+      field :x, Int16
+      field :y, Int16
+    end
+      
     class MapWindow < BaseForm
       field :opcode, Uint8, value: 8
       unused 1
@@ -424,6 +451,13 @@ module X11
       field :window, Window
     end
 
+    class UnmapWindow < BaseForm
+      field :opcode, Uint8, value: 10
+      unused 1
+      field :request_length, Uint16, value: 2
+      field :window, Window
+    end
+
     class ConfigureWindow < BaseForm
       field :opcode, Uint8, value: 12
       unused 1
@@ -455,6 +489,25 @@ module X11
       unused 10
     end
 
+    class QueryTree < BaseForm
+      field :opcode, Uint8, value: 15
+      unused 1
+      field :request_length, Uint16, value: 2
+      field :window, Window
+    end
+
+    class QueryTreeReply < BaseForm
+      field :reply, Uint8, value: 1
+      unused 1
+      field :sequence_number, Uint16
+      field :reply_length, Uint32
+      field :root, Window
+      field :parent, Window
+      field :children, Uint16, :length
+      unused 14
+      field :children, Window, :list
+    end
+
     class InternAtom < BaseForm
       field :opcode, Uint8, value: 16
       field :only_if_exists, Bool
@@ -480,6 +533,22 @@ module X11
       unused 20
     end
 
+    class GetAtomName < BaseForm
+      field :opcode, Uint8, value: 17
+      unused 1
+      field :request_length, Uint16, value: 2
+      field :atom, Atom
+    end
+
+    class AtomName < Reply
+      unused 1
+      field :sequence_number, Uint16
+      field :reply_length, Uint32
+      field :name, Uint16, :length
+      unused 22
+      field :name, String8, :string
+    end
+
     Replace = 0
     Prepend = 1
     Append = 2
@@ -496,12 +565,33 @@ module X11
       field :type, Atom
       field :format, Uint8
       unused 3
-      field :data, Uint32, value: ->(cp) {
-        cp.data.length / 4
-      }
+      field :data, Uint32, value: ->(cp) { cp.data.length / (cp.format/8) }
       field :data, Uint8, :list
     end
 
+    class GetProperty < BaseForm
+      field :opcode, Uint8, value: 20
+      field :delete, Bool
+      field :request_length, Uint16, value: 6
+      field :window, Window
+      field :property, Atom
+      field :type, Atom
+      field :long_offset, Uint32
+      field :long_length, Uint32
+    end
+    
+    class Property < BaseForm
+      field :reply, Uint8, value: 1
+      field :format, Uint8
+      field :sequence_number, Uint16
+      field :reply_length, Uint32
+      field :type, Atom
+      field :bytes_after, Uint32
+      field :value, Uint32, :format_length
+      unused 12
+      field :value, String8, :string
+    end
+
     class GrabButton < BaseForm
       field :opcode, Uint8, value: 28
       field :owner_events, Bool
@@ -528,6 +618,18 @@ module X11
       field :keyboard_mode, Uint8
       unused 3
     end
+
+    class OpenFont < BaseForm
+      field :opcode, Uint8, value: 45
+      unused 1
+      field :request_length, Uint16, value: ->(of) {
+        3+(of.name.length+3)/4
+      }
+      field :fid, Font
+      field :name, Uint16, :length
+      unused 2
+      field :name, String8, :string
+    end
     
     class ListFonts < BaseForm
       field :opcode, Uint8, value: 49
@@ -618,11 +720,11 @@ module X11
       field :src_drawable, Drawable
       field :dst_drawable, Drawable
       field :gc, Gcontext
-      field :src_x, Uint16
-      field :src_y, Uint16
-      field :dst_x, Uint16
-      field :dst_y, Uint16
-      field :width, Uint16
+      field :src_x,  Uint16
+      field :src_y,  Uint16
+      field :dst_x,  Uint16
+      field :dst_y,  Uint16
+      field :width,  Uint16
       field :height, Uint16
     end
 
@@ -754,7 +856,7 @@ module X11
       field :sequence_number, Uint16
     end
 
-    class PressEvent < SimpleEvent
+    class InputEvent < SimpleEvent
       field :time, Uint32
       field :root, Window
       field :event, Window
@@ -764,6 +866,32 @@ module X11
       field :event_x, Int16
       field :event_y, Int16
       field :state, Uint16
+    end
+
+    class EnterLeaveNotify < InputEvent
+      field :mode, Uint8
+      field :same_screen_or_focus, Uint8
+
+      def same_screen = same_screen_or_focus.anybit?(0x02)
+      def focus = same_screen_or_focus.anybit?(0x01)
+    end
+
+    class EnterNotify < EnterLeaveNotify
+    end
+
+    class LeaveNotify < EnterLeaveNotify
+    end
+
+    class FocusIn < SimpleEvent
+      field :event, Window
+      field :mode, Uint8
+      unused 23
+    end
+
+    class FocusOut < FocusIn
+    end
+      
+    class PressEvent < InputEvent
       field :same_screen, Bool
       unused 1
     end
@@ -782,6 +910,31 @@ module X11
 
     class ButtonRelease < PressEvent
     end
+
+    class ReparentNotify < SimpleEvent
+      field :event, Window
+      field :window, Window
+      field :parent, Window
+      field :x, Int16
+      field :y, Int16
+      field :override_redirect, Bool
+      unused 11
+    end
+
+    class ConfigureRequest < Event # 23
+      field :stack_mode,      Uint8
+      field :sequence_number, Uint16
+      field :parent, Window
+      field :window, Window
+      field :sibling, Window
+      field :x, Int16
+      field :y, Int16
+      field :width, Uint16
+      field :height, Uint16
+      field :border_width, Uint16
+      field :value_mask, Uint16
+      unused 4
+    end
     
     class Expose < SimpleEvent
       field :window, Window
@@ -800,14 +953,51 @@ module X11
       unused 21
     end
 
+    class CreateNotify < SimpleEvent # 16
+      field :parent, Window
+      field :window, Window
+      field :x, Int16
+      field :y, Int16
+      field :width, Uint16
+      field :height, Uint16
+      field :border_width, Uint16
+      field :override_redirect, Bool
+    end
+    
+    class DestroyNotify < Event
+      unused 1
+      field :sequence_number, Uint16
+      field :event, Window
+      field :window, Window
+      unused 20
+    end
+    
+    class UnmapNotify < Event
+      unused 1
+      field :sequence_number, Uint16
+      field :event, Window
+      field :window, Window
+      field :from_configure, Bool
+      unused 19
+    end
+    
     class MapNotify < Event
       unused 1
       field :sequence_number, Uint16
       field :event, Window
+      field :window, Window
       field :override_redirect, Bool
       unused 19
     end
 
+    class MapRequest < Event
+      unused 1
+      field :sequence_number, Uint16
+      field :parent, Window
+      field :window, Window
+      unused 20
+    end
+
     class ConfigureNotify < Event
       unused 1
       field :sequence_number, Uint16
@@ -822,6 +1012,24 @@ module X11
       unused 5
     end
 
+    class ClientMessage < Event
+      field :format, Uint8
+      field :sequence_number, Uint16
+      field :window, Window
+      field :type, Atom
+      field :data, X11::Type::Message
+    end
+
+    class PropertyNotify < Event # 28
+      unused 1
+      field :sequence_number, Uint16
+      field :window, Window
+      field :atom, Atom
+      field :time, Uint32
+      field :state, Uint8
+      unused 15
+    end
+
 
     # XRender extension
     # From https://cgit.freedesktop.org/xorg/proto/renderproto/tree/renderproto.h

data/lib/X11/type.rb

@@ -1,51 +1,54 @@
 # 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
-
-          def self.size
-            #{bytesize}
-          end
+    class BaseType
+      @directive = nil
+      @bytesize = nil
 
-          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)
+        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
 
+      def self.unpack(x) = x.nil? ? nil  : x.unpack1(@directive)
+      def self.size = @bytesize
+      def self.from_packet(sock) = unpack(sock.read(size))
+    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
+    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
+    
+    class Message
+      def self.pack(x)   = 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)
+        x.b + "\x00"*(-x.length & 3)
       end
 
-
-
-
       def self.unpack(socket, size)
+        raise "Expected size for String8" if size.nil?
         val = socket.read(size)
         unused_padding = (4 - (size % 4)) % 4
         socket.read(unused_padding)
@@ -55,7 +58,7 @@ module X11
 
     class String16
       def self.pack(x)
-        x.encode("UTF-16BE").force_encoding("ASCII-8BIT") + "\x00\x00"*(-x.length & 1)
+        x.encode("UTF-16BE").b + "\x00\x00"*(-x.length & 1)
       end
 
       def self.unpack(socket, size)
@@ -68,28 +71,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) = 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)     = (x ? "\x01" : "\x00")
+      def self.unpack(str) = (str[0] == "\x01")
+      def self.size = 1
     end
     
     KeyCode      = Uint8

data/lib/X11/version.rb

@@ -1,3 +1,3 @@
 module X11
-  VERSION = "0.0.4"
+  VERSION = "0.0.6"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pure-x11
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.6
 platform: ruby
 authors:
 - Vidar Hokstad
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-11-21 00:00:00.000000000 Z
+date: 2023-12-28 00:00:00.000000000 Z
 dependencies: []
 description: Pure Ruby X11 bindings
 email: