mirrors/wayland
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/wayland/wayland.git synced 2025-11-17 06:59:46 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Chage the 'base' field to be the name of the super class instead

Browse source 
Instead of display->base.base we want display->proxy.object, or

        buffer->buffer.resource.object.id = id;

which makes it clear what we end up addressing.
This commit is contained in:
Kristian Høgsberg 2010-12-01 17:07:41 -05:00
parent b71cd9e31d
commit b313b02983
7 changed files with 212 additions and 206 deletions
Download patch file Download diff file Expand all files Collapse all files

16
compositor/compositor.h
View file

@ -48,7 +48,7 @@ struct wlsc_listener {
};
struct wlsc_output {
struct wl_object base;
struct wl_object object;
struct wl_list link;
struct wlsc_compositor *compositor;
struct wlsc_surface *background;
@ -88,7 +88,7 @@ enum wlsc_pointer_type {
};
struct wlsc_input_device {
struct wl_input_device base;
struct wl_input_device input_device;
int32_t x, y;
struct wlsc_compositor *ec;
struct wlsc_surface *sprite;
@ -110,28 +110,28 @@ struct wlsc_input_device {
};
struct wlsc_drm {
struct wl_object base;
struct wl_object object;
int fd;
char *filename;
};
struct wlsc_drm_buffer {
struct wl_buffer base;
struct wl_buffer buffer;
EGLImageKHR image;
};
struct wlsc_shm {
struct wl_object base;
struct wl_object object;
};
struct wlsc_shm_buffer {
struct wl_buffer base;
struct wl_buffer buffer;
int32_t stride;
void *data;
};
struct wlsc_compositor {
struct wl_compositor base;
struct wl_compositor compositor;
struct wl_visual argb_visual, premultiplied_argb_visual, rgb_visual;
struct wlsc_drm drm;
@ -177,7 +177,7 @@ struct wlsc_vector {
};
struct wlsc_surface {
struct wl_surface base;
struct wl_surface surface;
struct wlsc_compositor *compositor;
GLuint texture;
int32_t x, y, width, height;