Merge branch 'main' into plugins

Author: Toni500github

include/config.hpp

@@ -69,8 +69,8 @@ class Config : public ConfigBase
     std::string              data_dir;
     std::string              sep_reset;
     std::string              title_sep;
-    std::string              gui_css_file;
     std::string              gui_bg_image;
+    std::string              gui_css_file;
     std::string              ascii_logo_type;
     std::string              logo_position;
     std::string              offset;

include/pci.ids.hpp

@@ -1,6 +1,8 @@
 #ifndef _PCI_IDS_HPP
 #define _PCI_IDS_HPP
 
+/* TODO: delete any subdevices (what the fuck man this REALLY needs a rewrite) */
+
 #include "platform.hpp"
 #if !CF_ANDROID
 
@@ -2674,7 +2676,7 @@ inline std::string get_pci_ids()
 		174b d340  Radeon R7 340 OEM
 		1b0a 90d3  Radeon R7 240 OEM
 	6613  Oland PRO [Radeon R7 240/340 / Radeon 520]
-		148c 7340  Radeon R7 340
+		XXXX XXXX  Radeon R7 340
 		1682 7240  R7 240 2048 MB
 		1dcf 3000  Oland PRO [Radeon R7 240/340 / Radeon 520]
 	6617  Oland LE [Radeon R7 240]

scripts/generate_pci_arrays.py

@@ -54,6 +54,7 @@
 
                 # pci_table[current_vendor][device_id] = device_name
                 continue
+            # TODO: remove all subdevices (useless)
             case 2:
                 # subvendor = line.split(' ')[0]
                 # subdevice_id = line.split(' ')[1]

src/gui.cpp

@@ -44,6 +44,12 @@
 #include "stb_image.h"
 #include "util.hpp"
 
+#include "gdkmm/pixbufanimation.h"
+#include "glibmm/refptr.h"
+#include "gtkmm/cssprovider.h"
+#include "glibmm/main.h"
+#include "gtkmm/enums.h"
+
 using namespace GUI;
 
 // https://www.codespeedy.com/convert-rgb-to-hex-color-code-in-cpp/

src/main.cpp

@@ -27,6 +27,8 @@
 #include <stdlib.h>
 #include <termios.h>
 #include <unistd.h>
+#include <termios.h>
+#include <stdlib.h>
 
 #include <algorithm>
 #include <cerrno>
@@ -91,6 +93,7 @@ static int kbhit()
 {
     struct timeval tv = { 0L, 0L };
     fd_set         fds;
+
     FD_ZERO(&fds);
     FD_SET(STDIN_FILENO, &fds);
     return select(STDIN_FILENO + 1, &fds, NULL, NULL, &tv) > 0;