Merge branch 'combined-sdl2-ncurses-build' of https://github.com/frejanordsiek/lem into frejanordsiek-combined-sdl2-ncurses-build

Author: cxxxr

Makefile

@@ -12,6 +12,10 @@ rpc:
 	qlot install
 	$(LISP) --noinform --no-sysinit --no-userinit --load .qlot/setup.lisp --load scripts/build-rpc.lisp
 
+sdl2-ncurses:
+	qlot install
+	$(LISP) --noinform --no-sysinit --no-userinit --load .qlot/setup.lisp --load scripts/build-sdl2-ncurses.lisp
+
 test:
 	qlot install
 	.qlot/bin/rove lem-tests.asd

scripts/build-sdl2-ncurses.lisp

@@ -0,0 +1,8 @@
+(ql:quickload :lem-sdl2)
+(ql:quickload :lem-ncurses)
+
+(lem:init-at-build-time)
+
+(sb-ext:save-lisp-and-die "lem"
+                          :toplevel #'lem:main
+                          :executable t)

src/interface.lisp

@@ -20,7 +20,7 @@
     :initarg :window-left-margin
     :reader window-left-margin)))
 
-(defun get-default-implementation (&key (errorp t))
+(defun get-default-implementation (&key (errorp t) (implementation :ncurses))
   (let* ((classes (c2mop:class-direct-subclasses (find-class 'implementation)))
          (class (case (length classes)
                   (0
@@ -31,7 +31,7 @@
                    (first classes))
                   (otherwise
                    (dolist (class classes (first classes))
-                     (when (string= :ncurses (class-name class))
+                     (when (string= implementation (class-name class))
                        (return class)))))))
     (when class
       (make-instance class))))

src/lem.lisp

@@ -10,14 +10,20 @@
 (defvar *syntax-scan-window-recursive-p* nil)
 (defvar *help* "Usage: lem [ OPTION-OR-FILENAME ] ...
 Options:
-        -q, --no-init-file      do not load ~/.lem/init.lisp
-        --slime PORT            start slime on PORT
-        --eval EXPR             evaluate lisp expression EXPR
-        --debug                 enable debugger
-        --log-filename FILENAME file name of the log file
-        --kill                  immediately exit
-        -v, --version           print the version number and exit
-        -h, --help              display this help and exit"
+        -q, --no-init-file        do not load ~/.lem/init.lisp
+        --slime PORT              start slime on PORT
+        --eval EXPR               evaluate lisp expression EXPR
+        --debug                   enable debugger
+        --log-filename FILENAME   file name of the log file
+        --kill                    immediately exit
+        --gui                     to use any available GUI interface
+        --nogui                   to use any available terminal interface
+        --ncurses                 to use ncurses terminal interface
+        --sdl2                    to use SDL2 GUI interface
+        --sdl                     to use any available SDL GUI interface
+        -i, --interface INTERFACE interface to use, either sdl2 or ncurses
+        -v, --version             print the version number and exit
+        -h, --help                display this help and exit"
 "Help output for cli")
 
 (defun syntax-scan-window (window)
@@ -89,7 +95,8 @@ Options:
   args
   (debug nil)
   (log-filename nil)
-  (no-init-file nil))
+  (no-init-file nil)
+  (interface nil))
 
 (defun parse-args (args)
   (let ((parsed-args
@@ -122,6 +129,23 @@ Options:
                                      (error "Please, specify a filename to log to."))
                                    (setf (command-line-arguments-log-filename parsed-args)
                                          filename)))
+                                ((equal arg "--ncurses")
+                                 (setf (command-line-arguments-interface parsed-args) :ncurses))
+                                ((equal arg "--sdl2")
+                                 (setf (command-line-arguments-interface parsed-args) :sdl2))
+                                ((equal arg "--sdl")
+                                 (setf (command-line-arguments-interface parsed-args) :sdl2))
+                                ((equal arg "--gui")
+                                 (setf (command-line-arguments-interface parsed-args) :sdl2))
+                                ((equal arg "--nogui")
+                                 (setf (command-line-arguments-interface parsed-args) :ncurses))
+                                ((member arg '("-i" "--interface") :test #'equal)
+                                 (let ((interface (pop args)))
+                                   (if (and interface (plusp (length interface)))
+                                       (setf (command-line-arguments-interface parsed-args)
+                                             (alexandria:make-keyword (string-upcase interface)))
+                                       (write-line "Please specify an interface to use."
+                                                   *error-output*))))
                                 ((equal arg "--kill")
                                  `(uiop:quit))
                                 ((member arg '("-v" "--version") :test #'equal)
@@ -258,7 +282,14 @@ See scripts/build-ncurses.lisp or scripts/build-sdl2.lisp"
   (cond (*in-the-editor*
          (apply-args args))
         (t
-         (let ((implementation (get-default-implementation :errorp nil)))
+         (let ((implementation
+                (get-default-implementation
+                 :errorp nil
+                 :implementation
+                 (or (command-line-arguments-interface args)
+                     (if (interactive-stream-p *standard-input*)
+                         :ncurses
+                         :sdl2)))))
            (unless implementation
              (maybe-load-systems :lem-ncurses)
              (setf implementation (get-default-implementation)))