← Back to branch summary

~vanvugt/mir/fix-1315302

~vanvugt/mir/fix-1315302

« back to all changes in this revision

Viewing changes to src/platform/graphics/android/android_display.h

Committer: Tarmac
Author(s): Robert Carr
Date: 2014-04-29 23:27:11 UTC
mfrom: (1478.3.18 cursor-spike-phase-1-resubmit-resubmit-resubmit-hello-out-there)
Revision ID: tarmac-20140429232711-rnpgnyp1xo11csdu

Extract cursor image from the builtin cursor in preparation for client cursor API.

Approved by PS Jenkins bot, Alberto Aguirre, Chris Halse Rogers.

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

include/server/mir/graphics/cursor_images.h

src/server/graphics/builtin_cursor_images.cpp

src/server/graphics/builtin_cursor_images.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/default_server_configuration.cpp

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/platform/graphics/android/android_display.h

65

65

void pause();

66

66

void resume();

67

67

68

std::weak_ptr<Cursor> the_cursor();

68

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

69

69

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

70

70

71

71

private:

Older »