move core window API into netsurf header path

3 files changed, 2 insertions, 86 deletions

diff --git a/desktop/core_window.h b/desktop/core_window.h
deleted file mode 100644
index 38045a3e8..000000000
--- a/desktop/core_window.h
+++ /dev/null
@@ -1,84 +0,0 @@
-/*
- * Copyright 2012 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 window handling (interface).
- */
-
-#ifndef _NETSURF_DESKTOP_CORE_WINDOW_H_
-#define _NETSURF_DESKTOP_CORE_WINDOW_H_
-
-struct core_window;
-struct rect;
-
-typedef enum {
-	CORE_WINDOW_DRAG_NONE,
-	CORE_WINDOW_DRAG_SELECTION,
-	CORE_WINDOW_DRAG_TEXT_SELECTION,
-	CORE_WINDOW_DRAG_MOVE
-} core_window_drag_status;
-
-/** Callbacks to achieve various core window functionality. */
-struct core_window_callback_table {
-	/**
-	 * Request a redraw of the window
-	 *
-	 * \param cw		the core window object
-	 * \param r		rectangle to redraw
-	 */
-	void (*redraw_request)(struct core_window *cw, const struct rect *r);
-
-	/**
-	 * Update the limits of the window
-	 *
-	 * \param cw		the core window object
-	 * \param width		the width in px, or negative if don't care
-	 * \param height	the height in px, or negative if don't care
-	 */
-	void (*update_size)(struct core_window *cw, int width, int height);
-
-	/**
-	 * Scroll the window to make area visible
-	 *
-	 * \param cw		the core window object
-	 * \param r		rectangle to make visible
-	 */
-	void (*scroll_visible)(struct core_window *cw, const struct rect *r);
-
-	/**
-	 * Get window viewport dimensions
-	 *
-	 * \param cw		the core window object
-	 * \param width		to be set to viewport width in px, if non NULL
-	 * \param height	to be set to viewport height in px, if non NULL
-	 */
-	void (*get_window_dimensions)(struct core_window *cw,
-			int *width, int *height);
-
-	/**
-	 * Inform corewindow owner of drag status
-	 *
-	 * \param cw		the core window object
-	 * \param ds		the current drag status
-	 */
-	void (*drag_status)(struct core_window *cw,
-			core_window_drag_status ds);
-};
-
-
-#endif
diff --git a/desktop/tree.c b/desktop/tree.c
index a5c97c33c..4972777ba 100644
--- a/desktop/tree.c
+++ b/desktop/tree.c
@@ -32,11 +32,11 @@
 #include "utils/utils.h"
 #include "utils/nsoption.h"
 #include "netsurf/browser_window.h"
+#include "netsurf/core_window.h"
 #include "content/content.h"
 #include "content/hlcache.h"
 
 #include "desktop/tree.h"
-#include "desktop/core_window.h"
 
 struct tree {
 	unsigned int flags;	/* Tree flags */
diff --git a/desktop/treeview.c b/desktop/treeview.c
index fa7fea02d..387b34e7b 100644
--- a/desktop/treeview.c
+++ b/desktop/treeview.c
@@ -31,6 +31,7 @@
 #include "netsurf/clipboard.h"
 #include "netsurf/layout.h"
 #include "netsurf/keypress.h"
+#include "netsurf/core_window.h"
 #include "content/hlcache.h"
 #include "css/utils.h"
 
@@ -39,7 +40,6 @@
 #include "desktop/textarea.h"
 #include "desktop/treeview.h"
 #include "desktop/gui_internal.h"
-#include "desktop/core_window.h"
 
 /** @todo get rid of REDRAW_MAX -- need to be able to know window size */
 #define REDRAW_MAX 8000