libi3/font: Use "pango:" prefix to avoid confusion

Also add a user-friendly font description syntax to userguide

diff --git a/docs/userguide b/docs/userguide
index f78b4913c614f688d6c82c6582ec2d84a30f0dca..99fb072c4b32a92ed1057a8536a6d1a96b3ba4eb 100644 (file)
--- a/docs/userguide
+++ b/docs/userguide
@@ -316,13 +316,15 @@ and fall back to a working font.
 *Syntax*:
 ------------------------------
 font <X core font description>
-font xft:<a FreeType font description>
+font pango:[family list] [style options] [size]
 ------------------------------
 
 *Examples*:
 --------------------------------------------------------------
 font -misc-fixed-medium-r-normal--13-120-75-75-C-70-iso10646-1
-font xft:DejaVu Sans Mono 10
+font pango:DejaVu Sans Mono 10
+font pango:DejaVu Sans Mono, Terminus Bold Semi-Condensed 11
+font pango:Terminus 11x
 --------------------------------------------------------------
 
 [[keybindings]]
@@ -1117,7 +1119,7 @@ font <font>
 --------------------------------------------------------------
 bar {
     font -misc-fixed-medium-r-normal--13-120-75-75-C-70-iso10646-1
-    font xft:DejaVu Sans Mono 10
+    font pango:DejaVu Sans Mono 10
 }
 --------------------------------------------------------------
 

diff --git a/i3.config b/i3.config
index e45b31ba40576f3ae7ed768cf77a86c23b525c98..05ffb8f803ef4a1f77582b05cd4196a5ba2d070d 100644 (file)
--- a/i3.config
+++ b/i3.config
@@ -15,8 +15,8 @@ font -misc-fixed-medium-r-normal--13-120-75-75-C-70-iso10646-1
 # The font above is very space-efficient, that is, it looks good, sharp and
 # clear in small sizes. However, if you need a lot of unicode glyphs or
 # right-to-left text rendering, you should instead use pango for rendering and
-# chose an xft font, such as:
-# font xft:DejaVu Sans Mono 10
+# chose a FreeType font, such as:
+# font pango:DejaVu Sans Mono 10
 
 # use Mouse+Mod1 to drag floating windows to their wanted position
 floating_modifier Mod1

diff --git a/i3.config.keycodes b/i3.config.keycodes
index 890afcb73d07174323bb7e049ae2f7aced230d04..21229208ff43801f0487e3162efb8d5ec17a1071 100644 (file)
--- a/i3.config.keycodes
+++ b/i3.config.keycodes
@@ -16,8 +16,8 @@ font -misc-fixed-medium-r-normal--13-120-75-75-C-70-iso10646-1
 # The font above is very space-efficient, that is, it looks good, sharp and
 # clear in small sizes. However, if you need a lot of unicode glyphs or
 # right-to-left text rendering, you should instead use pango for rendering and
-# chose an xft font, such as:
-# font xft:DejaVu Sans Mono 10
+# chose a FreeType font, such as:
+# font pango:DejaVu Sans Mono 10
 
 # Use Mouse+$mod to drag floating windows to their wanted position
 floating_modifier $mod

diff --git a/libi3/font.c b/libi3/font.c
index 23d7420de33fb805e486500435f8dff3d338aa3d..a2162c47cea1e0b55fd7a0b287d56157e44f0a44 100644 (file)
--- a/libi3/font.c
+++ b/libi3/font.c
@@ -142,7 +142,11 @@ i3Font load_font(const char *pattern, const bool fallback) {
 
 #if PANGO_SUPPORT
     /* Try to load a pango font if specified */
-    if (strlen(pattern) > strlen("xft:") && !strncmp(pattern, "xft:", strlen("xft:"))) {
+    if (strlen(pattern) > strlen("pango:") && !strncmp(pattern, "pango:", strlen("pango:"))) {
+        pattern += strlen("pango:");
+        if (load_pango_font(&font, pattern))
+            return font;
+    } else if (strlen(pattern) > strlen("xft:") && !strncmp(pattern, "xft:", strlen("xft:"))) {
         pattern += strlen("xft:");
         if (load_pango_font(&font, pattern))
             return font;