pure-x11 0.0.2 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c3d89e6c8da43a6f489333c1d50f85485f1357bc0549747f11dbc2cf325e3af1
-  data.tar.gz: 9b7ddd2b688c8c5d924a027a1d05b65744b52ad7f84a7e646c26ec610fb93d8e
+  metadata.gz: 0ecd289a7ec4a0a7f44bba1d05a437774ca6ed3d4c403b572b28a8691ef2a950
+  data.tar.gz: ac9460f0c0db0635e33358550176802119db88c9bb4dee097807f21c970f68ba
 SHA512:
-  metadata.gz: ab203eb42daeda7e2091becae8de88582291ae8a7636035ed017f86e6195f928d2e7ff5945c356363ddba5ed63f7623158ac0004156cf76d5ff7e75092c32583
-  data.tar.gz: 361fb690e60345acf764192386fc511a3ade0c724bb48f7f585fc573dcfe6c50386e7098e875d697a2be9406578c1c75ab7c57ddacda78dd8cc303067ee72bbc
+  metadata.gz: db23062260daabe75bfe5a9f419772be329023777c405ae7bb3a08125b9942f63ec8d635c1c11869648272d2c3ecad16a432fbca2d4d584d80ad2dbf15250d5a
+  data.tar.gz: f303d01e2c4b43fa2c5d44af4e469288684887c3efe71ee644275f233d584b9e342f9ebd80374632afe1199ad0d4182cebb515a95a7408b79aa36d239c9c9ffb

data/Gemfile.lock

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

data/README.md

@@ -1,8 +1,13 @@
-Ruby X11
+Pure X11
 ========
 
+This library is now on Rubygems.org as "pure-X11" as I (vidarh) has not had a
+response from the original author. If that should change, I'll be happy to
+upstread everything.
+
 (under-development) Pure Ruby implementation of the X Window System Protocol.
-This library is based off of Mathieu Bouchard's work on his RubyX11 project.
+This library is based off of Mathieu Bouchard's work on his RubyX11 project,
+and Richard Ramsdens excellent start on Ruby-X11.
 
 Contributors
 ------------

data/example/test.rb

@@ -1,4 +1,5 @@
 require 'rubygems'
+require 'skrift'
 require 'bundler'
 require 'chunky_png'
 Bundler.setup(:default, :development)
@@ -8,95 +9,164 @@ $LOAD_PATH.unshift(File.dirname(__FILE__))
 
 require 'X11'
 
-display = X11::Display.new
-screen = display.screens.first
+
+dpy = display = X11::Display.new
+screen = dpy.screens.first
 root = screen.root
