lp:~mir-team/mir/cursor-spike-phase-6-load-x-cursors
Created by
Robert Carr
and last modified
Branch merges
Propose for merging
No branches
dependent on this one.
- Chris Halse Rogers: Approve
- PS Jenkins bot (community): Approve (continuous-integration)
- Andreas Pokorny (community): Approve
- Kevin DuBois (community): Abstain
- Alan Griffiths: Abstain
-
Diff: 2460 lines (+1744/-99)35 files modified3rd_party/CMakeLists.txt (+11/-1)
3rd_party/xcursor/CMakeLists.txt (+11/-0)
3rd_party/xcursor/xcursor.c (+968/-0)
3rd_party/xcursor/xcursor.h (+65/-0)
CMakeLists.txt (+1/-0)
include/platform/mir/graphics/cursor_image.h (+7/-0)
include/server/mir/default_server_configuration.h (+3/-3)
include/server/mir/input/cursor_images.h (+11/-8)
src/platform/graphics/mesa/cursor.cpp (+73/-20)
src/platform/graphics/mesa/cursor.h (+8/-0)
src/server/CMakeLists.txt (+1/-0)
src/server/frontend/default_ipc_factory.cpp (+3/-2)
src/server/frontend/default_ipc_factory.h (+6/-3)
src/server/frontend/session_mediator.cpp (+4/-3)
src/server/frontend/session_mediator.h (+5/-2)
src/server/graphics/CMakeLists.txt (+0/-1)
src/server/graphics/default_configuration.cpp (+0/-24)
src/server/input/CMakeLists.txt (+8/-0)
src/server/input/builtin_cursor_images.cpp (+7/-2)
src/server/input/builtin_cursor_images.h (+7/-9)
src/server/input/default_configuration.cpp (+37/-0)
src/server/input/xcursor_loader.cpp (+152/-0)
src/server/input/xcursor_loader.h (+71/-0)
tests/acceptance-tests/test_client_cursor_api.cpp (+9/-3)
tests/unit-tests/CMakeLists.txt (+3/-0)
tests/unit-tests/frontend/test_session_mediator.cpp (+1/-1)
tests/unit-tests/graphics/mesa/test_cursor.cpp (+104/-17)
tests/unit-tests/input/CMakeLists.txt (+1/-0)
tests/unit-tests/input/test_cursor_controller.cpp (+1/-0)
tests/unit-tests/input/test_xcursor_loader.cpp (+157/-0)
tests/unit-tests/input/testing-cursor-theme/default/cursors/arrow.in (+1/-0)
tests/unit-tests/input/testing-cursor-theme/default/cursors/blue.in (+1/-0)
tests/unit-tests/input/testing-cursor-theme/default/cursors/generate-theme.sh (+5/-0)
tests/unit-tests/input/testing-cursor-theme/default/cursors/green.in (+1/-0)
tests/unit-tests/input/testing-cursor-theme/default/cursors/red.in (+1/-0)
Branch information
Recent revisions
This branch has not been scanned yet.
Branch metadata
- Branch format:
- Branch format 7
- Repository format:
- Bazaar repository format 2a (needs bzr 1.16 or later)
- Stacked on:
- lp:mir/ubuntu