From e177fa49c29ca05f5b2498f286f78da6545f8278 Mon Sep 17 00:00:00 2001 From: Michael Drake Date: Fri, 17 Aug 2012 09:45:15 +0100 Subject: [PATCH] Move mouse pointer enums to mouse header. --- desktop/browser.h | 23 ----------------------- desktop/gui.h | 9 +-------- desktop/mouse.h | 34 ++++++++++++++++++++++++++++++++++ 3 files changed, 35 insertions(+), 31 deletions(-) diff --git a/desktop/browser.h b/desktop/browser.h index be5628880..489a7edad 100644 --- a/desktop/browser.h +++ b/desktop/browser.h @@ -68,29 +68,6 @@ typedef enum { DRAGGING_OTHER } browser_drag_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; - /** Browser window data. */ struct browser_window { /** Page currently displayed, or 0. Must have status READY or DONE. */ diff --git a/desktop/gui.h b/desktop/gui.h index eccf0b4c6..aa3fc8191 100644 --- a/desktop/gui.h +++ b/desktop/gui.h @@ -53,14 +53,6 @@ struct browser_window; struct selection; struct form_control; -typedef enum { 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; - #include #include @@ -69,6 +61,7 @@ typedef enum { GUI_POINTER_DEFAULT, GUI_POINTER_POINT, GUI_POINTER_CARET, #include "utils/config.h" #include "content/hlcache.h" #include "desktop/download.h" +#include "desktop/mouse.h" #include "desktop/search.h" #include "utils/errors.h" diff --git a/desktop/mouse.h b/desktop/mouse.h index 84af82f69..42603a67a 100644 --- a/desktop/mouse.h +++ b/desktop/mouse.h @@ -63,6 +63,40 @@ typedef enum { * (eg. Alt) */ } browser_mouse_state; + +typedef enum { 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