-wid = display.new_id
-display.write_request(X11::Form::CreateWindow.new(
-  screen.root_depth,
-  wid,
-  root,
-  0,  #x
-  0,  #y
-  1000,#w
-  600,#h
-  0,
-  X11::Form::InputOutput,
-  X11::Form::CopyFromParent,
-  X11::Form::CWBackPixel |
-    X11::Form::CWEventMask,
-  [0xff8844, # RGB background
-   X11::Form::SubstructureNotifyMask |
-#   X11::Form::StructureNotifyMask    | ## Move
-   X11::Form::ExposureMask           |
-   X11::Form::KeyPressMask           |
-   X11::Form::ButtonPressMask
-  ]
-))
+
+wid = dpy.create_window(
+  0, 0, # x,y
+  1000, 600, # w,h
+  # 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(
+    :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")
+
+$kmap = nil
+def update_keymap(dpy)
+  reply = dpy.get_keyboard_mapping
+
+
+  if reply
+    $kmap = reply.keysyms.map do |c|
+      if c == 0
+        nil
+      elsif X11::KeySyms[c]
+        X11::KeySyms[c]
+      elsif c < 0x100
+        c.chr(Encoding::ISO_8859_1)
+      elsif c.between?(0xffb0, 0xffb9)
+        "KP_#{c-0xffb0}".to_sym
+      elsif c.between?(0xffbe, 0xffe0)
+        "F#{c-0xffbe+1}".to_sym
+      elsif c.between?(0xff08, 0xffff)
+        # FIIXME:
+        raise "keyboard_#{c.to_s(16)}".to_s
+      elsif c.between?(0x01000100, 0x0110FFFF)
+        (c-0x01000100).
+        chr(Encoding::UTF_32) rescue c.to_s(16)
+      else
+        raise "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
+    p $kmap[47-dpy.display_info.min_keycode]
+  end
+end
+
+
+def lookup_keysym(dpy,  event)
+  update_keymap(dpy) if !$kmap
+  p $kmap[event.detail-dpy.display_info.min_keycode]
+end
+
 puts "Mapping"
-display.write_request(X11::Form::MapWindow.new(wid))
-# Creating GC
-gc = display.new_id
-display.write_request(X11::Form::CreateGC.new(
-  gc, screen.root,
-  X11::Form::ForegroundMask,
-  [0xff0000,  # RGB foreground
-  ]
-))
-
-$gc2 = display.new_id
-display.write_request(X11::Form::CreateGC.new(
-  $gc2,
-  screen.root,
-  X11::Form::ForegroundMask|X11::Form::BackgroundMask,
-  [0xffffff,  # RGB foreground
-   0x444444,
-  ]
-))
-
-$gc3 = display.new_id
-display.write_request(X11::Form::CreateGC.new(
-  $gc3,
-  screen.root,
-  0, []
-))
+dpy.map_window(wid)
+
+$gc = gc = dpy.create_gc(wid, foreground: 0xff0000)
+$gc2 = dpy.create_gc(wid,foreground: 0xffffff, background: 0x444444)
+$gc3 = dpy.create_gc(wid)
 
 
 puts "Main loop"
-p gc
 
-# This will wait for a reply
-p display.write_sync(X11::Form::ListFonts.new(10,  "*7x13*"),
-  X11::Form::ListFontsReply).names.map(&:to_s)
+#p dpy.list_fonts(10,  "*7x13*").names.map(&:to_s)
 
-fid = display.new_id
-display.write_request(X11::Form::OpenFont.new(fid, "7x13"))
-display.write_request(X11::Form::ChangeGC.new($gc2, X11::Form::FontMask, [fid]))
+fid = dpy.new_id
+dpy.open_font(fid, "-misc-fixed-bold-r-normal--13-120-75-75-c-70-iso10646-1")
+#"-bitstream-courier 10 pitch-medium-r-normal--0-0-0-0-m-0-iso10646-1")
+dpy.change_gc($gc2, X11::Form::FontMask, [fid])
 
 $png = ChunkyPNG::Image.from_file('genie.png')
-p $png.width
-p $png.height
 
-def redraw(display, wid, gc)
-  p [:redraw, gc]
-  display.write_request(X11::Form::PolyFillRectangle.new(
-    wid, gc,
-    [X11::Form::Rectangle.new(20,20, 60, 80)]
-  ))
+$data = ""
+$png.pixels.each do |px|
+  str = [px].pack("N")
+  if str[3] == "\x00"
+    $data << "\0\0\0\0".force_encoding("ASCII-8BIT")
+  else
+    $data << str[2] << str[1] << str[0] << str[3]
+  end
+end
 
-  display.write_request(X11::Form::ClearArea.new( false, wid, 30, 30, 5, 5))
-  display.write_request(X11::Form::ImageText8.new(wid, $gc2, 30, 70, "Hello World"))
+#$f = Font.load("/usr/share/fonts/truetype/tlwg/Umpush-BoldOblique.ttf")
+$f = Font.load("/usr/share/fonts/truetype/tlwg/Garuda.ttf")
+#$f = Font.load("resources/FiraGO-Regular.ttf")
 
+$sft = SFT.new($f)
+$sft.x_scale = 15
+$sft.y_scale = 15
+$glyphcache = {}
+def render_glyph(display, wid, x,y, ch)
+  gid = $sft.lookup(ch.ord)
+  mtx = $sft.gmetrics(gid)
+  data = $glyphcache[gid]
+  if !data
+    img = Image.new(mtx.min_width, mtx.min_height) #(mtx .min_width + 3) & ~3, mtx.min_height)
+    if !$sft.render(gid, img)
+      raise "Unable to render #{gid}\n"
+    end
+ #   p img
+    data = img.pixels.map {|px|
+      "\0\0"+px.chr+"\0" #+ "\0\0\0"
+    }.join.force_encoding("ASCII-8BIT")
+    $glyphcache[gid] = data
+  end
   depth = 24
-  # FIXME: The colors are wrong
-  #  pixels.pack("N*")
-  data = ""
-  $png.pixels.each do |px|
-    str = [px].pack("N")
-    data << str[2] << str[1] << str[0] << str[3]
+#  p data
+#p img
+#  p ch
+ display.put_image(
+    X11::Form::ZPixmap, wid, $gc2,
+    mtx.min_width,mtx.min_height,
+    x, y - mtx.y_offset, 0, depth, data
+  )
+  mtx.advance_width
+end
+
+def render_str(display, wid, x,y, str)
+  str.each_byte do |ch|
+    off = render_glyph(display, wid, x, y, ch.chr)
+    x+= off
   end
-  display.write_request(X11::Form::PutImage.new(
-    X11::Form::ZPixmap, wid, $gc2, $png.width, $png.height, 80, 80, 0, depth, data))
+end
+
+def redraw(dpy, wid, gc)
+  dpy.poly_fill_rectangle(wid, gc, [X11::Form::Rectangle.new(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,
+    $png.width, $png.height, 80, 120, 0, 24, $data
+  )
+  render_str(dpy, wid, 30,90, 'HelloWorld')
 end
 
 loop do
@@ -104,5 +174,9 @@ loop do
   if pkt
     p pkt
     redraw(display, wid, gc) if pkt.is_a?(X11::Form::Expose)
+
+    if pkt.is_a?(X11::Form::KeyPress)
+      lookup_keysym(dpy,pkt)
+    end
   end
 end

data/lib/X11/display.rb

@@ -26,7 +26,8 @@ module X11
         family = :Internet
       end
 
-      authorize(host, family, display_id)
+      # FIXME
+      authorize(host, family, display_id) rescue nil
 
       @requestseq = 1
       @queue = []
@@ -67,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
 
@@ -79,26 +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 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(StringIO.new(data))
+      # FIXME: 34: MappingNotify
       else
         STDERR.puts "FIXME: Event: #{type}"
         STDERR.puts "EVENT: #{data.inspect}"
+        data
       end
     end
 
@@ -119,19 +142,28 @@ 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]
@@ -139,14 +171,16 @@ module X11
       #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
 
@@ -158,17 +192,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
@@ -177,12 +213,54 @@ module X11
       end
     end
 
+    def find_visual(screen, depth, qlass = 4)
+      self.display_info.screens[screen].depths.find{|d|
+        d.depth == depth }.visuals.find{|v| v.qlass = qlass }
+    end
+
     # Requests
-    def create_window(*args)
-      write_request(X11::Form::CreateWindow.new(*args))
+    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
+
+      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]}
+      mask =   values.inject(0) {|acc,v| (acc | v[0]) }
+      values = values.map{_1[1]}
+      write_request(
+        X11::Form::CreateWindow.new(
+          depth, wid, parent,
+          x,y,w,h,border_width, wclass, visual, mask, values)
+      )
+      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)
+      )
     end
 
