Monitor configuration rework started, kernel modules test fix

source/ubl-settings-video.c

@@ -754,16 +754,54 @@ void yon_monitor_view_draw_all(GtkWidget *cnt){
             gtk_container_remove(GTK_CONTAINER(container),window->templateMonitorscreenOverlay);
             }
         }
-        if (container)
+        dictionary *boxes=NULL;
+        if (videoconfig.monitor_output_layers)
+        for_dictionaries(boxes,videoconfig.monitor_output_layers){
+            gtk_widget_destroy((GtkWidget*)boxes->data);
+            if (boxes->prev)
+                free(boxes->prev);
+            boxes->prev=NULL;
+        }
+        free(boxes);
+        videoconfig.monitor_output_layers=NULL;
+        int overall_width=10;
+        yon_dictionary_add_or_create_if_exists_with_data(videoconfig.monitor_output_layers,"Box",gtk_box_new(GTK_ORIENTATION_HORIZONTAL,0));
+        gtk_box_pack_start(GTK_BOX(videoconfig.pack_box),(GtkWidget*)videoconfig.monitor_output_layers->data,0,0,0);
+        gtk_widget_show((GtkWidget*)videoconfig.monitor_output_layers->data);
         for_dictionaries(dict,videoconfig.monitor_visuals){
             monitor_window *window = yon_dictionary_get_data(dict,monitor_window*);
             if(dict->first==dict) {}
             else {
-                gtk_box_pack_start(GTK_BOX(container),window->templateMonitorscreenOverlay,0,0,0);
+                overall_width+=150;
+                gtk_box_pack_start(GTK_BOX(((GtkWidget*)videoconfig.monitor_output_layers->data)),window->templateMonitorscreenOverlay,0,0,0);
+            }
+            int width=0;
+            GdkWindow *cur_window = gtk_widget_get_window(videoconfig.pack_box);
+            if(cur_window)
+            width = gdk_window_get_width(cur_window);
+            printf("%d - %d\n",width,overall_width);
+            if (overall_width+150>width){
+                overall_width=10;
+                yon_dictionary_add_or_create_if_exists_with_data(videoconfig.monitor_output_layers,"Box",gtk_box_new(GTK_ORIENTATION_HORIZONTAL,0));
+                gtk_box_pack_start(GTK_BOX(videoconfig.pack_box),(GtkWidget*)videoconfig.monitor_output_layers->data,0,0,0);
             }
+            
         }
+        gtk_widget_show((GtkWidget*)videoconfig.monitor_output_layers->data);
         monitor_window *window = yon_dictionary_get_data(videoconfig.monitor_visuals->first,monitor_window*);
-        gtk_box_pack_start(GTK_BOX(container),window->templateMonitorscreenOverlay,0,0,0);
+        gtk_box_pack_start(GTK_BOX(((GtkWidget*)videoconfig.monitor_output_layers->data)),window->templateMonitorscreenOverlay,0,0,0);
+        
+
+        // if (container)
+        // for_dictionaries(dict,videoconfig.monitor_visuals){
+        //     monitor_window *window = yon_dictionary_get_data(dict,monitor_window*);
+        //     if(dict->first==dict) {}
+        //     else {
+        //         gtk_box_pack_start(GTK_BOX(container),window->templateMonitorscreenOverlay,0,0,0);
+        //     }
+        // }
+        // monitor_window *window = yon_dictionary_get_data(videoconfig.monitor_visuals->first,monitor_window*);
+        // gtk_box_pack_start(GTK_BOX(container),window->templateMonitorscreenOverlay,0,0,0);
     }
     yon_monitor_view_update();
 }
