Sivecano/dwl - Change 2GP4MXKEDQMZ7E6TCRSMV2AGN7HLEAHR3QEAC2QFCQQNPMNJSIHQC

consolidate some of the ugliness into a separate file

Similar to Linux kernel approach, encapsulate some of the uglier conditional compilation into inline functions in header files.

The goal is to make dwl.c more attractive to people who embrace the suckless philosophy - simple, short, hackable, and easy to understand. We want dwm users to feel comfortable here, not scare them off. Plus, if we do this right, the main dwl.c code should require only minimal changes once XWayland is no longer a necessary evil.

According to cloc, this also brings dwl.c down below 2000 lines of non-blank, non-comment code.

Created by Devin J. Pohly on December 25, 2020

2GP4MXKEDQMZ7E6TCRSMV2AGN7HLEAHR3QEAC2QFCQQNPMNJSIHQC

Dependencies

In channels

main

Change contents

Deletion in dwl.c at line 61 [8.4]
B:BD[6.52] → [7.7:7]
∅:D[7.7] → [9.81:97]
∅:D[6.52] → [9.81:97]
∅:D[10.74] → [9.81:97]
∅:D[11.77] → [9.81:97]
B:BD[12.153] → [9.81:97]
∅:D[9.97] → [13.1:118]
B:BD[12.153] → [13.1:118]
B:BD[13.118] → [9.98:171]
```
#ifdef XWAYLAND
#define WLR_SURFACE(C)          ((C)->type != XDGShell ? (C)->surface.xwayland->surface : (C)->surface.xdg->surface)
#else
#define WLR_SURFACE(C)          ((C)->surface.xdg->surface)
#endif
```
Deletion in dwl.c at line 91 [8.4]
B:BD[13.150] → [9.197:213]
```
#ifdef XWAYLAND
```
Deletion in dwl.c at line 92 [8.4]
B:BD[13.191] → [9.214:221]
```
#endif
```
Deletion in dwl.c at line 93 [8.4]
B:BD[13.203] → [9.222:238]
∅:D[13.203] → [14.155:185]
∅:D[9.238] → [14.155:185]
B:BD[15.230] → [14.155:185]
B:BD[14.185] → [4.4:35]
∅:D[4.35] → [9.239:246]
B:BD[14.185] → [9.239:246]
```
#ifdef XWAYLAND
	struct wl_listener activate;
	struct wl_listener configure;
#endif
```

Insertion in dwl.c at line 102 [8.4]

[16.90]

[9.264]

	struct wl_listener activate;
	struct wl_listener configure;

Deletion in dwl.c at line 320 [8.4]
B:BD[17.308] → [3.1:17]
```
#ifdef XWAYLAND
```
Deletion in dwl.c at line 322 [8.4]
B:BD[18.86] → [3.54:61]
```
#endif
```
Deletion in dwl.c at line 358 [8.4]
B:BD[9.569] → [9.569:610]
```
static void updatewindowtype(Client *c);
```

Insertion in dwl.c at line 369 [8.4]

[19.2470]

[2.1]

/* attempt to encapsulate suck into one file */
#include "client.h"

Replacement in dwl.c at line 456 [8.4]
∅:D[20.1357] → [9.834:850]
∅:D[5.1555] → [9.834:850]
B:BD[21.392] → [9.834:850]
B:BD[9.872] → [9.872:900]
B:BD[9.900] → [22.1:24]
∅:D[22.24] → [9.900:1084]
B:BD[9.900] → [9.900:1084]
∅:D[23.284] → [24.170:183]
∅:D[13.466] → [24.170:183]
∅:D[9.1084] → [24.170:183]
B:BD[24.170] → [24.170:183]
```
#ifdef XWAYLAND
	if (c->type != XDGShell) {
		updatewindowtype(c);
		appid = c->surface.xwayland->class;
		title = c->surface.xwayland->title;
	} else
#endif
	{
		appid = c->surface.xdg->toplevel->app_id;
		title = c->surface.xdg->toplevel->title;
	}
	if (!appid)
```
[5.1555]
[24.183]
```
	c->isfloating = client_is_float_type(c);
	if (!(appid = client_get_appid(c)))
```
Replacement in dwl.c at line 460 [8.4]
B:BD[24.201] → [24.201:214]
```
	if (!title)
```
[24.201]
[24.214]
```
	if (!(title = client_get_title(c)))
```
Replacement in dwl.c at line 1092 [8.4]
∅:D[25.39] → [26.65:110]
∅:D[27.288] → [26.65:110]
B:BD[26.65] → [26.65:110]
B:BD[26.110] → [25.40:112]
∅:D[25.112] → [26.187:200]
B:BD[26.187] → [26.187:200]
B:BD[26.200] → [25.113:176]
```
#ifdef XWAYLAND
	if (c->type == X11Managed)
		wlr_xwayland_surface_set_fullscreen(c->surface.xwayland, fullscreen);
	else
#endif
		wlr_xdg_toplevel_set_fullscreen(c->surface.xdg, fullscreen);
```
[25.39]
[28.59]
```
	client_set_fullscreen(c, fullscreen);
```
Replacement in dwl.c at line 1145 [8.4]
B:BD[29.168] → [30.209:242]
```
	if (c && WLR_SURFACE(c) == old)
```
[31.432]
[29.183]
```
	if (c && client_surface(c) == old)
```

