From 5e3d688f31b9419db379fa87bcc60f34e22e939e Mon Sep 17 00:00:00 2001
From: Ivan Yarcev <yarcev.id@ublinux.ru>
Date: Thu, 14 Aug 2025 17:23:49 +0600
Subject: [PATCH] Changed resolutions list

---
 source/ubl-settings-video-monitor.c | 13 -------------
 source/ubl-settings-video.c         |  9 +++++++--
 source/ubl-settings-video.h         |  2 ++
 3 files changed, 9 insertions(+), 15 deletions(-)

diff --git a/source/ubl-settings-video-monitor.c b/source/ubl-settings-video-monitor.c
index de229f6..e3ef44c 100644
--- a/source/ubl-settings-video-monitor.c
+++ b/source/ubl-settings-video-monitor.c
@@ -261,19 +261,6 @@ void on_port_chosen_changed(GtkWidget *, monitor_edit_window *window){
                 config_str parsed = yon_char_parse(main_config.resolutions_sorted[i],&size,";");
                 if (!yon_char_is_empty(parsed[0])){
                     char *cur_res = g_hash_table_lookup(main_config.resolutions,parsed[0]);
-                    int res_size;
-                    config_str parsed_res = yon_char_parse(cur_res,&res_size,";");
-                    char *temp = yon_char_extend(parsed_res[0],' ',12);
-                    if (strcmp(temp,parsed_res[0]))free(parsed_res[0]);
-                    parsed_res[0]=temp;
-                    temp = yon_char_extend(parsed_res[1],' ',5);
-                    if (strcmp(temp,parsed_res[1]))free(parsed_res[1]);
-                    parsed_res[1]=temp;
-                    temp = yon_char_extend(parsed_res[2],' ',10);
-                    if (strcmp(temp,parsed_res[2]))free(parsed_res[2]);
-                    parsed_res[2]=temp;
-                    cur_res = yon_char_parsed_to_string(parsed_res,res_size,"\t");
-                    yon_char_parsed_free(parsed_res,res_size);
                     gtk_combo_box_text_append(GTK_COMBO_BOX_TEXT(window->ResolutionCombo),parsed[0],cur_res);
                 }
                 yon_char_parsed_free(parsed,size);
diff --git a/source/ubl-settings-video.c b/source/ubl-settings-video.c
index 7de93b8..91df846 100644
--- a/source/ubl-settings-video.c
+++ b/source/ubl-settings-video.c
@@ -398,12 +398,17 @@ void yon_proprietary_get_thread(GtkWidget *,main_window *widgets){
 
 void yon_all_resolutions_update(){
     main_config.resolutions_sorted = yon_resource_open_file(get_resolutions_supportable_command,&main_config.resolutions_size);
-    for (int i=1;i<main_config.resolutions_size;i++){
+    char *table_str = yon_char_parsed_to_string(main_config.resolutions_sorted,main_config.resolutions_size,"\n");
+    int format_size;
+    config_str resolutions_formatted = yon_config_load(table_format_command(table_str),&format_size);
+    for (int i=0;i<format_size;i++){
+        yon_char_remove_last_symbol(resolutions_formatted[i],'\n');
         int parsed_size;
         config_str parsed = yon_char_parse(main_config.resolutions_sorted[i],&parsed_size,";");
-        g_hash_table_insert(main_config.resolutions,yon_char_new(parsed[0]),yon_char_new(main_config.resolutions_sorted[i]));
+        g_hash_table_insert(main_config.resolutions,yon_char_new(parsed[0]),yon_char_new(resolutions_formatted[i]));
         yon_char_parsed_free(parsed,parsed_size);
     }
+        yon_char_parsed_free(resolutions_formatted,format_size);
 }
 
 void yon_monitor_set_resolutions(){
diff --git a/source/ubl-settings-video.h b/source/ubl-settings-video.h
index c5bd21a..45409f1 100644
--- a/source/ubl-settings-video.h
+++ b/source/ubl-settings-video.h
@@ -69,6 +69,8 @@ END {\n\
 }\
 '"
 
+#define table_format_command(target) yon_char_unite("tail +2 <<< '",target,"' | column -t -s';'",NULL)
+
 #define get_resolutions_command "xrandr  |grep -noP \"\\d+x+\\d+\""
 #define get_resolution_ports_command "xrandr |grep  -nwP  \"connected\" |grep -oE \"[-0-9a-zA-Z:]{1,} connected\" |grep -oE \"[-0-9a-zA-Z:]{1,} \""