Get orientation from RGBA setting

Author: nightuser

kitty/config_data.py

@@ -295,6 +295,12 @@ def box_drawing_scale(x):
 and very thick lines.
 '''))
 
+o('subpixel_rendering', False, long_text=_('''
+Use subpixel rendering instead of grayscale in freetype. Impacts performance,
+but may look better on low DPI screens. Possible values are :code:`none`,
+:code:`lcd`, and :code:`lcd_v`.
+'''))
+
 # }}}
 
 g('cursor')  # {{{
@@ -955,21 +961,6 @@ def macos_option_as_alt(x):
 light and dark backgrounds. WARNING: this might make your mouse cursor
 invisible on dual GPU machines.'''))
 
-
-def to_subpixel_options(x):
-    x = x.lower()
-    if x == 'lcd':
-        return 1
-    if x == 'lcd_v':
-        return 2
-    return 0
-
-
-o('subpixel_rendering', 'none', option_type=to_subpixel_options, long_text=_('''
-Use subpixel rendering instead of grayscale in freetype. Impacts performance,
-but may look better on low DPI screens. Possible values are :code:`none`,
-:code:`lcd`, and :code:`lcd_v`.
-'''))
 # }}}
 
 g('shortcuts')  # {{{

kitty/freetype.c

@@ -388,16 +388,17 @@ populate_processed_bitmap(FT_GlyphSlotRec *slot, FT_Bitmap *bitmap, ProcessedBit
 static inline bool
 render_bitmap(Face *self, int glyph_id, ProcessedBitmap *ans, unsigned int cell_width, unsigned int cell_height, unsigned int num_cells, bool bold, bool italic, bool rescale, FONTS_DATA_HANDLE fg) {
     int flags = FT_LOAD_RENDER;
-    switch (OPT(subpixel_rendering)) {
-        case SUBPIXEL_LCD:
-            flags |= FT_LOAD_TARGET_LCD;
-            break;
-        case SUBPIXEL_LCD_V:
-            flags |= FT_LOAD_TARGET_LCD_V;
-            break;
-        case SUBPIXEL_NONE:
-        default:
-            break;
+    if (OPT(subpixel_rendering)) {
+        switch (self->rgba) {
+            case FC_RGBA_RGB:
+            case FC_RGBA_BGR:
+                flags |= FT_LOAD_TARGET_LCD;
+                break;
+            case FC_RGBA_VRGB:
+            case FC_RGBA_VBGR:
+                flags |= FT_LOAD_TARGET_LCD_V;
+                break;
+        }
     }
     if (!load_glyph(self, glyph_id, flags)) return false;
     unsigned int max_width = cell_width * num_cells;
@@ -670,17 +671,21 @@ render_simple_text_impl(PyObject *s, const char *text, unsigned int baseline) {
         int error = FT_Load_Glyph(self->face, glyph_index, FT_LOAD_DEFAULT);
         if (error) continue;
         int flags = 0;
-        switch (OPT(subpixel_rendering)) {
-            case SUBPIXEL_LCD:
-                flags |= FT_RENDER_MODE_LCD;
-                break;
-            case SUBPIXEL_LCD_V:
-                flags |= FT_RENDER_MODE_LCD_V;
-                break;
-            case SUBPIXEL_NONE:
-            default:
+        if (OPT(subpixel_rendering)) {
+            switch (self->rgba) {
+                case FC_RGBA_RGB:
+                case FC_RGBA_BGR:
+                    flags |= FT_RENDER_MODE_LCD;
+                    break;
+                case FC_RGBA_VRGB:
+                case FC_RGBA_VBGR:
+                    flags |= FT_RENDER_MODE_LCD_V;
+                    break;
+                default:
+                    flags |= FT_RENDER_MODE_LCD;
+            }
+        } else {
                 flags |= FT_RENDER_MODE_NORMAL;
-                break;
         }
         error = FT_Render_Glyph(self->face->glyph, flags);
         if (error) continue;

kitty/glfw.c

@@ -514,7 +514,6 @@ create_os_window(PyObject UNUSED *self, PyObject *args) {
     // blank the window once so that there is no initial flash of color
     // changing, in case the background color is not black
     blank_canvas(is_semi_transparent ? OPT(background_opacity) : 1.0f);
-    bool is_subpixel_enabled = (OPT(subpixel_rendering) == SUBPIXEL_LCD || OPT(subpixel_rendering) == SUBPIXEL_LCD_V);
 #ifndef __APPLE__
     if (is_first_window) glfwSwapInterval(OPT(sync_to_monitor) && !global_state.is_wayland ? 1 : 0);
 #endif
@@ -527,7 +526,7 @@ create_os_window(PyObject UNUSED *self, PyObject *args) {
         glfwShowWindow(glfw_window);
     }
     if (is_first_window) {
-        PyObject *ret = PyObject_CallFunction(load_programs, "OO", is_semi_transparent ? Py_True : Py_False, is_subpixel_enabled ? Py_True : Py_False);
+        PyObject *ret = PyObject_CallFunction(load_programs, "OO", is_semi_transparent ? Py_True : Py_False, OPT(subpixel_rendering) ? Py_True : Py_False);
         if (ret == NULL) return NULL;
         Py_DECREF(ret);
 #ifdef __APPLE__

kitty/state.c

@@ -408,7 +408,7 @@ PYWRAP1(set_options) {
     S(macos_window_resizable, PyObject_IsTrue);
     S(macos_hide_from_tasks, PyObject_IsTrue);
     S(macos_thicken_font, PyFloat_AsDouble);
-    S(subpixel_rendering, PyLong_AsLong);
+    S(subpixel_rendering, PyObject_IsTrue);
     S(tab_bar_min_tabs, PyLong_AsUnsignedLong);
     S(disable_ligatures, PyLong_AsLong);
     S(resize_draw_strategy, PyLong_AsLong);

kitty/state.h

@@ -13,8 +13,6 @@
 typedef enum { LEFT_EDGE, TOP_EDGE, RIGHT_EDGE, BOTTOM_EDGE } Edge;
 typedef enum { RESIZE_DRAW_STATIC, RESIZE_DRAW_SCALED, RESIZE_DRAW_BLANK, RESIZE_DRAW_SIZE } ResizeDrawStrategy;
 
-typedef enum { SUBPIXEL_NONE, SUBPIXEL_LCD, SUBPIXEL_LCD_V } SubpixelRendering;
-
 typedef struct {
     double visual_bell_duration, cursor_blink_interval, cursor_stop_blinking_after, mouse_hide_wait, click_interval, wheel_scroll_multiplier, touch_scroll_multiplier;
     bool enable_audio_bell;
@@ -28,7 +26,7 @@ typedef struct {
     double repaint_delay, input_delay;
     bool focus_follows_mouse, hide_window_decorations;
     bool macos_hide_from_tasks, macos_quit_when_last_window_closed, macos_window_resizable, macos_traditional_fullscreen, macos_show_window_title_in_menubar;
-    SubpixelRendering subpixel_rendering;
+    bool subpixel_rendering;
     unsigned int macos_option_as_alt;
     float macos_thicken_font;
     int adjust_line_height_px, adjust_column_width_px;