← Back to branch summary

~robertcarr/mir/input-conglomeration

~robertcarr/mir/input-conglomeration

Viewing all changes in revision 635.

Committer: Robert Carr
Date: 2013-04-24 22:17:26 UTC
mfrom: (603.1.28 trunk)
Revision ID: robert.carr@canonical.com-20130424221726-q43f99x3ivs3gog1

Merge trunk

files added:
examples/multiwin.c

include/server/mir/event_queue.h

include/shared/mir/event_sink.h

src/server/event_queue.cpp

tests/unit-tests/event

tests/unit-tests/event/CMakeLists.txt

tests/unit-tests/event/test_event_queue.cpp

files renamed:
tests/unit-tests/input/android/test_event_filter_chain.cpp => tests/unit-tests/input/test_event_filter_chain.cpp

files modified:
examples/CMakeLists.txt

include/client/mir_toolkit/mir_client_library.h

include/server/mir/frontend/protobuf_ipc_factory.h

include/server/mir/frontend/session.h

include/server/mir/frontend/session_mediator.h

include/server/mir/shell/application_session.h

include/server/mir/shell/surface.h

include/shared/mir_toolkit/common.h

include/shared/mir_toolkit/event.h

include/test/mir_test/event_matchers.h

include/test/mir_test_doubles/mock_event_filter.h

include/test/mir_test_doubles/mock_session.h

include/test/mir_test_doubles/stub_ipc_factory.h

include/test/mir_test_doubles/stub_session.h

src/client/mir_client_library.cpp

src/client/mir_connection.cpp

src/client/mir_connection.h

src/client/mir_socket_rpc_channel.cpp

src/client/mir_socket_rpc_channel.h

src/client/mir_surface.cpp

src/client/mir_surface.h

src/server/CMakeLists.txt

src/server/default_server_configuration.cpp

src/server/frontend/protobuf_message_processor.cpp

src/server/frontend/protobuf_message_processor.h

src/server/frontend/protobuf_socket_communicator.cpp

src/server/frontend/session_mediator.cpp

src/server/input/event_filter_chain.cpp

src/server/input/event_filter_chain.h

src/server/shell/application_session.cpp

src/server/shell/surface.cpp

src/shared/input/android_input_lexicon.cpp

src/shared/protobuf/mir_protobuf.proto

src/shared/protobuf/mir_protobuf_wire.proto

tests/acceptance-tests/test_client_library.cpp

tests/integration-tests/input/android/test_android_cursor_listener.cpp

tests/integration-tests/input/android/test_android_input_manager.cpp

tests/unit-tests/CMakeLists.txt

tests/unit-tests/client/test_client_mir_surface.cpp

tests/unit-tests/frontend/test_session_mediator.cpp

tests/unit-tests/frontend/test_session_mediator_android.cpp

tests/unit-tests/frontend/test_session_mediator_gbm.cpp

tests/unit-tests/input/CMakeLists.txt

tests/unit-tests/input/android/CMakeLists.txt

tests/unit-tests/shell/test_single_visibility_focus_mechanism.cpp

tests/unit-tests/shell/test_surface.cpp

Show diffs side-by-side

added added

removed removed

examples/CMakeLists.txt

examples/multiwin.c

include/client/mir_toolkit/mir_client_library.h

include/server/mir/event_queue.h

include/server/mir/frontend/protobuf_ipc_factory.h

include/server/mir/frontend/session.h

include/server/mir/frontend/session_mediator.h

include/server/mir/shell/application_session.h

include/server/mir/shell/surface.h

include/shared/mir/event_sink.h

include/shared/mir_toolkit/common.h

include/shared/mir_toolkit/event.h

include/test/mir_test/event_matchers.h

include/test/mir_test_doubles/mock_event_filter.h

include/test/mir_test_doubles/mock_session.h

include/test/mir_test_doubles/stub_ipc_factory.h

include/test/mir_test_doubles/stub_session.h

src/client/mir_client_library.cpp

src/client/mir_connection.cpp

src/client/mir_connection.h

src/client/mir_socket_rpc_channel.cpp

src/client/mir_socket_rpc_channel.h

src/client/mir_surface.cpp

src/client/mir_surface.h

src/server/CMakeLists.txt

src/server/default_server_configuration.cpp

src/server/event_queue.cpp

src/server/frontend/protobuf_message_processor.cpp

src/server/frontend/protobuf_message_processor.h

src/server/frontend/protobuf_socket_communicator.cpp

src/server/frontend/session_mediator.cpp

src/server/input/event_filter_chain.cpp

src/server/input/event_filter_chain.h

src/server/shell/application_session.cpp

src/server/shell/surface.cpp

src/shared/input/android_input_lexicon.cpp

src/shared/protobuf/mir_protobuf.proto

src/shared/protobuf/mir_protobuf_wire.proto

tests/acceptance-tests/test_client_library.cpp

tests/integration-tests/input/android/test_android_cursor_listener.cpp

tests/integration-tests/input/android/test_android_input_manager.cpp

tests/unit-tests/CMakeLists.txt

tests/unit-tests/client/test_client_mir_surface.cpp

tests/unit-tests/event/

tests/unit-tests/event/CMakeLists.txt

tests/unit-tests/event/test_event_queue.cpp

tests/unit-tests/frontend/test_session_mediator.cpp

tests/unit-tests/frontend/test_session_mediator_android.cpp

tests/unit-tests/frontend/test_session_mediator_gbm.cpp

tests/unit-tests/input/CMakeLists.txt

tests/unit-tests/input/android/CMakeLists.txt

tests/unit-tests/input/test_event_filter_chain.cpp

tests/unit-tests/shell/test_single_visibility_focus_mechanism.cpp

tests/unit-tests/shell/test_surface.cpp

Older »