t-rex 1.0.6 → 2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d7f0b8057a14ed214b62947567e1c6c7eb0e588beb3326b4ebdedec202e7f0f1
-  data.tar.gz: c706413cc13b9037b27fa1e60639b366018626ac6a63eddebf829a1c4363f344
+  metadata.gz: 2fa0770f86f98c3694ab939dfccb26a9f6174058fb600e79afde45b3f32f69b3
+  data.tar.gz: '01468ba7f3d71c57125452fd9bd6caf02bcaa0606fc4c0486bef615773b7d862'
 SHA512:
-  metadata.gz: 9ecb3aa8ab03b94de67c8f9a86a2c9eecacdf127b66f047477823a9938efd706c5a6ac6ef31ace5be38fe4fbf9b6ee089ea160ccbe699142d2450b6b3718a8cc
-  data.tar.gz: 86969990e078cf98b2634bf525217b8e526c24207508d0ca1bf3f2e025c749ffda0268c802e9d7874ef290f8e90af185cf0d39faa599936696a2b11fe9b9092a
+  metadata.gz: c725bce6bf26b3d5a58a4d4cd53d9a18aa5e99054a02f0f741da70486c167d8e30bd54cf020ba5e6575a586018a9d035594cc0aca366f1f62cb5878f3eaa34e3
+  data.tar.gz: ab6a77ecd77d303cd76bca9972daa28db844eae423bc5480193eca1e42cdf9df0c39ab5b407a7a5da5e0d3a71c236ea4107323462b2c4f3c5a9662f87f89ebcd

data/bin/t-rex

@@ -1,75 +1,73 @@
 #!/usr/bin/env ruby
 # encoding: utf-8
+#
+# Title:      T-REX (Terminal - Rpn EXperiment)
+# Language:   Pure Ruby, best viewed in VIM
+# Author:     Geir Isene <g@isene.com> http://isene.com/
+# Github:     https://github.com/isene/t-rex/
+# License:    I release all copyright claims. This code is in the public domain.
+#             Permission is granted to use, copy modify, distribute, and sell
+#             this software for any purpose. I make no guarantee about the
+#             suitability of this software for any purpose and I am not liable
+#             for any damages resulting from its use. Further, I am under no
+#             obligation to maintain or extend this software. It is provided 
+#             on an 'as is' basis without any expressed or implied warranty.
+@version    = "2.0" # Full rewrite with rcurses, face lift, new functionality, bug fixes
 
-require 'io/console'
-require 'curses'
-include  Curses
+require 'rcurses'
+include Rcurses::Input
 
-# CLASSES
-class Curses::Window # CLASS EXTENSION 
-  # General extensions (see https://github.com/isene/Ruby-Curses-Class-Extension)
-  attr_accessor :color, :fg, :bg, :attr
-  # Set self.color for an already defined color pair such as: init_pair(1, 255, 3)
-  # The color pair is defined like this: init_pair(index, foreground, background)
-  # self.fg is set for the foreground color (and is used if self.color is not set)
-  # self.bg is set for the background color (and is used if self.color is not set)
-  # self.attr is set for text attributes like Curses::A_BOLD
-  def clr # Clears the whole window
-    self.setpos(0, 0)
-    self.maxy.times {self.deleteln()}
-    self.refresh
-    self.setpos(0, 0)
-  end
-  def fill # Fill window with color as set by self.color (or self.bg if not set) 
-    self.setpos(0, 0)
-    self.fill_from_cur_pos
-  end
-  def fill_from_cur_pos # Fills the rest of the window from current line
-    x = curx
-    y = cury
-    self.setpos(y, 0)
-    blank = " " * self.maxx
-    if self.color == nil
-      self.bg = 0 if self.bg   == nil
-      self.fg = 255 if self.fg == nil
-      init_pair(self.fg, self.fg, self.bg)
-      self.maxy.times {self.attron(color_pair(self.fg)) {self << blank}}
-    else
-      self.maxy.times {self.attron(color_pair(self.color)) {self << blank}}
-    end
-    self.refresh
-    self.setpos(y, x)
-  end
-  def fill_to_cur_pos # Fills the window up to current line
-    x = curx
-    y = cury
-    self.setpos(0, 0)
-    blank = " " * self.maxx
-    if self.color == nil
-      self.bg = 0 if self.bg   == nil
-      self.fg = 255 if self.fg == nil
-      init_pair(self.fg, self.fg, self.bg)
-      y.times {self.attron(color_pair(self.fg)) {self << blank}}
-    else
-      y.times {self.attron(color_pair(self.color)) {self << blank}}
-    end
-    self.refresh
-    self.setpos(y, x)
-  end
-  def p(text) # Puts text to window
-    self.attr = 0 if self.attr == nil
-    if self.color == nil
-      self.bg = 0 if self.bg   == nil
-      self.fg = 255 if self.fg == nil
-      init_pair(self.fg, self.fg, self.bg)
-      self.attron(color_pair(self.fg) | self.attr) { self << text }
-    else
-      self.attron(color_pair(self.color) | self.attr) { self << text }
-    end
-    self.refresh
+def help # HELP text
+help = <<HELPTEXT
+  
+  T-REX - Terminal Rpn calculator EXperiment. GitHub: https://github.com/isene/T-REX
+  This is a Reverse Polish Notation calculator similar to the traditional Hewlett 
+  Packard calculators. See https://www.hpmuseum.org/rpn.htm for info on RPN.
+ 
+  The stack is shown to the top left. The X, Y, Z and  T registers comprise the 
+  operating stack. L is the "Last X" register showing the previous value in X.
+  Toggle US and European number formats by pressing '. 
+ 
+  Functions available are shown under the stack registers. The orange symbol 
+  corresponds to the key to be pressed. For functions above each label (grey 
+  functions), press the Control key (Ctrl) and the orange key (asin = Ctrl+i).
+  
+  For Rectangular to Polar conversions:
+  R-P: X value in x, Y in y - yields "θ" in y and "r" in x.
+  P-R: "θ" in y and "r" in x - yeilds X in x and Y in y.
+
+  Use the "f" key to set the fixed number of decimal places. Use the "s" key to set 
+  the limit for viewing numbers in the "scientific" notation (e.g. 5e+06 for 5000000).
+ 
+  Content of registers #0-#9 are shown below the functions.
+  Store/recall using capital "S"/"R". "M" clears the regs.
+ 
+  Copy/yank the X register to clipboard with "y". Use "Y" to yank all the memory regs.
+
+  You can undo (with "u") all the way to the beginning of the session.
+
+  The 'H' key toggles between the help text in the right pane or a continuous printout.
+  Save the full printout to ~/t-rex.txt with "Ctrl-P".
+
+  The stack, register contents, modes and help text settings are saved on Quit.
+
+  Additionally, you can access the "Ruby mode" via '@'. Here you can address the stack 
+  directly, e.g. 'x = y + (z / t); puts x'. Quit Ruby mode with ESC.
+
+  Alternative keys: Left/Right keys (in addition to "<") exchanges X and Y registers. 
+  Backspace clears the x register.
+HELPTEXT
+  if @hlp
+    @p_hlp.fg = 239
+    @p_hlp.ix = 0
+    @p_hlp.puts(help)
+  else
+    @p_hlp.ix = @history.length - @h + 3
+    histprint
   end
 end