+    def select_input(w, events) = change_window_attributes(w, values: {Form::CWEventMask => events})
+
     def atom(name)
+      name = name.to_sym
       intern_atom(false, name) if !@atoms[name]
       @atoms[name]
     end
@@ -211,6 +289,14 @@ module X11
       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_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)
     end
@@ -221,8 +307,35 @@ module X11
       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) if !property.is_a?(Integer)
+      type     = atom_enum(type)
+      
+      result = write_sync(X11::Form::GetProperty.new(
+        delete, window, property, type, offset, length
+      ), X11::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)
+
+      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)
@@ -230,16 +343,108 @@ module X11
         X11::Form::ListFontsReply)
     end
 
-    def open_font(*args)
-      write_request(X11::Form::OpenFont.new(*args))
+    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 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))
+    end
+    
+    def map_window(*args)   = write_request(X11::Form::MapWindow.new(*args))
+    def unmap_window(*args) = write_request(X11::Form::UnmapWindow.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 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(
+        owner_events,
+        grab_window,
+        modifiers,
+        keycode,
+        pointer_mode  == :async ? 1 : 0,
+        keyboard_mode == :async ? 1 : 0
+      ))
     end
 
-    def change_gc(*args)
-      write_request(X11::Form::ChangeGC.new(*args))
+    def grab_button(owner_events, grab_window, event_mask, pointer_mode,
+      keyboard_mode, confine_to, cursor, button, modifiers)
+      write_request(X11::Form::GrabButton.new(
+        owner_events, grab_window, event_mask,
+        pointer_mode == :async ? 1 : 0,
+        keyboard_mode == :async ? 1 : 0,
+        confine_to.to_i, cursor.to_i, button, modifiers)
+      )
     end
 
