Move weston source to compositor/

This is the start of separating weston-the-compositor source files from
libweston source files.

This is moving all the files related to the 'weston' binary. Also the
CMS and systemd plugins are moved.

xwayland plugin is not moved, because it will be turned into a
libweston feature.

To avoid breaking the build, #includes for weston.h are fixed to use
compositor/weston.h. This serves as a reminder that such files may need
further attention: moving to the right directory, or maybe using the
proper -I flags instead.

v2: Move also screen-share.c, and add a note about weston-launch.

Signed-off-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk>
Reviewed-by: Yong Bakos <ybakos@humanoriented.com>
Acked-by: Daniel Stone <daniels@collabora.com>
Reviewed-by: Quentin Glidic <sardemff7+git@sardemff7.net>
Tested-by: Quentin Glidic <sardemff7+git@sardemff7.net>
Tested-by: Benoit Gschwind <gschwind@gnu-log.net>
Acked-by: Benoit Gschwind <gschwind@gnu-log.net>
[Pekka: rebased]

compositor/cms-colord.c

@@ -0,0 +1,566 @@
+/*
+ * Copyright © 2013 Richard Hughes
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sublicense, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the
+ * next paragraph) shall be included in all copies or substantial
+ * portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT.  IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+ * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+ * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+#include "config.h"
+
+#include <fcntl.h>
+#include <unistd.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <colord.h>
+
+#include "compositor.h"
+#include "cms-helper.h"
+#include "shared/helpers.h"
+
+struct cms_colord {
+	struct weston_compositor	*ec;
+	CdClient			*client;
+	GHashTable			*devices; /* key = device-id, value = cms_output */
+	GHashTable			*pnp_ids; /* key = pnp-id, value = vendor */
+	gchar				*pnp_ids_data;
+	GMainLoop			*loop;
+	GThread				*thread;
+	GList				*pending;
+	GMutex				 pending_mutex;
+	struct wl_event_source		*source;
+	int				 readfd;
+	int				 writefd;
+	struct wl_listener		 destroy_listener;
+	struct wl_listener		 output_created_listener;
+};
+
+struct cms_output {
+	CdDevice			*device;
+	guint32				 backlight_value;
+	struct cms_colord		*cms;
+	struct weston_color_profile	*p;
+	struct weston_output		*o;
+	struct wl_listener		 destroy_listener;
+};
+
+static gint
+colord_idle_find_output_cb(gconstpointer a, gconstpointer b)
+{
+	struct cms_output *ocms = (struct cms_output *) a;
+	struct weston_output *o = (struct weston_output *) b;
+	return ocms->o == o ? 0 : -1;
+}
+
+static void
+colord_idle_cancel_for_output(struct cms_colord *cms, struct weston_output *o)
+{
+	GList *l;
+
+	/* cancel and remove any helpers that match the output */
+	g_mutex_lock(&cms->pending_mutex);
+	l = g_list_find_custom (cms->pending, o, colord_idle_find_output_cb);
+	if (l) {
+		struct cms_output *ocms = l->data;
+		cms->pending = g_list_remove (cms->pending, ocms);
+	}
+	g_mutex_unlock(&cms->pending_mutex);
+}
+
+static bool
+edid_value_valid(const char *str)
+{
+	if (str == NULL)
+		return false;
+	if (str[0] == '\0')
+		return false;
+	if (strcmp(str, "unknown") == 0)
+		return false;
+	return true;
+}
+
+static gchar *
+get_output_id(struct cms_colord *cms, struct weston_output *o)
+{
+	const gchar *tmp;
+	GString *device_id;
+
+	/* see https://github.com/hughsie/colord/blob/master/doc/device-and-profile-naming-spec.txt
+	 * for format and allowed values */
+	device_id = g_string_new("xrandr");
+	if (edid_value_valid(o->make)) {
+		tmp = g_hash_table_lookup(cms->pnp_ids, o->make);
+		if (tmp == NULL)
+			tmp = o->make;
+		g_string_append_printf(device_id, "-%s", tmp);
+	}
+	if (edid_value_valid(o->model))
+		g_string_append_printf(device_id, "-%s", o->model);
+	if (edid_value_valid(o->serial_number))
+		g_string_append_printf(device_id, "-%s", o->serial_number);
+
+	/* no EDID data, so use fallback */
+	if (strcmp(device_id->str, "xrandr") == 0)
+		g_string_append_printf(device_id, "-drm-%i", o->id);
+
+	return g_string_free(device_id, FALSE);
+}
+
+static void
+update_device_with_profile_in_idle(struct cms_output *ocms)
+{
+	gboolean signal_write = FALSE;
+	ssize_t rc;
+	struct cms_colord *cms = ocms->cms;
+
+	colord_idle_cancel_for_output(cms, ocms->o);
+	g_mutex_lock(&cms->pending_mutex);
+	if (cms->pending == NULL)
+		signal_write = TRUE;
+	cms->pending = g_list_prepend(cms->pending, ocms);
+	g_mutex_unlock(&cms->pending_mutex);
+
+	/* signal we've got updates to do */
+	if (signal_write) {
+		gchar tmp = '\0';
+		rc = write(cms->writefd, &tmp, 1);
+		if (rc == 0)
+			weston_log("colord: failed to write to pending fd\n");
+	}
+}
+
+static void
+colord_update_output_from_device (struct cms_output *ocms)
+{
+	CdProfile *profile;
+	const gchar *tmp;
+	gboolean ret;
+	GError *error = NULL;
+	gint percentage;
+
+	/* old profile is no longer valid */
+	weston_cms_destroy_profile(ocms->p);
+	ocms->p = NULL;
+
+	ret = cd_device_connect_sync(ocms->device, NULL, &error);
+	if (!ret) {
+		weston_log("colord: failed to connect to device %s: %s\n",
+			   cd_device_get_object_path (ocms->device),
+			   error->message);
+		g_error_free(error);
+		goto out;
+	}
+	profile = cd_device_get_default_profile(ocms->device);
+	if (!profile) {
+		weston_log("colord: no assigned color profile for %s\n",
+			   cd_device_get_id (ocms->device));
+		goto out;
+	}
+	ret = cd_profile_connect_sync(profile, NULL, &error);
+	if (!ret) {
+		weston_log("colord: failed to connect to profile %s: %s\n",
+			   cd_profile_get_object_path (profile),
+			   error->message);
+		g_error_free(error);
+		goto out;
+	}
+
+	/* get the calibration brightness level (only set for some profiles) */
+	tmp = cd_profile_get_metadata_item(profile, CD_PROFILE_METADATA_SCREEN_BRIGHTNESS);
+	if (tmp != NULL) {
+		percentage = atoi(tmp);
+		if (percentage > 0 && percentage <= 100)
+			ocms->backlight_value = percentage * 255 / 100;
+	}
+
+	ocms->p = weston_cms_load_profile(cd_profile_get_filename(profile));
+	if (ocms->p == NULL) {
+		weston_log("colord: warning failed to load profile %s: %s\n",
+			   cd_profile_get_object_path (profile),
+			   error->message);
+		g_error_free(error);
+		goto out;
+	}
+out:
+	update_device_with_profile_in_idle(ocms);
+}
+
+static void
+colord_device_changed_cb(CdDevice *device, struct cms_output *ocms)
+{
+	weston_log("colord: device %s changed, update output\n",
+		   cd_device_get_object_path (ocms->device));
+	colord_update_output_from_device(ocms);
+}
+
+static void
+colord_notifier_output_destroy(struct wl_listener *listener, void *data)
+{
+	struct cms_output *ocms =
+		container_of(listener, struct cms_output, destroy_listener);
+	struct weston_output *o = (struct weston_output *) data;
+	struct cms_colord *cms = ocms->cms;
+	gchar *device_id;
+
+	device_id = get_output_id(cms, o);
+	g_hash_table_remove (cms->devices, device_id);
+	g_free (device_id);
+}
+
+static void
+colord_output_created(struct cms_colord *cms, struct weston_output *o)
+{
+	CdDevice *device;
+	const gchar *tmp;
+	gchar *device_id;
+	GError *error = NULL;
+	GHashTable *device_props;
+	struct cms_output *ocms;
+
+	/* create device */
+	device_id = get_output_id(cms, o);
+	weston_log("colord: output added %s\n", device_id);
+	device_props = g_hash_table_new_full(g_str_hash, g_str_equal,
+					     g_free, g_free);
+	g_hash_table_insert (device_props,
+			     g_strdup(CD_DEVICE_PROPERTY_KIND),
+			     g_strdup(cd_device_kind_to_string (CD_DEVICE_KIND_DISPLAY)));
+	g_hash_table_insert (device_props,
+			     g_strdup(CD_DEVICE_PROPERTY_FORMAT),
+			     g_strdup("ColorModel.OutputMode.OutputResolution"));
+	g_hash_table_insert (device_props,
+			     g_strdup(CD_DEVICE_PROPERTY_COLORSPACE),
+			     g_strdup(cd_colorspace_to_string(CD_COLORSPACE_RGB)));
+	if (edid_value_valid(o->make)) {
+		tmp = g_hash_table_lookup(cms->pnp_ids, o->make);
+		if (tmp == NULL)
+			tmp = o->make;
+		g_hash_table_insert (device_props,
+				     g_strdup(CD_DEVICE_PROPERTY_VENDOR),
+				     g_strdup(tmp));
+	}
+	if (edid_value_valid(o->model)) {
+		g_hash_table_insert (device_props,
+				     g_strdup(CD_DEVICE_PROPERTY_MODEL),
+				     g_strdup(o->model));
+	}
+	if (edid_value_valid(o->serial_number)) {
+		g_hash_table_insert (device_props,
+				     g_strdup(CD_DEVICE_PROPERTY_SERIAL),
+				     g_strdup(o->serial_number));
+	}
+	if (o->connection_internal) {
+		g_hash_table_insert (device_props,
+				     g_strdup (CD_DEVICE_PROPERTY_EMBEDDED),
+				     NULL);
+	}
+	device = cd_client_create_device_sync(cms->client,
+					      device_id,
+					      CD_OBJECT_SCOPE_TEMP,
+					      device_props,
+					      NULL,
+					      &error);
+	if (g_error_matches (error,
+			     CD_CLIENT_ERROR,
+			     CD_CLIENT_ERROR_ALREADY_EXISTS)) {
+		g_clear_error(&error);
+		device = cd_client_find_device_sync (cms->client,
+						     device_id,
+						     NULL,
+						     &error);
+	}
+	if (!device) {
+		weston_log("colord: failed to create new or "
+			   "find existing device: %s\n",
+			   error->message);
+		g_error_free(error);
+		goto out;
+	}
+
+	/* create object and watch for the output to be destroyed */
+	ocms = g_slice_new0(struct cms_output);
+	ocms->cms = cms;
+	ocms->o = o;
+	ocms->device = g_object_ref(device);
+	ocms->destroy_listener.notify = colord_notifier_output_destroy;
+	wl_signal_add(&o->destroy_signal, &ocms->destroy_listener);
+
+	/* add to local cache */
+	g_hash_table_insert (cms->devices, g_strdup(device_id), ocms);
+	g_signal_connect (ocms->device, "changed",
+			  G_CALLBACK (colord_device_changed_cb), ocms);
+
+	/* get profiles */
+	colord_update_output_from_device (ocms);
+out:
+	g_hash_table_unref (device_props);
+	if (device)
+		g_object_unref (device);
+	g_free (device_id);
+}
+
+static void
+colord_notifier_output_created(struct wl_listener *listener, void *data)
+{
+	struct weston_output *o = (struct weston_output *) data;
+	struct cms_colord *cms =
+		container_of(listener, struct cms_colord, destroy_listener);
+	weston_log("colord: output %s created\n", o->name);
+	colord_output_created(cms, o);
+}
+
+static gpointer
+colord_run_loop_thread(gpointer data)
+{
+	struct cms_colord *cms = (struct cms_colord *) data;
+	struct weston_output *o;
+
+	/* coldplug outputs */
+	wl_list_for_each(o, &cms->ec->output_list, link) {
+		weston_log("colord: output %s coldplugged\n", o->name);
+		colord_output_created(cms, o);
+	}
+
+	g_main_loop_run(cms->loop);
+	return NULL;
+}
+
+static int
+colord_dispatch_all_pending(int fd, uint32_t mask, void *data)
+{
+	gchar tmp;
+	GList *l;
+	ssize_t rc;
+	struct cms_colord *cms = data;
+	struct cms_output *ocms;
+
+	weston_log("colord: dispatching events\n");
+	g_mutex_lock(&cms->pending_mutex);
+	for (l = cms->pending; l != NULL; l = l->next) {
+		ocms = l->data;
+
+		/* optionally set backlight to calibration value */
+		if (ocms->o->set_backlight && ocms->backlight_value != 0) {
+			weston_log("colord: profile calibration backlight to %i/255\n",
+				   ocms->backlight_value);
+			ocms->o->set_backlight(ocms->o, ocms->backlight_value);
+		}
+
+		weston_cms_set_color_profile(ocms->o, ocms->p);
+	}
+	g_list_free (cms->pending);
+	cms->pending = NULL;
+	g_mutex_unlock(&cms->pending_mutex);
+
+	/* done */
+	rc = read(cms->readfd, &tmp, 1);
+	if (rc == 0)
+		weston_log("colord: failed to read from pending fd\n");
+	return 1;
+}
+
+static void
+colord_load_pnp_ids(struct cms_colord *cms)
+{
+	gboolean ret = FALSE;
+	gchar *tmp;
+	GError *error = NULL;
+	guint i;
+	const gchar *pnp_ids_fn[] = { "/usr/share/hwdata/pnp.ids",
+				      "/usr/share/misc/pnp.ids",
+				      NULL };
+
+	/* find and load file */
+	for (i = 0; pnp_ids_fn[i] != NULL; i++) {
+		if (!g_file_test(pnp_ids_fn[i], G_FILE_TEST_EXISTS))
+			continue;
+		ret = g_file_get_contents(pnp_ids_fn[i],
+					  &cms->pnp_ids_data,
+					  NULL,
+					  &error);
+		if (!ret) {
+			weston_log("colord: failed to load %s: %s\n",
+				   pnp_ids_fn[i], error->message);
+			g_error_free(error);
+			return;
+		}
+		break;
+	}
+	if (!ret) {
+		weston_log("colord: no pnp.ids found\n");
+		return;
+	}
+
+	/* parse fixed offsets into lines */
+	tmp = cms->pnp_ids_data;
+	for (i = 0; cms->pnp_ids_data[i] != '\0'; i++) {
+		if (cms->pnp_ids_data[i] != '\n')
+			continue;
+		cms->pnp_ids_data[i] = '\0';
+		if (tmp[0] && tmp[1] && tmp[2] && tmp[3] == '\t' && tmp[4]) {
+			tmp[3] = '\0';
+			g_hash_table_insert(cms->pnp_ids, tmp, tmp+4);
+			tmp = &cms->pnp_ids_data[i+1];
+		}
+	}
+}
+
+static void
+colord_module_destroy(struct cms_colord *cms)
+{
+	if (cms->loop) {
+		g_main_loop_quit(cms->loop);
+		g_main_loop_unref(cms->loop);
+	}
+	if (cms->thread)
+		g_thread_join(cms->thread);
+
+	/* cms->devices must be destroyed before other resources, as
+	 * the other resources are needed during output cleanup in
+	 * cms->devices unref.
+	 */
+	if (cms->devices)
+		g_hash_table_unref(cms->devices);
+	if (cms->client)
+		g_object_unref(cms->client);
+	if (cms->readfd)
+		close(cms->readfd);
+	if (cms->writefd)
+		close(cms->writefd);
+
+	g_free(cms->pnp_ids_data);
+	g_hash_table_unref(cms->pnp_ids);
+
+	free(cms);
+}
+
+static void
+colord_notifier_destroy(struct wl_listener *listener, void *data)
+{
+	struct cms_colord *cms =
+		container_of(listener, struct cms_colord, destroy_listener);
+	colord_module_destroy(cms);
+}
+
+static void
+colord_cms_output_destroy(gpointer data)
+{
+	struct cms_output *ocms = (struct cms_output *) data;
+	struct cms_colord *cms = ocms->cms;
+	struct weston_output *o = ocms->o;
+	gboolean ret;
+	gchar *device_id;
+	GError *error = NULL;
+
+	colord_idle_cancel_for_output(cms, o);
+	device_id = get_output_id(cms, o);
+	weston_log("colord: output unplugged %s\n", device_id);
+
+	wl_list_remove(&ocms->destroy_listener.link);
+	g_signal_handlers_disconnect_by_data(ocms->device, ocms);
+
+	ret = cd_client_delete_device_sync (cms->client,
+					    ocms->device,
+					    NULL,
+					    &error);
+
+	if (!ret) {
+		weston_log("colord: failed to delete device: %s\n",
+			   error->message);
+		g_error_free(error);
+	}
+
+	g_object_unref(ocms->device);
+	g_slice_free(struct cms_output, ocms);
+	g_free (device_id);
+}
+
+WL_EXPORT int
+module_init(struct weston_compositor *ec,
+	    int *argc, char *argv[])
+{
+	gboolean ret;
+	GError *error = NULL;
+	int fd[2];
+	struct cms_colord *cms;
+	struct wl_event_loop *loop;
+
+	weston_log("colord: initialized\n");
+
+	/* create local state object */
+	cms = zalloc(sizeof *cms);
+	if (cms == NULL)
+		return -1;
+	cms->ec = ec;
+#if !GLIB_CHECK_VERSION(2,36,0)
+	g_type_init();
+#endif
+	cms->client = cd_client_new();
+	ret = cd_client_connect_sync(cms->client, NULL, &error);
+	if (!ret) {
+		weston_log("colord: failed to contact daemon: %s\n", error->message);
+		g_error_free(error);
+		colord_module_destroy(cms);
+		return -1;
+	}
+	g_mutex_init(&cms->pending_mutex);
+	cms->devices = g_hash_table_new_full(g_str_hash, g_str_equal,
+					     g_free, colord_cms_output_destroy);
+
+	/* destroy */
+	cms->destroy_listener.notify = colord_notifier_destroy;
+	wl_signal_add(&ec->destroy_signal, &cms->destroy_listener);
+
+	/* devices added */
+	cms->output_created_listener.notify = colord_notifier_output_created;
+	wl_signal_add(&ec->output_created_signal, &cms->output_created_listener);
+
+	/* add all the PNP IDs */
+	cms->pnp_ids = g_hash_table_new_full(g_str_hash,
+					     g_str_equal,
+					     NULL,
+					     NULL);
+	colord_load_pnp_ids(cms);
+
+	/* setup a thread for the GLib callbacks */
+	cms->loop = g_main_loop_new(NULL, FALSE);
+	cms->thread = g_thread_new("colord CMS main loop",
+				   colord_run_loop_thread, cms);
+
+	/* batch device<->profile updates */
+	if (pipe2(fd, O_CLOEXEC) == -1) {
+		colord_module_destroy(cms);
+		return -1;
+	}
+	cms->readfd = fd[0];
+	cms->writefd = fd[1];
+	loop = wl_display_get_event_loop(ec->wl_display);
+	cms->source = wl_event_loop_add_fd (loop,
+					    cms->readfd,
+					    WL_EVENT_READABLE,
+					    colord_dispatch_all_pending,
+					    cms);
+	if (!cms->source) {
+		colord_module_destroy(cms);
+		return -1;
+	}
+	return 0;
+}