-class Stack
+
+class Stack # STACK class
   attr_accessor :x, :y, :z, :t, :l, :deg
 
   def initialize(x, y, z, t, l)
@@ -227,13 +225,21 @@ class Stack
   end
   def asin
     self.l = self.x
-    self.x = Math::asin(self.x)
-    self.x = self.x * 180 / Math::PI if self.deg 
+    begin
+      self.x = Math::asin(self.x)
+      self.x = self.x * 180 / Math::PI if self.deg 
+    rescue
+      return "Error"
+    end
   end
   def acos
     self.l = self.x
-    self.x = Math::acos(self.x)
-    self.x = self.x * 180 / Math::PI if self.deg 
+    begin
+      self.x = Math::acos(self.x)
+      self.x = self.x * 180 / Math::PI if self.deg 
+    rescue
+      return "Error"
+    end
   end
   def atan
     self.l = self.x
@@ -268,7 +274,7 @@ class Stack
   end
 end
 
-begin # BASIC SETUP
+begin # BASIC setup
   @stk = Stack.new(0, 0, 0, 0, 0)
   @reg = %w[0 0 0 0 0 0 0 0 0 0] 
   @fix = 4
@@ -280,58 +286,93 @@ begin # BASIC SETUP
   load(Dir.home+'/.t-rex.conf') if File.exist?(Dir.home+'/.t-rex.conf')
   @mod == "Deg" ? @stk.deg = true : @stk.deg = false
 
-  @history = [""]
+  @history = [" "]
+  @u    = []
+  @undo = false
+end
+
+begin # PANE setup
+  @h, @w = IO.console.winsize
+
+  #  pane = Rcurses::Pane.new(  x,  y,   width,  height,  fg,  bg)
+  @p_bck  = Rcurses::Pane.new(  1,  1,      @w,      @h, 235, 235) # Back
+  @p_inf  = Rcurses::Pane.new(  2,  2,      32,       1, 168, 238) # Info-line
+  @p_lbl  = Rcurses::Pane.new(  2,  3,       1,       5, 250, 238) # LTZYX lables
+  @p_key  = Rcurses::Pane.new(  2,  9,      32,      11,   0,   0) # Key panel
+  @p_reg  = Rcurses::Pane.new(  2, 21,      32, @h - 21, 242,   0) # Regs
+  @p_hlp  = Rcurses::Pane.new( 35,  2, @w - 35, @h -  2, 239,   0) # Help
+  @p_l    = Rcurses::Pane.new(  4,  3,      30,       1,  60, 235) # L
+  @p_t    = Rcurses::Pane.new(  4,  4,      30,       1,  68, 233) # T
+  @p_z    = Rcurses::Pane.new(  4,  5,      30,       1,  75, 233) # Z
+  @p_y    = Rcurses::Pane.new(  4,  6,      30,       1, 117, 233) # Y
+  @p_x    = Rcurses::Pane.new(  4,  7,      30,       1,   7,   0) # X
+
+  @p_lbl.align = "r"
+  @p_l.align   = "r"
+  @p_t.align   = "r"
+  @p_z.align   = "r"
+  @p_y.align   = "r"
+  @p_x.align   = "r"
+
+  @p_lbl.text  = "ltzyx".i
+
+  class String
+    def t ; self.fg(111) ; end
+    def k ; self.fg(214) ; end
+    def s ; self.fg(242) ; end
+  end
 
