From 6ec1729ff9f2bb11937d362db7cd763358483294 Mon Sep 17 00:00:00 2001
From: pointer-to-bios <yyb1738487169@163.com>
Date: Sun, 31 Jul 2022 18:18:46 +0800
Subject: [PATCH] deliver fonts and display into library

---
 BWLserver/guilog.cc                 | 2 +-
 BWLserver/server.hh                 | 2 +-
 BWLserver/update.cc                 | 2 +-
 {BWLserver => includes}/display.hh  | 0
 includes/fonts.hh                   | 9 +++++++++
 {BWLserver => libs}/display.cc      | 2 +-
 BWLserver/fonts.hh => libs/fonts.cc | 5 +----
 7 files changed, 14 insertions(+), 8 deletions(-)
 rename {BWLserver => includes}/display.hh (100%)
 create mode 100644 includes/fonts.hh
 rename {BWLserver => libs}/display.cc (98%)
 rename BWLserver/fonts.hh => libs/fonts.cc (99%)

diff --git a/BWLserver/guilog.cc b/BWLserver/guilog.cc
index b7cb434..9e31f16 100644
--- a/BWLserver/guilog.cc
+++ b/BWLserver/guilog.cc
@@ -1,5 +1,5 @@
 #include "guilog.hh"
-#include "fonts.hh"
+#include "../includes/fonts.hh"
 #include "update.hh"
 
 #include "../includes/logs.hh"
diff --git a/BWLserver/server.hh b/BWLserver/server.hh
index 0ccf7c6..dabd5cc 100644
--- a/BWLserver/server.hh
+++ b/BWLserver/server.hh
@@ -32,9 +32,9 @@
 
 #include "../includes/bsv.hh"
 #include "../includes/pipe.hh"
+#include "../includes/display.hh"
 
 #include "reqrec.hh"
-#include "display.hh"
 #include "threads.hh"
 #include "update.hh"
 
diff --git a/BWLserver/update.cc b/BWLserver/update.cc
index bb4ae7f..7d23a00 100644
--- a/BWLserver/update.cc
+++ b/BWLserver/update.cc
@@ -3,7 +3,7 @@
 #include <cstring>
 #include <map>
 
-#include "display.hh"
+#include "../includes/display.hh"
 
 #include "../includes/bsv.hh"
 
diff --git a/BWLserver/display.hh b/includes/display.hh
similarity index 100%
rename from BWLserver/display.hh
rename to includes/display.hh
diff --git a/includes/fonts.hh b/includes/fonts.hh
new file mode 100644
index 0000000..4dedff6
--- /dev/null
+++ b/includes/fonts.hh
@@ -0,0 +1,9 @@
+#ifndef __fonts_hh_
+#define __fonts_hh_
+
+namespace font
+{
+    extern unsigned char consolas[256][16];
+};
+
+#endif
diff --git a/BWLserver/display.cc b/libs/display.cc
similarity index 98%
rename from BWLserver/display.cc
rename to libs/display.cc
index 6f3d2ad..e276779 100644
--- a/BWLserver/display.cc
+++ b/libs/display.cc
@@ -1,4 +1,4 @@
-#include "display.hh"
+#include "../includes/display.hh"
 #include "../includes/bsv.hh"
 
 #include <iostream>
diff --git a/BWLserver/fonts.hh b/libs/fonts.cc
similarity index 99%
rename from BWLserver/fonts.hh
rename to libs/fonts.cc
index 1abb6d9..236c57c 100644
--- a/BWLserver/fonts.hh
+++ b/libs/fonts.cc
@@ -1,5 +1,4 @@
-#ifndef __fonts_hh_
-#define __fonts_hh_
+#include "../includes/fonts.hh"
 
 namespace font
 {
@@ -1846,5 +1845,3 @@ namespace font
     };
 
 };
-
-#endif
-- 
GitLab