compositor/cms-helper.c

@@ -0,0 +1,135 @@
+/*
+ * Copyright © 2013 Richard Hughes
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sublicense, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the
+ * next paragraph) shall be included in all copies or substantial
+ * portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT.  IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+ * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+ * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+#include "config.h"
+
+#include <stdlib.h>
+#include <string.h>
+#include <stdio.h>
+
+#ifdef HAVE_LCMS
+#include <lcms2.h>
+#endif
+
+#include "compositor.h"
+#include "cms-helper.h"
+
+#ifdef HAVE_LCMS
+static void
+weston_cms_gamma_clear(struct weston_output *o)
+{
+	int i;
+	uint16_t *red;
+
+	if (!o->set_gamma)
+		return;
+
+	red = calloc(o->gamma_size, sizeof(uint16_t));
+	for (i = 0; i < o->gamma_size; i++)
+		red[i] = (uint32_t) 0xffff * (uint32_t) i / (uint32_t) (o->gamma_size - 1);
+	o->set_gamma(o, o->gamma_size, red, red, red);
+	free(red);
+}
+#endif
+
+void
+weston_cms_set_color_profile(struct weston_output *o,
+			     struct weston_color_profile *p)
+{
+#ifdef HAVE_LCMS
+	cmsFloat32Number in;
+	const cmsToneCurve **vcgt;
+	int i;
+	int size;
+	uint16_t *red = NULL;
+	uint16_t *green = NULL;
+	uint16_t *blue = NULL;
+
+	if (!o->set_gamma)
+		return;
+	if (!p) {
+		weston_cms_gamma_clear(o);
+		return;
+	}
+
+	weston_log("Using ICC profile %s\n", p->filename);
+	vcgt = cmsReadTag (p->lcms_handle, cmsSigVcgtTag);
+	if (vcgt == NULL || vcgt[0] == NULL) {
+		weston_cms_gamma_clear(o);
+		return;
+	}
+
+	size = o->gamma_size;
+	red = calloc(size, sizeof(uint16_t));
+	green = calloc(size, sizeof(uint16_t));
+	blue = calloc(size, sizeof(uint16_t));
+	for (i = 0; i < size; i++) {
+		in = (cmsFloat32Number) i / (cmsFloat32Number) (size - 1);
+		red[i] = cmsEvalToneCurveFloat(vcgt[0], in) * (double) 0xffff;
+		green[i] = cmsEvalToneCurveFloat(vcgt[1], in) * (double) 0xffff;
+		blue[i] = cmsEvalToneCurveFloat(vcgt[2], in) * (double) 0xffff;
+	}
+	o->set_gamma(o, size, red, green, blue);
+	free(red);
+	free(green);
+	free(blue);
+#endif
+}
+
+void
+weston_cms_destroy_profile(struct weston_color_profile *p)
+{
+	if (!p)
+		return;
+#ifdef HAVE_LCMS
+	cmsCloseProfile(p->lcms_handle);
+#endif
+	free(p->filename);
+	free(p);
+}
+
+struct weston_color_profile *
+weston_cms_create_profile(const char *filename,
+			  void *lcms_profile)
+{
+	struct weston_color_profile *p;
+	p = zalloc(sizeof(struct weston_color_profile));
+	p->filename = strdup(filename);
+	p->lcms_handle = lcms_profile;
+	return p;
+}
+
+struct weston_color_profile *
+weston_cms_load_profile(const char *filename)
+{
+	struct weston_color_profile *p = NULL;
+#ifdef HAVE_LCMS
+	cmsHPROFILE lcms_profile;
+	lcms_profile = cmsOpenProfileFromFile(filename, "r");
+	if (lcms_profile)
+		p = weston_cms_create_profile(filename, lcms_profile);
+#endif
+	return p;
+}

compositor/cms-helper.h

@@ -0,0 +1,75 @@
+/*
+ * Copyright © 2013 Richard Hughes
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sublicense, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the
+ * next paragraph) shall be included in all copies or substantial
+ * portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT.  IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+ * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+ * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+#ifndef _WESTON_CMS_H_
+#define _WESTON_CMS_H_
+
+#include "config.h"
+
+#include "compositor.h"
+
+/* General overview on how to be a CMS plugin:
+ *
+ * First, some nomenclature:
+ *
+ *  CMF:       Color management framework, i.e. "Use foo.icc for device $bar"
+ *  CMM:       Color management module that converts pixel colors, which is
+ *             usually lcms2 on any modern OS.
+ *  CMS:       Color management system that encompasses both a CMF and CMM.
+ *  ICC:       International Color Consortium, the people that define the
+ *             binary encoding of a .icc file.
+ *  VCGT:      Video Card Gamma Tag. An Apple extension to the ICC specification
+ *             that allows the calibration state to be stored in the ICC profile
+ *  Output:    Physical port with a display attached, e.g. LVDS1
+ *
+ * As a CMF is probably something you don't want or need on an embedded install
+ * these functions will not be called if the icc_profile key is set for a
+ * specific [output] section in weston.ini
+ *
+ * Most desktop environments want the CMF to decide what profile to use in
+ * different situations, so that displays can be profiled and also so that
+ * the ICC profiles can be changed at runtime depending on the task or ambient
+ * environment.
+ *
+ * The CMF can be selected using the 'modules' key in the [core] section.
+ */
+
+struct weston_color_profile {
+	char	*filename;
+	void	*lcms_handle;
+};
+
+void
+weston_cms_set_color_profile(struct weston_output *o,
+			     struct weston_color_profile *p);
+struct weston_color_profile *
+weston_cms_create_profile(const char *filename,
+			  void *lcms_profile);
+struct weston_color_profile *
+weston_cms_load_profile(const char *filename);
+void
+weston_cms_destroy_profile(struct weston_color_profile *p);
+
+#endif

