A bunch of cleanups. Add some useful properties to the browser.
Marco Pesenti Gritti
18 years ago
parent
5101efb75b
commit
5a7a2fedc3
@ -1,158 +0,0 @@
|
||||
/*
|
||||
* Copyright (C) 2006 Red Hat, Inc
|
||||
*
|
||||
* Sugar 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; either version 2 of the License, or
|
||||
* (at your option) any later version.
|
||||
*
|
||||
* Sugar 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, write to the Free Software
|
||||
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
|
||||
*/
|
||||
|
||||
#include "gecko-browser.h"
|
||||
|
||||
#include <nsCOMPtr.h>
|
||||
#include <nsIPrefService.h>
|
||||
#include <nsServiceManagerUtils.h>
|
||||
|
||||
enum {
|
||||
PROP_0,
|
||||
PROP_PROGRESS
|
||||
};
|
||||
|
||||
void
|
||||
gecko_browser_startup(void)
|
||||
{
|
||||
nsCOMPtr<nsIPrefService> prefService;
|
||||
|
||||
prefService = do_GetService(NS_PREFSERVICE_CONTRACTID);
|
||||
NS_ENSURE_TRUE(prefService, );
|
||||
|
||||
nsCOMPtr<nsIPrefBranch> pref;
|
||||
prefService->GetBranch("", getter_AddRefs(pref));
|
||||
NS_ENSURE_TRUE(pref, );
|
||||
|
||||
pref->SetBoolPref ("dom.disable_open_during_load", TRUE);
|
||||
}
|
||||
|
||||
G_DEFINE_TYPE(GeckoBrowser, gecko_browser, GTK_TYPE_MOZ_EMBED)
|
||||
|
||||
//static guint signals[N_SIGNALS];
|
||||
|
||||
GeckoBrowser *
|
||||
gecko_browser_new(void)
|
||||
{
|
||||
return GECKO_BROWSER(g_object_new(GECKO_TYPE_BROWSER, NULL));
|
||||
}
|
||||
|
||||
static void
|
||||
gecko_browser_get_property(GObject *object,
|
||||
guint prop_id,
|
||||
GValue *value,
|
||||
GParamSpec *pspec)
|
||||
{
|
||||
GeckoBrowser *browser = GECKO_BROWSER(object);
|
||||
|
||||
switch (prop_id) {
|
||||
case PROP_PROGRESS:
|
||||
g_value_set_double(value, browser->progress);
|
||||
break;
|
||||
|
||||
default:
|
||||
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
static void
|
||||
gecko_browser_class_init(GeckoBrowserClass *browser_class)
|
||||
{
|
||||
GObjectClass *gobject_class = G_OBJECT_CLASS(browser_class);
|
||||
|
||||
gobject_class->get_property = gecko_browser_get_property;
|
||||
|
||||
g_object_class_install_property (gobject_class, PROP_PROGRESS,
|
||||
g_param_spec_double ("progress",
|
||||
"Progress",
|
||||
"Progress",
|
||||
0.0, 1.0, 0.0,
|
||||
G_PARAM_READABLE));
|
||||
}
|
||||
|
||||
GeckoBrowser *
|
||||
gecko_browser_create_window(GeckoBrowser *browser)
|
||||
{
|
||||
return GECKO_BROWSER_GET_CLASS(browser)->create_window(browser);
|
||||
}
|
||||
|
||||
static void
|
||||
new_window_cb(GtkMozEmbed *embed,
|
||||
GtkMozEmbed **newEmbed,
|
||||
guint chromemask)
|
||||
{
|
||||
GeckoBrowser *browser;
|
||||
|
||||
browser = gecko_browser_create_window(GECKO_BROWSER(embed));
|
||||
|
||||
*newEmbed = GTK_MOZ_EMBED(browser);
|
||||
}
|
||||
|
||||
static void
|
||||
gecko_browser_set_progress(GeckoBrowser *browser, float progress)
|
||||
{
|
||||
g_return_if_fail(GECKO_IS_BROWSER(browser));
|
||||
|
||||
browser->progress = progress;
|
||||
g_object_notify (G_OBJECT(browser), "progress");
|
||||
}
|
||||
|
||||
static void
|
||||
net_state_cb(GtkMozEmbed *embed, const char *aURI, gint state, guint status)
|
||||
{
|
||||
GeckoBrowser *browser = GECKO_BROWSER(embed);
|
||||
|
||||
if (state & GTK_MOZ_EMBED_FLAG_IS_NETWORK) {
|
||||
if (state & GTK_MOZ_EMBED_FLAG_START) {
|
||||
browser->total_requests = 0;
|
||||
browser->current_requests = 0;
|
||||
browser->progress = 0.0;
|
||||
}
|
||||
}
|
||||
|
||||
if (state & GTK_MOZ_EMBED_FLAG_IS_REQUEST) {
|
||||
float progress;
|
||||
|
||||
if (state & GTK_MOZ_EMBED_FLAG_START) {
|
||||
browser->total_requests++;
|
||||
}
|
||||
else if (state & GTK_MOZ_EMBED_FLAG_STOP)
|
||||
{
|
||||
browser->current_requests++;
|
||||
}
|
||||
|
||||
progress = float(browser->current_requests) /
|
||||
float(browser->total_requests);
|
||||
if (progress > browser->progress) {
|
||||
gecko_browser_set_progress(browser, progress);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
static void
|
||||
gecko_browser_init(GeckoBrowser *browser)
|
||||
{
|
||||
browser->progress = 0.0;
|
||||
|
||||
g_signal_connect(G_OBJECT(browser), "new-window",
|
||||
G_CALLBACK(new_window_cb), NULL);
|
||||
g_signal_connect(G_OBJECT(browser), "net-state-all",
|
||||
G_CALLBACK(net_state_cb), NULL);
|
||||
}
|
||||
@ -1,57 +0,0 @@
|
||||
/*
|
||||
* Copyright (C) 2006 Red Hat, Inc
|
||||
*
|
||||
* Sugar 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; either version 2 of the License, or
|
||||
* (at your option) any later version.
|
||||
*
|
||||
* Sugar 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, write to the Free Software
|
||||
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
|
||||
*/
|
||||
|
||||
#ifndef __GECKO_BROWSER_H__
|
||||
#define __GECKO_BROWSER_H__
|
||||
|
||||
#include <gtkmozembed.h>
|
||||
|
||||
G_BEGIN_DECLS
|
||||
|
||||
typedef struct _GeckoBrowser GeckoBrowser;
|
||||
typedef struct _GeckoBrowserClass GeckoBrowserClass;
|
||||
|
||||
#define GECKO_TYPE_BROWSER (gecko_browser_get_type())
|
||||
#define GECKO_BROWSER(object) (G_TYPE_CHECK_INSTANCE_CAST((object), GECKO_TYPE_BROWSER, GeckoBrowser))
|
||||
#define GECKO_BROWSER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass), GECKO_TYPE_BROWSER, GeckoBrowserClass))
|
||||
#define GECKO_IS_BROWSER(object) (G_TYPE_CHECK_INSTANCE_TYPE((object), GECKO_TYPE_BROWSER))
|
||||
#define GECKO_IS_BROWSER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass), GECKO_TYPE_BROWSER))
|
||||
#define GECKO_BROWSER_GET_CLASS(object) (G_TYPE_INSTANCE_GET_CLASS((object), GECKO_TYPE_BROWSER, GeckoBrowserClass))
|
||||
|
||||
struct _GeckoBrowser {
|
||||
GtkMozEmbed base_instance;
|
||||
|
||||
int total_requests;
|
||||
int current_requests;
|
||||
float progress;
|
||||
};
|
||||
|
||||
struct _GeckoBrowserClass {
|
||||
GtkMozEmbedClass base_class;
|
||||
|
||||
GeckoBrowser * (* create_window) (GeckoBrowser *browser);
|
||||
};
|
||||
|
||||
GType gecko_browser_get_type (void);
|
||||
void gecko_browser_startup (void);
|
||||
GeckoBrowser *gecko_browser_new (void);
|
||||
GeckoBrowser *gecko_browser_create_window (GeckoBrowser *browser);
|
||||
|
||||
G_END_DECLS
|
||||
|
||||
#endif
|
||||
@ -0,0 +1,235 @@
|
||||
/*
|
||||
* Copyright (C) 2006 Red Hat, Inc
|
||||
*
|
||||
* Sugar 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; either version 2 of the License, or
|
||||
* (at your option) any later version.
|
||||
*
|
||||
* Sugar 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, write to the Free Software
|
||||
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
|
||||
*/
|
||||
|
||||
#include "sugar-browser.h"
|
||||
|
||||
#include <nsCOMPtr.h>
|
||||
#include <nsIPrefService.h>
|
||||
#include <nsServiceManagerUtils.h>
|
||||
|
||||
enum {
|
||||
PROP_0,
|
||||
PROP_PROGRESS,
|
||||
PROP_TITLE,
|
||||
PROP_ADDRESS,
|
||||
PROP_CAN_GO_BACK,
|
||||
PROP_CAN_GO_FORWARD
|
||||
};
|
||||
|
||||
void
|
||||
sugar_browser_startup(void)
|
||||
{
|
||||
nsCOMPtr<nsIPrefService> prefService;
|
||||
|
||||
prefService = do_GetService(NS_PREFSERVICE_CONTRACTID);
|
||||
NS_ENSURE_TRUE(prefService, );
|
||||
|
||||
nsCOMPtr<nsIPrefBranch> pref;
|
||||
prefService->GetBranch("", getter_AddRefs(pref));
|
||||
NS_ENSURE_TRUE(pref, );
|
||||
|
||||
pref->SetBoolPref ("dom.disable_open_during_load", TRUE);
|
||||
}
|
||||
|
||||
G_DEFINE_TYPE(SugarBrowser, sugar_browser, GTK_TYPE_MOZ_EMBED)
|
||||
|
||||
static void
|
||||
sugar_browser_get_property(GObject *object,
|
||||
guint prop_id,
|
||||
GValue *value,
|
||||
GParamSpec *pspec)
|
||||
{
|
||||
SugarBrowser *browser = SUGAR_BROWSER(object);
|
||||
|
||||
switch (prop_id) {
|
||||
case PROP_PROGRESS:
|
||||
g_value_set_double(value, browser->progress);
|
||||
break;
|
||||
case PROP_ADDRESS:
|
||||
g_value_set_string(value, browser->address);
|
||||
break;
|
||||
case PROP_TITLE:
|
||||
g_value_set_string(value, browser->title);
|
||||
break;
|
||||
case PROP_CAN_GO_BACK:
|
||||
g_value_set_boolean(value, browser->can_go_back);
|
||||
break;
|
||||
case PROP_CAN_GO_FORWARD:
|
||||
g_value_set_boolean(value, browser->can_go_forward);
|
||||
break;
|
||||
default:
|
||||
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
static void
|
||||
sugar_browser_class_init(SugarBrowserClass *browser_class)
|
||||
{
|
||||
GObjectClass *gobject_class = G_OBJECT_CLASS(browser_class);
|
||||
|
||||
gobject_class->get_property = sugar_browser_get_property;
|
||||
|
||||
g_object_class_install_property(gobject_class, PROP_PROGRESS,
|
||||
g_param_spec_double ("progress",
|
||||
"Progress",
|
||||
"Progress",
|
||||
0.0, 1.0, 0.0,
|
||||
G_PARAM_READABLE));
|
||||
|
||||
g_object_class_install_property (gobject_class, PROP_ADDRESS,
|
||||
g_param_spec_string ("address",
|
||||
"Address",
|
||||
"Address",
|
||||
"",
|
||||
G_PARAM_READABLE));
|
||||
|
||||
g_object_class_install_property (gobject_class, PROP_TITLE,
|
||||
g_param_spec_string ("title",
|
||||
"Title",
|
||||
"Title",
|
||||
"",
|
||||
G_PARAM_READABLE));
|
||||
|
||||
g_object_class_install_property (gobject_class, PROP_CAN_GO_BACK,
|
||||
g_param_spec_boolean ("can-go-back",
|
||||
"Can go back",
|
||||
"Can go back",
|
||||
FALSE,
|
||||
G_PARAM_READABLE));
|
||||
|
||||
g_object_class_install_property (gobject_class, PROP_CAN_GO_FORWARD,
|
||||
g_param_spec_boolean ("can-go-forward",
|
||||
"Can go forward",
|
||||
"Can go forward",
|
||||
FALSE,
|
||||
G_PARAM_READABLE));
|
||||
}
|
||||
|
||||
SugarBrowser *
|
||||
sugar_browser_create_window(SugarBrowser *browser)
|
||||
{
|
||||
return SUGAR_BROWSER_GET_CLASS(browser)->create_window(browser);
|
||||
}
|
||||
|
||||
static void
|
||||
update_navigation_properties(SugarBrowser *browser)
|
||||
{
|
||||
GtkMozEmbed *embed = GTK_MOZ_EMBED(browser);
|
||||
|
||||
browser->can_go_back = gtk_moz_embed_can_go_back(embed);
|
||||
g_object_notify (G_OBJECT(browser), "can_go_back");
|
||||
|
||||
browser->can_go_forward = gtk_moz_embed_can_go_forward(embed);
|
||||
g_object_notify (G_OBJECT(browser), "can_go_forward");
|
||||
}
|
||||
|
||||
static void
|
||||
new_window_cb(GtkMozEmbed *embed,
|
||||
GtkMozEmbed **newEmbed,
|
||||
guint chromemask)
|
||||
{
|
||||
SugarBrowser *browser;
|
||||
|
||||
browser = sugar_browser_create_window(SUGAR_BROWSER(embed));
|
||||
|
||||
*newEmbed = GTK_MOZ_EMBED(browser);
|
||||
}
|
||||
|
||||
static void
|
||||
sugar_browser_set_progress(SugarBrowser *browser, float progress)
|
||||
{
|
||||
g_return_if_fail(SUGAR_IS_BROWSER(browser));
|
||||
|
||||
browser->progress = progress;
|
||||
g_object_notify (G_OBJECT(browser), "progress");
|
||||
}
|
||||
|
||||
static void
|
||||
net_state_cb(GtkMozEmbed *embed, const char *aURI, gint state, guint status)
|
||||
{
|
||||
SugarBrowser *browser = SUGAR_BROWSER(embed);
|
||||
|
||||
if (state & GTK_MOZ_EMBED_FLAG_IS_NETWORK) {
|
||||
if (state & GTK_MOZ_EMBED_FLAG_START) {
|
||||
browser->total_requests = 0;
|
||||
browser->current_requests = 0;
|
||||
browser->progress = 0.0;
|
||||
}
|
||||
|
||||
update_navigation_properties(browser);
|
||||
}
|
||||
|
||||
if (state & GTK_MOZ_EMBED_FLAG_IS_REQUEST) {
|
||||
float progress;
|
||||
|
||||
if (state & GTK_MOZ_EMBED_FLAG_START) {
|
||||
browser->total_requests++;
|
||||
}
|
||||
else if (state & GTK_MOZ_EMBED_FLAG_STOP)
|
||||
{
|
||||
browser->current_requests++;
|
||||
}
|
||||
|
||||
progress = float(browser->current_requests) /
|
||||
float(browser->total_requests);
|
||||
if (progress > browser->progress) {
|
||||
sugar_browser_set_progress(browser, progress);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
static void
|
||||
title_cb(GtkMozEmbed *embed)
|
||||
{
|
||||
SugarBrowser *browser = SUGAR_BROWSER(embed);
|
||||
|
||||
g_free(browser->title);
|
||||
browser->title = gtk_moz_embed_get_title(embed);
|
||||
|
||||
g_object_notify (G_OBJECT(browser), "title");
|
||||
}
|
||||
|
||||
static void
|
||||
location_cb(GtkMozEmbed *embed)
|
||||
{
|
||||
SugarBrowser *browser = SUGAR_BROWSER(embed);
|
||||
|
||||
g_free(browser->address);
|
||||
browser->address = gtk_moz_embed_get_location(embed);
|
||||
|
||||
g_object_notify (G_OBJECT(browser), "address");
|
||||
}
|
||||
|
||||
static void
|
||||
sugar_browser_init(SugarBrowser *browser)
|
||||
{
|
||||
browser->title = NULL;
|
||||
browser->address = NULL;
|
||||
browser->progress = 0.0;
|
||||
|
||||
g_signal_connect(G_OBJECT(browser), "new-window",
|
||||
G_CALLBACK(new_window_cb), NULL);
|
||||
g_signal_connect(G_OBJECT(browser), "net-state-all",
|
||||
G_CALLBACK(net_state_cb), NULL);
|
||||
g_signal_connect(G_OBJECT(browser), "title",
|
||||
G_CALLBACK(title_cb), NULL);
|
||||
g_signal_connect(G_OBJECT(browser), "location",
|
||||
G_CALLBACK(location_cb), NULL);
|
||||
}
|
||||
@ -0,0 +1,60 @@
|
||||
/*
|
||||
* Copyright (C) 2006 Red Hat, Inc
|
||||
*
|
||||
* Sugar 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; either version 2 of the License, or
|
||||
* (at your option) any later version.
|
||||
*
|
||||
* Sugar 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, write to the Free Software
|
||||
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
|
||||
*/
|
||||
|
||||
#ifndef __SUGAR_BROWSER_H__
|
||||
#define __SUGAR_BROWSER_H__
|
||||
|
||||
#include <gtkmozembed.h>
|
||||
|
||||
G_BEGIN_DECLS
|
||||
|
||||
typedef struct _SugarBrowser SugarBrowser;
|
||||
typedef struct _SugarBrowserClass SugarBrowserClass;
|
||||
|
||||
#define SUGAR_TYPE_BROWSER (sugar_browser_get_type())
|
||||
#define SUGAR_BROWSER(object) (G_TYPE_CHECK_INSTANCE_CAST((object), SUGAR_TYPE_BROWSER, SugarBrowser))
|
||||
#define SUGAR_BROWSER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass), SUGAR_TYPE_BROWSER, SugarBrowserClass))
|
||||
#define SUGAR_IS_BROWSER(object) (G_TYPE_CHECK_INSTANCE_TYPE((object), SUGAR_TYPE_BROWSER))
|
||||
#define SUGAR_IS_BROWSER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass), SUGAR_TYPE_BROWSER))
|
||||
#define SUGAR_BROWSER_GET_CLASS(object) (G_TYPE_INSTANCE_GET_CLASS((object), SUGAR_TYPE_BROWSER, SugarBrowserClass))
|
||||
|
||||
struct _SugarBrowser {
|
||||
GtkMozEmbed base_instance;
|
||||
|
||||
int total_requests;
|
||||
int current_requests;
|
||||
float progress;
|
||||
char *address;
|
||||
char *title;
|
||||
gboolean can_go_back;
|
||||
gboolean can_go_forward;
|
||||
};
|
||||
|
||||
struct _SugarBrowserClass {
|
||||
GtkMozEmbedClass base_class;
|
||||
|
||||
SugarBrowser * (* create_window) (SugarBrowser *browser);
|
||||
};
|
||||
|
||||
GType sugar_browser_get_type (void);
|
||||
void sugar_browser_startup (void);
|
||||
SugarBrowser *sugar_browser_create_window (SugarBrowser *browser);
|
||||
|
||||
G_END_DECLS
|
||||
|
||||
#endif
|
||||
Loading…
Reference in New Issue