-
Notifications
You must be signed in to change notification settings - Fork 328
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Absolutum obsoletum Signed-off-by: Hank Donnay <[email protected]>
- Loading branch information
Showing
18 changed files
with
2,182 additions
and
3 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
*-protocol.[ch] |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -25,6 +25,8 @@ HFILES=\ | |
|
||
<$PLAN9/src/mkone | ||
|
||
<mkwayland | ||
|
||
$O.drawclient: drawclient.$O | ||
$LD -o $target $prereq | ||
|
||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,19 @@ | ||
way_proto=/usr/share/wayland-protocols | ||
|
||
xdg-shell-protocol.c: $way_proto/stable/xdg-shell/xdg-shell.xml | ||
wayland-scanner private-code < $prereq > $target | ||
|
||
xdg-shell-client-protocol.h: $way_proto/stable/xdg-shell/xdg-shell.xml | ||
wayland-scanner client-header < $prereq > $target | ||
|
||
xdg-decoration-protocol.c: $way_proto/unstable/xdg-decoration/xdg-decoration-unstable-v1.xml | ||
wayland-scanner private-code < $prereq > $target | ||
|
||
xdg-decoration-client-protocol.h: $way_proto/unstable/xdg-decoration/xdg-decoration-unstable-v1.xml | ||
wayland-scanner client-header < $prereq > $target | ||
|
||
pointer-constraints-client-protocol.h: $way_proto/unstable/pointer-constraints/pointer-constraints-unstable-v1.xml | ||
wayland-scanner client-header < $prereq > $target | ||
|
||
pointer-constraints-protocol.c: $way_proto/unstable/pointer-constraints/pointer-constraints-unstable-v1.xml | ||
wayland-scanner private-code < $prereq > $target |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,157 @@ | ||
#include <u.h> | ||
#include "wayland-inc.h" | ||
#include <libc.h> | ||
#include <draw.h> | ||
#include <memdraw.h> | ||
|
||
#include "wayland-shm.h" | ||
#include <sys/mman.h> | ||
|
||
AUTOLIB(wayland); | ||
|
||
Memimage * | ||
allocmemimage(Rectangle r, u32int chan) { | ||
int d; | ||
Memimage *i; | ||
if ((d = chantodepth(chan)) == 0) { | ||
werrstr("bad channel descriptor %.8lux", chan); | ||
return nil; | ||
} | ||
// fprint(2, "allocmemimage: start\n"); | ||
// Too lazy to write a real allocator, just create shm mappings and rely on | ||
// wayland's book-keeping to tear them down. | ||
int l = wordsperline(r, d); | ||
int nw = l * Dy(r); | ||
uint32 sz = sizeof(shmTab) + ((1 + nw) * sizeof(ulong)); | ||
Memdata *md = malloc(sizeof(Memdata)); | ||
if (md == nil) { | ||
// fprint(2, "allocmemimage: malloc fail\n"); | ||
return nil; | ||
} | ||
// fprint(2, "allocmemimage: shm\n"); | ||
int fd = allocate_shm_file(sz); | ||
if (fd == -1) { | ||
// fprint(2, "allocmemimage: shm fail\n"); | ||
free(md); | ||
return nil; | ||
} | ||
// fprint(2, "allocmemimage: mmap\n"); | ||
uchar *data = mmap(NULL, sz, PROT_READ | PROT_WRITE, MAP_SHARED, fd, 0); | ||
if (data == MAP_FAILED) { | ||
// fprint(2, "allocmemimage: map fail\n"); | ||
free(md); | ||
close(fd); | ||
return nil; | ||
} | ||
|
||
md->ref = 1; | ||
md->base = (u32int *)data; | ||
shmTab *t = (shmTab *)data; | ||
t->md = md; | ||
t->fd = fd; | ||
t->sz = sz; | ||
// Should only be 24 bytes used, max. | ||
md->bdata = (uchar *)(md->base + sizeof(shmTab)); | ||
md->allocd = 1; | ||
// fprint(2, "allocmemimage: allocmemimaged\n"); | ||
i = allocmemimaged(r, chan, md, t); | ||
if (i == nil) { | ||
// fprint(2, "allocmemimage: allocmemimaged fail\n"); | ||
munmap(data, sz); | ||
free(md); | ||
close(fd); | ||
return nil; | ||
} | ||
md->imref = i; | ||
return i; | ||
} | ||
|
||
/* | ||
static void | ||
buffer_release(void *opaque, struct wl_buffer *buf) { | ||
wl_buffer_destroy(buf); | ||
} | ||
static struct wl_buffer_listener kill_buffer = { | ||
.release = buffer_release, | ||
}; | ||
void | ||
mk_buffer(window *w, Memimage *i) { | ||
if (i == nil) | ||
return; | ||
if (i->X != nil) | ||
return; | ||
if (i->data->ref == 0 || !i->data->allocd) // zombie memimage ??? | ||
return; | ||
shmTab *tab = (shmTab *)i->data->base; | ||
Globals *g = w->global; | ||
struct wl_shm_pool *pool = wl_shm_create_pool(g->wl_shm, tab->fd, tab->sz); | ||
if (pool == nil) { | ||
fprint(2, "mk_buffer: pool fail\n"); | ||
return; | ||
} | ||
struct wl_buffer *buf = wl_shm_pool_create_buffer( | ||
pool, 64, Dx(i->r), Dy(i->r), Dx(i->r) * 4, WL_SHM_FORMAT_XRGB8888); | ||
if (buf == nil) { | ||
fprint(2, "mk_buffer: buffer fail\n"); | ||
return; | ||
} | ||
wl_shm_pool_destroy(pool); | ||
fprint(2, "mkbuffer: %p\n", i); | ||
i->X = buf; | ||
wl_buffer_add_listener(buf, &kill_buffer, NULL); | ||
} | ||
*/ | ||
|
||
void | ||
freememimage(Memimage *i) { | ||
if (i == nil) | ||
return; | ||
if (i->data->ref-- == 1 && i->data->allocd) { | ||
if (i->data->base) { | ||
shmTab *tab = (shmTab *)i->data->base; | ||
if (tab->md != i->data) { | ||
fprint(2, "maritan memdata\n"); | ||
return _freememimage(i); | ||
}; | ||
close(tab->fd); | ||
munmap(i->data->base, tab->sz); | ||
} | ||
free(i->data); | ||
} | ||
free(i); | ||
} | ||
|
||
/* | ||
void | ||
memimagedraw(Memimage *dst, Rectangle r, Memimage *src, Point sp, | ||
Memimage *mask, Point mp, int op) { | ||
fprint(2, "memimagedraw\n"); | ||
} | ||
void | ||
memfillcolor(Memimage *m, u32int val) { | ||
_memfillcolor(m, val); | ||
} | ||
u32int | ||
pixelbits(Memimage *m, Point p) { | ||
return _pixelbits(m, p); | ||
} | ||
*/ | ||
|
||
int | ||
loadmemimage(Memimage *i, Rectangle r, uchar *data, int ndata) { | ||
return _loadmemimage(i, r, data, ndata); | ||
} | ||
|
||
int | ||
cloadmemimage(Memimage *i, Rectangle r, uchar *data, int ndata) { | ||
return _cloadmemimage(i, r, data, ndata); | ||
} | ||
|
||
int | ||
unloadmemimage(Memimage *i, Rectangle r, uchar *data, int ndata) { | ||
return _unloadmemimage(i, r, data, ndata); | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,114 @@ | ||
#include <u.h> | ||
#include <libc.h> | ||
#include <wayland-client.h> | ||
#include <wayland-cursor.h> | ||
#include <xkbcommon/xkbcommon.h> | ||
|
||
#include "xdg-shell-client-protocol.h" | ||
#include "xdg-decoration-client-protocol.h" | ||
#include "pointer-constraints-client-protocol.h" | ||
|
||
struct bounds { | ||
int x, y; | ||
}; | ||
|
||
struct output_elem { | ||
struct wl_output *o; | ||
int scale, dpi, on; | ||
double px, mm; | ||
struct wl_list link; | ||
}; | ||
|
||
typedef struct Globals { | ||
struct wl_display *wl_display; | ||
struct wl_registry *wl_registry; | ||
struct wl_shm *wl_shm; | ||
struct wl_cursor_theme *wl_cursor_theme; | ||
struct wl_compositor *wl_compositor; | ||
struct wl_subcompositor *wl_subcompositor; | ||
struct xdg_wm_base *xdg_wm_base; | ||
struct wl_seat *wl_seat; | ||
struct wl_data_device_manager *data_device_manager; | ||
struct wl_data_device *data_device; | ||
struct wl_data_offer *snarf_offer; | ||
int snarf_fd; | ||
char *snarf_buf; | ||
struct zwp_pointer_constraints_v1 *pointer_constraints; | ||
struct zxdg_decoration_manager_v1 *zxdg_decoration_manager_v1; | ||
struct wl_list output_list; | ||
|
||
uint32_t seat_capabilities; | ||
struct pixfmt { | ||
uint32_t wl; | ||
uint32_t p9; | ||
} pixfmt; | ||
struct bounds bounds; | ||
} Globals; | ||
|
||
// This is the singleton for a given process. | ||
// | ||
// Wayland specific code should be using the passed data pointer, this is just | ||
// for the plan9 interface callbacks. | ||
extern Globals procState; | ||
|
||
// Window is a big bag of state for painting a window on screen. | ||
typedef struct window { | ||
// RWLock mu; | ||
Globals *global; | ||
struct wl_keyboard *wl_keyboard; | ||
struct wl_pointer *wl_pointer; | ||
struct wl_surface *wl_surface; | ||
struct xdg_surface *xdg_surface; | ||
struct xdg_toplevel *xdg_toplevel; | ||
struct zwp_pointer_constraints_v1 *pointer_constraints; | ||
// Frame and border need to be re-organized: "frame" was originally the | ||
// window contents with the main surface being the border, but this | ||
// arrangement breaks pointer warping in GNOME. This state of affair is | ||
// weird, but actually works. | ||
struct border { | ||
struct edge { | ||
struct wl_subsurface *subsurface; | ||
struct wl_surface *surface; | ||
int skip; | ||
int x, y; | ||
} edge[4]; // top, bottom, left, right | ||
struct wl_shm_pool *pool; | ||
} decoration; | ||
struct bounds bounds, cursize, wantsize; | ||
int scale; | ||
int resizing; | ||
// Mouse members: x, y, button state, time and entry serial. | ||
struct mouse { | ||
// RWLock mu; | ||
int X, Y, B, T, S; | ||
int in; // which surface? | ||
} m; | ||
struct cursor { | ||
// RWLock mu; | ||
struct wl_surface *surface; | ||
struct wl_shm_pool *pool; | ||
uint32 *buf; | ||
int x, y; | ||
} cursor; | ||
// Keyboard members: xkb members and serial | ||
struct keyboard { | ||
// RWLock mu; | ||
struct xkb_context *context; | ||
struct xkb_keymap *keymap; | ||
struct xkb_state *state; | ||
int S; | ||
int32 rate, delay; | ||
int32 time, key, event, delayed; | ||
} kb; | ||
} window; | ||
|
||
struct Memdata; | ||
typedef struct shmTab { | ||
struct Memdata *md; | ||
int fd; | ||
size_t sz; | ||
} shmTab; | ||
|
||
extern int borderSz; | ||
extern int barSz; | ||
extern const int curBufSz; |
Oops, something went wrong.