move key press enums and operations to their own header

desktop/textarea.c

@@ -29,16 +29,16 @@
 #include "utils/log.h"
 #include "utils/utf8.h"
 #include "utils/utils.h"
-#include "css/utils.h"
-
 #include "netsurf/browser_window.h"
-#include "netsurf/mouse.h"
-#include "desktop/textarea.h"
-#include "desktop/textinput.h"
 #include "netsurf/plotters.h"
-#include "desktop/scrollbar.h"
+#include "netsurf/mouse.h"
+#include "netsurf/keypress.h"
 #include "netsurf/clipboard.h"
 #include "netsurf/layout.h"
+#include "css/utils.h"
+
+#include "desktop/textarea.h"
+#include "desktop/scrollbar.h"
 #include "desktop/gui_internal.h"
 
 #define CARET_COLOR 0x0000FF

desktop/textinput.c

@@ -33,15 +33,16 @@
 #include "utils/talloc.h"
 #include "utils/utf8.h"
 #include "utils/utils.h"
+#include "netsurf/mouse.h"
 #include "netsurf/form.h"
+#include "netsurf/window.h"
+#include "netsurf/keypress.h"
 #include "render/box.h"
 #include "render/html_internal.h"
 #include "render/layout.h"
 
-#include "netsurf/mouse.h"
 #include "desktop/browser_private.h"
 #include "desktop/textinput.h"
-#include "netsurf/window.h"
 #include "desktop/gui_internal.h"
 
 /* Define to enable textinput debug */
@@ -101,7 +102,7 @@ void browser_window_remove_caret(struct browser_window *bw, bool only_hide)
 	}
 }
 
