← Back to branch summary

~mir-team/mir/cursor-spike-phase-2

~mir-team/mir/cursor-spike-phase-2

« back to all changes in this revision

Viewing changes to src/server/graphics/nested/nested_display.h

Committer: Robert Carr
Date: 2014-03-17 20:31:28 UTC
mfrom: (1466.2.3 normalize-cursor-construction)
Revision ID: robert.carr@canonical.com-20140317203128-mkva75svxory6ty0

Add CursorImage and CursorRepository interfaces. Port the builtin cursor to these and port the GBM cursor to use them

files added:
include/platform/mir/graphics/cursor_image.h

include/platform/mir/graphics/cursor_repository.h

src/server/graphics/builtin_cursor_repository.cpp

src/server/graphics/builtin_cursor_repository.h

files renamed:
src/platform/graphics/mesa/black_arrow.c => src/server/graphics/black_arrow.c

src/platform/graphics/mesa/black_arrow.xcf => src/server/graphics/black_arrow.xcf

files modified:
examples/render_surfaces.cpp

include/platform/mir/graphics/cursor.h

include/platform/mir/graphics/display.h

include/server/mir/default_server_configuration.h

include/test/mir_test_doubles/mock_display.h

include/test/mir_test_doubles/null_display.h

src/platform/graphics/android/android_display.cpp

src/platform/graphics/android/android_display.h

src/platform/graphics/mesa/cursor.cpp

src/platform/graphics/mesa/cursor.h

src/platform/graphics/mesa/display.cpp

src/platform/graphics/mesa/display.h

src/server/graphics/CMakeLists.txt

src/server/graphics/default_configuration.cpp

src/server/graphics/nested/nested_display.cpp

src/server/graphics/nested/nested_display.h

src/server/graphics/offscreen/display.cpp

src/server/graphics/offscreen/display.h

tests/unit-tests/graphics/mesa/test_cursor.cpp

Show diffs side-by-side

added added

removed removed

src/server/graphics/nested/nested_display.h

117

117

void pause() override;

118

118

void resume() override;

119

119

120

std::shared_ptr<Cursor> create_hardware_cursor() override;

120

std::shared_ptr<Cursor> create_hardware_cursor(std::shared_ptr<CursorImage> const& initial_image) override;

121

121

std::unique_ptr<graphics::GLContext> create_gl_context() override;

122

122

123

123

private:

Older »