Add xrdb file template

Author: tehaleph

tools/converter.py

@@ -9,7 +9,6 @@
 
 iterm_re = re.compile("(.+)\.itermcolors$")
 iterm_ext = '.itermcolors'
-xrdb_ext = '.xrdb'
 hex_format = '%02x%02x%02x'
 
 red_comp = 'Red Component'
@@ -25,13 +24,11 @@ def __init__(
             loader: Environment,
             bar: Progress,
             path_to_iterm_schemes: str,
-            path_to_xrdb: str,
             output_dir: str
     ):
         self.bar = bar
         self.loader = loader
         self.iterm_dir = path_to_iterm_schemes
-        self.xrdb_dir = path_to_xrdb
         self.out_dir = output_dir
 
         self.templates = self.get_all_templates(templates)
@@ -63,7 +60,6 @@ def parse_scheme(self, scheme):
         colors_dict = {}
 
         iterm_path = self.iterm_dir + scheme + iterm_ext
-        xrdb_path = self.xrdb_dir + scheme + xrdb_ext
 
         if not os.path.isfile(iterm_path):
             logging.error('Scheme ' + iterm_path + ' doesn\'t exist')
@@ -93,11 +89,6 @@ def parse_scheme(self, scheme):
 
         f.close()
 
-        # xrdb files were used to generate themes, now it is not needed
-        # but in case someone uses them for other purposes, these files continue to be saved
-        if not os.path.isfile(xrdb_path):
-            self.generate_xrdb_file(xrdb_path, colors_dict)
-
         return colors_dict
 
     def detect_dark_theme(self, hex):
@@ -126,14 +117,6 @@ def calculcate_color_components_guint16(self, color_components):
     def calculate_guint16(self, x):
         return str(int((x * 256)) + int((x * 256)) * 256)
 
-    def generate_xrdb_file(self, xrdb_path, hex_dict):
-        with open(xrdb_path, 'w') as f:
-            for color_name in hex_dict:
-                color_hex = hex_dict[color_name]
-                f.write('#define ' + color_name.replace(' ', '_') + ' #' + color_hex['hex'] + '\n')
-
-            f.close()
-
     def generate_from_template(self, task_id, colors, template):
         self.bar.update(task_id, total=len(self.schemes))
 

tools/gen.py

@@ -79,7 +79,6 @@
         loader=file_system_loader,
         bar=progress_bar,
         path_to_iterm_schemes='../schemes/',
-        path_to_xrdb='../xrdb/',
         output_dir='../'
     )
 

tools/templates/xrdb.xrdb

@@ -0,0 +1,33 @@
+#define Ansi_0_Color #{{ Ansi_0_Color.hex }}
+#define Ansi_1_Color #{{ Ansi_1_Color.hex }}
+#define Ansi_10_Color #{{ Ansi_10_Color.hex }}
+#define Ansi_11_Color #{{ Ansi_11_Color.hex }}
+#define Ansi_12_Color #{{ Ansi_12_Color.hex }}
+#define Ansi_13_Color #{{ Ansi_13_Color.hex }}
+#define Ansi_14_Color #{{ Ansi_14_Color.hex }}
+#define Ansi_15_Color #{{ Ansi_15_Color.hex }}
+#define Ansi_2_Color #{{ Ansi_2_Color.hex }}
+#define Ansi_3_Color #{{ Ansi_3_Color.hex }}
+#define Ansi_4_Color #{{ Ansi_4_Color.hex }}
+#define Ansi_5_Color #{{ Ansi_5_Color.hex }}
+#define Ansi_6_Color #{{ Ansi_6_Color.hex }}
+#define Ansi_7_Color #{{ Ansi_7_Color.hex }}
+#define Ansi_8_Color #{{ Ansi_8_Color.hex }}
+#define Ansi_9_Color #{{ Ansi_9_Color.hex }}
+#define Background_Color #{{ Background_Color.hex }}
+{% if Badge_Color %}#define Badge_Color #{{ Badge_Color.hex }}
+{% endif %}
+#define Bold_Color #{{ Bold_Color.hex }}
+#define Cursor_Color #{{ Cursor_Color.hex }}
+{% if Cursor_Guide_Color %}#define Cursor_Guide_Color #{{ Cursor_Guide_Color.hex }}
+{% endif %}
+#define Cursor_Text_Color #{{ Cursor_Text_Color.hex }}
+#define Foreground_Color #{{ Foreground_Color.hex }}
+{% if Link_Color %}#define Link_Color #{{ Link_Color.hex }}
+{% endif %}
+#define Selected_Text_Color #{{ Selected_Text_Color.hex }}
+#define Selection_Color #{{ Selection_Color.hex }}
+{% if Tab_Color %}#define Tab_Color #{{ Tab_Color.hex }}
+{% endif %}
+{% if Underline_Color %}#define Underline_Color #{{ Underline_Color.hex }}
+{% endif %}