move mouse and pointer state header into public API

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;

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;

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"

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"

desktop/selection.h

@@ -24,7 +24,7 @@
 #define _NETSURF_DESKTOP_SELECTION_H_
 
 #include <stdbool.h>
-#include "desktop/mouse.h"
+#include "netsurf/mouse.h"
 
 struct box;
 

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;

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"

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"

desktop/tree.h

@@ -27,7 +27,7 @@
 #include <stdbool.h>
 #include <stdint.h>
 
-#include "desktop/mouse.h"
+#include "netsurf/mouse.h"
 
 struct sslcert_session_data;
 struct tree;

desktop/treeview.h

@@ -26,7 +26,7 @@
 #include <stdbool.h>
 #include <stdint.h>
 
-#include "desktop/mouse.h"
+#include "netsurf/mouse.h"
 #include "desktop/core_window.h"
 #include "desktop/textinput.h"
 

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"
 

frontends/amiga/cookies.c

@@ -19,7 +19,7 @@
 #include <proto/exec.h>
 
 #include "desktop/cookie_manager.h"
-#include "desktop/mouse.h"
+#include "netsurf/mouse.h"
 #include "netsurf/window.h"
 
 #include "amiga/cookies.h"

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"
 

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"

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"

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"

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"

frontends/amiga/gui.h

@@ -26,7 +26,7 @@
 #include <devices/inputevent.h>
 
 #include "netsurf/window.h"
-#include "desktop/mouse.h"
+#include "netsurf/mouse.h"
 
 #include "amiga/menu.h"
 #include "amiga/object.h"

frontends/amiga/history.c

@@ -20,7 +20,7 @@
 #include <proto/exec.h>
 
 #include "utils/errors.h"
-#include "desktop/mouse.h"
+#include "netsurf/mouse.h"
 #include "netsurf/window.h"
 
 #include "amiga/history.h"

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"

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"

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"

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"

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"
 

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"
 

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"

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"
 

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"

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"

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"

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"

frontends/atari/gui.h

@@ -22,7 +22,7 @@
 #include <stdbool.h>
 #include <mt_gem.h>
 
-#include "desktop/mouse.h"
+#include "netsurf/mouse.h"
 
 #include "atari/redrawslots.h"
 #include "atari/gemtk/gemtk.h"

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"
 

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"

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"

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"

frontends/atari/plot/fontplot.c

@@ -21,7 +21,7 @@
 #include <stdlib.h>
 #include <mt_gem.h>
 
-#include "desktop/mouse.h"
+#include "netsurf/mouse.h"
 #include "desktop/plot_style.h"
 
 #include "atari/bitmap.h"

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"

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"

frontends/atari/statusbar.c

@@ -28,7 +28,7 @@
 #include <math.h>
 
 #include "utils/log.h"
-#include "desktop/mouse.h"
+#include "netsurf/mouse.h"
 #include "desktop/plotters.h"
 
 #include "atari/gui.h"

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"

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"

frontends/beos/cookies.cpp

@@ -21,7 +21,7 @@
 #include <stdlib.h>
 #include <string.h>
 extern "C" {
-#include "desktop/mouse.h"
+#include "netsurf/mouse.h"
 #include "utils/log.h"
 #include "desktop/cookie_manager.h"
 #include "desktop/plotters.h"

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"

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

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"

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"

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"

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"

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"

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"
 

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;

include/netsurf/mouse.h

@@ -18,12 +18,14 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-/** \file
+/**
- * Core mouse state.
+ * \file
+ *
+ * Core mouse and pointer states.
  */
 
-#ifndef _NETSURF_DESKTOP_MOUSE_H_
+#ifndef _NETSURF_MOUSE_H_
-#define _NETSURF_DESKTOP_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). */
@@ -79,13 +81,26 @@ typedef enum browser_mouse_state {
 
 
 typedef enum gui_pointer_shape {
-	GUI_POINTER_DEFAULT, GUI_POINTER_POINT, GUI_POINTER_CARET,
+	GUI_POINTER_DEFAULT,
-	GUI_POINTER_MENU, GUI_POINTER_UP, GUI_POINTER_DOWN,
+	GUI_POINTER_POINT,
-	GUI_POINTER_LEFT, GUI_POINTER_RIGHT, GUI_POINTER_RU,
+	GUI_POINTER_CARET,
-	GUI_POINTER_LD, GUI_POINTER_LU, GUI_POINTER_RD,
+	GUI_POINTER_MENU,
-	GUI_POINTER_CROSS, GUI_POINTER_MOVE, GUI_POINTER_WAIT,
+	GUI_POINTER_UP,
-	GUI_POINTER_HELP, GUI_POINTER_NO_DROP, GUI_POINTER_NOT_ALLOWED,
+	GUI_POINTER_DOWN,
-	GUI_POINTER_PROGRESS } gui_pointer_shape;
+	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 {

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"

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"
 

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"

render/textplain.h

@@ -25,7 +25,7 @@
 #define _NETSURF_RENDER_TEXTPLAIN_H_
 
 #include <stddef.h>
-#include "desktop/mouse.h"
+#include "netsurf/mouse.h"
 
 struct content;
 struct hlcache_handle;