-  Curses.init_screen
-  Curses.start_color
-  Curses.curs_set(0)
-  Curses.noecho
-  Curses.cbreak
-  Curses.stdscr.keypad = true
+  keys  = "\n"
+  keys += " r".t + "↓".k + " r".t + "↑".k + " x".t + "<".k + ">y".t
+  keys += " + - * / \\ %".k + " c".t + "h".k + "s".t + " p".k + "i".t
+  keys += "\n\n"
+  keys += " y√x  x^2 x^3  e^x 10^x  redrw".s
+  keys += "\n"
+  keys += " y".t + "^".k + "x".t + "  1/".t + "x".k + " s".t + "q".k + "rt".t 
+  keys += " l".t + "n".k + "  lo".t + "g".k + "   l".k + "astx".t
+  keys += "\n\n"
+  keys += " asin acos atan  R→P P→R  cstk".s
+  keys += "\n"
+  keys += "  s".t + "i".k + "n".t + "  c".t + "o".k + "s".t + "  t".t + "a".k + "n".t
+  keys += "  r".k + "ad".t + " d".k + "eg".t + "  c".k + "lx".t
+  keys += "\n\n"
+  keys += " S".k + "to".t + " R".k + "cl".t + " s".k + "ci".t + " f".k + "ix".t
+  keys += " u".k + "ndo".t + " H".k + "lp".t + " Q".k + "uit".t  
+  @p_key.text = keys
 end
 
 # FUNCTIONS
-def getchr # PROCESS KEY PRESSES
-  c = STDIN.getch
-  case c
-  when "\e"    # ANSI escape sequences
-    case $stdin.getc
-    when '['   # CSI
-      case $stdin.getc
-      when 'A' then chr = "UP"
-      when 'B' then chr = "DOWN"
-      when 'C' then chr = "RIGHT"
-      when 'D' then chr = "LEFT"
-      when 'Z' then chr = "S-TAB"
-      when '2' then chr = "INS"    ; STDIN.getc
-      when '3' then chr = "DEL"    ; STDIN.getc
-      when '5' then chr = "PgUP"   ; STDIN.getc
-      when '6' then chr = "PgDOWN" ; STDIN.getc
-      when '7' then chr = "HOME"   ; STDIN.getc
-      when '8' then chr = "END"    ; STDIN.getc
-      end
+def history(entry)
+  @history.push(entry.b, "  #{@stk.t}".i, "  #{@stk.z}".i, "  #{@stk.y}".i, "  #{@stk.x}".i.b, " ")
+end
+def histprint
+  print = @history.join("\n ")
+  @p_hlp.ix = 0 if @p_hlp.ix < 0
+  @p_hlp.fg = 145
+  @p_hlp.puts(print)
+  return print
+end
+def num_format(n) # THE NUMBER FORMAT FUNCTION
+  if n.abs >= 10 ** @sci.to_i
+    n = "%.#{@sci}g" % n
+  elsif n.abs <= 10 ** (1 / @sci.to_i) and n > 10
+    n = "%.#{@sci}g" % n
+  else
+    n = n.round(@fix)
+    n = "%.#{@fix}f" % n
+    m = n[/^-/]
+    m = "" if m == nil
+    n.sub!(/-/, '')
+    i = n[/\d*/]
+    i.gsub!(/(\d)(?=(\d\d\d)+(?!\d))/, "\\1,")
+    f = n.sub(/\d*\.(\d*)/, '\1')
+    n = m + i + "." + f
+    if not @dot
+      n.gsub!(/,/, ' ')
+      n.sub!(/\./, ',')
     end
-  when "", "" then chr = "BACK"
-  when "" then chr = "WBACK"
-  when "" then chr = "LDEL"
-  when "" then chr = "C-X"
-  when "" then chr = "C-Q"
-  when "" then chr = "C-N"
-  when "" then chr = "C-G"
-  when "" then chr = "C-L"
-  when "	" then chr = "C-I"
-  when "" then chr = "C-O"
-  when "
" then chr = "C-A"
-  when "" then chr = "C-R"
-  when "" then chr = "C-D"
-  when "" then chr = "C-C"
-  when "" then chr = "C-T"
-  when "" then chr = "C-^"
-  when "\r" then chr = "ENTER"
-  when "\t" then chr = "TAB"
-  when /./  then chr = c
-  end
-  return chr
+  end
+  return n
 end
 def main_getkey(c) # GET KEY FROM USER
   c == "" ? chr = getchr : chr = c
