grmenu 4.0.1 → 4.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 15a2bac2ca8d2fcd19044ec0e07c589799400b840a302751a0b787f58095e548
-  data.tar.gz: b73e42131614a574a3f85313dd611f294814e97da90ceb681714e33ffab51cae
+  metadata.gz: 2204001c5ee3dc5f6a037e839683035a655d73d98d74c667906f268ba84d0d07
+  data.tar.gz: cc4d101354a88160890e4ebdb36073b5dd73cfb2ca5447aee609d6386aecb3d8
 SHA512:
-  metadata.gz: 3598fafb53860c943e0752730c8720424436f01035122f094c4d17938786a5dee451d41b388ef4032083f132752ea6cdef15bae2f56d01eea6871d323bbb1164
-  data.tar.gz: 0f4dd3d3da4f1f65f6c4e926815ebe294e82dca8195c2362bd3fd614da399b7f8be3ca620e05b7a158bef49bb57347469b451675490930161192fa689f8caa9f
+  metadata.gz: 9c91666f2d8e9c9bb6094e50eca470029223425e0bf58e10adc83bfdc5d28062bb664f2a2569b78cf33a3cfb569c9873800cce7b1ec54c64c8ee383a310c6eb5
+  data.tar.gz: 9da6c6d0543fc48c2f01cfdd4f64f6916698c433381504006cef981ab0b7974f785bff0c777b5e2ccc8092315658de5eaf45f42d340aed20c99abd9f9ab04f5c

data/README.md

