Gitweb links:
...log
http://git.netsurf-browser.org/netsurf.git/shortlog/a4ed8bf4c9900e0361636dd95a98cf26a54a2e8a
...commit
http://git.netsurf-browser.org/netsurf.git/commit/a4ed8bf4c9900e0361636dd95a98cf26a54a2e8a
...tree
http://git.netsurf-browser.org/netsurf.git/tree/a4ed8bf4c9900e0361636dd95a98cf26a54a2e8a
The branch, master has been updated
via a4ed8bf4c9900e0361636dd95a98cf26a54a2e8a (commit)
via e1dea53d2aa5e44df2fa17fd18885ffd901b1fba (commit)
from 0bbb4f5a2a9d4fa3f29bcd9fc041646fc68a54be (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commitdiff
http://git.netsurf-browser.org/netsurf.git/commit/?id=a4ed8bf4c9900e0361636dd95a98cf26a54a2e8a
commit a4ed8bf4c9900e0361636dd95a98cf26a54a2e8a
Author: Chris Young <[email protected]>
Commit: Chris Young <[email protected]>
Make more drag-related global variables private
diff --git a/frontends/amiga/drag.c b/frontends/amiga/drag.c
index eaae8ca..9fdd197 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 bae060e..7048a10 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 9490ab1..d7178bc 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 f0fa31d..40a9503 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__
commitdiff
http://git.netsurf-browser.org/netsurf.git/commit/?id=e1dea53d2aa5e44df2fa17fd18885ffd901b1fba
commit e1dea53d2aa5e44df2fa17fd18885ffd901b1fba
Author: Chris Young <[email protected]>
Commit: Chris Young <[email protected]>
Make ami_autoscroll private to drag.c
diff --git a/frontends/amiga/drag.c b/frontends/amiga/drag.c
index 122ecd1..eaae8ca 100644
--- a/frontends/amiga/drag.c
+++ b/frontends/amiga/drag.c
@@ -47,10 +47,11 @@
#include "amiga/theme.h"
-struct Window *drag_icon = NULL;
-ULONG drag_icon_width;
-ULONG drag_icon_height;
-BOOL drag_in_progress = FALSE;
+static struct Window *drag_icon = NULL;
+static ULONG drag_icon_width;
+static ULONG drag_icon_height;
+static BOOL drag_in_progress = FALSE;
+static bool ami_autoscroll = false;
void gui_drag_save_object(struct gui_window *g, struct hlcache_handle *c,
gui_save_type type)
@@ -97,7 +98,7 @@ void gui_drag_save_selection(struct gui_window *g, const char
*selection)
{
ami_drag_icon_show(g->shared->win, "ascii");
- ami_autoscroll = TRUE;
+ ami_autoscroll = true;
drag_save_data = g;
drag_save = GUI_SAVE_TEXT_SELECTION;
}
@@ -108,7 +109,7 @@ void ami_drag_save(struct Window *win)
char path[1025], dpath[1025];
ami_drag_icon_close(NULL);
- ami_autoscroll = FALSE;
+ ami_autoscroll = true;
if(nsoption_charp(pubscreen_name) &&
(strcmp(nsoption_charp(pubscreen_name),"Workbench") == 0))
{
@@ -246,13 +247,15 @@ void ami_drag_icon_show(struct Window *win, const char
*type)
TAG_DONE);
}
-void ami_drag_icon_move(void)
+bool ami_drag_icon_move(void)
{
- if(drag_icon == NULL) return;
+ if(drag_icon == NULL) return FALSE;
ChangeWindowBox(drag_icon, scrn->MouseX - (drag_icon_width / 2),
scrn->MouseY - (drag_icon_height / 2),
drag_icon_width, drag_icon_height);
+
+ return ami_autoscroll;
}
/**
@@ -335,7 +338,7 @@ void ami_drag_icon_close(struct Window *win)
{
}
-void ami_drag_icon_move(void)
+bool ami_drag_icon_move(void)
{
}
diff --git a/frontends/amiga/drag.h b/frontends/amiga/drag.h
index ee67740..bae060e 100644
--- a/frontends/amiga/drag.h
+++ b/frontends/amiga/drag.h
@@ -36,7 +36,7 @@ void gui_drag_save_object(struct gui_window *g, struct
hlcache_handle *c, gui_sa
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);
-void ami_drag_icon_move(void);
+bool ami_drag_icon_move(void);
BOOL ami_drag_in_progress(void);
void *ami_window_at_pointer(int type);
diff --git a/frontends/amiga/gui.c b/frontends/amiga/gui.c
index f07383a..9490ab1 100644
--- a/frontends/amiga/gui.c
+++ b/frontends/amiga/gui.c
@@ -1989,9 +1989,7 @@ static void ami_handle_msg(void)
if(gwin->mouse_state &
BROWSER_MOUSE_DRAG_ON)
{
- ami_drag_icon_move();
-
- if(ami_autoscroll == TRUE) {
+ if(ami_drag_icon_move() ==
TRUE) {
if((gwin->win->MouseX <
bbox->Left) &&
((gwin->win->MouseX - bbox->Left) > -AMI_DRAG_THRESHOLD))
drag_x_move =
gwin->win->MouseX - bbox->Left;
diff --git a/frontends/amiga/gui.h b/frontends/amiga/gui.h
index 8289a5c..5ca1894 100644
--- a/frontends/amiga/gui.h
+++ b/frontends/amiga/gui.h
@@ -174,7 +174,6 @@ struct MinList *window_list;
struct Screen *scrn;
struct MsgPort *sport;
struct gui_window *cur_gw;
-BOOL ami_autoscroll;
void ami_get_msg(void);
void ami_try_quit(void);
-----------------------------------------------------------------------
Summary of changes:
frontends/amiga/drag.c | 31 +++++++++++++++++++++----------
frontends/amiga/drag.h | 8 ++------
frontends/amiga/gui.c | 6 ++----
frontends/amiga/gui.h | 1 -
frontends/amiga/theme.c | 2 +-
5 files changed, 26 insertions(+), 22 deletions(-)
diff --git a/frontends/amiga/drag.c b/frontends/amiga/drag.c
index 122ecd1..9fdd197 100644
--- a/frontends/amiga/drag.c
+++ b/frontends/amiga/drag.c
@@ -46,11 +46,14 @@
#include "amiga/gui.h"
#include "amiga/theme.h"
-
-struct Window *drag_icon = NULL;
-ULONG drag_icon_width;
-ULONG drag_icon_height;
-BOOL drag_in_progress = FALSE;
+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;
+static BOOL drag_in_progress = FALSE;
+static bool ami_autoscroll = false;
void gui_drag_save_object(struct gui_window *g, struct hlcache_handle *c,
gui_save_type type)
@@ -97,7 +100,7 @@ void gui_drag_save_selection(struct gui_window *g, const
char *selection)
{
ami_drag_icon_show(g->shared->win, "ascii");
- ami_autoscroll = TRUE;
+ ami_autoscroll = true;
drag_save_data = g;
drag_save = GUI_SAVE_TEXT_SELECTION;
}
@@ -108,7 +111,7 @@ void ami_drag_save(struct Window *win)
char path[1025], dpath[1025];
ami_drag_icon_close(NULL);
- ami_autoscroll = FALSE;
+ ami_autoscroll = true;
if(nsoption_charp(pubscreen_name) &&
(strcmp(nsoption_charp(pubscreen_name),"Workbench") == 0))
{
@@ -246,13 +249,15 @@ void ami_drag_icon_show(struct Window *win, const char
*type)
TAG_DONE);
}
-void ami_drag_icon_move(void)
+bool ami_drag_icon_move(void)
{
- if(drag_icon == NULL) return;
+ if(drag_icon == NULL) return FALSE;
ChangeWindowBox(drag_icon, scrn->MouseX - (drag_icon_width / 2),
scrn->MouseY - (drag_icon_height / 2),
drag_icon_width, drag_icon_height);
+
+ return ami_autoscroll;
}
/**
@@ -274,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;
@@ -335,7 +346,7 @@ void ami_drag_icon_close(struct Window *win)
{
}
-void ami_drag_icon_move(void)
+bool ami_drag_icon_move(void)
{
}
diff --git a/frontends/amiga/drag.h b/frontends/amiga/drag.h
index ee67740..7048a10 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);
-void ami_drag_icon_move(void);
+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 f07383a..d7178bc 100644
--- a/frontends/amiga/gui.c
+++ b/frontends/amiga/gui.c
@@ -1989,9 +1989,7 @@ static void ami_handle_msg(void)
if(gwin->mouse_state &
BROWSER_MOUSE_DRAG_ON)
{
- ami_drag_icon_move();
-
- if(ami_autoscroll == TRUE) {
+ if(ami_drag_icon_move() ==
TRUE) {
if((gwin->win->MouseX <
bbox->Left) &&
((gwin->win->MouseX - bbox->Left) > -AMI_DRAG_THRESHOLD))
drag_x_move =
gwin->win->MouseX - bbox->Left;
@@ -2171,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/gui.h b/frontends/amiga/gui.h
index 8289a5c..5ca1894 100644
--- a/frontends/amiga/gui.h
+++ b/frontends/amiga/gui.h
@@ -174,7 +174,6 @@ struct MinList *window_list;
struct Screen *scrn;
struct MsgPort *sport;
struct gui_window *cur_gw;
-BOOL ami_autoscroll;
void ami_get_msg(void);
void ami_try_quit(void);
diff --git a/frontends/amiga/theme.c b/frontends/amiga/theme.c
index f0fa31d..40a9503 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__
--
NetSurf Browser
_______________________________________________
netsurf-commits mailing list
[email protected]
http://listmaster.pepperfish.net/cgi-bin/mailman/listinfo/netsurf-commits-netsurf-browser.org
