1 files changed, 8 insertions, 21 deletions

diff --git a/platform/javascript/os_javascript.h b/platform/javascript/os_javascript.h
index ea906c560f..65269148ec 100644
--- a/platform/javascript/os_javascript.h
+++ b/platform/javascript/os_javascript.h
@@ -45,24 +45,9 @@
 
 #include <emscripten/html5.h>
 
-typedef void (*GFXInitFunc)(void *ud, bool gl2, int w, int h, bool fs);
 typedef String (*GetDataDirFunc)();
 
 class OS_JavaScript : public OS_Unix {
-public:
-	struct TouchPos {
-		int id;
-		Point2 pos;
-	};
-
-private:
-	Vector<TouchPos> touch;
-	Point2 last_mouse;
-	int last_button_mask;
-	GFXInitFunc gfx_init_func;
-	void *gfx_init_ud;
-
-	bool use_gl2;
 
 	int64_t time_to_save_sync;
 	int64_t last_sync_time;
@@ -76,6 +61,7 @@ private:
 	InputDefault *input;
 	bool window_maximized;
 	VideoMode video_mode;
+	CursorShape cursor_shape;
 	MainLoop *main_loop;
 
 	GetDataDirFunc get_data_dir_func;
@@ -90,6 +76,9 @@ private:
 
 	void process_joypads();
 
+	void set_css_cursor(const char *);
+	const char *get_css_cursor() const;
+
 public:
 	// functions used by main to initialize/deintialize the OS
 	virtual int get_video_driver_count() const;
@@ -119,9 +108,8 @@ public:
 
 	virtual void alert(const String &p_alert, const String &p_title = "ALERT!");
 
-	virtual void set_mouse_show(bool p_show);
-	virtual void set_mouse_grab(bool p_grab);
-	virtual bool is_mouse_grab_enabled() const;
+	virtual void set_mouse_mode(MouseMode p_mode);
+	virtual MouseMode get_mouse_mode() const;
 	virtual Point2 get_mouse_position() const;
 	virtual int get_mouse_button_state() const;
 	virtual void set_window_title(const String &p_title);
@@ -166,8 +154,7 @@ public:
 	virtual String get_resource_dir() const;
 
 	void process_accelerometer(const Vector3 &p_accelerometer);
-	void process_touch(int p_what, int p_pointer, const Vector<TouchPos> &p_points);
-	void push_input(const InputEvent &p_ev);
+	void push_input(const Ref<InputEvent> &p_ev);
 
 	virtual bool is_joy_known(int p_device);
 	virtual String get_joy_guid(int p_device) const;
@@ -177,7 +164,7 @@ public:
 	virtual int get_power_seconds_left();
 	virtual int get_power_percent_left();
 
-	OS_JavaScript(const char *p_execpath, GFXInitFunc p_gfx_init_func, void *p_gfx_init_ud, GetDataDirFunc p_get_data_dir_func);
+	OS_JavaScript(const char *p_execpath, GetDataDirFunc p_get_data_dir_func);
 	~OS_JavaScript();
 };