mirrors/netsurf
1
0
Fork 0
mirror of https://github.com/netsurf-browser/netsurf synced 2025-02-15 14:04:22 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'tlsa/selection-search-refactor'

Browse Source
This commit is contained in:
Michael Drake 2013-05-10 12:20:24 +01:00
commit 51a16104c7
31 changed files with 18 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
amiga/clipboard.c
View File

@ -18,7 +18,6 @@
#include "desktop/gui.h"
#include "desktop/plotters.h"
#include "desktop/selection.h"
#include "desktop/textinput.h"
#include "desktop/options.h"

1
amiga/context_menu.c
View File

@ -42,7 +42,6 @@
#include "desktop/browser_private.h"
#include "desktop/history_core.h"
#include "desktop/hotlist.h"
#include "desktop/selection.h"
#include "desktop/searchweb.h"
#include "desktop/textinput.h"
#include "desktop/tree_url_node.h"

1
amiga/download.c
View File

@ -43,7 +43,6 @@
#include "amiga/utf8.h"
#include "desktop/download.h"
#include "desktop/selection.h"
#include "desktop/save_complete.h"
#include "image/ico.h"

4
amiga/drag.c
View File

@ -40,8 +40,6 @@
#include "desktop/options.h"
#include "amiga/theme.h"
#include "desktop/selection.h"
#include "utils/errors.h"
#include "utils/log.h"
#include "utils/messages.h"
@ -89,7 +87,7 @@ void gui_drag_save_object(gui_save_type type, hlcache_handle *c,
drag_save = type;
}
void gui_drag_save_selection(struct selection *s, struct gui_window *g)
void gui_drag_save_selection(struct gui_window *g, const char *selection)
{
ami_drag_icon_show(g->shared->win, "ascii");

1
amiga/file.c
View File

@ -33,7 +33,6 @@
#include "desktop/save_complete.h"
#include "desktop/save_pdf/pdf_plotters.h"
#include "desktop/save_text.h"
#include "desktop/selection.h"
#include "utils/messages.h"
#include "utils/url.h"

1
amiga/gui.c
View File

@ -27,7 +27,6 @@
#include "desktop/save_complete.h"
#include "desktop/scrollbar.h"
#include "desktop/searchweb.h"
#include "desktop/selection.h"
#include "desktop/textinput.h"
#include "desktop/tree.h"
#include "desktop/tree_url_node.h"

1
amiga/menu.c
View File

@ -60,7 +60,6 @@
#include "desktop/hotlist.h"
#include "desktop/browser_private.h"
#include "desktop/gui.h"
#include "desktop/selection.h"
#include "desktop/textinput.h"
#include "utils/messages.h"
#include "utils/schedule.h"

1
amiga/search.c
View File

@ -29,7 +29,6 @@
#include "desktop/browser.h"
#include "desktop/gui.h"
#include "desktop/search.h"
#include "desktop/selection.h"
#include "utils/log.h"
#include "utils/messages.h"
#include "utils/utils.h"

1
atari/download.c
View File

@ -32,7 +32,6 @@
#include "desktop/netsurf.h"
#include "desktop/options.h"
#include "desktop/save_complete.h"
#include "desktop/selection.h"
#include "desktop/textinput.h"
#include "desktop/download.h"
#include "render/html.h"

3
atari/gui.c
View File

@ -42,7 +42,6 @@
#include "desktop/options.h"
#include "desktop/save_complete.h"
#include "desktop/selection.h"
#include "desktop/textinput.h"
#include "desktop/browser.h"
#include "desktop/browser_private.h"
@ -661,7 +660,7 @@ void gui_drag_save_object(gui_save_type type, hlcache_handle *c,
TODO();
}
void gui_drag_save_selection(struct selection *s, struct gui_window *w)
void gui_drag_save_selection(struct gui_window *g, const char *selection)
{
LOG((""));
TODO();

3
beos/window.cpp
View File

@ -26,7 +26,6 @@ extern "C" {
#include "desktop/browser_private.h"
#include "desktop/mouse.h"
#include "desktop/options.h"
#include "desktop/selection.h"
#include "desktop/textinput.h"
#include "render/font.h"
#include "utils/log.h"
@ -1297,7 +1296,7 @@ void gui_drag_save_object(gui_save_type type, hlcache_handle *c,
}
void gui_drag_save_selection(struct selection *s, struct gui_window *g)
void gui_drag_save_selection(struct gui_window *g, const char *selection)
{
}

1
cocoa/BrowserView.m
View File

@ -28,7 +28,6 @@
#import "desktop/plotters.h"
#import "desktop/textinput.h"
#import "desktop/options.h"
#import "desktop/selection.h"
#import "utils/messages.h"
@interface BrowserView ()

1
cocoa/BrowserViewController.m
View File

@ -24,7 +24,6 @@
#import "desktop/history_core.h"
#import "desktop/textinput.h"
#import "desktop/options.h"
#import "desktop/selection.h"
#import "utils/corestrings.h"
#import "utils/filename.h"

1
cocoa/NetsurfApp.m
View File

@ -32,7 +32,6 @@
#import "desktop/options.h"
#import "desktop/plotters.h"
#import "desktop/save_complete.h"
#import "desktop/selection.h"
#import "desktop/textinput.h"
#import "desktop/tree.h"
#import "render/html.h"

3
cocoa/gui.m
View File

@ -30,7 +30,6 @@
#import "desktop/browser_private.h"
#import "desktop/options.h"
#import "desktop/textinput.h"
#import "desktop/selection.h"
#import "desktop/401login.h"
#import "utils/utils.h"
#import "image/ico.h"
@ -291,7 +290,7 @@ void gui_drag_save_object(gui_save_type type, hlcache_handle *c,
{
}
void gui_drag_save_selection(struct selection *s, struct gui_window *g)
void gui_drag_save_selection(struct gui_window *g, const char *selection)
{
}

1
cocoa/selection.m
View File

@ -21,7 +21,6 @@
#import "cocoa/BrowserViewController.h"
#import "desktop/browser_private.h"
#import "desktop/selection.h"
static NSMutableString *cocoa_clipboard_string;

3
desktop/gui.h
View File

@ -50,7 +50,6 @@ typedef enum {
struct gui_window;
struct gui_download_window;
struct browser_window;
struct selection;
struct form_control;
#include <stdbool.h>
@ -116,7 +115,7 @@ void gui_download_window_done(struct gui_download_window *dw);
void gui_drag_save_object(gui_save_type type, hlcache_handle *c,
struct gui_window *g);
void gui_drag_save_selection(struct selection *s, struct gui_window *g);
void gui_drag_save_selection(struct gui_window *g, const char *selection);
void gui_start_selection(struct gui_window *g);
void gui_clear_selection(struct gui_window *g);

5
desktop/selection.c
View File

@ -273,8 +273,9 @@ bool selection_click(struct selection *s, browser_mouse_state mouse,
((mouse & BROWSER_MOUSE_DRAG_1) ||
(modkeys && (mouse & BROWSER_MOUSE_DRAG_2)))) {
/* drag-saving selection */
gui_drag_save_selection(s, top->window);
char *sel = selection_get_copy(s);
gui_drag_save_selection(top->window, sel);
free(sel);
}
else if (!modkeys) {
if (pos && (mouse & BROWSER_MOUSE_PRESS_1)) {

1
framebuffer/clipboard.c
View File

@ -25,7 +25,6 @@
#include <string.h>
#include "desktop/browser.h"
#include "desktop/gui.h"
#include "desktop/selection.h"
#include "framebuffer/gui.h"
#include "utils/log.h"

2
framebuffer/gui.c
View File

@ -1844,7 +1844,7 @@ gui_drag_save_object(gui_save_type type,
}
void
gui_drag_save_selection(struct selection *s, struct gui_window *g)
gui_drag_save_selection(struct gui_window *g, const char *selection)
{
}

1
gtk/scaffolding.c
View File

@ -48,7 +48,6 @@
#include "desktop/save_text.h"
#include "desktop/search.h"
#include "desktop/searchweb.h"
#include "desktop/selection.h"
#include "desktop/textinput.h"
#include "desktop/tree.h"
#include "gtk/cookies.h"

1
gtk/search.c
View File

@ -36,7 +36,6 @@
#include "desktop/gui.h"
#include "desktop/search.h"
#include "desktop/searchweb.h"
#include "desktop/selection.h"
#include "utils/log.h"
#include "utils/messages.h"
#include "utils/utils.h"

1
gtk/selection.c
View File

@ -22,7 +22,6 @@
#include "utils/log.h"
#include "desktop/gui.h"
#include "desktop/selection.h"
#include "desktop/browser.h"
#include "gtk/selection.h"
#include "gtk/window.h"

3
gtk/window.c
View File

@ -33,7 +33,6 @@
#include "desktop/options.h"
#include "desktop/searchweb.h"
#include "desktop/textinput.h"
#include "desktop/selection.h"
#include "gtk/compat.h"
#include "gtk/gui.h"
#include "gtk/scaffolding.h"
@ -1080,7 +1079,7 @@ void gui_drag_save_object(gui_save_type type, hlcache_handle *c,
}
void gui_drag_save_selection(struct selection *s, struct gui_window *g)
void gui_drag_save_selection(struct gui_window *g, const char *selection)
{
}

2
monkey/browser.c
View File

@ -314,7 +314,7 @@ gui_window_scroll_visible(struct gui_window *g, int x0, int y0,
}
void
gui_drag_save_selection(struct selection *s, struct gui_window *g)
gui_drag_save_selection(struct gui_window *g, const char *selection)
{
}

1
riscos/menus.c
View File

@ -41,7 +41,6 @@
#include "desktop/history_core.h"
#include "desktop/hotlist.h"
#include "desktop/netsurf.h"
#include "desktop/selection.h"
#include "desktop/textinput.h"
#include "riscos/dialog.h"
#include "riscos/configure.h"

8
riscos/save.c
View File

@ -42,7 +42,6 @@
#include "desktop/netsurf.h"
#include "desktop/save_complete.h"
#include "desktop/save_text.h"
#include "desktop/selection.h"
#include "desktop/thumbnail.h"
#include "image/bitmap.h"
#include "render/form.h"
@ -395,7 +394,7 @@ void gui_drag_save_object(gui_save_type save_type, hlcache_handle *c,
* \param g gui window
*/
void gui_drag_save_selection(struct selection *s, struct gui_window *g)
void gui_drag_save_selection(struct gui_window *g, const char *selection)
{
wimp_pointer pointer;
char icon_buf[20];
@ -421,7 +420,10 @@ void gui_drag_save_selection(struct selection *s, struct gui_window *g)
if (gui_save_selection == NULL)
free(gui_save_selection);
gui_save_selection = selection_get_copy(s);
if (selection == NULL)
gui_save_selection = strdup("");
else
gui_save_selection = strdup(selection);
ro_gui_save_set_state(NULL, GUI_SAVE_TEXT_SELECTION, NULL,
save_leafname, LEAFNAME_MAX,

1
riscos/search.c
View File

@ -34,7 +34,6 @@
#include "desktop/gui.h"
#include "desktop/browser_private.h"
#include "desktop/search.h"
#include "desktop/selection.h"
#include "riscos/dialog.h"
#include "riscos/menus.h"
#include "riscos/wimp.h"

1
riscos/textselection.c
View File

@ -27,7 +27,6 @@
#include "oslib/wimp.h"
#include "content/hlcache.h"
#include "desktop/gui.h"
#include "desktop/selection.h"
#include "desktop/textinput.h"
#include "riscos/gui.h"
#include "riscos/menus.h"

1
riscos/window.c
View File

@ -53,7 +53,6 @@
#include "desktop/hotlist.h"
#include "desktop/mouse.h"
#include "desktop/plotters.h"
#include "desktop/selection.h"
#include "desktop/textinput.h"
#include "desktop/thumbnail.h"
#include "desktop/tree.h"

4
windows/gui.c
View File

@ -38,7 +38,6 @@
#include "desktop/netsurf.h"
#include "desktop/options.h"
#include "desktop/plotters.h"
#include "desktop/selection.h"
#include "desktop/textinput.h"
#include "render/html.h"
#include "utils/log.h"
@ -1766,7 +1765,8 @@ void gui_drag_save_object(gui_save_type type, hlcache_handle *c,
{
}
void gui_drag_save_selection(struct selection *s, struct gui_window *w)
void gui_drag_save_selection(struct gui_window *g, const char *selection)
{
}