wayland: clean up, copy less and remove locking on frame done callback (a bit faster redrawing)

Sigrid Solveig Haflínudóttir committed 4 years ago

Commit 6b448b91 parent efe20ef2 files · +17 −22Browse files

Unified · Split

2 files

gui-wl/wl-cb.c +3 −6
gui-wl/wl-screen.c +14 −16

@@ -79,10 +79,8 @@ wl_surface_frame_done(void data, struct wl_callback cb, uint32_t time) · 78 unmodified lines
79	79	wl = data;
80	80	wl_callback_destroy(cb);
81	81	cb = wl_surface_frame(wl->surface);
82		− qlock(&drawlock);
83		− wlflush(wl);
84		− qunlock(&drawlock);
85	82	wl_callback_add_listener(cb, &wl_surface_frame_listener, wl);
	83	+ wlflush(wl);
86	84	}
87	85
88	86	static void
@@ -93,7 +91,7 @@ keyboard_keymap(void data, struct wl_keyboard keyboard, uint32_t format, int32 · 4 unmodified lines
93	91	Wlwin *wl;
94	92
95	93	wl = data;
96		− keymap_string = mmap(NULL, size, PROT_READ, MAP_SHARED, fd, 0);
	94	+ keymap_string = mmap(nil, size, PROT_READ, MAP_SHARED, fd, 0);
97	95	xkb_keymap_unref(keymap);
98	96	keymap = xkb_keymap_new_from_string(wl->xkb_context, keymap_string, XKB_KEYMAP_FORMAT_TEXT_V1, XKB_KEYMAP_COMPILE_NO_FLAGS);
99	97	munmap(keymap_string, size);
@@ -477,9 +475,8 @@ data_device_handle_selection(void data, struct wl_data_device data_device, str · 377 unmodified lines
477	475	int fds[2];
478	476
479	477	// An application has set the clipboard contents
480		− if (offer == NULL) {
	478	+ if(offer == nil)
481	479	return;
482		− }
483	480
484	481	wl = data;
485	482	pipe2(fds, O_CLOEXEC);

gui-wl/wl-screen.c+14−16

@@ -47,14 +47,17 @@ newwlwin(void) · 46 unmodified lines
47	47	void
48	48	wlflush(Wlwin *wl)
49	49	{
50		− if(wl->dirty == 1)
51		− memcpy(wl->shm_data, gscreen->data->bdata, wl->dxwl->dy4);
	50	+ Point p;
52	51
53	52	wl_surface_attach(wl->surface, wl->screenbuffer, 0, 0);
54		− if(wl->dirty)
55		− wl_surface_damage(wl->surface, wl->r.min.x, wl->r.min.y, Dx(wl->r), Dy(wl->r));
	53	+ if(wl->dirty){
	54	+ p.x = wl->r.min.x;
	55	+ for(p.y = wl->r.min.y; p.y < wl->r.max.y; p.y++)
	56	+ memcpy(wl->shm_data+(p.ywl->dx+p.x)4, byteaddr(gscreen, p), Dx(wl->r)*4);
	57	+ wl_surface_damage(wl->surface, p.x, wl->r.min.y, Dx(wl->r), Dy(wl->r));
	58	+ wl->dirty = 0;
	59	+ }
56	60	wl_surface_commit(wl->surface);
57		− wl->dirty = 0;
58	61	}
59	62
60	63	void
@@ -86,9 +89,8 @@ dispatchproc(void *a) · 25 unmodified lines
86	89	{
87	90	Wlwin *wl;
88	91	wl = a;
89		− for(;wl->runing == 1;){
	92	+ while(wl->runing)
90	93	wl_display_dispatch(wl->display);
91		− }
92	94	}
93	95
94	96	static Wlwin*
@@ -99,7 +101,7 @@ wlattach(char *label) · 4 unmodified lines
99	101
100	102	wl = newwlwin();
101	103	gwin = wl;
102		− wl->display = wl_display_connect(NULL);
	104	+ wl->display = wl_display_connect(nil);
103	105	if(wl->display == nil)
104	106	sysfatal("could not connect to display");
105	107
@@ -151,19 +153,15 @@ attachscreen(Rectangle r, ulong chan, int depth, int width, int *softscreen) · 45 unmodified lines
151	153	void
152	154	flushmemscreen(Rectangle r)
153	155	{
154		− Wlwin *wl;
155		−
156		− wl = gwin;
157		− wl->dirty = 1;
158		− wl->r = r;
159		− wlflush(wl);
	156	+ gwin->dirty = 1;
	157	+ gwin->r = r;
	158	+ wlflush(gwin);
160	159	}
161	160
162	161	void
163	162	screensize(Rectangle r, ulong chan)
164	163	{
165		− gwin->dirty = 1;
166		− gwin->r = r;
	164	+ flushmemscreen(r);
167	165	}
168	166
169	167	void

wayland: clean up, copy less and remove locking on frame done callback (a bit faster redrawing)

Keyboard shortcuts

General

Issues and pull requests

Issues, pull requests and Inbox

Repository code