textbringer-presentation 2 → 4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 12491d20e8d1e9de9ab44cdcbbe2020596de71ad5dd356bbd7815c02911dc095
-  data.tar.gz: 7ed617f25461dd6db1c7693da54b1263daa799a2595c252077aad34d8163085c
+  metadata.gz: ebd0aea8f6c194787d2c18b1259b797632bdc4107be882047ceff4008297c7d3
+  data.tar.gz: 14b4c4f2fc7a97b4fcda575f6160763447184f4b35964d75abb3586a337fe863
 SHA512:
-  metadata.gz: 4a56a97e1bae76bc0dfefa9977cb147384aa11318c9c1169baec27760035b170e886e63aa2d2ccb0ca51d82798c615d3aea2cbc9a724d2b9a72b3adf41bb50df
-  data.tar.gz: e29a0e8e2707f2403c882e7273d6c285062dc9c5a52642a2904a893ef761f40c90efdb7380ec447b476a99df3befbdc91364fa663b33a85bd1e9f05482008fd0
+  metadata.gz: 84da4841008a52448cd2f7311c44f84cfd9d127901ff89fdf82c62a11d3440a9c72b914adcda6d42d33b4285122d1f6b97d97e695174571e172804983a7f06fd
+  data.tar.gz: e50fb46d7227f35881e14d22a873dfddff5d6f692bc3325a9f1424c031a53302d4780b8f0a69c0184112007ea5ba63f6667110616b17020e398c4efd980ae07a

data/lib/textbringer/modes/presentation_mode.rb

@@ -103,25 +103,43 @@ module Textbringer
       width = CONFIG[:presentation_window_width]
       height = CONFIG[:presentation_window_height]
       if width.nil? || height.nil?
-        wininfo = `xwininfo -id $WINDOWID`
-        width = wininfo.slice(/Width: (\d+)/, 1).to_i
-        height = wininfo.slice(/Height: (\d+)/, 1).to_i
+        width, height = terminal_window_size
       end
       lines = Window.lines
       columns = Window.columns
       y = @buffer[:presentation_top_margin] +
         (/\A\s*\z/.match(body) ? 3 : body.count("\n") + 5)
       left_margin = @buffer[:presentation_image_left_margin]
-      img_width = width * (columns - left_margin * 2) / columns
-      img_height = height * (lines - y - 2) / lines
-      STDOUT.printf("\e[%d;%dH", y, left_margin + 1)
-      img_size = "#{img_width}x#{img_height}"
+      if width > 0 && height > 0
+        img_width = width * (columns - left_margin * 2) / columns
+        img_height = height * (lines - y - 2) / lines
+        STDOUT.printf("\e[%d;%dH", y, left_margin + 1)
+        img_size="#{img_width}x#{img_height}"
+        resize_option = "-resize #{img_size} -extent #{img_size}"
+      else
+        STDOUT.printf("\e[%d;%dH", y, 1)
+        resize_option = ""
+      end
       img_bg = @buffer[:presentation_image_background]
       options = CONFIG.fetch(:presentation_img2sixel_options, "")
-      STDOUT.print(`convert -resize #{img_size} -gravity center -background '#{img_bg}' -extent #{img_size} '#{img}' - | img2sixel #{options} 2> /dev/null`)
+      STDOUT.print(`convert #{resize_option} -gravity center -background '#{img_bg}' '#{img}' - | img2sixel #{options} 2> /dev/null`)
       STDOUT.flush
     end
 
+    TIOCGWINSZ = 0x5413
+
+    def terminal_window_size
+      buffer = [0, 0, 0, 0].pack('SSSS')
+  
+      if STDOUT.ioctl(TIOCGWINSZ, buffer) >= 0
+        rows, cols, xpixel, ypixel = buffer.unpack('SSSS')
+        return xpixel, ypixel if xpixel > 0
+      end
+      nil
+    rescue
+      nil
+    end
+
     def show_code(code, lang)
       Window.current.split
       Window.current.shrink_if_larger_than_buffer

data/lib/textbringer/presentation/slide_list.rb

@@ -27,7 +27,7 @@ module Textbringer
         i = 1
         @buffer.save_excursion do
           @buffer.beginning_of_buffer
-          while @buffer.re_search_forward(/^(?:#+[ \t]*([^\r\n]*)|```.*```)/m,
+          while @buffer.re_search_forward(/^(?:#+[ \t]*([^\r\n]*)|```.*?```)/m,
                                           raise_error: false)
             title = match_string(1)
             if title

data/lib/textbringer/presentation/version.rb

@@ -2,6 +2,6 @@
 
 module Textbringer
   module Presentation
-    VERSION = "2"
+    VERSION = "4"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: textbringer-presentation
 version: !ruby/object:Gem::Version
-  version: '2'
+  version: '4'
 platform: ruby
 authors:
 - Shugo Maeda