minor fixes and debug improvements

Author: sulincix

meson.build

@@ -20,7 +20,7 @@ src = [
     'src/tools/screenshot.cpp',
     'src/tools/save-load.cpp',
     'src/tools/pen.cpp',
-    'src/utils/which.c',
+    'src/utils/misc.c',
 ]
 
 subdir('po')

src/SetupWidgets.cpp

@@ -63,6 +63,9 @@ void setupWidgets(){
         if(floatingSettings->current_page == 0){
             floatingSettings->setHide();
             return;
+        }
+        if(drawing->getPen() != PEN && drawing->getPen() != MARKER){
+            setPen(PEN);
         }
 	      floatingSettings->setPage(0);
         floatingWidget->moveAction();

src/tools.h

@@ -27,12 +27,20 @@
 #include <libintl.h>
 
 
+extern "C" {
+    extern size_t _cur_time;
+    size_t get_epoch();
+    char* which(const char* cmd);
+}
+
+
 #ifndef DEBUG
 #define debug(...)
 #else
-#define debug printf("[%s]:", __func__); printf
+#define debug printf("[%s:%ld]:", __func__, get_epoch() - _cur_time); _cur_time = get_epoch(); printf
 #endif
 
+
 #define _(String) gettext(String)
 
 #include "utils/Settings.h"

src/tools/pen.cpp

@@ -75,6 +75,7 @@ void setupPenType(){
     });
 
     penButtons[ERASER] = create_button(ERASER, [=](){
+        setPenStyle(SPLINE);
         setPen(ERASER);
     });
 

src/tools/update.cpp

@@ -15,13 +15,13 @@ void updateGui(){
     toolButtons[PENMENU]->setStyleSheet("background-color: none;");
     toolButtons[ERASERMENU]->setStyleSheet("background-color: none;");
 
+    set_icon(get_icon_by_id(PEN), toolButtons[PENMENU]);
     if(drawing->getPen() == MARKER || drawing->getPen() == PEN){
         set_icon(get_icon_by_id(drawing->getPen()), toolButtons[PENMENU]);
         toolButtons[PENMENU]->setStyleSheet("background-color:"+drawing->penColor.name()+";");
     } else if (drawing->getPen() == ERASER){
         toolButtons[ERASERMENU]->setStyleSheet("background-color:"+drawing->penColor.name()+";");
     }
-    toolButtons[SHAPEMENU]->setEnabled(drawing->getPen() != ERASER);
     set_icon(get_icon_by_id(drawing->getPenStyle()), toolButtons[SHAPEMENU]);
     // Update button backgrounds
     for (auto it = penButtons.begin(); it != penButtons.end(); ++it) {

src/utils/ScreenShot.cpp

@@ -19,9 +19,6 @@ extern DrawingWidget *drawing;
 
 #define _(String) gettext(String)
 
-extern "C" {
-#include "which.h"
-}
 
 void takeScreenshot(){
     QString pics = QStandardPaths::writableLocation(QStandardPaths::PicturesLocation);

src/utils/which.c src/utils/misc.csrc/utils/which.c renamed to src/utils/misc.c

@@ -10,14 +10,26 @@
 #include <string.h>
 #include <sys/stat.h>
 
-#include "which.h"
+#include <sys/time.h>
+#include <fcntl.h>
+#include <stdlib.h>
+#include <sys/file.h>
+#include <errno.h>
+
+size_t _cur_time;
+size_t get_epoch(){
+    struct timeval tv;
+    gettimeofday(&tv, NULL);
+    return 1000000 * tv.tv_sec + tv.tv_usec;
+}
 
-char* which(char* cmd){
+
+char* which(const char* cmd){
     char* fullPath = strdup(getenv("PATH")); // Duplicate the PATH string
 
     struct stat buffer;
     int exists;
-    char* fileOrDirectory = cmd;
+    char* fileOrDirectory = (char*)cmd;
     char *fullfilename = calloc(1024, sizeof(char));
 
     char *token = strtok(fullPath, ":");
@@ -31,9 +43,9 @@ char* which(char* cmd){
             return fullfilename;
         }
 
-	    token = strtok(NULL, ":"); /* next token */
+      token = strtok(NULL, ":"); /* next token */
     }
     free(fullPath); // Free the duplicated string
     free(fullfilename);
     return "";
-}
+}