Aren/toaruos
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

port gears to yutani

Browse Source
This commit is contained in:
Kevin Lange 2014-04-15 20:22:12 -07:00
parent 80854c820f
commit 4801031d6d
1 changed files with 71 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

132
userspace/gui/gl/gears.c
View File

@ -26,8 +26,9 @@
#include <GL/gl.h> #include <GL/gl.h>
#include <GL/osmesa.h> #include <GL/osmesa.h>
#include "lib/window.h" #include "lib/yutani.h"
#include "lib/graphics.h" #include "lib/graphics.h"
#include "lib/pthread.h"
struct timeval { struct timeval {
unsigned int tv_sec; unsigned int tv_sec;
@ -258,22 +259,38 @@ int resize(gfx_context_t * ctx, OSMesaContext gl_ctx) {
return 0; return 0;
} }
static yutani_t * yctx;
static yutani_window_t * wina;
static gfx_context_t * ctx;
static int should_exit = 0;
void * draw_thread(void * glctx) {
OSMesaContext gl_ctx = (OSMesaContext)glctx;
while (!should_exit) {
fps();
angle += 0.2;
draw();
flip(ctx);
yutani_flip(yctx, wina);
syscall_yield();
}
pthread_exit(0);
}
int main (int argc, char ** argv) { int main (int argc, char ** argv) {
int left = 30; int left = 30;
int top = 30; int top = 30;
int width = 500; int width = 500;
int height = 500; int height = 500;
int quit = 0;
yctx = yutani_init();
setup_windowing(); wina = yutani_window_create(yctx, width, height);
yutani_window_move(yctx, wina, left, top);
/* Do something with a window */ ctx = init_graphics_yutani_double_buffer(wina);
window_t * wina = window_create(left, top, width, height);
gfx_context_t * ctx = init_graphics_window_double_buffer(wina);
draw_fill(ctx, rgb(0,0,0)); draw_fill(ctx, rgb(0,0,0));
win_sane_events();
OSMesaContext gl_ctx = OSMesaCreateContext(OSMESA_BGRA, NULL); OSMesaContext gl_ctx = OSMesaCreateContext(OSMESA_BGRA, NULL);
if (resize(ctx, gl_ctx)) { if (resize(ctx, gl_ctx)) {
@ -283,63 +300,56 @@ int main (int argc, char ** argv) {
init(); init();
while (!quit) { /* XXX add a method to query if there are available packets in pex */
wins_packet_t * event = get_window_events_async(); pthread_t thread;
if (event) { pthread_create(&thread, NULL, draw_thread, NULL);
switch (event->command_type & WE_GROUP_MASK) {
case WE_WINDOW_EVT: {
w_window_t * evt = (w_window_t *)((uintptr_t)event + sizeof(wins_packet_t));
window_t * window = NULL;
switch (event->command_type) {
case WE_RESIZED:
window = wins_get_window(evt->wid);
if (window) {
/* Accept resize request */
resize_window_buffer_client(window, evt->left, evt->top, evt->width, evt->height);
/* Reinitialize core graphics library */
reinit_graphics_window(ctx, wina);
/* Fix up the GL context as well */
resize(ctx, gl_ctx);
}
break;
}
break;
}
case WE_KEY_EVT: {
w_keyboard_t * kbd = (w_keyboard_t *)((uintptr_t)event + sizeof(wins_packet_t));
switch (kbd->event.keycode) {
case 'q':
free(event);
goto finish;
case KEY_ARROW_LEFT:
view_roty += 5.0;
break;
case KEY_ARROW_RIGHT:
view_roty -= 5.0;
break;
case KEY_ARROW_UP:
view_rotx += 5.0;
break;
case KEY_ARROW_DOWN:
view_rotx -= 5.0;
break;
}
break;
}
}
free(event);
}
fps(); while (!should_exit) {
angle += 0.2; yutani_msg_t * m = yutani_poll(yctx);
draw(); if (m) {
flip(ctx); switch (m->type) {
syscall_yield(); case YUTANI_MSG_KEY_EVENT:
{
struct yutani_msg_key_event * ke = (void*)m->data;
if (ke->event.action == KEY_ACTION_DOWN) {
switch (ke->event.keycode) {
case 'q':
should_exit = 1;
free(m);
goto finish;
case KEY_ARROW_LEFT:
view_roty += 5.0;
break;
case KEY_ARROW_RIGHT:
view_roty -= 5.0;
break;
case KEY_ARROW_UP:
view_rotx += 5.0;
break;
case KEY_ARROW_DOWN:
view_rotx -= 5.0;
break;
default:
break;
}
}
}
break;
#if 0
/* XXX resizing */
/* Fix up the GL context as well */
resize(ctx, gl_ctx);
#endif
default:
break;
}
free(m);
}
} }
finish: finish:
OSMesaDestroyContext(gl_ctx); OSMesaDestroyContext(gl_ctx);
teardown_windowing(); yutani_close(yctx, wina);
return 0; return 0;
} }