-    def map_window(*args)
-      write_request(X11::Form::MapWindow.new(*args))
+    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
+
+      if stack_mode
+        mask |= 0x040
+        values << case stack_mode
+                  when :above then 0
+                  when :below then 1
+                  when :top_if then 2
+                  when :bottom_if then 3
+                  when :opposite then 4
+                  else raise "Unknown stack_mode #{stack_mode.inspect}"
+                  end
+      end
+      write_request(X11::Form::ConfigureWindow.new(window, mask, values))
     end
 
 
@@ -265,29 +470,12 @@ module X11
       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))
-    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 create_pixmap(depth, drawable, w,h)
       pid = new_id
@@ -329,7 +517,7 @@ module X11
         s.depths.map do |d|
           d.visuals.map {|v| v.visual == visual ? v : nil }
         end
-      end.flatten.compact.first.format
+      end.flatten.compact.first&.format
     end
     
     def render_find_standard_format(sym)
@@ -411,7 +599,12 @@ module X11
       auth = Auth.new
       auth_info = auth.get_by_hostname(host||"localhost", family, display_id)
 
-      auth_name, auth_data = auth_info.auth_name, auth_info.auth_data
+      if auth_info
+        auth_name, auth_data = auth_info.auth_name, auth_info.auth_data
+      else
+        auth_name = ""
+        auth_data = ""
+      end
       p [auth_name, auth_data]
 
       handshake = Form::ClientHandshake.new(

data/lib/X11/form.rb

@@ -1,4 +1,3 @@
-require 'ostruct'
 
 module X11
   module Form
@@ -82,14 +81,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
@@ -128,8 +127,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]
@@ -178,12 +186,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
@@ -248,9 +258,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
@@ -259,11 +269,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
@@ -288,13 +298,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
 
@@ -329,20 +339,38 @@ module X11
     # Requests
 
     CopyFromParent = 0
-    InputOutput = 1
-    InputOnly = 2
+    InputOutput    = 1
+    InputOnly      = 2
 
-    CWBackPixel = 0x0002
+    CWBackPixmap  = 0x0001
+    CWBackPixel   = 0x0002
+    CWBorderPixmap= 0x0004
     CWBorderPixel = 0x0008
-    CWEventMask = 0x0800
-    CWColorMap  = 0x2000
-
-    KeyPressMask           = 0x00001
-    ButtonPressMask        = 0x00004
-    PointerMotionMask      = 0x00040
-    ExposureMask           = 0x08000
-    StructureNotifyMask    = 0x20000
-    SubstructureNotifyMask = 0x80000
+    CWBitGravity  = 0x0010
+    CWWinGravity  = 0x0020
+    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
@@ -361,6 +389,68 @@ module X11
       field :value_list, Uint32, :list
     end
 
