Mir

Merge lp://staging/~robertcarr/mir/xkbcommon-mapper into lp://staging/~mir-team/mir/trunk

xkbcommon-mapper
Merge into trunk

Proposed by Robert Carr on 2013-04-09

Status:	Merged
Approved by:	Alan Griffiths on 2013-04-16
Approved revision:	no longer in the source branch.
Merged at revision:	593
Proposed branch:	lp://staging/~robertcarr/mir/xkbcommon-mapper
Merge into:	lp://staging/~mir-team/mir/trunk
Diff against target:	674 lines (+358/-25) 19 files modified CMakeLists.txt (+1/-0) cmake/FindXKBCOMMON.cmake (+23/-0) debian/control (+2/-1) examples/eglapp.c (+3/-1) include/test/mir_test/event_factory.h (+1/-0) src/client/CMakeLists.txt (+1/-0) src/client/input/CMakeLists.txt (+1/-0) src/client/input/android_input_receiver.cpp (+31/-3) src/client/input/android_input_receiver.h (+4/-0) src/client/input/xkb_mapper.cpp (+102/-0) src/client/input/xkb_mapper.h (+56/-0) src/server/input/android/event_filter_dispatcher_policy.cpp (+2/-0) tests/acceptance-tests/test_client_input.cpp (+75/-14) tests/mir_test_doubles/event_factory.cpp (+5/-0) tests/unit-tests/client/input/CMakeLists.txt (+1/-0) tests/unit-tests/client/input/test_android_input_receiver.cpp (+6/-5) tests/unit-tests/client/input/test_xkb_mapper.cpp (+40/-0) tools/setup-android-dependencies.sh (+2/-1) tools/setup-partial-armhf-chroot.sh (+2/-0)
To merge this branch:	bzr merge lp://staging/~robertcarr/mir/xkbcommon-mapper
Related bugs:	Link a bug report
Related blueprints:	Mir on the Phone (iteration 0) (Undefined)

Reviewer	Review Type	Date Requested	Status
PS Jenkins bot (community)	continuous-integration		Approve on 2013-04-16
Alan Griffiths			Approve on 2013-04-15
Daniel van Vugt			Approve on 2013-04-15
Kevin DuBois (community)		2013-04-09	Approve on 2013-04-12
Review via email: mp+157775@code.staging.launchpad.net

Commit message

Map keys using xkbcommon.

Description of the change

Implement support for a simple client side XKB common based key mapper.

Will resolve the server side todo (event_filter_dispathcer_policy.cpp) over the next few days as I pull together a better working example of server input.

Revision history for this message

Kevin DuBois (kdub) wrote on 2013-04-09:

304 + xkb_context *context;
305 + xkb_keymap *map;
306 + xkb_state *state;

can we use custom deleters instead of the destructor?

+ uint32_t xkb_scan_code = scan_code + 8;
comment/macro/constant to explain the 8

do we need to update the android helper scripts to download the new dependency?

review: Needs Fixing

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2013-04-09:

FAILED: Continuous integration, rev:578
http://jenkins.qa.ubuntu.com/job/mir-ci/333/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-android-raring-i386-build/310/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-raring-amd64-build/193
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-quantal-amd64-ci/338/console

Click here to trigger a rebuild:
http://s-jenkins:8080/job/mir-ci/333/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

Robert Carr (robertcarr) wrote on 2013-04-09:

>> do we need to update the android helper scripts to download the new dependency?

I updated the android helper scripts but cross-compile-chroot still doesn't work

>> can we use custom deleters instead of the destructor?

Yes

>> comment/macro/constant to explain the 8

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2013-04-09:

FAILED: Continuous integration, rev:583
http://jenkins.qa.ubuntu.com/job/mir-ci/339/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-android-raring-i386-build/322/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-raring-amd64-build/205
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-quantal-amd64-ci/344/console

Click here to trigger a rebuild:
http://s-jenkins:8080/job/mir-ci/339/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2013-04-09:

FAILED: Continuous integration, rev:584
http://jenkins.qa.ubuntu.com/job/mir-ci/342/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-android-raring-i386-build/325/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-raring-amd64-build/208
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-quantal-amd64-ci/347/console

Click here to trigger a rebuild:
http://s-jenkins:8080/job/mir-ci/342/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

