Added tic tac toe

Author: scopeInfinity

Makefile

@@ -17,6 +17,7 @@ app_entry_o = $(BUILD_DIR)/app_entry.o
 
 # Apps
 app_calc = $(BUILD_DIR)/calc
+app_ttt = $(BUILD_DIR)/ttt
 app_dashboard = $(BUILD_DIR)/dashboard
 
 # Parameters
@@ -28,21 +29,25 @@ all: images binaries
 
 images: $(image_vmdk)
 
-binaries: $(bt_stage1) $(bt_stage2) $(app_calc)
+binaries: $(bt_stage1) $(bt_stage2)
 
-$(image_vmdk): $(bt_stage1) $(bt_stage2) $(app_calc)
+$(image_vmdk): $(bt_stage1) $(bt_stage2)  $(app_calc) $(app_ttt)
 	dd bs=512 count=2 if=$(bt_stage1) of=$@
 	/bin/echo -ne "\x55\xaa" | dd seek=510 bs=1 of=$@
 	cat $(bt_stage2) >> $@
 	cat $(app_calc)  >> $@
+	cat $(app_ttt)  >> $@
 	@echo "Stage 1 Size     : " $$(stat -c %s $(bt_stage1))
 	@echo "Stage 2 Size     : " $$(stat -c %s $(bt_stage2))
 	@echo "App Calc Size    : " $$(stat -c %s $(app_calc))
+	@echo "App TTT Size    : " $$(stat -c %s $(app_ttt))
 	@echo "Image Size       : " $$(stat -c %s $@)
 	@echo "Want BT_STAGE2_SECTOR_COUNT : 0x"$$(printf "%x\n" $$(( $$(stat -c %s $(bt_stage2)) / 512)) )
 	@echo "Got BT_STAGE2_SECTOR_COUNT  : 0x"$(BT_STAGE2_SECTOR_COUNT)
-	@echo "AppSector Sector Count : "$$(( $$(stat -c %s $(app_calc)) / 512))
-	@echo "AppSector Sector Start : "$$(( 1 + $$(stat -c %s $(bt_stage1)) / 512 + $$(stat -c %s $(bt_stage2)) / 512))
+	@echo "AppCalc Sector Count : "$$(( $$(stat -c %s $(app_calc)) / 512))
+	@echo "AppCalc Sector Start : "$$(( 1 + $$(stat -c %s $(bt_stage1)) / 512 + $$(stat -c %s $(bt_stage2)) / 512))
+	@echo "AppTTT Sector Count : "$$(( $$(stat -c %s $(app_ttt)) / 512))
+	@echo "AppTTT Sector Start : "$$(( 1 + $$(stat -c %s $(bt_stage1)) / 512 + $$(stat -c %s $(bt_stage2)) / 512 + $$(stat -c %s $(app_calc)) / 512))
 
 $(bt_stage1): $(BL_SRC_DIR)/stage1.asm $(BL_SRC_DIR)/constants.asm $(BL_SRC_DIR)/io.asm $(BL_SRC_DIR)/disk.asm
 	nasm -o $@ -f bin -i $(BL_SRC_DIR)/ -D BT_STAGE2_SECTOR_COUNT=$(BT_STAGE2_SECTOR_COUNT) $<
