From 88f7ab0e8d99647757d5f12f00039ef6b1157fce Mon Sep 17 00:00:00 2001
From: spy <spyhoodle@gmail.com>
Date: Tue, 15 Mar 2022 15:37:38 +0000
Subject: [PATCH] new structure

---
 .vscode/settings.json                      |   5 --
 core/__pycache__/cursor.cpython-310.pyc    | Bin 311 -> 818 bytes
 core/__pycache__/mode.cpython-310.pyc      | Bin 0 -> 497 bytes
 core/__pycache__/statusbar.cpython-310.pyc | Bin 822 -> 1016 bytes
 core/__pycache__/utils.cpython-310.pyc     | Bin 732 -> 934 bytes
 core/buffer.py                             |   0
 core/cursor.py                             |  26 ++++++++-
 core/mode.py                               |  17 ++++++
 core/statusbar.py                          |  50 ++++++++++--------
 core/utils.py                              |  23 +++++---
 lambda                                     |  58 ++++++++++++---------
 modes/__pycache__/command.cpython-310.pyc  | Bin 1130 -> 1335 bytes
 modes/__pycache__/insert.cpython-310.pyc   | Bin 520 -> 640 bytes
 modes/__pycache__/normal.cpython-310.pyc   | Bin 861 -> 813 bytes
 modes/command.py                           |  50 ++++++++++++------
 modes/insert.py                            |  34 ++++++++----
 modes/normal.py                            |  27 ++++++----
 17 files changed, 195 insertions(+), 95 deletions(-)
 delete mode 100644 .vscode/settings.json
 create mode 100644 core/__pycache__/mode.cpython-310.pyc
 create mode 100644 core/buffer.py
 create mode 100644 core/mode.py

