reorganized and started fleshing out what UI programs will look like starting with...

diff --git a/bin/screenlock.c b/bin/screenlock.c
index cbfdb1c54dad327ce77458d25d3268bcbaddbe3c..6b66458ecd88b01b2e967016107b58dc5c856fa9 100644 (file)
--- a/bin/screenlock.c
+++ b/bin/screenlock.c
@@ -1,6 +1,15 @@
+#include <liba.h>
+#include <libui.h>
+
 int main(int argc, char** argv)
 {
     (void)argc;
     (void)argv;
+
+    UIWin* win = win_create("Lock Screen");
+    win_show(win);
+    sleep(5);
+    win_delete(win);
+
     return 0;
 }
\ No newline at end of file

diff --git a/inc/ffind.h b/inc/ffind.h
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/inc/gui.h b/inc/gui.h
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/inc/libui_impl.h b/inc/impl/libui.h
similarity index 100%
rename from inc/libui_impl.h
rename to inc/impl/libui.h

diff --git a/inc/rc.h b/inc/rc.h
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/inc/task.h b/inc/task.h
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/inc/vte.h b/inc/vte.h
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/lib/ui/font_close.c b/lib/ui/font_close.c
index fed619d2ef4826158162366aaae78f21a8b5045e..c812ae875d1e099817a84d341a4cd7b481b8803d 100644 (file)
--- a/lib/ui/font_close.c
+++ b/lib/ui/font_close.c
@@ -1,6 +1,6 @@
 #include <liba.h>
 #include <libui.h>
-#include "libui_impl.h"
+#include <impl/libui.h>
 
 void font_close(UIFont font)
 {

diff --git a/lib/ui/font_load.c b/lib/ui/font_load.c
index 45297529c505f5adcdd8f7f47183324a4ad59fd3..cbb286b29347eb0a5631608c84d46dfb6d60fdeb 100644 (file)
--- a/lib/ui/font_load.c
+++ b/lib/ui/font_load.c
@@ -1,6 +1,6 @@
 #include <liba.h>
 #include <libui.h>
-#include "libui_impl.h"
+#include <impl/libui.h>
 
 UIFont font_load(char* patt)
 {

diff --git a/lib/ui/ui_begin.c b/lib/ui/ui_begin.c
index 8d7d5b977e59c7ce6198e9b43c777d2ab82da7e3..46fae72e59e7022a4c5cf1bb6e556ad68ac7d9ca 100644 (file)
--- a/lib/ui/ui_begin.c
+++ b/lib/ui/ui_begin.c
@@ -1,6 +1,6 @@
 #include <liba.h>
 #include <libui.h>
-#include "libui_impl.h"
+#include <impl/libui.h>
 
 void ui_begin(UIWin* win)
 {

diff --git a/lib/ui/ui_end.c b/lib/ui/ui_end.c
index 45c0f3a1fe2268187b1270a5eeaaecd77cf4ecc9..01dc0edd5b238aeaf874bf6de942f0f52221902e 100644 (file)
--- a/lib/ui/ui_end.c
+++ b/lib/ui/ui_end.c
@@ -1,6 +1,6 @@
 #include <liba.h>
 #include <libui.h>
-#include "libui_impl.h"
+#include <impl/libui.h>
 
 void ui_end(UIWin* win)
 {

diff --git a/lib/ui/window_create.c b/lib/ui/window_create.c
index 4bf078b6fe9f8a11b03d2844f00a53ea9d39f360..6d162093b8d7d697d3acd2b20feb9a89a8c263aa 100644 (file)
--- a/lib/ui/window_create.c
+++ b/lib/ui/window_create.c
@@ -1,9 +1,6 @@
 #include <liba.h>
 #include <libui.h>
-#include "libui_impl.h"
-
-//static Display* XDisplay = NULL;
-//struct UIWin* Managed_Windows = NULL;
+#include <impl/libui.h>
 
 struct XConf X = {0};
 

diff --git a/lib/ui/window_delete.c b/lib/ui/window_delete.c
index 45f29eb8edfddf7a936457d74284ca22dbbcd73a..3170660b45023686a39062353410bc402ff88122 100644 (file)
--- a/lib/ui/window_delete.c
+++ b/lib/ui/window_delete.c
@@ -1,6 +1,6 @@
 #include <liba.h>
 #include <libui.h>
-#include "libui_impl.h"
+#include <impl/libui.h>
 
 void win_delete(UIWin* win)
 {

diff --git a/lib/ui/window_hide.c b/lib/ui/window_hide.c
index c4f8ca32da897cb1183b516afc6b799a87b1e63d..5bf01e78bd071ba4c846f597226d0a01f198376a 100644 (file)
--- a/lib/ui/window_hide.c
+++ b/lib/ui/window_hide.c
@@ -1,8 +1,8 @@
 #include <liba.h>
 #include <libui.h>
-#include "libui_impl.h"
+#include <impl/libui.h>
 
-void win_show(UIWin* win)
+void win_hide(UIWin* win)
 {
     XUnmapWindow(X.display, win->self);
     XSync(X.display, False);

diff --git a/lib/ui/window_show.c b/lib/ui/window_show.c
index b2f92f8085674cbb6838e76f0e6273878d7ceede..2eae6b9031e10e34e526e34a5ed2e920a0145b1c 100644 (file)
--- a/lib/ui/window_show.c
+++ b/lib/ui/window_show.c
@@ -1,10 +1,9 @@
 #include <liba.h>
 #include <libui.h>
-#include "libui_impl.h"
+#include <impl/libui.h>
 
 void win_show(UIWin* win)
 {
-    (void)win;
-//    XMapWindow(X.display, win->self);
-//    XSync(X.display, False);
+    XMapWindow(X.display, win->self);
+    XSync(X.display, False);
 }

diff --git a/tools/build.c b/tools/build.c
index f163af61b11194f919e209914795a178602726f0..cdb0721203a0b8c00de4dea902f891cf42b69697 100644 (file)
--- a/tools/build.c
+++ b/tools/build.c
@@ -18,7 +18,7 @@ typedef struct Target {
     void (*build)(struct Target*);
 } Target;
 
-int MaxJobs = 1;
+int MaxJobs = 12;
 
 char* CCCMD[] = {
     "cc",
@@ -51,8 +51,10 @@ char* LDCMD[] = {
 
 char* LIBS[] = {
     "-lnet",
+    "-lui",
     "-la",
     "-lX11",
+    "-lXft",
     "-lfontconfig",
     NULL
 };