skrift-x11 0.1.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a086ab34c955c628b9b32640d98e26415a2e6766e9a784797893b6c8ef7473b0
-  data.tar.gz: 89a0ea4e3ee0cf221037e6c951d746c63f00140dd775f1b332cb0d7afdc52c67
+  metadata.gz: 92507a6b036b8ab2eb0145017a938019111e2ea17c4e001a693529d2518876f3
+  data.tar.gz: 2da4b5247c4e4b085a4f4591594d09f69f2f35a93c7fe43210b68f7efbfe3798
 SHA512:
-  metadata.gz: 8cf85e533b7d29eb13e993842a83a09bd3eaf7322fe41d93d5290637788d5bd944a90dd96f3f21f618edf2d03998f9667f7c403621470622fd552d72f6d039be
-  data.tar.gz: e07c349839802875a8d73f13a0dd2daa3beb76c12f52677f34a7a5f5bdd76aab8acdb38dc5c5c59e5612aad1ae2716ba7ffe223a86b4ca63eebae5fde1eae21d
+  metadata.gz: 8bac35a07d623a9f27539ec68d2a2cc4eb2cc906e788660a7cbea25323d55ff30ada7ac1474f92c7caa4b8c92a50a509bf6eaf25550c5e04d6e273a13aebe15f
+  data.tar.gz: c35c1e39c5b5ef7daf70257dc14e0930ac70607e78b6bc8397563964377d8e090b4472162fbbb061c05c584553ae6d0b7e937e7d3ecc156f534b6eed518c41e5

data/example.rb

@@ -7,61 +7,49 @@ require 'pp'
 
 Bundler.setup(:default, :development)
 
-$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
-$LOAD_PATH.unshift(File.dirname(__FILE__))
+#$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
+#$LOAD_PATH.unshift(File.dirname(__FILE__))
 
 require 'skrift/x11'
 
-$dpy = dpy = display = X11::Display.new
+dpy = display = X11::Display.new
 screen = dpy.screens.first
+visual = dpy.find_visual(0, 32).visual_id
+#cmap   = dpy.create_colormap(0, screen.root, visual)
 
-# Transparency: Check
-# https://stackoverflow.com/questions/13395179/empty-or-transparent-window-with-xlib-showing-border-lines-only/13397150#13397150
+p visual
+#p cmap
 
-# FIXME: Hack; see XFindVisualMatch
-visual = 123
-
-cmap = $dpy.create_colormap(0, screen.root, visual)
-
-wid = display.new_id
-$dpy.create_window(
-  32, 
-  wid, screen.root,
-  0, 0, # x,y
+wid = dpy.create_window(
+  0, 0,      # x,y
   1000, 600, # w,h
-  0,
-  X11::Form::InputOutput,
-  visual, #X11::Form::CopyFromParent -- Must be provided if e.g. depth is different than root.
-  X11::Form::CWBackPixel | X11::Form::CWBorderPixel |
-    X11::Form::CWEventMask | X11::Form::CWColorMap,
-  [0x00000000, # ARGB background
-   0x0, # Border pixel; Necessary when depth != screen.root_depth
-   X11::Form::SubstructureNotifyMask |
-   X11::Form::StructureNotifyMask    | ## Move
-   X11::Form::ExposureMask           |
-   X11::Form::KeyPressMask           |
-   X11::Form::ButtonPressMask,
-   cmap # Colormap. Necessary when depth != screen.root_depth
-  ]
+  visual: visual,
+  values: {
+    X11::Form::CWBackPixel   => 0, # ARGB background
+    X11::Form::CWBorderPixel => 0, # Needed in case window depth != screen.root_depth
+    X11::Form::CWEventMask   =>
+      (X11::Form::SubstructureNotifyMask |
+       X11::Form::StructureNotifyMask    |
+       X11::Form::ExposureMask           |
+       X11::Form::KeyPressMask           |
+       X11::Form::ButtonPressMask)#,
+#    X11::Form::CWColorMap    => cmap # Needed for same reason as borderpixel
+  }
 )
+p wid
 
 dpy.map_window(wid) # Window won't be visible until this
 
 # A "picture" object for us to draw in the window with.
 fmt  = dpy.render_find_visual_format(visual)
+p fmt
 $pic = dpy.render_create_picture(wid, fmt)
 
-# The easy way
-#$fgpic = dpy.render_create_solid_fill(0xffff,0xffff,0,0)
-
-
-$gc  = dpy.create_gc(wid, foreground: 0xffff0000)
-
-puts "Main loop"
+gc  = dpy.create_gc(wid, foreground: 0xffff0000)
 
-$f = Font.load("resources/FiraGO-Regular_extended_with_NotoSansEgyptianHieroglyphs-Regular.ttf")
+f = Font.load("resources/FiraGO-Regular_extended_with_NotoSansEgyptianHieroglyphs-Regular.ttf")
 
-$skrift = Skrift::X11::Glyphs.new($dpy, $f, x_scale: 40, y_scale: 40)
+$skrift = Skrift::X11::Glyphs.new(dpy, f, x_scale: 40, y_scale: 40)
 
 def redraw(dpy, wid, gc)
   dpy.poly_fill_rectangle(wid, gc, [X11::Form::Rectangle.new(20,45, 400, 400)])
@@ -74,9 +62,9 @@ end
 loop do
   pkt = display.next_packet
   if pkt
-    #puts pkt.inspect[0..200]
+    puts pkt.inspect[0..200]
     #raise "Error" if pkt.is_a?(X11::Form::Error)
-    redraw(display, wid, $gc) if pkt.is_a?(X11::Form::Expose)
+    redraw(display, wid, gc) if pkt.is_a?(X11::Form::Expose)
 
     if pkt.is_a?(X11::Form::KeyPress)
 #      lookup_keysym(dpy,pkt)

data/lib/skrift/x11/glyphs.rb

@@ -20,6 +20,7 @@ module Skrift
 
         @glyphcache = {}
         @colcache   = {}
+        @chcache = {}
 
         @lm = @sft.lmetrics
 
@@ -60,6 +61,7 @@ module Skrift
     
   
       def cache_glyph(gid, baseline)
+        return if gid.nil?
         mtx = @sft.gmetrics(gid)
 
         # FIXME: Not sure what to do if mtx.nil? here.
@@ -103,7 +105,9 @@ module Skrift
       def map_glyphs(str)
         # FIXME: Should probably cache by character rather than
         # glyph
-        str.to_s.each_char.map { |ch| @sft.lookup(ch.ord) }
+        str.to_s.each_char.map do |ch|
+          @chcache[ch] ||= @sft.lookup(ch.ord).to_i
+        end
       end
       
       def cache_glyphs(gl)

data/lib/skrift/x11/version.rb

@@ -2,6 +2,6 @@
 
 module Skrift
   module X11
-    VERSION = "0.1.0"
+    VERSION = "0.2.1"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: skrift-x11
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Vidar Hokstad
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-09-25 00:00:00.000000000 Z
+date: 2023-11-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: skrift