README.md

@@ -20,7 +20,7 @@ You can find a live demo [here](https://bananymous.com/banan-os)
 - [x] AML interpreter (partial)
 - [x] Basic graphical environment
   - [x] Terminal emulator
-  - [x] Status bar
+  - [ ] Task bar
   - [ ] Program launcher
   - [ ] Some nice apps
 - [x] ELF dynamic linking
@@ -32,14 +32,13 @@ You can find a live demo [here](https://bananymous.com/banan-os)
 - [x] NVMe disks
 - [x] ATA (IDE, SATA) disks
 - [x] E1000 and E1000E NICs
-- [x] RTL8111/8168/8211/8411 NICs
 - [x] PS2 keyboard (all scancode sets)
 - [x] PS2 mouse
 - [x] USB
   - [x] Keyboard
   - [x] Mouse
-  - [x] Mass storage
   - [ ] Hubs
+  - [ ] Mass storage
   - [ ] ...
 - [ ] virtio devices (network, storage)
 

kernel/kernel/OpenFileDescriptorSet.cpp

@@ -202,6 +202,8 @@ namespace Kernel
 	{
 		TRY(validate_fd(fd));
 
+		dprintln("fcntl({} ('{}'), {}, {H})", fd, m_open_files[fd]->path(), cmd, extra);
+
 		switch (cmd)
 		{
 			case F_GETFD:
@@ -209,12 +211,14 @@ namespace Kernel
 			case F_SETFD:
 				m_open_files[fd]->flags &= ~FD_CLOEXEC;
 				m_open_files[fd]->flags |= extra & FD_CLOEXEC;
+				dprintln("  set CLOEXEC to {}", !!(m_open_files[fd]->flags & FD_CLOEXEC));
 				return 0;
 			case F_GETFL:
 				return m_open_files[fd]->flags & ~(O_APPEND | O_DSYNC | O_NONBLOCK | O_RSYNC | O_SYNC | O_ACCMODE);
 			case F_SETFL:
 				m_open_files[fd]->flags &= ~O_NONBLOCK;
 				m_open_files[fd]->flags |= extra & O_NONBLOCK;
+				dprintln("  set NONBLOCK to {}", !!(m_open_files[fd]->flags & O_NONBLOCK));
 				return 0;
 			default:
 				break;

kernel/kernel/Terminal/Serial.cpp

@@ -210,8 +210,6 @@ namespace Kernel
 	void SerialTTY::handle_irq()
 	{
 		uint8_t ch = IO::inb(m_serial.port());
-		if (ch == 0x7F)
-			ch = '\b';
 
 		SpinLockGuard _(m_input_lock);
 		if (m_input.full())

kernel/kernel/Terminal/TTY.cpp

@@ -285,6 +285,14 @@ namespace Kernel
 
 	void TTY::do_backspace()
 	{
+		auto print_backspace =
+			[this]
+			{
+				putchar('\b');
+				putchar(' ');
+				putchar('\b');
+			};
+
 		if (m_output.bytes > 0)
 		{
 			uint8_t last = m_output.buffer[m_output.bytes - 1];
@@ -300,20 +308,20 @@ namespace Kernel
 				}
 				ASSERT(m_output.bytes > 0);
 				m_output.bytes--;
-				putchar('\b');
+				print_backspace();
 			}
 			// Caret notation
 			else if (last < 32 || last == 127)
 			{
 				m_output.bytes--;
-				putchar('\b');
+				print_backspace();
-				putchar('\b');
+				print_backspace();
 			}
 			// Ascii
 			else
 			{
 				m_output.bytes--;
-				putchar('\b');
+				print_backspace();
 			}
 		}
 	}

kernel/kernel/Terminal/VirtualTTY.cpp

@@ -461,7 +461,7 @@ namespace Kernel
 				break;
 			case BS:
 				if (m_column > 0)
-					putchar_at(' ', --m_column, m_row);
+					m_column--;
 				break;
 			case HT:
 				m_column++;
@@ -480,7 +480,7 @@ namespace Kernel
 				break;
 			case ESC:
 				m_state = State::WaitingAnsiEscape;
-				break;
+				break;;
 			default:
 				putchar_at(codepoint, m_column, m_row);
 				m_last_graphic_char = codepoint;

userspace/libraries/LibInput/KeyEvent.cpp

@@ -58,10 +58,10 @@ namespace LibInput
 			"å", "ä", "ö",
 			"0", "1", "2", "3", "4", "5", "6", "7", "8", "9",
 			nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr,
-			/*"Insert", "PrintScreen", "Delete", "Home", "End", "PageUp", "PageDown",*/ nullptr, nullptr, "\x7F", nullptr, nullptr, nullptr, nullptr, "\n", " ",
+			/*"Insert", "PrintScreen", "Delete", "Home", "End", "PageUp", "PageDown",*/ nullptr, nullptr, "\e[3~", nullptr, nullptr, nullptr, nullptr, "\n", " ",
 			"!", "\"", "#", "¤", "%", "&", "/", "§", "½",
 			"(", ")", "[", "]", "{", "}",
-			"=", "?", "+", "\\", "´", "`", "¨", "¸", "\b", "@", "£", "$", "€",
+			"=", "?", "+", "\\", "´", "`", "¨", "¸", "\x7F", "@", "£", "$", "€",
 			"\e", "\t", nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr,
 			"'", "*", "^", "~", "\e[A", "\e[B", "\e[D", "\e[C",
 			",", ";", ".", ":", "-", "_", nullptr, nullptr, "<", ">", "|", "¬", "¦",
@@ -77,10 +77,10 @@ namespace LibInput
 			"Å", "Ä", "Ö",
 			"0", "1", "2", "3", "4", "5", "6", "7", "8", "9",
 			nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr,
-			/*"Insert", "PrintScreen", "Delete", "Home", "End", "PageUp", "PageDown",*/ nullptr, nullptr, "\x7F", nullptr, nullptr, nullptr, nullptr, "\n", " ",
+			/*"Insert", "PrintScreen", "Delete", "Home", "End", "PageUp", "PageDown",*/ nullptr, nullptr, "\e[3~", nullptr, nullptr, nullptr, nullptr, "\n", " ",
 			"!", "\"", "#", "¤", "%", "&", "/", "§", "½",
 			"(", ")", "[", "]", "{", "}",
-			"=", "?", "+", "\\", "´", "`", "¨", "¸", "\b", "@", "£", "$", "€",
+			"=", "?", "+", "\\", "´", "`", "¨", "¸", "\x7F", "@", "£", "$", "€",
 			"\e", "\t", nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr,
 			"'", "*", "^", "~", "\e[A", "\e[B", "\e[D", "\e[C",
 			",", ";", ".", ":", "-", "_", nullptr, nullptr, "<", ">", "|", "¬", "¦",
@@ -96,10 +96,10 @@ namespace LibInput
 			"Å", "Ä", "Ö",
 			"0", "1", "2", "3", "4", "5", "6", "7", "8", "9",
 			nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr,
-			/*"Insert", "PrintScreen", "Delete", "Home", "End", "PageUp", "PageDown",*/ nullptr, nullptr, "\x7F", nullptr, nullptr, nullptr, nullptr, "\n", " ",
+			/*"Insert", "PrintScreen", "Delete", "Home", "End", "PageUp", "PageDown",*/ nullptr, nullptr, "\e[3~", nullptr, nullptr, nullptr, nullptr, "\n", " ",
 			"!", "\"", "#", "¤", "%", "&", "/", "§", "½",
 			"(", ")", "[", "]", "{", "}",
-			"=", "?", "+", "\\", "´", "`", "¨", "¸", "\b", "@", "£", "$", "€",
+			"=", "?", "+", "\\", "´", "`", "¨", "¸", "\x7F", "@", "£", "$", "€",
 			"\e", "\t", nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr,
 			"'", "*", "^", "~", "\e[A", "\e[B", "\e[D", "\e[C",
 			",", ";", ".", ":", "-", "_", nullptr, nullptr, "<", ">", "|", "¬", "¦",

userspace/programs/Shell/Input.cpp

@@ -468,9 +468,9 @@ BAN::Optional<BAN::String> Input::get_input(BAN::Optional<BAN::StringView> custo
 			if (m_buffer_col <= 0)
 				break;
 			while ((m_buffers[m_buffer_index][m_buffer_col - 1] & 0xC0) == 0x80)
-				m_buffers[m_buffer_index].remove(--m_buffer_col);
+				m_buffer_col--;
-			m_buffers[m_buffer_index].remove(--m_buffer_col);
+			m_buffer_col--;
-			printf("\b\e[s%s \e[u", m_buffers[m_buffer_index].data() + m_buffer_col);
+			printf("\e[D");
 			fflush(stdout);
 			break;
 		case '\x01': // ^A
@@ -490,13 +490,13 @@ BAN::Optional<BAN::String> Input::get_input(BAN::Optional<BAN::StringView> custo
 				break;
 			putchar('\n');
 			return {};
-		case '\x7F':
+		case '\x7F': // backspace
-			if (m_buffer_col >= m_buffers[m_buffer_index].size())
+			if (m_buffer_col <= 0)
 				break;
-			m_buffers[m_buffer_index].remove(m_buffer_col);
+			while ((m_buffers[m_buffer_index][m_buffer_col - 1] & 0xC0) == 0x80)
-			while (m_buffer_col < m_buffers[m_buffer_index].size() && (m_buffers[m_buffer_index][m_buffer_col] & 0xC0) == 0x80)
+				m_buffers[m_buffer_index].remove(--m_buffer_col);
-				m_buffers[m_buffer_index].remove(m_buffer_col);
+			m_buffers[m_buffer_index].remove(--m_buffer_col);
-			printf("\e[s%s \e[u", m_buffers[m_buffer_index].data() + m_buffer_col);
+			printf("\b\e[s%s \e[u", m_buffers[m_buffer_index].data() + m_buffer_col);
 			fflush(stdout);
 			break;
 		case '\n':