diff options
author | Chris Young <chris@unsatisfactorysoftware.co.uk> | 2016-06-01 18:48:37 +0100 |
---|---|---|
committer | Chris Young <chris@unsatisfactorysoftware.co.uk> | 2016-06-01 18:48:37 +0100 |
commit | a4ed8bf4c9900e0361636dd95a98cf26a54a2e8a (patch) | |
tree | f778ba8e4e041ec04bae0ffe5eb7bd7a499804f7 /frontends | |
parent | e1dea53d2aa5e44df2fa17fd18885ffd901b1fba (diff) | |
download | netsurf-a4ed8bf4c9900e0361636dd95a98cf26a54a2e8a.tar.gz netsurf-a4ed8bf4c9900e0361636dd95a98cf26a54a2e8a.tar.bz2 |
Make more drag-related global variables private
Diffstat (limited to 'frontends')
-rw-r--r-- | frontends/amiga/drag.c | 10 | ||||
-rw-r--r-- | frontends/amiga/drag.h | 6 | ||||
-rw-r--r-- | frontends/amiga/gui.c | 2 | ||||
-rw-r--r-- | frontends/amiga/theme.c | 2 |
4 files changed, 12 insertions, 8 deletions
diff --git a/frontends/amiga/drag.c b/frontends/amiga/drag.c index eaae8ca1e..9fdd1972d 100644 --- a/frontends/amiga/drag.c +++ b/frontends/amiga/drag.c @@ -46,7 +46,9 @@ #include "amiga/gui.h" #include "amiga/theme.h" - +static void *drag_save_data; +static int drag_save; +static struct gui_window *drag_save_gui; static struct Window *drag_icon = NULL; static ULONG drag_icon_width; static ULONG drag_icon_height; @@ -277,6 +279,12 @@ BOOL ami_drag_in_progress(void) return drag_in_progress; } +bool ami_drag_has_data(void) +{ + if(drag_save_data != NULL) return true; + else return false; +} + static void *ami_find_gwin_by_id(struct Window *win, uint32 type) { struct nsObject *node, *nnode; diff --git a/frontends/amiga/drag.h b/frontends/amiga/drag.h index bae060ef1..7048a10fc 100644 --- a/frontends/amiga/drag.h +++ b/frontends/amiga/drag.h @@ -26,18 +26,14 @@ struct Window; #define AMI_DRAG_THRESHOLD 10 -int drag_save; -void *drag_save_data; -struct gui_window *drag_save_gui; - void gui_drag_save_selection(struct gui_window *g, const char *selection); void gui_drag_save_object(struct gui_window *g, struct hlcache_handle *c, gui_save_type type); - void ami_drag_save(struct Window *win); void ami_drag_icon_show(struct Window *win, const char *type); void ami_drag_icon_close(struct Window *win); bool ami_drag_icon_move(void); BOOL ami_drag_in_progress(void); +bool ami_drag_has_data(void); void *ami_window_at_pointer(int type); diff --git a/frontends/amiga/gui.c b/frontends/amiga/gui.c index 9490ab19b..d7178bcdb 100644 --- a/frontends/amiga/gui.c +++ b/frontends/amiga/gui.c @@ -2169,7 +2169,7 @@ static void ami_handle_msg(void) #endif } - if(drag_save_data && !gwin->mouse_state) + if(ami_drag_has_data() && !gwin->mouse_state) ami_drag_save(gwin->win); break; diff --git a/frontends/amiga/theme.c b/frontends/amiga/theme.c index f0fa31db8..40a9503c8 100644 --- a/frontends/amiga/theme.c +++ b/frontends/amiga/theme.c @@ -221,7 +221,7 @@ 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(ami_drag_has_data()) return; /**\todo check this shouldn't be drag_in_progress */ if(LIB_IS_AT_LEAST((struct Library *)IntuitionBase, 53, 42)) { #ifdef __amigaos4__ |