get a stupid wayland black box on the screen
parent
3e25ed94fc
commit
4c1d4f7547
|
|
@ -37,6 +37,7 @@
|
|||
pkg-config
|
||||
binutils
|
||||
curlMinimal
|
||||
curl-config
|
||||
clang
|
||||
bear
|
||||
naga-cli
|
||||
|
|
@ -48,12 +49,14 @@
|
|||
] else if pkgs.system == "x86_64-linux" then [
|
||||
pkg-config
|
||||
binutils
|
||||
curlMinimal
|
||||
clang
|
||||
bear
|
||||
naga-cli
|
||||
libGL
|
||||
mesa
|
||||
gf
|
||||
wayland
|
||||
xorg.libX11
|
||||
xorg.libXi
|
||||
xorg.xinput
|
||||
|
|
|
|||
22
justfile
22
justfile
|
|
@ -1,16 +1,32 @@
|
|||
alias b := build
|
||||
alias r := run
|
||||
|
||||
c_flags := if os() == "macos" {
|
||||
"$(curl-config --libs) -framework Cocoa -framework QuartzCore -framework CoreImage -framework Metal -framework MetalKit -ObjC"
|
||||
} else if os_family() == "unix" {
|
||||
"$(curl-config --libs) -lEGL -lGLESv2 -lGL -lm -lwayland-client -lX11 -lXi -lXcursor"
|
||||
} else { "" }
|
||||
|
||||
[macos]
|
||||
build: transpile_shaders_metal
|
||||
mkdir -p bin
|
||||
cc -Ivendor/ -O0 -g -Wall -Wextra $(curl-config --libs) -framework Cocoa -framework QuartzCore -framework CoreImage -framework Metal -framework MetalKit -ObjC src/*.c -o bin/chat_client
|
||||
# cc -Ivendor/ -g -Wall -Wextra src/*.c -o bin/chat_client -lEGL -lGLESv2 -lGL -lm -lX11 -lXi -lXcursor
|
||||
# cc bin/*.o -o bin/chat_client -lEGL -lGLESv2 -lGL -lm -lX11 -lXi -lXcursor
|
||||
cc -Ivendor/ -O0 -g -Wall -Wextra {{ c_flags }} src/*.c -o bin/chat_client
|
||||
|
||||
[linux]
|
||||
build: generate_wayland_protocols
|
||||
mkdir -p bin
|
||||
cc -Ivendor/ -O0 -g -Wall -Wextra {{ c_flags }} src/*.c src/wayland-crap/*.c -o bin/chat_client
|
||||
|
||||
run: build
|
||||
# nixGLIntel ./bin/chat_client
|
||||
./bin/chat_client
|
||||
|
||||
[linux]
|
||||
generate_wayland_protocols:
|
||||
wayland-scanner client-header src/wayland-crap/xdg-shell.xml src/wayland-crap/xdg-shell.h
|
||||
wayland-scanner code src/wayland-crap/xdg-shell.xml src/wayland-crap/xdg-shell.c
|
||||
|
||||
[macos]
|
||||
transpile_shaders_metal:
|
||||
mkdir -p bin/transpiled_shaders
|
||||
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
#ifndef ED_FILE_IO_INCLUDED
|
||||
#define ED_FILE_IO_INCLUDED
|
||||
#include <stdint.h>
|
||||
#include <stdbool.h>
|
||||
#include <stdint.h>
|
||||
|
||||
#include "string.h"
|
||||
|
||||
|
|
@ -11,12 +11,16 @@ bool load_file(string file_path, size_t size, void *buffer);
|
|||
#ifdef ED_FILE_IO_IMPLEMENTATION
|
||||
|
||||
#if defined(__unix__)
|
||||
#include <assert.h>
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
#include <assert.h>
|
||||
|
||||
unsigned long get_file_size(const char *filePath) {
|
||||
FILE *file = fopen(filePath, "r");
|
||||
unsigned long get_file_size(string file_path) {
|
||||
char *file_path_with_sentinel = malloc(file_path.len + 1);
|
||||
memcpy(file_path_with_sentinel, file_path.data, file_path.len + 1);
|
||||
file_path_with_sentinel[file_path.len] = 0;
|
||||
|
||||
FILE *file = fopen(file_path_with_sentinel, "r");
|
||||
assert(file && "get_file_size: failed to open file");
|
||||
|
||||
fseek(file, 0, SEEK_END);
|
||||
|
|
@ -25,21 +29,22 @@ unsigned long get_file_size(const char *filePath) {
|
|||
|
||||
fclose(file);
|
||||
|
||||
free(file_path_with_sentinel);
|
||||
return fsize;
|
||||
}
|
||||
|
||||
bool load_file(const char *filePath, unsigned long size, void *buffer) {
|
||||
FILE *file = fopen(filePath, "r");
|
||||
bool load_file(string file_path, size_t size, void *buffer) {
|
||||
char *file_path_with_sentinel = malloc(file_path.len + 1);
|
||||
memcpy(file_path_with_sentinel, file_path.data, file_path.len + 1);
|
||||
file_path_with_sentinel[file_path.len] = 0;
|
||||
|
||||
FILE *file = fopen(file_path_with_sentinel, "r");
|
||||
assert(file && "load_file: failed to open file");
|
||||
|
||||
fseek(file, 0, SEEK_END);
|
||||
long fsize = ftell(file);
|
||||
fseek(file, 0, SEEK_SET);
|
||||
|
||||
fread(buffer, fsize, 1, file);
|
||||
|
||||
fread(buffer, size, 1, file);
|
||||
fclose(file);
|
||||
|
||||
free(file_path_with_sentinel);
|
||||
return true;
|
||||
}
|
||||
|
||||
|
|
@ -47,49 +52,41 @@ bool load_file(const char *filePath, unsigned long size, void *buffer) {
|
|||
#include <windows.h>
|
||||
#define assertm(exp, msg) assert(((void)msg, exp))
|
||||
|
||||
VOID CALLBACK FileIOCompletionRoutine(
|
||||
__in DWORD dwErrorCode,
|
||||
__in DWORD dwNumberOfBytesTransfered,
|
||||
__in LPOVERLAPPED lpOverlapped )
|
||||
{
|
||||
VOID CALLBACK FileIOCompletionRoutine(__in DWORD dwErrorCode,
|
||||
__in DWORD dwNumberOfBytesTransfered,
|
||||
__in LPOVERLAPPED lpOverlapped) {
|
||||
printf("Error code: %li", dwErrorCode);
|
||||
printf("Number of bytes: %li", dwNumberOfBytesTransfered);
|
||||
}
|
||||
|
||||
unsigned long get_file_size(const char *filePath) {
|
||||
HANDLE hFile = CreateFile(filePath,
|
||||
GENERIC_READ,
|
||||
FILE_SHARE_READ,
|
||||
NULL,
|
||||
OPEN_EXISTING,
|
||||
FILE_ATTRIBUTE_NORMAL | FILE_FLAG_OVERLAPPED,
|
||||
NULL);
|
||||
HANDLE hFile =
|
||||
CreateFile(filePath, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING,
|
||||
FILE_ATTRIBUTE_NORMAL | FILE_FLAG_OVERLAPPED, NULL);
|
||||
|
||||
LARGE_INTEGER size;
|
||||
assert(GetFileSizeEx(hFile, &size) && "get_file_size: failed to get file size");
|
||||
assert(GetFileSizeEx(hFile, &size) &&
|
||||
"get_file_size: failed to get file size");
|
||||
|
||||
return size.LowPart;
|
||||
}
|
||||
|
||||
bool load_file(const char *filePath, unsigned long size, void *buffer) {
|
||||
HANDLE hFile = CreateFile(filePath,
|
||||
GENERIC_READ,
|
||||
FILE_SHARE_READ,
|
||||
NULL,
|
||||
OPEN_EXISTING,
|
||||
FILE_ATTRIBUTE_NORMAL,
|
||||
NULL);
|
||||
HANDLE hFile = CreateFile(filePath, GENERIC_READ, FILE_SHARE_READ, NULL,
|
||||
OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL);
|
||||
|
||||
OVERLAPPED ol = {0};
|
||||
unsigned long bytesRead = 0;
|
||||
if (!ReadFile(hFile, buffer, size, &bytesRead, NULL)) {
|
||||
unsigned long error = GetLastError();
|
||||
unsigned long msg = FormatMessage(FORMAT_MESSAGE_FROM_SYSTEM, NULL, error, 0, buffer, size, NULL);
|
||||
unsigned long msg = FormatMessage(FORMAT_MESSAGE_FROM_SYSTEM, NULL,
|
||||
error, 0, buffer, size, NULL);
|
||||
|
||||
printf("failed to load file: %s\n", (char *)buffer);
|
||||
assert(false && "failed to read file");
|
||||
}
|
||||
assert(bytesRead == size && "load_file: didn't one-shot read the whole file");
|
||||
assert(bytesRead == size &&
|
||||
"load_file: didn't one-shot read the whole file");
|
||||
|
||||
return true;
|
||||
}
|
||||
|
|
@ -97,11 +94,14 @@ bool load_file(const char *filePath, unsigned long size, void *buffer) {
|
|||
#include <Foundation/Foundation.h>
|
||||
|
||||
uint64_t get_file_size(string file_path) {
|
||||
NSFileManager* file_manager = [NSFileManager defaultManager];
|
||||
NSString *path = [file_manager stringWithFileSystemRepresentation:(const char *)file_path.data length:file_path.len];
|
||||
NSFileManager *file_manager = [NSFileManager defaultManager];
|
||||
NSString *path = [file_manager
|
||||
stringWithFileSystemRepresentation:(const char *)file_path.data
|
||||
length:file_path.len];
|
||||
|
||||
NSError *error = NULL;
|
||||
NSDictionary<NSFileAttributeKey, id> *attributes = [file_manager attributesOfItemAtPath:path error:&error];
|
||||
NSDictionary<NSFileAttributeKey, id> *attributes =
|
||||
[file_manager attributesOfItemAtPath:path error:&error];
|
||||
|
||||
if (error) {
|
||||
NSLog(@"error getting file attributes: %@\n", error.description);
|
||||
|
|
@ -109,22 +109,26 @@ uint64_t get_file_size(string file_path) {
|
|||
}
|
||||
|
||||
NSNumber *file_size = [attributes objectForKey:NSFileSize];
|
||||
|
||||
|
||||
return file_size.unsignedLongLongValue;
|
||||
}
|
||||
|
||||
bool load_file(string file_path, size_t size, void *buffer) {
|
||||
NSFileManager* file_manager = [NSFileManager defaultManager];
|
||||
NSString *path = [file_manager stringWithFileSystemRepresentation:(const char *)file_path.data length:file_path.len];
|
||||
NSFileManager *file_manager = [NSFileManager defaultManager];
|
||||
NSString *path = [file_manager
|
||||
stringWithFileSystemRepresentation:(const char *)file_path.data
|
||||
length:file_path.len];
|
||||
|
||||
NSData *data = [file_manager contentsAtPath:path];
|
||||
if (data == NULL) {
|
||||
fprintf(stderr, "failed to load file: %.*s\n", (int)file_path.len, file_path.data);
|
||||
fprintf(stderr, "failed to load file: %.*s\n", (int)file_path.len,
|
||||
file_path.data);
|
||||
return false;
|
||||
}
|
||||
|
||||
if (data.length > size) {
|
||||
fprintf(stderr, "buffer not large enough for file: %.*s\n", (int)file_path.len, file_path.data);
|
||||
fprintf(stderr, "buffer not large enough for file: %.*s\n",
|
||||
(int)file_path.len, file_path.data);
|
||||
}
|
||||
|
||||
memcpy(buffer, data.bytes, data.length);
|
||||
|
|
|
|||
259
src/gfx.h
259
src/gfx.h
|
|
@ -2,12 +2,6 @@
|
|||
|
||||
#ifndef ED_GFX_INCLUDED
|
||||
#define ED_GFX_INCLUDED
|
||||
#include <AppKit/AppKit.h>
|
||||
#include <CoreGraphics/CoreGraphics.h>
|
||||
#include <Foundation/Foundation.h>
|
||||
#include <Metal/Metal.h>
|
||||
#include <QuartzCore/CoreAnimation.h>
|
||||
#include <QuartzCore/QuartzCore.h>
|
||||
#include <stdint.h>
|
||||
|
||||
#include "ed_array.h"
|
||||
|
|
@ -15,6 +9,13 @@
|
|||
|
||||
bool keep_running = true;
|
||||
|
||||
#if defined(__APPLE__)
|
||||
#include <AppKit/AppKit.h>
|
||||
#include <CoreGraphics/CoreGraphics.h>
|
||||
#include <Foundation/Foundation.h>
|
||||
#include <Metal/Metal.h>
|
||||
#include <QuartzCore/CoreAnimation.h>
|
||||
#include <QuartzCore/QuartzCore.h>
|
||||
@interface EDGFXView : NSView
|
||||
@property NSTrackingArea *tracking_area;
|
||||
@end
|
||||
|
|
@ -30,6 +31,7 @@ bool keep_running = true;
|
|||
wrapIdArray(MTLRenderPipelineState);
|
||||
wrapIdArray(MTLBuffer);
|
||||
wrapIdArray(MTLTexture);
|
||||
#endif
|
||||
|
||||
typedef struct {
|
||||
float position[4];
|
||||
|
|
@ -72,6 +74,34 @@ typedef struct {
|
|||
array(_MTLBuffer) buffers;
|
||||
array(_MTLTexture) textures;
|
||||
} _metal_gfx_context;
|
||||
#elif __linux__
|
||||
#include "wayland-crap/xdg-shell.h"
|
||||
#include <EGL/egl.h>
|
||||
#include <X11/Xlib.h>
|
||||
#include <sys/mman.h>
|
||||
#include <syscall.h>
|
||||
#include <unistd.h>
|
||||
#include <wayland-client.h>
|
||||
|
||||
// And I thought MacOS needed a lot of state to create a window
|
||||
typedef struct {
|
||||
struct wl_display *display;
|
||||
struct wl_registry *registry;
|
||||
struct wl_surface *surface;
|
||||
struct wl_compositor *compositor;
|
||||
struct wl_shm *shared_memory;
|
||||
struct wl_shm_pool *shared_memory_pool;
|
||||
struct xdg_wm_base *wm_base;
|
||||
struct wl_buffer *buffer;
|
||||
struct xdg_surface *xdg_surface;
|
||||
struct xdg_toplevel *xdg_toplevel;
|
||||
} _opengl_gfx_context_wayland;
|
||||
|
||||
typedef struct {
|
||||
Display *display;
|
||||
Window window;
|
||||
int screen;
|
||||
} _opengl_gfx_context_x11;
|
||||
#endif
|
||||
|
||||
typedef void (*_gfx_frame_func)(int mouse_x, int mouse_y, bool mouse_left_down,
|
||||
|
|
@ -79,6 +109,9 @@ typedef void (*_gfx_frame_func)(int mouse_x, int mouse_y, bool mouse_left_down,
|
|||
typedef struct {
|
||||
#if defined(__APPLE__)
|
||||
_metal_gfx_context backend;
|
||||
#elif __linux__
|
||||
// TODO: be able to use X11 or Wayland at runtime
|
||||
_opengl_gfx_context_wayland backend;
|
||||
#else
|
||||
#error "Unsupported platform"
|
||||
#endif
|
||||
|
|
@ -205,8 +238,8 @@ void gfx_update_buffer(gfx_context_t *cx, size_t buffer_index, const void *data,
|
|||
|
||||
- (void)mouseMoved:(NSEvent *)event {
|
||||
// NSPoint location = NSEvent.mouseLocation;
|
||||
NSPoint location = [self convertPoint:[event locationInWindow]
|
||||
fromView:nil];
|
||||
NSPoint location =
|
||||
[self convertPoint:[event locationInWindow] fromView:nil];
|
||||
|
||||
_gfx_context.backend.mouse_x = location.x;
|
||||
_gfx_context.backend.mouse_y = location.y;
|
||||
|
|
@ -302,8 +335,8 @@ static _metal_gfx_context _metal_gfx_init_context(uint32_t width,
|
|||
exit(1);
|
||||
}
|
||||
|
||||
id<MTLLibrary> library = [device newLibraryWithURL:libraryURL
|
||||
error:&libraryError];
|
||||
id<MTLLibrary> library =
|
||||
[device newLibraryWithURL:libraryURL error:&libraryError];
|
||||
|
||||
if (library == NULL) {
|
||||
if (libraryError.description != NULL) {
|
||||
|
|
@ -573,11 +606,205 @@ static void _metal_gfx_update_buffer(_metal_gfx_context *cx,
|
|||
// FIXME: actually check to see if this will fit in the buffer
|
||||
memcpy(buffer_contents, data, len);
|
||||
}
|
||||
#elif __linux__
|
||||
|
||||
static void _wayland_xdg_toplevel_configure(void *data,
|
||||
struct xdg_toplevel *xdg_toplevel,
|
||||
int32_t width, int32_t height,
|
||||
struct wl_array *states) {}
|
||||
|
||||
static void _wayland_xdg_toplevel_close(void *data,
|
||||
struct xdg_toplevel *xdg_toplevel) {
|
||||
keep_running = false;
|
||||
}
|
||||
|
||||
static const struct xdg_toplevel_listener xdg_toplevel_listener = {
|
||||
_wayland_xdg_toplevel_configure,
|
||||
_wayland_xdg_toplevel_close,
|
||||
};
|
||||
|
||||
static void _wayland_xdg_surface_configure(void *data,
|
||||
struct xdg_surface *xdg_surface,
|
||||
uint32_t serial) {
|
||||
xdg_surface_ack_configure(xdg_surface, serial);
|
||||
}
|
||||
|
||||
static const struct xdg_surface_listener xdg_surface_listener = {
|
||||
_wayland_xdg_surface_configure,
|
||||
};
|
||||
|
||||
static void _wayland_xdg_wm_base_ping(void *data, struct xdg_wm_base *shell,
|
||||
uint32_t serial) {
|
||||
xdg_wm_base_pong(shell, serial);
|
||||
}
|
||||
static const struct xdg_wm_base_listener xdg_wm_base_listener = {
|
||||
_wayland_xdg_wm_base_ping,
|
||||
};
|
||||
|
||||
static void _wayland_registry_handle_global(void *data,
|
||||
struct wl_registry *registry,
|
||||
uint32_t name,
|
||||
const char *interface,
|
||||
uint32_t version) {
|
||||
_opengl_gfx_context_wayland *d = data;
|
||||
|
||||
fprintf(stderr, "global: %s\n", interface);
|
||||
|
||||
if (strcmp(interface, "wl_compositor") == 0) {
|
||||
d->compositor =
|
||||
wl_registry_bind(registry, name, &wl_compositor_interface, 3);
|
||||
} else if (strcmp(interface, "wl_shm") == 0) {
|
||||
d->shared_memory =
|
||||
wl_registry_bind(registry, name, &wl_shm_interface, 1);
|
||||
} else if (strcmp(interface, "xdg_wm_base") == 0) {
|
||||
d->wm_base =
|
||||
wl_registry_bind(registry, name, &xdg_wm_base_interface, 1);
|
||||
}
|
||||
}
|
||||
|
||||
static void _wayland_registry_handle_global_remove(void *data,
|
||||
struct wl_registry *registry,
|
||||
uint32_t name) {}
|
||||
|
||||
static const struct wl_registry_listener registry_listener = {
|
||||
_wayland_registry_handle_global,
|
||||
_wayland_registry_handle_global_remove,
|
||||
};
|
||||
|
||||
static _opengl_gfx_context_wayland
|
||||
_opengl_gfx_init_context_wayland(uint32_t width, uint32_t height) {
|
||||
_opengl_gfx_context_wayland cx = {0};
|
||||
|
||||
cx.display = wl_display_connect(NULL);
|
||||
if (!cx.display) {
|
||||
fprintf(stderr, "Failed to connect to Wayland display\n");
|
||||
exit(1);
|
||||
}
|
||||
struct wl_registry *registry = wl_display_get_registry(cx.display);
|
||||
wl_registry_add_listener(registry, ®istry_listener, &cx);
|
||||
|
||||
// wait for all the globals to be registered
|
||||
wl_display_roundtrip(cx.display);
|
||||
|
||||
xdg_wm_base_add_listener(cx.wm_base, &xdg_wm_base_listener, &cx);
|
||||
|
||||
cx.surface = wl_compositor_create_surface(cx.compositor);
|
||||
cx.xdg_surface = xdg_wm_base_get_xdg_surface(cx.wm_base, cx.surface);
|
||||
xdg_surface_add_listener(cx.xdg_surface, &xdg_surface_listener, &cx);
|
||||
|
||||
cx.xdg_toplevel = xdg_surface_get_toplevel(cx.xdg_surface);
|
||||
xdg_toplevel_add_listener(cx.xdg_toplevel, &xdg_toplevel_listener, &cx);
|
||||
xdg_toplevel_set_title(cx.xdg_toplevel, "chat - [Slack sux]");
|
||||
xdg_toplevel_set_app_id(cx.xdg_toplevel, "nl.spacegirl.a_chat_client");
|
||||
|
||||
wl_surface_commit(cx.surface);
|
||||
wl_display_roundtrip(cx.display);
|
||||
|
||||
int size = width * height * 4;
|
||||
int fd = syscall(SYS_memfd_create, "buffer", 0);
|
||||
ftruncate(fd, size);
|
||||
|
||||
uint8_t *data = mmap(NULL, size, PROT_READ | PROT_WRITE, MAP_SHARED, fd, 0);
|
||||
data[0] = 255;
|
||||
|
||||
cx.shared_memory_pool = wl_shm_create_pool(cx.shared_memory, fd, size);
|
||||
cx.buffer =
|
||||
wl_shm_pool_create_buffer(cx.shared_memory_pool, 0, width, height,
|
||||
width * 4, WL_SHM_FORMAT_XRGB8888);
|
||||
|
||||
wl_surface_attach(cx.surface, cx.buffer, 0, 0);
|
||||
wl_surface_commit(cx.surface);
|
||||
|
||||
return cx;
|
||||
}
|
||||
|
||||
static _opengl_gfx_context_x11 _opengl_gfx_init_context_11(uint32_t width,
|
||||
uint32_t height) {
|
||||
Display *display = XOpenDisplay(NULL);
|
||||
if (display == NULL) {
|
||||
fprintf(stderr, "Failed to open X display\n");
|
||||
exit(1);
|
||||
}
|
||||
|
||||
int screen = DefaultScreen(display);
|
||||
Window window = XCreateSimpleWindow(
|
||||
display, RootWindow(display, screen), 0, 0, width, height, 1,
|
||||
BlackPixel(display, screen), WhitePixel(display, screen));
|
||||
XSelectInput(display, window,
|
||||
ExposureMask | KeyPressMask | ButtonPressMask |
|
||||
ButtonReleaseMask);
|
||||
XMapWindow(display, window);
|
||||
|
||||
return (_opengl_gfx_context_x11){
|
||||
.display = display,
|
||||
.window = window,
|
||||
.screen = screen,
|
||||
};
|
||||
}
|
||||
|
||||
static void _opengl_gfx_send_events_wayland(_opengl_gfx_context_wayland *cx) {
|
||||
wl_display_dispatch(cx->display);
|
||||
}
|
||||
|
||||
static void _opengl_gfx_send_events_x11(_opengl_gfx_context_x11 *cx) {
|
||||
XEvent e;
|
||||
XNextEvent(cx->display, &e);
|
||||
if (e.type == Expose) {
|
||||
XFillRectangle(cx->display, cx->window,
|
||||
DefaultGC(cx->display, cx->screen), 20, 20, 10, 10);
|
||||
}
|
||||
|
||||
if (e.type == KeyPress) {
|
||||
keep_running = false;
|
||||
|
||||
XCloseDisplay(cx->display);
|
||||
}
|
||||
}
|
||||
|
||||
static void _opengl_gfx_present_wayland(_opengl_gfx_context_wayland *cx) {
|
||||
// TODO
|
||||
}
|
||||
|
||||
static size_t
|
||||
_opengl_gfx_push_texture_buffer_wayland(_opengl_gfx_context_wayland *cx,
|
||||
uint32_t width, uint32_t height,
|
||||
const void *data, size_t len) {
|
||||
|
||||
// TODO
|
||||
return 0;
|
||||
}
|
||||
|
||||
static void
|
||||
_opengl_gfx_resize_texture_buffer_wayland(_opengl_gfx_context_wayland *cx,
|
||||
uint32_t width, size_t texture_index,
|
||||
uint32_t height) {
|
||||
// TODO
|
||||
}
|
||||
|
||||
size_t _opengl_gfx_push_vertex_buffer_wayland(_opengl_gfx_context_wayland *cx,
|
||||
const void *data, size_t len) {
|
||||
|
||||
// TODO
|
||||
return 0;
|
||||
}
|
||||
static size_t
|
||||
_opengl_gfx_allocate_vertex_buffer_wayland(_opengl_gfx_context_wayland *cx,
|
||||
size_t len) {
|
||||
// TODO
|
||||
return 0;
|
||||
}
|
||||
static void _opengl_gfx_update_buffer_wayland(_opengl_gfx_context_wayland *cx,
|
||||
size_t buffer_index,
|
||||
const void *data, size_t len) {
|
||||
// TODO
|
||||
}
|
||||
#endif
|
||||
|
||||
void gfx_run_events(gfx_context_t *cx) {
|
||||
#if defined(__APPLE__)
|
||||
return _metal_gfx_send_events(&cx->backend);
|
||||
#elif __linux__
|
||||
return _opengl_gfx_send_events_wayland(&cx->backend);
|
||||
#else
|
||||
#error "Unsupported graphics backend"
|
||||
#endif
|
||||
|
|
@ -588,6 +815,9 @@ size_t gfx_push_texture_buffer(gfx_context_t *cx, uint32_t width,
|
|||
#if defined(__APPLE__)
|
||||
return _metal_gfx_push_texture_buffer(&cx->backend, width, height, data,
|
||||
len);
|
||||
#elif __linux__
|
||||
return _opengl_gfx_push_texture_buffer_wayland(&cx->backend, width, height,
|
||||
data, len);
|
||||
#else
|
||||
#error "Unsupported graphics backend"
|
||||
#endif
|
||||
|
|
@ -596,6 +826,8 @@ size_t gfx_push_texture_buffer(gfx_context_t *cx, uint32_t width,
|
|||
size_t gfx_push_vertex_buffer(gfx_context_t *cx, const void *data, size_t len) {
|
||||
#if defined(__APPLE__)
|
||||
return _metal_gfx_push_vertex_buffer(&cx->backend, data, len);
|
||||
#elif __linux__
|
||||
return _opengl_gfx_push_vertex_buffer_wayland(&cx->backend, data, len);
|
||||
#else
|
||||
#error "Unsupported graphics backend"
|
||||
#endif
|
||||
|
|
@ -604,6 +836,8 @@ size_t gfx_push_vertex_buffer(gfx_context_t *cx, const void *data, size_t len) {
|
|||
size_t gfx_allocate_vertex_buffer(gfx_context_t *cx, size_t len) {
|
||||
#if defined(__APPLE__)
|
||||
return _metal_gfx_allocate_vertex_buffer(&cx->backend, len);
|
||||
#elif __linux__
|
||||
return _opengl_gfx_allocate_vertex_buffer_wayland(&cx->backend, len);
|
||||
#else
|
||||
#error "Unsupported graphics backend"
|
||||
#endif
|
||||
|
|
@ -614,6 +848,9 @@ void gfx_update_buffer(gfx_context_t *cx, size_t buffer_index, const void *data,
|
|||
size_t len) {
|
||||
#if defined(__APPLE__)
|
||||
return _metal_gfx_update_buffer(&cx->backend, buffer_index, data, len);
|
||||
#elif __linux__
|
||||
return _opengl_gfx_update_buffer_wayland(&cx->backend, buffer_index, data,
|
||||
len);
|
||||
#else
|
||||
#error "Unsupported graphics backend"
|
||||
#endif
|
||||
|
|
@ -661,6 +898,8 @@ void *gfx_init_context(_gfx_frame_func frame_func, uint32_t width,
|
|||
__auto_type backend =
|
||||
#if defined(__APPLE__)
|
||||
_metal_gfx_init_context(width, height);
|
||||
#elif __linux__
|
||||
_opengl_gfx_init_context_wayland(width, height);
|
||||
#else
|
||||
#error "Unsupported graphics backend"
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -201,13 +201,14 @@ void ed_frame(int mouse_x, int mouse_y, bool mouse_left_down,
|
|||
}
|
||||
|
||||
int main(int argc, char *argv[]) {
|
||||
curl_global_init(CURL_GLOBAL_ALL);
|
||||
/* curl_global_init(CURL_GLOBAL_ALL);
|
||||
|
||||
slack_client client = slack_init_client();
|
||||
_slack_debug_print_auth_test(&client);
|
||||
slack_client client = slack_init_client(_String("test token"), _String("Cookie: test_cookie=hello"));
|
||||
_slack_debug_print_auth_test(&client, _String("test token"), _String("Cookie: test_cookie=hello"));
|
||||
|
||||
curl_global_cleanup();
|
||||
return 0;
|
||||
*/
|
||||
|
||||
ed_init(ed_frame);
|
||||
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@ typedef struct {
|
|||
CURL *curl;
|
||||
} slack_client;
|
||||
|
||||
void _slack_debug_print_auth_test(slack_client *client);
|
||||
void _slack_debug_print_auth_test(slack_client *client, string token, string cookie);
|
||||
|
||||
slack_client slack_init_client();
|
||||
|
||||
|
|
|
|||
|
|
@ -0,0 +1,173 @@
|
|||
/* Generated by wayland-scanner 1.22.0 */
|
||||
|
||||
/*
|
||||
* Copyright © 2008-2013 Kristian Høgsberg
|
||||
* Copyright © 2013 Rafael Antognolli
|
||||
* Copyright © 2013 Jasper St. Pierre
|
||||
* Copyright © 2010-2013 Intel Corporation
|
||||
* Copyright © 2015-2017 Samsung Electronics Co., Ltd
|
||||
* Copyright © 2015-2017 Red Hat Inc.
|
||||
*
|
||||
* Permission is hereby granted, free of charge, to any person obtaining a
|
||||
* copy of this software and associated documentation files (the "Software"),
|
||||
* to deal in the Software without restriction, including without limitation
|
||||
* the rights to use, copy, modify, merge, publish, distribute, sublicense,
|
||||
* and/or sell copies of the Software, and to permit persons to whom the
|
||||
* Software is furnished to do so, subject to the following conditions:
|
||||
*
|
||||
* The above copyright notice and this permission notice (including the next
|
||||
* paragraph) shall be included in all copies or substantial portions of the
|
||||
* Software.
|
||||
*
|
||||
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
|
||||
* THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
||||
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
|
||||
* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
|
||||
* DEALINGS IN THE SOFTWARE.
|
||||
*/
|
||||
|
||||
#include <stdlib.h>
|
||||
#include <stdint.h>
|
||||
#include "wayland-util.h"
|
||||
|
||||
extern const struct wl_interface wl_output_interface;
|
||||
extern const struct wl_interface wl_seat_interface;
|
||||
extern const struct wl_interface wl_surface_interface;
|
||||
extern const struct wl_interface xdg_popup_interface;
|
||||
extern const struct wl_interface xdg_positioner_interface;
|
||||
extern const struct wl_interface xdg_surface_interface;
|
||||
extern const struct wl_interface xdg_toplevel_interface;
|
||||
|
||||
static const struct wl_interface *xdg_shell_types[] = {
|
||||
NULL,
|
||||
NULL,
|
||||
NULL,
|
||||
NULL,
|
||||
&xdg_positioner_interface,
|
||||
&xdg_surface_interface,
|
||||
&wl_surface_interface,
|
||||
&xdg_toplevel_interface,
|
||||
&xdg_popup_interface,
|
||||
&xdg_surface_interface,
|
||||
&xdg_positioner_interface,
|
||||
&xdg_toplevel_interface,
|
||||
&wl_seat_interface,
|
||||
NULL,
|
||||
NULL,
|
||||
NULL,
|
||||
&wl_seat_interface,
|
||||
NULL,
|
||||
&wl_seat_interface,
|
||||
NULL,
|
||||
NULL,
|
||||
&wl_output_interface,
|
||||
&wl_seat_interface,
|
||||
NULL,
|
||||
&xdg_positioner_interface,
|
||||
NULL,
|
||||
};
|
||||
|
||||
static const struct wl_message xdg_wm_base_requests[] = {
|
||||
{ "destroy", "", xdg_shell_types + 0 },
|
||||
{ "create_positioner", "n", xdg_shell_types + 4 },
|
||||
{ "get_xdg_surface", "no", xdg_shell_types + 5 },
|
||||
{ "pong", "u", xdg_shell_types + 0 },
|
||||
};
|
||||
|
||||
static const struct wl_message xdg_wm_base_events[] = {
|
||||
{ "ping", "u", xdg_shell_types + 0 },
|
||||
};
|
||||
|
||||
WL_EXPORT const struct wl_interface xdg_wm_base_interface = {
|
||||
"xdg_wm_base", 6,
|
||||
4, xdg_wm_base_requests,
|
||||
1, xdg_wm_base_events,
|
||||
};
|
||||
|
||||
static const struct wl_message xdg_positioner_requests[] = {
|
||||
{ "destroy", "", xdg_shell_types + 0 },
|
||||
{ "set_size", "ii", xdg_shell_types + 0 },
|
||||
{ "set_anchor_rect", "iiii", xdg_shell_types + 0 },
|
||||
{ "set_anchor", "u", xdg_shell_types + 0 },
|
||||
{ "set_gravity", "u", xdg_shell_types + 0 },
|
||||
{ "set_constraint_adjustment", "u", xdg_shell_types + 0 },
|
||||
{ "set_offset", "ii", xdg_shell_types + 0 },
|
||||
{ "set_reactive", "3", xdg_shell_types + 0 },
|
||||
{ "set_parent_size", "3ii", xdg_shell_types + 0 },
|
||||
{ "set_parent_configure", "3u", xdg_shell_types + 0 },
|
||||
};
|
||||
|
||||
WL_EXPORT const struct wl_interface xdg_positioner_interface = {
|
||||
"xdg_positioner", 6,
|
||||
10, xdg_positioner_requests,
|
||||
0, NULL,
|
||||
};
|
||||
|
||||
static const struct wl_message xdg_surface_requests[] = {
|
||||
{ "destroy", "", xdg_shell_types + 0 },
|
||||
{ "get_toplevel", "n", xdg_shell_types + 7 },
|
||||
{ "get_popup", "n?oo", xdg_shell_types + 8 },
|
||||
{ "set_window_geometry", "iiii", xdg_shell_types + 0 },
|
||||
{ "ack_configure", "u", xdg_shell_types + 0 },
|
||||
};
|
||||
|
||||
static const struct wl_message xdg_surface_events[] = {
|
||||
{ "configure", "u", xdg_shell_types + 0 },
|
||||
};
|
||||
|
||||
WL_EXPORT const struct wl_interface xdg_surface_interface = {
|
||||
"xdg_surface", 6,
|
||||
5, xdg_surface_requests,
|
||||
1, xdg_surface_events,
|
||||
};
|
||||
|
||||
static const struct wl_message xdg_toplevel_requests[] = {
|
||||
{ "destroy", "", xdg_shell_types + 0 },
|
||||
{ "set_parent", "?o", xdg_shell_types + 11 },
|
||||
{ "set_title", "s", xdg_shell_types + 0 },
|
||||
{ "set_app_id", "s", xdg_shell_types + 0 },
|
||||
{ "show_window_menu", "ouii", xdg_shell_types + 12 },
|
||||
{ "move", "ou", xdg_shell_types + 16 },
|
||||
{ "resize", "ouu", xdg_shell_types + 18 },
|
||||
{ "set_max_size", "ii", xdg_shell_types + 0 },
|
||||
{ "set_min_size", "ii", xdg_shell_types + 0 },
|
||||
{ "set_maximized", "", xdg_shell_types + 0 },
|
||||
{ "unset_maximized", "", xdg_shell_types + 0 },
|
||||
{ "set_fullscreen", "?o", xdg_shell_types + 21 },
|
||||
{ "unset_fullscreen", "", xdg_shell_types + 0 },
|
||||
{ "set_minimized", "", xdg_shell_types + 0 },
|
||||
};
|
||||
|
||||
static const struct wl_message xdg_toplevel_events[] = {
|
||||
{ "configure", "iia", xdg_shell_types + 0 },
|
||||
{ "close", "", xdg_shell_types + 0 },
|
||||
{ "configure_bounds", "4ii", xdg_shell_types + 0 },
|
||||
{ "wm_capabilities", "5a", xdg_shell_types + 0 },
|
||||
};
|
||||
|
||||
WL_EXPORT const struct wl_interface xdg_toplevel_interface = {
|
||||
"xdg_toplevel", 6,
|
||||
14, xdg_toplevel_requests,
|
||||
4, xdg_toplevel_events,
|
||||
};
|
||||
|
||||
static const struct wl_message xdg_popup_requests[] = {
|
||||
{ "destroy", "", xdg_shell_types + 0 },
|
||||
{ "grab", "ou", xdg_shell_types + 22 },
|
||||
{ "reposition", "3ou", xdg_shell_types + 24 },
|
||||
};
|
||||
|
||||
static const struct wl_message xdg_popup_events[] = {
|
||||
{ "configure", "iiii", xdg_shell_types + 0 },
|
||||
{ "popup_done", "", xdg_shell_types + 0 },
|
||||
{ "repositioned", "3u", xdg_shell_types + 0 },
|
||||
};
|
||||
|
||||
WL_EXPORT const struct wl_interface xdg_popup_interface = {
|
||||
"xdg_popup", 6,
|
||||
3, xdg_popup_requests,
|
||||
3, xdg_popup_events,
|
||||
};
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
Loading…
Reference in New Issue