ampv 1.2.0 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4cd792f9c7d994f5be1035bcbced7c95df683908
-  data.tar.gz: a16d8998f82dfd65d0611ee602447adbc6fb6c95
+  metadata.gz: 943c6cc8f359174b3bf8d5c51c38761dacf1523b
+  data.tar.gz: 8a2c814830826c6c8f3c698bd1f8ec0ab7a1cde5
 SHA512:
-  metadata.gz: d5c646276dece49053e5ee73dceb67c2de4ce4485ba014c261701798ea9234ce66b68e23f970703e5d2c79ee5c9f7b14c2f3592be418611badfdb8239622747d
-  data.tar.gz: 8d0e88a8409d93bf33271abf62ca452af5e6296e47d5310007dad00e069e731a04c6284c1bf7772bf91acf7f19848c4bfa0f53599a13ea4d09dfaea8dd8b6170
+  metadata.gz: 081a7c98b93fad0f3604c8f1de457b9966477562941db6093954a1dffd5749fa9e3dd4eb7ea8bafa17e32a42b95c8d86e3c50061e2ce0fd383cc94f816b8c928
+  data.tar.gz: 3bed50ec7e8b7b2150321d2a7970c6eca6069de872869cc854c1b052658e31e77d7f2036ff066d348ec11cee5cb36f21f4a12b4edec14c154455e504ed62be5b

data/lib/ampv.rb

@@ -163,12 +163,10 @@ module Ampv
     end
 
     def handle_mouse_event(e)
-      if e.event_type != Gdk::Event::MOTION_NOTIFY
-        button = e.event_type == Gdk::Event::SCROLL ? WHEEL_BUTTONS[e.direction] : e.button
-        return if Config["mouse_bindings"][e.event_type].nil?
-        process_cmd(Config["mouse_bindings"][e.event_type][button])
-      end
-      mouse_cursor_timeout
+      button = e.event_type == Gdk::Event::SCROLL ? WHEEL_BUTTONS[e.direction] : e.button
+      return if Config["mouse_bindings"][e.event_type].nil?
+      process_cmd(Config["mouse_bindings"][e.event_type][button])
+      mouse_cursor_timeout(true)
     end
 
     def handle_keyboard_event(e)
@@ -182,11 +180,14 @@ module Ampv
       end
     end
 
-    def mouse_cursor_timeout
-      window.set_cursor(nil)
+    def mouse_cursor_timeout(mevent = false)
       GLib::Source.remove(@cursor_timeout) if @cursor_timeout
+      window.set_cursor(nil)
       @cursor_timeout = GLib::Timeout.add(1000) {
         window.set_cursor(Gdk::Cursor.new(Gdk::Cursor::BLANK_CURSOR)) unless @mpv.is_paused
+        # hacky workaround when called after a mouse event
+        # without this the cursor is still shown when it should not be.
+        Gdk::Display.default.warp_pointer(*Gdk::Display.default.pointer[0..2]) if mevent
         false
       }
     end

data/lib/ampv/config.rb

@@ -1,10 +1,10 @@
 module Ampv
   class Config
 
-    @@config_file  = "#{(ENV["XDG_CONFIG_HOME"] || "#{Dir.home}/.config")}/ampv.conf"
-    @@input_config = File.exists?("#{Dir.home}/.mpv/input.conf") ?
+    CONFIG_FILE  = "#{(ENV["XDG_CONFIG_HOME"] || "#{Dir.home}/.config")}/ampv.conf"
+    INPUT_CONFIG = File.exists?("#{Dir.home}/.mpv/input.conf") ?
                       "#{Dir.home}/.mpv/input.conf" : File.expand_path("../../../input.conf", __FILE__)
