From 156ac2594a7e29d6841476a68e4e9545a0600da8 Mon Sep 17 00:00:00 2001 From: "Michael D. Lowis" Date: Fri, 11 Dec 2020 16:36:28 -0500 Subject: [PATCH] reorganized and started fleshing out what UI programs will look like starting with screenlock --- bin/screenlock.c | 9 +++++++++ inc/ffind.h | 0 inc/gui.h | 0 inc/{libui_impl.h => impl/libui.h} | 0 inc/rc.h | 0 inc/task.h | 0 inc/vte.h | 0 lib/ui/font_close.c | 2 +- lib/ui/font_load.c | 2 +- lib/ui/ui_begin.c | 2 +- lib/ui/ui_end.c | 2 +- lib/ui/window_create.c | 5 +---- lib/ui/window_delete.c | 2 +- lib/ui/window_hide.c | 4 ++-- lib/ui/window_show.c | 7 +++---- tools/build.c | 4 +++- 16 files changed, 23 insertions(+), 16 deletions(-) delete mode 100644 inc/ffind.h delete mode 100644 inc/gui.h rename inc/{libui_impl.h => impl/libui.h} (100%) delete mode 100644 inc/rc.h delete mode 100644 inc/task.h delete mode 100644 inc/vte.h diff --git a/bin/screenlock.c b/bin/screenlock.c index cbfdb1c..6b66458 100644 --- a/bin/screenlock.c +++ b/bin/screenlock.c @@ -1,6 +1,15 @@ +#include +#include + 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 index e69de29..0000000 diff --git a/inc/gui.h b/inc/gui.h deleted file mode 100644 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 index e69de29..0000000 diff --git a/inc/task.h b/inc/task.h deleted file mode 100644 index e69de29..0000000 diff --git a/inc/vte.h b/inc/vte.h deleted file mode 100644 index e69de29..0000000 diff --git a/lib/ui/font_close.c b/lib/ui/font_close.c index fed619d..c812ae8 100644 --- a/lib/ui/font_close.c +++ b/lib/ui/font_close.c @@ -1,6 +1,6 @@ #include #include -#include "libui_impl.h" +#include void font_close(UIFont font) { diff --git a/lib/ui/font_load.c b/lib/ui/font_load.c index 4529752..cbb286b 100644 --- a/lib/ui/font_load.c +++ b/lib/ui/font_load.c @@ -1,6 +1,6 @@ #include #include -#include "libui_impl.h" +#include UIFont font_load(char* patt) { diff --git a/lib/ui/ui_begin.c b/lib/ui/ui_begin.c index 8d7d5b9..46fae72 100644 --- a/lib/ui/ui_begin.c +++ b/lib/ui/ui_begin.c @@ -1,6 +1,6 @@ #include #include -#include "libui_impl.h" +#include void ui_begin(UIWin* win) { diff --git a/lib/ui/ui_end.c b/lib/ui/ui_end.c index 45c0f3a..01dc0ed 100644 --- a/lib/ui/ui_end.c +++ b/lib/ui/ui_end.c @@ -1,6 +1,6 @@ #include #include -#include "libui_impl.h" +#include void ui_end(UIWin* win) { diff --git a/lib/ui/window_create.c b/lib/ui/window_create.c index 4bf078b..6d16209 100644 --- a/lib/ui/window_create.c +++ b/lib/ui/window_create.c @@ -1,9 +1,6 @@ #include #include -#include "libui_impl.h" - -//static Display* XDisplay = NULL; -//struct UIWin* Managed_Windows = NULL; +#include struct XConf X = {0}; diff --git a/lib/ui/window_delete.c b/lib/ui/window_delete.c index 45f29eb..3170660 100644 --- a/lib/ui/window_delete.c +++ b/lib/ui/window_delete.c @@ -1,6 +1,6 @@ #include #include -#include "libui_impl.h" +#include void win_delete(UIWin* win) { diff --git a/lib/ui/window_hide.c b/lib/ui/window_hide.c index c4f8ca3..5bf01e7 100644 --- a/lib/ui/window_hide.c +++ b/lib/ui/window_hide.c @@ -1,8 +1,8 @@ #include #include -#include "libui_impl.h" +#include -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 b2f92f8..2eae6b9 100644 --- a/lib/ui/window_show.c +++ b/lib/ui/window_show.c @@ -1,10 +1,9 @@ #include #include -#include "libui_impl.h" +#include 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 f163af6..cdb0721 100644 --- 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 }; -- 2.54.0