mirrors
/
netsurf
mirror of https://github.com/netsurf-browser/netsurf
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Move mouse pointer enums to mouse header.

This commit is contained in:
Michael Drake 2012-08-17 09:45:15 +01:00
parent 402de7572d
commit e177fa49c2
3 changed files with 35 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
desktop/browser.h
View File

@ -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. */

9
desktop/gui.h
View File

@ -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 <stdbool.h>
#include <libwapcaplet/libwapcaplet.h>
@ -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"

34
desktop/mouse.h
View File

@ -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