From patchwork Tue Oct 25 18:09:45 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Daniel_D=C3=ADaz?= X-Patchwork-Id: 79260 Delivered-To: patch@linaro.org Received: by 10.140.97.247 with SMTP id m110csp3255533qge; Tue, 25 Oct 2016 11:13:58 -0700 (PDT) X-Received: by 10.98.75.152 with SMTP id d24mr41314994pfj.97.1477419238329; Tue, 25 Oct 2016 11:13:58 -0700 (PDT) Return-Path: Received: from mail.openembedded.org (mail.openembedded.org. [140.211.169.62]) by mx.google.com with ESMTP id n67si21937690pga.91.2016.10.25.11.13.58; Tue, 25 Oct 2016 11:13:58 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) client-ip=140.211.169.62; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org; spf=pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-core-bounces@lists.openembedded.org; dmarc=fail (p=NONE dis=NONE) header.from=linaro.org Received: from review.yoctoproject.org (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id 316DD6074F; Tue, 25 Oct 2016 18:13:48 +0000 (UTC) X-Original-To: openembedded-core@lists.openembedded.org Delivered-To: openembedded-core@lists.openembedded.org Received: from mail-oi0-f53.google.com (mail-oi0-f53.google.com [209.85.218.53]) by mail.openembedded.org (Postfix) with ESMTP id 900966093B for ; Tue, 25 Oct 2016 18:10:14 +0000 (UTC) Received: by mail-oi0-f53.google.com with SMTP id t73so111443131oie.1 for ; Tue, 25 Oct 2016 11:10:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=ILGwzVxfbgC7bgciBFjV9Mgw8+nBaX0m4VV18SYfd9o=; b=M/kTi4L3tqXutHIl+24rI7q1Hrh7Si7ZIiqB+Tp8WDMR5cixdbZafWKeCYz6kYB5df fTnazDxHb3GEdsQ1jJu8CVWBr/jFRlVA25+1QaPa7LeXBorTHcwqomMJ27s+ZMN+atfI fP917gU813hRlsYySKBfchf/8zIaptHQghBi0= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=ILGwzVxfbgC7bgciBFjV9Mgw8+nBaX0m4VV18SYfd9o=; b=Kpj3/iAhH1fdZhRNDneRj40IEeRcFZShqY4tF4pJcDsNYBws+60jbN9B/0XuVWOSEF rT1u/XdRU34V8FZBJEFKATGI+Fb5O//xwZiN19ITgtBr3/eK1tQdSloM9MwoIKIRddkl gwdSpqKHUosE8J+hE6fNjRBLwn8yxWViCfbG3HuGMgs/R1Ulz0oEUCVWFIU5h91PKN98 dx95ISqFAgwaM/In9wfQMn2PaLYR6Xzwh6Gs2FlfGdd3oV7PK+N8m8LU5faZKi9iYv5/ 5U1kKD8pkiPU5MvNjSEB7UU+TX1FHNO6fyJWQFOh4xhZlfscdXZiQLjikkQ0th2LsLCj 3RaA== X-Gm-Message-State: ABUngvdYuFNb7ayVJ0gEE3ISowGfF7XR6Rk8D6ZoXYFL/lMzdxrOR80FxUt7uFdwZC7D1yZU X-Received: by 10.157.51.26 with SMTP id f26mr5734222otc.28.1477419015495; Tue, 25 Oct 2016 11:10:15 -0700 (PDT) Received: from aura.cortijodelrio.net (CableLink64-18.telefonia.InterCable.net. [201.172.64.18]) by smtp.googlemail.com with ESMTPSA id n8sm7231507oib.19.2016.10.25.11.10.13 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 25 Oct 2016 11:10:14 -0700 (PDT) From: =?UTF-8?q?Daniel=20D=C3=ADaz?= To: openembedded-core@lists.openembedded.org Date: Tue, 25 Oct 2016 13:09:45 -0500 Message-Id: <1477418985-28961-1-git-send-email-daniel.diaz@linaro.org> X-Mailer: git-send-email 1.9.1 MIME-Version: 1.0 Subject: [OE-core] [PATCH][krogoth] weston: Add no-input-device patch to 1.9.0. X-BeenThere: openembedded-core@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Patches and discussions about the oe-core layer List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: openembedded-core-bounces@lists.openembedded.org Errors-To: openembedded-core-bounces@lists.openembedded.org The included patch, backported from Weston master, allows it to run without any input device at launch. An ini option is introduced for this purpose, so there is no behavioral change. Related change in weston.ini: [core] require-input=true Default is true; setting it false allows Weston to run without a keyboard or mouse, which is handy for automated environments. Signed-off-by: Daniel Díaz --- .../add-config-option-for-no-input-device.patch | 125 +++++++++++++++++++++ meta/recipes-graphics/wayland/weston_1.9.0.bb | 1 + 2 files changed, 126 insertions(+) create mode 100644 meta/recipes-graphics/wayland/weston/add-config-option-for-no-input-device.patch diff --git a/meta/recipes-graphics/wayland/weston/add-config-option-for-no-input-device.patch b/meta/recipes-graphics/wayland/weston/add-config-option-for-no-input-device.patch new file mode 100644 index 0000000..93376ef --- /dev/null +++ b/meta/recipes-graphics/wayland/weston/add-config-option-for-no-input-device.patch @@ -0,0 +1,125 @@ +From 6c89292024cc08d4499916dc153c354175bd81c4 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Daniel=20D=C3=ADaz?= +Date: Fri, 21 Oct 2016 14:03:13 -0500 +Subject: [PATCH] Add configuration option for no input device. +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +[Backported from master, 75b7197.) + +As it has been discussed in the past [1], running Weston +without any input device at launch might be beneficial for +some use cases. + +Certainly, it's best for the vast majority of users (and +the project) to require an input device to be present, as +to avoid frustration and hassle, but for those brave souls +that so prefer, this patch lets them run without any input +device at all. + +This introduces a simple configuration in weston.ini: + [core] + require-input=true + +True is the default, so no behavioral change is introduced. + +[1] https://lists.freedesktop.org/archives/wayland-devel/2015-November/025193.html + +Signed-off-by: Daniel Díaz +Reviewed-by: Peter Hutterer +Reviewed-by: Daniel Stone +--- + man/weston.ini.man | 5 +++++ + src/compositor.h | 4 ++++ + src/libinput-seat.c | 6 ++++++ + src/main.c | 5 +++++ + weston.ini.in | 1 + + 5 files changed, 21 insertions(+) + +diff --git a/man/weston.ini.man b/man/weston.ini.man +index a9b6026..668b16f 100644 +--- a/man/weston.ini.man ++++ b/man/weston.ini.man +@@ -169,6 +169,11 @@ time, the one specified in the command-line will be used. On the other + hand, if none of these sets the value, default idle timeout will be + set to 300 seconds. + .RS ++.PP ++.RE ++.TP 7 ++.BI "require-input=" true ++require an input device for launch + + .SH "LIBINPUT SECTION" + The +diff --git a/src/compositor.h b/src/compositor.h +index c4c81f0..292a412 100644 +--- a/src/compositor.h ++++ b/src/compositor.h +@@ -701,6 +701,10 @@ struct weston_compositor { + + void *user_data; + void (*exit)(struct weston_compositor *c); ++ ++ /* Whether to let the compositor run without any input device. */ ++ bool require_input; ++ + }; + + struct weston_buffer { +diff --git a/src/libinput-seat.c b/src/libinput-seat.c +index c9f9ed2..1c4c358 100644 +--- a/src/libinput-seat.c ++++ b/src/libinput-seat.c +@@ -250,6 +250,12 @@ udev_input_enable(struct udev_input *input) + devices_found = 1; + } + ++ if (devices_found == 0 && !c->require_input) { ++ weston_log("warning: no input devices found, but none required " ++ "as per configuration.\n"); ++ return 0; ++ } ++ + if (devices_found == 0) { + weston_log( + "warning: no input devices on entering Weston. " +diff --git a/src/main.c b/src/main.c +index a98570e..b8632e9 100644 +--- a/src/main.c ++++ b/src/main.c +@@ -658,6 +658,7 @@ int main(int argc, char *argv[]) + struct wl_client *primary_client; + struct wl_listener primary_client_destroyed; + struct weston_seat *seat; ++ int require_input; + + const struct weston_option core_options[] = { + { WESTON_OPTION_STRING, "backend", 'B', &backend }, +@@ -737,6 +738,10 @@ int main(int argc, char *argv[]) + if (weston_compositor_init_config(ec, config) < 0) + goto out_signals; + ++ weston_config_section_get_bool(section, "require-input", ++ &require_input, true); ++ ec->require_input = require_input; ++ + if (backend_init(ec, &argc, argv, config) < 0) { + weston_log("fatal: failed to create compositor backend\n"); + goto out_signals; +diff --git a/weston.ini.in b/weston.ini.in +index 06b51df..e9ef992 100644 +--- a/weston.ini.in ++++ b/weston.ini.in +@@ -2,6 +2,7 @@ + #modules=xwayland.so,cms-colord.so + #shell=desktop-shell.so + #gbm-format=xrgb2101010 ++#require-input=true + + [shell] + background-image=/usr/share/backgrounds/gnome/Aqua.jpg +-- +1.9.1 + diff --git a/meta/recipes-graphics/wayland/weston_1.9.0.bb b/meta/recipes-graphics/wayland/weston_1.9.0.bb index 16a788d..8a619b5 100644 --- a/meta/recipes-graphics/wayland/weston_1.9.0.bb +++ b/meta/recipes-graphics/wayland/weston_1.9.0.bb @@ -13,6 +13,7 @@ SRC_URI = "http://wayland.freedesktop.org/releases/${BPN}-${PV}.tar.xz \ file://0001-make-error-portable.patch \ file://libsystemd.patch \ file://explicit-enable-disable-systemd.patch \ + file://add-config-option-for-no-input-device.patch \ " SRC_URI[md5sum] = "66bbba12f546570b4d97f676bc79a28e" SRC_URI[sha256sum] = "9c1b03f3184fa0b0dfdf67e215048085156e1a2ca344af6613fed36794ac48cf"