compositor: add capability flag for arbitrary surface rotation

The upcoming rpi-renderer cannot handle arbitrary rotations. Introduce
Weston capability bits, and add a bit for arbitrary rotation. GL and
Pixman renderers support it.

Shell or any other module must not produce surface transformations with
rotation, if the capability bit is not set. Do not register the surface
rotation binding in desktop shell, if arbitary rotation is not
supported.

Signed-off-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk>
Pekka Paalanen 12 years ago committed by Kristian Høgsberg
parent 9bdfc48f09
commit 7bb6510748
  1. 24
      src/compositor.c
  2. 6
      src/compositor.h
  3. 1
      src/gl-renderer.c
  4. 1
      src/pixman-renderer.c
  5. 7
      src/shell.c

@ -2888,6 +2888,28 @@ weston_version(int *major, int *minor, int *micro)
*micro = WESTON_VERSION_MICRO; *micro = WESTON_VERSION_MICRO;
} }
static const struct {
uint32_t bit;
const char *desc;
} capability_strings[] = {
{ WESTON_CAP_ROTATION_ANY, "arbitrary surface rotation:" },
};
static void
weston_compositor_log_capabilities(struct weston_compositor *compositor)
{
unsigned i;
int yes;
weston_log("Compositor capabilities:\n");
for (i = 0; i < ARRAY_LENGTH(capability_strings); i++) {
yes = compositor->capabilities & capability_strings[i].bit;
weston_log_continue(STAMP_SPACE "%s %s\n",
capability_strings[i].desc,
yes ? "yes" : "no");
}
}
static int on_term_signal(int signal_number, void *data) static int on_term_signal(int signal_number, void *data)
{ {
struct wl_display *display = data; struct wl_display *display = data;
@ -3282,6 +3304,8 @@ int main(int argc, char *argv[])
goto out; goto out;
} }
weston_compositor_log_capabilities(ec);
if (wl_display_add_socket(display, socket_name)) { if (wl_display_add_socket(display, socket_name)) {
weston_log("fatal: failed to add socket: %m\n"); weston_log("fatal: failed to add socket: %m\n");
ret = EXIT_FAILURE; ret = EXIT_FAILURE;

@ -485,6 +485,11 @@ struct weston_renderer {
void (*destroy)(struct weston_compositor *ec); void (*destroy)(struct weston_compositor *ec);
}; };
enum weston_capability {
/* backend/renderer supports arbitrary rotation */
WESTON_CAP_ROTATION_ANY = 0x0001,
};
struct weston_compositor { struct weston_compositor {
struct wl_signal destroy_signal; struct wl_signal destroy_signal;
@ -526,6 +531,7 @@ struct weston_compositor {
/* Repaint state. */ /* Repaint state. */
struct weston_plane primary_plane; struct weston_plane primary_plane;
uint32_t capabilities; /* combination of enum weston_capability */
uint32_t focus; uint32_t focus;

@ -1830,6 +1830,7 @@ gl_renderer_create(struct weston_compositor *ec, EGLNativeDisplayType display,
} }
ec->renderer = &gr->base; ec->renderer = &gr->base;
ec->capabilities |= WESTON_CAP_ROTATION_ANY;
return 0; return 0;

@ -658,6 +658,7 @@ pixman_renderer_init(struct weston_compositor *ec)
renderer->base.destroy_surface = pixman_renderer_destroy_surface; renderer->base.destroy_surface = pixman_renderer_destroy_surface;
renderer->base.destroy = pixman_renderer_destroy; renderer->base.destroy = pixman_renderer_destroy;
ec->renderer = &renderer->base; ec->renderer = &renderer->base;
ec->capabilities |= WESTON_CAP_ROTATION_ANY;
weston_compositor_add_debug_binding(ec, KEY_R, weston_compositor_add_debug_binding(ec, KEY_R,
debug_binding, ec); debug_binding, ec);

@ -4247,8 +4247,11 @@ shell_add_bindings(struct weston_compositor *ec, struct desktop_shell *shell)
shell); shell);
weston_compositor_add_button_binding(ec, BTN_MIDDLE, mod, weston_compositor_add_button_binding(ec, BTN_MIDDLE, mod,
resize_binding, shell); resize_binding, shell);
weston_compositor_add_button_binding(ec, BTN_RIGHT, mod,
rotate_binding, NULL); if (ec->capabilities & WESTON_CAP_ROTATION_ANY)
weston_compositor_add_button_binding(ec, BTN_RIGHT, mod,
rotate_binding, NULL);
weston_compositor_add_key_binding(ec, KEY_TAB, mod, switcher_binding, weston_compositor_add_key_binding(ec, KEY_TAB, mod, switcher_binding,
shell); shell);
weston_compositor_add_key_binding(ec, KEY_F9, mod, backlight_binding, weston_compositor_add_key_binding(ec, KEY_F9, mod, backlight_binding,

Loading…
Cancel
Save