Merge pull request #1733 from snmsts/less-pdcurses-in-ncurses

Less pdcurses in ncurses
lem-project · Jan 4, 2025 · 1b40b1e · 1b40b1e
2 parents 28f62aa + 1ebd45c
commit 1b40b1e
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 11 deletions.
diff --git a/frontends/ncurses/cl-charms-pdcurseswin32.lisp b/frontends/ncurses/cl-charms-pdcurseswin32.lisp
@@ -2,18 +2,12 @@
 
 (in-package :cl-charms/low-level)
 
-(export '(getch
-          color-pair
-          resizeterm
-          *escdelay*
+(export '(*escdelay*
           *pdcurses-version-number*
           *pdcurses-version-info*
           PDC-save-key-modifiers))
 
 ;; add missing definitions
-(defun getch () (wgetch *stdscr*))
-(defun color-pair (n) (logand (ash n 24) #xff000000))
-(setf (fdefinition 'resizeterm) #'resize-term)
 (defvar *escdelay-dummy* 0)
 (define-symbol-macro *escdelay* *escdelay-dummy*)
 

diff --git a/frontends/ncurses/lem-ncurses.asd b/frontends/ncurses/lem-ncurses.asd
@@ -5,7 +5,7 @@
                "lem"
                "lem/extensions")
   :serial t
-  :components (#+win32(:file "cl-charms-pdcurseswin32")
+  :components (#+pdcurses(:file "cl-charms-pdcurseswin32")
                (:file "config")
                (:file "term")
                (:file "clipboard")

diff --git a/frontends/ncurses/ncurses.lisp b/frontends/ncurses/ncurses.lisp
@@ -1,9 +1,8 @@
 (uiop:define-package :lem-ncurses
   (:use :cl)
   (:use-reexport :lem-ncurses/config)
-  (:export :*terminal-io-saved*
-           ;; ncurses-pdcurseswin32.lisp
-           :input-polling-interval))
+  (:export :*terminal-io-saved*))
+
 (in-package :lem-ncurses)
 
 (pushnew :lem-ncurses *features*)