compositor/cms-static.c

@@ -0,0 +1,119 @@
+/*
+ * Copyright © 2013 Richard Hughes
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sublicense, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the
+ * next paragraph) shall be included in all copies or substantial
+ * portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT.  IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+ * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+ * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+#include "config.h"
+
+#include <stdlib.h>
+#include <string.h>
+
+#include "compositor.h"
+#include "cms-helper.h"
+#include "shared/helpers.h"
+#include "weston.h"
+
+struct cms_static {
+	struct weston_compositor	*ec;
+	struct wl_listener		 destroy_listener;
+	struct wl_listener		 output_created_listener;
+};
+
+static void
+cms_output_created(struct cms_static *cms, struct weston_output *o)
+{
+	struct weston_color_profile *p;
+	struct weston_config_section *s;
+	char *profile;
+
+	weston_log("cms-static: output %i [%s] created\n", o->id, o->name);
+
+	if (o->name == NULL)
+		return;
+	s = weston_config_get_section(wet_get_config(cms->ec),
+				      "output", "name", o->name);
+	if (s == NULL)
+		return;
+	if (weston_config_section_get_string(s, "icc_profile", &profile, NULL) < 0)
+		return;
+	p = weston_cms_load_profile(profile);
+	if (p == NULL && strlen(profile) > 0) {
+		weston_log("cms-static: failed to load %s\n", profile);
+	} else {
+		weston_log("cms-static: loading %s for %s\n",
+			   (p != NULL) ? profile : "identity LUT",
+			   o->name);
+		weston_cms_set_color_profile(o, p);
+	}
+}
+
+static void
+cms_notifier_output_created(struct wl_listener *listener, void *data)
+{
+	struct weston_output *o = (struct weston_output *) data;
+	struct cms_static *cms =
+		container_of(listener, struct cms_static, output_created_listener);
+	cms_output_created(cms, o);
+}
+
+static void
+cms_module_destroy(struct cms_static *cms)
+{
+	free(cms);
+}
+
+static void
+cms_notifier_destroy(struct wl_listener *listener, void *data)
+{
+	struct cms_static *cms = container_of(listener, struct cms_static, destroy_listener);
+	cms_module_destroy(cms);
+}
+
+
+WL_EXPORT int
+module_init(struct weston_compositor *ec,
+	    int *argc, char *argv[])
+{
+	struct cms_static *cms;
+	struct weston_output *output;
+
+	weston_log("cms-static: initialized\n");
+
+	/* create local state object */
+	cms = zalloc(sizeof *cms);
+	if (cms == NULL)
+		return -1;
+
+	cms->ec = ec;
+	cms->destroy_listener.notify = cms_notifier_destroy;
+	wl_signal_add(&ec->destroy_signal, &cms->destroy_listener);
+
+	cms->output_created_listener.notify = cms_notifier_output_created;
+	wl_signal_add(&ec->output_created_signal, &cms->output_created_listener);
+
+	/* discover outputs */
+	wl_list_for_each(output, &ec->output_list, link)
+		cms_output_created(cms, output);
+
+	return 0;
+}