@@ -1,4 +1,4 @@
-# GRmenu (Ruby) v4.0.1
+# GRmenu (Ruby) v4.0.3
 
 **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.3!")
 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.3)                  {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.3"
   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
@@ -2733,8 +2771,7 @@ class GRmenu
       brightness_level = parts[1].to_i if parts[1] && !parts[1].empty?
     end
 
-    is_neon_color = color_name.start_with?("neon")
-    is_anim_active = is_neon_color || (@animate && ["diagonal", "linear", "fade", "rgb", "rainbow", "chroma", "neon"].include?(@animate.to_s.downcase))
+    is_anim_active = @animate && ["neon", "fade"].include?(@animate.to_s.downcase)
     is_chroma = color_name == "rgb" || color_name == "rainbow" || color_name == "chroma" || @animate.to_s.downcase == "rgb"
 
     if is_chroma
@@ -2784,53 +2821,13 @@ class GRmenu
                BASE_RGB[color_name] || [255, 255, 255]
              end
 
-      if @animate.to_s.downcase == "fade"
-        factor = (Math.sin(tick + phase_offset) + 1.0) / 2.0
-        f = 0.35 + 0.65 * factor
-        r = (base[0] * f).clamp(0, 255).to_i
-        g = (base[1] * f).clamp(0, 255).to_i
-        b = (base[2] * f).clamp(0, 255).to_i
-        glow = (factor > 0.85) ? ";1" : ""
-        return "\e[38;2;#{r};#{g};#{b}#{glow}m#{text}#{self.class.ansi_reset}"
-      else
-        out = String.new("")
-        char_count = 0
-        in_escape = false
-        escape_buf = String.new("")
-
-        text.to_s.each_char do |ch|
-          if ch == "\e"
-            in_escape = true
-            escape_buf << ch
-            next
-          end
-          if in_escape
-            escape_buf << ch
-            if ch =~ /[a-zA-Z]/
-              in_escape = false
-              out << escape_buf
-              escape_buf.clear
-            end
-            next
-          end
-
-          if ch == " " || ch == "\t" || ch == "\r" || ch == "\n"
-            out << ch
-          else
-            phase = char_count * 0.22 + phase_offset
-            factor = (Math.sin(tick + phase) + 1.0) / 2.0
-            f = 0.35 + 0.65 * factor
-            r = (base[0] * f).clamp(0, 255).to_i
-            g = (base[1] * f).clamp(0, 255).to_i
-            b = (base[2] * f).clamp(0, 255).to_i
-            glow = (factor > 0.85) ? ";1" : ""
-            out << "\e[38;2;#{r};#{g};#{b}#{glow}m#{ch}"
-            char_count += 1
-          end
-        end
-        out << self.class.ansi_reset
-        return out
-      end
+      factor = (Math.sin(tick + phase_offset) + 1.0) / 2.0
+      f = 0.35 + 0.65 * factor
+      r = (base[0] * f).clamp(0, 255).to_i
+      g = (base[1] * f).clamp(0, 255).to_i
+      b = (base[2] * f).clamp(0, 255).to_i
+      glow = (factor > 0.85) ? ";1" : ""
+      return "\e[38;2;#{r};#{g};#{b}#{glow}m#{text}#{self.class.ansi_reset}"
     end
 
     color_code = self.class.ansi_color(color_name, brightness_level)
@@ -3053,7 +3050,8 @@ class GRmenu
     if @banner && !@banner.empty?
       banner_lines, banner_box_w = render_banner_lines(term_cols)
       unless banner_lines.empty?
-        rendered_lines.concat(banner_lines)
+        b_pad = (@center && term_cols > banner_box_w) ? " " * ((term_cols - banner_box_w) / 2) : ""
+        rendered_lines.concat(banner_lines.map { |l| "#{b_pad}#{l}" })
         rendered_lines << ""
         header_lines_count += banner_lines.length + 1
         header_box_width = [header_box_width, banner_box_w].max
@@ -3075,28 +3073,63 @@ class GRmenu
     calculated_width = ([calculated_width, GRmenu.display_width(@query) + 16].max) if @search
     total_width = [calculated_width, term_cols - 2].min
 
-    reference_width = header_box_width > 0 ? header_box_width : total_width
-    margin_left = (@center && reference_width > total_width) ? " " * ((reference_width - total_width) / 2) : ""
+    sub_1_preview_w = 0
+    sub_2_preview_w = 0
+    if @open_level >= 1 && is_submenu_item?(@functions[@index])
+      s1_acts = get_submenu_actions(@functions[@index])
+      if s1_acts && !s1_acts.empty?
+        s1_names = s1_acts.map { |a| extract_name_from_action(a) }
+        s1_max = s1_names.empty? ? 10 : s1_names.map { |n| GRmenu.display_width(n) }.max
+        s1_title = all_names[@index] || ""
+        sub_1_preview_w = [s1_max + 8, GRmenu.display_width(s1_title) + 6, 20].max
+        sub_1_preview_w = [sub_1_preview_w, 36].min
+
+        if @open_level >= 2 && is_submenu_item?(s1_acts[@sub_index_1])
+          s2_acts = get_submenu_actions(s1_acts[@sub_index_1])
+          if s2_acts && !s2_acts.empty?
+            s2_names = s2_acts.map { |a| extract_name_from_action(a) }
+            s2_max = s2_names.empty? ? 10 : s2_names.map { |n| GRmenu.display_width(n) }.max
+            s2_title = extract_name_from_action(s1_acts[@sub_index_1]) || ""
+            sub_2_preview_w = [s2_max + 8, GRmenu.display_width(s2_title) + 6, 20].max
+            sub_2_preview_w = [sub_2_preview_w, 36].min
+          end
+        end
+      end
+    end
+
+    total_chain_w = total_width
+    total_chain_w += 2 + sub_1_preview_w if sub_1_preview_w > 0
+    total_chain_w += 2 + sub_2_preview_w if sub_2_preview_w > 0
+
+    margin_left = if @center && term_cols > total_chain_w
+                    " " * ((term_cols - total_chain_w) / 2)
+                  elsif @center && term_cols > total_width
+                    " " * ((term_cols - total_width) / 2)
+                  else
+                    ""
+                  end
 
     subtitle_lines_count = 0
     if @subtitle && !@subtitle.empty?
       subtitle_lines = @subtitle.lines.map(&:chomp)
-      div_w = @divider.is_a?(Numeric) ? @divider.to_i : [reference_width, term_cols - 2].min
+      ref_sub_w = header_box_width > 0 ? header_box_width : total_chain_w
+      div_w = @divider.is_a?(Numeric) ? @divider.to_i : [ref_sub_w, term_cols - 2].min
+      sub_pad = (@center && term_cols > div_w) ? " " * ((term_cols - div_w) / 2) : ""
 
       if @divider
-        rendered_lines << colorize("─" * div_w, @style_config.divider, 0.0)
+        rendered_lines << "#{sub_pad}#{colorize("─" * div_w, @style_config.divider, 0.0)}"
         subtitle_lines_count += 1
       end
 
       subtitle_lines.each_with_index do |sub_line, s_i|
         pad_sub = [div_w - GRmenu.display_width(sub_line), 0].max
         formatted_sub = @center ? (" " * (pad_sub / 2) + sub_line + " " * (pad_sub - (pad_sub / 2))) : sub_line
-        rendered_lines << colorize(formatted_sub, @style_config.subtitle, s_i * 0.3)
+        rendered_lines << "#{sub_pad}#{colorize(formatted_sub, @style_config.subtitle, s_i * 0.3)}"
         subtitle_lines_count += 1
       end
 
       if @divider
-        rendered_lines << colorize("─" * div_w, @style_config.divider, 0.6)
+        rendered_lines << "#{sub_pad}#{colorize("─" * div_w, @style_config.divider, 0.6)}"
         subtitle_lines_count += 1
       end
       rendered_lines << ""
@@ -3189,6 +3222,7 @@ class GRmenu
       v_left  = colorize(v_l_raw, border_color_cfg, 0.2)
       v_right = colorize(v_r_raw, border_color_cfg, 0.8)
 
+      main_box_start = rendered_lines.length
       top_border_line = box_border[:tl] + top_fill + box_border[:tr]
       rendered_lines << "#{margin_left}#{colorize(top_border_line, border_color_cfg, 0.0)}"
 
@@ -3411,9 +3445,9 @@ class GRmenu
         if sub_2_lines
           total_3_w = margin_left.length + total_width + 2 + sub_1_w + 2 + sub_2_w
           if total_3_w <= term_cols
-            sub_1_start = [[parent_row_idx - 1, 0].max, [rendered_lines.length - sub_1_lines.length, 0].max].min
+            sub_1_start = main_box_start
             p1_abs_row = sub_1_start + (p_row_1 || 1)
-            sub_2_start = [[p1_abs_row - 1, 0].max, [rendered_lines.length - sub_2_lines.length, 0].max].min
+            sub_2_start = main_box_start
             max_3_lines = [rendered_lines.length, sub_1_start + sub_1_lines.length, sub_2_start + sub_2_lines.length].max
 
             x1_start = margin_left.length + total_width + 2
@@ -3460,7 +3494,7 @@ class GRmenu
             rendered_lines = stitched_lines
           elsif (sub_1_w + 2 + sub_2_w) <= term_cols
             p1_abs_row = (p_row_1 || 1)
-            sub_2_start = [[p1_abs_row - 1, 0].max, [sub_1_lines.length - sub_2_lines.length, 0].max].min
+            sub_2_start = main_box_start
             max_2_lines = [sub_1_lines.length, sub_2_start + sub_2_lines.length].max
 
             x1_start = margin_left.length
@@ -3500,7 +3534,7 @@ class GRmenu
         else
           total_2_w = margin_left.length + total_width + 2 + sub_1_w
           if total_2_w <= term_cols
-            sub_start_line = [[parent_row_idx - 1, 0].max, [rendered_lines.length - sub_1_lines.length, 0].max].min
+            sub_start_line = main_box_start
             max_total_lines = [rendered_lines.length, sub_start_line + sub_1_lines.length].max
 
             x1_start = margin_left.length + total_width + 2
@@ -3736,11 +3770,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 +3795,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 +3824,7 @@ class GRmenu
     end
     buffer << CLEAR_TO_EOS
     Kernel.print(buffer)
+    $stdout.flush
   end
 
   def run_interactive_loop(input_stream, target_width)
@@ -3823,34 +3866,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 +3938,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 +3949,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.3
 platform: ruby
 authors:
 - grcode