summaryrefslogtreecommitdiff
path: root/desktop
diff options
context:
space:
mode:
Diffstat (limited to 'desktop')
-rw-r--r--desktop/browser.h2
-rw-r--r--desktop/mouse.h117
-rw-r--r--desktop/scrollbar.c2
-rw-r--r--desktop/selection.c2
-rw-r--r--desktop/selection.h2
-rw-r--r--desktop/sslcert_viewer.h2
-rw-r--r--desktop/textarea.c2
-rw-r--r--desktop/textinput.c2
-rw-r--r--desktop/tree.h2
-rw-r--r--desktop/treeview.h2
10 files changed, 9 insertions, 126 deletions
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 <monkeyson@users.sourceforge.net>
- * Copyright 2006 James Bursa <bursa@users.sourceforge.net>
- * Copyright 2010 Michael Drake <tlsa@netsurf-browser.org>
- *
- * 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 <http://www.gnu.org/licenses/>.
- */
-
-/** \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 <stdbool.h>
-#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 <stdbool.h>
#include <stdint.h>
-#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 <stdbool.h>
#include <stdint.h>
-#include "desktop/mouse.h"
+#include "netsurf/mouse.h"
#include "desktop/core_window.h"
#include "desktop/textinput.h"
generated by cgit v1.2.3 (git 2.39.1) at 2024-04-16 21:06:49 +0000