gjdwebserver/gjdwebserver-overlay
4
0
Fork 0
Code Pull Requests Releases Activity

Removed patches

Browse Source
This commit is contained in:
Gerben Jan Dijkman
2022-01-26 02:30:31 +01:00
parent 6209908e15
commit 7bac544198
5 changed files with 0 additions and 207 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
x11-wm/phoc/files/0001-seat-Don-t-notify-on-key-release.patch
View File

@@ -1,28 +0,0 @@
From 63d8f9ceb0d2336db4276e717aabe427153b76bb Mon Sep 17 00:00:00 2001
From: Arnaud Ferraris <arnaud.ferraris@gmail.com>
Date: Sat, 6 Jun 2020 02:24:37 +0200
Subject: [PATCH 1/2] seat: Don't notify on key release
---
src/seat.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/src/seat.c b/src/seat.c
index b04fed1..679a3f5 100644
--- a/src/seat.c
+++ b/src/seat.c
@@ -42,9 +42,9 @@ handle_keyboard_key (struct wl_listener
wl_container_of (listener, keyboard, keyboard_key);
PhocDesktop *desktop = server->desktop;
- wlr_idle_notify_activity (desktop->idle, keyboard->seat->seat);
struct wlr_event_keyboard_key *event = data;
-
+ if (event->state == WLR_KEY_PRESSED)
+ wlr_idle_notify_activity(desktop->idle, keyboard->seat->seat);
phoc_keyboard_handle_key (keyboard, event);
}
--
2.26.2

112
x11-wm/phoc/files/0002-seat-inhibit-touch-events-when-in-power-save-mode-or.patch
View File

