Merge lp://staging/~mir-team/unity-system-compositor/toggle-cursor into lp://staging/unity-system-compositor
Proposed by
Andreas Pokorny
| Status: | Work in progress |
|---|---|
| Proposed branch: | lp://staging/~mir-team/unity-system-compositor/toggle-cursor |
| Merge into: | lp://staging/unity-system-compositor |
| Diff against target: |
8316 lines (+1598/-5675) 65 files modified
CMakeLists.txt (+2/-1) debian/changelog (+0/-8) debian/control (+5/-4) spinner/eglapp.c (+10/-7) spinner/eglspinner.c (+5/-16) src/CMakeLists.txt (+14/-20) src/com.canonical.Unity.Screen.xml (+0/-29) src/cursor_enabler.cpp (+72/-0) src/cursor_enabler.h (+58/-0) src/dbus_connection_handle.cpp (+0/-102) src/dbus_connection_handle.h (+0/-48) src/dbus_event_loop.cpp (+0/-444) src/dbus_event_loop.h (+0/-87) src/dbus_message_handle.cpp (+0/-83) src/dbus_message_handle.h (+0/-48) src/dbus_screen.cpp (+213/-0) src/dbus_screen.h (+77/-0) src/dbus_screen_observer.h (+9/-26) src/external_spinner.cpp (+9/-28) src/external_spinner.h (+2/-4) src/generate_header_with_string_from_file.sh (+0/-26) src/powerd_mediator.cpp (+237/-401) src/powerd_mediator.h (+64/-71) src/powerkey_handler.cpp (+41/-52) src/powerkey_handler.h (+22/-27) src/scoped_dbus_error.h (+0/-57) src/screen_hardware.h (+0/-49) src/screen_state_handler.cpp (+75/-73) src/screen_state_handler.h (+37/-42) src/server.cpp (+8/-88) src/server.h (+41/-61) src/shell.cpp (+157/-0) src/shell.h (+54/-0) src/system_compositor.cpp (+71/-15) src/system_compositor.h (+8/-13) src/thread_name.cpp (+0/-32) src/thread_name.h (+0/-29) src/unity_screen_service.cpp (+0/-358) src/unity_screen_service.h (+0/-83) src/window_manager.cpp (+0/-234) src/window_manager.h (+0/-85) src/worker_thread.cpp (+142/-0) src/worker_thread.h (+55/-0) tests/CMakeLists.txt (+0/-1) tests/integration-tests/CMakeLists.txt (+0/-53) tests/integration-tests/dbus_bus.cpp (+0/-52) tests/integration-tests/dbus_bus.h (+0/-46) tests/integration-tests/dbus_client.cpp (+0/-151) tests/integration-tests/dbus_client.h (+0/-113) tests/integration-tests/run_command.cpp (+0/-44) tests/integration-tests/run_command.h (+0/-34) tests/integration-tests/test_dbus_event_loop.cpp (+0/-232) tests/integration-tests/test_external_spinner.cpp (+0/-167) tests/integration-tests/test_powerd_mediator.cpp (+0/-655) tests/integration-tests/test_unity_screen_service.cpp (+0/-413) tests/integration-tests/usc_test_helper_wait_for_signal.c (+0/-24) tests/integration-tests/wait_condition.h (+0/-72) tests/unit-tests/CMakeLists.txt (+1/-4) tests/unit-tests/advanceable_timer.cpp (+0/-211) tests/unit-tests/advanceable_timer.h (+0/-53) tests/unit-tests/fake_shared.h (+0/-33) tests/unit-tests/test_cursor_enabler.cpp (+109/-0) tests/unit-tests/test_mir_screen.cpp (+0/-366) tests/unit-tests/test_screen_event_handler.cpp (+0/-196) tests/unit-tests/test_session_switcher.cpp (+0/-4) |
| To merge this branch: | bzr merge lp://staging/~mir-team/unity-system-compositor/toggle-cursor |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Unity System Compositor Development Team | Pending | ||
|
Review via email:
|
|||
Commit message
Toggle cursor by watching the event stream
To post a comment you must log in.
Unmerged revisions
- 206. By Andreas Pokorny
-
rebase by skipping the changes in unity-system-
compositor - 205. By Andreas Pokorny
-
merge but omit changes from trunk since we need to target mir-0.12.1
- 204. By Andreas Pokorny
-
merge event-2.0 changes back in
*fingers-crossed*
- 203. By Andreas Pokorny
-
keep display on when mouse pointer moves
- 202. By Andreas Pokorny
-
merged mirevent-2.0
- 201. By Andreas Pokorny
-
further cleanup drops all references to cursor image again
- 200. By Andreas Pokorny
-
ok nearly
- 199. By Andreas Pokorny
-
merged msh changes
- 198. By Andreas Pokorny
-
merged event-2.0 changes
- 197. By Andreas Pokorny
-
add test and cleanup further
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
