Shuffle some more stuff around, prepare some more for NX.

Shirakumo · Aug 31, 2023 · 294718d · 294718d
1 parent b9e97ff
commit 294718d
Show file tree

Hide file tree

Showing 5 changed files with 39 additions and 34 deletions.
diff --git a/backends/nxgl/context.lisp b/backends/nxgl/context.lisp
@@ -182,6 +182,9 @@
       (unwind-protect (finalize main)
         (nxgl:shutdown)))))
 
+(defun system-username ()
+  (nxgl:username))
+
 (defmacro define-callback (name args &body body)
   `(cffi:defcallback ,name :void ((context :pointer) (user :pointer) ,@args)
      (declare (ignore context user))

diff --git a/main.lisp b/main.lisp
@@ -23,35 +23,13 @@
   (setf +main+ NIL)
   (setf +input-source+ :keyboard))
 
-#+windows
-(cffi:define-foreign-library secur32
-  (T (:default "Secur32")))
-
-(flet ((fallback-username ()
-         (or
-          #+windows
-          (cffi:with-foreign-objects ((size :ulong)
-                                      (name :uint16 128))
-            (unless (cffi:foreign-library-loaded-p 'secur32)
-              (cffi:load-foreign-library 'secur32))
-            (setf (cffi:mem-ref size :ulong) 128)
-            ;; Constant 3 here specifies a "display name".
-            (cond ((< 0 (cffi:foreign-funcall "GetUserNameExW" :int 13 :pointer name :pointer size :int))
-                   (org.shirakumo.com-on:wstring->string name (cffi:mem-ref size :ulong)))
-                  (T
-                   (setf (cffi:mem-ref size :ulong) 128)
-                   (when (< 0 (cffi:foreign-funcall "GetUserNameW" :pointer name :pointer size :int))
-                     (org.shirakumo.com-on:wstring->string name (cffi:mem-ref size :ulong))))))
-          #+unix
-          (cffi:foreign-funcall "getlogin" :string)
-          (pathname-utils:directory-name (user-homedir-pathname)))))
-  (defmethod username ((main main))
-    (fallback-username))
-
-  (defmethod username ((default (eql T)))
-    (if +main+
-        (username +main+)
-        (fallback-username))))
+(defmethod username ((main main))
+  (system-username))
+
+(defmethod username ((default (eql T)))
+  (if +main+
+      (username +main+)
+      (system-username)))
 
 (defmethod scene ((default (eql T)))
   (scene +main+))

diff --git a/os-resources.lisp b/os-resources.lisp
@@ -1,5 +1,27 @@
 (in-package #:org.shirakumo.fraf.trial)
 
+#+windows
+(cffi:define-foreign-library secur32
+    (T (:default "Secur32")))
+
+(defun system-username ()
+  (or #+windows
+      (cffi:with-foreign-objects ((size :ulong)
+                                  (name :uint16 128))
+        (unless (cffi:foreign-library-loaded-p 'secur32)
+          (cffi:load-foreign-library 'secur32))
+        (setf (cffi:mem-ref size :ulong) 128)
+        ;; Constant 3 here specifies a "display name".
+        (cond ((< 0 (cffi:foreign-funcall "GetUserNameExW" :int 13 :pointer name :pointer size :int))
+               (org.shirakumo.com-on:wstring->string name (cffi:mem-ref size :ulong)))
+              (T
+               (setf (cffi:mem-ref size :ulong) 128)
+               (when (< 0 (cffi:foreign-funcall "GetUserNameW" :pointer name :pointer size :int))
+                 (org.shirakumo.com-on:wstring->string name (cffi:mem-ref size :ulong))))))
+      #+unix
+      (cffi:foreign-funcall "getlogin" :string)
+      (pathname-utils:directory-name (user-homedir-pathname))))
+
 (defvar *open-in-browser-hook* (constantly NIL))
 (defun open-in-browser (url)
   (or (funcall *open-in-browser-hook* url)

diff --git a/package.lisp b/package.lisp
@@ -1286,6 +1286,11 @@
    #:update-action-mappings)
   ;; os-resources.lisp
   (:export
+   #:*open-in-browser-hook*
+   #:system-username
+   #:open-in-browser
+   #:open-in-file-manager
+   #:rename-thread
    #:cpu-time
    #:io-bytes
    #:gpu-room
@@ -1579,8 +1584,6 @@
    #:finalize
    #:gl-property
    #:current-time
-   #:open-in-browser
-   #:open-in-file-manager
    #:kw
    #:enlist
    #:unlist
@@ -1604,7 +1607,6 @@
    #:logfile
    #:config-directory
    #:standalone-logging-handler
-   #:rename-thread
    #:make-thread
    #:with-thread
    #:thread-did-not-exit

diff --git a/toolkit.lisp b/toolkit.lisp
@@ -387,10 +387,10 @@
 (defun config-directory (&rest app-path)
   (apply #'pathname-utils:subdirectory
          (or (envvar-directory "TRIAL_CONFIG_HOME")
-             #+(or windows win32)
+             #+windows
              (or (envvar-directory "AppData")
                  (pathname-utils:subdirectory (user-homedir-pathname) "AppData" "Roaming"))
-             #-(or windows win32)
+             #+nx #p"save:/"
              (or (envvar-directory "XDG_CONFIG_HOME")
                  (pathname-utils:subdirectory (user-homedir-pathname) ".config")))
          (or app-path (list +app-vendor+ +app-system+))))