@@ -339,86 +380,121 @@ def main_getkey(c) # GET KEY FROM USER
   when 'ENTER'
     @stk.l = @stk.x
     @stk.y, @stk.z, @stk.t = @stk.x, @stk.y, @stk.z
+    history("ENTER")
   when "'"
     @dot = !@dot
   when 'UP'   # Roll stack up
     @stk.rup
+    history("↑")
   when 'DOWN' # Roll stack down
     @stk.rdn
+    history("↓")
   when '<', 'LEFT', 'RIGHT' # x<>y
     @stk.xy
+    history("x<>y")
   when '+'
     @stk.add
+    history("+")
   when '-'
     @stk.subtract
+    history("-")
   when '*'
     @stk.multiply
+    history("*")
   when '/'
     e = @stk.divide
+    history("/")
     error ("Error: Divide by zero") if e == "Error"
   when '\\'   # \ (modulo)
     @stk.mod
+    history("MOD")
   when '%'    # 100*x/y
     e = @stk.percent
+    history("%")
     error ("Error: Divide by zero") if e == "Error"
   when 'h'    # Change sign
     @stk.chs
+    history("chs")
   when 'p'    # pi
     @stk.l = @stk.x
     @stk.pi
+    history("pi")
   when '^'    # y^x
     @stk.pow
+    history("y^x")
   when 'C-^'  # y^(1/x)
     e = @stk.root 
+    history("y^(1/x)")
     error ("Error: Divide by zero") if e == "Error"
   when 'x'    # 1/x
     e = @stk.recip
+    history("1/x")
     error ("Error: Divide by zero") if e == "Error"
   when 'C-X'  # x^2
     @stk.sqr  
+    history("x^2")
   when 'q'    # Square root
     e = @stk.sqrt
+    history("sqrt")
     error ("Error: Imaginary number") if e == "Error"
   when 'C-Q'  # x^3
     @stk.cube
+    history("x^3")
   when 'n'    # ln(x)
     e = @stk.ln
+    history("ln")
     error ("Error: Negative x") if e == "Error"
   when 'C-N'  # e^x
     @stk.ex
+    history("e^x")
   when 'g'    # log(x)
     e = @stk.log
+    history("log")
     error ("Error: Negative x") if e == "Error"
   when 'C-G'  # 10^x
     @stk.tenx
+    history("10^x")
   when 'l'    # Recall Lastx (l) to x
     @stk.lift
     @stk.x = @stk.l
-  when 'C-L'  # Break/redraw
-    @break = true
+    history("lastx")
+  when 'C-L'  # Redraw
+    refresh
   when 'i'
     @stk.sin
-  when 'C-I'
-    @stk.asin
+    history("sin")
+  when 'TAB' # Same as 'C-I'
+    e = @stk.asin
+    history("asin")
+    error ("Error: Number out of domain") if e == "Error"
   when 'o'
     @stk.cos
+    history("cos")
   when 'C-O'
-    @stk.acos
+    e = @stk.acos
+    history("acos")
+    error ("Error: Number out of domain") if e == "Error"
   when 'a'
     @stk.tan
+    history("tan")
   when 'C-A'
     @stk.atan
+    history("atan")
   when 'r'     # Rad mode
     @mod     = "Rad"
     @stk.deg = false
+    history("Rad")
   when 'C-R'   # R->P
     e = @stk.rp
+    history("R->P")
     error ("Error: Divide by zero") if e == "Error"
   when 'd'     # Deg mode
     @mod     = "Deg"
     @stk.deg = true
+    history("Deg")
   when 'C-D'   # P->R
     @stk.pr
+    history("P->R")
   when 'c', 'BACK'
     @stk.x = 0
   when 'C-C'   # Clear stack
@@ -427,59 +503,62 @@ def main_getkey(c) # GET KEY FROM USER
     @stk.z = 0
     @stk.t = 0
     @stk.l = 0
+    history("CLR")
   when 'M'
     @reg = %w[0 0 0 0 0 0 0 0 0 0] 
   when 'S' # Store to Reg
-    @w_x.clr
-    @w_x.p(" Store x in Reg #(0-9)")
+    @p_x.puts(" Store x in Reg #(0-9)")
     r = getchr
     if r =~ /[0-9]/
       @reg[r.to_i] = @stk.x
     end
+    history("STO #{r}")
   when 'R'  # Recall from Reg
-    @w_x.clr
-    @w_x.p(" Recall from Reg #(0-9)")
+    @p_x.puts(" Recall from Reg #(0-9)")
     r = getchr
     if r =~ /[0-9]/
       @stk.lift
       @stk.x = @reg[r.to_i].to_f
     end
