compositor: Parse config file in main(), only keep weston config object
[profile/ivi/weston-ivi-shell.git] / src / compositor.h
index 57d363a..e3a798e 100644 (file)
 #ifndef _WAYLAND_SYSTEM_COMPOSITOR_H_
 #define _WAYLAND_SYSTEM_COMPOSITOR_H_
 
+#ifdef  __cplusplus
+extern "C" {
+#endif
+
 #include <pixman.h>
 #include <xkbcommon/xkbcommon.h>
 #include <wayland-server.h>
 
-#include <GLES2/gl2.h>
-#include <GLES2/gl2ext.h>
-#include <EGL/egl.h>
-#include <EGL/eglext.h>
-
+#include "version.h"
 #include "matrix.h"
-#include "../shared/config-parser.h"
-#include "weston-egl-ext.h"
+#include "config-parser.h"
 
 #define ARRAY_LENGTH(a) (sizeof (a) / sizeof (a)[0])
 
@@ -91,6 +90,10 @@ struct weston_shell_interface {
        void (*set_transient)(struct shell_surface *shsurf,
                              struct weston_surface *parent,
                              int x, int y, uint32_t flags);
+       void (*set_fullscreen)(struct shell_surface *shsurf,
+                              uint32_t method,
+                              uint32_t framerate,
+                              struct weston_output *output);
        int (*move)(struct shell_surface *shsurf, struct weston_seat *ws);
        int (*resize)(struct shell_surface *shsurf,
                      struct weston_seat *ws, uint32_t edges);
@@ -153,6 +156,7 @@ enum dpms_enum {
 
 struct weston_output {
        uint32_t id;
+       char *name;
 
        void *renderer_state;
 
@@ -166,24 +170,26 @@ struct weston_output {
        int32_t mm_width, mm_height;
        struct weston_border border;
        pixman_region32_t region;
-       int current_buffer;
-       pixman_region32_t buffer_damage[2];
+       pixman_region32_t previous_damage;
        int repaint_needed;
        int repaint_scheduled;
        struct weston_output_zoom zoom;
        int dirty;
        struct wl_signal frame_signal;
+       struct wl_signal destroy_signal;
        uint32_t frame_time;
        int disable_planes;
 
-       char *make, *model;
+       char *make, *model, *serial_number;
        uint32_t subpixel;
        uint32_t transform;
-       
+       uint32_t scale;
+
        struct weston_mode *current;
        struct weston_mode *origin;
        struct wl_list mode_list;
 
+       void (*start_repaint_loop)(struct weston_output *output);
        void (*repaint)(struct weston_output *output,
                        pixman_region32_t *damage);
        void (*destroy)(struct weston_output *output);
@@ -191,11 +197,176 @@ struct weston_output {
        int (*switch_mode)(struct weston_output *output, struct weston_mode *mode);
 
        /* backlight values are on 0-255 range, where higher is brighter */
-       uint32_t backlight_current;
+       int32_t backlight_current;
        void (*set_backlight)(struct weston_output *output, uint32_t value);
        void (*set_dpms)(struct weston_output *output, enum dpms_enum level);
+
+       int connection_internal;
+       uint16_t gamma_size;
+       void (*set_gamma)(struct weston_output *output,
+                         uint16_t size,
+                         uint16_t *r,
+                         uint16_t *g,
+                         uint16_t *b);
+};
+
+struct weston_pointer_grab;
+struct weston_pointer_grab_interface {
+       void (*focus)(struct weston_pointer_grab *grab);
+       void (*motion)(struct weston_pointer_grab *grab, uint32_t time);
+       void (*button)(struct weston_pointer_grab *grab,
+                      uint32_t time, uint32_t button, uint32_t state);
+};
+
+struct weston_pointer_grab {
+       const struct weston_pointer_grab_interface *interface;
+       struct weston_pointer *pointer;
+};
+
+struct weston_keyboard_grab;
+struct weston_keyboard_grab_interface {
+       void (*key)(struct weston_keyboard_grab *grab, uint32_t time,
+                   uint32_t key, uint32_t state);
+       void (*modifiers)(struct weston_keyboard_grab *grab, uint32_t serial,
+                         uint32_t mods_depressed, uint32_t mods_latched,
+                         uint32_t mods_locked, uint32_t group);
+};
+
+struct weston_keyboard_grab {
+       const struct weston_keyboard_grab_interface *interface;
+       struct weston_keyboard *keyboard;
 };
 
+struct weston_touch_grab;
+struct weston_touch_grab_interface {
+       void (*down)(struct weston_touch_grab *grab,
+                       uint32_t time,
+                       int touch_id,
+                       wl_fixed_t sx,
+                       wl_fixed_t sy);
+       void (*up)(struct weston_touch_grab *grab,
+                       uint32_t time,
+                       int touch_id);
+       void (*motion)(struct weston_touch_grab *grab,
+                       uint32_t time,
+                       int touch_id,
+                       wl_fixed_t sx,
+                       wl_fixed_t sy);
+};
+
+struct weston_touch_grab {
+       const struct weston_touch_grab_interface *interface;
+       struct weston_touch *touch;
+};
+
+struct wl_data_offer {
+       struct wl_resource resource;
+       struct wl_data_source *source;
+       struct wl_listener source_destroy_listener;
+};
+
+struct wl_data_source {
+       struct wl_resource resource;
+       struct wl_array mime_types;
+
+       void (*accept)(struct wl_data_source *source,
+                      uint32_t serial, const char *mime_type);
+       void (*send)(struct wl_data_source *source,
+                    const char *mime_type, int32_t fd);
+       void (*cancel)(struct wl_data_source *source);
+};
+
+struct weston_pointer {
+       struct weston_seat *seat;
+
+       struct wl_list resource_list;
+       struct weston_surface *focus;
+       struct wl_resource *focus_resource;
+       struct wl_listener focus_listener;
+       uint32_t focus_serial;
+       struct wl_signal focus_signal;
+
+       struct weston_surface *sprite;
+       struct wl_listener sprite_destroy_listener;
+       int32_t hotspot_x, hotspot_y;
+
+       struct weston_pointer_grab *grab;
+       struct weston_pointer_grab default_grab;
+       wl_fixed_t grab_x, grab_y;
+       uint32_t grab_button;
+       uint32_t grab_serial;
+       uint32_t grab_time;
+
+       wl_fixed_t x, y;
+       uint32_t button_count;
+};
+
+
+struct weston_touch {
+       struct weston_seat *seat;
+
+       struct wl_list resource_list;
+       struct weston_surface *focus;
+       struct wl_resource *focus_resource;
+       struct wl_listener focus_listener;
+       uint32_t focus_serial;
+       struct wl_signal focus_signal;
+
+       struct weston_touch_grab *grab;
+       struct weston_touch_grab default_grab;
+       wl_fixed_t grab_x, grab_y;
+       uint32_t grab_serial;
+       uint32_t grab_time;
+};
+
+struct weston_pointer *
+weston_pointer_create(void);
+void
+weston_pointer_destroy(struct weston_pointer *pointer);
+void
+weston_pointer_set_focus(struct weston_pointer *pointer,
+                        struct weston_surface *surface,
+                        wl_fixed_t sx, wl_fixed_t sy);
+void
+weston_pointer_start_grab(struct weston_pointer *pointer,
+                         struct weston_pointer_grab *grab);
+void
+weston_pointer_end_grab(struct weston_pointer *pointer);
+
+struct weston_keyboard *
+weston_keyboard_create(void);
+void
+weston_keyboard_destroy(struct weston_keyboard *keyboard);
+void
+weston_keyboard_set_focus(struct weston_keyboard *keyboard,
+                         struct weston_surface *surface);
+void
+weston_keyboard_start_grab(struct weston_keyboard *device,
+                          struct weston_keyboard_grab *grab);
+void
+weston_keyboard_end_grab(struct weston_keyboard *keyboard);
+
+struct weston_touch *
+weston_touch_create(void);
+void
+weston_touch_destroy(struct weston_touch *touch);
+void
+weston_touch_start_grab(struct weston_touch *device,
+                       struct weston_touch_grab *grab);
+void
+weston_touch_end_grab(struct weston_touch *touch);
+
+void
+wl_data_device_set_keyboard_focus(struct weston_seat *seat);
+
+int
+wl_data_device_manager_init(struct wl_display *display);
+
+
+void
+weston_seat_set_selection(struct weston_seat *seat,
+                         struct wl_data_source *source, uint32_t serial);
+
 struct weston_xkb_info {
        struct xkb_keymap *keymap;
        int keymap_fd;
@@ -214,29 +385,57 @@ struct weston_xkb_info {
        xkb_led_index_t scroll_led;
 };
 
+struct weston_keyboard {
+       struct weston_seat *seat;
+
+       struct wl_list resource_list;
+       struct weston_surface *focus;
+       struct wl_resource *focus_resource;
+       struct wl_listener focus_listener;
+       uint32_t focus_serial;
+       struct wl_signal focus_signal;
+
+       struct weston_keyboard_grab *grab;
+       struct weston_keyboard_grab default_grab;
+       uint32_t grab_key;
+       uint32_t grab_serial;
+       uint32_t grab_time;
+
+       struct wl_array keys;
+
+       struct {
+               uint32_t mods_depressed;
+               uint32_t mods_latched;
+               uint32_t mods_locked;
+               uint32_t group;
+       } modifiers;
+
+       struct weston_keyboard_grab input_method_grab;
+       struct wl_resource *input_method_resource;
+};
+
 struct weston_seat {
-       struct wl_seat seat;
-       struct wl_pointer pointer;
-       int has_pointer;
-       struct wl_keyboard keyboard;
-       int has_keyboard;
-       struct wl_touch touch;
-       int has_touch;
+       struct wl_list base_resource_list;
+
+       struct weston_pointer *pointer;
+       struct weston_keyboard *keyboard;
+       struct weston_touch *touch;
+
+       struct wl_signal destroy_signal;
 
        struct weston_compositor *compositor;
-       struct weston_surface *sprite;
-       struct wl_listener sprite_destroy_listener;
-       struct weston_surface *drag_surface;
-       struct wl_listener drag_surface_destroy_listener;
-       int32_t hotspot_x, hotspot_y;
        struct wl_list link;
        enum weston_keyboard_modifier modifier_state;
-       struct wl_surface *saved_kbd_focus;
+       struct weston_surface *saved_kbd_focus;
        struct wl_listener saved_kbd_focus_listener;
+       struct wl_list drag_resource_list;
 
-       uint32_t num_tp;
+       uint32_t selection_serial;
+       struct wl_data_source *selection_data_source;
+       struct wl_listener selection_data_source_listener;
+       struct wl_signal selection_signal;
 
-       struct wl_listener new_drag_icon_listener;
+       uint32_t num_tp;
 
        void (*led_update)(struct weston_seat *ws, enum weston_led leds);
 
@@ -249,19 +448,12 @@ struct weston_seat {
        struct input_method *input_method;
 };
 
-struct weston_shader {
-       GLuint program;
-       GLuint vertex_shader, fragment_shader;
-       GLint proj_uniform;
-       GLint tex_uniforms[3];
-       GLint alpha_uniform;
-       GLint color_uniform;
-};
-
 enum {
        WESTON_COMPOSITOR_ACTIVE,
        WESTON_COMPOSITOR_IDLE,         /* shell->unlock called on activity */
-       WESTON_COMPOSITOR_SLEEPING      /* no rendering, no frame events */
+       WESTON_COMPOSITOR_OFFSCREEN,    /* no rendering, no frame events */
+       WESTON_COMPOSITOR_SLEEPING      /* same as offscreen, but also set dmps
+                                         * to off */
 };
 
 struct weston_layer {
@@ -271,8 +463,9 @@ struct weston_layer {
 
 struct weston_plane {
        pixman_region32_t damage;
-       pixman_region32_t opaque;
+       pixman_region32_t clip;
        int32_t x, y;
+       struct wl_list link;
 };
 
 struct weston_renderer {
@@ -284,30 +477,40 @@ struct weston_renderer {
                               pixman_region32_t *output_damage);
        void (*flush_damage)(struct weston_surface *surface);
        void (*attach)(struct weston_surface *es, struct wl_buffer *buffer);
+       int (*create_surface)(struct weston_surface *surface);
+       void (*surface_set_color)(struct weston_surface *surface,
+                              float red, float green,
+                              float blue, float alpha);
        void (*destroy_surface)(struct weston_surface *surface);
+       void (*destroy)(struct weston_compositor *ec);
+};
+
+enum weston_capability {
+       /* backend/renderer supports arbitrary rotation */
+       WESTON_CAP_ROTATION_ANY                 = 0x0001,
+
+       /* screencaptures need to be y-flipped */
+       WESTON_CAP_CAPTURE_YFLIP                = 0x0002,
 };
 
 struct weston_compositor {
        struct wl_signal destroy_signal;
 
-       struct weston_shader texture_shader_rgba;
-       struct weston_shader texture_shader_rgbx;
-       struct weston_shader texture_shader_egl_external;
-       struct weston_shader texture_shader_y_uv;
-       struct weston_shader texture_shader_y_u_v;
-       struct weston_shader texture_shader_y_xuxv;
-       struct weston_shader solid_shader;
-       struct weston_shader *current_shader;
        struct wl_display *wl_display;
        struct weston_shell_interface shell_interface;
+       struct weston_config *config;
 
        struct wl_signal activate_signal;
        struct wl_signal kill_signal;
-       struct wl_signal lock_signal;
-       struct wl_signal unlock_signal;
+       struct wl_signal idle_signal;
+       struct wl_signal wake_signal;
 
        struct wl_signal show_input_panel_signal;
        struct wl_signal hide_input_panel_signal;
+       struct wl_signal update_input_panel_signal;
+
+       struct wl_signal seat_created_signal;
+       struct wl_signal output_created_signal;
 
        struct wl_event_loop *input_loop;
        struct wl_event_source *input_loop_source;
@@ -319,49 +522,27 @@ struct weston_compositor {
        struct wl_list seat_list;
        struct wl_list layer_list;
        struct wl_list surface_list;
+       struct wl_list plane_list;
        struct wl_list key_binding_list;
        struct wl_list button_binding_list;
        struct wl_list axis_binding_list;
        struct wl_list debug_binding_list;
-       struct {
-               struct weston_spring spring;
-               struct weston_animation animation;
-               struct weston_surface *surface;
-       } fade;
 
        uint32_t state;
        struct wl_event_source *idle_source;
        uint32_t idle_inhibit;
-       int option_idle_time;           /* default timeout, s */
-       int idle_time;                  /* effective timeout, s */
+       int idle_time;                  /* timeout, s */
 
        /* Repaint state. */
-       struct wl_array vertices;
-       struct wl_array indices; /* only used in compositor-wayland */
-       struct wl_array vtxcnt;
        struct weston_plane primary_plane;
-       int fan_debug;
+       uint32_t capabilities; /* combination of enum weston_capability */
 
        uint32_t focus;
 
        struct weston_renderer *renderer;
 
-       PFNGLEGLIMAGETARGETRENDERBUFFERSTORAGEOESPROC
-               image_target_renderbuffer_storage;
-       PFNGLEGLIMAGETARGETTEXTURE2DOESPROC image_target_texture_2d;
-       PFNEGLCREATEIMAGEKHRPROC create_image;
-       PFNEGLDESTROYIMAGEKHRPROC destroy_image;
-
-       int has_unpack_subimage;
        pixman_format_code_t read_format;
 
-       PFNEGLBINDWAYLANDDISPLAYWL bind_display;
-       PFNEGLUNBINDWAYLANDDISPLAYWL unbind_display;
-       PFNEGLQUERYWAYLANDBUFFERWL query_buffer;
-       int has_bind_display;
-
-       int has_egl_image_external;
-
        void (*destroy)(struct weston_compositor *ec);
        void (*restore)(struct weston_compositor *ec);
        int (*authenticate)(struct weston_compositor *c, uint32_t id);
@@ -377,18 +558,73 @@ struct weston_compositor {
        struct weston_xkb_info xkb_info;
 };
 
+struct weston_buffer_reference {
+       struct wl_buffer *buffer;
+       struct wl_listener destroy_listener;
+};
+
 struct weston_region {
        struct wl_resource resource;
        pixman_region32_t region;
 };
 
+struct weston_subsurface {
+       struct wl_resource *resource;
+
+       /* guaranteed to be valid and non-NULL */
+       struct weston_surface *surface;
+       struct wl_listener surface_destroy_listener;
+
+       /* can be NULL */
+       struct weston_surface *parent;
+       struct wl_listener parent_destroy_listener;
+       struct wl_list parent_link;
+       struct wl_list parent_link_pending;
+
+       struct {
+               int32_t x;
+               int32_t y;
+               int set;
+       } position;
+
+       struct {
+               int has_data;
+
+               /* wl_surface.attach */
+               int newly_attached;
+               struct weston_buffer_reference buffer_ref;
+               int32_t sx;
+               int32_t sy;
+
+               /* wl_surface.damage */
+               pixman_region32_t damage;
+
+               /* wl_surface.set_opaque_region */
+               pixman_region32_t opaque;
+
+               /* wl_surface.set_input_region */
+               pixman_region32_t input;
+
+               /* wl_surface.frame */
+               struct wl_list frame_callback_list;
+
+               /* wl_surface.set_buffer_transform */
+               uint32_t buffer_transform;
+
+               /* wl_surface.set_buffer_scale */
+               uint32_t buffer_scale;
+       } cached;
+
+       int synchronized;
+};
+
 /* Using weston_surface transformations
  *
  * To add a transformation to a surface, create a struct weston_transform, and
  * add it to the list surface->geometry.transformation_list. Whenever you
  * change the list, anything under surface->geometry, or anything in the
- * weston_transforms linked into the list, you must set
- * surface->geometry.dirty = 1.
+ * weston_transforms linked into the list, you must call
+ * weston_surface_geometry_dirty().
  *
  * The order in the list defines the order of transformations. Let the list
  * contain the transformation matrices M1, ..., Mn as head to tail. The
@@ -405,28 +641,29 @@ struct weston_region {
  * If you want to apply a transformation in local coordinates, add your
  * weston_transform to the head of the list. If you want to apply a
  * transformation in global coordinates, add it to the tail of the list.
+ *
+ * If surface->geometry.parent is set, the total transformation of this
+ * surface will be the parent's total transformation and this transformation
+ * combined:
+ *    Mparent * Mn * ... * M2 * M1
  */
 
 struct weston_surface {
-       struct wl_surface surface;
+       struct wl_resource resource;
        struct weston_compositor *compositor;
-       GLuint textures[3];
-       int num_textures;
-       pixman_region32_t texture_damage;
        pixman_region32_t clip;
        pixman_region32_t damage;
-       pixman_region32_t opaque;
+       pixman_region32_t opaque;        /* part of geometry, see below */
        pixman_region32_t input;
-       int32_t pitch;
        struct wl_list link;
        struct wl_list layer_link;
-       struct weston_shader *shader;
-       GLfloat color[4];
-       float alpha;
+       float alpha;                     /* part of geometry, see below */
        struct weston_plane *plane;
 
+       void *renderer_state;
+
        /* Surface geometry state, mutable.
-        * If you change anything, set dirty = 1.
+        * If you change anything, call weston_surface_geometry_dirty().
         * That includes the transformations referenced from the list.
         */
        struct {
@@ -436,13 +673,19 @@ struct weston_surface {
                /* struct weston_transform */
                struct wl_list transformation_list;
 
-               int dirty;
+               /* managed by weston_surface_set_transform_parent() */
+               struct weston_surface *parent;
+               struct wl_listener parent_destroy_listener;
+               struct wl_list child_list; /* geometry.parent_link */
+               struct wl_list parent_link;
        } geometry;
 
        /* State derived from geometry state, read-only.
         * This is updated by weston_surface_update_transform().
         */
        struct {
+               int dirty;
+
                pixman_region32_t boundingbox;
                pixman_region32_t opaque;
 
@@ -471,17 +714,15 @@ struct weston_surface {
 
        struct wl_list frame_callback_list;
 
-       EGLImageKHR images[3];
-       GLenum target;
-       int num_images;
-
-       struct wl_buffer *buffer;
-       struct wl_listener buffer_destroy_listener;
+       struct weston_buffer_reference buffer_ref;
+       uint32_t buffer_transform;
+       uint32_t buffer_scale;
+       int keep_buffer; /* bool for backends to prevent early release */
 
        /* All the pending state, that wl_surface.commit will apply. */
        struct {
                /* wl_surface.attach */
-               int remove_contents;
+               int newly_attached;
                struct wl_buffer *buffer;
                struct wl_listener buffer_destroy_listener;
                int32_t sx;
@@ -498,6 +739,12 @@ struct weston_surface {
 
                /* wl_surface.frame */
                struct wl_list frame_callback_list;
+
+               /* wl_surface.set_buffer_transform */
+               uint32_t buffer_transform;
+
+               /* wl_surface.set_scaling_factor */
+               uint32_t buffer_scale;
        } pending;
 
        /*
@@ -505,8 +752,15 @@ struct weston_surface {
         * a new buffer has been set up for this surface. The integer params
         * are the sx and sy paramerters supplied to surface::attach .
         */
-       void (*configure)(struct weston_surface *es, int32_t sx, int32_t sy);
-       void *private;
+       void (*configure)(struct weston_surface *es, int32_t sx, int32_t sy, int32_t width, int32_t height);
+       void *configure_private;
+
+       /* Parent's list of its sub-surfaces, weston_subsurface:parent_link.
+        * Contains also the parent itself as a dummy weston_subsurface,
+        * if the list is not empty.
+        */
+       struct wl_list subsurface_list; /* weston_subsurface::parent_link */
+       struct wl_list subsurface_list_pending; /* ...::parent_link_pending */
 };
 
 enum weston_key_state_update {
@@ -515,9 +769,15 @@ enum weston_key_state_update {
 };
 
 void
+weston_version(int *major, int *minor, int *micro);
+
+void
 weston_surface_update_transform(struct weston_surface *surface);
 
 void
+weston_surface_geometry_dirty(struct weston_surface *surface);
+
+void
 weston_surface_to_global_fixed(struct weston_surface *surface,
                               wl_fixed_t sx, wl_fixed_t sy,
                               wl_fixed_t *x, wl_fixed_t *y);
@@ -535,6 +795,21 @@ void
 weston_surface_from_global_fixed(struct weston_surface *surface,
                                 wl_fixed_t x, wl_fixed_t y,
                                 wl_fixed_t *sx, wl_fixed_t *sy);
+int32_t
+weston_surface_buffer_width(struct weston_surface *surface);
+int32_t
+weston_surface_buffer_height(struct weston_surface *surface);
+
+WL_EXPORT void
+weston_surface_to_buffer_float(struct weston_surface *surface,
+                              float x, float y, float *bx, float *by);
+WL_EXPORT void
+weston_surface_to_buffer(struct weston_surface *surface,
+                         int sx, int sy, int *bx, int *by);
+
+pixman_box32_t
+weston_surface_to_buffer_rect(struct weston_surface *surface,
+                             pixman_box32_t rect);
 
 void
 weston_spring_init(struct weston_spring *spring,
@@ -549,7 +824,10 @@ weston_surface_activate(struct weston_surface *surface,
                        struct weston_seat *seat);
 void
 notify_motion(struct weston_seat *seat, uint32_t time,
-             wl_fixed_t x, wl_fixed_t y);
+             wl_fixed_t dx, wl_fixed_t dy);
+void
+notify_motion_absolute(struct weston_seat *seat, uint32_t time,
+                      wl_fixed_t x, wl_fixed_t y);
 void
 notify_button(struct weston_seat *seat, uint32_t time, int32_t button,
              enum wl_pointer_button_state state);
@@ -586,6 +864,11 @@ void
 weston_plane_release(struct weston_plane *plane);
 
 void
+weston_compositor_stack_plane(struct weston_compositor *ec,
+                             struct weston_plane *plane,
+                             struct weston_plane *above);
+
+void
 weston_output_finish_frame(struct weston_output *output, uint32_t msecs);
 void
 weston_output_schedule_repaint(struct weston_output *output);
@@ -602,13 +885,17 @@ weston_compositor_unlock(struct weston_compositor *compositor);
 void
 weston_compositor_wake(struct weston_compositor *compositor);
 void
-weston_compositor_activity(struct weston_compositor *compositor);
+weston_compositor_offscreen(struct weston_compositor *compositor);
 void
-weston_compositor_update_drag_surfaces(struct weston_compositor *compositor);
+weston_compositor_sleep(struct weston_compositor *compositor);
+struct weston_surface *
+weston_compositor_pick_surface(struct weston_compositor *compositor,
+                              wl_fixed_t x, wl_fixed_t y,
+                              wl_fixed_t *sx, wl_fixed_t *sy);
 
 
 struct weston_binding;
-typedef void (*weston_key_binding_handler_t)(struct wl_seat *seat,
+typedef void (*weston_key_binding_handler_t)(struct weston_seat *seat,
                                             uint32_t time, uint32_t key,
                                             void *data);
 struct weston_binding *
@@ -618,7 +905,7 @@ weston_compositor_add_key_binding(struct weston_compositor *compositor,
                                  weston_key_binding_handler_t binding,
                                  void *data);
 
-typedef void (*weston_button_binding_handler_t)(struct wl_seat *seat,
+typedef void (*weston_button_binding_handler_t)(struct weston_seat *seat,
                                                uint32_t time, uint32_t button,
                                                void *data);
 struct weston_binding *
@@ -628,7 +915,7 @@ weston_compositor_add_button_binding(struct weston_compositor *compositor,
                                     weston_button_binding_handler_t binding,
                                     void *data);
 
-typedef void (*weston_axis_binding_handler_t)(struct wl_seat *seat,
+typedef void (*weston_axis_binding_handler_t)(struct weston_seat *seat,
                                              uint32_t time, uint32_t axis,
                                              wl_fixed_t value, void *data);
 struct weston_binding *
@@ -658,7 +945,7 @@ weston_compositor_run_button_binding(struct weston_compositor *compositor,
                                     struct weston_seat *seat, uint32_t time,
                                     uint32_t button,
                                     enum wl_pointer_button_state value);
-void
+int
 weston_compositor_run_axis_binding(struct weston_compositor *compositor,
                                   struct weston_seat *seat, uint32_t time,
                                   uint32_t axis, int32_t value);
@@ -688,6 +975,10 @@ void
 weston_surface_set_position(struct weston_surface *surface,
                            float x, float y);
 
+void
+weston_surface_set_transform_parent(struct weston_surface *surface,
+                                   struct weston_surface *parent);
+
 int
 weston_surface_is_mapped(struct weston_surface *surface);
 
@@ -706,15 +997,19 @@ weston_surface_move_to_plane(struct weston_surface *surface,
 void
 weston_surface_unmap(struct weston_surface *surface);
 
+struct weston_surface *
+weston_surface_get_main_surface(struct weston_surface *surface);
+
 void
-weston_buffer_post_release(struct wl_buffer *buffer);
+weston_buffer_reference(struct weston_buffer_reference *ref,
+                       struct wl_buffer *buffer);
 
 uint32_t
 weston_compositor_get_time(void);
 
 int
 weston_compositor_init(struct weston_compositor *ec, struct wl_display *display,
-                      int argc, char *argv[], const char *config_file);
+                      int *argc, char *argv[], struct weston_config *config);
 void
 weston_compositor_shutdown(struct weston_compositor *ec);
 void
@@ -730,7 +1025,7 @@ void
 weston_output_move(struct weston_output *output, int x, int y);
 void
 weston_output_init(struct weston_output *output, struct weston_compositor *c,
-                  int x, int y, int width, int height, uint32_t transform);
+                  int x, int y, int width, int height, uint32_t transform, uint32_t scale);
 void
 weston_output_destroy(struct weston_output *output);
 
@@ -738,13 +1033,20 @@ void
 weston_seat_init(struct weston_seat *seat, struct weston_compositor *ec);
 void
 weston_seat_init_pointer(struct weston_seat *seat);
-void
+int
 weston_seat_init_keyboard(struct weston_seat *seat, struct xkb_keymap *keymap);
 void
 weston_seat_init_touch(struct weston_seat *seat);
+void
+weston_seat_repick(struct weston_seat *seat);
 
 void
 weston_seat_release(struct weston_seat *seat);
+int
+weston_compositor_xkb_init(struct weston_compositor *ec,
+                          struct xkb_rule_names *names);
+void
+weston_compositor_xkb_destroy(struct weston_compositor *ec);
 
 /* String literal of spaces, the same width as the timestamp. */
 #define STAMP_SPACE "               "
@@ -789,12 +1091,8 @@ clipboard_create(struct weston_seat *seat);
 void
 text_cursor_position_notifier_create(struct weston_compositor *ec);
 
-void
-text_model_factory_create(struct weston_compositor *ec);
-
-void
-input_method_create(struct weston_compositor *ec,
-                   struct weston_seat *seat);
+int
+text_backend_init(struct weston_compositor *ec);
 
 struct weston_process;
 typedef void (*weston_process_cleanup_func_t)(struct weston_process *process,
@@ -824,7 +1122,12 @@ weston_zoom_run(struct weston_surface *surface, float start, float stop,
 
 struct weston_surface_animation *
 weston_fade_run(struct weston_surface *surface,
+               float start, float end, float k,
                weston_surface_animation_done_func_t done, void *data);
+void
+weston_fade_update(struct weston_surface_animation *fade,
+                  float start, float end, float k);
+
 struct weston_surface_animation *
 weston_slide_run(struct weston_surface *surface, float start, float stop,
                 weston_surface_animation_done_func_t done, void *data);
@@ -839,37 +1142,30 @@ weston_surface_destroy(struct weston_surface *surface);
 int
 weston_output_switch_mode(struct weston_output *output, struct weston_mode *mode);
 
-extern const EGLint gles2_renderer_opaque_attribs[];
-extern const EGLint gles2_renderer_alpha_attribs[];
-
-int
-gles2_renderer_create(struct weston_compositor *ec, EGLNativeDisplayType display,
-       const EGLint *attribs, const EGLint *visual_id);
-EGLDisplay
-gles2_renderer_display(struct weston_compositor *ec);
-int
-gles2_renderer_output_create(struct weston_output *output,
-                                   EGLNativeWindowType window);
-void
-gles2_renderer_output_destroy(struct weston_output *output);
-EGLSurface
-gles2_renderer_output_surface(struct weston_output *output);
-void
-gles2_renderer_set_border(struct weston_compositor *ec, int32_t width, int32_t height, void *data,
-                         int32_t *edges);
-void
-gles2_renderer_destroy(struct weston_compositor *ec);
-
 int
 noop_renderer_init(struct weston_compositor *ec);
-void
-noop_renderer_destroy(struct weston_compositor *ec);
 
 struct weston_compositor *
-backend_init(struct wl_display *display, int argc, char *argv[],
-           const char *config_file);
+backend_init(struct wl_display *display, int *argc, char *argv[],
+            struct weston_config *config);
 
 int
-module_init(struct weston_compositor *compositor);
+module_init(struct weston_compositor *compositor,
+           int *argc, char *argv[]);
+
+void
+weston_transformed_coord(int width, int height,
+                        enum wl_output_transform transform,
+                        uint32_t scale,
+                        float sx, float sy, float *bx, float *by);
+pixman_box32_t
+weston_transformed_rect(int width, int height,
+                       enum wl_output_transform transform,
+                       uint32_t scale,
+                       pixman_box32_t rect);
+
+#ifdef  __cplusplus
+}
+#endif
 
 #endif