mirrors/wayland
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/wayland/wayland.git synced 2026-03-11 05:34:41 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Update surface.attach and change surface.map to surface.map_toplevel

Browse source 
The new map_toplevel() request no longer specifies a position and takes
the size from the attached buffer.  The attach request now takes a
position relative to the top-left corner of the old buffer to let
clients specify the relative position of the new buffer.
This commit is contained in:
Kristian Høgsberg 2010-12-17 09:53:12 -05:00
parent 53a7f2137b
commit 82da52b15b
13 changed files with 130 additions and 157 deletions
Download patch file Download diff file Expand all files Collapse all files

52
clients/flower.c
View file

@ -30,6 +30,7 @@
#include <math.h>
#include <time.h>
#include <cairo.h>
#include <sys/time.h>
#include <glib.h>
#include "wayland-client.h"
@ -97,31 +98,36 @@ draw_stuff(cairo_surface_t *surface, int width, int height)
cairo_destroy(cr);
}
static int
motion_handler(struct window *window,
struct input *input, uint32_t time,
int32_t x, int32_t y,
int32_t sx, int32_t sy, void *data)
{
return POINTER_HAND1;
}
static void
button_handler(struct window *window,
struct input *input, uint32_t time,
int button, int state, void *data)
{
if (state)
window_move(window, input, time);
}
struct flower {
struct display *display;
struct window *window;
int x, y, width, height;
int offset;
int width, height;
};
static void
frame_callback(void *data, uint32_t time)
{
struct flower *flower = data;
window_move(flower->window,
flower->x + cos((flower->offset + time) / 400.0) * 400 - flower->width / 2,
flower->y + sin((flower->offset + time) / 320.0) * 300 - flower->height / 2);
wl_display_frame_callback(display_get_display(flower->display),
frame_callback, flower);
}
int main(int argc, char *argv[])
{
cairo_surface_t *s;
struct timespec ts;
struct flower flower;
struct display *d;
struct timeval tv;
d = display_create(&argc, &argv, NULL);
if (d == NULL) {
@ -129,18 +135,15 @@ int main(int argc, char *argv[])
return -1;
}
flower.x = 512;
flower.y = 384;
gettimeofday(&tv, NULL);
srandom(tv.tv_usec);
flower.width = 200;
flower.height = 200;
flower.display = d;
flower.window = window_create(d, "flower", flower.x, flower.y,
flower.window = window_create(d, "flower",
flower.width, flower.height);
clock_gettime(CLOCK_MONOTONIC, &ts);
srandom(ts.tv_nsec);
flower.offset = random();
window_set_decoration(flower.window, 0);
window_draw(flower.window);
s = window_get_surface(flower.window);
@ -154,10 +157,9 @@ int main(int argc, char *argv[])
cairo_surface_destroy(s);
window_flush(flower.window);
window_set_motion_handler(flower.window, motion_handler);
window_set_button_handler(flower.window, button_handler);
window_set_user_data(flower.window, &flower);
wl_display_frame_callback(display_get_display(d),
frame_callback, &flower);
display_run(d);
return 0;