mirrors/netsurf
1
0
Fork 0
mirror of https://github.com/netsurf-browser/netsurf synced 2024-12-23 12:36:51 +03:00
Code Issues Packages Projects Releases Wiki Activity

Haiku: Better map mouse cursors

Browse Source 
Drop custom cursor bitmaps in favor of the system ones.

We only miss the wait cursor now, but the progress one should do.
This commit is contained in:
François Revol 2020-05-09 01:28:43 +02:00
parent 4b8ed9b777
commit 600b2ed60a
1 changed files with 51 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

116
frontends/beos/window.cpp
View File

@ -1108,93 +1108,79 @@ static void gui_window_update_extent(struct gui_window *g)
g->view->UnlockLooper(); g->view->UnlockLooper();
} }
/* some cursors like those in Firefox */ static BCursorID gui_haiku_pointer(gui_pointer_shape shape)
// XXX: move to separate file or resource ? {
switch (shape) {
case GUI_POINTER_POINT: /* link */
return B_CURSOR_ID_FOLLOW_LINK;
const uint8 kLinkCursorBits[] = { case GUI_POINTER_CARET: /* input */
16, /* cursor size */ return B_CURSOR_ID_I_BEAM;
1, /* bits per pixel */
2, /* vertical hot spot */
2, /* horizontal hot spot */
/* data */ case GUI_POINTER_MENU:
0x00, 0x00, 0x00, 0x00, 0x38, 0x00, 0x24, 0x00, 0x24, 0x00, 0x13, 0xe0, 0x12, 0x5c, 0x09, 0x2a, return B_CURSOR_ID_CONTEXT_MENU;
0x08, 0x01, 0x3c, 0x21, 0x4c, 0x71, 0x42, 0x71, 0x30, 0xf9, 0x0c, 0xf9, 0x02, 0x02, 0x01, 0x00,
/* mask */ case GUI_POINTER_UP:
0x00, 0x00, 0x00, 0x00, 0x38, 0x00, 0x3c, 0x00, 0x3c, 0x00, 0x1f, 0xe0, 0x1f, 0xfc, 0x0f, 0xfe, return B_CURSOR_ID_RESIZE_NORTH;
0x0f, 0xff, 0x3f, 0xff, 0x7f, 0xff, 0x7f, 0xff, 0x3f, 0xff, 0x0f, 0xff, 0x03, 0xfc, 0x01, 0xe0
};
const uint8 kWatchCursorBits[] = { case GUI_POINTER_DOWN:
16, /* cursor size */ return B_CURSOR_ID_RESIZE_SOUTH;
1, /* bits per pixel */
0, /* vertical hot spot */
1, /* horizontal hot spot */
/* data */ case GUI_POINTER_LEFT:
0x70, 0x00, 0x48, 0x00, 0x48, 0x00, 0x27, 0xc0, 0x24, 0xb8, 0x12, 0x54, 0x10, 0x02, 0x78, 0x02, return B_CURSOR_ID_RESIZE_WEST;
0x98, 0x02, 0x84, 0x02, 0x60, 0x3a, 0x18, 0x46, 0x04, 0x8a, 0x02, 0x92, 0x01, 0x82, 0x00, 0x45,
/* mask */ case GUI_POINTER_RIGHT:
0x70, 0x00, 0x78, 0x00, 0x78, 0x00, 0x3f, 0xc0, 0x3f, 0xf8, 0x1f, 0xfc, 0x1f, 0xfe, 0x7f, 0xfe, return B_CURSOR_ID_RESIZE_EAST;
0xff, 0xfe, 0xff, 0xfe, 0x7f, 0xfe, 0x1f, 0xfe, 0x07, 0xfe, 0x03, 0xfe, 0x01, 0xfe, 0x00, 0x7f
};
const uint8 kWatch2CursorBits[] = { case GUI_POINTER_RU:
16, /* cursor size */ return B_CURSOR_ID_RESIZE_NORTH_EAST;
1, /* bits per pixel */
0, /* vertical hot spot */
1, /* horizontal hot spot */
/* data */ case GUI_POINTER_LD:
0x70, 0x00, 0x48, 0x00, 0x48, 0x00, 0x27, 0xc0, 0x24, 0xb8, 0x12, 0x54, 0x10, 0x02, 0x78, 0x02, return B_CURSOR_ID_RESIZE_SOUTH_WEST;
0x98, 0x02, 0x84, 0x02, 0x60, 0x3a, 0x18, 0x46, 0x04, 0xa2, 0x02, 0x92, 0x01, 0xa2, 0x00, 0x45,
/* mask */ case GUI_POINTER_LU:
0x70, 0x00, 0x78, 0x00, 0x78, 0x00, 0x3f, 0xc0, 0x3f, 0xf8, 0x1f, 0xfc, 0x1f, 0xfe, 0x7f, 0xfe, return B_CURSOR_ID_RESIZE_NORTH_WEST;
0xff, 0xfe, 0xff, 0xfe, 0x7f, 0xfe, 0x1f, 0xfe, 0x07, 0xfe, 0x03, 0xfe, 0x01, 0xfe, 0x00, 0x7f
};
case GUI_POINTER_RD:
return B_CURSOR_ID_RESIZE_SOUTH_EAST;
case GUI_POINTER_CROSS:
return B_CURSOR_ID_CROSS_HAIR;
case GUI_POINTER_MOVE:
return B_CURSOR_ID_MOVE;
case GUI_POINTER_WAIT:
case GUI_POINTER_PROGRESS:
return B_CURSOR_ID_PROGRESS;
case GUI_POINTER_NO_DROP:
case GUI_POINTER_NOT_ALLOWED:
return B_CURSOR_ID_NOT_ALLOWED;
case GUI_POINTER_HELP:
return B_CURSOR_ID_HELP;
case GUI_POINTER_DEFAULT:
default:
break;
}
return B_CURSOR_ID_SYSTEM_DEFAULT;
}
static void gui_window_set_pointer(struct gui_window *g, gui_pointer_shape shape) static void gui_window_set_pointer(struct gui_window *g, gui_pointer_shape shape)
{ {
BCursor *cursor = NULL;
bool allocated = false;
if (g->current_pointer == shape) if (g->current_pointer == shape)
return; return;
g->current_pointer = shape; g->current_pointer = shape;
switch (shape) { BCursor cursor(gui_haiku_pointer(shape));
case GUI_POINTER_POINT:
cursor = new BCursor(kLinkCursorBits);
allocated = true;
break;
case GUI_POINTER_CARET:
cursor = (BCursor *)B_CURSOR_I_BEAM;
break;
case GUI_POINTER_WAIT:
cursor = new BCursor(kWatchCursorBits);
allocated = true;
break;
case GUI_POINTER_PROGRESS:
cursor = new BCursor(kWatch2CursorBits);
allocated = true;
break;
default:
cursor = (BCursor *)B_CURSOR_SYSTEM_DEFAULT;
allocated = false;
}
if (g->view && g->view->LockLooper()) { if (g->view && g->view->LockLooper()) {
g->view->SetViewCursor(cursor); g->view->SetViewCursor(&cursor);
g->view->UnlockLooper(); g->view->UnlockLooper();
} }
if (allocated)
delete cursor;
} }
static void gui_window_place_caret(struct gui_window *g, int x, int y, int height, static void gui_window_place_caret(struct gui_window *g, int x, int y, int height,