aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--config.def.h9
-rw-r--r--config.h174
-rw-r--r--drw.c172
-rw-r--r--drw.c~450
4 files changed, 642 insertions, 163 deletions
diff --git a/config.def.h b/config.def.h
index b8e202d..b678309 100644
--- a/config.def.h
+++ b/config.def.h
@@ -1,7 +1,4 @@
1/* See LICENSE file for copyright and license details. */ 1static const unsigned int borderpx = 0; /* border pixel of windows */
2
3/* appearance */
4static const unsigned int borderpx = 1; /* border pixel of windows */
5static const unsigned int snap = 32; /* snap pixel */ 2static const unsigned int snap = 32; /* snap pixel */
6static const unsigned int gappih = 10; /* horiz inner gap between windows */ 3static const unsigned int gappih = 10; /* horiz inner gap between windows */
7static const unsigned int gappiv = 10; /* vert inner gap between windows */ 4static const unsigned int gappiv = 10; /* vert inner gap between windows */
@@ -33,13 +30,13 @@ static const Rule rules[] = {
33 */ 30 */
34 /* class instance title tags mask isfloating isterminal noswallow monitor */ 31 /* class instance title tags mask isfloating isterminal noswallow monitor */
35 { "Gimp", NULL, NULL, 0, 1, 0, 0, -1 }, 32 { "Gimp", NULL, NULL, 0, 1, 0, 0, -1 },
36 { "Firefox", NULL, NULL, 1 << 8, 0, 0, -1, -1 }, 33 { "Brave", NULL, NULL, 1 << 8, 0, 0, -1, -1 },
37 { "St", NULL, NULL, 0, 0, 1, 0, -1 }, 34 { "St", NULL, NULL, 0, 0, 1, 0, -1 },
38 { NULL, NULL, "Event Tester", 0, 0, 0, 1, -1 }, /* xev */ 35 { NULL, NULL, "Event Tester", 0, 0, 0, 1, -1 }, /* xev */
39}; 36};
40 37
41/* layout(s) */ 38/* layout(s) */
42static const float mfact = 0.55; /* factor of master area size [0.05..0.95] */ 39static const float mfact = 0.50; /* factor of master area size [0.05..0.95] */
43static const int nmaster = 1; /* number of clients in master area */ 40static const int nmaster = 1; /* number of clients in master area */
44static const int resizehints = 1; /* 1 means respect size hints in tiled resizals */ 41static const int resizehints = 1; /* 1 means respect size hints in tiled resizals */
45static const int lockfullscreen = 1; /* 1 will force focus on the fullscreen window */ 42static const int lockfullscreen = 1; /* 1 will force focus on the fullscreen window */
diff --git a/config.h b/config.h
index 785ca10..726a37d 100644
--- a/config.h
+++ b/config.h
@@ -1,25 +1,34 @@
1static const unsigned int borderpx = 0; /* border pixel of windows */ 1static const unsigned int borderpx = 0; /* border pixel of windows */
2static const unsigned int snap = 32; /* snap pixel */ 2static const unsigned int snap = 32; /* snap pixel */
3static const unsigned int systraypinning = 0; /* 0: sloppy systray follows selected monitor, >0: pin systray to monitor X */ 3static const unsigned int systraypinning =
4static const unsigned int systrayonleft = 0; /* 0: systray in the right corner, >0: systray on left of status text */ 4 0; /* 0: sloppy systray follows selected monitor, >0: pin systray to monitor
5static const unsigned int systrayspacing = 2; /* systray spacing */ 5 X */
6static const int systraypinningfailfirst = 1; /* 1: if pinning fails, display systray on the first monitor, False: display systray on the last monitor*/ 6static const unsigned int systrayonleft =
7static const int showsystray = 1; /* 0 means no systray */ 7 0; /* 0: systray in the right corner, >0: systray on left of status text */
8static const unsigned int gappih = 10; /* horiz inner gap between windows */ 8static const unsigned int systrayspacing = 2; /* systray spacing */
9static const unsigned int gappiv = 10; /* vert inner gap between windows */ 9static const int systraypinningfailfirst =
10static const unsigned int gappoh = 10; /* horiz outer gap between windows and screen edge */ 10 1; /* 1: if pinning fails, display systray on the first monitor, False:
11static const unsigned int gappov = 10; /* vert outer gap between windows and screen edge */ 11 display systray on the last monitor*/
12static const int smartgaps = 0; /* 1 means no outer gap when there is only one window */ 12static const int showsystray = 1; /* 0 means no systray */
13static const int swallowfloating = 1; /* 1 means no outer gap when there is only one window */ 13static const unsigned int gappih = 10; /* horiz inner gap between windows */
14static const int showbar = 0; /* 0 means no bar */ 14static const unsigned int gappiv = 10; /* vert inner gap between windows */
15static const int topbar = 1; /* 0 means bottom bar */ 15static const unsigned int gappoh =
16static const char *fonts[] = { "monospace:size=10" }; 16 10; /* horiz outer gap between windows and screen edge */
17static const char dmenufont[] = "monospace:size=10"; 17static const unsigned int gappov =
18static const char col_gray1[] = "#222222"; 18 10; /* vert outer gap between windows and screen edge */
19static const char col_gray2[] = "#444444"; 19static const int smartgaps =
20static const char col_gray3[] = "#bbbbbb"; 20 0; /* 1 means no outer gap when there is only one window */
21static const char col_gray4[] = "#eeeeee"; 21static const int swallowfloating =
22static const char col_cyan[] = "#005577"; 22 1; /* 1 means no outer gap when there is only one window */
23static const int showbar = 0; /* 0 means no bar */
24static const int topbar = 1; /* 0 means bottom bar */
25static const char *fonts[] = {"monospace:size=10"};
26static const char dmenufont[] = "monospace:size=10";
27static const char col_gray1[] = "#222222";
28static const char col_gray2[] = "#444444";
29static const char col_gray3[] = "#bbbbbb";
30static const char col_gray4[] = "#eeeeee";
31static const char col_cyan[] = "#005577";
23static const char norm_fg[] = "#bfbfbf"; 32static const char norm_fg[] = "#bfbfbf";
24static const char norm_bg[] = "#000001"; 33static const char norm_bg[] = "#000001";
25static const char norm_border[] = "#3f3f40"; 34static const char norm_border[] = "#3f3f40";
@@ -32,89 +41,90 @@ static const char urg_fg[] = "#bfbfbf";
32static const char urg_bg[] = "#501C61"; 41static const char urg_bg[] = "#501C61";
33static const char urg_border[] = "#501C61"; 42static const char urg_border[] = "#501C61";
34 43
35static const char *colors[][3] = { 44static const char *colors[][3] = {
36 /* fg bg border */ 45 /* fg bg border */
37 [SchemeNorm] = { norm_fg, norm_bg, norm_border }, // unfocused wins 46 [SchemeNorm] = {norm_fg, norm_bg, norm_border}, // unfocused wins
38 [SchemeSel] = { sel_fg, sel_bg, sel_border }, // the focused win 47 [SchemeSel] = {sel_fg, sel_bg, sel_border}, // the focused win
39}; 48};
40 49
41/* tagging */ 50/* tagging */
42static const char *tags[] = { "1", "2", "3", "4", "5", "6", "7", "8", "9" }; 51static const char *tags[] = {"1", "2", "3", "4", "5", "6", "7", "8", "9"};
43 52
44static const Rule rules[] = { 53static const Rule rules[] = {
45/* class instance title tags mask isfloating isterminal noswallow monitor */ 54 /* class instance title tags mask isfloating isterminal
46 { "St", NULL, NULL, 0, 0, 1, 0, -1 }, 55 noswallow monitor */
47 { NULL, NULL, "Event Tester", 0, 0, 0, 1, -1 }, /* xev */ 56 {"St", NULL, NULL, 0, 0, 1, 0, -1},
57 {NULL, NULL, "Event Tester", 0, 0, 0, 1, -1}, /* xev */
48}; 58};
49 59
50/* layout(s) */ 60/* layout(s) */
51static const float mfact = 0.50; /* factor of master area size [0.05..0.95] */ 61static const float mfact = 0.50; /* factor of master area size [0.05..0.95] */
52static const int nmaster = 1; /* number of clients in master area */ 62static const int nmaster = 1; /* number of clients in master area */
53static const int resizehints = 0; /* 1 means respect size hints in tiled resizals */ 63static const int resizehints =
54static const int lockfullscreen = 1; /* 1 will force focus on the fullscreen window */ 64 0; /* 1 means respect size hints in tiled resizals */
65static const int lockfullscreen =
66 1; /* 1 will force focus on the fullscreen window */
55 67
56static const Layout layouts[] = { 68static const Layout layouts[] = {
57 /* symbol arrange function */ 69 /* symbol arrange function */
58 { "[]=", tile }, /* first entry is default */ 70 {"[]=", tile}, /* first entry is default */
59 { "><>", NULL }, /* no layout function means floating behavior */ 71 {"><>", NULL}, /* no layout function means floating behavior */
60 { "[M]", monocle }, 72 {"[M]", monocle},
61}; 73};
62 74
63/* key definitions */ 75/* key definitions */
64#define MODKEY Mod4Mask 76#define MODKEY Mod4Mask
65#define TAGKEYS(KEY,TAG) \ 77#define TAGKEYS(KEY, TAG) \
66 { MODKEY, KEY, view, {.ui = 1 << TAG} }, \ 78 {MODKEY, KEY, view, {.ui = 1 << TAG}}, \
67 { MODKEY|ControlMask, KEY, toggleview, {.ui = 1 << TAG} }, \ 79 {MODKEY | ControlMask, KEY, toggleview, {.ui = 1 << TAG}}, \
68 { MODKEY|ShiftMask, KEY, tag, {.ui = 1 << TAG} }, \ 80 {MODKEY | ShiftMask, KEY, tag, {.ui = 1 << TAG}}, \
69 { MODKEY|ControlMask|ShiftMask, KEY, toggletag, {.ui = 1 << TAG} }, 81 {MODKEY | ControlMask | ShiftMask, KEY, toggletag, {.ui = 1 << TAG}},
70 82
71/* helper for spawning shell commands in the pre dwm-5.0 fashion */ 83/* helper for spawning shell commands in the pre dwm-5.0 fashion */
72#define SHCMD(cmd) { .v = (const char*[]){ "/bin/sh", "-c", cmd, NULL } } 84#define SHCMD(cmd) \
85 { \
86 .v = (const char *[]) { "/bin/sh", "-c", cmd, NULL } \
87 }
73 88
74/* commands */ 89/* commands */
75static char dmenumon[2] = "0"; /* component of dmenucmd, manipulated in spawn() */ 90static char dmenumon[2] =
76//static const char *dmenucmd[] = { "dmenu_run", "-m", dmenumon, "-fn", dmenufont, "-nb", norm_bg, "-nf", norm_fg, "-sb", sel_bg, "-sf", sel_fg, NULL }; 91 "0"; /* component of dmenucmd, manipulated in spawn() */
77static const char *dmenucmd[] = { "dmenu_run", "-m", dmenumon, NULL}; 92// static const char *dmenucmd[] = { "dmenu_run", "-m", dmenumon, "-fn",
78static const char *termcmd[] = { "st", NULL }; 93// dmenufont, "-nb", norm_bg, "-nf", norm_fg, "-sb", sel_bg, "-sf", sel_fg, NULL
94// };
95static const char *dmenucmd[] = {"dmenu_run", "-m", dmenumon, NULL};
96static const char *termcmd[] = {"st", NULL};
79 97
80static const Key keys[] = { 98static const Key keys[] = {
81 /* modifier key function argument */ 99 /* modifier key function argument */
82 { MODKEY, XK_d, spawn, {.v = dmenucmd } }, 100 {MODKEY, XK_d, spawn, {.v = dmenucmd}},
83 { MODKEY, XK_Return, spawn, {.v = termcmd } }, 101 {MODKEY, XK_Return, spawn, {.v = termcmd}},
84 { MODKEY, XK_b, togglebar, {0} }, 102 {MODKEY, XK_b, togglebar, {0}},
85 { MODKEY, XK_q, killclient, {0} }, 103 {MODKEY, XK_q, killclient, {0}},
86 { MODKEY, XK_f, togglefullscr, {0} }, 104 {MODKEY, XK_f, togglefullscr, {0}},
87 { MODKEY, XK_space, setlayout, {0} }, 105 {MODKEY, XK_space, setlayout, {0}},
88 { MODKEY|ShiftMask, XK_space, togglefloating, {0} }, 106 {MODKEY | ShiftMask, XK_space, togglefloating, {0}},
89 TAGKEYS( XK_1, 0) 107 TAGKEYS(XK_1, 0) TAGKEYS(XK_2, 1) TAGKEYS(XK_3, 2) TAGKEYS(XK_4, 3)
90 TAGKEYS( XK_2, 1) 108 TAGKEYS(XK_5, 4) TAGKEYS(XK_6, 5) TAGKEYS(XK_7, 6) TAGKEYS(XK_8, 7)
91 TAGKEYS( XK_3, 2) 109 TAGKEYS(XK_9, 8){MODKEY | ShiftMask, XK_q, quit, {0}},
92 TAGKEYS( XK_4, 3)
93 TAGKEYS( XK_5, 4)
94 TAGKEYS( XK_6, 5)
95 TAGKEYS( XK_7, 6)
96 TAGKEYS( XK_8, 7)
97 TAGKEYS( XK_9, 8)
98 { MODKEY|ShiftMask, XK_q, quit, {0} },
99}; 110};
100 111
101/* button definitions */ 112/* button definitions */
102/* click can be ClkTagBar, ClkLtSymbol, ClkStatusText, ClkWinTitle, ClkClientWin, or ClkRootWin */ 113/* click can be ClkTagBar, ClkLtSymbol, ClkStatusText, ClkWinTitle,
114 * ClkClientWin, or ClkRootWin */
103static const Button buttons[] = { 115static const Button buttons[] = {
104 /* click event mask button function argument */ 116 /* click event mask button function argument */
105 { ClkLtSymbol, 0, Button1, setlayout, {0} }, 117 {ClkLtSymbol, 0, Button1, setlayout, {0}},
106 { ClkLtSymbol, 0, Button3, setlayout, {.v = &layouts[2]} }, 118 {ClkLtSymbol, 0, Button3, setlayout, {.v = &layouts[2]}},
107 119 {ClkTagBar, MODKEY, Button1, tag, {0}},
108 { ClkTagBar, MODKEY, Button1, tag, {0} }, 120 {ClkTagBar, MODKEY, Button3, toggletag, {0}},
109 { ClkTagBar, MODKEY, Button3, toggletag, {0} }, 121 {ClkWinTitle, 0, Button2, zoom, {0}},
110 { ClkWinTitle, 0, Button2, zoom, {0} }, 122 {ClkStatusText, 0, Button2, spawn, {.v = termcmd}},
111 { ClkStatusText, 0, Button2, spawn, {.v = termcmd } }, 123 {ClkClientWin, MODKEY, Button1, movemouse, {0}},
112 { ClkClientWin, MODKEY, Button1, movemouse, {0} }, 124 {ClkClientWin, MODKEY, Button2, togglefloating, {0}},
113 { ClkClientWin, MODKEY, Button2, togglefloating, {0} }, 125 {ClkClientWin, MODKEY, Button3, resizemouse, {0}},
114 { ClkClientWin, MODKEY, Button3, resizemouse, {0} }, 126 {ClkTagBar, 0, Button1, view, {0}},
115 { ClkTagBar, 0, Button1, view, {0} }, 127 {ClkTagBar, 0, Button3, toggleview, {0}},
116 { ClkTagBar, 0, Button3, toggleview, {0} }, 128 {ClkTagBar, MODKEY, Button1, tag, {0}},
117 { ClkTagBar, MODKEY, Button1, tag, {0} }, 129 {ClkTagBar, MODKEY, Button3, toggletag, {0}},
118 { ClkTagBar, MODKEY, Button3, toggletag, {0} },
119}; 130};
120
diff --git a/drw.c b/drw.c
index a58a2b4..7d7b41b 100644
--- a/drw.c
+++ b/drw.c
@@ -11,13 +11,14 @@
11#define UTF_INVALID 0xFFFD 11#define UTF_INVALID 0xFFFD
12#define UTF_SIZ 4 12#define UTF_SIZ 4
13 13
14static const unsigned char utfbyte[UTF_SIZ + 1] = {0x80, 0, 0xC0, 0xE0, 0xF0}; 14static const unsigned char utfbyte[UTF_SIZ + 1] = { 0x80, 0, 0xC0, 0xE0, 0xF0 };
15static const unsigned char utfmask[UTF_SIZ + 1] = {0xC0, 0x80, 0xE0, 0xF0, 0xF8}; 15static const unsigned char utfmask[UTF_SIZ + 1] =
16static const long utfmin[UTF_SIZ + 1] = { 0, 0, 0x80, 0x800, 0x10000}; 16 { 0xC0, 0x80, 0xE0, 0xF0, 0xF8 };
17static const long utfmax[UTF_SIZ + 1] = {0x10FFFF, 0x7F, 0x7FF, 0xFFFF, 0x10FFFF}; 17static const long utfmin[UTF_SIZ + 1] = { 0, 0, 0x80, 0x800, 0x10000 };
18 18static const long utfmax[UTF_SIZ + 1] =
19static long 19 { 0x10FFFF, 0x7F, 0x7FF, 0xFFFF, 0x10FFFF };
20utf8decodebyte(const char c, size_t *i) 20
21static long utf8decodebyte(const char c, size_t *i)
21{ 22{
22 for (*i = 0; *i < (UTF_SIZ + 1); ++(*i)) 23 for (*i = 0; *i < (UTF_SIZ + 1); ++(*i))
23 if (((unsigned char)c & utfmask[*i]) == utfbyte[*i]) 24 if (((unsigned char)c & utfmask[*i]) == utfbyte[*i])
@@ -25,18 +26,15 @@ utf8decodebyte(const char c, size_t *i)
25 return 0; 26 return 0;
26} 27}
27 28
28static size_t 29static size_t utf8validate(long *u, size_t i)
29utf8validate(long *u, size_t i)
30{ 30{
31 if (!BETWEEN(*u, utfmin[i], utfmax[i]) || BETWEEN(*u, 0xD800, 0xDFFF)) 31 if (!BETWEEN(*u, utfmin[i], utfmax[i]) || BETWEEN(*u, 0xD800, 0xDFFF))
32 *u = UTF_INVALID; 32 *u = UTF_INVALID;
33 for (i = 1; *u > utfmax[i]; ++i) 33 for (i = 1; *u > utfmax[i]; ++i) ;
34 ;
35 return i; 34 return i;
36} 35}
37 36
38static size_t 37static size_t utf8decode(const char *c, long *u, size_t clen)
39utf8decode(const char *c, long *u, size_t clen)
40{ 38{
41 size_t i, j, len, type; 39 size_t i, j, len, type;
42 long udecoded; 40 long udecoded;
@@ -60,8 +58,8 @@ utf8decode(const char *c, long *u, size_t clen)
60 return len; 58 return len;
61} 59}
62 60
63Drw * 61Drw *drw_create(Display *dpy, int screen, Window root, unsigned int w,
64drw_create(Display *dpy, int screen, Window root, unsigned int w, unsigned int h) 62 unsigned int h)
65{ 63{
66 Drw *drw = ecalloc(1, sizeof(Drw)); 64 Drw *drw = ecalloc(1, sizeof(Drw));
67 65
@@ -70,15 +68,15 @@ drw_create(Display *dpy, int screen, Window root, unsigned int w, unsigned int h
70 drw->root = root; 68 drw->root = root;
71 drw->w = w; 69 drw->w = w;
72 drw->h = h; 70 drw->h = h;
73 drw->drawable = XCreatePixmap(dpy, root, w, h, DefaultDepth(dpy, screen)); 71 drw->drawable =
72 XCreatePixmap(dpy, root, w, h, DefaultDepth(dpy, screen));
74 drw->gc = XCreateGC(dpy, root, 0, NULL); 73 drw->gc = XCreateGC(dpy, root, 0, NULL);
75 XSetLineAttributes(dpy, drw->gc, 1, LineSolid, CapButt, JoinMiter); 74 XSetLineAttributes(dpy, drw->gc, 1, LineSolid, CapButt, JoinMiter);
76 75
77 return drw; 76 return drw;
78} 77}
79 78
80void 79void drw_resize(Drw *drw, unsigned int w, unsigned int h)
81drw_resize(Drw *drw, unsigned int w, unsigned int h)
82{ 80{
83 if (!drw) 81 if (!drw)
84 return; 82 return;
@@ -87,11 +85,12 @@ drw_resize(Drw *drw, unsigned int w, unsigned int h)
87 drw->h = h; 85 drw->h = h;
88 if (drw->drawable) 86 if (drw->drawable)
89 XFreePixmap(drw->dpy, drw->drawable); 87 XFreePixmap(drw->dpy, drw->drawable);
90 drw->drawable = XCreatePixmap(drw->dpy, drw->root, w, h, DefaultDepth(drw->dpy, drw->screen)); 88 drw->drawable =
89 XCreatePixmap(drw->dpy, drw->root, w, h,
90 DefaultDepth(drw->dpy, drw->screen));
91} 91}
92 92
93void 93void drw_free(Drw *drw)
94drw_free(Drw *drw)
95{ 94{
96 XFreePixmap(drw->dpy, drw->drawable); 95 XFreePixmap(drw->dpy, drw->drawable);
97 XFreeGC(drw->dpy, drw->gc); 96 XFreeGC(drw->dpy, drw->gc);
@@ -102,8 +101,7 @@ drw_free(Drw *drw)
102/* This function is an implementation detail. Library users should use 101/* This function is an implementation detail. Library users should use
103 * drw_fontset_create instead. 102 * drw_fontset_create instead.
104 */ 103 */
105static Fnt * 104static Fnt *xfont_create(Drw *drw, const char *fontname, FcPattern *fontpattern)
106xfont_create(Drw *drw, const char *fontname, FcPattern *fontpattern)
107{ 105{
108 Fnt *font; 106 Fnt *font;
109 XftFont *xfont = NULL; 107 XftFont *xfont = NULL;
@@ -116,17 +114,22 @@ xfont_create(Drw *drw, const char *fontname, FcPattern *fontpattern)
116 * behaviour whereas the former just results in missing-character 114 * behaviour whereas the former just results in missing-character
117 * rectangles being drawn, at least with some fonts. */ 115 * rectangles being drawn, at least with some fonts. */
118 if (!(xfont = XftFontOpenName(drw->dpy, drw->screen, fontname))) { 116 if (!(xfont = XftFontOpenName(drw->dpy, drw->screen, fontname))) {
119 fprintf(stderr, "error, cannot load font from name: '%s'\n", fontname); 117 fprintf(stderr,
118 "error, cannot load font from name: '%s'\n",
119 fontname);
120 return NULL; 120 return NULL;
121 } 121 }
122 if (!(pattern = FcNameParse((FcChar8 *) fontname))) { 122 if (!(pattern = FcNameParse((FcChar8 *) fontname))) {
123 fprintf(stderr, "error, cannot parse font name to pattern: '%s'\n", fontname); 123 fprintf(stderr,
124 "error, cannot parse font name to pattern: '%s'\n",
125 fontname);
124 XftFontClose(drw->dpy, xfont); 126 XftFontClose(drw->dpy, xfont);
125 return NULL; 127 return NULL;
126 } 128 }
127 } else if (fontpattern) { 129 } else if (fontpattern) {
128 if (!(xfont = XftFontOpenPattern(drw->dpy, fontpattern))) { 130 if (!(xfont = XftFontOpenPattern(drw->dpy, fontpattern))) {
129 fprintf(stderr, "error, cannot load font from pattern.\n"); 131 fprintf(stderr,
132 "error, cannot load font from pattern.\n");
130 return NULL; 133 return NULL;
131 } 134 }
132 } else { 135 } else {
@@ -142,8 +145,7 @@ xfont_create(Drw *drw, const char *fontname, FcPattern *fontpattern)
142 return font; 145 return font;
143} 146}
144 147
145static void 148static void xfont_free(Fnt *font)
146xfont_free(Fnt *font)
147{ 149{
148 if (!font) 150 if (!font)
149 return; 151 return;
@@ -153,8 +155,7 @@ xfont_free(Fnt *font)
153 free(font); 155 free(font);
154} 156}
155 157
156Fnt* 158Fnt *drw_fontset_create(Drw *drw, const char *fonts[], size_t fontcount)
157drw_fontset_create(Drw* drw, const char *fonts[], size_t fontcount)
158{ 159{
159 Fnt *cur, *ret = NULL; 160 Fnt *cur, *ret = NULL;
160 size_t i; 161 size_t i;
@@ -171,8 +172,7 @@ drw_fontset_create(Drw* drw, const char *fonts[], size_t fontcount)
171 return (drw->fonts = ret); 172 return (drw->fonts = ret);
172} 173}
173 174
174void 175void drw_fontset_free(Fnt *font)
175drw_fontset_free(Fnt *font)
176{ 176{
177 if (font) { 177 if (font) {
178 drw_fontset_free(font->next); 178 drw_fontset_free(font->next);
@@ -180,28 +180,27 @@ drw_fontset_free(Fnt *font)
180 } 180 }
181} 181}
182 182
183void 183void drw_clr_create(Drw *drw, Clr *dest, const char *clrname)
184drw_clr_create(Drw *drw, Clr *dest, const char *clrname)
185{ 184{
186 if (!drw || !dest || !clrname) 185 if (!drw || !dest || !clrname)
187 return; 186 return;
188 187
189 if (!XftColorAllocName(drw->dpy, DefaultVisual(drw->dpy, drw->screen), 188 if (!XftColorAllocName(drw->dpy, DefaultVisual(drw->dpy, drw->screen),
190 DefaultColormap(drw->dpy, drw->screen), 189 DefaultColormap(drw->dpy, drw->screen),
191 clrname, dest)) 190 clrname, dest))
192 die("error, cannot allocate color '%s'", clrname); 191 die("error, cannot allocate color '%s'", clrname);
193} 192}
194 193
195/* Wrapper to create color schemes. The caller has to call free(3) on the 194/* Wrapper to create color schemes. The caller has to call free(3) on the
196 * returned color scheme when done using it. */ 195 * returned color scheme when done using it. */
197Clr * 196Clr *drw_scm_create(Drw *drw, const char *clrnames[], size_t clrcount)
198drw_scm_create(Drw *drw, const char *clrnames[], size_t clrcount)
199{ 197{
200 size_t i; 198 size_t i;
201 Clr *ret; 199 Clr *ret;
202 200
203 /* need at least two colors for a scheme */ 201 /* need at least two colors for a scheme */
204 if (!drw || !clrnames || clrcount < 2 || !(ret = ecalloc(clrcount, sizeof(XftColor)))) 202 if (!drw || !clrnames || clrcount < 2
203 || !(ret = ecalloc(clrcount, sizeof(XftColor))))
205 return NULL; 204 return NULL;
206 205
207 for (i = 0; i < clrcount; i++) 206 for (i = 0; i < clrcount; i++)
@@ -209,34 +208,37 @@ drw_scm_create(Drw *drw, const char *clrnames[], size_t clrcount)
209 return ret; 208 return ret;
210} 209}
211 210
212void 211void drw_setfontset(Drw *drw, Fnt *set)
213drw_setfontset(Drw *drw, Fnt *set)
214{ 212{
215 if (drw) 213 if (drw)
216 drw->fonts = set; 214 drw->fonts = set;
217} 215}
218 216
219void 217void drw_setscheme(Drw *drw, Clr *scm)
220drw_setscheme(Drw *drw, Clr *scm)
221{ 218{
222 if (drw) 219 if (drw)
223 drw->scheme = scm; 220 drw->scheme = scm;
224} 221}
225 222
226void 223void
227drw_rect(Drw *drw, int x, int y, unsigned int w, unsigned int h, int filled, int invert) 224drw_rect(Drw *drw, int x, int y, unsigned int w, unsigned int h, int filled,
225 int invert)
228{ 226{
229 if (!drw || !drw->scheme) 227 if (!drw || !drw->scheme)
230 return; 228 return;
231 XSetForeground(drw->dpy, drw->gc, invert ? drw->scheme[ColBg].pixel : drw->scheme[ColFg].pixel); 229 XSetForeground(drw->dpy, drw->gc,
230 invert ? drw->scheme[ColBg].pixel : drw->scheme[ColFg].
231 pixel);
232 if (filled) 232 if (filled)
233 XFillRectangle(drw->dpy, drw->drawable, drw->gc, x, y, w, h); 233 XFillRectangle(drw->dpy, drw->drawable, drw->gc, x, y, w, h);
234 else 234 else
235 XDrawRectangle(drw->dpy, drw->drawable, drw->gc, x, y, w - 1, h - 1); 235 XDrawRectangle(drw->dpy, drw->drawable, drw->gc, x, y, w - 1,
236 h - 1);
236} 237}
237 238
238int 239int
239drw_text(Drw *drw, int x, int y, unsigned int w, unsigned int h, unsigned int lpad, const char *text, int invert) 240drw_text(Drw *drw, int x, int y, unsigned int w, unsigned int h,
241 unsigned int lpad, const char *text, int invert)
240{ 242{
241 int i, ty, ellipsis_x = 0; 243 int i, ty, ellipsis_x = 0;
242 unsigned int tmpw, ew, ellipsis_w = 0, ellipsis_len; 244 unsigned int tmpw, ew, ellipsis_w = 0, ellipsis_len;
@@ -252,7 +254,10 @@ drw_text(Drw *drw, int x, int y, unsigned int w, unsigned int h, unsigned int lp
252 int charexists = 0, overflow = 0; 254 int charexists = 0, overflow = 0;
253 /* keep track of a couple codepoints for which we have no match. */ 255 /* keep track of a couple codepoints for which we have no match. */
254 enum { nomatches_len = 64 }; 256 enum { nomatches_len = 64 };
255 static struct { long codepoint[nomatches_len]; unsigned int idx; } nomatches; 257 static struct {
258 long codepoint[nomatches_len];
259 unsigned int idx;
260 } nomatches;
256 static unsigned int ellipsis_width = 0; 261 static unsigned int ellipsis_width = 0;
257 262
258 if (!drw || (render && (!drw->scheme || !w)) || !text || !drw->fonts) 263 if (!drw || (render && (!drw->scheme || !w)) || !text || !drw->fonts)
@@ -261,11 +266,12 @@ drw_text(Drw *drw, int x, int y, unsigned int w, unsigned int h, unsigned int lp
261 if (!render) { 266 if (!render) {
262 w = invert ? invert : ~invert; 267 w = invert ? invert : ~invert;
263 } else { 268 } else {
264 XSetForeground(drw->dpy, drw->gc, drw->scheme[invert ? ColFg : ColBg].pixel); 269 XSetForeground(drw->dpy, drw->gc,
270 drw->scheme[invert ? ColFg : ColBg].pixel);
265 XFillRectangle(drw->dpy, drw->drawable, drw->gc, x, y, w, h); 271 XFillRectangle(drw->dpy, drw->drawable, drw->gc, x, y, w, h);
266 d = XftDrawCreate(drw->dpy, drw->drawable, 272 d = XftDrawCreate(drw->dpy, drw->drawable,
267 DefaultVisual(drw->dpy, drw->screen), 273 DefaultVisual(drw->dpy, drw->screen),
268 DefaultColormap(drw->dpy, drw->screen)); 274 DefaultColormap(drw->dpy, drw->screen));
269 x += lpad; 275 x += lpad;
270 w -= lpad; 276 w -= lpad;
271 } 277 }
@@ -279,10 +285,15 @@ drw_text(Drw *drw, int x, int y, unsigned int w, unsigned int h, unsigned int lp
279 nextfont = NULL; 285 nextfont = NULL;
280 while (*text) { 286 while (*text) {
281 utf8charlen = utf8decode(text, &utf8codepoint, UTF_SIZ); 287 utf8charlen = utf8decode(text, &utf8codepoint, UTF_SIZ);
282 for (curfont = drw->fonts; curfont; curfont = curfont->next) { 288 for (curfont = drw->fonts; curfont;
283 charexists = charexists || XftCharExists(drw->dpy, curfont->xfont, utf8codepoint); 289 curfont = curfont->next) {
290 charexists = charexists
291 || XftCharExists(drw->dpy, curfont->xfont,
292 utf8codepoint);
284 if (charexists) { 293 if (charexists) {
285 drw_font_getexts(curfont, text, utf8charlen, &tmpw, NULL); 294 drw_font_getexts(curfont, text,
295 utf8charlen, &tmpw,
296 NULL);
286 if (ew + ellipsis_width <= w) { 297 if (ew + ellipsis_width <= w) {
287 /* keep track where the ellipsis still fits */ 298 /* keep track where the ellipsis still fits */
288 ellipsis_x = x + ew; 299 ellipsis_x = x + ew;
@@ -298,7 +309,8 @@ drw_text(Drw *drw, int x, int y, unsigned int w, unsigned int h, unsigned int lp
298 if (!render) 309 if (!render)
299 x += tmpw; 310 x += tmpw;
300 else 311 else
301 utf8strlen = ellipsis_len; 312 utf8strlen =
313 ellipsis_len;
302 } else if (curfont == usedfont) { 314 } else if (curfont == usedfont) {
303 utf8strlen += utf8charlen; 315 utf8strlen += utf8charlen;
304 text += utf8charlen; 316 text += utf8charlen;
@@ -318,15 +330,22 @@ drw_text(Drw *drw, int x, int y, unsigned int w, unsigned int h, unsigned int lp
318 330
319 if (utf8strlen) { 331 if (utf8strlen) {
320 if (render) { 332 if (render) {
321 ty = y + (h - usedfont->h) / 2 + usedfont->xfont->ascent; 333 ty = y + (h - usedfont->h) / 2 +
322 XftDrawStringUtf8(d, &drw->scheme[invert ? ColBg : ColFg], 334 usedfont->xfont->ascent;
323 usedfont->xfont, x, ty, (XftChar8 *)utf8str, utf8strlen); 335 XftDrawStringUtf8(d,
336 &drw->
337 scheme[invert ? ColBg :
338 ColFg],
339 usedfont->xfont, x, ty,
340 (XftChar8 *) utf8str,
341 utf8strlen);
324 } 342 }
325 x += ew; 343 x += ew;
326 w -= ew; 344 w -= ew;
327 } 345 }
328 if (render && overflow) 346 if (render && overflow)
329 drw_text(drw, ellipsis_x, y, ellipsis_w, h, 0, "...", invert); 347 drw_text(drw, ellipsis_x, y, ellipsis_w, h, 0, "...",
348 invert);
330 349
331 if (!*text || overflow) { 350 if (!*text || overflow) {
332 break; 351 break;
@@ -358,21 +377,26 @@ drw_text(Drw *drw, int x, int y, unsigned int w, unsigned int h, unsigned int lp
358 377
359 FcConfigSubstitute(NULL, fcpattern, FcMatchPattern); 378 FcConfigSubstitute(NULL, fcpattern, FcMatchPattern);
360 FcDefaultSubstitute(fcpattern); 379 FcDefaultSubstitute(fcpattern);
361 match = XftFontMatch(drw->dpy, drw->screen, fcpattern, &result); 380 match =
381 XftFontMatch(drw->dpy, drw->screen, fcpattern,
382 &result);
362 383
363 FcCharSetDestroy(fccharset); 384 FcCharSetDestroy(fccharset);
364 FcPatternDestroy(fcpattern); 385 FcPatternDestroy(fcpattern);
365 386
366 if (match) { 387 if (match) {
367 usedfont = xfont_create(drw, NULL, match); 388 usedfont = xfont_create(drw, NULL, match);
368 if (usedfont && XftCharExists(drw->dpy, usedfont->xfont, utf8codepoint)) { 389 if (usedfont
369 for (curfont = drw->fonts; curfont->next; curfont = curfont->next) 390 && XftCharExists(drw->dpy, usedfont->xfont,
370 ; /* NOP */ 391 utf8codepoint)) {
392 for (curfont = drw->fonts; curfont->next; curfont = curfont->next) ; /* NOP */
371 curfont->next = usedfont; 393 curfont->next = usedfont;
372 } else { 394 } else {
373 xfont_free(usedfont); 395 xfont_free(usedfont);
374 nomatches.codepoint[++nomatches.idx % nomatches_len] = utf8codepoint; 396 nomatches.codepoint[++nomatches.idx %
375no_match: 397 nomatches_len] =
398 utf8codepoint;
399 no_match:
376 usedfont = drw->fonts; 400 usedfont = drw->fonts;
377 } 401 }
378 } 402 }
@@ -384,8 +408,7 @@ no_match:
384 return x + (render ? w : 0); 408 return x + (render ? w : 0);
385} 409}
386 410
387void 411void drw_map(Drw *drw, Window win, int x, int y, unsigned int w, unsigned int h)
388drw_map(Drw *drw, Window win, int x, int y, unsigned int w, unsigned int h)
389{ 412{
390 if (!drw) 413 if (!drw)
391 return; 414 return;
@@ -394,8 +417,7 @@ drw_map(Drw *drw, Window win, int x, int y, unsigned int w, unsigned int h)
394 XSync(drw->dpy, False); 417 XSync(drw->dpy, False);
395} 418}
396 419
397unsigned int 420unsigned int drw_fontset_getwidth(Drw *drw, const char *text)
398drw_fontset_getwidth(Drw *drw, const char *text)
399{ 421{
400 if (!drw || !drw->fonts || !text) 422 if (!drw || !drw->fonts || !text)
401 return 0; 423 return 0;
@@ -412,22 +434,23 @@ drw_fontset_getwidth_clamp(Drw *drw, const char *text, unsigned int n)
412} 434}
413 435
414void 436void
415drw_font_getexts(Fnt *font, const char *text, unsigned int len, unsigned int *w, unsigned int *h) 437drw_font_getexts(Fnt *font, const char *text, unsigned int len, unsigned int *w,
438 unsigned int *h)
416{ 439{
417 XGlyphInfo ext; 440 XGlyphInfo ext;
418 441
419 if (!font || !text) 442 if (!font || !text)
420 return; 443 return;
421 444
422 XftTextExtentsUtf8(font->dpy, font->xfont, (XftChar8 *)text, len, &ext); 445 XftTextExtentsUtf8(font->dpy, font->xfont, (XftChar8 *) text, len,
446 &ext);
423 if (w) 447 if (w)
424 *w = ext.xOff; 448 *w = ext.xOff;
425 if (h) 449 if (h)
426 *h = font->h; 450 *h = font->h;
427} 451}
428 452
429Cur * 453Cur *drw_cur_create(Drw *drw, int shape)
430drw_cur_create(Drw *drw, int shape)
431{ 454{
432 Cur *cur; 455 Cur *cur;
433 456
@@ -439,8 +462,7 @@ drw_cur_create(Drw *drw, int shape)
439 return cur; 462 return cur;
440} 463}
441 464
442void 465void drw_cur_free(Drw *drw, Cur *cursor)
443drw_cur_free(Drw *drw, Cur *cursor)
444{ 466{
445 if (!cursor) 467 if (!cursor)
446 return; 468 return;
diff --git a/drw.c~ b/drw.c~
new file mode 100644
index 0000000..a58a2b4
--- /dev/null
+++ b/drw.c~
@@ -0,0 +1,450 @@
1/* See LICENSE file for copyright and license details. */
2#include <stdio.h>
3#include <stdlib.h>
4#include <string.h>
5#include <X11/Xlib.h>
6#include <X11/Xft/Xft.h>
7
8#include "drw.h"
9#include "util.h"
10
11#define UTF_INVALID 0xFFFD
12#define UTF_SIZ 4
13
14static const unsigned char utfbyte[UTF_SIZ + 1] = {0x80, 0, 0xC0, 0xE0, 0xF0};
15static const unsigned char utfmask[UTF_SIZ + 1] = {0xC0, 0x80, 0xE0, 0xF0, 0xF8};
16static const long utfmin[UTF_SIZ + 1] = { 0, 0, 0x80, 0x800, 0x10000};
17static const long utfmax[UTF_SIZ + 1] = {0x10FFFF, 0x7F, 0x7FF, 0xFFFF, 0x10FFFF};
18
19static long
20utf8decodebyte(const char c, size_t *i)
21{
22 for (*i = 0; *i < (UTF_SIZ + 1); ++(*i))
23 if (((unsigned char)c & utfmask[*i]) == utfbyte[*i])
24 return (unsigned char)c & ~utfmask[*i];
25 return 0;
26}
27
28static size_t
29utf8validate(long *u, size_t i)
30{
31 if (!BETWEEN(*u, utfmin[i], utfmax[i]) || BETWEEN(*u, 0xD800, 0xDFFF))
32 *u = UTF_INVALID;
33 for (i = 1; *u > utfmax[i]; ++i)
34 ;
35 return i;
36}
37
38static size_t
39utf8decode(const char *c, long *u, size_t clen)
40{
41 size_t i, j, len, type;
42 long udecoded;
43
44 *u = UTF_INVALID;
45 if (!clen)
46 return 0;
47 udecoded = utf8decodebyte(c[0], &len);
48 if (!BETWEEN(len, 1, UTF_SIZ))
49 return 1;
50 for (i = 1, j = 1; i < clen && j < len; ++i, ++j) {
51 udecoded = (udecoded << 6) | utf8decodebyte(c[i], &type);
52 if (type)
53 return j;
54 }
55 if (j < len)
56 return 0;
57 *u = udecoded;
58 utf8validate(u, len);
59
60 return len;
61}
62
63Drw *
64drw_create(Display *dpy, int screen, Window root, unsigned int w, unsigned int h)
65{
66 Drw *drw = ecalloc(1, sizeof(Drw));
67
68 drw->dpy = dpy;
69 drw->screen = screen;
70 drw->root = root;
71 drw->w = w;
72 drw->h = h;
73 drw->drawable = XCreatePixmap(dpy, root, w, h, DefaultDepth(dpy, screen));
74 drw->gc = XCreateGC(dpy, root, 0, NULL);
75 XSetLineAttributes(dpy, drw->gc, 1, LineSolid, CapButt, JoinMiter);
76
77 return drw;
78}
79
80void
81drw_resize(Drw *drw, unsigned int w, unsigned int h)
82{
83 if (!drw)
84 return;
85
86 drw->w = w;
87 drw->h = h;
88 if (drw->drawable)
89 XFreePixmap(drw->dpy, drw->drawable);
90 drw->drawable = XCreatePixmap(drw->dpy, drw->root, w, h, DefaultDepth(drw->dpy, drw->screen));
91}
92
93void
94drw_free(Drw *drw)
95{
96 XFreePixmap(drw->dpy, drw->drawable);
97 XFreeGC(drw->dpy, drw->gc);
98 drw_fontset_free(drw->fonts);
99 free(drw);
100}
101
102/* This function is an implementation detail. Library users should use
103 * drw_fontset_create instead.
104 */
105static Fnt *
106xfont_create(Drw *drw, const char *fontname, FcPattern *fontpattern)
107{
108 Fnt *font;
109 XftFont *xfont = NULL;
110 FcPattern *pattern = NULL;
111
112 if (fontname) {
113 /* Using the pattern found at font->xfont->pattern does not yield the
114 * same substitution results as using the pattern returned by
115 * FcNameParse; using the latter results in the desired fallback
116 * behaviour whereas the former just results in missing-character
117 * rectangles being drawn, at least with some fonts. */
118 if (!(xfont = XftFontOpenName(drw->dpy, drw->screen, fontname))) {
119 fprintf(stderr, "error, cannot load font from name: '%s'\n", fontname);
120 return NULL;
121 }
122 if (!(pattern = FcNameParse((FcChar8 *) fontname))) {
123 fprintf(stderr, "error, cannot parse font name to pattern: '%s'\n", fontname);
124 XftFontClose(drw->dpy, xfont);
125 return NULL;
126 }
127 } else if (fontpattern) {
128 if (!(xfont = XftFontOpenPattern(drw->dpy, fontpattern))) {
129 fprintf(stderr, "error, cannot load font from pattern.\n");
130 return NULL;
131 }
132 } else {
133 die("no font specified.");
134 }
135
136 font = ecalloc(1, sizeof(Fnt));
137 font->xfont = xfont;
138 font->pattern = pattern;
139 font->h = xfont->ascent + xfont->descent;
140 font->dpy = drw->dpy;
141
142 return font;
143}
144
145static void
146xfont_free(Fnt *font)
147{
148 if (!font)
149 return;
150 if (font->pattern)
151 FcPatternDestroy(font->pattern);
152 XftFontClose(font->dpy, font->xfont);
153 free(font);
154}
155
156Fnt*
157drw_fontset_create(Drw* drw, const char *fonts[], size_t fontcount)
158{
159 Fnt *cur, *ret = NULL;
160 size_t i;
161
162 if (!drw || !fonts)
163 return NULL;
164
165 for (i = 1; i <= fontcount; i++) {
166 if ((cur = xfont_create(drw, fonts[fontcount - i], NULL))) {
167 cur->next = ret;
168 ret = cur;
169 }
170 }
171 return (drw->fonts = ret);
172}
173
174void
175drw_fontset_free(Fnt *font)
176{
177 if (font) {
178 drw_fontset_free(font->next);
179 xfont_free(font);
180 }
181}
182
183void
184drw_clr_create(Drw *drw, Clr *dest, const char *clrname)
185{
186 if (!drw || !dest || !clrname)
187 return;
188
189 if (!XftColorAllocName(drw->dpy, DefaultVisual(drw->dpy, drw->screen),
190 DefaultColormap(drw->dpy, drw->screen),
191 clrname, dest))
192 die("error, cannot allocate color '%s'", clrname);
193}
194
195/* Wrapper to create color schemes. The caller has to call free(3) on the
196 * returned color scheme when done using it. */
197Clr *
198drw_scm_create(Drw *drw, const char *clrnames[], size_t clrcount)
199{
200 size_t i;
201 Clr *ret;
202
203 /* need at least two colors for a scheme */
204 if (!drw || !clrnames || clrcount < 2 || !(ret = ecalloc(clrcount, sizeof(XftColor))))
205 return NULL;
206
207 for (i = 0; i < clrcount; i++)
208 drw_clr_create(drw, &ret[i], clrnames[i]);
209 return ret;
210}
211
212void
213drw_setfontset(Drw *drw, Fnt *set)
214{
215 if (drw)
216 drw->fonts = set;
217}
218
219void
220drw_setscheme(Drw *drw, Clr *scm)
221{
222 if (drw)
223 drw->scheme = scm;
224}
225
226void
227drw_rect(Drw *drw, int x, int y, unsigned int w, unsigned int h, int filled, int invert)
228{
229 if (!drw || !drw->scheme)
230 return;
231 XSetForeground(drw->dpy, drw->gc, invert ? drw->scheme[ColBg].pixel : drw->scheme[ColFg].pixel);
232 if (filled)
233 XFillRectangle(drw->dpy, drw->drawable, drw->gc, x, y, w, h);
234 else
235 XDrawRectangle(drw->dpy, drw->drawable, drw->gc, x, y, w - 1, h - 1);
236}
237
238int
239drw_text(Drw *drw, int x, int y, unsigned int w, unsigned int h, unsigned int lpad, const char *text, int invert)
240{
241 int i, ty, ellipsis_x = 0;
242 unsigned int tmpw, ew, ellipsis_w = 0, ellipsis_len;
243 XftDraw *d = NULL;
244 Fnt *usedfont, *curfont, *nextfont;
245 int utf8strlen, utf8charlen, render = x || y || w || h;
246 long utf8codepoint = 0;
247 const char *utf8str;
248 FcCharSet *fccharset;
249 FcPattern *fcpattern;
250 FcPattern *match;
251 XftResult result;
252 int charexists = 0, overflow = 0;
253 /* keep track of a couple codepoints for which we have no match. */
254 enum { nomatches_len = 64 };
255 static struct { long codepoint[nomatches_len]; unsigned int idx; } nomatches;
256 static unsigned int ellipsis_width = 0;
257
258 if (!drw || (render && (!drw->scheme || !w)) || !text || !drw->fonts)
259 return 0;
260
261 if (!render) {
262 w = invert ? invert : ~invert;
263 } else {
264 XSetForeground(drw->dpy, drw->gc, drw->scheme[invert ? ColFg : ColBg].pixel);
265 XFillRectangle(drw->dpy, drw->drawable, drw->gc, x, y, w, h);
266 d = XftDrawCreate(drw->dpy, drw->drawable,
267 DefaultVisual(drw->dpy, drw->screen),
268 DefaultColormap(drw->dpy, drw->screen));
269 x += lpad;
270 w -= lpad;
271 }
272
273 usedfont = drw->fonts;
274 if (!ellipsis_width && render)
275 ellipsis_width = drw_fontset_getwidth(drw, "...");
276 while (1) {
277 ew = ellipsis_len = utf8strlen = 0;
278 utf8str = text;
279 nextfont = NULL;
280 while (*text) {
281 utf8charlen = utf8decode(text, &utf8codepoint, UTF_SIZ);
282 for (curfont = drw->fonts; curfont; curfont = curfont->next) {
283 charexists = charexists || XftCharExists(drw->dpy, curfont->xfont, utf8codepoint);
284 if (charexists) {
285 drw_font_getexts(curfont, text, utf8charlen, &tmpw, NULL);
286 if (ew + ellipsis_width <= w) {
287 /* keep track where the ellipsis still fits */
288 ellipsis_x = x + ew;
289 ellipsis_w = w - ew;
290 ellipsis_len = utf8strlen;
291 }
292
293 if (ew + tmpw > w) {
294 overflow = 1;
295 /* called from drw_fontset_getwidth_clamp():
296 * it wants the width AFTER the overflow
297 */
298 if (!render)
299 x += tmpw;
300 else
301 utf8strlen = ellipsis_len;
302 } else if (curfont == usedfont) {
303 utf8strlen += utf8charlen;
304 text += utf8charlen;
305 ew += tmpw;
306 } else {
307 nextfont = curfont;
308 }
309 break;
310 }
311 }
312
313 if (overflow || !charexists || nextfont)
314 break;
315 else
316 charexists = 0;
317 }
318
319 if (utf8strlen) {
320 if (render) {
321 ty = y + (h - usedfont->h) / 2 + usedfont->xfont->ascent;
322 XftDrawStringUtf8(d, &drw->scheme[invert ? ColBg : ColFg],
323 usedfont->xfont, x, ty, (XftChar8 *)utf8str, utf8strlen);
324 }
325 x += ew;
326 w -= ew;
327 }
328 if (render && overflow)
329 drw_text(drw, ellipsis_x, y, ellipsis_w, h, 0, "...", invert);
330
331 if (!*text || overflow) {
332 break;
333 } else if (nextfont) {
334 charexists = 0;
335 usedfont = nextfont;
336 } else {
337 /* Regardless of whether or not a fallback font is found, the
338 * character must be drawn. */
339 charexists = 1;
340
341 for (i = 0; i < nomatches_len; ++i) {
342 /* avoid calling XftFontMatch if we know we won't find a match */
343 if (utf8codepoint == nomatches.codepoint[i])
344 goto no_match;
345 }
346
347 fccharset = FcCharSetCreate();
348 FcCharSetAddChar(fccharset, utf8codepoint);
349
350 if (!drw->fonts->pattern) {
351 /* Refer to the comment in xfont_create for more information. */
352 die("the first font in the cache must be loaded from a font string.");
353 }
354
355 fcpattern = FcPatternDuplicate(drw->fonts->pattern);
356 FcPatternAddCharSet(fcpattern, FC_CHARSET, fccharset);
357 FcPatternAddBool(fcpattern, FC_SCALABLE, FcTrue);
358
359 FcConfigSubstitute(NULL, fcpattern, FcMatchPattern);
360 FcDefaultSubstitute(fcpattern);
361 match = XftFontMatch(drw->dpy, drw->screen, fcpattern, &result);
362
363 FcCharSetDestroy(fccharset);
364 FcPatternDestroy(fcpattern);
365
366 if (match) {
367 usedfont = xfont_create(drw, NULL, match);
368 if (usedfont && XftCharExists(drw->dpy, usedfont->xfont, utf8codepoint)) {
369 for (curfont = drw->fonts; curfont->next; curfont = curfont->next)
370 ; /* NOP */
371 curfont->next = usedfont;
372 } else {
373 xfont_free(usedfont);
374 nomatches.codepoint[++nomatches.idx % nomatches_len] = utf8codepoint;
375no_match:
376 usedfont = drw->fonts;
377 }
378 }
379 }
380 }
381 if (d)
382 XftDrawDestroy(d);
383
384 return x + (render ? w : 0);
385}
386
387void
388drw_map(Drw *drw, Window win, int x, int y, unsigned int w, unsigned int h)
389{
390 if (!drw)
391 return;
392
393 XCopyArea(drw->dpy, drw->drawable, win, drw->gc, x, y, w, h, x, y);
394 XSync(drw->dpy, False);
395}
396
397unsigned int
398drw_fontset_getwidth(Drw *drw, const char *text)
399{
400 if (!drw || !drw->fonts || !text)
401 return 0;
402 return drw_text(drw, 0, 0, 0, 0, 0, text, 0);
403}
404
405unsigned int
406drw_fontset_getwidth_clamp(Drw *drw, const char *text, unsigned int n)
407{
408 unsigned int tmp = 0;
409 if (drw && drw->fonts && text && n)
410 tmp = drw_text(drw, 0, 0, 0, 0, 0, text, n);
411 return MIN(n, tmp);
412}
413
414void
415drw_font_getexts(Fnt *font, const char *text, unsigned int len, unsigned int *w, unsigned int *h)
416{
417 XGlyphInfo ext;
418
419 if (!font || !text)
420 return;
421
422 XftTextExtentsUtf8(font->dpy, font->xfont, (XftChar8 *)text, len, &ext);
423 if (w)
424 *w = ext.xOff;
425 if (h)
426 *h = font->h;
427}
428
429Cur *
430drw_cur_create(Drw *drw, int shape)
431{
432 Cur *cur;
433
434 if (!drw || !(cur = ecalloc(1, sizeof(Cur))))
435 return NULL;
436
437 cur->cursor = XCreateFontCursor(drw->dpy, shape);
438
439 return cur;
440}
441
442void
443drw_cur_free(Drw *drw, Cur *cursor)
444{
445 if (!cursor)
446 return;
447
448 XFreeCursor(drw->dpy, cursor->cursor);
449 free(cursor);
450}
generated by cgit v1.2.3 (git 2.39.1) at 2025-12-17 15:32:11 +0000