From 903c4dbef9fae1e24a66a8ff7b745c799f6726cd Mon Sep 17 00:00:00 2001 From: Vincent Sanders Date: Mon, 30 May 2016 10:57:22 +0100 Subject: move search header into public API --- desktop/gui_factory.c | 2 +- desktop/gui_search.h | 75 -------------------------------- frontends/amiga/search.c | 2 +- frontends/atari/search.c | 2 +- frontends/beos/gui.cpp | 2 +- frontends/cocoa/SearchWindowController.m | 2 +- frontends/gtk/search.c | 2 +- frontends/riscos/search.c | 2 +- include/netsurf/search.h | 75 ++++++++++++++++++++++++++++++++ render/search.c | 2 +- 10 files changed, 83 insertions(+), 83 deletions(-) delete mode 100644 desktop/gui_search.h create mode 100644 include/netsurf/search.h diff --git a/desktop/gui_factory.c b/desktop/gui_factory.c index 07848ee02..0aba19751 100644 --- a/desktop/gui_factory.c +++ b/desktop/gui_factory.c @@ -34,7 +34,7 @@ #include "desktop/gui_fetch.h" #include "desktop/gui_misc.h" #include "desktop/gui_window.h" -#include "desktop/gui_search.h" +#include "netsurf/search.h" #include "desktop/gui_clipboard.h" #include "desktop/gui_utf8.h" #include "desktop/gui_layout.h" diff --git a/desktop/gui_search.h b/desktop/gui_search.h deleted file mode 100644 index 0b02ac8bb..000000000 --- a/desktop/gui_search.h +++ /dev/null @@ -1,75 +0,0 @@ -/* - * Copyright 2014 Vincent Sanders - * - * 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 . - */ - -/** - * \file - * - * Interface to platform-specific search operations. - */ - -#ifndef _NETSURF_DESKTOP_GUI_SEARCH_H_ -#define _NETSURF_DESKTOP_GUI_SEARCH_H_ - -/** - * function table for page text search. - */ -struct gui_search_table { - /** - * Change the displayed search status. - * - * \param found search pattern matched in text - * \param p gui private data pointer provided with search callbacks - */ - void (*status)(bool found, void *p); - - /** - * display hourglass while searching. - * - * \param active start/stop indicator - * \param p gui private data pointer provided with search callbacks - */ - void (*hourglass)(bool active, void *p); - - /** - * add search string to recent searches list - * front has full liberty how to implement the bare notification; - * core gives no guarantee of the integrity of the string - * - * \param string search pattern - * \param p gui private data pointer provided with search callbacks - */ - void (*add_recent)(const char *string, void *p); - - /** - * activate search forwards button in gui - * - * \param active activate/inactivate - * \param p gui private data pointer provided with search callbacks - */ - void (*forward_state)(bool active, void *p); - - /** - * activate search back button in gui - * - * \param active activate/inactivate - * \param p gui private data pointer provided with search callbacks - */ - void (*back_state)(bool active, void *p); -}; - -#endif diff --git a/frontends/amiga/search.c b/frontends/amiga/search.c index 5ca979220..71ed0033d 100755 --- a/frontends/amiga/search.c +++ b/frontends/amiga/search.c @@ -52,7 +52,7 @@ #include "desktop/search.h" #include "desktop/mouse.h" #include "desktop/gui_window.h" -#include "desktop/gui_search.h" +#include "netsurf/search.h" #include "amiga/libs.h" #include "amiga/misc.h" diff --git a/frontends/atari/search.c b/frontends/atari/search.c index d72d3caaa..11fd67e4b 100644 --- a/frontends/atari/search.c +++ b/frontends/atari/search.c @@ -29,7 +29,7 @@ #include "utils/messages.h" #include "desktop/browser.h" #include "desktop/search.h" -#include "desktop/gui_search.h" +#include "netsurf/search.h" #include "atari/gui.h" #include "atari/rootwin.h" diff --git a/frontends/beos/gui.cpp b/frontends/beos/gui.cpp index 2e0aa4cc5..4c0fb512a 100644 --- a/frontends/beos/gui.cpp +++ b/frontends/beos/gui.cpp @@ -65,7 +65,7 @@ extern "C" { #include "desktop/browser.h" #include "desktop/gui_misc.h" #include "desktop/gui_clipboard.h" -#include "desktop/gui_search.h" +#include "netsurf/search.h" #include "desktop/gui_fetch.h" #include "desktop/netsurf.h" diff --git a/frontends/cocoa/SearchWindowController.m b/frontends/cocoa/SearchWindowController.m index 1c896a958..d07fd0413 100644 --- a/frontends/cocoa/SearchWindowController.m +++ b/frontends/cocoa/SearchWindowController.m @@ -20,7 +20,7 @@ #import "cocoa/SearchWindowController.h" #import "cocoa/BrowserViewController.h" -#import "desktop/gui_search.h" +#import "netsurf/search.h" #import "desktop/browser.h" #import "desktop/search.h" diff --git a/frontends/gtk/search.c b/frontends/gtk/search.c index d2adcf1b5..1124c6816 100644 --- a/frontends/gtk/search.c +++ b/frontends/gtk/search.c @@ -33,7 +33,7 @@ #include "desktop/browser.h" #include "desktop/search.h" #include "desktop/searchweb.h" -#include "desktop/gui_search.h" +#include "netsurf/search.h" #include "gtk/warn.h" #include "gtk/compat.h" diff --git a/frontends/riscos/search.c b/frontends/riscos/search.c index 989c9aa9e..2e869bb43 100644 --- a/frontends/riscos/search.c +++ b/frontends/riscos/search.c @@ -34,7 +34,7 @@ #include "content/content.h" #include "content/hlcache.h" #include "desktop/browser.h" -#include "desktop/gui_search.h" +#include "netsurf/search.h" #include "desktop/browser.h" #include "desktop/search.h" diff --git a/include/netsurf/search.h b/include/netsurf/search.h new file mode 100644 index 000000000..0b02ac8bb --- /dev/null +++ b/include/netsurf/search.h @@ -0,0 +1,75 @@ +/* + * Copyright 2014 Vincent Sanders + * + * 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 . + */ + +/** + * \file + * + * Interface to platform-specific search operations. + */ + +#ifndef _NETSURF_DESKTOP_GUI_SEARCH_H_ +#define _NETSURF_DESKTOP_GUI_SEARCH_H_ + +/** + * function table for page text search. + */ +struct gui_search_table { + /** + * Change the displayed search status. + * + * \param found search pattern matched in text + * \param p gui private data pointer provided with search callbacks + */ + void (*status)(bool found, void *p); + + /** + * display hourglass while searching. + * + * \param active start/stop indicator + * \param p gui private data pointer provided with search callbacks + */ + void (*hourglass)(bool active, void *p); + + /** + * add search string to recent searches list + * front has full liberty how to implement the bare notification; + * core gives no guarantee of the integrity of the string + * + * \param string search pattern + * \param p gui private data pointer provided with search callbacks + */ + void (*add_recent)(const char *string, void *p); + + /** + * activate search forwards button in gui + * + * \param active activate/inactivate + * \param p gui private data pointer provided with search callbacks + */ + void (*forward_state)(bool active, void *p); + + /** + * activate search back button in gui + * + * \param active activate/inactivate + * \param p gui private data pointer provided with search callbacks + */ + void (*back_state)(bool active, void *p); +}; + +#endif diff --git a/render/search.c b/render/search.c index f5e231ab0..4a1cd2ce4 100644 --- a/render/search.c +++ b/render/search.c @@ -33,7 +33,7 @@ #include "content/content.h" #include "content/hlcache.h" #include "desktop/selection.h" -#include "desktop/gui_search.h" +#include "netsurf/search.h" #include "desktop/gui_misc.h" #include "desktop/gui_internal.h" -- cgit v1.2.3