-/* exported interface documented in desktop/textinput.h */
+/* exported interface documented in netsurf/keypress.h */
 bool browser_window_key_press(struct browser_window *bw, uint32_t key)
 {
 	struct browser_window *focus = bw->focus;

desktop/textinput.h

@@ -19,8 +19,9 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-/** \file
- * Textual input handling (interface)
+/**
+ * \file
+ * Textual input handling interface
  */
 
 #ifndef _NETSURF_DESKTOP_TEXTINPUT_H_
@@ -28,49 +29,6 @@
 
 struct browser_window;
 
-enum input_key {
-
-	NS_KEY_SELECT_ALL = 1,
-	NS_KEY_COPY_SELECTION = 3,
-
-	NS_KEY_DELETE_LEFT = 8,
-	NS_KEY_TAB = 9,
-
-	NS_KEY_NL = 10,
-	NS_KEY_SHIFT_TAB = 11,
-	NS_KEY_CR = 13,
-
-	NS_KEY_DELETE_LINE = 21,
-	NS_KEY_PASTE = 22,
-	NS_KEY_CUT_SELECTION = 24,
-	NS_KEY_CLEAR_SELECTION = 26,
-
-	NS_KEY_ESCAPE = 27,
-
-	/* cursor movement keys */
-	NS_KEY_LEFT = 28,
-	NS_KEY_RIGHT,
-	NS_KEY_UP,
-	NS_KEY_DOWN,
-
-	NS_KEY_DELETE_RIGHT = 127,
-
-	NS_KEY_LINE_START = 128,
-	NS_KEY_LINE_END,
-	NS_KEY_TEXT_START,
-	NS_KEY_TEXT_END,
-	NS_KEY_WORD_LEFT,
-	NS_KEY_WORD_RIGHT,
-	NS_KEY_PAGE_UP,
-	NS_KEY_PAGE_DOWN,
-	NS_KEY_DELETE_LINE_END,
-	NS_KEY_DELETE_LINE_START,
-
-	NS_KEY_UNDO,
-	NS_KEY_REDO
-};
-
-
 /**
  * Position the caret and assign a callback for key presses.
  *
@@ -91,13 +49,5 @@ void browser_window_place_caret(struct browser_window *bw, int x, int y,
  */
 void browser_window_remove_caret(struct browser_window *bw, bool only_hide);
 
-/**
- * Handle key presses in a browser window.
- *
- * \param bw   The root browser window
- * \param key  The UCS4 character codepoint
- * \return true if key handled, false otherwise
- */
-bool browser_window_key_press(struct browser_window *bw, uint32_t key);
 
 #endif

desktop/treeview.c

@@ -29,6 +29,7 @@
 #include "netsurf/plotters.h"
 #include "netsurf/clipboard.h"
 #include "netsurf/layout.h"
+#include "netsurf/keypress.h"
 #include "content/hlcache.h"
 #include "css/utils.h"
 
@@ -37,7 +38,6 @@
 #include "desktop/textarea.h"
 #include "desktop/treeview.h"
 #include "desktop/gui_internal.h"
-#include "desktop/textinput.h"
 #include "desktop/core_window.h"
 
 /** @todo get rid of REDRAW_MAX -- need to be able to know window size */

frontends/amiga/clipboard.c

@@ -33,7 +33,7 @@
 #include "netsurf/content.h"
 #include "netsurf/browser_window.h"
 #include "netsurf/plotters.h"
-#include "desktop/textinput.h"
+#include "netsurf/keypress.h"
 #include "netsurf/window.h"
 #include "netsurf/clipboard.h"
 

frontends/amiga/ctxmenu.c

@@ -43,9 +43,9 @@
 #include "netsurf/content.h"
 #include "netsurf/browser_window.h"
 #include "netsurf/mouse.h"
+#include "netsurf/keypress.h"
 #include "desktop/browser_history.h"
 #include "desktop/searchweb.h"
-#include "desktop/textinput.h"
 
 #include "amiga/bitmap.h"
 #include "amiga/clipboard.h"

frontends/amiga/gui.c

@@ -107,6 +107,7 @@
 #include "netsurf/browser_window.h"
 #include "netsurf/cookie_db.h"
 #include "netsurf/url_db.h"
+#include "netsurf/keypress.h"
 #include "content/backing_store.h"
 #include "content/fetch.h"
 #include "desktop/browser_history.h"
@@ -115,7 +116,6 @@
 #include "desktop/save_complete.h"
 #include "desktop/scrollbar.h"
 #include "desktop/searchweb.h"
-#include "desktop/textinput.h"
 #include "desktop/tree.h"
 
 /* NetSurf Amiga platform includes */

frontends/amiga/menu.c

@@ -51,8 +51,8 @@
 #include "netsurf/mouse.h"
 #include "netsurf/window.h"
 #include "netsurf/content.h"
+#include "netsurf/keypress.h"
 #include "desktop/hotlist.h"
-#include "desktop/textinput.h"
 #include "desktop/version.h"
 
 #include "amiga/arexx.h"

frontends/amiga/tree.c

@@ -55,12 +55,12 @@
 #include "utils/messages.h"
 #include "netsurf/browser_window.h"
 #include "netsurf/window.h"
+#include "netsurf/keypress.h"
 #include "content/llcache.h"
 #include "desktop/cookie_manager.h"
 #include "desktop/global_history.h"
 #include "desktop/hotlist.h"
 #include "desktop/sslcert_viewer.h"
-#include "desktop/textinput.h"
 
 #include "amiga/gui.h"
 #include "amiga/tree.h"

frontends/atari/ctxmenu.c

@@ -22,7 +22,7 @@
 #include "utils/nsurl.h"
 #include "netsurf/browser_window.h"
 #include "netsurf/content.h"
-#include "desktop/textinput.h"
+#include "netsurf/keypress.h"
 
 #include "atari/gui.h"
 #include "atari/misc.h"

frontends/atari/deskmenu.c

@@ -24,8 +24,8 @@
 #include "utils/messages.h"
 #include "utils/nsoption.h"
 #include "netsurf/browser_window.h"
+#include "netsurf/keypress.h"
 #include "desktop/save_complete.h"
-#include "desktop/textinput.h"
 
 #include "atari/res/netsurf.rsh"
 #include "atari/gemtk/gemtk.h"

frontends/atari/download.c

@@ -31,11 +31,10 @@
 #include "utils/utils.h"
 #include "utils/nsoption.h"
 #include "utils/string.h"
-#include "desktop/save_complete.h"
-#include "desktop/textinput.h"
-#include "desktop/download.h"
 #include "netsurf/browser_window.h"
 #include "netsurf/download.h"
+#include "desktop/save_complete.h"
+#include "desktop/download.h"
 
 #include "atari/gui.h"
 #include "atari/misc.h"

frontends/atari/hotlist.c

@@ -28,10 +28,10 @@
 #include "utils/utils.h"
 #include "utils/nsoption.h"
 #include "utils/nsurl.h"
+#include "netsurf/keypress.h"
 #include "content/content.h"
 #include "desktop/hotlist.h"
 #include "desktop/tree.h"
-#include "desktop/textinput.h"
 
 #include "atari/gui.h"
 #include "atari/misc.h"

frontends/atari/misc.c

@@ -32,9 +32,9 @@
 #include "utils/file.h"
 #include "utils/dirent.h"
 #include "netsurf/mouse.h"
+#include "netsurf/keypress.h"
 #include "content/content.h"
 #include "content/hlcache.h"
-#include "desktop/textinput.h"
 #include "desktop/cookie_manager.h"
 #include "desktop/tree.h"
 

frontends/atari/rootwin.c

@@ -14,10 +14,11 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Module Description:
- *
- * This File implements the NetSurf Browser window, or passed functionality to
+ */
+
+/**
+ * \file
+ * Implements the NetSurf Browser window, or passed functionality to
  * the appropriate widget's.
  *
  */
@@ -41,7 +42,7 @@
 #include "netsurf/browser_window.h"
 #include "netsurf/mouse.h"
 #include "netsurf/plotters.h"
-#include "desktop/textinput.h"
+#include "netsurf/keypress.h"
 
 #include "atari/res/netsurf.rsh"
 #include "atari/gemtk/gemtk.h"

frontends/atari/toolbar.c

@@ -31,15 +31,15 @@
 #include "utils/nsoption.h"
 #include "utils/nsurl.h"
 #include "utils/utf8.h"
-#include "desktop/browser_history.h"
 #include "netsurf/browser_window.h"
 #include "netsurf/mouse.h"
-#include "desktop/plot_style.h"
 #include "netsurf/plotters.h"
+#include "netsurf/keypress.h"
+#include "desktop/plot_style.h"
+#include "desktop/browser_history.h"
 #include "desktop/tree.h"
 #include "desktop/hotlist.h"
 #include "desktop/textarea.h"
-#include "desktop/textinput.h"
 
 #include "atari/clipboard.h"
 #include "atari/gui.h"

frontends/beos/cookies.cpp

@@ -25,9 +25,9 @@ extern "C" {
 #include "netsurf/mouse.h"
 #include "netsurf/plotters.h"
 #include "netsurf/cookie_db.h"
+#include "netsurf/keypress.h"
 #include "desktop/cookie_manager.h"
 #include "desktop/tree.h"
-#include "desktop/textinput.h"
 }
 #include "beos/cookies.h"
 

frontends/beos/scaffolding.cpp

@@ -65,11 +65,11 @@ extern "C" {
 #include "netsurf/content_type.h"
 #include "netsurf/browser_window.h"
 #include "netsurf/form.h"
+#include "netsurf/keypress.h"
 #include "desktop/browser_history.h"
 #include "desktop/version.h"
 #include "desktop/searchweb.h"
 #include "desktop/search.h"
-#include "desktop/textinput.h"
 }
 
 #include "beos/about.h"

frontends/beos/window.cpp

@@ -47,7 +47,7 @@ extern "C" {
 #include "netsurf/window.h"
 #include "netsurf/clipboard.h"
 #include "netsurf/url_db.h"
-#include "desktop/textinput.h"
+#include "netsurf/keypress.h"
 }
 
 #include "beos/about.h"

frontends/cocoa/BookmarksController.m

@@ -20,9 +20,9 @@
 #import "utils/utils.h"
 #import "utils/nsurl.h"
 #import "netsurf/browser_window.h"
+#import "netsurf/keypress.h"
 #import "desktop/hotlist.h"
 #import "desktop/tree.h"
-#import "desktop/textinput.h"
 
 #import "cocoa/BookmarksController.h"
 #import "cocoa/Tree.h"

frontends/cocoa/BrowserView.m

@@ -23,7 +23,7 @@
 #import "netsurf/browser_window.h"
 #import "netsurf/plotters.h"
 #import "netsurf/content.h"
-#import "desktop/textinput.h"
+#import "netsurf/keypress.h"
 
 #import "cocoa/gui.h"
 #import "cocoa/BrowserView.h"

frontends/cocoa/BrowserViewController.m

@@ -25,7 +25,6 @@
 #import "netsurf/content.h"
 #import "netsurf/browser_window.h"
 #import "desktop/browser_history.h"
-#import "desktop/textinput.h"
 
 #import "cocoa/gui.h"
 #import "cocoa/BrowserViewController.h"

frontends/cocoa/NetsurfApp.m

@@ -40,7 +40,6 @@
 #import "netsurf/cookie_db.h"
 #import "netsurf/url_db.h"
 #import "desktop/save_complete.h"
-#import "desktop/textinput.h"
 #import "desktop/tree.h"
 
 #ifndef NETSURF_HOMEPAGE

frontends/cocoa/TreeView.m

@@ -20,7 +20,7 @@
 #import "cocoa/Tree.h"
 
 #import "netsurf/plotters.h"
-#import "desktop/textinput.h"
+#import "netsurf/keypress.h"
 
 @interface TreeView () <TreeDelegate>
 @end

frontends/cocoa/gui.m

@@ -27,7 +27,6 @@
 #import "netsurf/misc.h"
 #import "netsurf/browser_window.h"
 #import "netsurf/content.h"
-#import "desktop/textinput.h"
 
 #import "cocoa/gui.h"
 #import "cocoa/coordinates.h"

frontends/framebuffer/fbtk/event.c

@@ -32,7 +32,7 @@
 #include "utils/utils.h"
 #include "utils/log.h"
 #include "netsurf/browser_window.h"
-#include "desktop/textinput.h"
+#include "netsurf/keypress.h"
 
 #include "framebuffer/gui.h"
 #include "framebuffer/fbtk.h"

frontends/framebuffer/gui.c

@@ -35,7 +35,7 @@
 #include "utils/log.h"
 #include "utils/messages.h"
 #include "netsurf/browser_window.h"
-#include "desktop/textinput.h"
+#include "netsurf/keypress.h"
 #include "desktop/browser_history.h"
 #include "netsurf/plotters.h"
 #include "netsurf/window.h"

frontends/gtk/cookies.c

@@ -21,12 +21,13 @@
  */
 
 #include <gtk/gtk.h>
+#include <stdint.h>
 
 #include "utils/log.h"
+#include "netsurf/keypress.h"
 #include "desktop/cookie_manager.h"
 #include "desktop/plot_style.h"
 #include "desktop/tree.h"
-#include "desktop/textinput.h"
 
 #include "gtk/cookies.h"
 #include "gtk/plotters.h"

frontends/gtk/gui.c

@@ -38,18 +38,18 @@
 #include "utils/utils.h"
 #include "utils/file.h"
 #include "utils/nsoption.h"
-#include "content/fetch.h"
+#include "netsurf/keypress.h"
 #include "netsurf/url_db.h"
 #include "netsurf/cookie_db.h"
-#include "content/backing_store.h"
 #include "netsurf/browser_window.h"
+#include "netsurf/misc.h"
+#include "netsurf/netsurf.h"
+#include "content/fetch.h"
+#include "content/backing_store.h"
 #include "desktop/save_complete.h"
 #include "desktop/save_pdf.h"
 #include "desktop/searchweb.h"
-#include "desktop/textinput.h"
 #include "desktop/tree.h"
-#include "netsurf/misc.h"
-#include "netsurf/netsurf.h"
 
 #include "gtk/compat.h"
 #include "gtk/warn.h"

frontends/gtk/history.c

@@ -18,13 +18,14 @@
  */
 
 #include <stdlib.h>
+#include <stdint.h>
 #include <gtk/gtk.h>
 
 #include "utils/log.h"
+#include "netsurf/keypress.h"
 #include "desktop/global_history.h"
 #include "desktop/plot_style.h"
 #include "desktop/tree.h"
-#include "desktop/textinput.h"
 
 #include "gtk/plotters.h"
 #include "gtk/scaffolding.h"

frontends/gtk/hotlist.c

@@ -21,9 +21,9 @@
 
 #include "utils/log.h"
 #include "utils/nsoption.h"
+#include "netsurf/keypress.h"
 #include "desktop/hotlist.h"
 #include "desktop/tree.h"
-#include "desktop/textinput.h"
 
 #include "gtk/plotters.h"
 #include "gtk/scaffolding.h"

frontends/gtk/scaffolding.c

@@ -36,10 +36,11 @@
 #include "utils/file.h"
 #include "utils/nsurl.h"
 #include "netsurf/content.h"
-#include "desktop/browser_history.h"
+#include "netsurf/keypress.h"
 #include "netsurf/browser_window.h"
-#include "desktop/hotlist.h"
 #include "netsurf/plotters.h"
+#include "desktop/browser_history.h"
+#include "desktop/hotlist.h"
 #include "desktop/print.h"
 #include "desktop/save_complete.h"
 #ifdef WITH_PDF_EXPORT
@@ -48,7 +49,6 @@
 #endif
 #include "desktop/save_text.h"
 #include "desktop/searchweb.h"
-#include "desktop/textinput.h"
 #include "desktop/search.h"
 
 #include "gtk/compat.h"

frontends/gtk/window.c

@@ -42,6 +42,8 @@
 #include "netsurf/window.h"
 #include "netsurf/plotters.h"
 #include "netsurf/form.h"
+#include "netsurf/keypress.h"
+#include "desktop/textarea.h"
 #include "desktop/searchweb.h"
 #include "desktop/textinput.h"
 

frontends/riscos/cookies.c

@@ -33,9 +33,9 @@
 #include "utils/nsoption.h"
 #include "utils/messages.h"
 #include "utils/log.h"
+#include "netsurf/keypress.h"
 #include "desktop/cookie_manager.h"
 #include "desktop/tree.h"
-#include "desktop/textinput.h"
 
 #include "riscos/cookies.h"
 #include "riscos/dialog.h"

frontends/riscos/global_history.c

@@ -35,9 +35,9 @@
 #include "utils/messages.h"
 #include "utils/log.h"
 #include "netsurf/window.h"
+#include "netsurf/keypress.h"
 #include "desktop/global_history.h"
 #include "desktop/tree.h"
-#include "desktop/textinput.h"
 
 #include "riscos/dialog.h"
 #include "riscos/global_history.h"

frontends/riscos/hotlist.c

@@ -38,9 +38,9 @@
 #include "utils/nsurl.h"
 #include "netsurf/url_db.h"
 #include "netsurf/window.h"
+#include "netsurf/keypress.h"
 #include "desktop/hotlist.h"
 #include "desktop/tree.h"
-#include "desktop/textinput.h"
 
 #include "riscos/gui.h"
 #include "riscos/dialog.h"

frontends/riscos/menus.c

@@ -38,7 +38,6 @@
 #include "utils/messages.h"
 #include "utils/utf8.h"
 #include "desktop/cookie_manager.h"
-#include "desktop/textinput.h"
 
 #include "riscos/dialog.h"
 #include "riscos/configure.h"

frontends/riscos/textselection.c

@@ -33,7 +33,6 @@
 #include "utils/utils.h"
 #include "netsurf/clipboard.h"
 #include "netsurf/window.h"
-#include "desktop/textinput.h"
 #include "netsurf/browser_window.h"
 
 #include "riscos/gui.h"

frontends/riscos/treeview.c

@@ -40,7 +40,7 @@
 #include "utils/messages.h"
 #include "utils/utils.h"
 #include "netsurf/plotters.h"
-#include "desktop/textinput.h"
+#include "netsurf/keypress.h"
 #include "desktop/tree.h"
 
 #include "riscos/bitmap.h"

frontends/riscos/window.c

@@ -59,10 +59,10 @@
 #include "netsurf/bitmap.h"
 #include "netsurf/url_db.h"
 #include "netsurf/form.h"
+#include "netsurf/keypress.h"
 #include "desktop/browser_history.h"
 #include "desktop/cookie_manager.h"
 #include "desktop/scrollbar.h"
-#include "desktop/textinput.h"
 
 #include "riscos/bitmap.h"
 #include "riscos/buffer.h"

frontends/windows/drawable.c

@@ -29,7 +29,7 @@
 #include "utils/utils.h"
 #include "netsurf/browser_window.h"
 #include "netsurf/plotters.h"
-#include "desktop/textinput.h"
+#include "netsurf/keypress.h"
 
 #include "windows/windbg.h"
 #include "windows/plot.h"

frontends/windows/window.c

@@ -32,8 +32,8 @@
 #include "content/content.h"
 #include "netsurf/browser_window.h"
 #include "netsurf/window.h"
+#include "netsurf/keypress.h"
 #include "desktop/browser_history.h"
-#include "desktop/textinput.h"
 
 #include "windows/gui.h"
 #include "windows/pointers.h"

include/netsurf/keypress.h

@@ -0,0 +1,83 @@
+/*
+ * Copyright 2016 Vincent Sanders <vince@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
+ *
+ * Interface to key press operations.
+ */
+
+#ifndef _NETSURF_KEYPRESS_H_
+#define _NETSURF_KEYPRESS_H_
+
+struct browser_window;
+
+enum input_key {
+
+	NS_KEY_SELECT_ALL = 1,
+	NS_KEY_COPY_SELECTION = 3,
+
+	NS_KEY_DELETE_LEFT = 8,
+	NS_KEY_TAB = 9,
+
+	NS_KEY_NL = 10,
+	NS_KEY_SHIFT_TAB = 11,
+	NS_KEY_CR = 13,
+
+	NS_KEY_DELETE_LINE = 21,
+	NS_KEY_PASTE = 22,
+	NS_KEY_CUT_SELECTION = 24,
+	NS_KEY_CLEAR_SELECTION = 26,
+
+	NS_KEY_ESCAPE = 27,
+
+	/* cursor movement keys */
+	NS_KEY_LEFT = 28,
+	NS_KEY_RIGHT,
+	NS_KEY_UP,
+	NS_KEY_DOWN,
+
+	NS_KEY_DELETE_RIGHT = 127,
+
+	NS_KEY_LINE_START = 128,
+	NS_KEY_LINE_END,
+	NS_KEY_TEXT_START,
+	NS_KEY_TEXT_END,
+	NS_KEY_WORD_LEFT,
+	NS_KEY_WORD_RIGHT,
+	NS_KEY_PAGE_UP,
+	NS_KEY_PAGE_DOWN,
+	NS_KEY_DELETE_LINE_END,
+	NS_KEY_DELETE_LINE_START,
+
+	NS_KEY_UNDO,
+	NS_KEY_REDO
+};
+
+
+/**
+ * Handle key presses in a browser window.
+ *
+ * \param bw The root browser window
+ * \param key The UCS4 character codepoint
+ * \return true if key handled, false otherwise
+ */
+bool browser_window_key_press(struct browser_window *bw, uint32_t key);
+
+
+#endif

render/box_textarea.c

@@ -24,8 +24,8 @@
 
 #include "utils/config.h"
 #include "utils/log.h"
+#include "netsurf/keypress.h"
 #include "desktop/textarea.h"
-#include "desktop/textinput.h"
 
 #include "render/box_textarea.h"
 #include "render/font.h"

render/html_interaction.c

@@ -39,12 +39,12 @@
 #include "netsurf/mouse.h"
 #include "netsurf/misc.h"
 #include "netsurf/layout.h"
+#include "netsurf/keypress.h"
 #include "content/hlcache.h"
 #include "desktop/frames.h"
 #include "desktop/scrollbar.h"
 #include "desktop/selection.h"
 #include "desktop/textarea.h"
-#include "desktop/textinput.h"
 #include "javascript/js.h"
 #include "desktop/gui_internal.h"
 

render/textplain.c

@@ -38,16 +38,16 @@
 #include "utils/utils.h"
 #include "utils/utf8.h"
 #include "netsurf/content.h"
+#include "netsurf/keypress.h"
+#include "netsurf/browser_window.h"
+#include "netsurf/plotters.h"
+#include "netsurf/layout.h"
 #include "content/content_protected.h"
 #include "content/hlcache.h"
 #include "css/utils.h"
-#include "netsurf/browser_window.h"
 #include "utils/nsoption.h"
-#include "netsurf/plotters.h"
 #include "desktop/search.h"
 #include "desktop/selection.h"
-#include "desktop/textinput.h"
-#include "netsurf/layout.h"
 #include "desktop/gui_internal.h"
 
 #include "render/search.h"