mainnika
/
weston
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rename screenshooter protocol to weston_screenshooter

Browse Source 
Due to the effort of moving a way from non-prefixed protocols, rename
the weston specific screenshooter protocol to weston_screenshooter.

Signed-off-by: Jonas Ådahl <jadahl@gmail.com>
Reviewed-by: Mariusz Ceier <mceier+wayland@gmail.com>
Reviewed-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk>
dev
Jonas Ådahl 9 years ago committed by Pekka Paalanen
parent 6d6fb61a32
commit cf1efd2ab7
4 changed files with 27 additions and 22 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 14
      Makefile.am
  2. 21
      clients/screenshot.c
  3. 4
      protocol/weston-screenshooter.xml
  4. 10
      src/screenshooter.c

14
Makefile.am
Unescape View File

@ -113,8 +113,8 @@ systemd_notify_la_SOURCES = \
endif endif
nodist_weston_SOURCES = \ nodist_weston_SOURCES = \
protocol/screenshooter-protocol.c \ protocol/weston-screenshooter-protocol.c \
protocol/screenshooter-server-protocol.h \ protocol/weston-screenshooter-server-protocol.h \
protocol/text-cursor-position-protocol.c \ protocol/text-cursor-position-protocol.c \
protocol/text-cursor-position-server-protocol.h \ protocol/text-cursor-position-server-protocol.h \
protocol/text-input-unstable-v1-protocol.c \ protocol/text-input-unstable-v1-protocol.c \
@ -577,8 +577,8 @@ weston_flower_CFLAGS = $(AM_CFLAGS) $(CLIENT_CFLAGS)
weston_screenshooter_SOURCES = \ weston_screenshooter_SOURCES = \
clients/screenshot.c clients/screenshot.c
nodist_weston_screenshooter_SOURCES = \ nodist_weston_screenshooter_SOURCES = \
protocol/screenshooter-protocol.c \ protocol/weston-screenshooter-protocol.c \
protocol/screenshooter-client-protocol.h protocol/weston-screenshooter-client-protocol.h
weston_screenshooter_LDADD = $(CLIENT_LIBS) libshared.la weston_screenshooter_LDADD = $(CLIENT_LIBS) libshared.la
weston_screenshooter_CFLAGS = $(AM_CFLAGS) $(CLIENT_CFLAGS) weston_screenshooter_CFLAGS = $(AM_CFLAGS) $(CLIENT_CFLAGS)
@ -749,8 +749,8 @@ endif
endif endif
BUILT_SOURCES += \ BUILT_SOURCES += \
protocol/screenshooter-protocol.c \ protocol/weston-screenshooter-protocol.c \
protocol/screenshooter-client-protocol.h \ protocol/weston-screenshooter-client-protocol.h \
protocol/text-cursor-position-client-protocol.h \ protocol/text-cursor-position-client-protocol.h \
protocol/text-cursor-position-protocol.c \ protocol/text-cursor-position-protocol.c \
protocol/text-input-unstable-v1-protocol.c \ protocol/text-input-unstable-v1-protocol.c \
@ -1341,7 +1341,7 @@ BUILT_SOURCES += \
EXTRA_DIST += \ EXTRA_DIST += \
protocol/weston-desktop-shell.xml \ protocol/weston-desktop-shell.xml \
protocol/screenshooter.xml \ protocol/weston-screenshooter.xml \
protocol/workspaces.xml \ protocol/workspaces.xml \
protocol/text-cursor-position.xml \ protocol/text-cursor-position.xml \
protocol/weston-test.xml \ protocol/weston-test.xml \

21
clients/screenshot.c
Unescape View File

