debian/midori
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Implement a primitive find-as-you-type

Browse source
This commit is contained in:
Christian Dywan 2009-02-22 01:45:22 +01:00
parent 3baab132b9
commit 51c6fb1cdf
3 changed files with 51 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
midori/marshal.list
View file

@ -1,4 +1,5 @@
BOOLEAN:VOID
VOID:BOOLEAN,STRING
VOID:OBJECT,ENUM
VOID:STRING,BOOLEAN
VOID:STRING,INT,STRING

10
midori/midori-browser.c
View file

@ -855,12 +855,22 @@ midori_view_new_view_cb (GtkWidget* view,
static void
midori_view_search_text_cb (GtkWidget* view,
gboolean found,
gchar* typing,
MidoriBrowser* browser)
{
const gchar* text;
gboolean case_sensitive;
gboolean highlight;
if (typing)
{
gint position = -1;
gtk_widget_show (browser->find);
gtk_window_set_focus (GTK_WINDOW (browser), browser->find_text);
gtk_editable_insert_text (GTK_EDITABLE (browser->find_text), typing, -1, &position);
gtk_editable_set_position (GTK_EDITABLE (browser->find_text), -1);
}
if (GTK_WIDGET_VISIBLE (browser->find))
{
gtk_icon_entry_set_icon_from_stock (GTK_ICON_ENTRY (browser->find_text),

44
midori/midori-view.c
View file

@ -275,6 +275,18 @@ midori_view_class_init (MidoriViewClass* class)
MIDORI_TYPE_VIEW,
MIDORI_TYPE_NEW_VIEW);
/**
* MidoriView::search-text:
* @view: the object on which the signal is emitted
* @found: whether the search was successful
* @typing: whether the search was initiated by typing
*
* Emitted when a search is performed. Either manually
* invoked or automatically by typing. The value of typing
* is actually the text the user typed.
*
* Note that in 0.1.3 the argument @typing was introduced.
*/
signals[SEARCH_TEXT] = g_signal_new (
"search-text",
G_TYPE_FROM_CLASS (class),
@ -282,9 +294,10 @@ midori_view_class_init (MidoriViewClass* class)
0,
0,
NULL,
g_cclosure_marshal_VOID__BOOLEAN,
G_TYPE_NONE, 1,
G_TYPE_BOOLEAN);
midori_cclosure_marshal_VOID__BOOLEAN_STRING,
G_TYPE_NONE, 2,
G_TYPE_BOOLEAN,
G_TYPE_STRING);
signals[ADD_BOOKMARK] = g_signal_new (
"add-bookmark",
@ -794,6 +807,27 @@ gtk_widget_button_press_event_cb (WebKitWebView* web_view,
return FALSE;
}
static gboolean
gtk_widget_key_press_event_cb (WebKitWebView* web_view,
GdkEventKey* event,
MidoriView* view)
{
guint character = gdk_unicode_to_keyval (event->keyval);
if (!webkit_web_view_can_cut_clipboard (web_view)
&& !webkit_web_view_can_paste_clipboard (web_view))
{
gchar* text = g_strdup_printf ("%c", character);
g_signal_emit (view, signals[SEARCH_TEXT], 0,
webkit_web_view_search_text (web_view,
text, FALSE, TRUE, TRUE), text);
g_free (text);
}
return FALSE;
}
static gboolean
gtk_widget_scroll_event_cb (WebKitWebView* web_view,
GdkEventScroll* event,
@ -1541,6 +1575,8 @@ midori_view_construct_web_view (MidoriView* view)
webkit_web_view_hovering_over_link_cb, view,
"signal::button-press-event",
gtk_widget_button_press_event_cb, view,
"signal::key-press-event",
gtk_widget_key_press_event_cb, view,
"signal::scroll-event",
gtk_widget_scroll_event_cb, view,
"signal::populate-popup",
@ -2434,7 +2470,7 @@ midori_view_search_text (MidoriView* view,
g_signal_emit (view, signals[SEARCH_TEXT], 0,
webkit_web_view_search_text (WEBKIT_WEB_VIEW (view->web_view),
text, case_sensitive, forward, TRUE));
text, case_sensitive, forward, TRUE), NULL);
}
/**