diff --git a/.vscode/settings.json b/.vscode/settings.json
deleted file mode 100644
index c53b90f..0000000
--- a/.vscode/settings.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-    "python.analysis.extraPaths": [
-        "./modes"
-    ]
-}
\ No newline at end of file
diff --git a/core/__pycache__/cursor.cpython-310.pyc b/core/__pycache__/cursor.cpython-310.pyc
index 634fb05f756b5cf9d0c1cfde489707dbbdbbfbd9..e726a47e009dcf09e749e73ebdb70eca9ff79403 100644
GIT binary patch
literal 818
zcmZXS&2G~`5XX1dpD77QrH6zf6p0JIV5t(Es)B^XF_&^mkt)Z#!d9F(-E~7#rKj*9
zaOA{O@Djdq$}4bz|Ev?$f|X`=_O~<Z`Ec3m9Wbo-KjX;{!PqZ4v=<nA3o%cjB$NCL
z8#5`SgPluPdf0{Z&sh|t94`AsHpRY!m=92E#7>1is1Uv39B-WybHI+k+!ph|o`Lx-
z7J$6~3-^rTqt2-ICPkS}Z@uG-li^kE7WrJ!;q~xp>}R=@YJM9WU%VNfyeh`QGB^38
zP<xU^y!IA4pI0#4St-?bradJ4`+1y|GZmY~Dwb*)7s+fQlQ=E4iqmUtO8s)Nsvk7w
zB?VHw<`636T^@>iasTK5_`l}3fVMdwVW2RMW{3gX2-;6sMQ3M##`LL8?HeXN5P#?E
z?|cLJhSs-rvu>KSrAgG`F5R2j`<%-v+fvS3$o<u-_A`}#%Brmc9EsYQB{xv{oEjvP
zDzWWpluwb}G*jvHvU&Ouh@t=KkU!xhuF#KhOzHdkMK<-=7C(ehu{GcDI~4qtuesy{
zoT=b%qWMcAXQX@Z(;cX&d6A~IR7lV_l{Bf=)cSvN(??)^h@oDGqVHHTiX1x;o0%o8
ZI7&?0!opLG^}0}JcCv&*7C!8D{sJ<lp6vht

delta 98
zcmdnQww;MDpO=@50SGo1=p|J%OyrXh;sNqf7*ZHp7@`<bn1UHJnJ4;4G3rcA*Jev$
r0CHI;9*~*%-(Lcxjf0Vg5rkR(7qJ7mewvI$?30<8)!3MTJRSxB%kmMi

diff --git a/core/__pycache__/mode.cpython-310.pyc b/core/__pycache__/mode.cpython-310.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..27c7be4845fc1ce938b56b1f3cd64d4540665aa4
GIT binary patch
literal 497
zcmZvZy-EW?5XblHE=RmHVxgUa%{6Xg8APy8lkS?ZxmhrHn+>~XAP_qrM9aL=wic2%
z5V3G}H5$Qz`OnVIZ)XP94hDUK_PUhQ4JG6yCi})PxkmS=C_sR=#L$`=Rx`tEP6;sJ
zkE9kL#-z%&NRf(%d~TglZOCVHuU!{<jWtHip^5!=7S96x2Hm$PYYOxPJKiyO2plsp
zBprF8Ypgu82fC)?9g`t*4*563{$+Z|T>kXof0?Qn1z{{`7uVS4D0M&Plg75zIUa9I
z6c<;lM8ZO$nr^mKolf<y5(~NSz&9=kP@UQkcYrV6&*ZH&TKdIGf?mp2nJFmQSf^zi
zbFo;t0=d}TAET7Cpd}Uk@-4-@{78`{YE)%)7N7aF$M5u1O#}BNt{sXY^7pO2!fz!$
JjyWPF{{-T#WMTjS

literal 0
HcmV?d00001

diff --git a/core/__pycache__/statusbar.cpython-310.pyc b/core/__pycache__/statusbar.cpython-310.pyc
index bbb0bdda8a6ac8947954366647e118ae1c861fa6..9335a90c4af45eca96dc6f5cd563cca763066be9 100644
GIT binary patch
literal 1016
zcma)5O>YuG7=Gttmn{NCB()edrfG~^<PR95)uX8gZ^VQw%pfSRWM*m8WH{A-VVcmR
ze`&6s_Uf?*^?e6Os281No|*US*>~od&8pQh;5a|)^lK5o4>EQKN8=Sv`w&5aViV|s
z;!1plE>luPxN^llKszol15O8wmd!v$kT~Dqv?~OM3@xnx!p$=!(2{6HhoE8=4ds%l
z68e%Be1j{#<iXl&!3wU|9uYj{O<c~7)SV4SMOAOttJ0PDn<4miID#!5bKD6hhZ0Xw
zJN5fEPxFQCr>2*W^i+2xZgo+@_I-JpDcu`nlgt!!(4vZP!=89K9%M5wDeUENJkdo$
z;Ti$mVVn7AF`sMGj=WT9p87bjSVMVckARf;4(2W{H%~jGY^pnUe$i3-tTRcceU)|w
znL*#Sz31}_ABPq#U9xQ=R9KVOM1$2?UDibt*9tfHFfgDlwj;(3eKP3s6E`_HcF8`<
zC0~lATt*I7%(1mrsE%+V=PTh*_ZD2UoPU-la4i|?xto_qPFyl4H@T?ozjCocUb6e(
zqD>9|{~D}~s8&VTY21SK*SCz@=pi&=!(Ae7>RJIRot*l3q{p8|xgik^$!X}pnxJ%a
zK34gt5a?*f;Rb!2DrIwn$}No5)|Z2Vy?HuD-|ODV`*&}>nCMwM_OZ>C9T>Aue074`
zG6#{@(7>oK89g-Gjvk;9eziJl@CK8=4<zB^fXDKPRao-NJi@HDFo(oT+6KoCCA}aM
Wc#{|SA{P_=l1^ty_5>19Irsx8+|{%I

literal 822
zcma)4&2AGh5FW3+-pwkl5JJ$vfd~*Hmxd#UsDjc9QWXx|0#&tHyWNHT3AR(HwBZuo
z0#$0c@eI5J58x}OJOGzmV4QA5PYAF4>9gmX&*Sk{8ygYe7<}3uzhD4A-Qwz?xOj?F
z-$W1~NDd<qf$#<YOh!bISI`R=7=xh=v+_hLBgHQd*FU~5Td#*zcNiD)APJqM8Scau
z&gVGwJ^`qifGMc(82!JJ8LNHaz4O#vL2Ld61U;iOj+{1}A`coKlwE`QbFv2q?Kj>m
zoV99Jhdy*buqQxa0PpW#`kZ-d7i5hGvY>`@QWN2Cf#5Ya-Z{m3cn2<s@!qmsxL^eS
zYK&j=IjL!*WB=Bnn$F2BsDnoD|DPW70+)xCdzUA!oz{^pxB-o4;5=QG0^Dm1du-v_
zz2FWu9k};U4wj_5z=mV59XPgdFWlp{CCh0cRcxf?u@KrQ%af_nQrjr0@=6^};tcnm
z9qzu|-?KEAWiPT^8=({2PGxqS8tZ?^gh?$cDuF($JU#MFDhoMcSyGjj9c8(+epU+k
zapbQQ-#~S+h~>k6S{1UdC#QWOPx^UWj78i}DusI{Hd8&0)%N7n21*_&sZ;!4LEl3N
z34UJNYm-fKja?@ZjYvcu&`0z!-Jxv~{#JL~E!l9@1m&)*Tz1b>u0N~js)j3Y8v`~R
R;7z8v+;OeaE+vFb`UeSyy3GIp

diff --git a/core/__pycache__/utils.cpython-310.pyc b/core/__pycache__/utils.cpython-310.pyc
index 5950a7f7636455211f423e2d409fd4b4d077c94f..e307307cedfef9107cb2de5d4932d886307a110b 100644
GIT binary patch
literal 934
zcmZ`%&2AGh5cbdhHKeo>ttdi@Rvb{5L-zou3IP)0TBLBx1#Nb$B<gN99Xr5Q=_!2#
zZV0J4@&>#BFX1bvyaFf28xmD*8Ofh#Job$JeXh2*Ta4`Iue5*WG4|U9*G*9HhK7DY
z01SA+O5Wq#`Jxb|?8(NLh1c`I1OJlsd<Y<<IRN>ACDD>jvV>bteHj^=gM5m*!js(9
zUK{mh5skMr^j8Al7h=Y)*o=dC#6TV}SDm6@740#@uLQ^iUwE9|+&L3XHr!<8f?dd&
zG#*5Aek$;}@#pOJx&L<nMsL|VIq!5;Rupx7HXWI`$jUxsuj9iyt}q@a$FU8DYBU&{
zC8sx_gFigB{^t>x;qo4Zme)yOgA70$TydeaZRJ%_;m1ifLhBEd$%j@}2<RwEJR4{O
zI!Eh4W-=R0uqr3U%2QSUVEDi_d6EvRQl)xQr=UKitBa+1g({tzQK63}wG9VV1^rqD
zbU@!H@WeCOk&$eRKpaWjr=?sHtj+lwQ7$O}J`>;AcX3;qe}wxR!mkNu<V?&t$cGGq
z8=`rOyF>^{=IAb&*CK@Py50BP;~3qyLEnL+dg(5FzI!-9rFEQ*>zEiyVssD2kRb8V
zeRp(1V4J|oLXC0Tr6lgS)m?(#mO>;sN<C=UUBRB)?>Cvp<Z4%`B|7{mk0h~oKw%PE
tscYTHW<AF~x+|^vIeMF2*J?WLuqhn9EGw86>Xmy)Q@hRDJfhm|{l9p7#AN^g

literal 732
zcmZvZ&uiN-6vy?;PMRfyZYzu)is@n0ht>Bny202rgY=fmaQsAUYEPb|baQcF(Eb-=
z&>Z(K>AF+?fgN_*lRZiT6X>h2-jko7K2np(h~T)qJ74@}g#7ZG-GMRk7N<Ew0Rprn
z6`fP+JuBIq0S9qM<{SbDaTUNWNj%u%X%bT><k!MZGw!$lMu6)O=R2I{8w$`hZ^=Dr
zDX{0n*K3(~&xob>=r(jCDA_&H@-7oRWcY@xMJud;@RnXN{n7@vWdEE0R|Vp`o!*?x
zWLlO@^m$d-s7$K`q;I0LCQ>^36u*kL6#LX({?KUq2v<j&ICNnOV61jww$er#H_BA0
z^v60av<sHfX1U`^gZ32Tz=g(w$?$kCi)C(I@TCBoyRg=(s;%Q!viV8$q5sWklB-H4
zrfw3D*Gb<}k|`~dl`TqhUN>&AR0<Z2^hC{L6v0mUF(2|V3)u^<pJHeay?=%W^xcEf
zmVGBb*qZI(WgTA8<LwXy)0;u`em46si?pxOvDkVSb3O0@UsoUWfwA`!l=*?w8i7=1
z*<GubCzx?TmpMjj1j>k>P<@03F>%wF4q0E+U!zOyl<<snS7-RTQm`uJg?}C6yBL!p
IMFvNI0SdR7VE_OC

diff --git a/core/buffer.py b/core/buffer.py
new file mode 100644
index 0000000..e69de29
diff --git a/core/cursor.py b/core/cursor.py
index c2ee144..c0b6069 100644
--- a/core/cursor.py
+++ b/core/cursor.py
@@ -1,5 +1,29 @@
 def cursor_mode(mode):
     if mode == "block":
         print("\033[2 q")
+
     elif mode == "line":
-        print("\033[6 q")
\ No newline at end of file
+        print("\033[6 q")
+
+    elif mode == "hidden":
+        print('\033[? 25l')
+
+    elif mode == "visible":
+        print('\033[? 25h')
+
+
+def check_cursor(data):
+    data["cursor_x"] = max(2, data["cursor_x"])
+    data["cursor_x"] = min(data["width"] - 1, data["cursor_x"])
+    data["cursor_y"] = max(0, data["cursor_y"])
+    data["cursor_y"] = min(data["height"] - 3, data["cursor_y"])
+
+    return data
+
+
+def move(stdscr, data):
+    # Calculate a valid cursor position from data
+    data = check_cursor(data)
+
+    # Move the cursor
+    stdscr.move(data["cursor_y"], data["cursor_x"])
diff --git a/core/mode.py b/core/mode.py
new file mode 100644
index 0000000..918464a
--- /dev/null
+++ b/core/mode.py
@@ -0,0 +1,17 @@
+from modes import normal, insert, command
+
+
+def activate(stdscr, data):
+    if data["mode"] == "normal":
+        data["mode_color"] = 6
+        data = normal.activate(stdscr, data)
+
+    elif data["mode"] == "insert":
+        data["mode_color"] = 12
+        data = insert.activate(stdscr, data)
+
+    elif data["mode"] == "command":
+        data["mode_color"] = 6
+        data = command.activate(stdscr, data)
+
+    return data
diff --git a/core/statusbar.py b/core/statusbar.py
index 79d95a5..7101e5e 100644
--- a/core/statusbar.py
+++ b/core/statusbar.py
@@ -1,35 +1,43 @@
 import curses
 
 
-def refresh(stdscr, height, width, mode, colors=None, theme="inverted", icon="λ", file="[No Name]"):
-    if colors is None:
-        colors = [8, 6, 14, 2]
-
-    if theme == "inverted":
-        # Add spaces on either end
-        icon = f" {icon} "
-        mode = f" {mode} "
-        file = f" {file} "
-
-    else:
-        # Subtract one from all colours
-        for index, color in enumerate(colors):
-            colors[index] -= 1
+def themes(data):
+    if data["statusbar_theme"] == "bare":
+        # The theme colors
+        colors = (7, data["mode_color"] - 1, 13, 1)
 
         # Add spaces before each part
-        icon = f" {icon}"
-        mode = f" {mode}"
-        file = f" {file}"
+        icon = f" {data['icon']}"
+        mode = f" {data['mode'].upper()}"
+        file = f" {data['file']}"
 
+    else:
+        # The theme colors
+        colors = (8, data["mode_color"], 14, 2)
+
+        # Add spaces on either end
+        icon = f" {data['icon']} "
+        mode = f" {data['mode'].upper()} "
+        file = f" {data['file']} "
+
+    return colors, icon, mode, file
+
+
+def refresh(stdscr, data):
+    colors, icon, mode, file = themes(data)
     # Render icon
-    stdscr.addstr(height - 2, 0, icon, curses.color_pair(colors[0]) | curses.A_BOLD)
+    stdscr.addstr(data["height"] - 2, 0, icon,
+                  curses.color_pair(colors[0]) | curses.A_BOLD)
 
     # Render mode
-    stdscr.addstr(height - 2, len(icon), mode, curses.color_pair(colors[1]) | curses.A_BOLD)
+    stdscr.addstr(data["height"] - 2, len(icon), mode,
+                  curses.color_pair(colors[1]) | curses.A_BOLD)
 
     # Render file name
-    stdscr.addstr(height - 2, len(icon) + len(mode), file, curses.color_pair(colors[2]) | curses.A_BOLD)
+    stdscr.addstr(data["height"] - 2, len(icon) + len(mode), file,
+                  curses.color_pair(colors[2]) | curses.A_BOLD)
 
     # Rest of the bar
-    stdscr.addstr(height - 2, len(icon) + len(mode) + len(file), " " * (width - (len(icon) + len(mode) + len(file))),
+    stdscr.addstr(data["height"] - 2, len(icon) + len(mode) + len(file),
+                  " " * (data["width"] - (len(icon) + len(mode) + len(file))),
                   curses.color_pair(colors[3]))
diff --git a/core/utils.py b/core/utils.py
index b3c3b2f..8c604c6 100644
--- a/core/utils.py
+++ b/core/utils.py
@@ -1,16 +1,17 @@
 from sys import exit
+from core import cursor
 import curses
 
 
-def goodbye(stdscr, height, width):
+def goodbye(stdscr, data):
     # The prompt message
     prompt = "Really quit lambda? (y or n): "
 
     # Clear the bottom line
-    stdscr.addstr(height-1, 0, " " * (width - 1), curses.color_pair(1))
+    stdscr.addstr(data["height"]-1, 0, " " * (data["width"] - 1), curses.color_pair(1))
     
     # Print the prompt
-    stdscr.addstr(height-1, 0, prompt, curses.color_pair(11))
+    stdscr.addstr(data["height"]-1, 0, prompt, curses.color_pair(11))
 
     # Wait for and capture a key press from the user
     key = stdscr.getch()
@@ -20,9 +21,17 @@ def goodbye(stdscr, height, width):
         exit()
 
     # Clear the bottom line again
-    stdscr.addstr(height-1, 0, " " * (width - 1), curses.color_pair(1))
+    stdscr.addstr(data["height"]-1, 0, " " * (data["width"] - 1), curses.color_pair(1))
 
 
-def error(stdscr, height, error_msg):
-    error_msg = f" ERROR {error_msg}"
-    stdscr.addstr(height-1, 0, error_msg, curses.color_pair(3))
+def error(stdscr, data, error_msg):
+    # Print the error message to the bottom line
+    error_msg = f"ERROR: {error_msg}"
+    stdscr.addstr(data["height"]-1, 0, error_msg, curses.color_pair(3))
+    stdscr.addstr(data["height"]-1, len(error_msg) + 1, "(press any key) ", curses.color_pair(1))
+
+    # Wait for a key to be pressed
+    stdscr.getch()
+
+    # Clear the bottom line
+    stdscr.addstr(data["height"]-1, 0, " " * (data["width"] - 1), curses.color_pair(1))
\ No newline at end of file
diff --git a/lambda b/lambda
index 96c6e2c..f7c2b09 100755
--- a/lambda
+++ b/lambda
@@ -1,8 +1,8 @@
 #!/usr/bin/python
+from core import colors, cursor, mode
 import os
 import curses
-from core import colors, cursor
-from modes import normal
+import argparse
 
 
 def start_screen(stdscr):
@@ -12,7 +12,7 @@ def start_screen(stdscr):
     # Startup text
     title = "λ Lambda"
     subtext = [
-        "A performant, efficient and hackable text editor",
+        "Next generation hackable text editor for nerds",
         "",
         "Type :h to open the README.md document",
         "Type :o <file> to open a file and edit",
@@ -33,39 +33,35 @@ def start_screen(stdscr):
         stdscr.addstr(start_y, start_x, text)
 
 
-def start(stdscr):
+def start(stdscr, file):
     # Initialise data before starting
-    data = {"cursor_y": 0, "cursor_x": 0, "commands": []}
-
-    # Clear and refresh the screen for a blank canvas
-    stdscr.clear()
-    stdscr.refresh()
+    data = {
+            "cursor_y": 0,
+            "cursor_x": 0,
+            "height": 0,
+            "width": 0,
+            "mode": "normal",
+            "icon": "λ",
+            "file": file,
+            "statusbar_theme": "filled"
+    }
 
     # Initialise colors
     colors.init_colors()
 
-    # Load the start screen
-    start_screen(stdscr)
-
     # Change the cursor shape
     cursor.cursor_mode("block")
 
+    # Start the screen
+    start_screen(stdscr)
+
     # Main loop
     while True:
         # Get the height and width of the screen
-        height, width = stdscr.getmaxyx()
+        data["height"], data["width"] = stdscr.getmaxyx()
 
-        # Activate normal mode
-        data = normal.activate(stdscr, height, width, data)
-
-        # Calculate a valid cursor position from data
-        cursor_x = max(2, data["cursor_x"])
-        cursor_x = min(width - 1, cursor_x)
-        cursor_y = max(0, data["cursor_y"])
-        cursor_y = min(height - 3, cursor_y)
-
-        # Move the cursor
-        stdscr.move(cursor_y, cursor_x)
+        # Activate the next mode
+        data = mode.activate(stdscr, data)
 
         # Refresh and clear the screen
         stdscr.refresh()
@@ -73,12 +69,24 @@ def start(stdscr):
 
 
 def main():
+    parser = argparse.ArgumentParser(description="Process some integers.")
+    parser.add_argument("file", metavar="file", type=str, nargs="?",
+                        help="File to open")
+
+    args = parser.parse_args()
+    # Check the file name
+    if args.file:
+        file = args.file
+
+    else:
+        file = "[No Name]"
+
     # Change the escape delay to 25ms
     # Fixes an issue where esc takes too long to press
     os.environ.setdefault("ESCDELAY", "25")
 
     # Initialise the screen
-    curses.wrapper(start)
+    curses.wrapper(start, file)
 
 
 if __name__ == "__main__":
diff --git a/modes/__pycache__/command.cpython-310.pyc b/modes/__pycache__/command.cpython-310.pyc
index 0fb2c77effb0c94f114a77452b84e84160877df1..474b6b80d223968703cec63fa380beeefc433f2e 100644
GIT binary patch
literal 1335
zcmZWp&2Aev5ay8F)k=|MrwCHDDFU@fVF(B!^pZpB7IhT$&yAYK?oR|1#%f7PYwv1h
zE+t3C>g2vcdMOH6$391&pod;~?a8m8Q->?1P+S6>of&e5!*4!rQmK>(j=%qG_I^d}
zA8Tw5ipFO+)B7j{5fG6Wx)9SY1#8oYb(vs-|3bQ4IKsuRBj^EX6s|CWG^i=2+Sik`
z=PTn(bQq<bfZ3(>;P~}$ws58zMMhID$N_$zke@%Avy2Hip{jD~qDE1xX>th}$zXvs
z<X(o}`xyxS4iOIOJHoZrF0KmawT4mDMu|ekej~#Boh?`%4_IxnW8lodsR3=a{ww%M
z4`nQk+Yh5i3d8XZ^1Rkbblo4-r3iJR>Om66{zyEk?<`@b!IZsQw=hT&(VI!*NTm|h
z;Koh0NCRcK@U?HebyR8!YwZuBwlQ+~VRM+ovYC!&O(Cbv$d7x%Z^ns`X>+~x!FXm0
z@}&$WS~?cBcTsTQ)T16ylvSK%C_#zU7^mtjTn=m_Uk?|R0?r)rArLYkbGiv?W}yNB
z2q&!(+g=M5dfA4TTKJ3B%NNA9Njt|bg5SCpO@*rq8NGm8B+o+CCmFr;76ie6h0Orr
z?P6Q7;Y<`U{^^@O%v#hXQMv$>H*(2yS-yb2GbJk1H*8z+1U5%nT&vs?p|ZNi>io^@
zqB`fgoUseYIA(gas&gH&RU;?p!&)n=Jqtj}Z(mk3x`4TJ?IfBx|Ho*RPtdnXPSv}O
zn;qj0WjGk>D}<dWE0*x+a0zwejuI97k>R%4S9fs5Kxqk;C46k0vry>a`9r@K2-zPD
z!{d`E9wp;bmFmg#?B(pdzW2EGr2Y99Uw-xV{x?rM-#+{9`N84$Km7R9i|+eZw)uuM
zwp6YZl<X^+4vp&zk!s{*oJ^6b1E~Xa1{0Oa)KvD{FODAXwe}C5?X}v5MRH`=I2oIw
zU1)a>+s_S4l*s92STIzWZ#<SGd?&|AIBK}6Y_C|cqG}6ZCvw(xrhXKP?si{=xHXy`
ztx27;e<g0(&7L3VaO!JWM=O1Zg3~g)4Yz<YkCxb7%4vyuj03Wsa=1s!^aEyX?$n`*
z+`rA<WArce07DzD;X$Hge*gT1s(a|pOV2lKoNiyCT9vSiotQ-OQ`@D~{-d^u2OcZm
F`4{W9JoNwo

literal 1130
zcmZ8g-ER{)5ck)9ByDn4L89uN5Fqie(y5Vn-~qT3B@K5+Y4~X2jz|b?)^3t!H=Ec_
zN{}O+l>0-P$NP(r{K`}Rg*-9dM5176#xvuYvFGQRyizG6Sa;@o?S6>R7pGiZ1eC`>
z>Q`VKah#$Iw{S*U1UsFiv_(1P>_60E+~Yp%9w)~r3N9f6MZ}hrj`dizV`;sy?xm`k
zFn6?G9_&6)9Z1~=W~gEu9m9Tr-fz#CVI22~tc-k+2uM2`U0{O@He^9D8u`vUqD_m>
zEgnTgQpnN@I(g39QxSRASDLFtTE8oLovyatd5`O^4U;^};sIASSWEvSxdE}uyR~kf
ziJBTtYg|lfX`HorT+4DURBi3LH=No)d=$x83s-{L2F5TWAqg=7suJ=qTgnQUzpEEe
zMgdS!?;ZwJ@r-rQ%==aqCkuv=K^MeePIthAGgm2C=-NUTfPcwZ*aA6>w0GtMHosko
zqTJVk@#gqCDxy94(0CW&0s&^mP(YaR0AlJZ88Vb~nTK->yfnwBbb_SN8!MzC&yR2N
z4RNnqXNP>eJoELYVRLMJh&8L*!E0j&^+AW*E35MbhVI$Cs2Xp9XTjAso8bFOS2;Mn
zfn3F-n^C1H0W|pE`irBZ{pP`?)0X(b$r9hX{2646%S&AObU$t<T%2~gy|aFr4f5eg
zDm|W@f1G~0wg04k(0KaCpMO0&e16n?@$%K{<C8aU|NiG)>-MGVc#EQ+WFZ7noJyg(
z){i+?T3VLn6JfoM&<Plmu~b6Y%3<T(hbQ~>!{e9x^@gRX7+5;YhqmMn8qJf&YfE#<
zi*B$q=|V5Y!=V^(%g*xNAPS`$0qOcex(2a~$2zvOFQ&2tddr){X^*$IPGt|G(&>kF
z8y5Y#Vw)~5j1%3P#9CYfP2B^=2*X=+8*gDkLsF)@gpo2~ATzQ<s$`dfhxZGv;xgR^
z3;8VXLRjQmmgG_tFccFdcfnj#P&iz<+0BexUH=G%WSolM-KQv5$rcK6NH?or0WFUN
AMgRZ+

diff --git a/modes/__pycache__/insert.cpython-310.pyc b/modes/__pycache__/insert.cpython-310.pyc
index a607828477a0503e92f64efb47c3ad23ca1ece08..80f41fa63f17d18bbfa781d076295f05fcd195d7 100644
GIT binary patch
literal 640
zcmY*Wy>8n;4Cehva$Tj!)TL_{p+NNlMp2-<muy~wvv`e-NLIi*8#SOz?besDyA*wr
zyu+=X{0f~)DyWg1!0#yje&qER7gON#_@iF_(g1(t=lNk9d}0Y#3<#)N=+r`WdZ87d
zM)MsO1}$cMTg<PaDoz{;l}@ihba5M&j#A!iDfHAxwf{$S#qyaYScU;OTg`t<u0<DJ
zGIxGY;u_)aRlVvvUx)jBjeb|Ru3Mt3yB>Y0*PGxeez@PK!hiM6HhRem(!?s7@b#j(
z5j)G+99g;L(SE8yp`Jm6gBoB^M;`Hot`FvH*9VK{s1(yaWJh?=gGPI&={;s#C7*Hr
zHN<>SgZ`!;xU#HfUfGjyIh6u$1cc$@^1P~>rf+)+$+qi_KfPmT$~QfAu1!`ZtqPKi
zRFMBdKCDP45!cSA*H2r%k+_uI`q-?-$t#oc5HU1F8Anqta9%4FQeonnxZb(wg<g2e
zQ0h{ZrZiJCkxyAQHCB_j=2ez#(~}>$j1<O3qw`tivBy*S8I#(!{-eBj5CWGlF{S+n
D*NlcQ

literal 520
zcmY*WJx{|h5Iuk7qo`%z7cel8r4c(qNQi-@17+%##-@o#NM*Z)O6k_Wz}~X)m%K9d
zFEDWzkSHhJv)}3L_s(txgCoGW*bJv{4B(T<VQ?hZnD!JwfnpWZY{D2QuEYi=TuBw+
zDpWXzB-&#aB+U1$%iO|FGm}dy{RZt(1#U1c5e0aPjXofeKD18R-1xB2<*aZ%cqx@D
zym-<pBe1uFud}phYMt8oDph)!R#`n&Sz0$r+q8VP+PL9-<s<#7^M%u-VQB`*Ob?fT
zZbB?Xn4Oz*+{|#kcea)ewycGgwOsL5?g9oqXkp8Dunt;*j>RaE`xsB``vk`Xq%sNb
zM&sN2heQ~nJ~H~zXj}MTrd?hnp&>&iARu)wRpv4u=1tWYYsk#ssD=c5oaL@uW=<2c
x^jR@KVVuWYa&v+dt$3L?Mt73klwJMcqVDy6Zo9;nT2%Uqe!-H3KE$FgzX5TJWy1gf

diff --git a/modes/__pycache__/normal.cpython-310.pyc b/modes/__pycache__/normal.cpython-310.pyc
index 9cae3d912d66121c52a33975121653773e9706d3..3e8be884fa35cb41da7e96d5ea7141cdaea5bdd1 100644
GIT binary patch
literal 813
zcmZuvJ#P~+81`%XKAK#rsFX@bAa$saZsFLdphA^cQI>95(B<rskh@%EJ5eKDr!es=
zl97MFZ}G}hiGhIuMGU-lph*#y{G4Auub=np>Q1Lca6SE$4ceTLug=(A6peG-`UF7`
z0VS!R4;AfGAc6|^k@T71BET;f;RQ*fTl6F;wR_s+W~v9dvSBe*x>ki#`@7s3Ba%0`
z^%sN&4C*gnOjWl*?SMQYg1sP&oRNlHY<TYZ<1K%BpAS6$9Qp9S?<3EjZ~1@T$DV&H
z_RyoX6Suu^*(D3Oq%)%WqO;}G{hoynHr~|uZhi|`jD@j<^6v85!qCFVhNFp=%2;02
zLayQE8eZ9`sH-ZUh!iZVmB7w%k(=DIv7CP<>JZh|C)u#BWTvm?nUJ%r%&UROGbf_6
zNv*29e0DXrk-V10)JWG>Kd=P4lpiJE5D${?i2KP8#8&b%raV0Sg-F#Adf%H2!;8Dg
zoT6dK5*qCP3TJNUlI@(ifE57FXBn)>4K-l{4PDS1XaN5O+Oxr+tc!6PDK~E$DS4@+
z9x4~ZbzvrL`%mLsH8yxJO)>O2rObxf2wf<3fZpnX1J{iWJah_iUYOA=H}V)QoggGM
vVJ#Np#?qePMK293FKQ)y20pNt_vDVASKf%8VJg#7zIKDuAwrkLEP4DJNa?W^

literal 861
zcmZuwO>Yx15cSu7By7=AN+}WtgnC&Cb-7VNg^IXBK=hUi+N|Af$Zoc>ozO^|Q}`jt
zk$=K(@Rd^~4oGl75eLQ&q%APgynXhY8QWuTy|K|oVBcnYy&Z<oXFIrT1O|uTY9D|j
zj!RVGF2<G<;G|0&rzNdemjP$o`+&M0_jv$cpNB^%X`MqhO0Ws?x~j4v2kQ5SN=OZ?
zrF5o8s+Y;!vvI%8av%ITxcUUpPz@WH;Q^6x!#MHK9mMG)M9~3i*wIR7PQQ1d?_bqD
zr#}SU|8IWa^ur7Nul&&IuQi^N1~s@L4O_4&Td&`mVc2DRhL6b@$)2YF#wFJ}2EQ|5
zK9Z`IZzty%4rlPd;Bq~AW^iF}e~BM2@sorZT1zgejSI6}_s5wQ(%wzt8DD9xa%ucR
z^iK+Hy!U;s3quEDVi?bK_7TZ#2wm=`MO}$hola6N#%Y;VJ)Wgi&4o&bwXCvo?{s1U
zaVGMS7Pj?j7a+nhVcXFcz|H6@;PvP`U_1H&=x_Z5BytA=b9g{&yK;LEU|OR&UUiJ)
z1w51n&B+2ynWlgG*wC3br45A#Lpoi*^XkpZXD<>aZCMjYaV&)@jCUe*UbqDlPu>7c
zZd$l$;g*Fh3--h-xNTVsa35TS05J(^Oc{2wog^@xYl3U&s>v*`rEm+og<RmJlCHR|
ZYr+Fa9hKs#y+dXHr3e}p;gCjme*vA{wmtv=

diff --git a/modes/command.py b/modes/command.py
index 751c7c8..0dd0c51 100644
--- a/modes/command.py
+++ b/modes/command.py
@@ -2,7 +2,7 @@ from core import statusbar, utils
 import curses
 
 
-def execute(stdscr, height, width, commands):
+def execute(stdscr, data, commands):
     if not commands:
         # Quit if there are no commands, don't check anything
         return
@@ -11,20 +11,32 @@ def execute(stdscr, height, width, commands):
         if command == "w":
             # Write to the file
             pass
+
         elif command == "q":
             # Goodbye prompt
-            utils.goodbye(stdscr, height, width)
+            utils.goodbye(stdscr, data)
+
+        elif command == "t":
+            if data["statusbar_theme"] == "filled":
+                data["statusbar_theme"] = "bare"
+
+            else:
+                data["statusbar_theme"] = "filled"
+
+        else:
+            utils.error(stdscr, data, f"Not an editor command: '{command}'")
+
+    return data
 
 
-def activate(stdscr, height, width, data):
+def activate(stdscr, data):
     # Initialise variables
-    key = 0
     commands = []
 
     # Visibly switch to command mode
-    statusbar.refresh(stdscr, height, width, "COMMAND")
-    stdscr.addstr(height-1, 0, ":")
-    stdscr.move(height-1, 1)
+    statusbar.refresh(stdscr, data)
+    stdscr.addstr(data["height"]-1, 0, ":")
+    stdscr.move(data["height"]-1, 1)
 
     # Main loop
     while True:
@@ -34,38 +46,44 @@ def activate(stdscr, height, width, data):
         # Handle subtracting a key (backspace)
         if key == curses.KEY_BACKSPACE:
             # Write whitespace over characters to refresh it
-            stdscr.addstr(height-1, 1, " " * len(commands))
+            stdscr.addstr(data["height"]-1, 1, " " * len(commands))
 
             if commands:
                 # Subtract a character
                 commands.pop()
             else:
-                # If there's nothing left, quit the loop
+                # Exit command mode and enter normal mode if there is nothing left
+                data["mode"] = "normal"
                 return data
 
         elif key == 27:
-            # Quit the loop if escape is pressed
+            # Exit command mode and enter normal mode if "esc" is pressed
+            data["mode"] = "normal"
             return data
 
-        elif key in (curses.KEY_ENTER, ord('\n'), ord('\r')):
+        elif key in (curses.KEY_ENTER, ord('\n'), ord('\r'), ord(":"), ord(";")):
             # Execute commands
-            execute(stdscr, height, width, commands)
+            data = execute(stdscr, data, commands)
 
             # Clear the bottom bar
-            stdscr.addstr(height - 1, 0, " " * (width - 1))
+            stdscr.addstr(data["height"] - 1, 0, " " * (data["width"] - 1))
 
+            # Return to normal mode after executing a command
+            data["mode"] = "normal"
             return data
 
         else:
             # If any other key is typed, append it
             # As long as the key is in the valid list
             valid = "abcdefghijklmnopqrstuvwxyz ABCDEFGHIJKLMNOPQRSTUVWXYZ!"
-            if chr(key) in valid and len(commands) < (width - 2):
+            if chr(key) in valid and len(commands) < (data["width"] - 2):
                 commands.append(chr(key))
 
         # Join the commands together for visibility on the screen
         friendly_command = "".join(commands)
+
         # Write the commands to the screen
-        stdscr.addstr(height-1, 1, friendly_command)
+        stdscr.addstr(data["height"]-1, 1, friendly_command)
+
         # Move the cursor the end of the commands
-        stdscr.move(height-1, len(commands)+1)
+        stdscr.move(data["height"]-1, len(commands)+1)
diff --git a/modes/insert.py b/modes/insert.py
index 9641028..41e2458 100644
--- a/modes/insert.py
+++ b/modes/insert.py
@@ -1,17 +1,33 @@
-from core import statusbar
+from core import statusbar, cursor
 
 
-def execute(stdscr, height, width, key):
-    return
+def execute(data, key):
+    return data
 
 
-def activate(stdscr, height, width, data):
+def activate(stdscr, data):
     # Refresh the status bar with a different colour for insert
-    colors = [8, 12, 14, 2]
-    statusbar.refresh(stdscr, height, width, "INSERT", colors)
+    data["statusbar_colors"] = [8, 12, 14, 2]
+    statusbar.refresh(stdscr, data)
 
-    while True:
-        # Wait for and capture a key press from the user
-        key = stdscr.getch()
+    # Refresh the status bar
+    statusbar.refresh(stdscr, data)
 
+    # Move the cursor
+    cursor.move(stdscr, data)
+
+    # Switch to a line cursor
+    cursor.cursor_mode("line")
+
+    # Wait for and capture a key press from the user
+    key = stdscr.getch()
+
+    # Exit insert mode
+    if key == 27:
+        data["mode"] = "normal"
         return data
+
+    # Check keybindings
+    data = execute(data, key)
+
+    return data
diff --git a/modes/normal.py b/modes/normal.py
index cbd4893..cd90104 100644
--- a/modes/normal.py
+++ b/modes/normal.py
@@ -1,9 +1,7 @@
-from modes import command
-from modes import insert
-from core import statusbar
+from core import statusbar, cursor
 
 
-def execute(stdscr, height, width, key, data):
+def execute(data, key):
     if key == ord("j"):
         # Move the cursor down
         data["cursor_y"] += 1
@@ -21,23 +19,30 @@ def execute(stdscr, height, width, key, data):
         data["cursor_x"] -= 1
 
     elif key == ord("i"):
-        # Insert mode
-        data = insert.activate(stdscr, height, width, data)
+        # Exit normal mode and enter insert mode
+        data["mode"] = "insert"
 
     elif key in (ord(":"), ord(";")):
-        # Switch to command mode
-        data = command.activate(stdscr, height, width, data)
+        # Exit normal mode and enter command mode
+        data["mode"] = "command"
 
     return data
 
 
-def activate(stdscr, height, width, data):
+def activate(stdscr, data):
     # Refresh the status bar
-    statusbar.refresh(stdscr, height, width, "NORMAL")
+    statusbar.refresh(stdscr, data)
+
+    # Move the cursor
+    cursor.move(stdscr, data)
+
+    # Switch the cursor to a block
+    cursor.cursor_mode("block")
 
     # Wait for and capture a key press from the user
     key = stdscr.getch()
 
     # Check against the keybindings
-    data = execute(stdscr, height, width, key, data)
+    data = execute(data, key)
+
     return data