X-Git-Url: https://git.korewanetadesu.com/?p=pico8.git;a=blobdiff_plain;f=pico8.el;h=784cea6575d43c5a91a89622e9721861ae76ab96;hp=2597bb3701a4121ea6f75acc56f7bf7a03caede3;hb=823c38ce61401461f03a0b10a8e38441e69befe1;hpb=7c5a210fcfc3290f36482c73bfe17371ada080d2 diff --git a/pico8.el b/pico8.el index 2597bb3..784cea6 100644 --- a/pico8.el +++ b/pico8.el @@ -2,7 +2,7 @@ ;; ;; Author: Joe Wreschnig ;; Package-Version: 20170620 -;; Package-Requires: ((emacs "25") (polymode "20170307") (lua-mode "20151025")) +;; Package-Requires: ((emacs "25") (polymode "20170307") (lua-mode "20151025") (dash "2.12.0")) ;; URL: https://git.korewanetadesu.com/pico8.git ;; Keywords: convenience ;; @@ -24,6 +24,7 @@ (require 'polymode) (require 'lua-mode) (require 'thingatpt) +(require 'dash) (defgroup pico8 nil @@ -31,11 +32,6 @@ :tag "PICO-8" :group 'languages) -(defgroup pico8-faces nil - "Faces for PICO-8 (.p8) cartridge files." - :tag "PICO-8 Faces" - :group 'pico8) - (defcustom pico8-executable-paths '("/Applications/PICO-8.app/Contents/MacOS/pico8" ; macOS "/usr/lib/pico8/pico8" ; PocketCHIP @@ -59,10 +55,10 @@ disabled by setting this to t." (defcustom pico8-lua-indent-level 1 "Default indentation for PICO-8 Lua mode. -This overrides `lua-indent-level' in `pico8-lua-mode'. -`lua-mode''s default indentation is 3, which is both -idiosyncratic and quite large when viewed in the PICO-8 editor, -where the convention is 1." +This overrides ‘lua-indent-level’ in ‘pico8-lua-mode’. ‘lua-mode’ +uses a default indentation is 3, which is both idiosyncratic and +quite large when viewed in the PICO-8 editor, where the +convention is 1." :group 'pico8 :tag "PICO-8 Lua Indent Level") @@ -88,10 +84,9 @@ where the convention is 1." (defconst pico8-data-characters (append "0123456789abcdef" nil)) -(defface pico8-data-face +(defface pico8-data '((t (:inherit fixed-pitch))) - "Face for PICO-8 binary data." - :group 'pico8-faces) + "Face for PICO-8 binary data.") (define-derived-mode pico8-data-mode fundamental-mode "PICO-8 Data" @@ -109,13 +104,13 @@ insert the typed character if it is one of these characters, overwriting one of these characters." (interactive "P") (when (memq (char-after) pico8-data-characters) - (let ((overwrite-mode t)) + (let ((overwrite-mode 'overwrite-mode-textual)) (self-insert-command (prefix-numeric-value n))))) (let ((map pico8-data-mode-map)) (suppress-keymap map) - (dolist (c pico8-data-characters) - (define-key map (format "%c" c) 'pico8-data-self-insert-command))) + (dolist (c (mapcar #'char-to-string pico8-data-characters)) + (define-key map c 'pico8-data-self-insert-command))) (defun pico8-goto-char (position) "Set point to POSITION, a number. @@ -130,7 +125,7 @@ widened if necessary to reach it." "Look up the PICO-8 executable." (or (car (delete nil (mapcar 'executable-find pico8-executable-paths))) (error "The PICO-8 executable could not be found. -Make sure it is installed, and present in `pico8-executable-paths'"))) +Make sure it is installed, and present in ‘pico8-executable-paths’"))) (defun pico8--create-output-buffer () "Create and return a buffer for PICO-8 output." @@ -271,48 +266,22 @@ Make sure it is installed, and present in `pico8-executable-paths'"))) (error "Valid flag numbers are 0 to 255, inclusive")) (+ (* 2 flag) (if (> flag 128) 1 0))) -(defgroup pico8-pixel-faces nil - "Font faces to use for PICO-8 pixels. - -Rather than customizing each directly, you'll probably just want -to change `pico8-pixel-face'." - :tag "PICO-8 Pixel Faces" - :group 'pico8-faces) - -(defface pico8-pixel-face - '((t (:inherit pico8-data-face :height 100))) - "Face for PICO-8 sprite 'pixels'." - :group 'pico8-faces) - -(dotimes (i (length pico8-colors)) - (let ((c (nth i pico8-colors))) - (eval `(defface ,(intern (format "pico8-pixel-%x" i)) - '((t (:inherit pico8-pixel-face :foreground ,c))) - ,(format "Face for PICO-8 sprite 'pixel' %x" i) - :group 'pico8-pixel-faces - :tag ,(format "Face for PICO-8 sprite 'pixel' %x." i))))) +(defface pico8-pixel + '((t (:inherit pico8-data :height 100))) + "Face for PICO-8 sprite “pixels.”" + :group 'pico8) (defconst pico8-gfx-font-lock-keywords - `(("0+" . 'pico8-pixel-0) - ("1+" . 'pico8-pixel-1) - ("2+" . 'pico8-pixel-2) - ("3+" . 'pico8-pixel-3) - ("4+" . 'pico8-pixel-4) - ("5+" . 'pico8-pixel-5) - ("6+" . 'pico8-pixel-6) - ("7+" . 'pico8-pixel-7) - ("8+" . 'pico8-pixel-8) - ("9+" . 'pico8-pixel-9) - ("a+" . 'pico8-pixel-a) - ("b+" . 'pico8-pixel-b) - ("c+" . 'pico8-pixel-c) - ("d+" . 'pico8-pixel-d) - ("e+" . 'pico8-pixel-e) - ("f+" . 'pico8-pixel-f) - - ;; If the \n isn't in the smaller face the line is taller to - ;; accommodate the full sized point at the end-of-line. - ("\n" . 'pico8-pixel-0))) + (cons + ;; If the \n isn't in the smaller face the line is taller to + ;; accommodate the full sized point at the end-of-line. + '("\n" . 'pico8-pixel) + (-map-indexed + (lambda (i c) + `(,(format "%x+" i) + 0 '(:inherit pico8-pixel :foreground ,c))) + pico8-colors))) + (defun pico8-gfx-current-position () "Calculate the sprite and in-sprite position of the cursor." @@ -370,14 +339,14 @@ to change `pico8-pixel-face'." (define-key pico8-gfx-mode-map "q" 'pico8-backward-sprite) (define-key pico8-gfx-mode-map "w" 'pico8-forward-sprite) -(defface pico8-map-tile-face - '((t (:inherit pico8-data-face :height 100))) +(defface pico8-map-tile + '((t (:inherit pico8-data :height 100))) "Face for PICO-8 map 'tiles'." :group 'pico8-faces) (defconst pico8-map-font-lock-keywords - '(("[0-9a-f]+" . 'pico8-map-tile-face) - ("\n" . 'pico8-map-tile-face))) + '(("[0-9a-f]+" . 'pico8-map-tile) + ("\n" . 'pico8-map-tile))) (defun pico8-map-lighter () "Calculate the map tile under the cursor." @@ -454,9 +423,8 @@ this is the numeric literal in the code." (let ((beg (- (point) (% (min 255 (current-column)) 2)))) (string-to-number (buffer-substring beg (+ beg 2)) 16))) - ;; In Lua or other code, the sprite is a numeric literal. - ;; lua-mode doesn't derive from anything. - ((or (derived-mode-p 'lua-mode) (derived-mode-p 'prog-mode)) + ;; In Lua, the sprite is a numeric literal. + ((derived-mode-p 'lua-mode) (pico8--string-to-number (or (word-at-point) ""))) (t nil))) @@ -496,9 +464,6 @@ This function needs a lot of work.." (and (re-search-backward "\\" (- (point) 30) t) (char-after))))) - ;; FIXME: Actually parse something? lua-mode's sexp - ;; commands don't seem too good, and counting parentheses - ;; by hand is for nerds. (cond ((= c ?f) (pico8-goto-flag n)) ((= c ?s) (pico8-goto-sprite n)) (t (error "There's nothing obvious to go to"))))) @@ -539,7 +504,7 @@ This function needs a lot of work.." (flycheck-define-checker pico8-lua "A PICO-8 Lua syntax checker using the Lua compiler. -See URL `http://www.lua.org/'." +See URL ‘http://www.lua.org/'." :command ("luac" "-p" source) :standard-input nil :error-patterns @@ -551,7 +516,7 @@ See URL `http://www.lua.org/'." (flycheck-define-checker pico8-luacheck "A PICO-8 Lua syntax checker using luacheck. -See URL `https://github.com/mpeterv/luacheck'." +See URL ‘https://github.com/mpeterv/luacheck’." :command ("luacheck" "--formatter" "plain" "--codes" ; Show warning codes @@ -568,7 +533,7 @@ See URL `https://github.com/mpeterv/luacheck'." (error line-start (optional (file-name)) ":" line ":" column ":" - ;; `luacheck' before 0.11.0 did not output codes for errors, hence + ;; ‘luacheck’ before 0.11.0 did not output codes for errors, hence ;; the ID is optional here (optional " (" (id "E" (one-or-more digit)) ") ") (message) line-end))