clients/editor.c | 5 +++++
clients/keyboard.c | 5 +++++
clients/window.c | 12 ++++++++++++
configure.ac | 4 ++--
debian/changelog | 9 +++++++++
src/compositor-x11.c | 2 +-
6 files changed, 34 insertions(+), 3 deletions(-)
New commits:
commit 474b8be0f041b7b39686979ab0c0c4e8b270f984
Author: Héctor Orón Martínez <zu...@debian.org>
Date: Fri Sep 19 16:40:33 2014 +0200
Release Debian version weston-1.6.0-1
Signed-off-by: Héctor Orón Martínez <zu...@debian.org>
diff --git a/debian/changelog b/debian/changelog
index 6a77044..64a8dd9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+weston (1.6.0-1) unstable; urgency=medium
+
+ * New upstream release.
+ * Fix "weston-terminal: exits under load"
+ - Thanks Rémi Denis-Courmont for report.
+ (Closes: #760043)
+
+ -- Hector Oron <zu...@debian.org> Fri, 19 Sep 2014 16:38:47 +0200
+
weston (1.5.93-2) unstable; urgency=medium
[ Hector Oron ]
commit 2858cc2a50854685b44eee72994dea57f5aa4246
Author: Pekka Paalanen <pekka.paala...@collabora.co.uk>
Date: Fri Sep 19 13:40:14 2014 +0300
configure.ac: bump version to 1.6.0
Signed-off-by: Pekka Paalanen <pekka.paala...@collabora.co.uk>
diff --git a/configure.ac b/configure.ac
index 4a889af..05e883d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,6 @@
m4_define([weston_major_version], [1])
-m4_define([weston_minor_version], [5])
-m4_define([weston_micro_version], [93])
+m4_define([weston_minor_version], [6])
+m4_define([weston_micro_version], [0])
m4_define([weston_version],
[weston_major_version.weston_minor_version.weston_micro_version])
commit 30e1f3c311772ad884df894c7ebf733a41f66458
Author: Olivier Blin <olivier.b...@softathome.com>
Date: Tue Sep 16 19:13:17 2014 +0200
editor: do not crash when text input manager is not available
[Pekka Paalanen: whitespace fix]
Signed-off-by: Pekka Paalanen <pekka.paala...@collabora.co.uk>
diff --git a/clients/editor.c b/clients/editor.c
index 66cba0b..421f8fe 100644
--- a/clients/editor.c
+++ b/clients/editor.c
@@ -1359,6 +1359,11 @@ main(int argc, char *argv[])
display_set_user_data(editor.display, &editor);
display_set_global_handler(editor.display, global_handler);
+ if (editor.text_input_manager == NULL) {
+ fprintf(stderr, "No text input manager global\n");
+ return -1;
+ }
+
editor.window = window_create(editor.display);
editor.widget = window_frame_create(editor.window, &editor);
commit 814f0ee5a634601f9c4cf36ac1a5147826192509
Author: Olivier Blin <olivier.b...@softathome.com>
Date: Tue Sep 16 19:13:16 2014 +0200
keyboard: do not crash when input panel is not available
[Pekka Paalanen: whitespace fix]
Signed-off-by: Pekka Paalanen <pekka.paala...@collabora.co.uk>
diff --git a/clients/keyboard.c b/clients/keyboard.c
index 7c11cec..2579571 100644
--- a/clients/keyboard.c
+++ b/clients/keyboard.c
@@ -995,6 +995,11 @@ main(int argc, char *argv[])
display_set_user_data(virtual_keyboard.display, &virtual_keyboard);
display_set_global_handler(virtual_keyboard.display, global_handler);
+ if (virtual_keyboard.input_panel == NULL) {
+ fprintf(stderr, "No input panel global\n");
+ return -1;
+ }
+
output = display_get_output(virtual_keyboard.display);
keyboard_create(output, &virtual_keyboard);
commit 22e16b656f67ee577e32a7af91f443840fc3aee1
Author: Jason Ekstrand <jason.ekstr...@intel.com>
Date: Mon Sep 15 12:10:27 2014 -0700
compositor-x11: Rename the output make to "weston-X11"
Previously all outputs in the X11 backend had the make "xwayland" which is
confusing. Now they have something that makes a little more sense.
diff --git a/src/compositor-x11.c b/src/compositor-x11.c
index 3494e34..b602bc9 100644
--- a/src/compositor-x11.c
+++ b/src/compositor-x11.c
@@ -869,7 +869,7 @@ x11_compositor_create_output(struct x11_compositor *c, int
x, int y,
output->base.set_dpms = NULL;
output->base.switch_mode = NULL;
output->base.current_mode = &output->mode;
- output->base.make = "xwayland";
+ output->base.make = "weston-X11";
output->base.model = "none";
if (configured_name)
commit b2c18647775732da740946eb199b1f2b46ba950b
Author: Ondřej Majerech <majerec...@gmail.com>
Date: Sat Sep 13 16:35:45 2014 +0200
window: Don't needlessly sync parent and geometry
When a toytoolkit client redraws, the toolkit syncs the parent and
geometry. If a client redraws often (such as the terminal drawing a huge
amount of output), this can spam the compositor with requests and may
result in the client's eventual being killed.
We don't need to send requests for changing the geometry or parent if
these haven't changed. So remember the last geometry and parent, and
update them only if needed.
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=83297
Signed-off-by: Ondřej Majerech <majerec...@gmail.com>
Reviewed-by: Pekka Paalanen <pekka.paala...@collabora.co.uk>
diff --git a/clients/window.c b/clients/window.c
index 9c48155..e44d65c 100644
--- a/clients/window.c
+++ b/clients/window.c
@@ -217,6 +217,7 @@ struct window {
struct rectangle saved_allocation;
struct rectangle min_allocation;
struct rectangle pending_allocation;
+ struct rectangle last_geometry;
int x, y;
int redraw_needed;
int redraw_task_scheduled;
@@ -246,6 +247,7 @@ struct window {
struct xdg_popup *xdg_popup;
struct window *parent;
+ struct wl_surface *last_parent_surface;
struct window_frame *frame;
@@ -3993,7 +3995,11 @@ window_sync_parent(struct window *window)
else
parent_surface = NULL;
+ if (parent_surface == window->last_parent_surface)
+ return;
+
xdg_surface_set_parent(window->xdg_surface, parent_surface);
+ window->last_parent_surface = parent_surface;
}
static void
@@ -4018,12 +4024,18 @@ window_sync_geometry(struct window *window)
return;
window_get_geometry(window, &geometry);
+ if (geometry.x == window->last_geometry.x &&
+ geometry.y == window->last_geometry.y &&
+ geometry.width == window->last_geometry.width &&
+ geometry.height == window->last_geometry.height)
+ return;
xdg_surface_set_window_geometry(window->xdg_surface,
geometry.x,
geometry.y,
geometry.width,
geometry.height);
+ window->last_geometry = geometry;
}
static void
--
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: https://lists.debian.org/e1xuzz1-0007qk...@moszumanska.debian.org
