conquer-dzen 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c8933fbe7d81968698b0cb03f96d6779097065e4
-  data.tar.gz: a8c7295a89adc78506ba843bd7ac475eea5608bc
+  metadata.gz: 0e78581b0223c20b705c7fc522b81781d1850677
+  data.tar.gz: 6db26158a7cf9aeee8644bf81d8dc70fc3b4acf7
 SHA512:
-  metadata.gz: 8a44a9d97917ea92e17a7c70f14184b044b2c87fded2dc2cba533d337f617f809307bba3a67d917c9d2738d6d5d4eb3674e45e92d4c538389d22560286acca6c
-  data.tar.gz: 5460a13f78768047598162adecd396213517167958d9c2f7c1bfbe25473ef23a9dcc5ae31ca2eeb75598e409306b1bb54bbd18cb73a055f8dc1e687b2f1762ed
+  metadata.gz: a53f3df751e5ec2bb3d3ccb31c9396f8b1b27ee7e33ab8d15646c9b46ee7c958dc1a8ead65f971abbf557f3095357f8201845c2f1da5ac142fa448ae4dedcc1d
+  data.tar.gz: f88fa0b2dd9a82e956922ee2747e725ef3741cf80c5ab8f72c2bac532769b65457915d7336709bb06944ede49b386e4a3709e952fb20c3436a608c4e9fbaf8eb

data/.gitignore

@@ -7,3 +7,4 @@
 /pkg/
 /spec/reports/
 /tmp/
+/vendor/

data/lib/conquer/dzen.rb

@@ -3,11 +3,13 @@ require 'conquer/dzen/version'
 require 'conquer/dzen/color'
 require 'conquer/dzen/graphics'
 require 'conquer/dzen/positioning'
+require 'conquer/dzen/interaction'
 
 module Conquer
   module Helpers
     extend Dzen::Color
     extend Dzen::Graphics
     extend Dzen::Positioning
+    extend Dzen::Interaction
   end
 end

data/lib/conquer/dzen/interaction.rb

@@ -0,0 +1,23 @@
+require 'conquer/dzen/interaction/callback_listener'
+require 'conquer/dzen/interaction/tooltip_listener'
+
+module Conquer
+  module Dzen
+    module Interaction
+      def show_tooltip(*args)
+        Celluloid.publish('tooltip', *args)
+      end
+
+      def button(button, callback, *args)
+        rpc_call = { method: :event, params: ['button', callback, *args] }
+        command = "echo -n '#{rpc_call.to_json}' | socat stdin '#{RPC_SOCKET}'"
+        "^ca(#{button}, #{command})#{yield}^ca()"
+      end
+
+      Conquer.on_startup do
+        CallbackListener.supervise
+        TooltipListener.supervise
+      end
+    end
+  end
+end

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

@@ -0,0 +1,22 @@
+require 'celluloid/current'
+
+module Conquer
+  module Dzen
+    module Interaction
+      class CallbackListener
+        include Celluloid
+        include Celluloid::Notifications
+
+        def initialize
+          subscribe('button', :run_callback)
+        end
+
+        def run_callback(_, callback, *args)
+          Celluloid::Future.new do
+            Helpers.send(callback, *args)
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,38 @@
+require 'celluloid/current'
+
+module Conquer
+  module Dzen
+    module Interaction
+      class TooltipListener
+        include Celluloid
+        include Celluloid::Notifications
+
+        def initialize
+          @current_tooltip = nil
+          subscribe('tooltip', :show_tooltip)
+        end
+
+        def show_tooltip(_, title, text, width = 150)
+          Process.kill('TERM', @current_tooltip) if @current_tooltip
+
+          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,
+            '-w', width.to_s, '-e', 'onstart=uncollapse;button1=exit',
+            '-xs', mouse[:screen]
+          ]
+          pipe = ::IO.popen(dzen_command, 'w+')
+          @current_tooltip = pipe.pid
+
+          pipe.puts title
+          pipe.puts text
+          pipe.flush
+          pipe.pid
+        end
+      end
+    end
+  end
+end

data/lib/conquer/dzen/positioning.rb

@@ -1,6 +1,14 @@
 module Conquer
   module Dzen
     module Positioning
+      def ignore_bg(state = :on)
+        if block_given?
+          "^ib(1)#{yield}^ib(0)"
+        else
+          "^ib(#{state == :on ? 0 : 1})"
+        end
+      end
+
       def lock_x(options = {})
         if block_given?
           "#{'^ib(1)' if options[:ignore_bg]}" \
@@ -15,8 +23,8 @@ module Conquer
         '^p(_UNLOCK_X)'
       end
 
-      def shift(x, y)
-        return "#{shift(x, y)}#{yield}#{shift(-x, -y)}" if block_given?
+      def shift(x, y = 0)
+        return "#{shift(x, y)}#{yield}#{shift(-x)}^p()" if block_given?
         x = x.round
         y = y.round
         x = nil if x == 0

data/lib/conquer/dzen/version.rb

@@ -1,5 +1,5 @@
 module Conquer
   module Dzen
-    VERSION = "0.1.0"
+    VERSION = '0.1.1'.freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: conquer-dzen
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Joakim Reinert
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-06-04 00:00:00.000000000 Z
+date: 2016-06-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -93,6 +93,9 @@ files:
 - lib/conquer/dzen/graphics/progress_bar.rb
 - lib/conquer/dzen/graphics/rectangle.rb
 - lib/conquer/dzen/graphics/rectangle_outline.rb
+- lib/conquer/dzen/interaction.rb
+- lib/conquer/dzen/interaction/callback_listener.rb
+- lib/conquer/dzen/interaction/tooltip_listener.rb
 - lib/conquer/dzen/positioning.rb
 - lib/conquer/dzen/version.rb
 homepage: https://github.com/jreinert/conquer-dzen