1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
|
diff --git a/src/frame.c b/src/frame.c
index 216d51d72..0b693282a 100644
--- a/src/frame.c
+++ b/src/frame.c
@@ -62,8 +62,9 @@ frameBorderTop (Client * c)
if (FLAG_TEST (c->xfwm_flags, XFWM_FLAG_HAS_BORDER)
&& !FLAG_TEST (c->flags, CLIENT_FLAG_FULLSCREEN)
- && FLAG_TEST_ALL (c->flags, CLIENT_FLAG_MAXIMIZED)
- && (c->screen_info->params->borderless_maximize))
+ && (!FLAG_TEST_ALL (c->flags, CLIENT_FLAG_MAXIMIZED)
+ || !(c->screen_info->params->borderless_maximize))
+ && c->screen_info->params->rounded_corners_keep_decorations)
{
return frameDecorationBorderTop (c->screen_info);
}
@@ -76,8 +77,9 @@ frameCornerWidth (Client * c, int corner, int state)
g_return_val_if_fail (c != NULL, 0);
TRACE ("client \"%s\" (0x%lx)", c->name, c->window);
- if (FLAG_TEST_ALL (c->flags, CLIENT_FLAG_MAXIMIZED)
- && c->screen_info->params->borderless_maximize)
+ if (((FLAG_TEST_ALL (c->flags, CLIENT_FLAG_MAXIMIZED)
+ && c->screen_info->params->borderless_maximize))
+ || !c->screen_info->params->rounded_corners_keep_decorations)
{
return 0;
}
@@ -97,8 +99,9 @@ frameCornerHeight (Client * c, int corner, int state)
g_return_val_if_fail (c != NULL, 0);
TRACE ("client \"%s\" (0x%lx)", c->name, c->window);
- if (FLAG_TEST_ALL (c->flags, CLIENT_FLAG_MAXIMIZED)
- && c->screen_info->params->borderless_maximize)
+ if (((FLAG_TEST_ALL (c->flags, CLIENT_FLAG_MAXIMIZED)
+ && c->screen_info->params->borderless_maximize))
+ || !c->screen_info->params->rounded_corners_keep_decorations)
{
return 0;
}
@@ -179,6 +182,66 @@ frameDrawTitleText (ScreenInfo * screen_info, cairo_t * cr, PangoLayout * layout
pango_cairo_show_layout (cr, layout);
}
+// Rounded corners patch, adapted from https://github.com/Asmilex/xfwm-rounded-corners-patch.
+static void
+frameRoundCorners (Client * c)
+{
+ ScreenInfo *screen_info = c->screen_info;
+ DisplayInfo *display_info = screen_info->display_info;
+
+ int rad = screen_info->params->rounded_corners_radius;
+ if (!rad || c->type == WINDOW_DOCK || c->type == WINDOW_DESKTOP
+ || FLAG_TEST_ALL (c->flags, CLIENT_FLAG_FULLSCREEN)
+ || (FLAG_TEST_ALL (c->flags, CLIENT_FLAG_MAXIMIZED)
+ && !screen_info->params->rounded_corners_maximized))
+ {
+ return;
+ }
+
+ XWindowAttributes win_attr;
+ XGetWindowAttributes (display_info->dpy, screen_info->shape_win, &win_attr);
+ if (!XGetWindowAttributes (display_info->dpy, screen_info->shape_win, &win_attr))
+ {
+ return;
+ }
+
+ int width = win_attr.border_width * 2 + win_attr.width;
+ int height = win_attr.border_width * 2 + win_attr.height;
+ int dia = 2 * rad;
+ if (dia > width || dia > height)
+ {
+ return;
+ }
+
+ Pixmap mask = XCreatePixmap (display_info->dpy, screen_info->shape_win, width, height, 1);
+ if (!mask)
+ {
+ return;
+ }
+
+ XGCValues xgcv;
+ GC shape_gc = XCreateGC (display_info->dpy, mask, 0, &xgcv);
+ if (!shape_gc)
+ {
+ XFreePixmap (display_info->dpy, mask);
+ return;
+ }
+
+ XSetForeground (display_info->dpy, shape_gc, 0);
+ XFillRectangle (display_info->dpy, mask, shape_gc, 0, 0, width, height);
+ XSetForeground (display_info->dpy, shape_gc, 1);
+ XFillArc (display_info->dpy, mask, shape_gc, 0, 0, dia, dia, 0, 23040);
+ XFillArc (display_info->dpy, mask, shape_gc, width-dia-1, 0, dia, dia, 0, 23040);
+ XFillArc (display_info->dpy, mask, shape_gc, 0, height-dia-1, dia, dia, 0, 23040);
+ XFillArc (display_info->dpy, mask, shape_gc, width-dia-1, height-dia-1, dia, dia, 0, 23040);
+ XFillRectangle (display_info->dpy, mask, shape_gc, rad, 0, width-dia, height);
+ XFillRectangle (display_info->dpy, mask, shape_gc, 0, rad, width, height-dia);
+ XShapeCombineMask (display_info->dpy, screen_info->shape_win, ShapeBounding, 0, 0, mask, ShapeSet);
+ XFreePixmap (display_info->dpy, mask);
+ XFreeGC (display_info->dpy, shape_gc);
+}
+
+
static void
frameCreateTitlePixmap (Client * c, int state, int left, int right, xfwmPixmap * title_pm, xfwmPixmap * top_pm)
{
@@ -539,6 +602,12 @@ frameSetShape (Client * c, int state, FramePixmap * frame_pix, int button_x[BUTT
rect.width = c->width;
rect.height = c->height;
XShapeCombineRectangles (display_info->dpy, screen_info->shape_win, ShapeBounding, 0, 0, &rect, 1, ShapeSet, Unsorted);
+
+ // Rounded corners patch
+ if (!frame_pix)
+ {
+ frameRoundCorners (c);
+ }
}
else
{
@@ -727,6 +796,8 @@ frameSetShape (Client * c, int state, FramePixmap * frame_pix, int button_x[BUTT
MYWINDOW_XWINDOW (c->buttons[i]), ShapeBounding, ShapeUnion);
}
}
+ // Rounded corners patch
+ frameRoundCorners (c);
}
rect.x = 0;
rect.y = 0;
@@ -957,9 +1028,10 @@ frameDrawWin (Client * c)
}
}
}
-
- if (FLAG_TEST_ALL (c->flags, CLIENT_FLAG_MAXIMIZED)
+ // Rounded corners patch
+ if ((FLAG_TEST_ALL (c->flags, CLIENT_FLAG_MAXIMIZED)
&& (c->screen_info->params->borderless_maximize))
+ || !c->screen_info->params->rounded_corners_keep_decorations)
{
xfwmWindowHide (&c->sides[SIDE_LEFT]);
xfwmWindowHide (&c->sides[SIDE_RIGHT]);
@@ -1225,7 +1297,8 @@ frameLeft (Client * c)
if (FLAG_TEST (c->xfwm_flags, XFWM_FLAG_HAS_BORDER)
&& !FLAG_TEST (c->flags, CLIENT_FLAG_FULLSCREEN)
&& (!FLAG_TEST_ALL (c->flags, CLIENT_FLAG_MAXIMIZED)
- || !(c->screen_info->params->borderless_maximize)))
+ || !(c->screen_info->params->borderless_maximize))
+ && c->screen_info->params->rounded_corners_keep_decorations)
{
return frameDecorationLeft (c->screen_info);
}
@@ -1241,7 +1314,8 @@ frameRight (Client * c)
if (FLAG_TEST (c->xfwm_flags, XFWM_FLAG_HAS_BORDER)
&& !FLAG_TEST (c->flags, CLIENT_FLAG_FULLSCREEN)
&& (!FLAG_TEST_ALL (c->flags, CLIENT_FLAG_MAXIMIZED)
- || !(c->screen_info->params->borderless_maximize)))
+ || !(c->screen_info->params->borderless_maximize))
+ && c->screen_info->params->rounded_corners_keep_decorations)
{
return frameDecorationRight (c->screen_info);
}
@@ -1254,7 +1328,7 @@ frameTop (Client * c)
g_return_val_if_fail (c != NULL, 0);
TRACE ("client \"%s\" (0x%lx)", c->name, c->window);
- if (CLIENT_HAS_FRAME (c))
+ if (CLIENT_HAS_FRAME (c) && c->screen_info->params->rounded_corners_keep_decorations)
{
return frameDecorationTop(c->screen_info) - frameBorderTop (c);
}
@@ -1286,7 +1360,8 @@ frameX (Client * c)
if (FLAG_TEST (c->xfwm_flags, XFWM_FLAG_HAS_BORDER)
&& !FLAG_TEST (c->flags, CLIENT_FLAG_FULLSCREEN)
&& (!FLAG_TEST_ALL (c->flags, CLIENT_FLAG_MAXIMIZED)
- || !(c->screen_info->params->borderless_maximize)))
+ || !(c->screen_info->params->borderless_maximize))
+ && c->screen_info->params->rounded_corners_keep_decorations)
{
return c->x - frameLeft (c);
}
@@ -1300,7 +1375,8 @@ frameY (Client * c)
TRACE ("client \"%s\" (0x%lx)", c->name, c->window);
if (FLAG_TEST (c->xfwm_flags, XFWM_FLAG_HAS_BORDER)
- && !FLAG_TEST (c->flags, CLIENT_FLAG_FULLSCREEN))
+ && !FLAG_TEST (c->flags, CLIENT_FLAG_FULLSCREEN)
+ && c->screen_info->params->rounded_corners_keep_decorations)
{
return c->y - frameTop (c);
}
@@ -1316,7 +1392,8 @@ frameWidth (Client * c)
if (FLAG_TEST (c->xfwm_flags, XFWM_FLAG_HAS_BORDER)
&& !FLAG_TEST (c->flags, CLIENT_FLAG_FULLSCREEN)
&& (!FLAG_TEST_ALL (c->flags, CLIENT_FLAG_MAXIMIZED)
- || !(c->screen_info->params->borderless_maximize)))
+ || !(c->screen_info->params->borderless_maximize))
+ && c->screen_info->params->rounded_corners_keep_decorations)
{
return c->width + frameLeft (c) + frameRight (c);
}
@@ -1331,12 +1408,14 @@ frameHeight (Client * c)
if (FLAG_TEST (c->xfwm_flags, XFWM_FLAG_HAS_BORDER)
&& FLAG_TEST (c->flags, CLIENT_FLAG_SHADED)
- && !FLAG_TEST (c->flags, CLIENT_FLAG_FULLSCREEN))
+ && !FLAG_TEST (c->flags, CLIENT_FLAG_FULLSCREEN)
+ && c->screen_info->params->rounded_corners_keep_decorations)
{
return frameTop (c) + frameBottom (c);
}
else if (FLAG_TEST (c->xfwm_flags, XFWM_FLAG_HAS_BORDER)
- && !FLAG_TEST (c->flags, CLIENT_FLAG_FULLSCREEN))
+ && !FLAG_TEST (c->flags, CLIENT_FLAG_FULLSCREEN)
+ && c->screen_info->params->rounded_corners_keep_decorations)
{
return c->height + frameTop (c) + frameBottom (c);
}
diff --git a/src/settings.c b/src/settings.c
index 385c680c2..63037a22f 100644
--- a/src/settings.c
+++ b/src/settings.c
@@ -763,9 +763,16 @@ loadSettings (ScreenInfo *screen_info)
{"wrap_workspaces", NULL, G_TYPE_BOOLEAN, TRUE},
{"zoom_desktop", NULL, G_TYPE_BOOLEAN, TRUE},
{"zoom_pointer", NULL, G_TYPE_BOOLEAN, TRUE},
+ {"rounded_corners_radius", NULL, G_TYPE_INT, TRUE},
+ {"rounded_corners_maximized", NULL, G_TYPE_BOOLEAN, TRUE},
+ {"rounded_corners_keep_decorations", NULL, G_TYPE_BOOLEAN, TRUE},
{NULL, NULL, G_TYPE_INVALID, FALSE}
};
+ setIntValue ("rounded_corners_radius", 8, rc);
+ setBooleanValue ("rounded_corners_maximized", FALSE, rc);
+ setBooleanValue ("rounded_corners_keep_decorations", TRUE, rc);
+
TRACE ("entering");
loadRcData (screen_info, rc);
@@ -933,6 +940,11 @@ loadSettings (ScreenInfo *screen_info)
compositorSetVblankMode (screen_info, compositorParseVblankMode (value));
}
+ // Rounded corners patch
+ screen_info->params->rounded_corners_radius = getIntValue ("rounded_corners_radius", rc);
+ screen_info->params->rounded_corners_maximized = getBoolValue ("rounded_corners_maximized", rc);
+ screen_info->params->rounded_corners_keep_decorations = getBoolValue ("rounded_corners_keep_decorations", rc);
+
freeRc (rc);
return TRUE;
}
@@ -1258,6 +1270,11 @@ cb_xfwm4_channel_property_changed(XfconfChannel *channel, const gchar *property_
{
screen_info->params->cycle_tabwin_mode = CLAMP (g_value_get_int(value), 0, 1);
}
+ else if (!strcmp (name, "rounded_corners_radius"))
+ {
+ screen_info->params->rounded_corners_radius = CLAMP (g_value_get_int(value), 0, 100);
+ reloadScreenSettings (screen_info, UPDATE_ALL);
+ }
else if ((!strcmp (name, "button_offset"))
|| (!strcmp (name, "button_spacing"))
|| (!strcmp (name, "double_click_time"))
@@ -1452,6 +1469,16 @@ cb_xfwm4_channel_property_changed(XfconfChannel *channel, const gchar *property_
{
screen_info->params->wrap_cycle = g_value_get_boolean (value);
}
+ else if (!strcmp (name, "rounded_corners_maximized"))
+ {
+ screen_info->params->rounded_corners_maximized = g_value_get_boolean (value);
+ reloadScreenSettings (screen_info, UPDATE_MAXIMIZE);
+ }
+ else if (!strcmp (name, "rounded_corners_keep_decorations"))
+ {
+ screen_info->params->rounded_corners_keep_decorations = g_value_get_boolean (value);
+ reloadScreenSettings (screen_info, UPDATE_ALL);
+ }
else if ((!strcmp (name, "full_width_title"))
|| (!strcmp (name, "show_app_icon")))
{
diff --git a/src/settings.h b/src/settings.h
index 612ee2e8a..ea9174aff 100644
--- a/src/settings.h
+++ b/src/settings.h
@@ -252,6 +252,9 @@ struct _XfwmParams
gboolean wrap_workspaces;
gboolean zoom_desktop;
gboolean zoom_pointer;
+ int rounded_corners_radius;
+ gboolean rounded_corners_maximized;
+ gboolean rounded_corners_keep_decorations;
};
gboolean loadSettings (ScreenInfo *);
|