+    history("RCL #{r}")
   when 's'     # Set Sci size/limit
-    @w_x.clr
-    @w_x.p(" Sci notation limit (2-9)")
-    r = getchr
-    if r =~ /[2-9]/
-      @sci = r.to_i
+    @p_x.puts(" Sci notation limit (2-9)")
+    s = getchr
+    if s =~ /[2-9]/
+      @sci = s.to_i
     end
+    history("Sci #{s}")
   when 'f'     # Set Fix size
-    @w_x.clr
-    @w_x.p(" Fixed decimals (0-9)")
-    r = getchr
-    if r =~ /[0-9]/
-      @fix = r.to_i
+    @p_x.puts(" Fixed decimals (0-9)")
+    f = getchr
+    if f =~ /[0-9]/
+      @fix = f.to_i
     end
+    history("Fix #{f}")
   when 'u'     # Undo
     unless @u.empty?
       @stk = @u.last.dup
       @u.pop
       @undo = true
     end
+    history("UNDO")
   when 'y'
     begin
-      @w_x.color = 7
-      @w_x.fill
+      @p_x.bg = 250
+      @p_x.refresh
       system("echo '#{@stk.x}' | xclip")
       sleep(0.1)
-      @w_x.color = 6
+      @p_x.bg = 0
+      @p_x.refresh
     rescue
-      @w_x.clr
-      @w_x.p(" Install xclip to yank")
+      @p_x.text = " Install xclip to yank"
+      @p_x.refresh
       getchr
     end
   when 'Y'
     begin
-      @w_x.color = 5
-      @w_x.fill
+      @p_x.bg = 244
+      @p_x.refresh
       mem = ""
       10.times do |i|
         reg = @reg[i]
@@ -487,142 +566,74 @@ def main_getkey(c) # GET KEY FROM USER
       end
       system("echo '#{mem}' | xclip")
       sleep(0.1)
-      @w_x.color = 6
+      @p_x.bg = 0
+      @p_x.refresh
     rescue
-      @w_x.clr
-      @w_x.p(" Install xclip to yank")
+      @p_x.text = " Install xclip to yank"
+      @p_x.refresh
       getchr
     end
-  when 'H'
+  when 'H' # Toggle help/histprint
     @hlp = !@hlp
-    @w_hlp.fill
-    help if @hlp
-  when '@'     # Ruby console
-    @w_hlp.fill
-    console(" Ruby: ")
-    @w_hlp.fill
-    help if @hlp
-  when 'Q'     # Exit 
+  when 'C-B'
+    if !@hlp
+      loop do
+        @p_hlp.ix -= @h + 3
+        histprint
+        break if getchr != 'C-B'
+      end
+    end
+  when 'C-P'
+    cont = histprint.pure
+    File.write(Dir.home+'/t-rex.txt', cont)
+    error ("History written to t-rex.txt")
+  when '@' # Ruby console
+    @p_hlp.fg = 168
+    loop do
+      @p_hlp.puts("")
+      @p_hlp.prompt = " Ruby: "
+      @p_hlp.editline
+      Rcurses::Cursor.set(4,36)
+      x = @stk.x
+      y = @stk.y
+      z = @stk.z
+      t = @stk.t
+      l = @stk.l
+      begin
+        eval(@p_hlp.text)
+      rescue
+      end
+      break if getchr == "ESC"
+    end
+    @p_hlp.fg = 239
+    getchr
+    @hlp ? help : @p_hlp.puts("")
+  when 'Q' # QUIT 
     exit 0
-  when /[0-9.,-]/ # Go to entry mode for x
+  when /[0-9.,]/ # Go to entry mode for x
+    @stk.lift
+    pstack
     number, c = entry(chr)
     if number != ""
       @stk.l = @stk.x
       @stk.lift unless @stk.x == 0
       @stk.x = number
     end