Robert Carr (robertcarr) wrote on 2013-04-10:

Fixed android build and potentially jenkins hang.

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2013-04-10:

FAILED: Continuous integration, rev:585
http://jenkins.qa.ubuntu.com/job/mir-ci/350/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-android-raring-i386-build/336/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-raring-amd64-build/219
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-quantal-amd64-ci/355
        deb: http://jenkins.qa.ubuntu.com/job/mir-quantal-amd64-ci/355/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins:8080/job/mir-ci/350/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2013-04-10:

FAILED: Continuous integration, rev:586
http://jenkins.qa.ubuntu.com/job/mir-ci/351/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-android-raring-i386-build/337/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-raring-amd64-build/220
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-quantal-amd64-ci/356
        deb: http://jenkins.qa.ubuntu.com/job/mir-quantal-amd64-ci/356/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-vm-ci-build/./distribution=precise,flavor=amd64/154

Click here to trigger a rebuild:
http://s-jenkins:8080/job/mir-ci/351/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

Daniel van Vugt (vanvugt) wrote on 2013-04-11:

Text conflict in examples/eglapp.c
Text conflict in tests/unit-tests/client/input/test_android_input_receiver.cpp
2 conflicts encountered.

Sorry about that. It would be due to my stuff that landed today.

review: Needs Fixing

Revision history for this message

Robert Carr (robertcarr) wrote on 2013-04-11:

Trunk merged! changes applied!

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2013-04-11:

PASSED: Continuous integration, rev:587
http://jenkins.qa.ubuntu.com/job/mir-ci/363/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-raring-i386-build/352
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-raring-amd64-build/235
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-quantal-amd64-ci/368
        deb: http://jenkins.qa.ubuntu.com/job/mir-quantal-amd64-ci/368/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins:8080/job/mir-ci/363/rebuild

review: Approve (continuous-integration)

Revision history for this message

Daniel van Vugt (vanvugt) wrote on 2013-04-12:

I have no opinion until I get back to this, later. :)

review: Abstain

Revision history for this message

Daniel van Vugt (vanvugt) wrote on 2013-04-12:

ev->key.action == 0
Can we use constants/macros for action or not possible yet?

Only one real problem:
src/client/* need LGPL headers. Not GPL.

review: Needs Fixing

Revision history for this message

Robert Carr (robertcarr) wrote on 2013-04-12:

Thanks!

Still no ev->key.action defines (though there is AKEY_EVENT_ACTION_*). I'll try and get this in next week. As always it's not QUITE as simple as it should be to do something sensible ;)

License headers fixed!

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2013-04-12:

PASSED: Continuous integration, rev:588
http://jenkins.qa.ubuntu.com/job/mir-ci/379/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-raring-i386-build/371
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-raring-amd64-build/254
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-quantal-amd64-ci/384
        deb: http://jenkins.qa.ubuntu.com/job/mir-quantal-amd64-ci/384/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins:8080/job/mir-ci/379/rebuild

review: Approve (continuous-integration)

Revision history for this message

Kevin DuBois (kdub) wrote on 2013-04-12:

"stitch in time saves nine":
seems richer types would prevent mis-translation between XKB and evdev codes
that's probably an mp by itself though, just something for later maybe.

367-369 these could probably be const/initialized in constructor.

I'll approve though, looks good as far as the android dependency goes as well

review: Approve

Revision history for this message

Daniel van Vugt (vanvugt) wrote on 2013-04-15:

Sorry, I just realized the global:

283 +// xkb scancodes are offset by 8 from evdev scancodes for compatibility with X protocol.
284 +static uint32_t const xkb_scancode_offset_from_evdev = 8;

It would probably be easier to read and less error-prone if you just defined a function or macro...

uint32_t xkb_scancode(uint32_t evdev_scancode)
{
return evdev_scancode + 8;
}

That would be preferred. But I won't block the proposal on it.

review: Approve

Revision history for this message

Alan Griffiths (alan-griffiths) wrote on 2013-04-15:

> It would probably be easier to read and less error-prone if you just defined a
> function or macro...
>
> uint32_t xkb_scancode(uint32_t evdev_scancode)
> {
> return evdev_scancode + 8;
> }
>
> That would be preferred. But I won't block the proposal on it.