On Mon, Dec 02, 2013 at 03:35:33PM -0800, Kristian Høgsberg wrote: > On Mon, Dec 02, 2013 at 10:05:01PM +0100, Jonas Ådahl wrote: > > Hi, > > > > Here comes a patch series containing some input cleanup and fixes. > > > > The most drastic change is removal of udev handling code from > > compositor-rpi.c making it use udev-seat.c. That patch is especially > > drastic since I have only compile tested it. More about that in that > > E-mail. > > I committed 1-4, 5 doesn't compile: > > compositor-x11.c: In function 'x11_compositor_setup_xkb': > compositor-x11.c:276:36: error: 'struct weston_seat' has no member named > 'xkb_state' > xkb_state_update_mask(c->core_seat.xkb_state.state, > ^ > compositor-x11.c: In function 'update_xkb_state': > compositor-x11.c:923:36: error: 'struct weston_seat' has no member named > 'xkb_state' > xkb_state_update_mask(c->core_seat.xkb_state.state,
Sorry about that. I will send new a version (now with HAVE_XCB_XKB defined working as well) as well as 6/6 again. Jonas > > I can also only compile-test the RPi change, but it makes too much > sense to not push. I trust that the Collabora guys will be able to > take a quick look. > > Kristian > > > Jonas > > > > > > Jonas Ådahl (6): > > rpi: Use common udev_input for input device handling > > input: Keep track of number of touch points inside touch struct > > input: Reset touch state when last touch device was removed > > input: Reset pointer state when last pointer device was removed > > input: Move the xkb fields from weston_seat to weston_keyboard > > input: Reset keyboard state when releasing last seat keyboard > > > > src/bindings.c | 2 +- > > src/compositor-rpi.c | 261 > > +++-------------------------------------------- > > src/compositor-wayland.c | 2 +- > > src/compositor-x11.c | 4 +- > > src/compositor.h | 18 ++-- > > src/input.c | 188 +++++++++++++++++++++------------- > > src/shell.c | 2 +- > > src/text-backend.c | 4 +- > > 8 files changed, 148 insertions(+), 333 deletions(-) > > > > -- > > 1.8.1.2 > > > > _______________________________________________ > > wayland-devel mailing list > > [email protected] > > http://lists.freedesktop.org/mailman/listinfo/wayland-devel _______________________________________________ wayland-devel mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/wayland-devel
