commit f5906b8e0a0621af88bd6446dfc614b40197027d
parent e6b79cc1e100fb2029d40041bbdf6a97b45afc90
Author: lash <dev@holbrook.no>
Date: Wed, 28 Feb 2024 04:06:19 +0000
Separate gtk source files
Diffstat:
11 files changed, 43 insertions(+), 338 deletions(-)
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,3 @@
-src/*.ui
+src/gtk/*.ui
testdata_mdb
*\~
diff --git a/Makefile b/Makefile
@@ -1,5 +1,10 @@
all: subs
+core: subs
+
+gtk: core
+ make -C src/gtk
+
subs: glade
make -C src
@@ -7,11 +12,12 @@ glade:
gtk4-builder-tool simplify --3to4 glade.ui > src/main.ui
clean:
- rm -vf src/*.o
- rm -vf src/a.out
+ make -C src clean
+ make -C src/gtk clean
+ rm -vf src/aux/varint/*.o
-run: all
- G_MESSAGES_DEBUG=all ./src/a.out
+run: gtk all
+ G_MESSAGES_DEBUG=all ./src/gtk/a.out
-debug: all
- G_DEBUG=3 G_MESSAGES_DEBUG=all ./src/a.out
+debug: gtk all
+ G_DEBUG=3 G_MESSAGES_DEBUG=all ./src/gtk/a.out
diff --git a/src/Makefile b/src/Makefile
@@ -1,19 +1,20 @@
OBJS := $(patsubst %.c,%.o,$(filter-out main.c,$(wildcard *.c)))
-INCLUDES := `pkg-config --cflags gtk4 libgcrypt lmdb libxdg-basedir`
+INCLUDES := `pkg-config --cflags libgcrypt lmdb libxdg-basedir`
CFLAGS += $(INCLUDES) -g3 -Wall -Iaux/varint
-LIBS := `pkg-config --libs gtk4 libgcrypt zlib lmdb libxdg-basedir` -lb64
+LIBS := `pkg-config --libs libgcrypt zlib lmdb libxdg-basedir` -lb64
LDFLAGS += $(LIBS)
-all: aux resource $(OBJS)
- $(CC) $(CFLAGS) main.c -o a.out $(OBJS) $(LDFLAGS) aux/varint/varint.o
+#all: aux resource $(OBJS)
+# $(CC) $(CFLAGS) main.c -o a.out $(OBJS) $(LDFLAGS) aux/varint/varint.o
+all: aux $(OBJS)
%.o: %.c
$(CC) $(CFLAGS) -c $< -o $@ $(LDFLAGS)
-resource:
- glib-compile-resources kee.gresource.xml --target=resources.c --generate-source
-
aux:
make -C aux
+clean:
+ rm -vf *.o
+
.PHONY: clean aux
diff --git a/src/aux/varint/varint.o b/src/aux/varint/varint.o
Binary files differ.
diff --git a/src/gtk/Makefile b/src/gtk/Makefile
@@ -0,0 +1,22 @@
+OBJS := $(patsubst %.c,%.o,$(filter-out main.c,$(wildcard *.c)))
+LINKOBJS := $(wildcard ../*.o) $(OBJS) ../aux/varint/varint.o
+INCLUDES := `pkg-config --cflags gtk4` -I..
+CFLAGS += $(INCLUDES) -g3 -Wall
+LIBS := `pkg-config --libs gtk4 zlib lmdb libgcrypt` -lb64
+LDFLAGS += $(LIBS)
+
+all: resource $(OBJS)
+ $(CC) $(CFLAGS) main.c -o a.out $(LINKOBJS) $(LDFLAGS)
+
+%.o: %.c
+ $(CC) $(CFLAGS) -c $< -o $@ $(LDFLAGS)
+
+debug: all
+
+clean:
+ rm -vf *.o
+ rm -vf a.out
+ rm -vf resources.c
+
+resource:
+ glib-compile-resources kee.gresource.xml --target=resources.c --generate-source
diff --git a/src/debug.c b/src/gtk/debug.c
diff --git a/src/kee.gresource.xml b/src/gtk/kee.gresource.xml
diff --git a/src/main.c b/src/gtk/main.c
diff --git a/src/ui.c b/src/gtk/ui.c
diff --git a/src/ui.h b/src/gtk/ui.h
diff --git a/src/resources.c b/src/resources.c
@@ -1,324 +0,0 @@
-#include <gio/gio.h>
-
-#if defined (__ELF__) && ( __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 6))
-# define SECTION __attribute__ ((section (".gresource.kee"), aligned (8)))
-#else
-# define SECTION
-#endif
-
-static const SECTION union { const guint8 data[1881]; const double alignment; void * const ptr;} kee_resource_data = {
- "\107\126\141\162\151\141\156\164\000\000\000\000\000\000\000\000"
- "\030\000\000\000\254\000\000\000\000\000\000\050\005\000\000\000"
- "\000\000\000\000\003\000\000\000\004\000\000\000\004\000\000\000"
- "\005\000\000\000\113\120\220\013\002\000\000\000\254\000\000\000"
- "\004\000\114\000\260\000\000\000\264\000\000\000\161\002\354\244"
- "\000\000\000\000\264\000\000\000\012\000\114\000\300\000\000\000"
- "\304\000\000\000\324\265\002\000\377\377\377\377\304\000\000\000"
- "\001\000\114\000\310\000\000\000\314\000\000\000\206\165\217\153"
- "\004\000\000\000\314\000\000\000\007\000\166\000\330\000\000\000"
- "\117\007\000\000\065\256\104\147\001\000\000\000\117\007\000\000"
- "\004\000\114\000\124\007\000\000\130\007\000\000\157\162\147\057"
- "\001\000\000\000\144\145\146\141\154\163\151\146\171\057\000\000"
- "\004\000\000\000\057\000\000\000\000\000\000\000\155\141\151\156"
- "\056\165\151\000\000\000\000\000\147\006\000\000\000\000\000\000"
- "\074\077\170\155\154\040\166\145\162\163\151\157\156\075\042\061"
- "\056\060\042\040\145\156\143\157\144\151\156\147\075\042\125\124"
- "\106\055\070\042\077\076\012\074\151\156\164\145\162\146\141\143"
- "\145\076\074\162\145\161\165\151\162\145\163\040\154\151\142\075"
- "\042\147\164\153\042\040\166\145\162\163\151\157\156\075\042\064"
- "\056\060\042\057\076\074\157\142\152\145\143\164\040\143\154\141"
- "\163\163\075\042\107\164\153\127\151\156\144\157\167\042\040\151"
- "\144\075\042\153\145\145\143\150\157\157\163\145\042\076\074\160"
- "\162\157\160\145\162\164\171\040\156\141\155\145\075\042\143\150"
- "\151\154\144\042\076\074\157\142\152\145\143\164\040\143\154\141"
- "\163\163\075\042\107\164\153\114\151\163\164\102\157\170\042\057"
- "\076\074\057\160\162\157\160\145\162\164\171\076\074\057\157\142"
- "\152\145\143\164\076\074\157\142\152\145\143\164\040\143\154\141"
- "\163\163\075\042\107\164\153\127\151\156\144\157\167\042\040\151"
- "\144\075\042\153\145\145\163\143\141\156\042\076\074\160\162\157"
- "\160\145\162\164\171\040\156\141\155\145\075\042\143\150\151\154"
- "\144\042\076\074\157\142\152\145\143\164\040\143\154\141\163\163"
- "\075\042\107\164\153\102\157\170\042\076\074\160\162\157\160\145"
- "\162\164\171\040\156\141\155\145\075\042\157\162\151\145\156\164"
- "\141\164\151\157\156\042\076\166\145\162\164\151\143\141\154\074"
- "\057\160\162\157\160\145\162\164\171\076\074\143\150\151\154\144"
- "\076\074\157\142\152\145\143\164\040\143\154\141\163\163\075\042"
- "\107\164\153\111\155\141\147\145\042\076\074\160\162\157\160\145"
- "\162\164\171\040\156\141\155\145\075\042\151\143\157\156\055\156"
- "\141\155\145\042\076\147\164\153\055\155\151\163\163\151\156\147"
- "\055\151\155\141\147\145\074\057\160\162\157\160\145\162\164\171"
- "\076\074\160\162\157\160\145\162\164\171\040\156\141\155\145\075"
- "\042\165\163\145\055\146\141\154\154\142\141\143\153\042\076\061"
- "\074\057\160\162\157\160\145\162\164\171\076\074\057\157\142\152"
- "\145\143\164\076\074\057\143\150\151\154\144\076\074\143\150\151"
- "\154\144\076\074\160\154\141\143\145\150\157\154\144\145\162\057"
- "\076\074\057\143\150\151\154\144\076\074\143\150\151\154\144\076"
- "\074\160\154\141\143\145\150\157\154\144\145\162\057\076\074\057"
- "\143\150\151\154\144\076\074\057\157\142\152\145\143\164\076\074"
- "\057\160\162\157\160\145\162\164\171\076\074\057\157\142\152\145"
- "\143\164\076\074\157\142\152\145\143\164\040\143\154\141\163\163"
- "\075\042\107\164\153\127\151\156\144\157\167\042\040\151\144\075"
- "\042\153\145\145\165\156\154\157\143\153\042\076\074\160\162\157"
- "\160\145\162\164\171\040\156\141\155\145\075\042\143\150\151\154"
- "\144\042\076\074\157\142\152\145\143\164\040\143\154\141\163\163"
- "\075\042\107\164\153\102\157\170\042\040\151\144\075\042\153\145"
- "\145\165\156\154\157\143\153\142\157\170\042\076\074\160\162\157"
- "\160\145\162\164\171\040\156\141\155\145\075\042\157\162\151\145"
- "\156\164\141\164\151\157\156\042\076\166\145\162\164\151\143\141"
- "\154\074\057\160\162\157\160\145\162\164\171\076\074\143\150\151"
- "\154\144\076\074\157\142\152\145\143\164\040\143\154\141\163\163"
- "\075\042\107\164\153\105\156\164\162\171\042\040\151\144\075\042"
- "\153\145\145\165\156\154\157\143\153\160\141\163\163\160\150\162"
- "\141\163\145\042\076\074\160\162\157\160\145\162\164\171\040\156"
- "\141\155\145\075\042\146\157\143\165\163\141\142\154\145\042\076"
- "\061\074\057\160\162\157\160\145\162\164\171\076\074\057\157\142"
- "\152\145\143\164\076\074\057\143\150\151\154\144\076\074\143\150"
- "\151\154\144\076\074\157\142\152\145\143\164\040\143\154\141\163"
- "\163\075\042\107\164\153\102\165\164\164\157\156\042\040\151\144"
- "\075\042\153\145\145\165\156\154\157\143\153\163\165\142\155\151"
- "\164\042\076\074\160\162\157\160\145\162\164\171\040\156\141\155"
- "\145\075\042\154\141\142\145\154\042\040\164\162\141\156\163\154"
- "\141\164\141\142\154\145\075\042\061\042\076\142\165\164\164\157"
- "\156\074\057\160\162\157\160\145\162\164\171\076\074\160\162\157"
- "\160\145\162\164\171\040\156\141\155\145\075\042\146\157\143\165"
- "\163\141\142\154\145\042\076\061\074\057\160\162\157\160\145\162"
- "\164\171\076\074\160\162\157\160\145\162\164\171\040\156\141\155"
- "\145\075\042\162\145\143\145\151\166\145\163\055\144\145\146\141"
- "\165\154\164\042\076\061\074\057\160\162\157\160\145\162\164\171"
- "\076\074\057\157\142\152\145\143\164\076\074\057\143\150\151\154"
- "\144\076\074\143\150\151\154\144\076\074\160\154\141\143\145\150"
- "\157\154\144\145\162\057\076\074\057\143\150\151\154\144\076\074"
- "\057\157\142\152\145\143\164\076\074\057\160\162\157\160\145\162"
- "\164\171\076\074\057\157\142\152\145\143\164\076\074\157\142\152"
- "\145\143\164\040\143\154\141\163\163\075\042\107\164\153\127\151"
- "\156\144\157\167\042\040\151\144\075\042\153\145\145\166\151\145"
- "\167\042\076\074\160\162\157\160\145\162\164\171\040\156\141\155"
- "\145\075\042\143\150\151\154\144\042\076\074\157\142\152\145\143"
- "\164\040\143\154\141\163\163\075\042\107\164\153\107\162\151\144"
- "\042\040\151\144\075\042\166\151\145\167\042\076\074\143\150\151"
- "\154\144\076\074\157\142\152\145\143\164\040\143\154\141\163\163"
- "\075\042\107\164\153\111\155\141\147\145\042\076\074\160\162\157"
- "\160\145\162\164\171\040\156\141\155\145\075\042\165\163\145\055"
- "\146\141\154\154\142\141\143\153\042\076\061\074\057\160\162\157"
- "\160\145\162\164\171\076\074\154\141\171\157\165\164\076\074\160"
- "\162\157\160\145\162\164\171\040\156\141\155\145\075\042\143\157"
- "\154\165\155\156\042\076\060\074\057\160\162\157\160\145\162\164"
- "\171\076\074\160\162\157\160\145\162\164\171\040\156\141\155\145"
- "\075\042\162\157\167\042\076\060\074\057\160\162\157\160\145\162"
- "\164\171\076\074\160\162\157\160\145\162\164\171\040\156\141\155"
- "\145\075\042\143\157\154\165\155\156\055\163\160\141\156\042\076"
- "\062\074\057\160\162\157\160\145\162\164\171\076\074\160\162\157"
- "\160\145\162\164\171\040\156\141\155\145\075\042\162\157\167\055"
- "\163\160\141\156\042\076\062\074\057\160\162\157\160\145\162\164"
- "\171\076\074\057\154\141\171\157\165\164\076\074\057\157\142\152"
- "\145\143\164\076\074\057\143\150\151\154\144\076\074\143\150\151"
- "\154\144\076\074\160\154\141\143\145\150\157\154\144\145\162\057"
- "\076\074\057\143\150\151\154\144\076\074\143\150\151\154\144\076"
- "\074\160\154\141\143\145\150\157\154\144\145\162\057\076\074\057"
- "\143\150\151\154\144\076\074\143\150\151\154\144\076\074\160\154"
- "\141\143\145\150\157\154\144\145\162\057\076\074\057\143\150\151"
- "\154\144\076\074\143\150\151\154\144\076\074\160\154\141\143\145"
- "\150\157\154\144\145\162\057\076\074\057\143\150\151\154\144\076"
- "\074\143\150\151\154\144\076\074\160\154\141\143\145\150\157\154"
- "\144\145\162\057\076\074\057\143\150\151\154\144\076\074\057\157"
- "\142\152\145\143\164\076\074\057\160\162\157\160\145\162\164\171"
- "\076\074\057\157\142\152\145\143\164\076\074\057\151\156\164\145"
- "\162\146\141\143\145\076\012\000\000\050\165\165\141\171\051\113"
- "\145\145\057\000\003\000\000\000" };
-
-static GStaticResource static_resource = { kee_resource_data.data, sizeof (kee_resource_data.data) - 1 /* nul terminator */, NULL, NULL, NULL };
-
-G_MODULE_EXPORT
-GResource *kee_get_resource (void);
-GResource *kee_get_resource (void)
-{
- return g_static_resource_get_resource (&static_resource);
-}
-/* GLIB - Library of useful routines for C programming
- * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
- *
- * SPDX-License-Identifier: LGPL-2.1-or-later
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, see <http://www.gnu.org/licenses/>.
- */
-
-/*
- * Modified by the GLib Team and others 1997-2000. See the AUTHORS
- * file for a list of people on the GLib Team. See the ChangeLog
- * files for a list of changes. These files are distributed with
- * GLib at ftp://ftp.gtk.org/pub/gtk/.
- */
-
-#ifndef __G_CONSTRUCTOR_H__
-#define __G_CONSTRUCTOR_H__
-
-/*
- If G_HAS_CONSTRUCTORS is true then the compiler support *both* constructors and
- destructors, in a usable way, including e.g. on library unload. If not you're on
- your own.
-
- Some compilers need #pragma to handle this, which does not work with macros,
- so the way you need to use this is (for constructors):
-
- #ifdef G_DEFINE_CONSTRUCTOR_NEEDS_PRAGMA
- #pragma G_DEFINE_CONSTRUCTOR_PRAGMA_ARGS(my_constructor)
- #endif
- G_DEFINE_CONSTRUCTOR(my_constructor)
- static void my_constructor(void) {
- ...
- }
-
-*/
-
-#ifndef __GTK_DOC_IGNORE__
-
-#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 7)
-
-#define G_HAS_CONSTRUCTORS 1
-
-#define G_DEFINE_CONSTRUCTOR(_func) static void __attribute__((constructor)) _func (void);
-#define G_DEFINE_DESTRUCTOR(_func) static void __attribute__((destructor)) _func (void);
-
-#elif defined (_MSC_VER) && (_MSC_VER >= 1500)
-/* Visual studio 2008 and later has _Pragma */
-
-/*
- * Only try to include gslist.h if not already included via glib.h,
- * so that items using gconstructor.h outside of GLib (such as
- * GResources) continue to build properly.
- */
-#ifndef __G_LIB_H__
-#include "gslist.h"
-#endif
-
-#include <stdlib.h>
-
-#define G_HAS_CONSTRUCTORS 1
-
-/* We do some weird things to avoid the constructors being optimized
- * away on VS2015 if WholeProgramOptimization is enabled. First we
- * make a reference to the array from the wrapper to make sure its
- * references. Then we use a pragma to make sure the wrapper function
- * symbol is always included at the link stage. Also, the symbols
- * need to be extern (but not dllexport), even though they are not
- * really used from another object file.
- */
-
-/* We need to account for differences between the mangling of symbols
- * for x86 and x64/ARM/ARM64 programs, as symbols on x86 are prefixed
- * with an underscore but symbols on x64/ARM/ARM64 are not.
- */
-#ifdef _M_IX86
-#define G_MSVC_SYMBOL_PREFIX "_"
-#else
-#define G_MSVC_SYMBOL_PREFIX ""
-#endif
-
-#define G_DEFINE_CONSTRUCTOR(_func) G_MSVC_CTOR (_func, G_MSVC_SYMBOL_PREFIX)
-#define G_DEFINE_DESTRUCTOR(_func) G_MSVC_DTOR (_func, G_MSVC_SYMBOL_PREFIX)
-
-#define G_MSVC_CTOR(_func,_sym_prefix) \
- static void _func(void); \
- extern int (* _array ## _func)(void); \
- int _func ## _wrapper(void); \
- int _func ## _wrapper(void) { _func(); g_slist_find (NULL, _array ## _func); return 0; } \
- __pragma(comment(linker,"/include:" _sym_prefix # _func "_wrapper")) \
- __pragma(section(".CRT$XCU",read)) \
- __declspec(allocate(".CRT$XCU")) int (* _array ## _func)(void) = _func ## _wrapper;
-
-#define G_MSVC_DTOR(_func,_sym_prefix) \
- static void _func(void); \
- extern int (* _array ## _func)(void); \
- int _func ## _constructor(void); \
- int _func ## _constructor(void) { atexit (_func); g_slist_find (NULL, _array ## _func); return 0; } \
- __pragma(comment(linker,"/include:" _sym_prefix # _func "_constructor")) \
- __pragma(section(".CRT$XCU",read)) \
- __declspec(allocate(".CRT$XCU")) int (* _array ## _func)(void) = _func ## _constructor;
-
-#elif defined (_MSC_VER)
-
-#define G_HAS_CONSTRUCTORS 1
-
-/* Pre Visual studio 2008 must use #pragma section */
-#define G_DEFINE_CONSTRUCTOR_NEEDS_PRAGMA 1
-#define G_DEFINE_DESTRUCTOR_NEEDS_PRAGMA 1
-
-#define G_DEFINE_CONSTRUCTOR_PRAGMA_ARGS(_func) \
- section(".CRT$XCU",read)
-#define G_DEFINE_CONSTRUCTOR(_func) \
- static void _func(void); \
- static int _func ## _wrapper(void) { _func(); return 0; } \
- __declspec(allocate(".CRT$XCU")) static int (*p)(void) = _func ## _wrapper;
-
-#define G_DEFINE_DESTRUCTOR_PRAGMA_ARGS(_func) \
- section(".CRT$XCU",read)
-#define G_DEFINE_DESTRUCTOR(_func) \
- static void _func(void); \
- static int _func ## _constructor(void) { atexit (_func); return 0; } \
- __declspec(allocate(".CRT$XCU")) static int (* _array ## _func)(void) = _func ## _constructor;
-
-#elif defined(__SUNPRO_C)
-
-/* This is not tested, but i believe it should work, based on:
- * http://opensource.apple.com/source/OpenSSL098/OpenSSL098-35/src/fips/fips_premain.c
- */
-
-#define G_HAS_CONSTRUCTORS 1
-
-#define G_DEFINE_CONSTRUCTOR_NEEDS_PRAGMA 1
-#define G_DEFINE_DESTRUCTOR_NEEDS_PRAGMA 1
-
-#define G_DEFINE_CONSTRUCTOR_PRAGMA_ARGS(_func) \
- init(_func)
-#define G_DEFINE_CONSTRUCTOR(_func) \
- static void _func(void);
-
-#define G_DEFINE_DESTRUCTOR_PRAGMA_ARGS(_func) \
- fini(_func)
-#define G_DEFINE_DESTRUCTOR(_func) \
- static void _func(void);
-
-#else
-
-/* constructors not supported for this compiler */
-
-#endif
-
-#endif /* __GTK_DOC_IGNORE__ */
-#endif /* __G_CONSTRUCTOR_H__ */
-
-#ifdef G_HAS_CONSTRUCTORS
-
-#ifdef G_DEFINE_CONSTRUCTOR_NEEDS_PRAGMA
-#pragma G_DEFINE_CONSTRUCTOR_PRAGMA_ARGS(keeresource_constructor)
-#endif
-G_DEFINE_CONSTRUCTOR(keeresource_constructor)
-#ifdef G_DEFINE_DESTRUCTOR_NEEDS_PRAGMA
-#pragma G_DEFINE_DESTRUCTOR_PRAGMA_ARGS(keeresource_destructor)
-#endif
-G_DEFINE_DESTRUCTOR(keeresource_destructor)
-
-#else
-#warning "Constructor not supported on this compiler, linking in resources will not work"
-#endif
-
-static void keeresource_constructor (void)
-{
- g_static_resource_init (&static_resource);
-}
-
-static void keeresource_destructor (void)
-{
- g_static_resource_fini (&static_resource);
-}