-    @@key_names    = {
+    KEY_NAMES    = {
       "esc"         => "Escape",
       "space"       => "space",
       "right"       => "Right",
@@ -18,8 +18,7 @@ module Ampv
       "ins"         => "Insert",
       "del"         => "Delete",
     }
-    @@config       = { }
-    @@defaults     = {
+    DEFAULTS     = {
         "width"                  => Gdk::Screen.default.width > 1280 ? 1280 : 853,
         "height"                 => Gdk::Screen.default.width > 1280 ? 726  : 486,
         "x"                      => -1,
@@ -42,20 +41,21 @@ module Ampv
         "key_bindings"           => [ ],
         "mouse_bindings"         => [ ]
     }
+    @@config     = { }
 
     def self.load
-      if File.exists?(@@config_file)
-        File.readlines(@@config_file).each { |line|
+      if File.exists?(CONFIG_FILE)
+        File.readlines(CONFIG_FILE).each { |line|
           key, _, val = line.partition("=")
           key.strip!
           val.strip!
-          next unless @@defaults.has_key?(key) and key[0] != "#"
+          next unless DEFAULTS.has_key?(key) and key[0] != "#"
 
-          if @@defaults[key].is_a?(Integer)
+          if DEFAULTS[key].is_a?(Integer)
             val = val.to_i
-          elsif @@defaults[key].is_a?(TrueClass) or  @@defaults[key].is_a?(FalseClass)
+          elsif DEFAULTS[key].is_a?(TrueClass) or  DEFAULTS[key].is_a?(FalseClass)
             val = val == "true"
-          elsif @@defaults[key].is_a?(Gdk::Color)
+          elsif DEFAULTS[key].is_a?(Gdk::Color)
             begin
               val = Gdk::Color.parse(val)
             rescue
@@ -78,8 +78,8 @@ module Ampv
       # load input config
       self["mouse_bindings"] = [ ]
       self["key_bindings"]   = [ ]
-      if File.exists?(@@input_config)
-        File.readlines(@@input_config).each { |line|
+      if File.exists?(INPUT_CONFIG)
+        File.readlines(INPUT_CONFIG).each { |line|
           line.strip!
           if line.start_with?("MOUSE_BTN")
             # 4 = up, 5 = down, 6 = left, 7 = right
@@ -91,7 +91,7 @@ module Ampv
             self["mouse_bindings"][type][button] = cmd
           elsif !line.empty?
             key, cmd = line.match(/^([^\s]+)\s+(.+)$/).captures
-            if name = @@key_names[key.downcase]
+            if name = KEY_NAMES[key.downcase]
               keyval = Gdk::Keyval.from_name(name)
             else
               keyval = Gdk::Keyval.from_name(key)
@@ -104,7 +104,7 @@ module Ampv
     end
 
     def self.[](key)
-      @@config[key].nil? ? @@defaults[key] : @@config[key]
+      @@config[key].nil? ? DEFAULTS[key] : @@config[key]
     end
 
     def self.[]=(key, value)
@@ -112,7 +112,7 @@ module Ampv
     end
 
     def self.save
-      File.open(@@config_file, "w") { |file|
+      File.open(CONFIG_FILE, "w") { |file|
         @@config.each { |k, v| file.puts("#{k}=#{v}") unless k == "key_bindings" or k == "mouse_bindings" }
       }
     end

data/lib/ampv/playlist.rb

@@ -42,7 +42,7 @@ module Ampv
       vbox.border_width = 10
       sw.set_policy(Gtk::POLICY_AUTOMATIC, Gtk::POLICY_AUTOMATIC)
 
-      @treeview.set_enable_search (false)
+      @treeview.set_enable_search(false)
       @treeview.set_rubber_banding(true)
       @treeview.set_reorderable(true)
       @treeview.set_tooltip_column(0)

data/lib/ampv/version.rb

@@ -1,5 +1,5 @@
 module Ampv
   PACKAGE = "ampv"
-  VERSION = "1.2.0"
+  VERSION = "1.2.1"
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ampv
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.2.1
 platform: ruby
 authors:
 - ahoka
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-08 00:00:00.000000000 Z
+date: 2014-04-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gtk2
@@ -61,11 +61,11 @@ extra_rdoc_files: []
 files:
 - LICENSE
 - input.conf
-- lib/ampv/mpvwidget.rb
+- lib/ampv/playlist.rb
 - lib/ampv/progressbarwidget.rb
 - lib/ampv/config.rb
-- lib/ampv/playlist.rb
 - lib/ampv/version.rb
+- lib/ampv/mpvwidget.rb
 - lib/ampv.rb
 - bin/ampv
 homepage: https://github.com/ahodesuka/ampv