compositor/systemd-notify.c

@@ -0,0 +1,168 @@
+/*
+ * Copyright (c) 2015 General Electric Company. All rights reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sublicense, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the
+ * next paragraph) shall be included in all copies or substantial
+ * portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT.  IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+ * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+ * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+#include "config.h"
+
+#include <errno.h>
+#include <stdlib.h>
+#include <systemd/sd-daemon.h>
+#include <sys/socket.h>
+#include <wayland-server.h>
+#include "shared/helpers.h"
+#include "shared/zalloc.h"
+#include "compositor.h"
+
+struct systemd_notifier {
+	int watchdog_time;
+	struct wl_event_source *watchdog_source;
+	struct wl_listener compositor_destroy_listener;
+};
+
+static int
+add_systemd_sockets(struct weston_compositor *compositor)
+{
+	int fd;
+	int cnt_systemd_sockets;
+	int current_fd = 0;
+
+	cnt_systemd_sockets = sd_listen_fds(1);
+
+	if (cnt_systemd_sockets < 0) {
+		weston_log("sd_listen_fds failed with: %d\n",
+				cnt_systemd_sockets);
+		return -1;
+	}
+
+	/* socket-based activation not used, return silently */
+	if (cnt_systemd_sockets == 0)
+		return 0;
+
+	while (current_fd < cnt_systemd_sockets) {
+		fd = SD_LISTEN_FDS_START + current_fd;
+
+		if (sd_is_socket(fd, AF_UNIX, SOCK_STREAM,1) <= 0) {
+			weston_log("invalid socket provided from systemd\n");
+			return -1;
+		}
+
+		if (wl_display_add_socket_fd(compositor->wl_display, fd)) {
+			weston_log("wl_display_add_socket_fd failed"
+					"for systemd provided socket\n");
+			return -1;
+		}
+		current_fd++;
+	}
+
+	weston_log("info: add %d socket(s) provided by systemd\n",
+			current_fd);
+
+	return current_fd;
+}
+
+static int
+watchdog_handler(void *data)
+{
+	struct systemd_notifier *notifier = data;
+
+	wl_event_source_timer_update(notifier->watchdog_source,
+				     notifier->watchdog_time);
+
+	sd_notify(0, "WATCHDOG=1");
+
+	return 1;
+}
+
+static void
+weston_compositor_destroy_listener(struct wl_listener *listener, void *data)
+{
+	struct systemd_notifier *notifier;
+
+	sd_notify(0, "STOPPING=1");
+
+	notifier = container_of(listener,
+				struct systemd_notifier,
+				compositor_destroy_listener);
+
+	if (notifier->watchdog_source)
+		wl_event_source_remove(notifier->watchdog_source);
+
+	wl_list_remove(&notifier->compositor_destroy_listener.link);
+	free(notifier);
+}
+
+WL_EXPORT int
+module_init(struct weston_compositor *compositor,
+	    int *argc, char *argv[])
+{
+	char *tail;
+	char *watchdog_time_env;
+	struct wl_event_loop *loop;
+	long watchdog_time_conv;
+	struct systemd_notifier *notifier;
+
+	notifier = zalloc(sizeof *notifier);
+	if (notifier == NULL)
+		return -1;
+
+	notifier->compositor_destroy_listener.notify =
+		weston_compositor_destroy_listener;
+	wl_signal_add(&compositor->destroy_signal,
+		      &notifier->compositor_destroy_listener);
+
+	if (add_systemd_sockets(compositor) < 0)
+		return -1;
+
+	sd_notify(0, "READY=1");
+
+	/* 'WATCHDOG_USEC' is environment variable that is set
+	 * by systemd to transfer 'WatchdogSec' watchdog timeout
+	 * setting from service file.*/
+	watchdog_time_env = getenv("WATCHDOG_USEC");
+
+	if (!watchdog_time_env)
+		return 0;
+
+	errno = 0;
+	watchdog_time_conv = strtol(watchdog_time_env, &tail, 0);
+	if ((errno != 0) || (*tail != '\0'))
+		return 0;
+
+	/* Convert 'WATCHDOG_USEC' to milliseconds and notify
+	 * systemd every half of that time.*/
+	watchdog_time_conv /= 1000 * 2;
+	if (watchdog_time_conv <= 0)
+		return 0;
+
+	notifier->watchdog_time = watchdog_time_conv;
+
+	loop = wl_display_get_event_loop(compositor->wl_display);
+	notifier->watchdog_source =
+		wl_event_loop_add_timer(loop, watchdog_handler, notifier);
+	wl_event_source_timer_update(notifier->watchdog_source,
+				     notifier->watchdog_time);
+
+	return 0;
+}
+

