grmenu 4.0.1 → 4.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 15a2bac2ca8d2fcd19044ec0e07c589799400b840a302751a0b787f58095e548
-  data.tar.gz: b73e42131614a574a3f85313dd611f294814e97da90ceb681714e33ffab51cae
+  metadata.gz: c028e16af097dddc8e61b7cc766cc6a7f1870616e3c5169c832fe6edcf79fb55
+  data.tar.gz: 1c0070cb22cebd71fa4b235c0cea7bd51c1af58c7b662fbe5bd2d9976709e774
 SHA512:
-  metadata.gz: 3598fafb53860c943e0752730c8720424436f01035122f094c4d17938786a5dee451d41b388ef4032083f132752ea6cdef15bae2f56d01eea6871d323bbb1164
-  data.tar.gz: 0f4dd3d3da4f1f65f6c4e926815ebe294e82dca8195c2362bd3fd614da399b7f8be3ca620e05b7a158bef49bb57347469b451675490930161192fa689f8caa9f
+  metadata.gz: ba425e3a5e0a2d4692f9bc79e249a8303a245e0aeca137bd343fee489020d6b3f1b4c37147751ca4d5c05ab119b97848f6f7470803984550c69b93c0ae77a8cc
+  data.tar.gz: 90959c3c3c4ae76ec8bca759faea2ecdb801ee8fbc977bfae15618ad3af603202c95b2192e0296193cee5a933a0aa93e2ac559db84e0a967380c3e4737839c50

data/README.md

@@ -1,4 +1,4 @@
-# GRmenu (Ruby) v4.0.1
+# GRmenu (Ruby) v4.0.2
 
 **Suite TUI Profesional y Ligera para la Creación de Interfaces de Línea de Comandos en Terminales TTY.**
 
@@ -95,7 +95,7 @@ require 'grmenu'
 GRmenu.theme(:neon_red)
 
 def saludar
-  GRmenu.alert(:success, "Bienvenido a GRmenu v4.0.1!")
+  GRmenu.alert(:success, "Bienvenido a GRmenu v4.0.2!")
 end
 
 def ver_tabla

data/data/help.txt

@@ -8,7 +8,7 @@
 {bright_cyan}╚═══════════════════════════════════════════════════════════════════════════════════╝{reset}
 
 {bright_cyan}╔═══════════════════════════════════════════════════════════════════════════════════╗{reset}
-{bright_cyan}║{bright_yellow}             DOCUMENTACION Y GUIA COMPLETA DE PARAMETROS (v4.0.1)                  {bright_cyan}║{reset}
+{bright_cyan}║{bright_yellow}             DOCUMENTACION Y GUIA COMPLETA DE PARAMETROS (v4.0.2)                  {bright_cyan}║{reset}
 {bright_cyan}║{gray}  Soporte Raton SGR 1006, Submenus en Cascada 3 Niveles, Pestanas y CSS .gr        {bright_cyan}║{reset}
 {bright_cyan}╚═══════════════════════════════════════════════════════════════════════════════════╝{reset}
 

data/grmenu.rb

@@ -6,15 +6,15 @@ require 'zlib'
 require 'open3'
 
 class GRmenu
-  VERSION               = "4.0.1"
+  VERSION               = "4.0.2"
   CLEAR_SCREEN_SEQUENCE = "\e[H\e[2J\e[3J"
   HIDE_CURSOR           = "\e[?25l"
   SHOW_CURSOR           = "\e[?25h"
   CURSOR_HOME           = "\e[H"
   CLEAR_TO_EOL          = "\e[K"
   CLEAR_TO_EOS          = "\e[J"
-  ENABLE_MOUSE          = "\e[?1000h\e[?1006h"
-  DISABLE_MOUSE         = "\e[?1000l\e[?1006l"
+  ENABLE_MOUSE          = "\e[?1000h\e[?1002h\e[?1006h"
+  DISABLE_MOUSE         = "\e[?1006l\e[?1002l\e[?1000l"
 
   def self.find_data_file(filename)
     local_path = File.expand_path("data/#{filename}", __dir__)
@@ -24,6 +24,30 @@ class GRmenu
     nil
   end
 