@ -36,7 +36,7 @@
#include <cairo.h> #include <cairo.h>
#include <wayland-client.h> #include <wayland-client.h>
#include "screenshooter-client-protocol.h" #include "weston-screenshooter-client-protocol.h"
#include "shared/os-compatibility.h" #include "shared/os-compatibility.h"
/* The screenshooter is a good example of a custom object exposed by /* The screenshooter is a good example of a custom object exposed by
@ -44,7 +44,7 @@
* side marshalling outside libwayland.so */ * side marshalling outside libwayland.so */
static struct wl_shm *shm; static struct wl_shm *shm;
static struct screenshooter *screenshooter; static struct weston_screenshooter *screenshooter;
static struct wl_list output_list; static struct wl_list output_list;
int min_x, min_y, max_x, max_y; int min_x, min_y, max_x, max_y;
int buffer_copy_done; int buffer_copy_done;
@ -118,12 +118,12 @@ static const struct wl_output_listener output_listener = {
}; };
static void static void
screenshot_done(void *data, struct screenshooter *screenshooter) screenshot_done(void *data, struct weston_screenshooter *screenshooter)
{ {
buffer_copy_done = 1; buffer_copy_done = 1;
} }
static const struct screenshooter_listener screenshooter_listener = { static const struct weston_screenshooter_listener screenshooter_listener = {
screenshot_done screenshot_done
}; };
@ -141,9 +141,10 @@ handle_global(void *data, struct wl_registry *registry,
wl_output_add_listener(output->output, &output_listener, output); wl_output_add_listener(output->output, &output_listener, output);
} else if (strcmp(interface, "wl_shm") == 0) { } else if (strcmp(interface, "wl_shm") == 0) {
shm = wl_registry_bind(registry, name, &wl_shm_interface, 1); shm = wl_registry_bind(registry, name, &wl_shm_interface, 1);
} else if (strcmp(interface, "screenshooter") == 0) { } else if (strcmp(interface, "weston_screenshooter") == 0) {
screenshooter = wl_registry_bind(registry, name, screenshooter = wl_registry_bind(registry, name,
&screenshooter_interface, 1); &weston_screenshooter_interface,
1);
} }
} }
@ -290,7 +291,9 @@ int main(int argc, char *argv[])
return -1; return -1;
} }
screenshooter_add_listener(screenshooter, &screenshooter_listener, screenshooter); weston_screenshooter_add_listener(screenshooter,
&screenshooter_listener,
screenshooter);
if (set_buffer_size(&width, &height)) if (set_buffer_size(&width, &height))
return -1; return -1;
@ -298,7 +301,9 @@ int main(int argc, char *argv[])
wl_list_for_each(output, &output_list, link) { wl_list_for_each(output, &output_list, link) {
output->buffer = create_shm_buffer(output->width, output->height, &output->data); output->buffer = create_shm_buffer(output->width, output->height, &output->data);
screenshooter_shoot(screenshooter, output->output, output->buffer); weston_screenshooter_shoot(screenshooter,
output->output,
output->buffer);
buffer_copy_done = 0; buffer_copy_done = 0;
while (!buffer_copy_done) while (!buffer_copy_done)
wl_display_roundtrip(display); wl_display_roundtrip(display);

4
protocol/screenshooter.xml → protocol/weston-screenshooter.xml
Unescape View File

@ -1,6 +1,6 @@
<protocol name="screenshooter"> <protocol name="weston_screenshooter">
<interface name="screenshooter" version="1"> <interface name="weston_screenshooter" version="1">
<request name="shoot"> <request name="shoot">
<arg name="output" type="object" interface="wl_output"/> <arg name="output" type="object" interface="wl_output"/>
<arg name="buffer" type="object" interface="wl_buffer"/> <arg name="buffer" type="object" interface="wl_buffer"/>

10
src/screenshooter.c
Unescape View File

@ -34,7 +34,7 @@
#include <sys/uio.h> #include <sys/uio.h>
#include "compositor.h" #include "compositor.h"
#include "screenshooter-server-protocol.h" #include "weston-screenshooter-server-protocol.h"
#include "shared/helpers.h" #include "shared/helpers.h"
#include "wcap/wcap-decode.h" #include "wcap/wcap-decode.h"
@ -223,7 +223,7 @@ screenshooter_done(void *data, enum weston_screenshooter_outcome outcome)
switch (outcome) { switch (outcome) {
case WESTON_SCREENSHOOTER_SUCCESS: case WESTON_SCREENSHOOTER_SUCCESS:
screenshooter_send_done(resource); weston_screenshooter_send_done(resource);
break; break;
case WESTON_SCREENSHOOTER_NO_MEMORY: case WESTON_SCREENSHOOTER_NO_MEMORY:
wl_resource_post_no_memory(resource); wl_resource_post_no_memory(resource);
@ -252,7 +252,7 @@ screenshooter_shoot(struct wl_client *client,
weston_screenshooter_shoot(output, buffer, screenshooter_done, resource); weston_screenshooter_shoot(output, buffer, screenshooter_done, resource);
} }
struct screenshooter_interface screenshooter_implementation = { struct weston_screenshooter_interface screenshooter_implementation = {
screenshooter_shoot screenshooter_shoot
}; };
@ -264,7 +264,7 @@ bind_shooter(struct wl_client *client,
struct wl_resource *resource; struct wl_resource *resource;
resource = wl_resource_create(client, resource = wl_resource_create(client,
&screenshooter_interface, 1, id); &weston_screenshooter_interface, 1, id);
if (client != shooter->client) { if (client != shooter->client) {
wl_resource_post_error(resource, WL_DISPLAY_ERROR_INVALID_OBJECT, wl_resource_post_error(resource, WL_DISPLAY_ERROR_INVALID_OBJECT,
@ -622,7 +622,7 @@ screenshooter_create(struct weston_compositor *ec)
shooter->client = NULL; shooter->client = NULL;
shooter->global = wl_global_create(ec->wl_display, shooter->global = wl_global_create(ec->wl_display,
&screenshooter_interface, 1, &weston_screenshooter_interface, 1,
shooter, bind_shooter); shooter, bind_shooter);
weston_compositor_add_key_binding(ec, KEY_S, MODIFIER_SUPER, weston_compositor_add_key_binding(ec, KEY_S, MODIFIER_SUPER,
screenshooter_binding, shooter); screenshooter_binding, shooter);

Write Preview
Loading…
Cancel
Save