From 9e34de51b2a7668fff6da3511ce1aa4d900ebea9 Mon Sep 17 00:00:00 2001
From: Ivan Yarcev <yarcev.id@ublinux.ru>
Date: Thu, 18 Apr 2024 12:43:15 +0600
Subject: [PATCH] Fixes

---
 source/ubl-settings-video.c | 26 ++++++++++++++++++++------
 source/ubl-settings-video.h | 11 ++++++-----
 ubl-settings-video.glade    |  8 ++++++--
 3 files changed, 32 insertions(+), 13 deletions(-)

diff --git a/source/ubl-settings-video.c b/source/ubl-settings-video.c
index 40e4404..ac915fa 100644
--- a/source/ubl-settings-video.c
+++ b/source/ubl-settings-video.c
@@ -1153,10 +1153,17 @@ void yon_adapter_window_setup(main_window *widgets){
                 driver_use = json_object_get_string(unit_obj);
         }
         const char *driver_all="";
-        if (json_object_object_get_ex(item_obj, "configuration", &unit_obj)) {
-            if (json_object_object_get_ex(unit_obj, "driver", &unit_obj))
-                driver_all = json_object_get_string(unit_obj);
+        int loaded_size;
+        config_str loaded = yon_config_load(get_drivers_for_card_command,&loaded_size);
+        for (int i=0;i<loaded_size;i++){
+            free(yon_char_divide_search(loaded[i],"=",-1));
+            yon_char_remove_last_symbol(loaded[i],'\n');
+        }
+        int pos = yon_char_parsed_check_exist(loaded,loaded_size,(char*)driver_use);
+        if (pos>-1){
+            driver_all=yon_char_new(loaded[pos+1]);
         }
+        yon_char_parsed_free(loaded,loaded_size);
         char *final_text = yon_char_unite("<span size=\"12pt\"><span weight='bold' color='#1a5fb4'>",DESCRIPTION_LABEL,":</span> ",_(desc),
         "\n<span weight='bold' color='#1a5fb4'>",VENDOR_LABEL,":</span> ",vendor,
         "\n<span weight='bold' color='#1a5fb4'>",MODEL_LABEL,":</span> ",product,
@@ -1205,10 +1212,17 @@ void yon_adapter_window_setup(main_window *widgets){
                 driver_use = json_object_get_string(unit_obj);
         }
         const char *driver_all="";
-        if (json_object_object_get_ex(item_obj, "configuration", &unit_obj)) {
-            if (json_object_object_get_ex(unit_obj, "driver", &unit_obj))
-                driver_all = json_object_get_string(unit_obj);
+        int loaded_size;
+        config_str loaded = yon_config_load(get_drivers_for_card_command,&loaded_size);
+        for (int i=0;i<loaded_size;i++){
+            free(yon_char_divide_search(loaded[i],"=",-1));
+            yon_char_remove_last_symbol(loaded[i],'\n');
+        }
+        int pos = yon_char_parsed_check_exist(loaded,loaded_size,(char*)driver_use);
+        if (pos>-1){
+            driver_all=yon_char_new(loaded[pos+1]);
         }
+        yon_char_parsed_free(loaded,loaded_size);
         char *final_text = yon_char_unite("<span size=\"12pt\"><span weight='bold' color='#1a5fb4'>",DESCRIPTION_LABEL,":</span> ",_(desc),
         "\n<span weight='bold' color='#1a5fb4'>",VENDOR_LABEL,":</span> ",vendor,
         "\n<span weight='bold' color='#1a5fb4'>",MODEL_LABEL,":</span> ",product,
diff --git a/source/ubl-settings-video.h b/source/ubl-settings-video.h
index 31b670c..b2d9ce0 100644
--- a/source/ubl-settings-video.h
+++ b/source/ubl-settings-video.h
@@ -88,6 +88,7 @@
 
 #define get_adapter_info "lshw -c display -quiet |grep -oE \"vendor:[0-9a-zA-Z ]{1,}|description:[0-9a-zA-Z ]{1,}|product:[]0-9a-zA-Z [-]{1,}\"|sed 's/: /=/g';lspci | grep -E ' VGA | Display ' | cut -d\" \" -f 1 | xargs -i lspci -v -s {} |grep -oE \"Kernel[:a-zA-Z0-9: ,_]{1,}\"|sed 's/: /=/g'|sed 's/ /-/g'"
 #define get_adapter_info_json "lshw -c display -quiet -json"
+#define get_drivers_for_card_command "lspci | grep -E ' VGA | Display ' | cut -d' ' -f 1 | xargs -i lspci -k -s {}|grep Kernel|sed -e 's/^\t*//g' -e 's/Kernel driver in use: /uses=/g' -e 's/Kernel modules: /all=/g'"
 
 #define XORG_MONITOR(port) yon_char_append("XORG_MONITOR[",yon_char_append(port,"]"))
 #define VGADRV_AUTO "VGADRV_AUTO"
@@ -111,16 +112,16 @@
 #define OPTIRUN_command "ubconfig --source global get [video] OPTIRUN"
 #define PRIMUSRUN_command "ubconfig --source global get [video] PRIMUSRUN"
 #define INTEGRATEDVGA_command "ubconfig --source global get [video] INTEGRATEDVGA"
-#define KWIN_TRIPLE_BUFFER_command "ubconfig --source global get [/etc/profile.d/ublinux.sh] \"export KWIN_TRIPLE_BUFFER\""
-#define GL_YIELD_command "ubconfig --source global get [/etc/profile.d/ublinux.sh] \"export __GL_YIELD\""
+#define KWIN_TRIPLE_BUFFER_command "ubconfig --source global get [/etc/profile.d/ublinux.sh] KWIN_TRIPLE_BUFFER"
+#define GL_YIELD_command "ubconfig --source global get [/etc/profile.d/ublinux.sh] __GL_YIELD"
 
 #define XORG_PARAMETER "XORG_MONITOR"
 
 #define config_get_command(target) yon_char_append("cat ",target)
 
-#define yon_config_get_custom_command(target) yon_char_unite("ubconfig --source ",target," get [video] XORG_MONITOR[*] VGADRV_AUTO VGADRV_NOFREE XORG_EXT XORG_DPI FAILSAFEATI FAILSAFENVIDIA OPTIRUN PRIMUSRUN INTEGRATEDVGA",NULL), yon_char_unite("ubconfig --source ",target," get  [/etc/profile.d/ublinux.sh] \"export KWIN_TRIPLE_BUFFER\" \"export __GL_YIELD\"",NULL)
-#define config_get_local_command "ubconfig --source system get [video] XORG_MONITOR[*] VGADRV_AUTO VGADRV_NOFREE XORG_EXT XORG_DPI FAILSAFEATI FAILSAFENVIDIA OPTIRUN PRIMUSRUN INTEGRATEDVGA", "ubconfig --source system get [/etc/profile.d/ublinux.sh] \"export KWIN_TRIPLE_BUFFER\" \"export __GL_YIELD\""
-#define config_get_global_command yon_char_new("ubconfig --source global get [video] XORG_MONITOR[*] VGADRV_AUTO VGADRV_NOFREE XORG_EXT XORG_DPI FAILSAFEATI FAILSAFENVIDIA OPTIRUN PRIMUSRUN INTEGRATEDVGA"), "ubconfig --source global get [/etc/profile.d/ublinux.sh] \"export KWIN_TRIPLE_BUFFER\" \"export __GL_YIELD\""
+#define yon_config_get_custom_command(target) yon_char_unite("ubconfig --source ",target," get [video] XORG_MONITOR[*] VGADRV_AUTO VGADRV_NOFREE XORG_EXT XORG_DPI FAILSAFEATI FAILSAFENVIDIA OPTIRUN PRIMUSRUN INTEGRATEDVGA",NULL)
+#define config_get_local_command "ubconfig --source system get [video] XORG_MONITOR[*] VGADRV_AUTO VGADRV_NOFREE XORG_EXT XORG_DPI FAILSAFEATI FAILSAFENVIDIA OPTIRUN PRIMUSRUN INTEGRATEDVGA"
+#define config_get_global_command yon_char_new("ubconfig --source global get [video] XORG_MONITOR[*] VGADRV_AUTO VGADRV_NOFREE XORG_EXT XORG_DPI FAILSAFEATI FAILSAFENVIDIA OPTIRUN PRIMUSRUN INTEGRATEDVGA")
 #define config_get_default_command ""
 
 #define config_get_global_only_parameters ""
diff --git a/ubl-settings-video.glade b/ubl-settings-video.glade
index 8682da1..a55b9eb 100644
--- a/ubl-settings-video.glade
+++ b/ubl-settings-video.glade
@@ -894,7 +894,6 @@
                                     </child>
                                     <child>
                                       <object class="GtkButton" id="OptirunButton">
-                                        <property name="visible">True</property>
                                         <property name="can-focus">True</property>
                                         <property name="receives-default">True</property>
                                         <property name="image">image1</property>
@@ -960,7 +959,6 @@
                                     </child>
                                     <child>
                                       <object class="GtkButton" id="PrimusrunButton">
-                                        <property name="visible">True</property>
                                         <property name="can-focus">True</property>
                                         <property name="receives-default">True</property>
                                         <property name="image">image2</property>
@@ -1095,6 +1093,9 @@
                             <property name="enable-grid-lines">vertical</property>
                             <property name="enable-tree-lines">True</property>
                             <property name="tooltip-column">4</property>
+                            <child internal-child="selection">
+                              <object class="GtkTreeSelection"/>
+                            </child>
                             <child>
                               <object class="GtkTreeViewColumn" id="proprietartInstalledColumn">
                                 <property name="title" translatable="yes">Installed</property>
@@ -1265,6 +1266,9 @@
                             <property name="enable-grid-lines">vertical</property>
                             <property name="enable-tree-lines">True</property>
                             <property name="tooltip-column">4</property>
+                            <child internal-child="selection">
+                              <object class="GtkTreeSelection"/>
+                            </child>
                             <child>
                               <object class="GtkTreeViewColumn" id="driverInstalledColumn">
                                 <property name="title" translatable="yes">Installed</property>