+  def self.enable_windows_vt
+    return unless Gem.win_platform? || RUBY_PLATFORM =~ /mswin|mingw|cygwin/
+    require 'fiddle'
+    kernel32 = Fiddle.dlopen('kernel32')
+    get_std_handle = Fiddle::Function.new(kernel32['GetStdHandle'], [Fiddle::TYPE_INT], Fiddle::TYPE_VOIDP)
+    get_console_mode = Fiddle::Function.new(kernel32['GetConsoleMode'], [Fiddle::TYPE_VOIDP, Fiddle::TYPE_VOIDP], Fiddle::TYPE_INT)
+    set_console_mode = Fiddle::Function.new(kernel32['SetConsoleMode'], [Fiddle::TYPE_VOIDP, Fiddle::TYPE_INT], Fiddle::TYPE_INT)
+
+    h_out = get_std_handle.call(-11)
+    out_mode = ' ' * 4
+    if get_console_mode.call(h_out, out_mode) != 0
+      m = out_mode.unpack1('L')
+      set_console_mode.call(h_out, m | 0x0004)
+    end
+
+    h_in = get_std_handle.call(-10)
+    in_mode = ' ' * 4
+    if get_console_mode.call(h_in, in_mode) != 0
+      m = in_mode.unpack1('L')
+      set_console_mode.call(h_in, m | 0x0200)
+    end
+  rescue StandardError
+  end
+
   def self.load_json_data(filename)
     path = find_data_file(filename)
     return {} unless path && File.exist?(path)
@@ -1448,27 +1472,37 @@ class GRmenu
     return nil if first_char.nil?
 
     if first_char == "\e"
-      begin
-        second = is_tty ? input_stream.read_nonblock(1) : input_stream.read(1)
-        if second
-          first_char << second
-          if second == "[" || second == "O"
-            while true
-              ch = is_tty ? input_stream.read_nonblock(1) : input_stream.read(1)
-              break if ch.nil?
-              first_char << ch
-              break if ch =~ /[a-zA-Z~]/
-            end
-          end
+      seq = first_char.dup
+      if is_tty
+        while (ch = (input_stream.getch(min: 0, time: 0.1) rescue nil))
+          seq << ch
+          break if seq =~ /[a-zA-Z~]\z/
+        end
+      else
+        while (IO.select([input_stream], nil, nil, 0.05) rescue nil)
+          ch = (input_stream.read(1) rescue nil)
+          break if ch.nil?
+          seq << ch
+          break if seq =~ /[a-zA-Z~]\z/
         end
-      rescue IO::WaitReadable, IO::EAGAINWaitReadable, EOFError
       end
-    elsif first_char == "\x00" || first_char == "\xe0"
-      begin
-        second_char = is_tty ? input_stream.read_nonblock(1) : input_stream.read(1)
-        first_char << second_char if second_char
-      rescue IO::WaitReadable, IO::EAGAINWaitReadable, EOFError
+
+      if seq == "\e[M"
+        cb = is_tty ? (input_stream.getch(min: 0, time: 0.1) rescue nil) : (input_stream.read(1) rescue nil)
+        cx = is_tty ? (input_stream.getch(min: 0, time: 0.1) rescue nil) : (input_stream.read(1) rescue nil)
+        cy = is_tty ? (input_stream.getch(min: 0, time: 0.1) rescue nil) : (input_stream.read(1) rescue nil)
+        if cb && cx && cy
+          btn_c = cb.ord - 32
+          col_c = cx.ord - 32
+          row_c = cy.ord - 32
+          return "\e[<#{btn_c};#{col_c};#{row_c}M"
+        end
       end
+
+      return seq
+    elsif first_char == "\x00" || first_char == "\xe0"
+      second_char = is_tty ? (input_stream.getch(min: 0, time: 0.1) rescue nil) : (input_stream.read(1) rescue nil)
+      return first_char + second_char if second_char
     end
 
     first_char
@@ -2587,8 +2621,12 @@ class GRmenu
     @image        = image || keyword_arguments[:image]
     @image_width  = (image_width || keyword_arguments[:image_width])&.to_i
     @animate      = (keyword_arguments[:animate] || (@@global_theme.is_a?(Hash) && @@global_theme.dig(:sections, 'menu', 'animate')) || false).to_s
