diff -Nru weston-0.99.0+git20121020.5717b6db/.lastcommit weston-1.0.0+git20121025.00fbbe6b/.lastcommit --- weston-0.99.0+git20121020.5717b6db/.lastcommit 2012-10-19 22:03:33.000000000 +0000 +++ weston-1.0.0+git20121025.00fbbe6b/.lastcommit 2012-10-25 12:54:38.000000000 +0000 @@ -1 +1 @@ -commit 5717b6dbf1b9272c7bd9bdebe5a4ac267afca687 +commit 00fbbe6b6038553068cd9d903d96c7ba441a01c6 diff -Nru weston-0.99.0+git20121020.5717b6db/ChangeLog weston-1.0.0+git20121025.00fbbe6b/ChangeLog --- weston-0.99.0+git20121020.5717b6db/ChangeLog 2012-10-19 22:03:45.000000000 +0000 +++ weston-1.0.0+git20121025.00fbbe6b/ChangeLog 2012-10-25 12:55:03.000000000 +0000 @@ -1,9 +1,62 @@ -commit 63afda68438583d66616566e9321ad64d4342ddd +commit 7eed3aa16e3bd37c22ec3bb7881c960b799851d2 Author: Rico Tzschichholz -Date: Sat Oct 20 00:03:33 2012 +0200 +Date: Thu Oct 25 14:54:38 2012 +0200 Add debian tree from origin/ubuntu +commit 00fbbe6b6038553068cd9d903d96c7ba441a01c6 +Author: Kristian Høgsberg +Date: Tue Oct 23 13:04:09 2012 -0400 + + compositor: Clip pointer coordinates on pointer enter as well + + When tiling window managers resize a non-resizable window they're violating + ICCCM. Not some hippie-community standard like EWMH, but ICCCM, which is + about as old and sacred as the constitution. If they want to force a window + to be a size it wasn't designed for, at least they could have the decency to + reparent the client window into a bigger containing window of whatever size + they think it should be. But apparently ICCCM compliance is too much to ask. + + Anyway, all that just to say that it's really not our fault when we get an + enter event with coordinates outside the valid output region. But we'll + clip it anyway and work around mis-behaving tiling WMs. + +commit 42470cfc492d03e967ae515d298b1d4712de9a58 +Author: Kristian Høgsberg +Date: Mon Oct 22 18:50:03 2012 -0400 + + configure.ac: Bump version to 1.0.0 + +commit 128ee2c34290a109d425eb7aacd48892bfeb4452 +Author: Kristian Høgsberg +Date: Sun Oct 21 22:30:26 2012 -0400 + + test-client: Make sure we process pending eevents before we verify state + + Since the send-button-state request comes in on one socket and the + wayland event we're looking for comes in on another socket, the order + that we process the two in is undefined. Thus, button-test fails + intermittently, depending on which event we process first. + + We change wl_display_flush() to wl_display_roundtrip(), to make sure that + we deal with all wayland events before handling test protocol requests. + +commit 1d1e0a5ffaa91dcbdc1f18e0e5c43a2dc92f5875 +Author: Kristian Høgsberg +Date: Sun Oct 21 13:29:26 2012 -0400 + + compositor-drm: Disable hw cursor if allocation fails + + Instead of crashing later, we can just fall back to gl rendered cursors. + +commit 8c31a4c025a819b7293fd984fabdbee39d81a645 +Author: Kristian Høgsberg +Date: Fri Oct 19 23:05:37 2012 -0400 + + Define our own container_of as well + + Don't rely on libwayland-client/server to define this for us. + commit 5717b6dbf1b9272c7bd9bdebe5a4ac267afca687 Author: Kristian Høgsberg Date: Fri Oct 19 17:12:38 2012 -0400 diff -Nru weston-0.99.0+git20121020.5717b6db/clients/window.h weston-1.0.0+git20121025.00fbbe6b/clients/window.h --- weston-0.99.0+git20121020.5717b6db/clients/window.h 2012-10-19 22:03:33.000000000 +0000 +++ weston-1.0.0+git20121025.00fbbe6b/clients/window.h 2012-10-25 12:54:38.000000000 +0000 @@ -30,6 +30,10 @@ #define ARRAY_LENGTH(a) (sizeof (a) / sizeof (a)[0]) +#define container_of(ptr, type, member) ({ \ + const __typeof__( ((type *)0)->member ) *__mptr = (ptr); \ + (type *)( (char *)__mptr - offsetof(type,member) );}) + struct window; struct widget; struct display; diff -Nru weston-0.99.0+git20121020.5717b6db/configure weston-1.0.0+git20121025.00fbbe6b/configure --- weston-0.99.0+git20121020.5717b6db/configure 2012-10-19 22:03:43.000000000 +0000 +++ weston-1.0.0+git20121025.00fbbe6b/configure 2012-10-25 12:54:58.000000000 +0000 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for weston 0.99.0. +# Generated by GNU Autoconf 2.69 for weston 1.0.0. # # Report bugs to . # @@ -591,8 +591,8 @@ # Identity of this package. PACKAGE_NAME='weston' PACKAGE_TARNAME='weston' -PACKAGE_VERSION='0.99.0' -PACKAGE_STRING='weston 0.99.0' +PACKAGE_VERSION='1.0.0' +PACKAGE_STRING='weston 1.0.0' PACKAGE_BUGREPORT='https://bugs.freedesktop.org/enter_bug.cgi?product=weston' PACKAGE_URL='http://wayland.freedesktop.org/' @@ -1472,7 +1472,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures weston 0.99.0 to adapt to many kinds of systems. +\`configure' configures weston 1.0.0 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1542,7 +1542,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of weston 0.99.0:";; + short | recursive ) echo "Configuration of weston 1.0.0:";; esac cat <<\_ACEOF @@ -1749,7 +1749,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -weston configure 0.99.0 +weston configure 1.0.0 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2296,7 +2296,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by weston $as_me 0.99.0, which was +It was created by weston $as_me 1.0.0, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -3115,7 +3115,7 @@ # Define the identity of the package. PACKAGE='weston' - VERSION='0.99.0' + VERSION='1.0.0' cat >>confdefs.h <<_ACEOF @@ -18698,7 +18698,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by weston $as_me 0.99.0, which was +This file was extended by weston $as_me 1.0.0, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -18765,7 +18765,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -weston config.status 0.99.0 +weston config.status 1.0.0 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff -Nru weston-0.99.0+git20121020.5717b6db/configure.ac weston-1.0.0+git20121025.00fbbe6b/configure.ac --- weston-0.99.0+git20121020.5717b6db/configure.ac 2012-10-19 22:03:33.000000000 +0000 +++ weston-1.0.0+git20121025.00fbbe6b/configure.ac 2012-10-25 12:54:38.000000000 +0000 @@ -1,6 +1,6 @@ AC_PREREQ([2.64]) AC_INIT([weston], - [0.99.0], + [1.0.0], [https://bugs.freedesktop.org/enter_bug.cgi?product=weston], [weston], [http://wayland.freedesktop.org/]) diff -Nru weston-0.99.0+git20121020.5717b6db/debian/changelog weston-1.0.0+git20121025.00fbbe6b/debian/changelog --- weston-0.99.0+git20121020.5717b6db/debian/changelog 2012-10-19 22:04:33.000000000 +0000 +++ weston-1.0.0+git20121025.00fbbe6b/debian/changelog 2012-10-25 12:56:16.000000000 +0000 @@ -1,10 +1,10 @@ -weston (0.99.0+git20121020.5717b6db-0ubuntu0ricotz~precise) precise; urgency=medium +weston (1.0.0+git20121025.00fbbe6b-0ubuntu0ricotz~precise) precise; urgency=medium - * Checkout from git 20121020 (master branch) up to commit - 5717b6dbf1b9272c7bd9bdebe5a4ac267afca687 + * Checkout from git 20121025 (master branch) up to commit + 00fbbe6b6038553068cd9d903d96c7ba441a01c6 * Only added debian/ tree from origin/ubuntu - -- Rico Tzschichholz Sat, 20 Oct 2012 00:03:46 +0200 + -- Rico Tzschichholz Thu, 25 Oct 2012 14:55:04 +0200 weston (0.95.0-0ubuntu2) quantal; urgency=low diff -Nru weston-0.99.0+git20121020.5717b6db/src/compositor-drm.c weston-1.0.0+git20121025.00fbbe6b/src/compositor-drm.c --- weston-0.99.0+git20121020.5717b6db/src/compositor-drm.c 2012-10-19 22:03:33.000000000 +0000 +++ weston-1.0.0+git20121025.00fbbe6b/src/compositor-drm.c 2012-10-25 12:54:38.000000000 +0000 @@ -1466,6 +1466,10 @@ output->cursor_bo[1] = gbm_bo_create(ec->gbm, 64, 64, GBM_FORMAT_ARGB8888, GBM_BO_USE_CURSOR_64X64 | GBM_BO_USE_WRITE); + if (output->cursor_bo[0] == NULL || output->cursor_bo[1] == NULL) { + weston_log("cursor buffers unavailable, using gl cursors\n"); + ec->cursors_are_broken = 1; + } output->backlight = backlight_init(drm_device, connector->connector_type); diff -Nru weston-0.99.0+git20121020.5717b6db/src/compositor.c weston-1.0.0+git20121025.00fbbe6b/src/compositor.c --- weston-0.99.0+git20121020.5717b6db/src/compositor.c 2012-10-19 22:03:33.000000000 +0000 +++ weston-1.0.0+git20121025.00fbbe6b/src/compositor.c 2012-10-25 12:54:38.000000000 +0000 @@ -1756,6 +1756,7 @@ struct wl_pointer *pointer = seat->seat.pointer; if (output) { + clip_pointer_motion(seat, &x, &y); weston_seat_update_drag_surface(seat, x - pointer->x, y - pointer->y); diff -Nru weston-0.99.0+git20121020.5717b6db/src/compositor.h weston-1.0.0+git20121025.00fbbe6b/src/compositor.h --- weston-0.99.0+git20121020.5717b6db/src/compositor.h 2012-10-19 22:03:33.000000000 +0000 +++ weston-1.0.0+git20121025.00fbbe6b/src/compositor.h 2012-10-25 12:54:38.000000000 +0000 @@ -39,6 +39,10 @@ #define ARRAY_LENGTH(a) (sizeof (a) / sizeof (a)[0]) +#define container_of(ptr, type, member) ({ \ + const __typeof__( ((type *)0)->member ) *__mptr = (ptr); \ + (type *)( (char *)__mptr - offsetof(type,member) );}) + struct weston_transform { struct weston_matrix matrix; struct wl_list link; diff -Nru weston-0.99.0+git20121020.5717b6db/tests/test-client.c weston-1.0.0+git20121025.00fbbe6b/tests/test-client.c --- weston-0.99.0+git20121020.5717b6db/tests/test-client.c 2012-10-19 22:03:33.000000000 +0000 +++ weston-1.0.0+git20121025.00fbbe6b/tests/test-client.c 2012-10-25 12:54:38.000000000 +0000 @@ -355,7 +355,7 @@ char buf[64]; int len; - wl_display_flush(display->display); + wl_display_roundtrip(display->display); len = snprintf(buf, sizeof buf, "%u\n", display->input->button_mask); assert(write(fd, buf, len) == len);