-    main_getkey(c) if %w[< + - * / \ % ^ x C-X q C-Q n C-N g C-G i C-I o C-O a C-A c C-C].include?(c)
-  end
-end
-def console(pretext) # A SIMPLE READLINE-LIKE ROUTINE
-  Curses.curs_set(1)
-  Curses.echo
-  @w_hlp.color = 9
-  stk = 0
-  pos = @history[stk].length
-  @w_hlp.setpos(0,0)
-  chr = ""
-  while chr != "C-C"
-    @w_hlp.setpos(@w_hlp.cury,0)
-    text = pretext + @history[stk]
-    text += " " * (@w_hlp.maxx - text.length) if text.length < @w_hlp.maxx
-    @w_hlp.p(text)
-    @w_hlp.setpos(0,pretext.length + pos)
-    @w_hlp.refresh
-    chr = getchr
-    case chr
-    when 'UP'
-      unless stk == @history.length - 1
-        stk += 1 
-        pos = @history[stk].length
-      end
-    when 'DOWN'
-      unless stk == 0
-        stk -= 1 
-        pos = @history[stk].length
-      end
-    when 'RIGHT'
-      pos += 1 unless pos > @history[stk].length
-    when 'LEFT'
-      pos -= 1 unless pos == 0
-    when 'HOME'
-      pos = 0
-    when 'END'
-      pos = @history[stk].length
-    when 'DEL'
-      @history[stk][pos] = ""
-    when 'BACK'
-      unless pos == 0
-        pos -= 1
-        @history[stk][pos] = ""
-      end
-    when 'WBACK'
-      unless pos == 0
-        until @history[stk][pos - 1] == " " or pos == 0
-          pos -= 1
-          @history[stk][pos] = ""
-        end
-        if @history[stk][pos - 1] == " "
-          pos -= 1
-          @history[stk][pos] = ""
-        end
-      end
-    when 'LDEL'
-      @history[stk] = ""
-      pos = 0
-    when /^.$/
-      @history[stk].insert(pos,chr)
-      pos += 1
-    when 'ENTER'
-      @w_hlp.fill
-      @w_hlp.p(text)
-      @w_hlp.setpos(0,pretext.length + pos)
-      @w_hlp.refresh
-      @w_hlp.p("\n ")
-      curstr = @history[stk]
-      @history.uniq!
-      @history.compact!
-      @history.delete("")
-      begin
-        x = @stk.x
-        y = @stk.y
-        z = @stk.z
-        t = @stk.t
-        l = @stk.l
-        eval(curstr)
-        @stk.x = x
-        @stk.y = y
-        @stk.z = z
-        @stk.t = t
-        @stk.l = l
-        @w_hlp.p("\n\n")
-        pstack
-      rescue StandardError => e
-        @w_hlp.p("\n Error: #{e.inspect}\n")
-      end
-      @history.unshift("")
-      stk = 0
-      pos = @history[stk].length
-      chr = ""
-      @w_hlp.setpos(0,0)
+    history(number.to_s)
+    @stk.drop if c == "ENTER"
+    if %w[< + - * / \ % ^ x C-X q C-Q n C-N g C-G i C-I o C-O a C-A c C-C].include?(c)
+      @stk.drop
+      main_getkey(c)
     end
   end
-  @w_hlp.color = 11
-  Curses.curs_set(0)
-  Curses.noecho
 end
-def entry(chr)
-  Curses.curs_set(1)
-  Curses.echo
+def entry(chr) # X REGISTER ENTRY
   num = chr
   pos = 1
-  @w_x.color = 7
+  Rcurses::Cursor.set(7,33)
+  Rcurses::Cursor.show
   while %w[0 1 2 3 4 5 6 7 8 9 . , h RIGHT LEFT HOME END DEL BACK WBACK LDEL].include?(chr)
-    @w_x.clr
-    @w_x.setpos(0,0)
-    @w_x.p(num)
-    @w_x.setpos(0,pos)
-    @w_x.refresh
+    @p_x.puts(num)
     chr = getchr
     case chr
     when 'RIGHT'
@@ -634,12 +645,15 @@ def entry(chr)
     when 'END'
       pos = num.length
     when 'DEL'
-      num[pos] = ""
-    when 'BACK'
       unless pos == 0
         pos -= 1
         num[pos] = ""
       end
+    when 'BACK'
+      unless pos == 0
+        pos -= 1
+        num[pos - 1] = ""
+      end
     when 'WBACK'
       unless pos == 0
         until num[pos - 1] == " " or pos == 0
@@ -666,134 +680,47 @@ def entry(chr)
       num.insert(pos,chr)
       pos += 1
     end
+    Rcurses::Cursor.col(33 - num.length + pos)
   end
   num = "" if %w[DOWN UP].include?(chr)
   num.gsub!(/,/, '.')
   num != "" ? number = num.to_f : number = ""
-  Curses.curs_set(0)
-  Curses.noecho
-  @w_x.color = 6
+  Rcurses::Cursor.hide
   return number, chr
 end
-def num_format(n)
-  if n.abs >= 10 ** @sci.to_i
-    n = "%.#{@sci}g" % n
-  elsif n.abs <= 10 ** (1 / @sci.to_i) and n > 10
-    n = "%.#{@sci}g" % n
-  else
-    n = n.round(@fix)
-    n = "%.#{@fix}f" % n
-    m = n[/^-/]
-    m = "" if m == nil
-    n.sub!(/-/, '')
-    i = n[/\d*/]
-    i.gsub!(/(\d)(?=(\d\d\d)+(?!\d))/, "\\1,")
-    f = n.sub(/\d*\.(\d*)/, '\1')
-    n = m + i + "." + f
-    if not @dot
-      n.gsub!(/,/, ' ')
-      n.sub!(/\./, ',')
-    end
-  end
-  return n
+def refresh # REFRESH ALL PANES
+  @p_bck.refresh
+  @p_inf.refresh
+  @p_lbl.refresh
+  @p_key.refresh
+  @p_reg.refresh
+  help
+  @p_l.refresh  
+  @p_t.refresh  
+  @p_z.refresh  
+  @p_y.refresh  
+  @p_x.refresh  
 end
-def pstack
-  x = num_format(@stk.x)
-  y = num_format(@stk.y)
-  z = num_format(@stk.z)
-  t = num_format(@stk.t)
-  l = num_format(@stk.l)
-  @w_l.setpos(0,0)
-  @w_l.p(l.rjust(30))
-  @w_yzt.setpos(0,0)
-  @w_yzt.p(t.rjust(30) + z.rjust(30) + y.rjust(30))
-  @w_x.setpos(0,0)
-  @w_x.p(x.rjust(30))
+def pstack # PRINT STACK (XYZTL)
+  @p_l.puts(num_format(@stk.l))  
+  @p_t.puts(num_format(@stk.t))  
+  @p_z.puts(num_format(@stk.z))  
+  @p_y.puts(num_format(@stk.y))  
+  @p_x.puts(num_format(@stk.x).b)  
 end
-def pregs
-  @w_reg.setpos(1,0)
+def pregs # PRINT CONTENT OF REGS (0-9)
+  @p_reg.text = "\n"
   10.times do |i| 
     r = num_format(@reg[i].to_f)
-    @w_reg.p(" R##{i}" + "#{r}".rjust(27) + " ")
+    @p_reg.text += " R##{i}".i + "#{r}".rjust(27) + "\n" 
   end
+  @p_reg.refresh
 end
-def error(err)
-  @w_x.clr
-  @w_x.p(err.rjust(30))
+def error(err) # PRINT ERRORS TO X
+  @p_x.puts(err)
+  @history.insert(-2, err)
   getchr
 end
-def cmd
-text = <<CMDTEXT
- 
- r|↓| r|↑| x|<|>y  |+| |-| |*| |/| |\\| |%| c|h|s |p|i
- y√x  x^2 x^3  e^x 10^x  redrw
- y|^|x  1/|x| s|q|rt l|n|  lo|g|   |l|astx
- asin acos atan  R→P P→R  cstk
-  s|i|n  c|o|s  t|a|n  |r|ad |d|eg  |c|lx
-
- |S|to |R|cl |s|ci |f|ix |u|ndo |H|lp |Q|uit  
-CMDTEXT
-  text = text.split("\n")
-  text.each_with_index do |t,i|
-    if i.even?
-      @w_cmd.color = 8
-      @w_cmd.p(t)
-    else
-      t = t.split("|")
-      t.each_with_index do |c,j|
-        if j.even?
-          @w_cmd.color = 9
-          @w_cmd.p(c)
-        else
-          @w_cmd.color = 10
-          @w_cmd.p(c)
-        end
-      end
-      @w_cmd.p("\n")
-    end
-    @w_cmd.p("\n")
-  end
-end
-def help
-help = <<HELPTEXT
-  
-  T-REX - Terminal Rpn calculator EXperiment. GitHub: https://github.com/isene/T-REX
-  
-  This is a Reverse Polish Notation calculator similar to the traditional Hewlett 
-  Packard calculators. See https://www.hpmuseum.org/rpn.htm for info on RPN.
- 
-  The stack is shown to the top left. The X, Y, Z and  T registers comprise the 
-  operating stack. L is the "Last X" register showing the previous value in X.
-  Toggle US and European number formats by pressing '. 
- 
-  Functions available are shown under the stack registers. The orange symbol 
-  corresponds to the key to be pressed. For functions above each label (grey 
-  functions), press the Control key (Ctrl) and the orange key (asin = Ctrl+i).
-  
-  For Rectangular to Polar conversions:
-  R-P: X value in x, Y in y - yields "θ" in y and "r" in x.
-  P-R: "θ" in y and "r" in x - yeilds X in x and Y in y.
-
-  Use the "f" key to set the fixed number of decimal places. Use the "s" key to set 
-  the limit for viewing numbers in the "scientific" notation (e.g. 5e+06 for 5000000).
- 
-  Content of registers #0-#9 are shown below the functions.
-  Store/recall using capital "S"/"R". "M" clears the regs.
- 
-  Copy/yank the X register to clipboard with "y". Use "Y" to yank all the memory regs.
-
-  You can undo all the way to the beginning of the session.
-
-  The 'H' key toggles the help text in the right pane.
-
-  The stack, register contents, modes and help text settings are saved on Quit.
-
-  Additionally, for a world of possibilities, you can access the "Ruby mode" via '@'.
-  Here you can address the stack directly, e.g. x = y + (z / t). Quit Ruby mode with Ctrl-C.
-
-HELPTEXT
- @w_hlp.p(help)
-end
 def conf_write # WRITE TO .t-rex.conf
   conf  = "@fix = #{@fix}\n"
   conf += "@sci = #{@sci}\n"
@@ -808,73 +735,26 @@ def conf_write # WRITE TO .t-rex.conf
 end
 
 # MAIN PROGRAM
