From 8711fbe47dd0381efd09717b719b79be3d819f49 Mon Sep 17 00:00:00 2001 From: Vincent Sanders Date: Mon, 30 May 2016 12:07:16 +0100 Subject: move mouse and pointer state header into public API --- content/content.h | 2 +- desktop/browser.h | 2 +- desktop/mouse.h | 117 ------------------------------- desktop/scrollbar.c | 2 +- desktop/selection.c | 2 +- desktop/selection.h | 2 +- desktop/sslcert_viewer.h | 2 +- desktop/textarea.c | 2 +- desktop/textinput.c | 2 +- desktop/tree.h | 2 +- desktop/treeview.h | 2 +- frontends/amiga/bitmap.c | 2 +- frontends/amiga/cookies.c | 2 +- frontends/amiga/ctxmenu.c | 2 +- frontends/amiga/download.c | 2 +- frontends/amiga/drag.c | 2 +- frontends/amiga/font_scan.c | 2 +- frontends/amiga/gui.c | 2 +- frontends/amiga/gui.h | 2 +- frontends/amiga/history.c | 2 +- frontends/amiga/hotlist.c | 2 +- frontends/amiga/login.c | 2 +- frontends/amiga/menu.c | 2 +- frontends/amiga/plotters.c | 2 +- frontends/amiga/print.c | 2 +- frontends/amiga/search.c | 2 +- frontends/amiga/selectmenu.c | 2 +- frontends/amiga/sslcert.c | 2 +- frontends/amiga/theme.c | 2 +- frontends/atari/bitmap.c | 2 +- frontends/atari/cookies.c | 2 +- frontends/atari/font.c | 2 +- frontends/atari/gui.h | 2 +- frontends/atari/history.c | 2 +- frontends/atari/misc.c | 2 +- frontends/atari/plot/font_freetype.c | 2 +- frontends/atari/plot/font_internal.c | 2 +- frontends/atari/plot/fontplot.c | 2 +- frontends/atari/plot/plot.c | 2 +- frontends/atari/rootwin.c | 2 +- frontends/atari/statusbar.c | 2 +- frontends/atari/toolbar.c | 2 +- frontends/atari/treeview.c | 2 +- frontends/beos/cookies.cpp | 2 +- frontends/beos/window.cpp | 2 +- frontends/cocoa/NetsurfApp.m | 2 +- frontends/cocoa/gui.m | 2 +- frontends/gtk/window.c | 2 +- frontends/monkey/browser.c | 2 +- frontends/riscos/help.c | 2 +- frontends/riscos/window.c | 2 +- frontends/windows/plot.c | 2 +- frontends/windows/window.h | 2 +- include/netsurf/mouse.h | 132 +++++++++++++++++++++++++++++++++++ render/form.c | 2 +- render/html.h | 2 +- render/html_interaction.c | 2 +- render/textplain.h | 2 +- 58 files changed, 188 insertions(+), 173 deletions(-) delete mode 100644 desktop/mouse.h create mode 100644 include/netsurf/mouse.h diff --git a/content/content.h b/content/content.h index cdd7283cc..1c7507721 100644 --- a/content/content.h +++ b/content/content.h @@ -32,7 +32,7 @@ #include "content/content_factory.h" #include "content/content_type.h" #include "desktop/search.h" /* search flags enum */ -#include "desktop/mouse.h" /* mouse state enums */ +#include "netsurf/mouse.h" /* mouse state enums */ #include "desktop/plot_style.h" /* color typedef */ struct browser_window; diff --git a/desktop/browser.h b/desktop/browser.h index a1ec37a4b..35eab0ea7 100644 --- a/desktop/browser.h +++ b/desktop/browser.h @@ -30,7 +30,7 @@ #include "utils/errors.h" #include "desktop/plot_style.h" #include "desktop/frame_types.h" -#include "desktop/mouse.h" +#include "netsurf/mouse.h" struct browser_window; struct hlcache_handle; diff --git a/desktop/mouse.h b/desktop/mouse.h deleted file mode 100644 index 083bd1731..000000000 --- a/desktop/mouse.h +++ /dev/null @@ -1,117 +0,0 @@ -/* - * Copyright 2003 Phil Mellor - * Copyright 2006 James Bursa - * Copyright 2010 Michael Drake - * - * This file is part of NetSurf, http://www.netsurf-browser.org/ - * - * NetSurf is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 2 of the License. - * - * NetSurf is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -/** \file - * Core mouse state. - */ - -#ifndef _NETSURF_DESKTOP_MOUSE_H_ -#define _NETSURF_DESKTOP_MOUSE_H_ - -/* Mouse state. 1 is primary mouse button (e.g. Select on RISC OS). - * 2 is secondary mouse button (e.g. Adjust on RISC OS). */ -typedef enum browser_mouse_state { - BROWSER_MOUSE_HOVER = 0, /* No mouse buttons pressed, - * May be used to indicate - * hover or end of drag. */ - - BROWSER_MOUSE_PRESS_1 = (1 << 0), /* button 1 pressed */ - BROWSER_MOUSE_PRESS_2 = (1 << 1), /* button 2 pressed */ - - /* note: click meaning is different for - * different front ends. On RISC OS, it - * is standard to act on press, so a - * click is fired at the same time as a - * mouse button is pressed. With GTK, it - * is standard to act on release, so a - * click is fired when the mouse button - * is released, if the operation wasn't - * a drag. */ - - BROWSER_MOUSE_CLICK_1 = (1 << 2), /* button 1 clicked. */ - BROWSER_MOUSE_CLICK_2 = (1 << 3), /* button 2 clicked. */ - - BROWSER_MOUSE_DOUBLE_CLICK = (1 << 4), /* button double clicked */ - BROWSER_MOUSE_TRIPLE_CLICK = (1 << 5), /* button triple clicked */ - - /* note: double and triple clicks are - * fired alongside a - * BROWSER_MOUSE_CLICK_[1|2] - * to indicate which button - * is used. - */ - - BROWSER_MOUSE_DRAG_1 = (1 << 6), /* start of button 1 drag */ - BROWSER_MOUSE_DRAG_2 = (1 << 7), /* start of button 2 drag */ - - BROWSER_MOUSE_DRAG_ON = (1 << 8), /* a drag operation was started - * and a mouse button is still - * pressed */ - - BROWSER_MOUSE_HOLDING_1 = (1 << 9), /* during button 1 drag */ - BROWSER_MOUSE_HOLDING_2 = (1 << 10), /* during button 2 drag */ - - - BROWSER_MOUSE_MOD_1 = (1 << 11), /* 1st modifier key pressed - * (eg. Shift) */ - BROWSER_MOUSE_MOD_2 = (1 << 12), /* 2nd modifier key pressed - * (eg. Ctrl) */ - BROWSER_MOUSE_MOD_3 = (1 << 13) /* 3rd modifier key pressed - * (eg. Alt) */ -} browser_mouse_state; - - -typedef enum gui_pointer_shape { - GUI_POINTER_DEFAULT, GUI_POINTER_POINT, GUI_POINTER_CARET, - GUI_POINTER_MENU, GUI_POINTER_UP, GUI_POINTER_DOWN, - GUI_POINTER_LEFT, GUI_POINTER_RIGHT, GUI_POINTER_RU, - GUI_POINTER_LD, GUI_POINTER_LU, GUI_POINTER_RD, - GUI_POINTER_CROSS, GUI_POINTER_MOVE, GUI_POINTER_WAIT, - GUI_POINTER_HELP, GUI_POINTER_NO_DROP, GUI_POINTER_NOT_ALLOWED, - GUI_POINTER_PROGRESS } gui_pointer_shape; - -/** Mouse pointer type */ -typedef enum { - BROWSER_POINTER_DEFAULT = GUI_POINTER_DEFAULT, - BROWSER_POINTER_POINT = GUI_POINTER_POINT, - BROWSER_POINTER_CARET = GUI_POINTER_CARET, - BROWSER_POINTER_MENU = GUI_POINTER_MENU, - BROWSER_POINTER_UP = GUI_POINTER_UP, - BROWSER_POINTER_DOWN = GUI_POINTER_DOWN, - BROWSER_POINTER_LEFT = GUI_POINTER_LEFT, - BROWSER_POINTER_RIGHT = GUI_POINTER_RIGHT, - BROWSER_POINTER_RU = GUI_POINTER_RU, - BROWSER_POINTER_LD = GUI_POINTER_LD, - BROWSER_POINTER_LU = GUI_POINTER_LU, - BROWSER_POINTER_RD = GUI_POINTER_RD, - BROWSER_POINTER_CROSS = GUI_POINTER_CROSS, - BROWSER_POINTER_MOVE = GUI_POINTER_MOVE, - BROWSER_POINTER_WAIT = GUI_POINTER_WAIT, - BROWSER_POINTER_HELP = GUI_POINTER_HELP, - BROWSER_POINTER_NO_DROP = GUI_POINTER_NO_DROP, - BROWSER_POINTER_NOT_ALLOWED = GUI_POINTER_NOT_ALLOWED, - BROWSER_POINTER_PROGRESS = GUI_POINTER_PROGRESS, - BROWSER_POINTER_AUTO -} browser_pointer_shape; - - -void browser_mouse_state_dump(browser_mouse_state mouse); - -#endif diff --git a/desktop/scrollbar.c b/desktop/scrollbar.c index 82fcac1c9..64b767192 100644 --- a/desktop/scrollbar.c +++ b/desktop/scrollbar.c @@ -32,7 +32,7 @@ #include "desktop/browser.h" #include "desktop/system_colour.h" -#include "desktop/mouse.h" +#include "netsurf/mouse.h" #include "desktop/scrollbar.h" #include "desktop/plotters.h" #include "desktop/plot_style.h" diff --git a/desktop/selection.c b/desktop/selection.c index d2e326af3..7c1d15caa 100644 --- a/desktop/selection.c +++ b/desktop/selection.c @@ -37,7 +37,7 @@ #include "render/font.h" #include "render/textplain.h" -#include "desktop/mouse.h" +#include "netsurf/mouse.h" #include "desktop/browser_private.h" #include "desktop/plotters.h" #include "desktop/save_text.h" diff --git a/desktop/selection.h b/desktop/selection.h index 7e620fc46..e2bc3b31d 100644 --- a/desktop/selection.h +++ b/desktop/selection.h @@ -24,7 +24,7 @@ #define _NETSURF_DESKTOP_SELECTION_H_ #include -#include "desktop/mouse.h" +#include "netsurf/mouse.h" struct box; diff --git a/desktop/sslcert_viewer.h b/desktop/sslcert_viewer.h index 92f402f74..f7c8f3352 100644 --- a/desktop/sslcert_viewer.h +++ b/desktop/sslcert_viewer.h @@ -22,7 +22,7 @@ #define _NETSURF_DESKTOP_SSLCERT_VIEWER_H_ #include "content/llcache.h" -#include "desktop/mouse.h" +#include "netsurf/mouse.h" struct sslcert_session_data; struct redraw_context; diff --git a/desktop/textarea.c b/desktop/textarea.c index 157d6c188..804c78ca0 100644 --- a/desktop/textarea.c +++ b/desktop/textarea.c @@ -32,7 +32,7 @@ #include "content/handlers/css/utils.h" #include "desktop/browser.h" -#include "desktop/mouse.h" +#include "netsurf/mouse.h" #include "desktop/textarea.h" #include "desktop/textinput.h" #include "desktop/plotters.h" diff --git a/desktop/textinput.c b/desktop/textinput.c index 015c66936..0e98e03d5 100644 --- a/desktop/textinput.c +++ b/desktop/textinput.c @@ -38,7 +38,7 @@ #include "render/html_internal.h" #include "render/layout.h" -#include "desktop/mouse.h" +#include "netsurf/mouse.h" #include "desktop/browser_private.h" #include "desktop/textinput.h" #include "netsurf/window.h" diff --git a/desktop/tree.h b/desktop/tree.h index b4e0f66b7..f8864e167 100644 --- a/desktop/tree.h +++ b/desktop/tree.h @@ -27,7 +27,7 @@ #include #include -#include "desktop/mouse.h" +#include "netsurf/mouse.h" struct sslcert_session_data; struct tree; diff --git a/desktop/treeview.h b/desktop/treeview.h index d4d4ce9a7..536956997 100644 --- a/desktop/treeview.h +++ b/desktop/treeview.h @@ -26,7 +26,7 @@ #include #include -#include "desktop/mouse.h" +#include "netsurf/mouse.h" #include "desktop/core_window.h" #include "desktop/textinput.h" diff --git a/frontends/amiga/bitmap.c b/frontends/amiga/bitmap.c index 506ae33bc..791295f2e 100644 --- a/frontends/amiga/bitmap.c +++ b/frontends/amiga/bitmap.c @@ -48,7 +48,7 @@ #include "utils/nsurl.h" #include "utils/messages.h" #include "content/hlcache.h" -#include "desktop/mouse.h" +#include "netsurf/mouse.h" #include "netsurf/window.h" #include "netsurf/bitmap.h" diff --git a/frontends/amiga/cookies.c b/frontends/amiga/cookies.c index 3181d0ffe..c775c8316 100755 --- a/frontends/amiga/cookies.c +++ b/frontends/amiga/cookies.c @@ -19,7 +19,7 @@ #include #include "desktop/cookie_manager.h" -#include "desktop/mouse.h" +#include "netsurf/mouse.h" #include "netsurf/window.h" #include "amiga/cookies.h" diff --git a/frontends/amiga/ctxmenu.c b/frontends/amiga/ctxmenu.c index cc612da24..5951a10ae 100644 --- a/frontends/amiga/ctxmenu.c +++ b/frontends/amiga/ctxmenu.c @@ -43,7 +43,7 @@ #include "content/hlcache.h" #include "desktop/browser.h" #include "desktop/browser_history.h" -#include "desktop/mouse.h" +#include "netsurf/mouse.h" #include "desktop/searchweb.h" #include "desktop/textinput.h" diff --git a/frontends/amiga/download.c b/frontends/amiga/download.c index 8b122ecb3..b1526b994 100644 --- a/frontends/amiga/download.c +++ b/frontends/amiga/download.c @@ -51,7 +51,7 @@ #include "desktop/download.h" #include "desktop/save_complete.h" #include "desktop/browser.h" -#include "desktop/mouse.h" +#include "netsurf/mouse.h" #include "netsurf/window.h" #include "netsurf/download.h" #include "content/handlers/image/ico.h" diff --git a/frontends/amiga/drag.c b/frontends/amiga/drag.c index 67d17223e..122ecd1a6 100644 --- a/frontends/amiga/drag.c +++ b/frontends/amiga/drag.c @@ -35,7 +35,7 @@ #include "utils/utils.h" #include "utils/nsoption.h" #include "content/hlcache.h" -#include "desktop/mouse.h" +#include "netsurf/mouse.h" #include "amiga/bitmap.h" #include "amiga/clipboard.h" diff --git a/frontends/amiga/font_scan.c b/frontends/amiga/font_scan.c index 12fb6071d..c1c1732b9 100644 --- a/frontends/amiga/font_scan.c +++ b/frontends/amiga/font_scan.c @@ -48,7 +48,7 @@ #include "utils/nsoption.h" #include "utils/log.h" #include "utils/messages.h" -#include "desktop/mouse.h" +#include "netsurf/mouse.h" #include "netsurf/window.h" #include "amiga/font_scan.h" diff --git a/frontends/amiga/gui.c b/frontends/amiga/gui.c index ae70086d0..ebc7f8721 100644 --- a/frontends/amiga/gui.c +++ b/frontends/amiga/gui.c @@ -104,7 +104,7 @@ #include "desktop/browser_history.h" #include "desktop/browser.h" #include "desktop/hotlist.h" -#include "desktop/mouse.h" +#include "netsurf/mouse.h" #include "netsurf/netsurf.h" #include "desktop/version.h" #include "desktop/save_complete.h" diff --git a/frontends/amiga/gui.h b/frontends/amiga/gui.h index 10e89cd9b..c5c1c3134 100644 --- a/frontends/amiga/gui.h +++ b/frontends/amiga/gui.h @@ -26,7 +26,7 @@ #include #include "netsurf/window.h" -#include "desktop/mouse.h" +#include "netsurf/mouse.h" #include "amiga/menu.h" #include "amiga/object.h" diff --git a/frontends/amiga/history.c b/frontends/amiga/history.c index 61425f3d5..bc16d3000 100755 --- a/frontends/amiga/history.c +++ b/frontends/amiga/history.c @@ -20,7 +20,7 @@ #include #include "utils/errors.h" -#include "desktop/mouse.h" +#include "netsurf/mouse.h" #include "netsurf/window.h" #include "amiga/history.h" diff --git a/frontends/amiga/hotlist.c b/frontends/amiga/hotlist.c index 71720cbf4..44691742c 100755 --- a/frontends/amiga/hotlist.c +++ b/frontends/amiga/hotlist.c @@ -21,7 +21,7 @@ #include "utils/nsurl.h" #include "desktop/hotlist.h" -#include "desktop/mouse.h" +#include "netsurf/mouse.h" #include "netsurf/window.h" #include "amiga/hotlist.h" diff --git a/frontends/amiga/login.c b/frontends/amiga/login.c index 34585159c..d54c2fa15 100755 --- a/frontends/amiga/login.c +++ b/frontends/amiga/login.c @@ -41,7 +41,7 @@ #include "utils/messages.h" #include "utils/errors.h" #include "content/urldb.h" -#include "desktop/mouse.h" +#include "netsurf/mouse.h" #include "netsurf/window.h" #include "amiga/gui.h" diff --git a/frontends/amiga/menu.c b/frontends/amiga/menu.c index 969a65d38..0743bc7ba 100644 --- a/frontends/amiga/menu.c +++ b/frontends/amiga/menu.c @@ -50,7 +50,7 @@ #include "content/hlcache.h" #include "desktop/hotlist.h" #include "desktop/browser.h" -#include "desktop/mouse.h" +#include "netsurf/mouse.h" #include "netsurf/window.h" #include "desktop/textinput.h" #include "desktop/version.h" diff --git a/frontends/amiga/plotters.c b/frontends/amiga/plotters.c index 1f7408100..fee3e7b08 100644 --- a/frontends/amiga/plotters.c +++ b/frontends/amiga/plotters.c @@ -38,7 +38,7 @@ #include "utils/utils.h" #include "utils/log.h" #include "netsurf/css.h" -#include "desktop/mouse.h" +#include "netsurf/mouse.h" #include "netsurf/window.h" #include "amiga/plotters.h" diff --git a/frontends/amiga/print.c b/frontends/amiga/print.c index 573daf3b2..f4cd31452 100644 --- a/frontends/amiga/print.c +++ b/frontends/amiga/print.c @@ -53,7 +53,7 @@ #include "desktop/printer.h" #include "desktop/print.h" #include "netsurf/layout.h" -#include "desktop/mouse.h" +#include "netsurf/mouse.h" #include "netsurf/window.h" #include "content/hlcache.h" diff --git a/frontends/amiga/search.c b/frontends/amiga/search.c index 2ecb7af53..86a27cf41 100755 --- a/frontends/amiga/search.c +++ b/frontends/amiga/search.c @@ -50,7 +50,7 @@ #include "content/content.h" #include "desktop/browser.h" #include "desktop/search.h" -#include "desktop/mouse.h" +#include "netsurf/mouse.h" #include "netsurf/window.h" #include "netsurf/search.h" diff --git a/frontends/amiga/selectmenu.c b/frontends/amiga/selectmenu.c index 25931783f..ffd48032e 100644 --- a/frontends/amiga/selectmenu.c +++ b/frontends/amiga/selectmenu.c @@ -29,7 +29,7 @@ #include "utils/log.h" #include "utils/messages.h" #include "render/form.h" -#include "desktop/mouse.h" +#include "netsurf/mouse.h" #include "amiga/gui.h" #include "amiga/selectmenu.h" diff --git a/frontends/amiga/sslcert.c b/frontends/amiga/sslcert.c index ca6501a1a..ed7206127 100644 --- a/frontends/amiga/sslcert.c +++ b/frontends/amiga/sslcert.c @@ -20,7 +20,7 @@ #include "utils/nsurl.h" #include "content/llcache.h" -#include "desktop/mouse.h" +#include "netsurf/mouse.h" #include "netsurf/window.h" #include "desktop/sslcert_viewer.h" diff --git a/frontends/amiga/theme.c b/frontends/amiga/theme.c index f4fed128e..f0fa31db8 100644 --- a/frontends/amiga/theme.c +++ b/frontends/amiga/theme.c @@ -41,7 +41,7 @@ #include "utils/nsoption.h" #include "utils/utils.h" #include "desktop/searchweb.h" -#include "desktop/mouse.h" +#include "netsurf/mouse.h" #include "netsurf/window.h" #include "amiga/gui.h" diff --git a/frontends/atari/bitmap.c b/frontends/atari/bitmap.c index 35886c0fa..d0de37881 100644 --- a/frontends/atari/bitmap.c +++ b/frontends/atari/bitmap.c @@ -25,7 +25,7 @@ #include "utils/nsoption.h" #include "utils/log.h" #include "netsurf/bitmap.h" -#include "desktop/mouse.h" +#include "netsurf/mouse.h" #include "atari/bitmap.h" #include "atari/plot/plot.h" diff --git a/frontends/atari/cookies.c b/frontends/atari/cookies.c index 6019b4730..eff4ad8d5 100644 --- a/frontends/atari/cookies.c +++ b/frontends/atari/cookies.c @@ -20,7 +20,7 @@ #include "utils/log.h" #include "utils/messages.h" -#include "desktop/mouse.h" +#include "netsurf/mouse.h" #include "desktop/plotters.h" #include "desktop/cookie_manager.h" #include "desktop/core_window.h" diff --git a/frontends/atari/font.c b/frontends/atari/font.c index f6b91c8b9..a90b79566 100644 --- a/frontends/atari/font.c +++ b/frontends/atari/font.c @@ -25,7 +25,7 @@ #include "utils/log.h" #include "utils/nsoption.h" #include "netsurf/layout.h" -#include "desktop/mouse.h" +#include "netsurf/mouse.h" #include "desktop/plotters.h" #include "atari/gui.h" diff --git a/frontends/atari/gui.h b/frontends/atari/gui.h index 50184d029..9c9aaaa58 100644 --- a/frontends/atari/gui.h +++ b/frontends/atari/gui.h @@ -22,7 +22,7 @@ #include #include -#include "desktop/mouse.h" +#include "netsurf/mouse.h" #include "atari/redrawslots.h" #include "atari/gemtk/gemtk.h" diff --git a/frontends/atari/history.c b/frontends/atari/history.c index ba72c7f00..d8b582e8b 100644 --- a/frontends/atari/history.c +++ b/frontends/atari/history.c @@ -21,7 +21,7 @@ #include "utils/log.h" #include "utils/messages.h" -#include "desktop/mouse.h" +#include "netsurf/mouse.h" #include "desktop/global_history.h" #include "desktop/core_window.h" diff --git a/frontends/atari/misc.c b/frontends/atari/misc.c index 8688b93fd..c5a705233 100644 --- a/frontends/atari/misc.c +++ b/frontends/atari/misc.c @@ -29,7 +29,7 @@ #include "content/content.h" #include "content/hlcache.h" #include "desktop/cookie_manager.h" -#include "desktop/mouse.h" +#include "netsurf/mouse.h" #include "desktop/tree.h" #include "utils/nsoption.h" #include "utils/messages.h" diff --git a/frontends/atari/plot/font_freetype.c b/frontends/atari/plot/font_freetype.c index a77aff855..602820704 100644 --- a/frontends/atari/plot/font_freetype.c +++ b/frontends/atari/plot/font_freetype.c @@ -24,7 +24,7 @@ #include "utils/log.h" #include "utils/nsoption.h" -#include "desktop/mouse.h" +#include "netsurf/mouse.h" #include "desktop/plot_style.h" #include "atari/gui.h" diff --git a/frontends/atari/plot/font_internal.c b/frontends/atari/plot/font_internal.c index 89a56d0e5..b96f4c773 100644 --- a/frontends/atari/plot/font_internal.c +++ b/frontends/atari/plot/font_internal.c @@ -24,7 +24,7 @@ #include "utils/utf8.h" #include "utils/log.h" -#include "desktop/mouse.h" +#include "netsurf/mouse.h" #include "desktop/plot_style.h" #include "atari/gui.h" diff --git a/frontends/atari/plot/fontplot.c b/frontends/atari/plot/fontplot.c index 9f0edd9a4..d0a1fe16f 100644 --- a/frontends/atari/plot/fontplot.c +++ b/frontends/atari/plot/fontplot.c @@ -21,7 +21,7 @@ #include #include -#include "desktop/mouse.h" +#include "netsurf/mouse.h" #include "desktop/plot_style.h" #include "atari/bitmap.h" diff --git a/frontends/atari/plot/plot.c b/frontends/atari/plot/plot.c index f96039dd9..2e35bcdbd 100644 --- a/frontends/atari/plot/plot.c +++ b/frontends/atari/plot/plot.c @@ -31,7 +31,7 @@ #include "utils/utils.h" #include "netsurf/bitmap.h" #include "desktop/plotters.h" -#include "desktop/mouse.h" +#include "netsurf/mouse.h" #include "atari/gui.h" #include "atari/osspec.h" diff --git a/frontends/atari/rootwin.c b/frontends/atari/rootwin.c index 605ce45ae..ca25a0751 100644 --- a/frontends/atari/rootwin.c +++ b/frontends/atari/rootwin.c @@ -38,7 +38,7 @@ #include "utils/log.h" #include "desktop/browser.h" -#include "desktop/mouse.h" +#include "netsurf/mouse.h" #include "desktop/plotters.h" #include "desktop/textinput.h" #include "content/content.h" diff --git a/frontends/atari/statusbar.c b/frontends/atari/statusbar.c index c9d0f78aa..c05e1b4bf 100644 --- a/frontends/atari/statusbar.c +++ b/frontends/atari/statusbar.c @@ -28,7 +28,7 @@ #include #include "utils/log.h" -#include "desktop/mouse.h" +#include "netsurf/mouse.h" #include "desktop/plotters.h" #include "atari/gui.h" diff --git a/frontends/atari/toolbar.c b/frontends/atari/toolbar.c index f630332da..d2182c5fa 100644 --- a/frontends/atari/toolbar.c +++ b/frontends/atari/toolbar.c @@ -33,7 +33,7 @@ #include "utils/utf8.h" #include "desktop/browser_history.h" #include "desktop/browser.h" -#include "desktop/mouse.h" +#include "netsurf/mouse.h" #include "desktop/plot_style.h" #include "desktop/plotters.h" #include "desktop/tree.h" diff --git a/frontends/atari/treeview.c b/frontends/atari/treeview.c index 513e2dfe9..b47429859 100644 --- a/frontends/atari/treeview.c +++ b/frontends/atari/treeview.c @@ -29,7 +29,7 @@ #include "utils/utils.h" #include "content/urldb.h" #include "desktop/plotters.h" -#include "desktop/mouse.h" +#include "netsurf/mouse.h" #include "desktop/treeview.h" #include "atari/gui.h" diff --git a/frontends/beos/cookies.cpp b/frontends/beos/cookies.cpp index d1357fffa..bf8ce51d7 100644 --- a/frontends/beos/cookies.cpp +++ b/frontends/beos/cookies.cpp @@ -21,7 +21,7 @@ #include #include extern "C" { -#include "desktop/mouse.h" +#include "netsurf/mouse.h" #include "utils/log.h" #include "desktop/cookie_manager.h" #include "desktop/plotters.h" diff --git a/frontends/beos/window.cpp b/frontends/beos/window.cpp index 27be98786..5e75a0256 100644 --- a/frontends/beos/window.cpp +++ b/frontends/beos/window.cpp @@ -30,7 +30,7 @@ extern "C" { #include "content/content.h" #include "content/urldb.h" #include "desktop/browser.h" -#include "desktop/mouse.h" +#include "netsurf/mouse.h" #include "desktop/textinput.h" #include "desktop/plotters.h" #include "netsurf/window.h" diff --git a/frontends/cocoa/NetsurfApp.m b/frontends/cocoa/NetsurfApp.m index f048ca631..c30bce07e 100644 --- a/frontends/cocoa/NetsurfApp.m +++ b/frontends/cocoa/NetsurfApp.m @@ -38,7 +38,7 @@ #import "desktop/textinput.h" #import "desktop/tree.h" #import "render/html.h" -#import "desktop/mouse.h" +#import "netsurf/mouse.h" #import "netsurf/netsurf.h" #ifndef NETSURF_HOMEPAGE diff --git a/frontends/cocoa/gui.m b/frontends/cocoa/gui.m index 787fb68ea..7f39459b6 100644 --- a/frontends/cocoa/gui.m +++ b/frontends/cocoa/gui.m @@ -21,7 +21,7 @@ #import "utils/nsoption.h" #import "utils/utils.h" #import "utils/log.h" -#import "desktop/mouse.h" +#import "netsurf/mouse.h" #import "netsurf/window.h" #import "netsurf/misc.h" #import "desktop/browser.h" diff --git a/frontends/gtk/window.c b/frontends/gtk/window.c index 5d49eebf3..5c5d682ee 100644 --- a/frontends/gtk/window.c +++ b/frontends/gtk/window.c @@ -40,7 +40,7 @@ #include "gtk/window.h" #include "gtk/selection.h" #include "desktop/browser.h" -#include "desktop/mouse.h" +#include "netsurf/mouse.h" #include "desktop/searchweb.h" #include "desktop/textinput.h" #include "netsurf/window.h" diff --git a/frontends/monkey/browser.c b/frontends/monkey/browser.c index 4ae35a1fa..638dcdb26 100644 --- a/frontends/monkey/browser.c +++ b/frontends/monkey/browser.c @@ -25,7 +25,7 @@ #include "utils/ring.h" #include "utils/log.h" #include "utils/messages.h" -#include "desktop/mouse.h" +#include "netsurf/mouse.h" #include "netsurf/window.h" #include "desktop/browser.h" #include "desktop/plotters.h" diff --git a/frontends/riscos/help.c b/frontends/riscos/help.c index faabea708..64d4a2f8e 100644 --- a/frontends/riscos/help.c +++ b/frontends/riscos/help.c @@ -27,7 +27,7 @@ #include "utils/log.h" #include "utils/messages.h" #include "utils/utf8.h" -#include "desktop/mouse.h" +#include "netsurf/mouse.h" #include "netsurf/window.h" #include "riscos/treeview.h" diff --git a/frontends/riscos/window.c b/frontends/riscos/window.c index d386685b4..2e012da99 100644 --- a/frontends/riscos/window.c +++ b/frontends/riscos/window.c @@ -60,7 +60,7 @@ #include "desktop/cookie_manager.h" #include "desktop/scrollbar.h" #include "desktop/frames.h" -#include "desktop/mouse.h" +#include "netsurf/mouse.h" #include "desktop/plotters.h" #include "desktop/textinput.h" #include "desktop/tree.h" diff --git a/frontends/windows/plot.c b/frontends/windows/plot.c index d5ddf4f37..7480bc69f 100644 --- a/frontends/windows/plot.c +++ b/frontends/windows/plot.c @@ -28,7 +28,7 @@ #include "utils/log.h" #include "utils/utf8.h" #include "utils/utils.h" -#include "desktop/mouse.h" +#include "netsurf/mouse.h" #include "netsurf/window.h" #include "desktop/plotters.h" diff --git a/frontends/windows/window.h b/frontends/windows/window.h index ec54287f4..047cec654 100644 --- a/frontends/windows/window.h +++ b/frontends/windows/window.h @@ -22,7 +22,7 @@ /** The window operation function table for win32 */ extern struct gui_window_table *win32_window_table; -#include "desktop/mouse.h" +#include "netsurf/mouse.h" struct browser_mouse { struct gui_window *gui; diff --git a/include/netsurf/mouse.h b/include/netsurf/mouse.h new file mode 100644 index 000000000..19cd3ea5a --- /dev/null +++ b/include/netsurf/mouse.h @@ -0,0 +1,132 @@ +/* + * Copyright 2003 Phil Mellor + * Copyright 2006 James Bursa + * Copyright 2010 Michael Drake + * + * This file is part of NetSurf, http://www.netsurf-browser.org/ + * + * NetSurf is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; version 2 of the License. + * + * NetSurf is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +/** + * \file + * + * Core mouse and pointer states. + */ + +#ifndef _NETSURF_MOUSE_H_ +#define _NETSURF_MOUSE_H_ + +/* Mouse state. 1 is primary mouse button (e.g. Select on RISC OS). + * 2 is secondary mouse button (e.g. Adjust on RISC OS). */ +typedef enum browser_mouse_state { + BROWSER_MOUSE_HOVER = 0, /* No mouse buttons pressed, + * May be used to indicate + * hover or end of drag. */ + + BROWSER_MOUSE_PRESS_1 = (1 << 0), /* button 1 pressed */ + BROWSER_MOUSE_PRESS_2 = (1 << 1), /* button 2 pressed */ + + /* note: click meaning is different for + * different front ends. On RISC OS, it + * is standard to act on press, so a + * click is fired at the same time as a + * mouse button is pressed. With GTK, it + * is standard to act on release, so a + * click is fired when the mouse button + * is released, if the operation wasn't + * a drag. */ + + BROWSER_MOUSE_CLICK_1 = (1 << 2), /* button 1 clicked. */ + BROWSER_MOUSE_CLICK_2 = (1 << 3), /* button 2 clicked. */ + + BROWSER_MOUSE_DOUBLE_CLICK = (1 << 4), /* button double clicked */ + BROWSER_MOUSE_TRIPLE_CLICK = (1 << 5), /* button triple clicked */ + + /* note: double and triple clicks are + * fired alongside a + * BROWSER_MOUSE_CLICK_[1|2] + * to indicate which button + * is used. + */ + + BROWSER_MOUSE_DRAG_1 = (1 << 6), /* start of button 1 drag */ + BROWSER_MOUSE_DRAG_2 = (1 << 7), /* start of button 2 drag */ + + BROWSER_MOUSE_DRAG_ON = (1 << 8), /* a drag operation was started + * and a mouse button is still + * pressed */ + + BROWSER_MOUSE_HOLDING_1 = (1 << 9), /* during button 1 drag */ + BROWSER_MOUSE_HOLDING_2 = (1 << 10), /* during button 2 drag */ + + + BROWSER_MOUSE_MOD_1 = (1 << 11), /* 1st modifier key pressed + * (eg. Shift) */ + BROWSER_MOUSE_MOD_2 = (1 << 12), /* 2nd modifier key pressed + * (eg. Ctrl) */ + BROWSER_MOUSE_MOD_3 = (1 << 13) /* 3rd modifier key pressed + * (eg. Alt) */ +} browser_mouse_state; + + +typedef enum gui_pointer_shape { + GUI_POINTER_DEFAULT, + GUI_POINTER_POINT, + GUI_POINTER_CARET, + GUI_POINTER_MENU, + GUI_POINTER_UP, + GUI_POINTER_DOWN, + GUI_POINTER_LEFT, + GUI_POINTER_RIGHT, + GUI_POINTER_RU, + GUI_POINTER_LD, + GUI_POINTER_LU, + GUI_POINTER_RD, + GUI_POINTER_CROSS, + GUI_POINTER_MOVE, + GUI_POINTER_WAIT, + GUI_POINTER_HELP, + GUI_POINTER_NO_DROP, + GUI_POINTER_NOT_ALLOWED, + GUI_POINTER_PROGRESS +} gui_pointer_shape; + +/** Mouse pointer type */ +typedef enum { + BROWSER_POINTER_DEFAULT = GUI_POINTER_DEFAULT, + BROWSER_POINTER_POINT = GUI_POINTER_POINT, + BROWSER_POINTER_CARET = GUI_POINTER_CARET, + BROWSER_POINTER_MENU = GUI_POINTER_MENU, + BROWSER_POINTER_UP = GUI_POINTER_UP, + BROWSER_POINTER_DOWN = GUI_POINTER_DOWN, + BROWSER_POINTER_LEFT = GUI_POINTER_LEFT, + BROWSER_POINTER_RIGHT = GUI_POINTER_RIGHT, + BROWSER_POINTER_RU = GUI_POINTER_RU, + BROWSER_POINTER_LD = GUI_POINTER_LD, + BROWSER_POINTER_LU = GUI_POINTER_LU, + BROWSER_POINTER_RD = GUI_POINTER_RD, + BROWSER_POINTER_CROSS = GUI_POINTER_CROSS, + BROWSER_POINTER_MOVE = GUI_POINTER_MOVE, + BROWSER_POINTER_WAIT = GUI_POINTER_WAIT, + BROWSER_POINTER_HELP = GUI_POINTER_HELP, + BROWSER_POINTER_NO_DROP = GUI_POINTER_NO_DROP, + BROWSER_POINTER_NOT_ALLOWED = GUI_POINTER_NOT_ALLOWED, + BROWSER_POINTER_PROGRESS = GUI_POINTER_PROGRESS, + BROWSER_POINTER_AUTO +} browser_pointer_shape; + + +void browser_mouse_state_dump(browser_mouse_state mouse); + +#endif diff --git a/render/form.c b/render/form.c index 71849c265..b3a8c5114 100644 --- a/render/form.c +++ b/render/form.c @@ -44,7 +44,7 @@ #include "content/hlcache.h" #include "content/handlers/css/utils.h" #include "desktop/browser.h" -#include "desktop/mouse.h" +#include "netsurf/mouse.h" #include "desktop/knockout.h" #include "desktop/plot_style.h" #include "desktop/plotters.h" diff --git a/render/html.h b/render/html.h index 215bfbbe6..2900e8983 100644 --- a/render/html.h +++ b/render/html.h @@ -32,7 +32,7 @@ #include "content/content_type.h" #include "desktop/browser.h" -#include "desktop/mouse.h" +#include "netsurf/mouse.h" #include "desktop/plot_style.h" #include "desktop/frame_types.h" diff --git a/render/html_interaction.c b/render/html_interaction.c index 0efb1286d..9513d0f0a 100644 --- a/render/html_interaction.c +++ b/render/html_interaction.c @@ -37,7 +37,7 @@ #include "content/hlcache.h" #include "desktop/browser.h" #include "desktop/frames.h" -#include "desktop/mouse.h" +#include "netsurf/mouse.h" #include "utils/nsoption.h" #include "desktop/scrollbar.h" #include "desktop/selection.h" diff --git a/render/textplain.h b/render/textplain.h index c3f2a0f6a..6a88c3470 100644 --- a/render/textplain.h +++ b/render/textplain.h @@ -25,7 +25,7 @@ #define _NETSURF_RENDER_TEXTPLAIN_H_ #include -#include "desktop/mouse.h" +#include "netsurf/mouse.h" struct content; struct hlcache_handle; -- cgit v1.2.3