+    class ChangeWindowAttributes < BaseForm
+      field :opcode, Uint8, value: 2
+      unused 1
+      field :request_length, Uint16, value: ->(cw) { 3 + cw.value_list.length }
+      field :window, Window
+      field :value_mask, Bitmask
+      field :value_list, Uint32, :list
+    end
+
+    class GetWindowAttributes < BaseForm
+      field :opcode, Uint8, value: 3
+      unused 1
+      field :request_length, Uint16, value: 2
+      field :window, Window
+    end
+
+    class WindowAttributes < BaseForm
+      field :reply, Uint8, value: 1
+      field :backing_store, Uint8
+      field :sequence_number, Uint16
+      field :reply_length, Uint32
+      field :visual, VisualID
+      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, Uint8
+      field :override_redirect, Bool
+      field :colormap, Colormap
+      field :all_event_masks, Uint32
+      field :your_event_masks, Uint32
+      field :do_not_propagate_mask, Uint16
+      unused 2
+    end
+
+    class DestroyWindow < BaseForm
+      field :opcode, Uint8, value: 4
+      unused 1
+      field :request_length, Uint16, value: 2
+      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
@@ -368,6 +458,63 @@ 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
+      field :request_length, Uint16, value: ->(cw) { 3 + cw.values.length }
+      field :window, Window
+      field :value_mask, Uint16
+      unused 2
+      field :values, Uint32, :list
+    end
+
+    class GetGeometry < BaseForm
+      field :opcode, Uint8, value: 14
+      unused 1
+      field :request_length, Uint16, value: 2
+      field :drawable, Drawable
+    end
+
+    class Geometry < BaseForm
+      field :reply, Uint8, value: 1
+      field :depth, Uint8
+      field :sequence_number, Uint16
+      field :reply_length, Uint32
+      field :root, Window
+      field :x, Int16
+      field :y, Int16
+      field :width, Uint16
+      field :height, Uint16
+      field :border_width, Uint16
+      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
@@ -393,6 +540,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
@@ -409,12 +572,60 @@ 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
+      field :request_length, Uint16, value: 6
+      field :grab_window, Window
+      field :event_mask, Uint16
+      field :pointer_mode, Uint8
+      field :keyboard_mode, Uint8
+      field :confine_to, Window
+      field :cursor, Cursor
+      field :button, Uint8
+      unused 1
+      field :modifiers, Uint16
+    end
+
+    class GrabKey < BaseForm
+      field :opcode, Uint8, value: 33
+      field :owner_event, Bool
+      field :request_length, Uint16, value: 4
+      field :grab_window, Window
+      field :modifiers, Uint16
+      field :keycode, Uint8
+      field :pointer_mode, Uint8
+      field :keyboard_mode, Uint8
+      unused 3
+    end
+
     class OpenFont < BaseForm
       field :opcode, Uint8, value: 45
       unused 1
@@ -516,11 +727,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
 
@@ -652,7 +863,7 @@ module X11
       field :sequence_number, Uint16
     end
 
-    class PressEvent < SimpleEvent
+    class InputEvent < SimpleEvent
       field :time, Uint32
       field :root, Window
       field :event, Window
@@ -662,6 +873,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
@@ -677,6 +914,34 @@ module X11
 
     class MotionNotify < PressEvent
     end
+
+    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
@@ -695,14 +960,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
@@ -717,6 +1019,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/keysyms.rb

@@ -114,13 +114,18 @@ module X11
     0xff9d => :XK_KP_Begin,
     0xff9e => :XK_KP_Insert,
     0xff9f => :XK_KP_Delete,
-    0xffbd => :XK_KP_Equal,
     0xffaa => :XK_KP_Multiply,
     0xffab => :XK_KP_Add,
     0xffac => :XK_KP_Separator,
     0xffad => :XK_KP_Subtract,
     0xffae => :XK_KP_Decimal,
     0xffaf => :XK_KP_Divide,
+    0xffbd => :XK_KP_Equal,
+    0xffbe => :f1,
+    0xffbf => :f2,
+    0xffc0 => :f3,
+    0xffc1 => :f4, # And so on
+
 
     0xffe1 => :XK_Shift_L,
     0xffe2 => :XK_Shift_R,

data/lib/X11/type.rb

@@ -36,16 +36,23 @@ module X11
     define "Uint8", "C", 1
     define "Uint16", "S", 2
     define "Uint32", "L", 4
+    
+    define "Message", "c*", 20
+
+    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)
       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)

data/lib/X11/version.rb

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

metadata

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