-    @desc_prefix  = keyword_arguments[:desc_prefix] || keyword_arguments[:description_prefix]
-    @mouse        = (mouse == true || keyword_arguments[:mouse] == true || mouse.to_s == 'true' || keyword_arguments[:mouse].to_s == 'true' || (theme_menu_sec['mouse'].to_s == 'true'))
+    m_val = mouse.nil? ? keyword_arguments[:mouse] : mouse
+    if m_val.nil?
+      @mouse = theme_menu_sec.key?('mouse') ? (theme_menu_sec['mouse'].to_s != 'false') : true
+    else
+      @mouse = (m_val == true || m_val.to_s == 'true')
+    end
 
     t_sec = (@@global_theme.is_a?(Hash) && @@global_theme.dig(:sections, "tabs")) || {}
     @active_tab_color = (active_tab_color || keyword_arguments[:active_tab_color] || t_sec["active_tab"] || t_sec["active_tab_color"] || "yellow").to_s
@@ -3736,11 +3774,15 @@ class GRmenu
     target_width = min_width || size_max || 20
     action_to_execute = nil
 
+    self.class.enable_windows_vt
+    $stdout.sync = true
+
     is_tty = $stdin.respond_to?(:tty?) && $stdin.tty?
 
     begin
       Kernel.print("#{HIDE_CURSOR}#{CLEAR_SCREEN_SEQUENCE}")
       Kernel.print(ENABLE_MOUSE) if @mouse
+      $stdout.flush
 
       if @animate && !["false", "rgb", "", "nil"].include?(@animate.downcase)
         intro_lines = render_lines(target_width)
@@ -3757,17 +3799,21 @@ class GRmenu
     ensure
       Kernel.print(DISABLE_MOUSE) if @mouse
       Kernel.print(SHOW_CURSOR)
+      $stdout.flush
     end
 
     if action_to_execute
       Kernel.print(CLEAR_SCREEN_SEQUENCE)
+      $stdout.flush
       execute_action(action_to_execute)
     else
       Kernel.print(CLEAR_SCREEN_SEQUENCE)
+      $stdout.flush
     end
   rescue Interrupt
     Kernel.print(DISABLE_MOUSE) if @mouse
     Kernel.print("#{SHOW_CURSOR}#{CLEAR_SCREEN_SEQUENCE}")
+    $stdout.flush
     nil
   end
 
@@ -3782,6 +3828,7 @@ class GRmenu
     end
     buffer << CLEAR_TO_EOS
     Kernel.print(buffer)
+    $stdout.flush
   end
 
   def run_interactive_loop(input_stream, target_width)
@@ -3823,34 +3870,40 @@ class GRmenu
         act = $4
 
         if btn == 64
-          if @level == 2 && @open_level >= 2 && is_submenu_item?(@functions[@index])
+          if @open_level >= 2 && @sub_2_col_rng && @sub_2_col_rng.cover?(col) && is_submenu_item?(@functions[@index])
             s1_acts = get_submenu_actions(@functions[@index])
             s2_acts = get_submenu_actions(s1_acts[@sub_index_1]) if s1_acts
             @sub_index_2 = (@sub_index_2 - 1) % s2_acts.length if s2_acts && !s2_acts.empty?
-          elsif @level == 1 && @open_level >= 1 && is_submenu_item?(@functions[@index])
+            @level = 2
+          elsif @open_level >= 1 && @sub_1_col_rng && @sub_1_col_rng.cover?(col) && is_submenu_item?(@functions[@index])
             s1_acts = get_submenu_actions(@functions[@index])
             @sub_index_1 = (@sub_index_1 - 1) % s1_acts.length if s1_acts && !s1_acts.empty?
             @sub_index_2 = 0
+            @level = 1
           else
             move_up
             @sub_index_1 = 0
             @sub_index_2 = 0
+            @level = 0
           end
           draw_frame(target_width)
           next
         elsif btn == 65
-          if @level == 2 && @open_level >= 2 && is_submenu_item?(@functions[@index])
+          if @open_level >= 2 && @sub_2_col_rng && @sub_2_col_rng.cover?(col) && is_submenu_item?(@functions[@index])
             s1_acts = get_submenu_actions(@functions[@index])
             s2_acts = get_submenu_actions(s1_acts[@sub_index_1]) if s1_acts
             @sub_index_2 = (@sub_index_2 + 1) % s2_acts.length if s2_acts && !s2_acts.empty?