Replacement in dwl.c at line 1156 [8.4]

B:BD[32.252] → [30.243:362]

B:BD[30.362] → [7.1113:1161]

∅:D[30.414] → [9.1176:1192]

∅:D[7.1161] → [9.1176:1192]

B:BD[32.276] → [9.1176:1192]

B:BD[9.1192] → [30.415:498]

B:BD[30.498] → [7.1162:1215]

∅:D[30.555] → [9.1193:1200]

∅:D[7.1215] → [9.1193:1200]

B:BD[32.372] → [9.1193:1200]

	if (old && (!c || WLR_SURFACE(c) != old)) {
		if (wlr_surface_is_xdg_surface(old))
			wlr_xdg_toplevel_set_activated(
					wlr_xdg_surface_from_wlr_surface(old), 0);
#ifdef XWAYLAND
		else if (wlr_surface_is_xwayland_surface(old))
			wlr_xwayland_surface_activate(
					wlr_xwayland_surface_from_wlr_surface(old), 0);
#endif

[32.252]

[33.175]

	if (old && (!c || client_surface(c) != old)) {

Replacement in dwl.c at line 1162 [8.4]

B:BD[33.489] → [33.489:537]

		else if (wlr_surface_is_layer_surface(old)) {

[33.489]

[33.537]

		if (wlr_surface_is_layer_surface(old)) {

Insertion in dwl.c at line 1171 [8.4]

[33.848]

		} else {
			client_activate_surface(old, 0);

Replacement in dwl.c at line 1184 [8.4]
∅:D[5.3100] → [33.853:907]
B:BD[20.2890] → [33.853:907]
```
	wlr_seat_keyboard_notify_enter(seat, WLR_SURFACE(c),
```
[5.3100]
[33.907]
```
	wlr_seat_keyboard_notify_enter(seat, client_surface(c),
```
Replacement in dwl.c at line 1188 [8.4]
B:BD[32.978] → [9.1201:1217]
∅:D[9.1217] → [32.978:1004]
B:BD[32.978] → [32.978:1004]
B:BD[32.1004] → [7.1216:1273]
∅:D[34.891] → [32.1061:1067]
∅:D[13.968] → [32.1061:1067]
∅:D[7.1273] → [32.1061:1067]
B:BD[32.1061] → [32.1061:1067]
B:BD[32.1067] → [9.1218:1225]
B:BD[9.1225] → [7.1274:1327]
```
#ifdef XWAYLAND
	if (c->type != XDGShell)
		wlr_xwayland_surface_activate(c->surface.xwayland, 1);
	else
#endif
		wlr_xdg_toplevel_set_activated(c->surface.xdg, 1);
```
[32.978]
[35.505]
```
	client_activate_surface(client_surface(c), 1);
```
Replacement in dwl.c at line 1358 [8.4]
B:BD[36.128] → [36.128:129]
B:BD[36.129] → [9.1226:1242]
∅:D[9.1242] → [37.329:357]
B:BD[36.129] → [37.329:357]
B:BD[37.357] → [13.1023:1076]
∅:D[13.1076] → [36.199:205]
B:BD[36.199] → [36.199:205]
B:BD[36.205] → [9.1243:1250]
∅:D[9.1250] → [13.1077:1126]
B:BD[36.205] → [13.1077:1126]
```
#ifdef XWAYLAND
	if (sel->type != XDGShell)
		wlr_xwayland_surface_close(sel->surface.xwayland);
	else
#endif
		wlr_xdg_toplevel_send_close(sel->surface.xdg);
```
[36.128]
[8.11024]
```
	client_send_close(sel);
```
Replacement in dwl.c at line 1375 [8.4]
B:BD[38.196] → [9.1251:1267]
∅:D[9.1267] → [38.196:228]
B:BD[38.196] → [38.196:228]
```
#ifdef XWAYLAND
	if (c->type == X11Unmanaged) {
```
[38.196]
[38.228]
```
	if (client_is_unmanaged(c)) {
```
Deletion in dwl.c at line 1380 [8.4]
B:BD[38.341] → [9.1268:1275]
```
#endif
```

Replacement in dwl.c at line 1386 [8.4]

B:BD[15.2305] → [9.1276:1292]

∅:D[9.1292] → [37.358:386]

B:BD[15.2305] → [37.358:386]

B:BD[37.386] → [13.1127:1321]

B:BD[13.1321] → [9.1293:1311]

∅:D[9.1311] → [13.1322:1380]

B:BD[23.688] → [13.1322:1380]

∅:D[13.1380] → [23.746:807]

B:BD[23.746] → [23.746:807]

∅:D[23.807] → [15.2645:2648]

B:BD[15.2645] → [15.2645:2648]

#ifdef XWAYLAND
	if (c->type != XDGShell) {
		c->geom.x = c->surface.xwayland->x;
		c->geom.y = c->surface.xwayland->y;
		c->geom.width = c->surface.xwayland->width + 2 * c->bw;
		c->geom.height = c->surface.xwayland->height + 2 * c->bw;
	} else
#endif
	{
		wlr_xdg_surface_get_geometry(c->surface.xdg, &c->geom);
		c->geom.width += 2 * c->bw;
		c->geom.height += 2 * c->bw;
	}

[15.2305]

[21.1000]

	client_get_geometry(c, &c->geom);
	c->geom.width += 2 * c->bw;
	c->geom.height += 2 * c->bw;

Replacement in dwl.c at line 1477 [8.4]
∅:D[39.133] → [9.1312:1328]
∅:D[40.845] → [9.1312:1328]
B:BD[15.2696] → [9.1312:1328]
∅:D[41.55] → [37.387:414]
∅:D[42.560] → [37.387:414]
∅:D[9.1328] → [37.387:414]
B:BD[15.2696] → [37.387:414]
B:BD[37.414] → [13.1381:1447]
∅:D[23.890] → [15.2768:2858]
∅:D[13.1447] → [15.2768:2858]
B:BD[15.2768] → [15.2768:2858]
B:BD[15.2858] → [9.1329:1336]
∅:D[9.1336] → [13.1448:1504]
B:BD[15.2858] → [13.1448:1504]
∅:D[23.947] → [15.2924:3007]
∅:D[13.1504] → [15.2924:3007]
B:BD[15.2924] → [15.2924:3007]
```
#ifdef XWAYLAND
		if (c->type != XDGShell)
			surface = wlr_surface_surface_at(c->surface.xwayland->surface,
					cursor->x - c->geom.x - c->bw,
					cursor->y - c->geom.y - c->bw, &sx, &sy);
		else
#endif
			surface = wlr_xdg_surface_surface_at(c->surface.xdg,
					cursor->x - c->geom.x - c->bw,
					cursor->y - c->geom.y - c->bw, &sx, &sy);
```
[40.845]
[40.846]
```
		surface = client_surface_at(c, cursor->x - c->geom.x - c->bw,
				cursor->y - c->geom.y - c->bw, &sx, &sy);
```
Replacement in dwl.c at line 1614 [8.4]
B:BD[43.143] → [15.3011:3039]
```
		surface = WLR_SURFACE(c);
```
[43.143]
[15.3039]
```
		surface = client_surface(c);
```
Replacement in dwl.c at line 1637 [8.4]
B:BD[40.1159] → [40.1159:1178]
∅:D[40.1178] → [39.134:178]
B:BD[44.451] → [39.134:178]
```
	if (!c)
		return;
#if XWAYLAND
	if (c->type == X11Unmanaged)
```
[40.1159]
[39.178]
```
	if (!c || client_is_unmanaged(c))
```
Deletion in dwl.c at line 1639 [8.4]
B:BD[39.188] → [39.188:195]
```
#endif
```
Replacement in dwl.c at line 1726 [8.4]
B:BD[45.2] → [7.2048:2076]
```
		surface = WLR_SURFACE(c);
```
[45.2]
[7.2076]
```
		surface = client_surface(c);
```
Replacement in dwl.c at line 1756 [8.4]
∅:D[7.2225] → [9.1337:1353]
∅:D[20.3817] → [9.1337:1353]
B:BD[15.3194] → [9.1337:1353]
∅:D[9.1353] → [37.415:442]
B:BD[15.3194] → [37.415:442]
B:BD[37.442] → [13.1505:1584]
∅:D[13.1584] → [23.965:972]
B:BD[15.3365] → [23.965:972]
B:BD[23.972] → [9.1354:1361]
∅:D[9.1361] → [13.1585:1654]
B:BD[23.972] → [13.1585:1654]
```
#ifdef XWAYLAND
		if (c->type != XDGShell)
			wlr_surface_for_each_surface(c->surface.xwayland->surface, render, &rdata);
		else
#endif
			wlr_xdg_surface_for_each_surface(c->surface.xdg, render, &rdata);
```
[7.2225]
[46.818]
```
		client_for_each_surface(c, render, &rdata);
```

Replacement in dwl.c at line 1793 [8.4]

∅:D[47.155] → [48.656:710]

B:BD[48.656] → [48.656:710]

			wlr_surface_send_frame_done(WLR_SURFACE(c), &now);

[47.155]

[7.2244]

			wlr_surface_send_frame_done(client_surface(c), &now);

Replacement in dwl.c at line 1847 [8.4]
B:BD[49.389] → [9.1387:1403]
∅:D[9.1403] → [37.443:469]
B:BD[49.389] → [37.443:469]
B:BD[37.469] → [13.1966:2020]
∅:D[13.2020] → [23.1111:1137]
B:BD[23.1111] → [23.1111:1137]
∅:D[23.1137] → [15.3425:3491]
B:BD[15.3425] → [15.3425:3491]
B:BD[15.3491] → [9.1404:1411]
∅:D[9.1411] → [13.2021:2077]
B:BD[15.3491] → [13.2021:2077]
∅:D[48.910] → [15.3571:3631]
∅:D[23.1182] → [15.3571:3631]
∅:D[13.2077] → [15.3571:3631]
B:BD[15.3571] → [15.3571:3631]
```
#ifdef XWAYLAND
	if (c->type != XDGShell)
		wlr_xwayland_surface_configure(c->surface.xwayland,
				c->geom.x, c->geom.y,
				c->geom.width - 2 * c->bw, c->geom.height - 2 * c->bw);
	else
#endif
		c->resize = wlr_xdg_toplevel_set_size(c->surface.xdg,
				c->geom.width - 2 * c->bw, c->geom.height - 2 * c->bw);
```
[49.389]
[50.1388]
```
	c->resize = client_set_size(c, c->geom.width - 2 * c->bw,
			c->geom.height - 2 * c->bw);
```

Replacement in dwl.c at line 1984 [8.4]

B:BD[51.310] → [52.36:98]

		wlr_surface_send_leave(WLR_SURFACE(c), oldmon->wlr_output);

[51.310]

[51.381]

		wlr_surface_send_leave(client_surface(c), oldmon->wlr_output);

Replacement in dwl.c at line 1990 [8.4]

B:BD[53.406] → [52.99:156]

		wlr_surface_send_enter(WLR_SURFACE(c), m->wlr_output);

[53.406]

[54.150]

		wlr_surface_send_enter(client_surface(c), m->wlr_output);

Replacement in dwl.c at line 2314 [8.4]
B:BD[55.121] → [9.1437:1453]
∅:D[9.1453] → [38.343:373]
B:BD[55.121] → [38.343:373]
```
#ifdef XWAYLAND
	if (c->type == X11Unmanaged)
```
[55.121]
[38.373]
```
	if (client_is_unmanaged(c))
```
Replacement in dwl.c at line 2316 [8.4]
B:BD[38.383] → [9.1454:1461]
```
#endif
```
[38.383]
[38.383]

Deletion in dwl.c at line 2529 [8.4]

B:BD[9.3557] → [9.3557:3595]

B:BD[9.3595] → [20.4702:4769]

∅:D[20.4769] → [22.85:395]

B:BD[22.85] → [22.85:395]

B:BD[22.395] → [7.3222:3244]

}
void
updatewindowtype(Client *c)
{
	for (size_t i = 0; i < c->surface.xwayland->window_type_len; i++)
		if (c->surface.xwayland->window_type[i] == netatom[NetWMWindowTypeDialog] ||
				c->surface.xwayland->window_type[i] == netatom[NetWMWindowTypeSplash] ||
				c->surface.xwayland->window_type[i] == netatom[NetWMWindowTypeToolbar] ||
				c->surface.xwayland->window_type[i] == netatom[NetWMWindowTypeUtility])
			c->isfloating = 1;

Replacement in config.mk at line 5 [9.4900]

B:BD[9.4954] → [5.3943:4075]

CFLAGS ?= -g -Wall -Wextra -Werror -Wno-unused-parameter -Wno-sign-compare -Wno-error=unused-function -Wdeclaration-after-statement

[9.4954]

[9.5056]

CFLAGS ?= -g -Wall -Wextra -Werror -Wno-unused-parameter -Wno-sign-compare -Wno-unused-function -Wno-unused-variable -Wdeclaration-after-statement

Replacement in config.mk at line 8 [9.4900]
B:BD[9.5095] → [9.5095:5117]
```
#CFLAGS += -DXWAYLAND
```
[9.5095]
```
CFLAGS += -DXWAYLAND
```

File addition: client.h (----------)

[8.2]

/*
 * Attempt to consolidate unavoidable suck into one file, away from dwl.c.  This
 * file is not meant to be pretty.  We use a .h file with static inline
 * functions instead of a separate .c module, or function pointers like sway, so
 * that they will simply compile out if the chosen #defines leave them unused.
 */
/* Leave this function first; it's used in the others */
static inline int
client_is_x11(Client *c)
{
#ifdef XWAYLAND
	return c->type == X11Managed || c->type == X11Unmanaged;
#else
	return 0;
#endif
}
/* The others */
static inline void
client_activate_surface(struct wlr_surface *s, int activated)
{
#ifdef XWAYLAND
	if (wlr_surface_is_xwayland_surface(s)) {
		wlr_xwayland_surface_activate(
				wlr_xwayland_surface_from_wlr_surface(s), activated);
		return;
	}
#endif
	if (wlr_surface_is_xdg_surface(s))
		wlr_xdg_toplevel_set_activated(
				wlr_xdg_surface_from_wlr_surface(s), activated);
}
static inline void
client_for_each_surface(Client *c, wlr_surface_iterator_func_t fn, void *data)
{
#ifdef XWAYLAND
	if (client_is_x11(c)) {
		wlr_surface_for_each_surface(c->surface.xwayland->surface,
				fn, data);
		return;
	}
#endif
	wlr_xdg_surface_for_each_surface(c->surface.xdg, fn, data);
}
static inline const char *
client_get_appid(Client *c)
{
#ifdef XWAYLAND
	if (client_is_x11(c))
		return c->surface.xwayland->class;
#endif
	return c->surface.xdg->toplevel->app_id;
}
static inline void
client_get_geometry(Client *c, struct wlr_box *geom)
{
#ifdef XWAYLAND
	if (client_is_x11(c)) {
		geom->x = c->surface.xwayland->x;
		geom->y = c->surface.xwayland->y;
		geom->width = c->surface.xwayland->width;
		geom->height = c->surface.xwayland->height;
		return;
	}
#endif
	wlr_xdg_surface_get_geometry(c->surface.xdg, geom);
}
static inline const char *
client_get_title(Client *c)
{
#ifdef XWAYLAND
	if (client_is_x11(c))
		return c->surface.xwayland->title;
#endif
	return c->surface.xdg->toplevel->title;
}
static inline int
client_is_float_type(Client *c)
{
#ifdef XWAYLAND
	if (client_is_x11(c))
		for (size_t i = 0; i < c->surface.xwayland->window_type_len; i++)
			if (c->surface.xwayland->window_type[i] == netatom[NetWMWindowTypeDialog] ||
					c->surface.xwayland->window_type[i] == netatom[NetWMWindowTypeSplash] ||
					c->surface.xwayland->window_type[i] == netatom[NetWMWindowTypeToolbar] ||
					c->surface.xwayland->window_type[i] == netatom[NetWMWindowTypeUtility])
				return 1;
#endif
	return 0;
}
static inline int
client_is_unmanaged(Client *c)
{
#ifdef XWAYLAND
	return c->type == X11Unmanaged;
#endif
	return 0;
}
static inline void
client_send_close(Client *c)
{
#ifdef XWAYLAND
	if (client_is_x11(c)) {
		wlr_xwayland_surface_close(c->surface.xwayland);
		return;
	}
#endif
	wlr_xdg_toplevel_send_close(c->surface.xdg);
}
static inline void
client_set_fullscreen(Client *c, int fullscreen)
{
#ifdef XWAYLAND
	if (client_is_x11(c)) {
		wlr_xwayland_surface_set_fullscreen(c->surface.xwayland, fullscreen);
		return;
	}
#endif
	wlr_xdg_toplevel_set_fullscreen(c->surface.xdg, fullscreen);
}
static inline uint32_t
client_set_size(Client *c, uint32_t width, uint32_t height)
{
#ifdef XWAYLAND
	if (client_is_x11(c)) {
		wlr_xwayland_surface_configure(c->surface.xwayland,
				c->geom.x, c->geom.y, width, height);
		return 0;
	}
#endif
	return wlr_xdg_toplevel_set_size(c->surface.xdg, width, height);
}
static inline struct wlr_surface *
client_surface(Client *c)
{
#ifdef XWAYLAND
	if (client_is_x11(c))
		return c->surface.xwayland->surface;
#endif
	return c->surface.xdg->surface;
}
static inline struct wlr_surface *
client_surface_at(Client *c, double cx, double cy, double *sx, double *sy)
{
#ifdef XWAYLAND
	if (client_is_x11(c))
		return wlr_surface_surface_at(c->surface.xwayland->surface,
				cx, cy, sx, sy);
#endif
	return wlr_xdg_surface_surface_at(c->surface.xdg, cx, cy, sx, sy);
}

consolidate some of the ugliness into a separate file

Dependencies

In channels

Change contents

Deletion in dwl.c at line 61 [8.4]

Deletion in dwl.c at line 91 [8.4]

Deletion in dwl.c at line 92 [8.4]

Deletion in dwl.c at line 93 [8.4]

Insertion in dwl.c at line 102 [8.4]

Deletion in dwl.c at line 320 [8.4]

Deletion in dwl.c at line 322 [8.4]

Deletion in dwl.c at line 358 [8.4]

Insertion in dwl.c at line 369 [8.4]

Replacement in dwl.c at line 456 [8.4]

Replacement in dwl.c at line 460 [8.4]

Replacement in dwl.c at line 1092 [8.4]

Replacement in dwl.c at line 1145 [8.4]

Replacement in dwl.c at line 1156 [8.4]

Replacement in dwl.c at line 1162 [8.4]

Insertion in dwl.c at line 1171 [8.4]

Replacement in dwl.c at line 1184 [8.4]

Replacement in dwl.c at line 1188 [8.4]

Replacement in dwl.c at line 1358 [8.4]

Replacement in dwl.c at line 1375 [8.4]

Deletion in dwl.c at line 1380 [8.4]

Replacement in dwl.c at line 1386 [8.4]

Replacement in dwl.c at line 1477 [8.4]

Replacement in dwl.c at line 1614 [8.4]

Replacement in dwl.c at line 1637 [8.4]

Deletion in dwl.c at line 1639 [8.4]

Replacement in dwl.c at line 1726 [8.4]

Replacement in dwl.c at line 1756 [8.4]

Replacement in dwl.c at line 1793 [8.4]

Replacement in dwl.c at line 1847 [8.4]

Replacement in dwl.c at line 1984 [8.4]

Replacement in dwl.c at line 1990 [8.4]

Replacement in dwl.c at line 2314 [8.4]

Replacement in dwl.c at line 2316 [8.4]

Deletion in dwl.c at line 2529 [8.4]

Replacement in config.mk at line 5 [9.4900]

Replacement in config.mk at line 8 [9.4900]

File addition: client.h (----------)