pure-x11 0.0.2 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c3d89e6c8da43a6f489333c1d50f85485f1357bc0549747f11dbc2cf325e3af1
-  data.tar.gz: 9b7ddd2b688c8c5d924a027a1d05b65744b52ad7f84a7e646c26ec610fb93d8e
+  metadata.gz: 51d974fee51d60b334a5e5f26bb5e0d90f8628e09930da7bb6c97145b3718ed9
+  data.tar.gz: 2312f1c9f7e0d2b5391bb15aab15805e802635d53d6fe1d90cf22f0c2112b117
 SHA512:
-  metadata.gz: ab203eb42daeda7e2091becae8de88582291ae8a7636035ed017f86e6195f928d2e7ff5945c356363ddba5ed63f7623158ac0004156cf76d5ff7e75092c32583
-  data.tar.gz: 361fb690e60345acf764192386fc511a3ade0c724bb48f7f585fc573dcfe6c50386e7098e875d697a2be9406578c1c75ab7c57ddacda78dd8cc303067ee72bbc
+  metadata.gz: 226fbfc35ff75f2fa95fabf09a7d0e4c72cd99f1678cd607e8421ed26750118e40291686a582c01b0ae296dfcefc5e7038bd3d3025f9b678e5a1fa35c2465135
+  data.tar.gz: 69363b78df087ea43799f06c8477d008d15b721bcd604a52e1eb3b33411a102fcf4d33f3262ac0c0de5fa76de9262d489eaaca85e043f5251bb41563959970fd

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
+
+dpy.create_window(
+  screen.root_depth, wid, root,
+  0, 0, # x,y
+  1000, 600, # w,h
   0,
   X11::Form::InputOutput,
   X11::Form::CopyFromParent,
   X11::Form::CWBackPixel |
     X11::Form::CWEventMask,
-  [0xff8844, # RGB background
+  [0x0, # RGB background
    X11::Form::SubstructureNotifyMask |
-#   X11::Form::StructureNotifyMask    | ## Move
+   X11::Form::StructureNotifyMask    | ## Move
    X11::Form::ExposureMask           |
    X11::Form::KeyPressMask           |
    X11::Form::ButtonPressMask
   ]
-))
+)
+
+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)
+  )
+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,
-  ]
-))
+dpy.map_window(wid)
 
-$gc3 = display.new_id
-display.write_request(X11::Form::CreateGC.new(
-  $gc3,
-  screen.root,
-  0, []
-))
+$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 = []
@@ -86,6 +87,8 @@ module X11
         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
@@ -177,9 +180,46 @@ 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 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 atom(name)
@@ -211,6 +251,14 @@ module X11
       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_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
@@ -242,6 +290,77 @@ module X11
       write_request(X11::Form::MapWindow.new(*args))
     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 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 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
+
 
     def create_gc(window, foreground: nil, background: nil)
       mask = 0
@@ -329,7 +448,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 +530,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
@@ -332,14 +331,26 @@ module X11
     InputOutput = 1
     InputOnly = 2
 
-    CWBackPixel = 0x0002
+    CWBackPixmap  = 0x0001
+    CWBackPixel   = 0x0002
+    CWBorderPixmap= 0x0004
     CWBorderPixel = 0x0008
-    CWEventMask = 0x0800
-    CWColorMap  = 0x2000
+    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
@@ -361,6 +372,51 @@ 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 :class, 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 :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 MapWindow < BaseForm
       field :opcode, Uint8, value: 8
       unused 1
@@ -368,6 +424,37 @@ module X11
       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 InternAtom < BaseForm
       field :opcode, Uint8, value: 16
       field :only_if_exists, Bool
@@ -415,16 +502,31 @@ module X11
       field :data, Uint8, :list
     end
 
-    class OpenFont < BaseForm
-      field :opcode, Uint8, value: 45
+    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 :request_length, Uint16, value: ->(of) {
-        3+(of.name.length+3)/4
-      }
-      field :fid, Font
-      field :name, Uint16, :length
-      unused 2
-      field :name, String8, :string
+      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 ListFonts < BaseForm
@@ -677,6 +779,9 @@ module X11
 
     class MotionNotify < PressEvent
     end
+
+    class ButtonRelease < PressEvent
+    end
     
     class Expose < SimpleEvent
       field :window, Window

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

@@ -1,3 +1,3 @@
 module X11
-  VERSION = "0.0.2"
+  VERSION = "0.0.4"
 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.4
 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-11-21 00:00:00.000000000 Z
 dependencies: []
 description: Pure Ruby X11 bindings
 email: