More entry points mapped.

diff --git a/ctopy b/ctopy
index cc0f6742d06ef736080b156d64d2187ed535fccf..1d52ed07d3923a1188851149e7025a6263f456e3 100755 (executable)
--- a/ctopy
+++ b/ctopy
@@ -216,11 +216,11 @@ funmappings = (
      r"\3 = stdscr.getstr(\1, \2)", "curses"),
     (r"\bmvgetstr\(%(arg)s%(arg)s%(farg)s\)",          # NONTRIVIAL
      r"\3 = stdscr.getstr(\1, \2)", "curses"),
-    #                 mvhline                 curs_border(3X)
-    #                 mvhline_set             curs_border_set(3X)
-    #                 mvin_wch                curs_in_wch(3X)
-    #                 mvin_wchnstr            curs_in_wchstr(3X)
-    #                 mvin_wchstr             curs_in_wchstr(3X)
+    (r"\bmvhline\(", r"stdscr.hline(", "curses"),      # NONTRIVIAL
+    #mvhline_set             curs_border_set(3X)
+    #mvin_wch                curs_in_wch(3X)
+    #mvin_wchnstr            curs_in_wchstr(3X)
+    #mvin_wchstr             curs_in_wchstr(3X)
     #                 mvinch                  curs_inch(3X)
     #                 mvinchnstr              curs_inchstr(3X)
     #                 mvinchstr               curs_inchstr(3X)
@@ -279,18 +279,18 @@ funmappings = (
     #                 mvwscanw                curs_scanw(3X)
     #                 mvwvline                curs_border(3X)
     #                 mvwvline_set            curs_border_set(3X)
-    #                 napms                   curs_kernel(3X)
-    #                 newpad                  curs_pad(3X)
-    #                 newterm                 curs_initscr(3X)
-    #                 newwin                  curs_window(3X)
-    #                 nl                      curs_outopts(3X)
-    #                 nocbreak                curs_inopts(3X)
-    #                 nodelay                 curs_inopts(3X)
-    #                 noecho                  curs_inopts(3X)
-    #                 nonl                    curs_outopts(3X)
-    #                 noqiflush               curs_inopts(3X)
-    #                 noraw                   curs_inopts(3X)
-    #                 notimeout               curs_inopts(3X)
+    (r"\bnapms\(", r"curses.napms(", "curses"),
+    (r"\bnewpad\(", r"curses.newpad(", "curses"),
+    #newterm                 curs_initscr(3X)
+    (r"\bnewwin\(", r"curses.newwin(", "curses"),
+    (r"\bnl\(", r"curses.nl(", "curses"),
+    (r"\bnocbreak\(", r"curses.nocbreak(", "curses"),
+    (r"\bnodelay\(", r"curses.nodelay(", "curses"),
+    (r"\bnoecho\(", r"curses.noecho(", "curses"),
+    (r"\bnonl\(", r"curses.nonl(", "curses"),
+    (r"\bnoqiflush\(", r"curses.noqiflush(", "curses"),
+    (r"\bnoraw\(", r"curses.noraw(", "curses"),
+    (r"\bnotimeout\(", r"curses.notimeout(", "curses"),
     #                 overlay                 curs_overlay(3X)
     #                 overwrite               curs_overlay(3X)
     #                 pair_content            curs_color(3X)
@@ -300,8 +300,8 @@ funmappings = (
     #                 printw                  curs_printw(3X)
     #                 putp                    curs_terminfo(3X)
     #                 putwin                  curs_util(3X)
-    #                 qiflush                 curs_inopts(3X)
-    #                 raw                     curs_inopts(3X)
+    (r"\bqiflush\(", r"curses.qiflush(", "curses"),
+    (r"\braw\(", r"curses.raw(", "curses"),
     #                 redrawwin               curs_refresh(3X)
     #                 refresh                 curs_refresh(3X)
     #                 reset_prog_mode         curs_kernel(3X)
@@ -356,9 +356,9 @@ funmappings = (
     #                 tgetnum                 curs_termcap(3X)
     #                 tgetstr                 curs_termcap(3X)
     #                 tgoto                   curs_termcap(3X)
-    #                 tigetflag               curs_terminfo(3X)
-    #                 tigetnum                curs_terminfo(3X)
-    #                 tigetstr                curs_terminfo(3X)
+    (r"\btigetflag\(", r"curses.tigetflag(", "curses"),
+    (r"\btigetnum\(", r"curses.tigetnum(", "curses"),
+    (r"\btigetstr\(", r"curses.tigetstr(", "curses"),
     #                 timeout                 curs_inopts(3X)
     #                 touchline               curs_touch(3X)
     #                 touchwin                curs_touch(3X)
@@ -429,9 +429,9 @@ funmappings = (
     #                 wgetstr                 curs_getstr(3X)
     #                 whline                  curs_border(3X)
     #                 whline_set              curs_border_set(3X)
-    #                 win_wch                 curs_in_wch(3X)
-    #                 win_wchnstr             curs_in_wchstr(3X)
-    #                 win_wchstr              curs_in_wchstr(3X)
+    #win_wch                 curs_in_wch(3X)
+    #win_wchnstr             curs_in_wchstr(3X)
+    #win_wchstr              curs_in_wchstr(3X)
     #                 winch                   curs_inch(3X)
     #                 winchnstr               curs_inchstr(3X)
     #                 winchstr                curs_inchstr(3X)
@@ -447,7 +447,7 @@ funmappings = (
     #                 winsstr                 curs_insstr(3X)
     #                 winstr                  curs_instr(3X)
     #                 winwstr                 curs_inwstr(3X)
-    #                 wmouse_trafo            curs_mouse(3X)*
+    #wmouse_trafo            curs_mouse(3X)*
     #                 wmove                   curs_move(3X)
     #                 wnoutrefresh            curs_refresh(3X)
     #                 wprintw                 curs_printw(3X)
@@ -465,7 +465,7 @@ funmappings = (
     #                 wtouchln                curs_touch(3X)
     #                 wunctrl                 curs_util(3X)
     #                 wvline                  curs_border(3X)
-    #                 wvline_set              curs_border_set(3X)
+    #wvline_set              curs_border_set(3X)
     # And this does the curses library constants
     (r"\bA_ATTRIBUTES\b", r"curses.A_ATTRIBUTES", "curses"),
     (r"\bA_NORMAL\b", r"curses.A_NORMAL", "curses"),