10102218

Author: rdwnsjjd

README.md

@@ -37,9 +37,9 @@ it simply tracks your mouse and keyboard usage on your system by reading `/dev/i
 when they become idle for 2 min, the app considers your time as "waste time" and as you come back it will continue normally.
 
 #### How to use it?
-You can directly use the `/build/clocker` binary file by copying it to the `/bin` system directory.
+You can directly use the `/build/clocker` binary file by copying it to the `/usr/bin` system directory.
 or make source easily by running `make && make install` in the root directory of the project (recommended).
-it will copy `clocker` to `/bin` and clocker updater to `/root/.clocker`.
+it will copy `clocker` and `clocker updater` to `/usr/bin`.
 for run clocker run:
 ```
 $ sudo clocker

common/info.h renamed to common/defs.h

@@ -15,19 +15,34 @@
 // You should have received a copy of the GNU General Public License
 // along with Clocker.  If not, see <http://www.gnu.org/licenses/>.
 
-#ifndef COMMON_INFO_H
-#define COMMON_INFO_H
+#ifndef COMMON_DEFS_H
+#define COMMON_DEFS_H
 
 #include "../includes/common/inc.h"
 
-Str clocker_banner = COLOR_TRANSPARENT"\n"\
+#define INIT_VERSION "0.2-beta.0"
+
+#define CLOCKER_BANNER  COLOR_TRANSPARENT"\n"\
 "   █████████  ████                    █████\n" \
 "  ███░░░░░███░░███                   ░░███\n" \
 " ███     ░░░  ░███   ██████   ██████  ░███ █████  ██████  ████████\n" \
 "░███          ░███  ███░░███ ███░░███ ░███░░███  ███░░███░░███░░███\n" \
 "░███          ░███ ░███ ░███░███ ░░░  ░██████░  ░███████  ░███ ░░░\n" \
 "░░███     ███ ░███ ░███ ░███░███  ███ ░███░░███ ░███░░░   ░███\n" \
 " ░░█████████  █████░░██████ ░░██████  ████ █████░░██████  █████\n" \
-"  ░░░░░░░░░  ░░░░░  ░░░░░░   ░░░░░░  ░░░░ ░░░░░  ░░░░░░  ░░░░░\n"COLOR_RESET;
+"  ░░░░░░░░░  ░░░░░  ░░░░░░   ░░░░░░  ░░░░ ░░░░░  ░░░░░░  ░░░░░\n"COLOR_RESET
+
+
+#define ERR_TXT(txt_)           COLOR_RED          txt_ COLOR_RESET 
+#define WRN_TXT(txt_)           COLOR_YELLOW       txt_ COLOR_RESET 
+#define OK_TXT(txt_)            COLOR_GREEN        txt_ COLOR_RESET
+#define INF_TXT(txt_)           COLOR_B_CYAN         txt_ COLOR_RESET
+
+#define DNG_TXT(txt_)           COLOR_B_RED          txt_ COLOR_RESET 
+#define ATT_TXT(txt_)           COLOR_B_YELLOW       txt_ COLOR_RESET 
+
+#define TRANSPARENT_TXT(txt_)   COLOR_TRANSPARENT  txt_ COLOR_RESET
+#define BOLD_TXT(txt_)          COLOR_BOLD         txt_ COLOR_RESET
+#define ITALIC_TXT(txt_)        COLOR_ITALIC       txt_ COLOR_RESET
 
-#endif // COMMON_INFO_H
+#endif // COMMON_DEFS_H

headers/cmd.h

@@ -19,6 +19,7 @@
 #define HEADERS_CMD_H
 
 #include "../includes/common/inc.h"
+#include "../headers/mutexed.h"
 
 Hndl cmd_run(Hndl state);
 

headers/listener.h

@@ -19,6 +19,7 @@
 #define HEADERS_LISTENER_H
 
 #include "../includes/common/inc.h"
+#include "../common/defs.h"
 
 typedef UInt64 Listener;
 

headers/sig_handler.h

@@ -20,9 +20,10 @@
 
 #include <signal.h>
 #include "../includes/common/inc.h"