@@ -1,112 +0,0 @@
From c6aeee2009a2ee4647fd74da0fc3bd87f61a70fd Mon Sep 17 00:00:00 2001
From: Arnaud Ferraris <arnaud.ferraris@gmail.com>
Date: Sat, 6 Jun 2020 02:52:10 +0200
Subject: [PATCH 2/2] seat: inhibit touch events when in power save mode or
blank display
---
src/desktop.c | 2 ++
src/output.c | 3 +++
src/seat.c | 6 ++++++
src/server.c | 1 +
src/server.h | 1 +
5 files changed, 13 insertions(+)
diff --git a/src/desktop.c b/src/desktop.c
index 8fbb98e..40b2492 100644
--- a/src/desktop.c
+++ b/src/desktop.c
@@ -703,6 +703,7 @@ phoc_desktop_new (struct roots_config *c
void
phoc_desktop_toggle_output_blank (PhocDesktop *self)
{
+ PhocServer *server = phoc_server_get_default ();
PhocOutput *output;
wl_list_for_each(output, &self->outputs, link) {
@@ -710,6 +711,7 @@ phoc_desktop_toggle_output_blank (PhocDe
wlr_output_enable (output->wlr_output, enable);
wlr_output_commit (output->wlr_output);
+ server->active = enable;
if (enable)
phoc_output_damage_whole(output);
}
diff --git a/src/output.c b/src/output.c
index c03889f..045cbc0 100644
--- a/src/output.c
+++ b/src/output.c
@@ -928,6 +928,7 @@ handle_output_manager_test (struct wl_li
void
phoc_output_handle_output_power_manager_set_mode (struct wl_listener *listener, void *data)
{
+ PhocServer *server = phoc_server_get_default ();
struct wlr_output_power_v1_set_mode_event *event = data;
PhocOutput *self;
bool enable = true;
@@ -951,6 +952,8 @@ phoc_output_handle_output_power_manager_
if (enable == self->wlr_output->enabled)
return;
+ server->active = enable;
+
wlr_output_enable (self->wlr_output, enable);
if (!wlr_output_commit (self->wlr_output)) {
g_warning ("Failed to commit power mode change to %d for %p", enable, self);
diff --git a/src/seat.c b/src/seat.c
index 679a3f5..2a4c007 100644
--- a/src/seat.c
+++ b/src/seat.c
@@ -178,6 +178,8 @@ static void handle_touch_down(struct wl_listener *listener, void *data) {
struct roots_cursor *cursor =
wl_container_of(listener, cursor, touch_down);
PhocDesktop *desktop = server->desktop;
+ if (!server->active)
+ return;
wlr_idle_notify_activity(desktop->idle, cursor->seat->seat);
struct wlr_event_touch_down *event = data;
roots_cursor_handle_touch_down(cursor, event);
@@ -188,6 +190,8 @@ static void handle_touch_up(struct wl_listener *listener, void *data) {
struct roots_cursor *cursor =
wl_container_of(listener, cursor, touch_up);
PhocDesktop *desktop = server->desktop;
+ if (!server->active)
+ return;
wlr_idle_notify_activity(desktop->idle, cursor->seat->seat);
struct wlr_event_touch_up *event = data;
roots_cursor_handle_touch_up(cursor, event);
@@ -198,6 +202,8 @@ static void handle_touch_motion(struct wl_listener *listener, void *data) {
struct roots_cursor *cursor =
wl_container_of(listener, cursor, touch_motion);
PhocDesktop *desktop = server->desktop;
+ if (!server->active)
+ return;
wlr_idle_notify_activity(desktop->idle, cursor->seat->seat);
struct wlr_event_touch_motion *event = data;
roots_cursor_handle_touch_motion(cursor, event);
diff --git a/src/server.c b/src/server.c
index 838841b..41452cf 100644
--- a/src/server.c
+++ b/src/server.c
@@ -276,6 +276,7 @@ phoc_server_setup (PhocServer *self, const char *config_path,
phoc_startup_session (self);
self->inited = TRUE;
+ self->active = TRUE;
return TRUE;
}
diff --git a/src/server.h b/src/server.h
index 9501432..532b064 100644
--- a/src/server.h
+++ b/src/server.h
@@ -37,6 +37,7 @@ struct _PhocServer {
PhocInput *input;
PhocServerDebugFlags debug_flags;
gboolean inited;
+ gboolean active;
/* The session */
gchar *session;
--
2.26.2

42
x11-wm/phoc/files/Revert-layer-shell-error-on-0-dimension-without-anchors.diff
View File

@@ -1,42 +0,0 @@
From: =?utf-8?q?Guido_G=C3=BCnther?= <agx@sigxcpu.org>
Date: Fri, 1 Jan 2021 13:58:55 +0100
Subject: Revert "layer-shell: error on 0 dimension without anchors"
This reverts commit 8dec751a6d84335fb04288b8efab6dd5c90288d3.
Revert this until phosh has a fixed release.
---
types/wlr_layer_shell_v1.c | 20 --------------------
1 file changed, 20 deletions(-)
diff --git a/types/wlr_layer_shell_v1.c b/types/wlr_layer_shell_v1.c
index bc68111..d83b22b 100644
--- a/types/wlr_layer_shell_v1.c
+++ b/types/wlr_layer_shell_v1.c
@@ -307,26 +307,6 @@ static void layer_surface_role_commit(struct wlr_surface *wlr_surface) {
return;
}
- const uint32_t horiz = ZWLR_LAYER_SURFACE_V1_ANCHOR_LEFT |
- ZWLR_LAYER_SURFACE_V1_ANCHOR_RIGHT;
- if (surface->client_pending.desired_width == 0 &&
- (surface->client_pending.anchor & horiz) != horiz) {
- wl_resource_post_error(surface->resource,
- ZWLR_LAYER_SURFACE_V1_ERROR_INVALID_SIZE,
- "width 0 requested without setting left and right anchors");
- return;
- }
-
- const uint32_t vert = ZWLR_LAYER_SURFACE_V1_ANCHOR_TOP |
- ZWLR_LAYER_SURFACE_V1_ANCHOR_BOTTOM;
- if (surface->client_pending.desired_height == 0 &&
- (surface->client_pending.anchor & vert) != vert) {
- wl_resource_post_error(surface->resource,
- ZWLR_LAYER_SURFACE_V1_ERROR_INVALID_SIZE,
- "height 0 requested without setting top and bottom anchors");
- return;
- }
-
if (surface->closed) {
// Ignore commits after the compositor has closed it
return;

21
x11-wm/phoc/files/xcursor-fix-false-positive-stringop-truncation.diff
View File

@@ -1,21 +0,0 @@
Description: xcursor: strncpy truncation warning with GCC 10 on s390x
Fix false positive stringop-truncation warning/error with GCC 10 on s390x
.
Author: Lukas Märdian <slyon@ubuntu.com>
Bug: https://github.com/swaywm/wlroots/issues/2018
Last-Update: 2021-03-03
---
--- wlroots-0.12.0.orig/xcursor/xcursor.c
+++ wlroots-0.12.0/xcursor/xcursor.c
@@ -655,8 +655,11 @@ _XcursorAddPathElt (char *path, const ch
elt++;
len--;
}
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wstringop-truncation"
strncpy (path + pathlen, elt, len);
path[pathlen + len] = '\0';
+#pragma GCC diagnostic pop
}
static char *

4
x11-wm/phoc/phoc-0.12.0.ebuild
View File

@@ -62,10 +62,6 @@ src_prepare() {
default
rm -r "${S}"/subprojects/wlroots || die "Failed to remove bundled wlroots"
cp -r "${WORKDIR}/${WL_P}" "${S}"/subprojects/wlroots || die "Failed to copy right version of wlroots"
cd "${S}"/subprojects/wlroots
eapply "${FILESDIR}"/xcursor-fix-false-positive-stringop-truncation.diff
}
src_configure() {