conquer-dzen 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8a955af97495e65642ac3d57a421a2b7b1b98734
-  data.tar.gz: 70f07a3cfdb533f7dffe83809ff9c3e279be1604
+  metadata.gz: f305b9b87b16a67532e4b46cf7de063bdbab24c9
+  data.tar.gz: 1b1197177d069587a8b85cc579f463553bd14953
 SHA512:
-  metadata.gz: 9d6b53355f7a3b65892c5b5d80e4fab91ad630003350e205c04bbe04dfaf0cc5a6bbf116e1c4322981371387c92205938a56cd04c702c333f8d4e1b219ec8c0e
-  data.tar.gz: 46215af95e50b82b5398377ef2779a6ff43f11f3261debbbbf87a7b76a66acd37e444f8ed28501c6e591bc332cb1a17c1e6cc311b3cc74f4ecbb13f80bcf91ca
+  metadata.gz: 10962e1f4b4b1b48213ee608c93bd244bae611d9ac675b4f4c4d844abb4a473c7a74d2cc2b5dd71603384873df544e5fd9bbb92b51a075855f3013cf7df686b3
+  data.tar.gz: a98ca3c54381f41541fcab9066b536cd18ca9494e7834f9da80bcedce8c0acc681cbe2710259268213f4313b7bdebcf9761c338304035d8def47a2f61355e448

data/lib/conquer/dzen/interaction/tooltip_listener.rb

@@ -1,11 +1,15 @@
 require 'celluloid/current'
+require 'conquer/dzen/positioning'
 
 module Conquer
   module Dzen
     module Interaction
       class TooltipListener
+        MARGIN = 5
+
         include Celluloid
         include Celluloid::Notifications
+        include Positioning
 
         def initialize
           @current_tooltip = nil
@@ -13,24 +17,37 @@ module Conquer
         end
 
         def show_tooltip(_, title, text, width = 150)
-          Process.kill('TERM', @current_tooltip) if @current_tooltip
+          Process.kill('TERM', @current_tooltip.pid) if @current_tooltip
+          lines = text.lines.map { |line| shift(MARGIN) { line } }
+          mouse = mouse_location
+          dzen_command = dzen_command(mouse, lines.size, width + 2 * MARGIN)
+          async.run_dzen(dzen_command, title, lines.join)
+        end
 
-          lines = text.lines.size
-          mouse = `xdotool getmouselocation`.match(
-            /^x:(?<x>\d+) y:(?<y>\d+) screen:(?<screen>\d+)/
-          )
-          dzen_command = [
-            'dzen2', '-x', mouse[:x], '-y', mouse[:y], '-l', lines.to_s,
+        private
+
+        def dzen_command(mouse, line_count, width)
+          [
+            'dzen2', '-x', mouse[:x], '-y', mouse[:y], '-l', line_count.to_s,
             '-w', width.to_s, '-e', 'onstart=uncollapse;button1=exit',
             '-xs', mouse[:screen]
           ]
-          pipe = ::IO.popen(dzen_command, 'w+')
-          @current_tooltip = pipe.pid
+        end
+
+        def run_dzen(dzen_command, title, text)
+          ::IO.popen(dzen_command, 'w+') do |pipe|
+            @current_tooltip = pipe
+            pipe.puts title
+            pipe.puts text
+            pipe.flush
+            loop { sleep(100) }
+          end
+        end
 
-          pipe.puts title
-          pipe.puts text
-          pipe.flush
-          pipe.pid
+        def mouse_location
+          `xdotool getmouselocation`.match(
+            /^x:(?<x>\d+) y:(?<y>\d+) screen:(?<screen>\d+)/
+          )
         end
       end
     end

data/lib/conquer/dzen/version.rb

@@ -1,5 +1,5 @@
 module Conquer
   module Dzen
-    VERSION = '0.1.2'.freeze
+    VERSION = '0.1.3'.freeze
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: conquer-dzen
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Joakim Reinert