mirrors
/
netsurf
mirror of https://github.com/netsurf-browser/netsurf
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Force usage of OS pointers for OS4.1, there's no reason to use custom ones now.

This commit is contained in:
Chris Young 2013-10-12 11:52:08 +01:00
parent 5d2f4b0b98
commit 67f957df39
2 changed files with 18 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
amiga/gui_options.c
View File

@ -407,6 +407,7 @@ void ami_gui_opts_open(void)
BOOL disableanims, animspeeddisabled = FALSE, acceptlangdisabled = FALSE;
BOOL scaleselected = nsoption_bool(scale_quality), scaledisabled = FALSE;
BOOL download_notify_disabled = FALSE;
BOOL ptr_disable = FALSE;
char animspeed[10];
struct TextAttr fontsans, fontserif, fontmono, fontcursive, fontfantasy;
@ -417,6 +418,12 @@ void ami_gui_opts_open(void)
return;
}
if(IntuitionBase->LibNode.lib_Version >= 53) {
nsoption_set_bool(os_mouse_pointers, true);
nsoption_set_bool(truecolour_mouse_pointers, true);
ptr_disable = TRUE;
}
if(nsoption_charp(pubscreen_name))
{
if(strcmp(nsoption_charp(pubscreen_name),"Workbench") == 0)
@ -742,6 +749,7 @@ void ami_gui_opts_open(void)
GA_RelVerify, TRUE,
GA_Text, gadlab[GID_OPTS_PTRTRUE],
GA_Selected, nsoption_bool(truecolour_mouse_pointers),
GA_Disabled, ptr_disable,
CheckBoxEnd,
#endif
LAYOUT_AddChild, gow->objects[GID_OPTS_PTROS] = CheckBoxObject,
@ -749,6 +757,7 @@ void ami_gui_opts_open(void)
GA_RelVerify, TRUE,
GA_Text, gadlab[GID_OPTS_PTROS],
GA_Selected, nsoption_bool(os_mouse_pointers),
GA_Disabled, ptr_disable,
CheckBoxEnd,
LayoutEnd, // mouse
CHILD_WeightedHeight,0,

12
amiga/theme.c
View File

@ -217,6 +217,10 @@ void ami_reset_pointer(struct gui_window_2 *gwin)
void ami_update_pointer(struct Window *win, gui_pointer_shape shape)
{
if(drag_save_data) return;
if(IntuitionBase->LibNode.lib_Version >= 53) {
SetWindowPointer(win, WA_PointerType, osmouseptr[shape], TAG_DONE);
return;
}
if(nsoption_bool(os_mouse_pointers))
{
@ -234,9 +238,7 @@ void ami_update_pointer(struct Window *win, gui_pointer_shape shape)
break;
default:
if((IntuitionBase->LibNode.lib_Version >= 53) && (osmouseptr[shape] != -1)) {
SetWindowPointer(win, WA_PointerType, osmouseptr[shape], TAG_DONE);
} else if(mouseptrobj[shape]) {
if(mouseptrobj[shape]) {
SetWindowPointer(win, WA_Pointer, mouseptrobj[shape], TAG_DONE);
} else {
SetWindowPointer(win, TAG_DONE);
@ -274,6 +276,8 @@ void gui_window_hide_pointer(struct gui_window *g)
void ami_init_mouse_pointers(void)
{
if(IntuitionBase->LibNode.lib_Version >= 53) return;
int i;
struct RastPort mouseptr;
struct DiskObject *dobj;
@ -390,6 +394,8 @@ void ami_init_mouse_pointers(void)
void ami_mouse_pointers_free(void)
{
if(IntuitionBase->LibNode.lib_Version >= 53) return;
int i;
for(i=0;i<=AMI_LASTPOINTER;i++)