← Back to branch summary

~robertcarr/mir/input-conglomeration

~robertcarr/mir/input-conglomeration

Viewing all changes in revision 639.

Committer: Robert Carr
Date: 2013-04-30 18:50:51 UTC
mfrom: (603.22.7 demonstrate-inprocess-input)
Revision ID: robert.carr@canonical.com-20130430185051-8j73odbnqa3u2i84

Merge demonstrate-inprocess-input

files added:
src/shared/input/android

files removed:
src/client/input

src/client/input/CMakeLists.txt

files renamed:
examples/demo-inprocess-egl/ => examples/demo-inprocess-surface-client/

examples/demo-inprocess-egl/demo_inprocess_egl.cpp => examples/demo-inprocess-surface-client/demo_inprocess_surface_client.cpp

src/client/input/input_platform.h => include/shared/mir/input/input_platform.h

src/client/input/input_receiver_thread.h => include/shared/mir/input/input_receiver_thread.h

src/client/input/xkb_mapper.h => include/shared/mir/input/xkb_mapper.h

src/shared/input/android_input_lexicon.cpp => src/shared/input/android/android_input_lexicon.cpp

src/client/input/android_input_platform.cpp => src/shared/input/android/android_input_platform.cpp

src/client/input/android_input_platform.h => src/shared/input/android/android_input_platform.h

src/client/input/android_input_receiver.cpp => src/shared/input/android/android_input_receiver.cpp

src/client/input/android_input_receiver.h => src/shared/input/android/android_input_receiver.h

src/client/input/android_input_receiver_thread.cpp => src/shared/input/android/android_input_receiver_thread.cpp

src/client/input/android_input_receiver_thread.h => src/shared/input/android/android_input_receiver_thread.h

src/client/input/xkb_mapper.cpp => src/shared/input/xkb_mapper.cpp

files modified:
examples/CMakeLists.txt

examples/demo-inprocess-surface-client/CMakeLists.txt

examples/demo-inprocess-surface-client/inprocess_egl_client.cpp

examples/demo-inprocess-surface-client/inprocess_egl_client.h

include/server/mir/default_server_configuration.h

src/client/CMakeLists.txt

src/client/mir_connection.cpp

src/client/mir_surface.cpp

src/shared/input/CMakeLists.txt

tests/unit-tests/client/input/test_android_input_receiver.cpp

tests/unit-tests/client/input/test_android_input_receiver_thread.cpp

tests/unit-tests/client/input/test_xkb_mapper.cpp

tests/unit-tests/client/test_client_mir_surface.cpp

Show diffs side-by-side

added added

removed removed

examples/CMakeLists.txt

examples/demo-inprocess-surface-client/CMakeLists.txt

examples/demo-inprocess-surface-client/demo_inprocess_surface_client.cpp

examples/demo-inprocess-surface-client/inprocess_egl_client.cpp

examples/demo-inprocess-surface-client/inprocess_egl_client.h

include/server/mir/default_server_configuration.h

src/client/CMakeLists.txt

src/client/input/

src/client/input/CMakeLists.txt

src/client/mir_connection.cpp

src/client/mir_surface.cpp

src/shared/input/CMakeLists.txt

src/shared/input/android/

src/shared/input/android/android_input_platform.h

src/shared/input/android/android_input_receiver.cpp

src/shared/input/android/android_input_receiver_thread.h

src/shared/input/xkb_mapper.cpp

tests/unit-tests/client/input/test_android_input_receiver.cpp

tests/unit-tests/client/input/test_android_input_receiver_thread.cpp

tests/unit-tests/client/input/test_xkb_mapper.cpp

tests/unit-tests/client/test_client_mir_surface.cpp

Older »