Sivecano/dwl - Change O5JVMDEEKP334BAYMJ6HHXROW4X4WC24JHCYZTKJRQE5UGYXV7YQC

functions: dwm style and more dwm-like names

Created by Devin J. Pohly on April 21, 2020

O5JVMDEEKP334BAYMJ6HHXROW4X4WC24JHCYZTKJRQE5UGYXV7YQC

Dependencies

In channels

main

Change contents

Replacement in dwl.c at line 132 [3.4]

B:BD[3.2416] → [3.2416:2493]

static void focus_view(struct dwl_view *view, struct wlr_surface *surface) {

[3.2416]

[3.2493]

static void
focus(struct dwl_view *view, struct wlr_surface *surface)
{

Replacement in dwl.c at line 171 [3.4]

B:BD[3.3824] → [3.3824:3909]

static void keyboard_handle_modifiers(
		struct wl_listener *listener, void *data) {

[3.3824]

[3.3909]

static void
keypressmod(struct wl_listener *listener, void *data)
{

Replacement in dwl.c at line 190 [3.4]

B:BD[3.4602] → [4.315:380]

static void quit(struct dwl_server *server, const Arg *unused) {

[3.4602]

[4.380]

static void
quit(struct dwl_server *server, const Arg *arg)
{

Replacement in dwl.c at line 196 [3.4]

B:BD[4.426] → [2.55:118]

static void spawn(struct dwl_server *server, const Arg *arg) {

[4.426]

[2.118]

static void
spawn(struct dwl_server *server, const Arg *arg)
{

Replacement in dwl.c at line 208 [3.4]

∅:D[2.307] → [4.426:496]

B:BD[4.426] → [4.426:496]

static void focusnext(struct dwl_server *server, const Arg *unused) {

[2.307]

[4.496]

static void
focusnext(struct dwl_server *server, const Arg *arg)
{

Replacement in dwl.c at line 219 [3.4]

B:BD[4.767] → [4.767:824]

	focus_view(next_view, next_view->xdg_surface->surface);

[4.767]

[4.824]

	focus(next_view, next_view->xdg_surface->surface);

Replacement in dwl.c at line 225 [3.4]

B:BD[4.976] → [4.976:1068]

static bool handle_keybinding(struct dwl_server *server, uint32_t mods, xkb_keysym_t sym) {

[4.976]

[3.4679]

static bool
keybinding(struct dwl_server *server, uint32_t mods, xkb_keysym_t sym)
{

Replacement in dwl.c at line 245 [3.4]

B:BD[3.5553] → [3.5553:5632]

static void keyboard_handle_key(
		struct wl_listener *listener, void *data) {

[3.5553]

[3.5632]

static void
keypress(struct wl_listener *listener, void *data)
{

Replacement in dwl.c at line 267 [3.4]

B:BD[3.6511] → [4.1298:1364]

			handled = handle_keybinding(server, mods, syms[i]) || handled;

[3.6511]

[3.6560]

			handled = keybinding(server, mods, syms[i]) || handled;

Replacement in dwl.c at line 279 [3.4]

B:BD[3.6780] → [3.6780:6876]

static void server_new_keyboard(struct dwl_server *server,
		struct wlr_input_device *device) {

[3.6780]

[3.6876]

static void
createkeyboard(struct dwl_server *server, struct wlr_input_device *device)
{

Replacement in dwl.c at line 299 [3.4]

B:BD[3.7527] → [3.7527:7584]

	keyboard->modifiers.notify = keyboard_handle_modifiers;

[3.7527]

[3.7584]

	keyboard->modifiers.notify = keypressmod;

Replacement in dwl.c at line 301 [3.4]
B:BD[3.7659] → [3.7659:7704]
```
	keyboard->key.notify = keyboard_handle_key;
```
[3.7659]
[3.7704]
```
	keyboard->key.notify = keypress;
```

Replacement in dwl.c at line 310 [3.4]

B:BD[3.7925] → [3.7925:8020]

static void server_new_pointer(struct dwl_server *server,
		struct wlr_input_device *device) {

[3.7925]

[3.8020]

static void
createpointer(struct dwl_server *server, struct wlr_input_device *device)
{

Replacement in dwl.c at line 320 [3.4]

B:BD[3.8326] → [3.8326:8399]

static void server_new_input(struct wl_listener *listener, void *data) {

[3.8326]

[3.8399]

static void
inputdevice(struct wl_listener *listener, void *data)
{

Replacement in dwl.c at line 330 [3.4]
B:BD[3.8665] → [3.8665:8704]
```
		server_new_keyboard(server, device);
```
[3.8665]
[3.8704]
```
		createkeyboard(server, device);
```
Replacement in dwl.c at line 333 [3.4]
B:BD[3.8745] → [3.8745:8783]
```
		server_new_pointer(server, device);
```
[3.8745]
[3.8783]
```
		createpointer(server, device);
```

Replacement in dwl.c at line 348 [3.4]

B:BD[3.9216] → [3.9216:9292]

static void seat_request_cursor(struct wl_listener *listener, void *data) {

[3.9216]

[3.9292]

static void
setcursor(struct wl_listener *listener, void *data)
{

Replacement in dwl.c at line 369 [3.4]

B:BD[3.10123] → [3.10123:10248]

static bool view_at(struct dwl_view *view,
		double lx, double ly, struct wlr_surface **surface,
		double *sx, double *sy) {

[3.10123]

[3.10248]

static bool
xytosurface(struct dwl_view *view, double lx, double ly,
		struct wlr_surface **surface, double *sx, double *sy)
{

Replacement in dwl.c at line 400 [3.4]

B:BD[3.11027] → [3.11027:11177]

static struct dwl_view *desktop_view_at(
		struct dwl_server *server, double lx, double ly,
		struct wlr_surface **surface, double *sx, double *sy) {

[3.11027]

[3.11177]

static struct dwl_view *
xytoview(struct dwl_server *server, double lx, double ly,
		struct wlr_surface **surface, double *sx, double *sy)
{

Replacement in dwl.c at line 408 [3.4]

B:BD[3.11405] → [3.11405:11453]

		if (view_at(view, lx, ly, surface, sx, sy)) {

[3.11405]

[3.11453]

		if (xytosurface(view, lx, ly, surface, sx, sy)) {

Replacement in dwl.c at line 415 [3.4]

B:BD[3.11493] → [3.11493:11569]

static void process_cursor_move(struct dwl_server *server, uint32_t time) {

[3.11493]

[3.11569]

static void
handlemove(struct dwl_server *server, uint32_t time)
{

Replacement in dwl.c at line 423 [3.4]

B:BD[3.11748] → [3.11748:11826]

static void process_cursor_resize(struct dwl_server *server, uint32_t time) {

[3.11748]

[3.11826]

static void
handleresize(struct dwl_server *server, uint32_t time)
{

Replacement in dwl.c at line 466 [3.4]

B:BD[3.13044] → [3.13044:13122]

static void process_cursor_motion(struct dwl_server *server, uint32_t time) {

[3.13044]

[3.13122]

static void motionnotify(struct dwl_server *server, uint32_t time)
{

Replacement in dwl.c at line 470 [3.4]
B:BD[3.13237] → [3.13237:13274]
```
		process_cursor_move(server, time);
```
[3.13237]
[3.13274]
```
		handlemove(server, time);
```
Replacement in dwl.c at line 473 [3.4]
B:BD[3.13340] → [3.13340:13379]
```
		process_cursor_resize(server, time);
```
[3.13340]
[3.13379]
```
		handleresize(server, time);
```

Replacement in dwl.c at line 481 [3.4]

B:BD[3.13561] → [3.13561:13610]

	struct dwl_view *view = desktop_view_at(server,

[3.13561]

[3.13610]

	struct dwl_view *view = xytoview(server,

Replacement in dwl.c at line 513 [3.4]

B:BD[3.14793] → [3.14793:14870]

static void server_cursor_motion(struct wl_listener *listener, void *data) {

[3.14793]

[3.14870]

static void
motionrelative(struct wl_listener *listener, void *data)
{

Replacement in dwl.c at line 528 [3.4]

B:BD[3.15542] → [3.15542:15592]

	process_cursor_motion(server, event->time_msec);

[3.15542]

[3.15592]

	motionnotify(server, event->time_msec);

Replacement in dwl.c at line 531 [3.4]

B:BD[3.15595] → [3.15595:15684]

static void server_cursor_motion_absolute(
		struct wl_listener *listener, void *data) {

[3.15595]

[3.15684]

static void
motionabsolute(struct wl_listener *listener, void *data)
{

Replacement in dwl.c at line 544 [3.4]

B:BD[3.16314] → [3.16314:16364]

	process_cursor_motion(server, event->time_msec);

[3.16314]

[3.16364]

	motionnotify(server, event->time_msec);

Replacement in dwl.c at line 547 [3.4]

B:BD[3.16367] → [3.16367:16444]

static void server_cursor_button(struct wl_listener *listener, void *data) {

[3.16367]

[3.16444]

static void
buttonpress(struct wl_listener *listener, void *data)
{

Replacement in dwl.c at line 561 [3.4]

B:BD[3.16918] → [3.16918:16967]

	struct dwl_view *view = desktop_view_at(server,

[3.16918]

[3.16967]

	struct dwl_view *view = xytoview(server,

Replacement in dwl.c at line 568 [3.4]
B:BD[3.17260] → [3.17260:17289]
```
		focus_view(view, surface);
```
[3.17260]
[5.292]
```
		focus(view, surface);
```

Replacement in dwl.c at line 582 [3.4]

B:BD[3.17295] → [3.17295:17370]

static void server_cursor_axis(struct wl_listener *listener, void *data) {

[3.17295]

[3.17370]

static void
axisnotify(struct wl_listener *listener, void *data)
{

Replacement in dwl.c at line 596 [3.4]

B:BD[3.17831] → [3.17831:17907]

static void server_cursor_frame(struct wl_listener *listener, void *data) {

[3.17831]

[3.17907]

static void
cursorframe(struct wl_listener *listener, void *data)
{

Replacement in dwl.c at line 618 [3.4]

B:BD[3.18663] → [3.18663:18751]

static void render_surface(struct wlr_surface *surface,
		int sx, int sy, void *data) {

[3.18663]

[3.18751]

static void
render(struct wlr_surface *surface, int sx, int sy, void *data)
{

Replacement in dwl.c at line 680 [3.4]

B:BD[3.21247] → [3.21247:21316]

static void output_frame(struct wl_listener *listener, void *data) {

[3.21247]

[3.21316]

static void
renderoutput(struct wl_listener *listener, void *data)
{

Replacement in dwl.c at line 719 [3.4]

B:BD[3.22614] → [3.22614:22685]

		/* This calls our render_surface function for each surface among the

[3.22614]

[3.22685]

		/* This calls our render function for each surface among the

Replacement in dwl.c at line 722 [3.4]
B:BD[3.22782] → [3.22782:22811]
```
				render_surface, &rdata);
```
[3.22782]
[3.22811]
```
				render, &rdata);
```

Replacement in dwl.c at line 739 [3.4]

B:BD[3.23491] → [3.23491:23565]

static void server_new_output(struct wl_listener *listener, void *data) {

[3.23491]

[3.23565]

static void
createoutput(struct wl_listener *listener, void *data)
{

Replacement in dwl.c at line 768 [3.4]
B:BD[3.24632] → [3.24632:24670]
```
	output->frame.notify = output_frame;
```
[3.24632]
[3.24670]
```
	output->frame.notify = renderoutput;
```

Replacement in dwl.c at line 784 [3.4]

B:BD[3.25319] → [3.25319:25391]

static void xdg_surface_map(struct wl_listener *listener, void *data) {

[3.25319]

[3.25391]

static void
maprequest(struct wl_listener *listener, void *data)
{

Replacement in dwl.c at line 790 [3.4]

B:BD[3.25549] → [3.25549:25596]

	focus_view(view, view->xdg_surface->surface);

[3.25549]

[3.25596]

	focus(view, view->xdg_surface->surface);

Replacement in dwl.c at line 793 [3.4]

B:BD[3.25599] → [3.25599:25673]

static void xdg_surface_unmap(struct wl_listener *listener, void *data) {

[3.25599]

[3.25673]

static void
unmapnotify(struct wl_listener *listener, void *data)
{

Replacement in dwl.c at line 801 [3.4]

B:BD[3.25839] → [3.25839:25915]

static void xdg_surface_destroy(struct wl_listener *listener, void *data) {

[3.25839]

[3.25915]

static void
destroynotify(struct wl_listener *listener, void *data)
{

Replacement in dwl.c at line 810 [3.4]

B:BD[3.26105] → [3.26105:26205]

static void begin_interactive(struct dwl_view *view,
		enum dwl_cursor_mode mode, uint32_t edges) {

[3.26105]

[3.26205]

static void
moveresize(struct dwl_view *view,
		enum dwl_cursor_mode mode, uint32_t edges)
{

Replacement in dwl.c at line 840 [3.4]

B:BD[3.27158] → [5.636:706]

static void movemouse(struct dwl_server *server, const Arg *unused) {

[3.27158]

[5.706]

static void
movemouse(struct dwl_server *server, const Arg *arg)
{

Replacement in dwl.c at line 845 [3.4]

B:BD[5.752] → [5.752:801]

	struct dwl_view *view = desktop_view_at(server,

[5.752]

[5.801]

	struct dwl_view *view = xytoview(server,

Replacement in dwl.c at line 850 [3.4]

B:BD[5.890] → [5.890:936]

	begin_interactive(view, DWL_CURSOR_MOVE, 0);

[5.890]

[5.936]

	moveresize(view, DWL_CURSOR_MOVE, 0);

Replacement in dwl.c at line 853 [3.4]

B:BD[5.939] → [5.939:1011]

static void resizemouse(struct dwl_server *server, const Arg *unused) {

[5.939]

[5.1011]

static void
resizemouse(struct dwl_server *server, const Arg *arg)
{

Replacement in dwl.c at line 858 [3.4]

B:BD[5.1057] → [5.1057:1106]

	struct dwl_view *view = desktop_view_at(server,

[5.1057]

[5.1106]

	struct dwl_view *view = xytoview(server,

Replacement in dwl.c at line 868 [3.4]

B:BD[5.1409] → [5.1409:1486]

	begin_interactive(view, DWL_CURSOR_RESIZE, WLR_EDGE_BOTTOM|WLR_EDGE_RIGHT);

[5.1409]

[5.1486]

	moveresize(view, DWL_CURSOR_RESIZE, WLR_EDGE_BOTTOM|WLR_EDGE_RIGHT);

Replacement in dwl.c at line 871 [3.4]

∅:D[5.1489] → [3.27158:27243]

B:BD[3.27158] → [3.27158:27243]

static void xdg_toplevel_request_move(
		struct wl_listener *listener, void *data) {

[5.1489]

[3.27243]

static void
moverequest(struct wl_listener *listener, void *data)
{

Replacement in dwl.c at line 880 [3.4]
B:BD[3.27680] → [3.27680:27726]
```
	begin_interactive(view, DWL_CURSOR_MOVE, 0);
```
[3.27680]
[3.27726]
```
	moveresize(view, DWL_CURSOR_MOVE, 0);
```

Replacement in dwl.c at line 883 [3.4]

B:BD[3.27729] → [3.27729:27816]

static void xdg_toplevel_request_resize(
		struct wl_listener *listener, void *data) {

[3.27729]

[3.27816]

static void
resizerequest(struct wl_listener *listener, void *data)
{

Replacement in dwl.c at line 893 [3.4]

B:BD[3.28310] → [3.28310:28369]

	begin_interactive(view, DWL_CURSOR_RESIZE, event->edges);

[3.28310]

[3.28369]

	moveresize(view, DWL_CURSOR_RESIZE, event->edges);

Replacement in dwl.c at line 896 [3.4]

B:BD[3.28372] → [3.28372:28451]

static void server_new_xdg_surface(struct wl_listener *listener, void *data) {

[3.28372]

[3.28451]

static void
createnotify(struct wl_listener *listener, void *data)
{

Replacement in dwl.c at line 915 [3.4]
B:BD[3.29008] → [3.29008:29045]
```
	view->map.notify = xdg_surface_map;
```
[3.29008]
[3.29045]
```
	view->map.notify = maprequest;
```
Replacement in dwl.c at line 917 [3.4]
B:BD[3.29099] → [3.29099:29140]
```
	view->unmap.notify = xdg_surface_unmap;
```
[3.29099]
[3.29140]
```
	view->unmap.notify = unmapnotify;
```
Replacement in dwl.c at line 919 [3.4]
B:BD[3.29198] → [3.29198:29243]
```
	view->destroy.notify = xdg_surface_destroy;
```
[3.29198]
[3.29243]
```
	view->destroy.notify = destroynotify;
```

Replacement in dwl.c at line 924 [3.4]

B:BD[3.29378] → [3.29378:29434]

	view->request_move.notify = xdg_toplevel_request_move;

[3.29378]

[3.29434]

	view->request_move.notify = moverequest;

Replacement in dwl.c at line 926 [3.4]

B:BD[3.29503] → [3.29503:29563]

	view->request_resize.notify = xdg_toplevel_request_resize;

[3.29503]

[3.29563]

	view->request_resize.notify = resizerequest;

Replacement in dwl.c at line 933 [3.4]
B:BD[3.29722] → [3.29722:29757]
```
int main(int argc, char *argv[]) {
```
[3.29722]
[3.29757]
```
int
main(int argc, char *argv[])
{
```

Replacement in dwl.c at line 990 [3.4]

B:BD[3.32004] → [3.32004:32051]

	server.new_output.notify = server_new_output;

[3.32004]

[3.32051]

	server.new_output.notify = createoutput;

Replacement in dwl.c at line 1001 [3.4]

B:BD[3.32462] → [3.32462:32519]

	server.new_xdg_surface.notify = server_new_xdg_surface;

[3.32462]

[3.32519]

	server.new_xdg_surface.notify = createnotify;

Replacement in dwl.c at line 1031 [3.4]

B:BD[3.33800] → [3.33800:33853]

	server.cursor_motion.notify = server_cursor_motion;

[3.33800]

[3.33853]

	server.cursor_motion.notify = motionrelative;

Replacement in dwl.c at line 1033 [3.4]

B:BD[3.33923] → [3.33923:33994]

	server.cursor_motion_absolute.notify = server_cursor_motion_absolute;

[3.33923]

[3.33994]

	server.cursor_motion_absolute.notify = motionabsolute;

Replacement in dwl.c at line 1036 [3.4]

B:BD[3.34085] → [3.34085:34138]

	server.cursor_button.notify = server_cursor_button;

[3.34085]

[3.34138]

	server.cursor_button.notify = buttonpress;

Replacement in dwl.c at line 1038 [3.4]

B:BD[3.34208] → [3.34208:34257]

	server.cursor_axis.notify = server_cursor_axis;

[3.34208]

[3.34257]

	server.cursor_axis.notify = axisnotify;

Replacement in dwl.c at line 1040 [3.4]

B:BD[3.34323] → [3.34323:34374]

	server.cursor_frame.notify = server_cursor_frame;

[3.34323]

[3.34374]

	server.cursor_frame.notify = cursorframe;

Replacement in dwl.c at line 1050 [3.4]
B:BD[3.34778] → [3.34778:34823]
```
	server.new_input.notify = server_new_input;
```
[3.34778]
[3.34823]
```
	server.new_input.notify = inputdevice;
```

Replacement in dwl.c at line 1053 [3.4]

B:BD[3.34953] → [3.34953:35006]

	server.request_cursor.notify = seat_request_cursor;

[3.34953]

[3.35006]

	server.request_cursor.notify = setcursor;