+#include "../common/defs.h"
 
 typedef sig_t Sig;
 
-Sig sig_handler(Int32 signal);
+Void signal_handler(Int32 signal);
 
 #endif // HEADERS_SIG_HANDLER_H

headers/env.h renamed to headers/thread_arg.h

@@ -19,7 +19,46 @@
 #define HEADERS_ENV_H
 
 #include "../includes/common/inc.h"
+#include "../headers/mutexed.h"
 
+typedef enum {
+    TM_Default,
+    TM_Busy,
+    TM_Paused
+}
+TimeMode;
 
+typedef enum {
+    TC_None,
+    TC_End,
+    TC_Report,
+    TC_Pause,
+    TC_Resume
+}
+TimeCommand;
+
+typedef struct {
+    Str      version;
+    Mutexed* mode;
+    Mutexed* command;
+}
+TreadArg;
+
+
+INLINE Str time_mode_from(TimeMode mode) {
+    switch (mode) {
+        case TM_Default:
+            return "default";
+
+        case TM_Busy:
+            return "busy";
+
+        case TM_Paused:
+            return WRN_TXT("paused");
+        
+        default:
+            return "";
+    }
+}
 
 #endif // HEADERS_ENV_H

headers/time_handler.h

@@ -19,6 +19,7 @@
 #define HEADERS_TIME_HANDLE_H
 
 #include "../includes/common/inc.h"
+#include "../headers/thread_arg.h"
 
 Hndl time_handle(Void* arg);
 

headers/updater_checker.h

@@ -21,6 +21,7 @@
 #define HEADERS_UPDATECHRCKER_H
 
 #include "../includes/common/inc.h"
+#include "../common/defs.h"
 
 typedef enum {
     US_Error,

includes/prims/inc/debug.h

@@ -39,6 +39,12 @@
 #define COLOR_CYAN    "\x1b[36m"
 #define COLOR_RESET   "\x1b[0m"
 
+#define COLOR_B_RED     "\x1b[91m"
+#define COLOR_B_GREEN   "\x1b[92m"
+#define COLOR_B_YELLOW  "\x1b[93m"
+#define COLOR_B_BLUE    "\x1b[94m"
+#define COLOR_B_CYAN    "\x1b[96m"
+
 #define __FILENAME__        (strrchr(__FILE__, '/') ? strrchr(__FILE__, '/') + 1 : __FILE__)  
 
 #define ERR_LBL "ERR"

makefile

@@ -29,22 +29,25 @@ clocker := ${current}/src/clocker.c
 updater := ${current}/src/updater.c
 
 buildClocker := ${current}/build/clocker
-buildUpdater := ${current}/build/updater
+buildUpdater := ${current}/build/clocker-updater
 
 all: 
 	@mkdir -p ${current}/build
-	@gcc -w -g ${component} ${clocker} -o ${buildClocker} -lpthread
-	@gcc -w -g ${updater} ${current}/src/components/update_checker.c -o ${buildUpdater} -lpthread
+	@gcc -fcompare-debug-second -w -g ${component} ${clocker} -o ${buildClocker} -lpthread
+	@gcc -fcompare-debug-second -w -g ${updater} ${current}/src/components/update_checker.c -o ${buildUpdater} -lpthread
 
 install: 
-	@mkdir -p /root/.clocker
-	@gcc -w -g ${component} ${clocker} -o /bin/clocker  -lpthread
-	@gcc -w -g ${updater} ${current}/src/components/update_checker.c -o /root/.clocker/clocker-updater  -lpthread
+	@mkdir -p /root/.config/clocker
+	@cp ${buildClocker} /usr/bin
+	@cp ${buildUpdater} /usr/bin
 
 run:
 	@sudo ${buildClocker}
 
+clean:
+	@rm -rf ${current}/build/
 
 uninstall:
-	@rm -rf /root/.clocker
-	@rm /bin/clocker
+	@rm -rf /root/.config/clocker
+	@rm /usr/bin/clocker
+	@rm /usr/bin/clocker-updater