compositor/weston-screenshooter.c

@@ -0,0 +1,191 @@
+/*
+ * Copyright © 2008-2011 Kristian Høgsberg
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sublicense, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the
+ * next paragraph) shall be included in all copies or substantial
+ * portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT.  IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+ * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+ * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+#include "config.h"
+
+#include <linux/input.h>
+
+#include "compositor.h"
+#include "weston.h"
+#include "weston-screenshooter-server-protocol.h"
+#include "shared/helpers.h"
+
+struct screenshooter {
+	struct weston_compositor *ec;
+	struct wl_global *global;
+	struct wl_client *client;
+	struct weston_process process;
+	struct wl_listener destroy_listener;
+	struct weston_recorder *recorder;
+};
+
+static void
+screenshooter_done(void *data, enum weston_screenshooter_outcome outcome)
+{
+	struct wl_resource *resource = data;
+
+	switch (outcome) {
+	case WESTON_SCREENSHOOTER_SUCCESS:
+		weston_screenshooter_send_done(resource);
+		break;
+	case WESTON_SCREENSHOOTER_NO_MEMORY:
+		wl_resource_post_no_memory(resource);
+		break;
+	default:
+		break;
+	}
+}
+
+static void
+screenshooter_shoot(struct wl_client *client,
+		    struct wl_resource *resource,
+		    struct wl_resource *output_resource,
+		    struct wl_resource *buffer_resource)
+{
+	struct weston_output *output =
+		wl_resource_get_user_data(output_resource);
+	struct weston_buffer *buffer =
+		weston_buffer_from_resource(buffer_resource);
+
+	if (buffer == NULL) {
+		wl_resource_post_no_memory(resource);
+		return;
+	}
+
+	weston_screenshooter_shoot(output, buffer, screenshooter_done, resource);
+}
+
+struct weston_screenshooter_interface screenshooter_implementation = {
+	screenshooter_shoot
+};
+
+static void
+bind_shooter(struct wl_client *client,
+	     void *data, uint32_t version, uint32_t id)
+{
+	struct screenshooter *shooter = data;
+	struct wl_resource *resource;
+
+	resource = wl_resource_create(client,
+				      &weston_screenshooter_interface, 1, id);
+
+	if (client != shooter->client) {
+		wl_resource_post_error(resource, WL_DISPLAY_ERROR_INVALID_OBJECT,
+				       "screenshooter failed: permission denied");
+		return;
+	}
+
+	wl_resource_set_implementation(resource, &screenshooter_implementation,
+				       data, NULL);
+}
+
+static void
+screenshooter_sigchld(struct weston_process *process, int status)
+{
+	struct screenshooter *shooter =
+		container_of(process, struct screenshooter, process);
+
+	shooter->client = NULL;
+}
+
+static void
+screenshooter_binding(struct weston_keyboard *keyboard, uint32_t time,
+		      uint32_t key, void *data)
+{
+	struct screenshooter *shooter = data;
+	char *screenshooter_exe;
+	int ret;
+
+	ret = asprintf(&screenshooter_exe, "%s/%s",
+		       weston_config_get_libexec_dir(),
+		       "/weston-screenshooter");
+	if (ret < 0) {
+		weston_log("Could not construct screenshooter path.\n");
+		return;
+	}
+
+	if (!shooter->client)
+		shooter->client = weston_client_launch(shooter->ec,
+					&shooter->process,
+					screenshooter_exe, screenshooter_sigchld);
+	free(screenshooter_exe);
+}
+
+static void
+recorder_binding(struct weston_keyboard *keyboard, uint32_t time,
+		 uint32_t key, void *data)
+{
+	struct weston_compositor *ec = keyboard->seat->compositor;
+	struct weston_output *output;
+	struct screenshooter *shooter = data;
+	struct weston_recorder *recorder = shooter->recorder;;
+	static const char filename[] = "capture.wcap";
+
+	if (recorder) {
+		weston_recorder_stop(recorder);
+		shooter->recorder = NULL;
+	} else {
+		if (keyboard->focus && keyboard->focus->output)
+			output = keyboard->focus->output;
+		else
+			output = container_of(ec->output_list.next,
+					      struct weston_output, link);
+
+		shooter->recorder = weston_recorder_start(output, filename);
+	}
+}
+
+static void
+screenshooter_destroy(struct wl_listener *listener, void *data)
+{
+	struct screenshooter *shooter =
+		container_of(listener, struct screenshooter, destroy_listener);
+
+	wl_global_destroy(shooter->global);
+	free(shooter);
+}
+
+WL_EXPORT void
+screenshooter_create(struct weston_compositor *ec)
+{
+	struct screenshooter *shooter;
+
+	shooter = zalloc(sizeof *shooter);
+	if (shooter == NULL)
+		return;
+
+	shooter->ec = ec;
+
+	shooter->global = wl_global_create(ec->wl_display,
+					   &weston_screenshooter_interface, 1,
+					   shooter, bind_shooter);
+	weston_compositor_add_key_binding(ec, KEY_S, MODIFIER_SUPER,
+					  screenshooter_binding, shooter);
+	weston_compositor_add_key_binding(ec, KEY_R, MODIFIER_SUPER,
+					  recorder_binding, shooter);
+
+	shooter->destroy_listener.notify = screenshooter_destroy;
+	wl_signal_add(&ec->destroy_signal, &shooter->destroy_listener);
+}

compositor/weston.desktop

@@ -0,0 +1,5 @@
+[Desktop Entry]
+Name=Weston
+Comment=The reference Wayland server
+Exec=dbus-launch --exit-with-session weston
+Type=Application

compositor/weston.h

@@ -0,0 +1,70 @@
+/*
+ * Copyright © 2016 Giulio Camuffo
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sublicense, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the
+ * next paragraph) shall be included in all copies or substantial
+ * portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT.  IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+ * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+ * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+#ifndef WESTON_H
+#define WESTON_H
+
+#ifdef  __cplusplus
+extern "C" {
+#endif
+
+#include <compositor.h>
+
+void
+screenshooter_create(struct weston_compositor *ec);
+
+struct weston_process;
+typedef void (*weston_process_cleanup_func_t)(struct weston_process *process,
+					    int status);
+
+struct weston_process {
+	pid_t pid;
+	weston_process_cleanup_func_t cleanup;
+	struct wl_list link;
+};
+
+struct wl_client *
+weston_client_launch(struct weston_compositor *compositor,
+		     struct weston_process *proc,
+		     const char *path,
+		     weston_process_cleanup_func_t cleanup);
+
+struct wl_client *
+weston_client_start(struct weston_compositor *compositor, const char *path);
+
+void
+weston_watch_process(struct weston_process *process);
+
+struct weston_config *
+wet_get_config(struct weston_compositor *compositor);
+
+void *
+wet_load_module(const char *name, const char *entrypoint);
+
+#ifdef  __cplusplus
+}
+#endif
+
+#endif

compositor/weston.pc.in

@@ -0,0 +1,12 @@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@
+libexecdir=@libexecdir@
+pkglibexecdir=${libexecdir}/@PACKAGE@
+
+Name: Weston Plugin API
+Description: Header files for Weston plugin development
+Version: @WESTON_VERSION@
+Requires.private: libweston-@LIBWESTON_ABI_VERSION@
+Cflags: -I${includedir}/weston