ExternalVendorCode/genode
1
0
Fork 0
mirror of https://github.com/genodelabs/genode.git synced 2025-01-30 16:14:13 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

pointer: show default pointer on empty shape report

Browse Source
This commit is contained in:
Christian Helmuth 2018-05-09 15:46:40 +02:00
parent 0f7de9268d
commit cb3556877d
3 changed files with 42 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
repos/os/run/pointer.run
View File

@ -157,14 +157,14 @@ set config {
<provides> <service name="ROM"/> </provides> <provides> <service name="ROM"/> </provides>
<config> <config>
<rom name="smiley.config"> <rom name="smiley.config">
<inline description="smiley"> <inline description="smiley"> <config shape="smiley"/> </inline>
<config shape="smiley"/> <sleep milliseconds="800" />
</inline> <inline description="smiley"> <config shape="empty"/> </inline>
<sleep milliseconds="500" /> <sleep milliseconds="800" />
<inline description="yelims"> <inline description="yelims"> <config shape="yelims"/> </inline>
<config shape="yelims"/> <sleep milliseconds="800" />
</inline> <inline description="yelims"> <config shape="invisible"/> </inline>
<sleep milliseconds="500" /> <sleep milliseconds="800" />
</rom> </rom>
</config> </config>
<route> <route>

3
repos/os/src/app/pointer/main.cc
View File

@ -260,7 +260,8 @@ void Pointer::Main::_update_pointer()
shape_module.read_content(*this, (char*)&shape_report, sizeof(shape_report)); shape_module.read_content(*this, (char*)&shape_report, sizeof(shape_report));
if (shape_report.visible && /* show default pointer on invisible/empty/invalid shape report */
if (!shape_report.visible ||
((shape_report.width == 0) || ((shape_report.width == 0) ||
(shape_report.height == 0) || (shape_report.height == 0) ||
(shape_report.width > MAX_WIDTH) || (shape_report.width > MAX_WIDTH) ||

61
repos/os/src/test/pointer/main.cc
View File

@ -24,8 +24,11 @@ struct Shape
typedef Genode::String<16> Id; typedef Genode::String<16> Id;
Id const id; Id const id;
bool const visible;
unsigned const x_hot; unsigned const x_hot;
unsigned const y_hot; unsigned const y_hot;
unsigned const width;
unsigned const height;
unsigned char const map[WIDTH*HEIGHT]; unsigned char const map[WIDTH*HEIGHT];
void print(Genode::Output &output) const void print(Genode::Output &output) const
@ -36,7 +39,7 @@ struct Shape
static Shape const shape[] = { static Shape const shape[] = {
{ "arrow", 0, 0, { { "arrow", true, 0, 0, Shape::WIDTH, Shape::HEIGHT, {
1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,1,1,1,1,0,0,0,0,0,0,0,0,0,0,0, 0,1,1,1,1,0,0,0,0,0,0,0,0,0,0,0,
@ -53,24 +56,19 @@ static Shape const shape[] = {
0,0,0,0,0,0,0,0,0,0,1,0,1,0,0,0, 0,0,0,0,0,0,0,0,0,0,1,0,1,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 } }, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 } },
{ "blade", 0, 0, { { "blade", true, 0, 0, 11, 11, {
1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 1,1,0,0,0,0,0,0,0,0,0,
1,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0, 1,0,1,0,0,0,0,0,0,0,0,
0,1,0,1,0,0,0,0,0,0,0,0,0,0,0,0, 0,1,0,1,0,0,0,0,0,0,0,
0,0,1,0,1,0,0,0,0,0,0,0,0,0,0,0, 0,0,1,0,1,0,0,0,0,0,0,
0,0,0,1,0,1,0,0,0,0,0,0,0,0,0,0, 0,0,0,1,0,1,0,0,0,0,0,
0,0,0,0,1,0,1,0,0,0,0,0,0,0,0,0, 0,0,0,0,1,0,1,0,1,1,0,
0,0,0,0,0,1,0,1,0,0,0,0,0,0,0,0, 0,0,0,0,0,1,1,1,1,1,0,
0,0,0,0,0,0,1,0,1,0,0,0,0,0,0,0, 0,0,0,0,0,0,1,1,1,0,0,
0,0,0,0,0,0,0,1,0,1,0,0,0,0,0,0, 0,0,0,0,0,1,1,1,1,1,0,
0,0,0,0,0,0,0,0,1,0,1,0,1,1,0,0, 0,0,0,0,0,1,1,0,1,1,1,
0,0,0,0,0,0,0,0,0,1,1,1,1,1,0,0, 0,0,0,0,0,0,0,0,0,1,1 } },
0,0,0,0,0,0,0,0,0,0,1,1,1,0,0,0, { "bladex", true, 8, 8, Shape::WIDTH, Shape::HEIGHT, {
0,0,0,0,0,0,0,0,0,1,1,1,1,1,0,0,
0,0,0,0,0,0,0,0,0,1,1,0,1,1,1,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,1,1,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 } },
{ "bladex", 8, 8, {
1,1,0,0,0,0,0,0,0,0,0,0,0,0,1,1, 1,1,0,0,0,0,0,0,0,0,0,0,0,0,1,1,
1,0,1,0,0,0,0,0,0,0,0,0,0,1,0,1, 1,0,1,0,0,0,0,0,0,0,0,0,0,1,0,1,
0,1,0,1,0,0,0,0,0,0,0,0,1,0,1,0, 0,1,0,1,0,0,0,0,0,0,0,0,1,0,1,0,
@ -87,7 +85,7 @@ static Shape const shape[] = {
0,1,1,1,0,1,1,0,0,1,1,0,1,1,1,0, 0,1,1,1,0,1,1,0,0,1,1,0,1,1,1,0,
0,1,1,0,0,0,0,0,0,0,0,0,0,1,1,0, 0,1,1,0,0,0,0,0,0,0,0,0,0,1,1,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 } }, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 } },
{ "smiley", 8, 8, { { "smiley", true, 8, 8, Shape::WIDTH, Shape::HEIGHT, {
0,0,0,0,0,1,1,1,1,1,1,0,0,0,0,0, 0,0,0,0,0,1,1,1,1,1,1,0,0,0,0,0,
0,0,0,1,1,0,0,0,0,0,0,1,1,0,0,0, 0,0,0,1,1,0,0,0,0,0,0,1,1,0,0,0,
0,0,1,0,0,0,0,0,0,0,0,0,0,1,0,0, 0,0,1,0,0,0,0,0,0,0,0,0,0,1,0,0,
@ -104,7 +102,7 @@ static Shape const shape[] = {
0,0,1,0,0,0,0,0,0,0,0,0,0,1,0,0, 0,0,1,0,0,0,0,0,0,0,0,0,0,1,0,0,
0,0,0,1,1,0,0,0,0,0,0,1,1,0,0,0, 0,0,0,1,1,0,0,0,0,0,0,1,1,0,0,0,
0,0,0,0,0,1,1,1,1,1,1,0,0,0,0,0 } }, 0,0,0,0,0,1,1,1,1,1,1,0,0,0,0,0 } },
{ "yelims", 8, 8, { { "yelims", true, 8, 8, Shape::WIDTH, Shape::HEIGHT, {
0,0,0,0,0,1,1,1,1,1,1,0,0,0,0,0, 0,0,0,0,0,1,1,1,1,1,1,0,0,0,0,0,
0,0,0,1,1,0,0,0,0,0,0,1,1,0,0,0, 0,0,0,1,1,0,0,0,0,0,0,1,1,0,0,0,
0,0,1,0,0,0,0,0,0,0,0,0,0,1,0,0, 0,0,1,0,0,0,0,0,0,0,0,0,0,1,0,0,
@ -120,7 +118,9 @@ static Shape const shape[] = {
0,1,0,1,0,0,0,0,0,0,0,0,1,0,1,0, 0,1,0,1,0,0,0,0,0,0,0,0,1,0,1,0,
0,0,1,0,0,0,0,0,0,0,0,0,0,1,0,0, 0,0,1,0,0,0,0,0,0,0,0,0,0,1,0,0,
0,0,0,1,1,0,0,0,0,0,0,1,1,0,0,0, 0,0,0,1,1,0,0,0,0,0,0,1,1,0,0,0,
0,0,0,0,0,1,1,1,1,1,1,0,0,0,0,0 } } 0,0,0,0,0,1,1,1,1,1,1,0,0,0,0,0 } },
{ "empty", true, 0, 0, 0, 0, { } },
{ "invisible", false, 0, 0, Shape::WIDTH, Shape::HEIGHT, { } },
}; };
@ -158,18 +158,21 @@ struct Main
Shape const &shape = select_shape(_config.xml()); Shape const &shape = select_shape(_config.xml());
_shape_report.x_hot = shape.x_hot; _shape_report.visible = shape.visible;
_shape_report.y_hot = shape.y_hot; _shape_report.x_hot = shape.x_hot;
_shape_report.y_hot = shape.y_hot;
_shape_report.width = shape.width;
_shape_report.height = shape.height;
unsigned const w = Shape::WIDTH; unsigned const w = shape.width;
unsigned const h = Shape::HEIGHT; unsigned const h = shape.height;
for (unsigned y = 0; y < h; ++y) { for (unsigned y = 0; y < h; ++y) {
for (unsigned x = 0; x < w; ++x) { for (unsigned x = 0; x < w; ++x) {
_shape_report.shape[(y*w + x)*4 + 0] = 0xff; _shape_report.shape[(y*w + x)*4 + 0] = 0xff;
_shape_report.shape[(y*w + x)*4 + 1] = 0xff; _shape_report.shape[(y*w + x)*4 + 1] = 0xf2;
_shape_report.shape[(y*w + x)*4 + 2] = 0xff; _shape_report.shape[(y*w + x)*4 + 2] = 0xac;
_shape_report.shape[(y*w + x)*4 + 3] = shape.map[y*w +x] ? 0xe0 : 0; _shape_report.shape[(y*w + x)*4 + 3] = shape.map[y*w + x] ? 0xe0 : 0;
} }
} }