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

[project @ 2003-09-30 23:30:36 by jmb]

Browse Source 
Split mouseactions code from gui.c

svn path=/import/netsurf/; revision=337
This commit is contained in:
John Mark Bell 2003-09-30 23:30:36 +00:00
parent ba64beed38
commit 563b8f6335
4 changed files with 297 additions and 242 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
makefile
View File

@ -12,8 +12,10 @@ OBJECTS_COMMON = cache.o content.o fetch.o fetchcache.o other.o \
messages.o utils.o
OBJECTS = $(OBJECTS_COMMON) \
browser.o netsurf.o \
dialog.o download.o gif.o gui.o jpeg.o menus.o png.o theme.o plugin.o \
options.o filetype.o font.o uri.o htmlredraw.o sprite.o draw.o about.o
htmlredraw.o \
dialog.o download.o gui.o menus.o mouseactions.o options.o theme.o \
draw.o gif.o jpeg.o plugin.o png.o sprite.o \
about.o filetype.o font.o uri.o
OBJECTS_DEBUG = $(OBJECTS_COMMON) \
netsurfd.o \
optionsd.o filetyped.o fontd.o

240
riscos/gui.c
View File

@ -45,14 +45,6 @@ const char* HOME_URL = "file:///%3CNetSurf$Dir%3E/Resources/intro";
const char* HELP_URL = "file:///%3CNetSurf$Dir%3E/Docs/en/index";
struct ro_gui_drag_info;
typedef enum {
mouseaction_NONE,
mouseaction_BACK, mouseaction_FORWARD,
mouseaction_RELOAD, mouseaction_PARENT,
mouseaction_NEWWINDOW_OR_LINKFG, mouseaction_DUPLICATE_OR_LINKBG,
mouseaction_TOGGLESIZE, mouseaction_ICONISE, mouseaction_CLOSE
} mouseaction;
int ro_x_units(unsigned long browser_units);
int ro_y_units(unsigned long browser_units);
@ -79,9 +71,6 @@ static void ro_gui_drag_box(wimp_drag* drag, struct ro_gui_drag_info* drag_info)
static void ro_gui_drag_end(wimp_dragged* drag);
static void ro_gui_window_mouse_at(wimp_pointer* pointer);
static void ro_gui_toolbar_click(gui_window* g, wimp_pointer* pointer);
static double calculate_angle(double x, double y);
static int anglesDifferent(double a, double b);
static mouseaction ro_gui_try_mouse_action(void);
static void ro_gui_poll_queue(wimp_event_no event, wimp_block* block);
static void ro_gui_keypress(wimp_key* key);
static void ro_msg_datasave(wimp_message* block);
@ -834,204 +823,6 @@ void ro_gui_toolbar_click(gui_window* g, wimp_pointer* pointer)
}
double calculate_angle(double x, double y)
{
double a;
if (x == 0.0)
{
if (y < 0.0)
a = 0.0;
else
a = M_PI;
}
else
{
a = atan(y / x);
if (x > 0.0)
a += M_PI_2;
else
a -= M_PI_2;
}
return a;
}
int anglesDifferent(double a, double b)
{
double c;
if (a < 0.0)
a += M_2_PI;
if (b < 0.0)
b += M_2_PI;
if (a > M_2_PI)
a -= M_2_PI;
if (b > M_2_PI)
b -= M_2_PI;
c = a - b;
if (c < 0.0)
c += M_2_PI;
if (c > M_2_PI)
c -= M_2_PI;
return (c > M_PI / 6.0);
}
#define STOPPED 2
#define THRESHOLD 16
#define DAMPING 1
mouseaction ro_gui_try_mouse_action(void)
{
os_coord start, current, last, offset, moved;
double offsetDistance, movedDistance;
double angle, oldAngle;
bits z;
os_coord now;
int status;
int m;
enum {move_NONE, move_LEFT, move_RIGHT, move_UP, move_DOWN} moves[5];
moves[0] = move_NONE;
m = 1;
os_mouse(&start.x, &start.y, &z, &now);
status = 0;
do
{
os_mouse(&current.x, &current.y, &z, &now);
offset.x = current.x - start.x;
offset.y = current.y - start.y;
moved.x = current.x - last.x;
moved.y = current.y - last.y;
offsetDistance = sqrt(offset.x * offset.x + offset.y * offset.y);
if (moved.x > 0 || moved.y > 0)
movedDistance = sqrt(moved.x * moved.x + moved.y * moved.y);
else
movedDistance = 0.0;
angle = calculate_angle(offset.x, offset.y);
switch (status)
{
case 1:
if (movedDistance < STOPPED ||
(movedDistance > STOPPED*2.0 && anglesDifferent(angle, oldAngle)))
{
start.x = current.x;
start.y = current.y;
status = 0;
}
break;
case 0:
if (offsetDistance > THRESHOLD)
{
if (fabs(offset.x) > fabs(offset.y))
{
if (fabs(offset.y) < fabs(offset.x) * DAMPING && fabs(offset.x) > THRESHOLD*0.75)
{
if (offset.x < 0)
moves[m] = move_LEFT;
else
moves[m] = move_RIGHT;
if (moves[m] != moves[m-1])
m++;
start.x = current.x;
start.y = current.y;
oldAngle = angle;
status = 1;
}
}
else if (fabs(offset.y) > fabs(offset.x))
{
if (fabs(offset.x) < fabs(offset.y) * DAMPING && fabs(offset.y) > THRESHOLD*0.75)
{
if (offset.y < 0)
moves[m] = move_DOWN;
else
moves[m] = move_UP;
if (moves[m] != moves[m-1])
m++;
start.x = current.x;
start.y = current.y;
oldAngle = angle;
status = 1;
}
}
}
break;
}
last.x = current.x;
last.y = current.y;
LOG(("m = %d", m));
} while ((z & 2) != 0 && m < 4);
LOG(("MOUSEACTIONS: %d %d %d %d\n",moves[0], moves[1], moves[2], moves[3]));
if (m == 2)
{
switch (moves[1])
{
case move_LEFT:
LOG(("mouse action: go back"));
return mouseaction_BACK;
case move_RIGHT:
LOG(("MOUSE ACTION: GO FORWARD"));
return mouseaction_FORWARD;
case move_DOWN:
LOG(("mouse action: create new window // open link in new window, foreground"));
return mouseaction_NEWWINDOW_OR_LINKFG;
}
}
if (m == 3)
{
switch (moves[1])
{
case move_UP:
switch (moves[2])
{
case move_DOWN:
LOG(("mouse action: reload"));
return mouseaction_RELOAD;
case move_RIGHT:
LOG(("mouse action: toggle size"));
return mouseaction_TOGGLESIZE;
case move_LEFT:
LOG(("mouse action: parent directroy"));
return mouseaction_PARENT;
}
break;
case move_DOWN:
switch (moves[2])
{
case move_LEFT:
LOG(("mouse action: iconise"));
return mouseaction_ICONISE;
case move_UP:
LOG(("mouse action: duplicate // open link in new window, background"));
return mouseaction_DUPLICATE_OR_LINKBG;
case move_RIGHT:
LOG(("mouse action: close"));
return mouseaction_CLOSE;
}
break;
}
}
if (m == 4)
{
if (moves[1] == move_RIGHT && moves[2] == move_LEFT &&
moves[3] == move_RIGHT)
{
LOG(("mouse action: close window"));
return mouseaction_CLOSE;
}
}
return mouseaction_NONE;
}
void ro_gui_window_click(gui_window* g, wimp_pointer* pointer)
{
struct browser_action msg;
@ -1055,36 +846,7 @@ void ro_gui_window_click(gui_window* g, wimp_pointer* pointer)
if (pointer->buttons == wimp_CLICK_MENU)
{
/* check for mouse gestures */
mouseaction ma = mouseaction_NONE;
if (OPTIONS.use_mouse_gestures)
ma = ro_gui_try_mouse_action();
if (ma == mouseaction_NONE)
{
os_t now;
int z;
os_mouse(&x, &y, &z, &now);
ro_gui_create_menu(browser_menu, x - 64, y, g);
}
else
{
fprintf(stderr, "MOUSE GESTURE %d\n", ma);
switch (ma)
{
case mouseaction_BACK:
browser_window_back(g->data.browser.bw);
break;
case mouseaction_FORWARD:
browser_window_forward(g->data.browser.bw);
break;
case mouseaction_RELOAD:
browser_window_open_location_historical(g->data.browser.bw, g->data.browser.bw->url);
break;
}
}
ro_gui_mouse_action(g);
}
else if (g->data.browser.bw->current_content != NULL)
{

4
riscos/gui.h
View File

@ -61,7 +61,6 @@ struct gui_window
enum { drag_NONE, drag_UNKNOWN, drag_BROWSER_TEXT_SELECTION } drag_status;
};
/* in gui.c */
void ro_gui_copy_selection(gui_window* g);
void ro_gui_open_help_page(void);
@ -82,6 +81,9 @@ void ro_gui_theme_menu_selection(char *theme);
/* in download.c */
void ro_gui_download_init(void);
/* in mouseactions.c */
void ro_gui_mouse_action(gui_window* g);
/* icon numbers */
#define ICON_CONFIG_SAVE 0
#define ICON_CONFIG_CANCEL 1

289
riscos/mouseactions.c Normal file
View File

@ -0,0 +1,289 @@
/*
* This file is part of NetSurf, http://netsurf.sourceforge.net/
* Licensed under the GNU General Public License,
* http://www.opensource.org/licenses/gpl-license
* Copyright 2003 Phil Mellor <monkeyson@users.sourceforge.net>
*/
#include <math.h>
#include "oslib/os.h"
#include "netsurf/desktop/browser.h"
#include "netsurf/desktop/options.h"
#include "netsurf/riscos/gui.h"
#include "netsurf/utils/log.h"
typedef enum {
mouseaction_NONE,
mouseaction_BACK, mouseaction_FORWARD,
mouseaction_RELOAD, mouseaction_PARENT,
mouseaction_NEWWINDOW_OR_LINKFG, mouseaction_DUPLICATE_OR_LINKBG,
mouseaction_TOGGLESIZE, mouseaction_ICONISE, mouseaction_CLOSE
} mouseaction;
static double calculate_angle(double x, double y);
static int anglesDifferent(double a, double b);
static mouseaction ro_gui_try_mouse_action(void);
void ro_gui_mouse_action(gui_window *g) {
int x, y;
mouseaction ma = mouseaction_NONE;
if (OPTIONS.use_mouse_gestures)
ma = ro_gui_try_mouse_action();
if (ma == mouseaction_NONE) {
os_mouse(&x, &y, NULL, NULL);
ro_gui_create_menu(browser_menu, x - 64, y, g);
}
else {
LOG(("MOUSE GESTURE %d", ma));
switch (ma) {
case mouseaction_BACK:
browser_window_back(g->data.browser.bw);
break;
case mouseaction_FORWARD:
browser_window_forward(g->data.browser.bw);
break;
case mouseaction_RELOAD:
browser_window_open_location_historical(g->data.browser.bw,
g->data.browser.bw->url);
break;
}
}
}
double calculate_angle(double x, double y) {
double a;
if (x == 0.0) {
if (y < 0.0)
a = 0.0;
else
a = M_PI;
}
else {
a = atan(y / x);
if (x > 0.0)
a += M_PI_2;
else
a -= M_PI_2;
}
return a;
}
int anglesDifferent(double a, double b) {
double c;
if (a < 0.0)
a += M_2_PI;
if (b < 0.0)
b += M_2_PI;
if (a > M_2_PI)
a -= M_2_PI;
if (b > M_2_PI)
b -= M_2_PI;
c = a - b;
if (c < 0.0)
c += M_2_PI;
if (c > M_2_PI)
c -= M_2_PI;
return (c > M_PI / 6.0);
}
#define STOPPED 2
#define THRESHOLD 16
#define DAMPING 1
/* TODO - something in the following function causes a segfault when
* mouse actions are turned on. Obviously this needs fixing.
*/
mouseaction ro_gui_try_mouse_action(void) {
os_coord start, current, last, offset, moved;
double offsetDistance, movedDistance;
double angle, oldAngle=0.0;
bits z;
os_t now;
int status;
int m;
enum {move_NONE, move_LEFT, move_RIGHT, move_UP, move_DOWN} moves[5];
moves[0] = move_NONE;
m = 1;
os_mouse(&start.x, &start.y, &z, &now);
status = 0;
do {
os_mouse(&current.x, &current.y, &z, &now);
offset.x = current.x - start.x;
offset.y = current.y - start.y;
moved.x = current.x - last.x;
moved.y = current.y - last.y;
offsetDistance = sqrt((offset.x * offset.x + offset.y * offset.y));
if (moved.x > 0 || moved.y > 0)
movedDistance = sqrt((moved.x * moved.x + moved.y * moved.y));
else
movedDistance = 0.0;
angle = calculate_angle(offset.x, offset.y);
switch (status) {
case 1:
if (movedDistance < STOPPED ||
(movedDistance > STOPPED*2.0 && anglesDifferent(angle, oldAngle))) {
start.x = current.x;
start.y = current.y;
status = 0;
}
break;
case 0:
if (offsetDistance > THRESHOLD) {
if (fabs(offset.x) > fabs(offset.y)) {
if (fabs(offset.y) < fabs(offset.x) * DAMPING &&
fabs(offset.x) > THRESHOLD*0.75) {
if (offset.x < 0)
moves[m] = move_LEFT;
else
moves[m] = move_RIGHT;
if (moves[m] != moves[m-1])
m++;
start.x = current.x;
start.y = current.y;
oldAngle = angle;
status = 1;
}
}
else if (fabs(offset.y) > fabs(offset.x)) {
if (fabs(offset.x) < fabs(offset.y) * DAMPING &&
fabs(offset.y) > THRESHOLD*0.75) {
if (offset.y < 0)
moves[m] = move_DOWN;
else
moves[m] = move_UP;
if (moves[m] != moves[m-1])
m++;
start.x = current.x;
start.y = current.y;
oldAngle = angle;
status = 1;
}
}
}
break;
}
last.x = current.x;
last.y = current.y;
} while ((z & 2) != 0 && m < 4);
LOG(("MOUSEACTIONS: %d %d %d %d\n", moves[0], moves[1],
moves[2], moves[3]));
if (m == 2) {
switch (moves[1]) {
case move_LEFT:
LOG(("mouse action: go back"));
return mouseaction_BACK;
case move_RIGHT:
LOG(("MOUSE ACTION: GO FORWARD"));
return mouseaction_FORWARD;
case move_DOWN:
LOG(("mouse action: create new window // open link in new window, foreground"));
return mouseaction_NEWWINDOW_OR_LINKFG;
}
}
if (m == 3) {
switch (moves[1]) {
case move_UP:
switch (moves[2]) {
case move_DOWN:
LOG(("mouse action: reload"));
return mouseaction_RELOAD;
case move_RIGHT:
LOG(("mouse action: toggle size"));
return mouseaction_TOGGLESIZE;
case move_LEFT:
LOG(("mouse action: parent directroy"));
return mouseaction_PARENT;
}
break;
case move_DOWN:
switch (moves[2]) {
case move_LEFT:
LOG(("mouse action: iconise"));
return mouseaction_ICONISE;
case move_UP:
LOG(("mouse action: duplicate // open link in new window, background"));
return mouseaction_DUPLICATE_OR_LINKBG;
case move_RIGHT:
LOG(("mouse action: close"));
return mouseaction_CLOSE;
}
break;
}
}
if (m == 4) {
if (moves[1] == move_RIGHT && moves[2] == move_LEFT &&
moves[3] == move_RIGHT) {
LOG(("mouse action: close window"));
return mouseaction_CLOSE;
}
}
return mouseaction_NONE;
}