Răsfoiți Sursa

Always have clock visible

Johannes Zellner 8 luni în urmă
părinte
comite
eed5976433
3 a modificat fișierele cu 27 adăugiri și 8 ștergeri
  1. 10 0
      io.c
  2. 1 0
      io.h
  3. 16 8
      terminal.c

+ 10 - 0
io.c

@@ -45,6 +45,7 @@ static int shift_pressed;
 static unsigned int cursor;
 static unsigned short cursor_cell;
 static unsigned char last_scancode;
+static int scroll_occurred;
 
 static char apply_shift(char c)
 {
@@ -83,6 +84,14 @@ void io_clear_screen(void)
 		VGA_BASE[i] = (unsigned short)(VGA_ATTR << 8);
 }
 
+int io_did_scroll(void)
+{
+	if (!scroll_occurred)
+		return 0;
+	scroll_occurred = 0;
+	return 1;
+}
+
 void io_putchar(char c)
 {
 	if (c == '\n') {
@@ -95,6 +104,7 @@ void io_putchar(char c)
 			for (i = (IO_CONTENT_ROWS - 1) * IO_VGA_COLS; i < IO_CONTENT_SIZE; i++)
 				VGA_BASE[i] = (unsigned short)(VGA_ATTR << 8);
 			cursor = (IO_CONTENT_ROWS - 1) * IO_VGA_COLS;
+			scroll_occurred = 1;
 		}
 		cursor_cell = (unsigned short)(VGA_ATTR << 8);
 		return;

+ 1 - 0
io.h

@@ -12,6 +12,7 @@
 
 void io_init(void);
 void io_clear_screen(void);
+int io_did_scroll(void);  /* returns 1 once after a scroll, then 0 until next scroll */
 void io_putchar(char c);
 void io_putstr(const char *s);
 unsigned int io_get_cursor(void);

+ 16 - 8
terminal.c

@@ -12,18 +12,23 @@ static char datetime_buf[IO_DATETIME_LEN + 1];
 static int cursor_visible;
 static unsigned int last_cursor_tick;
 
+static void redraw_datetime(void)
+{
+	rtc_read_datetime(datetime_buf);
+	{
+		unsigned int i;
+		for (i = 0; i < IO_DATETIME_LEN && datetime_buf[i]; i++)
+			io_vga_write(IO_DATETIME_POS + i,
+				(unsigned short)((0x0A << 8) | (unsigned char)datetime_buf[i]));
+	}
+}
+
 static void update_datetime(void)
 {
 	unsigned int t = get_ticks_ms();
 	if (t - last_datetime_tick >= DATETIME_MS) {
 		last_datetime_tick = t;
-		rtc_read_datetime(datetime_buf);
-		{
-			unsigned int i;
-			for (i = 0; i < IO_DATETIME_LEN && datetime_buf[i]; i++)
-				io_vga_write(IO_DATETIME_POS + i,
-					(unsigned short)((0x0A << 8) | (unsigned char)datetime_buf[i]));
-		}
+		redraw_datetime();
 	}
 }
 
@@ -59,8 +64,11 @@ void terminal_run(void)
 			char c = io_poll_key();
 			if (c) {
 				io_putchar(c);
-				if (c == '\n')
+				if (c == '\n') {
 					io_putstr(prompt);
+					if (io_did_scroll())
+						redraw_datetime();
+				}
 			} else {
 				__asm__ volatile ("hlt");
 			}