@@ -1417,9 +1455,10 @@ void yon_adapter_window_setup(widgets_dict *widgets){
     yon_char_divide_search(product,"=",-1);
     char *vendor = yon_config_get_parameter(rtn,size,"vendor");
     yon_char_divide_search(vendor,"=",-1);
-    char *driver_use = yon_config_get_parameter(rtn,size,"Kernel_driver_in_use");
+    char *driver_use = yon_config_get_parameter(rtn,size,"Kernel-driver-in-use");
     yon_char_divide_search(driver_use,"=",-1);
-    char *driver_all = yon_config_get_parameter(rtn,size,"Kernel_modules");
+    char *driver_all = yon_config_get_parameter(rtn,size,"Kernel-modules");
+    driver_all = yon_char_replace(driver_all,"-"," ");
     yon_char_divide_search(driver_all,"=",-1);
     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,
@@ -1554,8 +1593,8 @@ void yon_setup_widgets(widgets_dict *widgets)
     widgets->driverDriverColumn = GTK_TREE_VIEW_COLUMN(gtk_builder_get_object(widgets->builder, "driverDriverColumn"));
     widgets->driverDescriptionColumn = GTK_TREE_VIEW_COLUMN(gtk_builder_get_object(widgets->builder, "driverDescriptionColumn"));
     widgets->driverSupportedColumn = GTK_TREE_VIEW_COLUMN(gtk_builder_get_object(widgets->builder, "driverSupportedColumn"));
-    
+    videoconfig.pack_box=widgets->mainMonitorVisualConfigurationBox;
-    gtk_window_set_title(GTK_WINDOW(widgets->MainWindow),TITLE_LABEL);
+    gtk_window_set_title(GTK_WINDOW(widgets->MainWindow),SETTINGS_VIDEO_TITLE_LABEL);
 
     videoconfig.list = GTK_LIST_STORE(gtk_builder_get_object(widgets->  builder, "liststore6"));
     videoconfig.list2 = GTK_LIST_STORE(gtk_builder_get_object(widgets->  builder, "liststore1"));
@@ -1736,7 +1775,7 @@ int main(int argc, char *argv[])
             }
     }
     
-    if (0){
+    if (getuid()!=0){
         char *args="";
         for (int i=0;i<argc;i++)
             args=yon_char_unite(args," ",argv[i],NULL);

source/ubl-settings-video.h

@@ -76,7 +76,7 @@
 #define get_proprietary_installed_command yon_char_unite("sudo pacman -Ss nvidia-.* |grep -E ",INSTALLED_LOW_LABEL," |grep -oE \"ubm-nvidia-[0-9a-zA-Z]{1,}|nvidia-[0-9]{1,4}xx-dkms\"",NULL)
 // #define get_proprietary_drivers_command "LC_ALL=C pacman -Ss ubm-nvidia-.* |grep -oE \"[a-zA-Z-]{1,}nvidia-[a-zA-Z0-9-]{1,}|installed\"|sed ':a;N;$!ba;s/\\ninstalled/ installed/g'"
 
-#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 "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 XORG_MONITOR(port) yon_char_get_augumented(" XORG_MONITOR[",yon_char_get_augumented(port,"] "))
 
@@ -137,6 +137,8 @@ typedef struct
     int lock_save_global;
     int lock_load_global;
     int lock_help;
+    dictionary *monitor_output_layers;
+    GtkWidget *pack_box;
 } config;
 
 typedef struct

source/ubl-utils.c

@@ -486,6 +486,21 @@ char *yon_char_from_int(int int_to_convert)
     return ch;
 }
 
+char *yon_char_replace(char *source, char *find, char*replace){ 
+    char *final=NULL;
+    char *temp=NULL;
+    if(!strstr(replace,find)){
+        while ((final=strstr(source,find))){
+            temp=malloc(strlen(source)-strlen(final));
+            memset(temp,0,strlen(source)-strlen(final)+strlen(replace));
+            memcpy(temp,source,strlen(source)-strlen(final));
+            temp=yon_char_get_augumented(temp,replace);
+            source=yon_char_get_augumented(temp,final+1);
+        }
+        return source;
+    }
+}
+
 /**[EN]
  * char **yon_char_parse(char *parameters, int *size, char *divider)
  * Parses string [parameters], divided by [divider],

source/ubl-utils.h

@@ -125,6 +125,8 @@ char *yon_char_divide_search(char *source, char *dividepos, int delete_divider);
 
 char *yon_char_from_int(int int_to_convert);
 
+char *yon_char_replace(char *source, char *find, char*replace);
+
 char **yon_char_parse(char *parameters, int *size, char *divider);
 
 char **yon_char_parsed_shrink(char **char_string, int *size, int item_to_delete);

ubl-settings-video.glade

@@ -1696,7 +1696,7 @@ translated and supported by community.</property>
                                             <property name="margin-end">5</property>
                                             <property name="margin-top">5</property>
                                             <property name="margin-bottom">5</property>
-                                            <property name="spacing">10</property>
+                                            <property name="orientation">vertical</property>
                                             <child>
                                               <placeholder/>
                                             </child>