blankie
/
wlroots
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Got simple working without keyboard input

This commit is contained in:
Timidger 2018-04-16 19:55:44 -04:00
parent ad6d40c7c6
commit b98779a674
No known key found for this signature in database
GPG Key ID: 42EF7ECE5FEF1D17
1 changed files with 60 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

79
examples/simple.c
View File

@ -1,4 +1,4 @@
#define _POSIX_C_SOURCE 199309L #define _POSIX_C_SOURCE 200112L
#include <GLES2/gl2.h> #include <GLES2/gl2.h>
#include <inttypes.h> #include <inttypes.h>
#include <stdio.h> #include <stdio.h>
@ -11,19 +11,30 @@
#include <wlr/types/wlr_output.h> #include <wlr/types/wlr_output.h>
#include <wlr/util/log.h> #include <wlr/util/log.h>
#include <xkbcommon/xkbcommon.h> #include <xkbcommon/xkbcommon.h>
#include "support/shared.h"
struct sample_state { struct sample_state {
struct wl_listener new_output;
struct timespec last_frame;
float color[3]; float color[3];
int dec; int dec;
}; };
void handle_output_frame(struct output_state *output, struct timespec *ts) { struct sample_output {
struct compositor_state *state = output->compositor; struct sample_state *sample;
struct sample_state *sample = state->data; struct wlr_output *output;
struct wl_listener frame;
struct wl_listener destroy;
};
long ms = (ts->tv_sec - state->last_frame.tv_sec) * 1000 +
(ts->tv_nsec - state->last_frame.tv_nsec) / 1000000; void output_frame_notify(struct wl_listener *listener, void *data) {
struct sample_output *sample_output = wl_container_of(listener, sample_output, frame);
struct sample_state *sample = sample_output->sample;
struct timespec now;
clock_gettime(CLOCK_MONOTONIC, &now);
long ms = (now.tv_sec - sample->last_frame.tv_sec) * 1000 +
(now.tv_nsec - sample->last_frame.tv_nsec) / 1000000;
int inc = (sample->dec + 1) % 3; int inc = (sample->dec + 1) % 3;
sample->color[inc] += ms / 2000.0f; sample->color[inc] += ms / 2000.0f;
@ -35,12 +46,31 @@ void handle_output_frame(struct output_state *output, struct timespec *ts) {
sample->dec = inc; sample->dec = inc;
} }
wlr_output_make_current(output->output, NULL); wlr_output_make_current(sample_output->output, NULL);
glClearColor(sample->color[0], sample->color[1], sample->color[2], 1.0); glClearColor(sample->color[0], sample->color[1], sample->color[2], 1.0);
glClear(GL_COLOR_BUFFER_BIT); glClear(GL_COLOR_BUFFER_BIT);
wlr_output_swap_buffers(output->output, NULL, NULL); wlr_output_swap_buffers(sample_output->output, NULL, NULL);
sample->last_frame = now;
}
void output_remove_notify(struct wl_listener *listener, void *data) {
struct sample_output *sample_output = wl_container_of(listener, sample_output, destroy);
wl_list_remove(&sample_output->frame.link);
free(sample_output);
}
void new_output_notify(struct wl_listener *listener, void *data) {
struct wlr_output *output = data;
struct sample_state *sample = wl_container_of(listener, sample, new_output);
struct sample_output *sample_output = calloc(1, sizeof(struct sample_output));
sample_output->output = output;
sample_output->sample = sample;
wl_signal_add(&output->events.frame, &sample_output->frame);
sample_output->frame.notify = output_frame_notify;
wl_signal_add(&output->events.destroy, &sample_output->destroy);
sample_output->destroy.notify = output_remove_notify;
} }
int main() { int main() {
@ -48,17 +78,28 @@ int main() {
struct sample_state state = { struct sample_state state = {
.color = { 1.0, 0.0, 0.0 }, .color = { 1.0, 0.0, 0.0 },
.dec = 0, .dec = 0,
.last_frame = { 0 }
}; };
struct compositor_state compositor = { 0, struct wl_display *display = wl_display_create();
.data = &state, struct wlr_backend *wlr = wlr_backend_autocreate(display);
.output_frame_cb = handle_output_frame, if (!wlr) {
};
compositor_init(&compositor);
if (!wlr_backend_start(compositor.backend)) {
wlr_log(L_ERROR, "Failed to start backend");
wlr_backend_destroy(compositor.backend);
exit(1); exit(1);
} }
wl_display_run(compositor.display); wl_signal_add(&wlr->events.new_output, &state.new_output);
compositor_fini(&compositor); state.new_output.notify = new_output_notify;
clock_gettime(CLOCK_MONOTONIC, &state.last_frame);
const char *socket = wl_display_add_socket_auto(display);
if (!socket) {
wlr_log_errno(L_ERROR, "Unable to open wayland socket");
wlr_backend_destroy(wlr);
exit(1);
}
setenv("_WAYLAND_DISPLAY", socket, true);
if (!wlr_backend_start(wlr)) {
wlr_log(L_ERROR, "Failed to start backend");
wlr_backend_destroy(wlr);
exit(1);
}
wl_display_run(display);
wl_display_destroy(display);
} }