-          elsif @level == 1 && @open_level >= 1 && is_submenu_item?(@functions[@index])
+            @level = 2
+          elsif @open_level >= 1 && @sub_1_col_rng && @sub_1_col_rng.cover?(col) && is_submenu_item?(@functions[@index])
             s1_acts = get_submenu_actions(@functions[@index])
             @sub_index_1 = (@sub_index_1 + 1) % s1_acts.length if s1_acts && !s1_acts.empty?
             @sub_index_2 = 0
+            @level = 1
           else
             move_down
             @sub_index_1 = 0
             @sub_index_2 = 0
+            @level = 0
           end
           draw_frame(target_width)
           next
@@ -3889,14 +3942,9 @@ class GRmenu
             s1_acts = get_submenu_actions(@functions[@index])
             s2_acts = get_submenu_actions(s1_acts[@sub_index_1]) if s1_acts
             if s2_acts && s2_clicked < s2_acts.length
-              if @level == 2 && @sub_index_2 == s2_clicked
-                return s2_acts[s2_clicked]
-              else
-                @level = 2
-                @sub_index_2 = s2_clicked
-                draw_frame(target_width)
-                next
-              end
+              @level = 2
+              @sub_index_2 = s2_clicked
+              return s2_acts[s2_clicked]
             end
           end
 
@@ -3905,67 +3953,39 @@ class GRmenu
             s1_acts = get_submenu_actions(@functions[@index])
             if s1_acts && s1_clicked < s1_acts.length
               t_act = s1_acts[s1_clicked]
-              if @level == 1 && @sub_index_1 == s1_clicked
-                if is_submenu_item?(t_act)
-                  @open_level = 2
-                  @level = 2
-                  @sub_index_2 = 0
-                  draw_frame(target_width)
-                  next
-                else
-                  return t_act
-                end
-              else
-                @level = 1
-                @sub_index_1 = s1_clicked
-                if is_submenu_item?(t_act)
-                  @open_level = 2
-                  @sub_index_2 = 0
-                else
-                  @open_level = 1
-                end
+              @level = 1
+              @sub_index_1 = s1_clicked
+              if is_submenu_item?(t_act)
+                @open_level = 2
+                @level = 2
+                @sub_index_2 = 0
                 draw_frame(target_width)
                 next
+              else
+                return t_act
               end
             end
           end
 
           if @row_hit_map && @row_hit_map[row]
             hit = @row_hit_map[row]
-            inner_x = col - hit[:margin_left] - 3
-            if inner_x >= 0
-              c_idx = (inner_x / (hit[:col_w] + 2)).to_i
-              c_idx = [[c_idx, 0].max, hit[:cols] - 1].min
+            x_in_box = col - hit[:margin_left]
+            if x_in_box > 0 && (hit[:total_w].nil? || x_in_box <= hit[:total_w])
+              c_idx = [[((x_in_box - 2) / ([hit[:col_w], 1].max + 2)).to_i, 0].max, hit[:cols] - 1].min
               clicked_item = hit[:row_indices][c_idx]
               if clicked_item
-                if @index == clicked_item
-                  if is_submenu_item?(@functions[clicked_item])
-                    @open_level = 1
-                    @level = 1
-                    @sub_index_1 = 0
-                    @sub_index_2 = 0
-                    @active_panel = :sub
-                    @submenu_open = true
-                    draw_frame(target_width)
-                    next
-                  else
-                    return @functions[clicked_item]
-                  end
-                else
-                  @index = clicked_item
-                  @level = 0
-                  @active_panel = :main
-                  if is_submenu_item?(@functions[clicked_item])
-                    @open_level = 1
-                    @sub_index_1 = 0
-                    @sub_index_2 = 0
-                    @submenu_open = true
-                  else
-                    @open_level = 0
-                    @submenu_open = false
-                  end
+                @index = clicked_item
+                if is_submenu_item?(@functions[clicked_item])
+                  @open_level = 1
+                  @level = 1
+                  @sub_index_1 = 0
+                  @sub_index_2 = 0
+                  @active_panel = :sub
+                  @submenu_open = true
                   draw_frame(target_width)
                   next
+                else
+                  return @functions[clicked_item]
                 end
               end
             end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: grmenu
 version: !ruby/object:Gem::Version
-  version: 4.0.1
+  version: 4.0.2
 platform: ruby
 authors:
 - grcode