diff options
| author | Chris Young <chris@unsatisfactorysoftware.co.uk> | 2013-10-12 11:52:08 +0100 |
|---|---|---|
| committer | Chris Young <chris@unsatisfactorysoftware.co.uk> | 2013-10-12 11:52:08 +0100 |
| commit | 67f957df39114368262c70e763d38dfd33801a10 (patch) | |
| tree | e46ab52b65f15e84d0fc942778b6995c9a390905 /amiga | |
| parent | 5d2f4b0b98317eae6362bd444a3ca333c1b98f9e (diff) | |
| download | netsurf-67f957df39114368262c70e763d38dfd33801a10.tar.gz netsurf-67f957df39114368262c70e763d38dfd33801a10.tar.bz2 | |
Force usage of OS pointers for OS4.1, there's no reason to use custom ones now.
Diffstat (limited to 'amiga')
| -rwxr-xr-x | amiga/gui_options.c | 9 | ||||
| -rw-r--r-- | amiga/theme.c | 12 |
2 files changed, 18 insertions, 3 deletions
diff --git a/amiga/gui_options.c b/amiga/gui_options.c index a1bd2914b..c98511d5b 100755 --- a/amiga/gui_options.c +++ b/amiga/gui_options.c @@ -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, diff --git a/amiga/theme.c b/amiga/theme.c index 5874ba62c..512173db5 100644 --- a/amiga/theme.c +++ b/amiga/theme.c @@ -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++) |