-loop do # OUTER LOOP - (catching refreshes via 'b')
-  @break = false # Initialize @break variable (set if user hits 'b')
-  begin # Create the windows/panels
-    maxx = Curses.cols
-    maxy = Curses.lines
-    init_pair( 1, 235, 235) # stdscr
-    Curses.stdscr.color = 1
-    Curses.stdscr.fill
-    # Curses::Window.new(h,w,y,x)
-    @w_inf = Curses::Window.new( 1, 32, 1, 1)
-    @w_lbl = Curses::Window.new( 5,  2, 2, 1)
-    @w_l   = Curses::Window.new( 1, 30, 2, 3)
-    @w_yzt = Curses::Window.new( 3, 30, 3, 3)
-    @w_x   = Curses::Window.new( 1, 30, 6, 3)
-    @w_cmd = Curses::Window.new(12, 32, 8, 1)
-    @w_reg = Curses::Window.new(maxy - 22, 32, 21, 1)
-    @w_hlp = Curses::Window.new(maxy -  2, maxx - 35, 1, 34)
-
-    init_pair( 2,  88, 238) # @w_inf
-    init_pair( 3,  60, 238) # @w_lbl
-    init_pair( 4, 246, 236) # @w_l
-    init_pair( 5, 250, 234) # @w_yzt
-    init_pair( 6,   7,   0) # @w_x
-    init_pair( 7,   0, 250) # @w_xi
-    init_pair( 8, 242,   0) # @w_cmd ctrl- & @w_reg
-    init_pair( 9, 111,   0) # @w_cmd
-    init_pair(10, 214,   0) # @w_cmd key
-    init_pair(11, 238,   0) # @w_hlp
-
-    @w_inf.color = 2
-    @w_lbl.color = 3
-    @w_l.color   = 4 
-    @w_yzt.color = 5
-    @w_x.color   = 6  
-    @w_x.attr    = Curses::A_BOLD
-    @w_cmd.color = 8
-    @w_cmd.attr  = Curses::A_BOLD
-    @w_reg.color = 8
-    @w_hlp.color = 11
-
-    @w_lbl.p(" L T Z Y X")
-    @w_cmd.fill; cmd
-    @w_reg.fill
-    @w_hlp.fill 
-    help if @hlp
-
-    @u = []
+refresh
+Rcurses::Cursor.hide
+begin # Capture main loop
+  loop do # Main loop
+    @p_inf.puts("  #{@mod} Sci=#{@sci} Fix=#{@fix}".i)
+    pstack
+    pregs
+    @t = @stk.dup
+    main_getkey("") # Get key input from user 
+    help
+    @u.push(@t.dup) if @t != @stk and @undo == false
     @undo = false
-
-    loop do # INNER, CORE LOOP 
-      
-      @w_inf.clr
-      @w_inf.p("  #{@mod} Sci=#{@sci} Fix=#{@fix}".ljust(32))
-      pstack
-      pregs
-      @t = @stk.dup
-      main_getkey("")    # Get key from user 
-      @u.push(@t.dup) if @t != @stk and @undo == false
-      @undo = false
-
-      break if @break    # Break to outer loop, redrawing windows, if user hit 'r'
-      break if Curses.cols != maxx or Curses.lines != maxy # break on terminal resize 
+    h1, w1 = IO.console.winsize
+    if h1 != @h or w1 != @w # Refresh on terminal resize 
+      @h, @w = IO.console.winsize
+      refresh
     end
-  ensure # On exit: close curses, clear terminal 
-    conf_write
-    close_screen
   end
+ensure # Write to .t-rex.conf on exit
+  conf_write
 end
 
 # vim: set sw=2 sts=2 et fdm=syntax fdn=2 fcs=fold\:\ :

metadata

@@ -1,39 +1,39 @@
 --- !ruby/object:Gem::Specification
 name: t-rex
 version: !ruby/object:Gem::Version
-  version: 1.0.6
+  version: '2.0'
 platform: ruby
 authors:
 - Geir Isene
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-12-06 00:00:00.000000000 Z
+date: 2025-03-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: curses
+  name: rcurses
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '2.4'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.3.2
+        version: '2.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '2.4'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.3.2
+        version: '2.4'
 description: 'This is a terminal curses RPN calculator similar to the traditional
   calculators from Hewlett Packard. See https://www.hpmuseum.org/rpn.htm for info
-  on RPN (Reverse Polish Notation). New in 1.0.6: Dropped the ''.rb'' suffix, fixed
-  looping bug'
+  on RPN (Reverse Polish Notation). New in 2.0: Full rewrite with rcurses, face lift,
+  new functionality, bug fixes'
 email: g@isene.com
 executables:
 - t-rex
@@ -46,7 +46,7 @@ licenses:
 - Unlicense
 metadata:
   source_code_uri: https://github.com/isene/t-rex
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -61,8 +61,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
-signing_key: 
+rubygems_version: 3.4.20
+signing_key:
 specification_version: 4
 summary: T-REX - Terminal Rpn calculator EXperiment
 test_files: []