@@ -66,6 +71,11 @@ $(app_calc): $(app_entry_o) $(APP_DIR)/calc.c $(SYSCALLS_SRC_DIR)/basic.h $(SYSC
 	ld --oformat binary -m elf_i386 -Ttext 0xC000 --strip-all -o $@ $(app_entry_o) $(BUILD_DIR)/calc.o
 	truncate --size=%512 $@
 
+$(app_ttt): $(app_entry_o) $(APP_DIR)/tic_tac_toe.c $(SYSCALLS_SRC_DIR)/basic.h $(SYSCALLS_SRC_DIR)/io.h $(SYSCALLS_SRC_DIR)/time.h $(SYSCALLS_SRC_DIR)/color.h $(UTIL_SRC_DIR)/string.h $(BL_SRC_DIR)/constants.asm $(BL_SRC_DIR)/io.asm $(SYSCALLS_SRC_DIR)/io_syscall.asm $(SYSCALLS_SRC_DIR)/time_syscall.asm
+	gcc -m16 -fno-pie -c -Isrc -o $(BUILD_DIR)/ttt.o $(APP_DIR)/tic_tac_toe.c
+	ld --oformat binary -m elf_i386 -Ttext 0xC000 --strip-all -o $@ $(app_entry_o) $(BUILD_DIR)/ttt.o
+	truncate --size=%512 $@
+
 debug_stage1: $(bt_stage1)
 	objdump -b binary -mi386 -Maddr16,data16 -D $<
 	xxd $<

src/app/dashboard.c

@@ -46,7 +46,8 @@ int run_dashboard(int argc,char **argv) {
         int num = read_int();
 
         // Load and launch calculator
-        int err = load_sectors(0xC000, 0x80, 27, 25);
+        // int err = load_sectors(0xC000, 0x80, 27, 25);
+        int err = load_sectors(0xC000, 0x80, 52, 25);
         if(err) {
             set_color_bg(C_DARK_GRAY);
             move_xy(2,WINDOW_HEIGHT);

src/app/tic_tac_toe.c

@@ -0,0 +1,112 @@
+// Simple Calculator
+#define BUILD_FOR_FUZZY
+#ifndef BUILD_FOR_FUZZY
+#else
+#include <lib/syscalls/io.h>
+#include <lib/syscalls/time.h>
+#include <lib/util/string.h>
+#endif
+
+void console_init() {
+    set_color_bg(C_BLACK);
+    set_color_fg(C_WHITE);
+    print_rectangle(0, 0, WINDOW_WIDTH, WINDOW_HEIGHT);
+    move_xy(0,0);
+}
+
+struct State
+{
+    unsigned char turn; // 0 or 1
+    unsigned char mat[3][3];
+};
+
+void reset(struct State *s) {
+    s->turn = 0;
+    for (int i = 0; i < 3; ++i)
+        for (int j = 0; j < 3; ++j)
+            s->mat[i][j]=' ';
+}
+
+void print_board(struct State *s) {
+    for (int i = 0; i < 3; ++i) {
+        print_line("   ");
+        print_char(s->mat[i][0]);
+        print_char('|');
+        print_char(s->mat[i][1]);
+        print_char('|');
+        print_char(s->mat[i][2]);
+        print_char('\n');
+        if(i<2) {
+            print_line("   -----\n");
+        }
+    }
+}
+
+void redraw(struct State *s) {
+    console_init();
+    print_line("TicTacToe\n");
+    print_line("---------\n");
+    print_line("\n");
+    print_line("Player 1 : X\n");
+    print_line("Player 2 : O\n");
+    print_line("\n");
+    print_line("Turn: Player ");
+    print_int(s->turn+1);
+    print_line("\n");
+    print_line("Controls: Use 1-9 in numpad keys pattern\n");
+    print_line("        : R to reset game\n");
+    print_line("        : Q to quit game\n\n");
+    print_board(s);
+}
+
+void play_move(struct State *s, unsigned char r, unsigned char c) {
+    if(s->mat[r][c]!=' ')
+        return;
+    char mark = 'X';
+    if (s->turn==1) {
+        mark =  'O';
+    }
+    s->mat[r][c]=mark;
+    s->turn=1-(s->turn);
+}
+
+struct State s;
+unsigned char quit;
+unsigned char greset;
+int main(int argc,char *argv[]) {
+    greset = 1;
+    quit = 0;
+    while(1) {
+        if(quit) break;
+        if(greset) {
+            reset(&s);
+            greset = 0;
+        }
+        redraw(&s);
+        while(1){
+            char c = getch();
+            if(c=='r' || c=='R') {
+                greset = 1;
+                break;
+            }
+            if(c=='q' || c=='Q') {
+                quit = 1;
+                break;
+            }
+            char row = -1, col = -1;
+            if(c=='1' || c=='2' || c=='3') row = 2;
+            if(c=='4' || c=='5' || c=='6') row = 1;
+            if(c=='7' || c=='8' || c=='9') row = 0;
+            if(c=='1' || c=='4' || c=='7') col = 0;
+            if(c=='2' || c=='5' || c=='8') col = 1;
+            if(c=='3' || c=='6' || c=='9') col = 2;
+            if(row>=0) {
+                play_move(&s, row, col);
+                break;
+            } else {
+                print_int(c);
+            }
+        }
+    }
+    return 0;
+}