r9614 MarkieB - /branches/MarkieB/gtkmain/gtk/gtk_scaffolding.c
by netsurf＠semichrome.net
Author: MarkieB
Date: Thu Oct 8 01:17:49 2009
New Revision: 9614
URL: http://source.netsurf-browser.org?rev=9614&view=rev
Log:
rewrap as my tabs now set to my favoured 4 :o)
Modified:
branches/MarkieB/gtkmain/gtk/gtk_scaffolding.c
Modified: branches/MarkieB/gtkmain/gtk/gtk_scaffolding.c
URL: http://source.netsurf-browser.org/branches/MarkieB/gtkmain/gtk/gtk_scaffo...
==============================================================================
--- branches/MarkieB/gtkmain/gtk/gtk_scaffolding.c (original)
+++ branches/MarkieB/gtkmain/gtk/gtk_scaffolding.c Thu Oct 8 01:17:49 2009
@@ -1072,7 +1072,8 @@
MULTIHANDLER(savewindowsize)
{
if (GTK_IS_PANED(g->status_pane))
- option_toolbar_status_width = gtk_paned_get_position(g->status_pane);
+ option_toolbar_status_width =
+ gtk_paned_get_position(g->status_pane);
gtk_window_get_position(g->window, &option_window_x,
&option_window_y);
gtk_window_get_size(g->window, &option_window_width,
13 years, 8 months
r9613 MarkieB - /branches/MarkieB/gtkmain/gtk/gtk_scaffolding.c
by netsurf＠semichrome.net
Author: MarkieB
Date: Thu Oct 8 01:00:14 2009
New Revision: 9613
URL: http://source.netsurf-browser.org?rev=9613&view=rev
Log:
clear incidental gtk warnings when saving window size
Modified:
branches/MarkieB/gtkmain/gtk/gtk_scaffolding.c
Modified: branches/MarkieB/gtkmain/gtk/gtk_scaffolding.c
URL: http://source.netsurf-browser.org/branches/MarkieB/gtkmain/gtk/gtk_scaffo...
==============================================================================
--- branches/MarkieB/gtkmain/gtk/gtk_scaffolding.c (original)
+++ branches/MarkieB/gtkmain/gtk/gtk_scaffolding.c Thu Oct 8 01:00:14 2009
@@ -1071,7 +1071,8 @@
MULTIHANDLER(savewindowsize)
{
- option_toolbar_status_width = gtk_paned_get_position(g->status_pane);
+ if (GTK_IS_PANED(g->status_pane))
+ option_toolbar_status_width = gtk_paned_get_position(g->status_pane);
gtk_window_get_position(g->window, &option_window_x,
&option_window_y);
gtk_window_get_size(g->window, &option_window_width,
13 years, 8 months
r9612 jmb - /branches/jmb/new-cache/content/hlcache.h
by netsurf＠semichrome.net
Author: jmb
Date: Wed Oct 7 18:37:14 2009
New Revision: 9612
URL: http://source.netsurf-browser.org?rev=9612&view=rev
Log:
Introduce event handling callback for high-level cache objects.
Modified:
branches/jmb/new-cache/content/hlcache.h
Modified: branches/jmb/new-cache/content/hlcache.h
URL: http://source.netsurf-browser.org/branches/jmb/new-cache/content/hlcache....
==============================================================================
--- branches/jmb/new-cache/content/hlcache.h (original)
+++ branches/jmb/new-cache/content/hlcache.h Wed Oct 7 18:37:14 2009
@@ -23,19 +23,37 @@
#ifndef NETSURF_CONTENT_HLCACHE_H_
#define NETSURF_CONTENT_HLCACHE_H_
+#include "content/content.h"
#include "content/llcache.h"
#include "utils/errors.h"
-struct content;
-
/** High-level cache handle */
typedef struct hlcache_handle hlcache_handle;
+
+/** High-level cache event */
+typedef struct {
+ content_msg type; /**< Event type */
+ union content_msg_data data; /**< Event data */
+} hlcache_event;
+
+/**
+ * Client callback for high-level cache events
+ *
+ * \param handle Handle to object generating event
+ * \param event Event data
+ * \param pw Pointer to client-specific data
+ * \return NSERROR_OK on success, appropriate error otherwise.
+ */
+typedef nserror (*hlcache_object_callback)(hlcache_handle *handle,
+ hlcache_event *event, void *pw);
/** Flags for high-level cache object retrieval */
/** \todo Do we really need to have duplicate symbols here? */
#define HLCACHE_RETRIEVE_FORCE_FETCH LLCACHE_RETRIEVE_FORCE_FETCH
#define HLCACHE_RETRIEVE_VERIFIABLE LLCACHE_RETRIEVE_VERIFIABLE
#define HLCACHE_RETRIEVE_SNIFF_TYPE LLCACHE_RETRIEVE_SNIFF_TYPE
+/** \todo The duplication is particularly bad if we add more flags here */
+#define HLCACHE_RETRIEVE_NO_ERROR_PAGE (1 << 3) /**< Don't create error page */
/**
* Retrieve a high-level cache handle for an object
@@ -44,15 +62,18 @@
* \param flags Object retrieval flags
* \param referer Referring URL, or NULL if none
* \param post POST data, or NULL for a GET request
+ * \param cb Callback to handle object events
+ * \param pw Pointer to client-specific data for callback
* \param parent Parent cache handle, or NULL if none
* \param result Pointer to location to recieve cache handle
* \return NSERROR_OK on success, appropriate error otherwise
*
- * \todo We probably need to ensure that all the functionality of fetchcache
- * can be replicated through this API.
+ * \todo fetchcache() has width and height parameters.
+ * Do we really need to preserve those?
*/
nserror hlcache_handle_retrieve(const char *url, uint32_t flags,
const char *referer, llcache_post_data *post,
+ hlcache_object_callback cb, void *pw,
hlcache_handle *parent, hlcache_handle **result);
/**
13 years, 8 months
r9611 jmb - /branches/jmb/new-cache/content/hlcache.h
by netsurf＠semichrome.net
Author: jmb
Date: Wed Oct 7 14:34:11 2009
New Revision: 9611
URL: http://source.netsurf-browser.org?rev=9611&view=rev
Log:
Something approximating a high-level cache API
Added:
branches/jmb/new-cache/content/hlcache.h
Added: branches/jmb/new-cache/content/hlcache.h
URL: http://source.netsurf-browser.org/branches/jmb/new-cache/content/hlcache....
==============================================================================
--- branches/jmb/new-cache/content/hlcache.h (added)
+++ branches/jmb/new-cache/content/hlcache.h Wed Oct 7 14:34:11 2009
@@ -1,0 +1,77 @@
+/*
+ * Copyright 2009 John-Mark Bell <jmb(a)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
+ * High-level resource cache (interface)
+ */
+
+#ifndef NETSURF_CONTENT_HLCACHE_H_
+#define NETSURF_CONTENT_HLCACHE_H_
+
+#include "content/llcache.h"
+#include "utils/errors.h"
+
+struct content;
+
+/** High-level cache handle */
+typedef struct hlcache_handle hlcache_handle;
+
+/** Flags for high-level cache object retrieval */
+/** \todo Do we really need to have duplicate symbols here? */
+#define HLCACHE_RETRIEVE_FORCE_FETCH LLCACHE_RETRIEVE_FORCE_FETCH
+#define HLCACHE_RETRIEVE_VERIFIABLE LLCACHE_RETRIEVE_VERIFIABLE
+#define HLCACHE_RETRIEVE_SNIFF_TYPE LLCACHE_RETRIEVE_SNIFF_TYPE
+
+/**
+ * Retrieve a high-level cache handle for an object
+ *
+ * \param url URL of the object to retrieve handle for
+ * \param flags Object retrieval flags
+ * \param referer Referring URL, or NULL if none
+ * \param post POST data, or NULL for a GET request
+ * \param parent Parent cache handle, or NULL if none
+ * \param result Pointer to location to recieve cache handle
+ * \return NSERROR_OK on success, appropriate error otherwise
+ *
+ * \todo We probably need to ensure that all the functionality of fetchcache
+ * can be replicated through this API.
+ */
+nserror hlcache_handle_retrieve(const char *url, uint32_t flags,
+ const char *referer, llcache_post_data *post,
+ hlcache_handle *parent, hlcache_handle **result);
+
+/**
+ * Retrieve a content object from a cache handle
+ *
+ * \param handle Cache handle to dereference
+ * \param result Pointer to location to recieve content object
+ * \return NSERROR_OK on success, appropriate error otherwise
+ *
+ * \todo This may not be correct. Ideally, the client should never need to
+ * directly access a content object. It may, therefore, be better to provide a
+ * bunch of veneers here that take a hlcache_handle and invoke the
+ * corresponding content_ API. If there's no content object associated with the
+ * hlcache_handle (e.g. because the source data is still being fetched, so it
+ * doesn't exist yet), then these veneers would behave as a NOP. The important
+ * thing being that the client need not care about this possibility and can
+ * just call the functions with impugnity.
+ */
+nserror hlcache_handle_to_content(const hlcache_handle *handle,
+ struct content **result);
+
+#endif
13 years, 8 months
r9610 jmb - /branches/jmb/new-cache/content/llcache.h
by netsurf＠semichrome.net
Author: jmb
Date: Wed Oct 7 11:43:49 2009
New Revision: 9610
URL: http://source.netsurf-browser.org?rev=9610&view=rev
Log:
When the low-level cache is informed that authentication details are required, or detects a redirect that requires user permission to follow, or is informed that the TLS certificate chain cannot be verified, it needs some mechanism to ask the user.
These kinds of queries are orthogonal to where the resource being fetched will be used. Therefore, it seems crazy to force users of a resource to have to care about these resource-fetching details.
Instead, what we do is to handle these kinds of out-of-band queries in a central place by registering a query handler with the low-level cache. This handler is called whenever such a fetch-related query is generated. Immediately before calling this handler, the low-level cache will mark the object being fetched as pending a user response. The handler (which is provided by the frontend code) will open a non-modal dialogue requesting the relevant permissions from the user. Once the user has dealt with the request, the frontend calls the provided response handler to inform the low-level cache whether it should continue with the fetching process or abort.
Modified:
branches/jmb/new-cache/content/llcache.h
Modified: branches/jmb/new-cache/content/llcache.h
URL: http://source.netsurf-browser.org/branches/jmb/new-cache/content/llcache....
==============================================================================
--- branches/jmb/new-cache/content/llcache.h (original)
+++ branches/jmb/new-cache/content/llcache.h Wed Oct 7 11:43:49 2009
@@ -23,11 +23,13 @@
#ifndef NETSURF_CONTENT_LLCACHE_H_
#define NETSURF_CONTENT_LLCACHE_H_
+#include <stdbool.h>
#include <stddef.h>
#include <stdint.h>
#include "utils/errors.h"
+struct ssl_cert_info;
struct form_successful_control;
/** Type of low-level cache object */
@@ -70,13 +72,76 @@
* \param pw Pointer to client-specific data
* \return NSERROR_OK on success, appropriate error otherwise.
*/
-typedef nserror (*llcache_client_callback)(llcache_object *object,
+typedef nserror (*llcache_object_callback)(llcache_object *object,
llcache_event *event, void *pw);
/** Flags for low-level cache object retrieval */
#define LLCACHE_RETRIEVE_FORCE_FETCH (1 << 0) /* Force a new fetch */
#define LLCACHE_RETRIEVE_VERIFIABLE (1 << 1) /* Requested URL was verified */
#define LLCACHE_RETRIEVE_SNIFF_TYPE (1 << 2) /* Permit content-type sniffing */
+
+/** Low-level cache query types */
+typedef enum {
+ LLCACHE_QUERY_AUTH, /**< Need authentication details */
+ LLCACHE_QUERY_REDIRECT, /**< Need permission to redirect */
+ LLCACHE_QUERY_SSL /**< SSL chain needs inspection */
+} llcache_query_type;
+
+/** Low-level cache query */
+typedef struct {
+ llcache_query_type type; /**< Type of query */
+
+ const char *url; /**< URL being fetched */
+
+ union {
+ struct {
+ const char *realm; /**< Authentication realm */
+ } auth;
+
+ struct {
+ const char *target; /**< Redirect target */
+ } redirect;
+
+ struct {
+ const struct ssl_cert_info *certs;
+ size_t num; /**< Number of certs in chain */
+ } ssl;
+ } data;
+} llcache_query;
+
+/**
+ * Response handler for fetch-related queries
+ *
+ * \param proceed Whether to proceed with the fetch or not
+ * \param cbpw Opaque value provided to llcache_query_callback
+ * \return NSERROR_OK on success, appropriate error otherwise
+ */
+typedef nserror (*llcache_query_response)(bool proceed, void *cbpw);
+
+/**
+ * Callback to handle fetch-related queries
+ *
+ * \param query Object containing details of query
+ * \param pw Pointer to callback-specific data
+ * \param cb Callback that client should call once query is satisfied
+ * \param cbpw Opaque value to pass into \a cb
+ * \return NSERROR_OK on success, appropriate error otherwise
+ *
+ * \note This callback should return immediately. Once a suitable answer to
+ * the query has been obtained, the provided response callback should be
+ * called. This is intended to be an entirely asynchronous process.
+ */
+typedef nserror (*llcache_query_callback)(llcache_query *query, void *pw,
+ llcache_query_response cb, void *cbpw);
+
+/**
+ * Initialise the low-level cache
+ *
+ * \param cb Query handler
+ * \param pw Pointer to query handler data
+ * \return NSERROR_OK on success, appropriate error otherwise.
+ */
+nserror llcache_initialise(llcache_query_callback cb, void *pw);
/**
* Retrieve a low-level cache object
@@ -92,7 +157,7 @@
*/
nserror llcache_object_retrieve(const char *url, uint32_t flags,
const char *referer, llcache_post_data *post,
- llcache_client_callback cb, void *pw,
+ llcache_object_callback cb, void *pw,
llcache_object **result);
/**
@@ -104,7 +169,7 @@
* \return NSERROR_OK on success, appropriate error otherwise
*/
nserror llcache_object_remove_callback(llcache_object *object,
- llcache_client_callback cb, void *pw);
+ llcache_object_callback cb, void *pw);
/**
* Retrieve the post-redirect URL of a low-level cache object
13 years, 8 months
r9609 jmb - in /branches/jmb/new-cache: content/llcache.h utils/errors.h
by netsurf＠semichrome.net
Author: jmb
Date: Wed Oct 7 08:31:47 2009
New Revision: 9609
URL: http://source.netsurf-browser.org?rev=9609&view=rev
Log:
Sort out error handling. It's about time we had common errors throughout the codebase, anyway.
Added:
branches/jmb/new-cache/utils/errors.h
Modified:
branches/jmb/new-cache/content/llcache.h
Modified: branches/jmb/new-cache/content/llcache.h
URL: http://source.netsurf-browser.org/branches/jmb/new-cache/content/llcache....
==============================================================================
--- branches/jmb/new-cache/content/llcache.h (original)
+++ branches/jmb/new-cache/content/llcache.h Wed Oct 7 08:31:47 2009
@@ -25,6 +25,8 @@
#include <stddef.h>
#include <stdint.h>
+
+#include "utils/errors.h"
struct form_successful_control;
@@ -60,14 +62,15 @@
} data; /**< Received data */
} llcache_event;
-/** Client callback for low-level cache events
+/**
+ * Client callback for low-level cache events
*
* \param object Object for which event is issued
* \param event Event data
* \param pw Pointer to client-specific data
+ * \return NSERROR_OK on success, appropriate error otherwise.
*/
-/** \todo Need to return an error code */
-typedef void (*llcache_client_callback)(llcache_object *object,
+typedef nserror (*llcache_client_callback)(llcache_object *object,
llcache_event *event, void *pw);
/** Flags for low-level cache object retrieval */
@@ -84,13 +87,13 @@
* \param post POST data, or NULL for a GET request
* \param cb Client callback for events
* \param pw Pointer to client-specific data
- * \return Pointer to cache object, or NULL on failure
- *
- * \todo Would it be better to have an error code here?
+ * \param result Pointer to location to recieve cache object
+ * \return NSERROR_OK on success, appropriate error otherwise
*/
-llcache_object *llcache_object_retrieve(const char *url, uint32_t flags,
+nserror llcache_object_retrieve(const char *url, uint32_t flags,
const char *referer, llcache_post_data *post,
- llcache_client_callback cb, void *pw);
+ llcache_client_callback cb, void *pw,
+ llcache_object **result);
/**
* Remove a callback from a low-level cache object
@@ -98,10 +101,9 @@
* \param object Object to remove callback from
* \param cb Callback to remove
* \param pw Pointer to client-specific data
- *
- * \todo Return an error code?
+ * \return NSERROR_OK on success, appropriate error otherwise
*/
-void llcache_object_remove_callback(llcache_object *object,
+nserror llcache_object_remove_callback(llcache_object *object,
llcache_client_callback cb, void *pw);
/**
Added: branches/jmb/new-cache/utils/errors.h
URL: http://source.netsurf-browser.org/branches/jmb/new-cache/utils/errors.h?r...
==============================================================================
--- branches/jmb/new-cache/utils/errors.h (added)
+++ branches/jmb/new-cache/utils/errors.h Wed Oct 7 08:31:47 2009
@@ -1,0 +1,36 @@
+/*
+ * Copyright 2009 John-Mark Bell <jmb(a)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
+ * Error codes
+ */
+
+#ifndef NETSURF_UTILS_ERRORS_H_
+#define NETSURF_UTILS_ERRORS_H_
+
+/**
+ * Enumeration of error codes
+ */
+typedef enum {
+ NSERROR_OK, /**< No error */
+
+ NSERROR_NOMEM /**< Memory exhaustion */
+} nserror;
+
+#endif
+
13 years, 8 months
r9608 jmb - /branches/jmb/new-cache/content/llcache.h
by netsurf＠semichrome.net
Author: jmb
Date: Tue Oct 6 13:17:07 2009
New Revision: 9608
URL: http://source.netsurf-browser.org?rev=9608&view=rev
Log:
Something approximating a low-level cache API
Added:
branches/jmb/new-cache/content/llcache.h
Added: branches/jmb/new-cache/content/llcache.h
URL: http://source.netsurf-browser.org/branches/jmb/new-cache/content/llcache....
==============================================================================
--- branches/jmb/new-cache/content/llcache.h (added)
+++ branches/jmb/new-cache/content/llcache.h Tue Oct 6 13:17:07 2009
@@ -1,0 +1,129 @@
+/*
+ * Copyright 2009 John-Mark Bell <jmb(a)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
+ * Low-level resource cache (interface)
+ */
+
+#ifndef NETSURF_CONTENT_LLCACHE_H_
+#define NETSURF_CONTENT_LLCACHE_H_
+
+#include <stddef.h>
+#include <stdint.h>
+
+struct form_successful_control;
+
+/** Type of low-level cache object */
+typedef struct llcache_object llcache_object;
+
+/** POST data object for low-level cache requests */
+typedef struct {
+ enum {
+ LLCACHE_POST_URL_ENCODED,
+ LLCACHE_POST_MULTIPART
+ } type; /**< Type of POST data */
+ union {
+ const char *urlenc; /**< URL encoded data */
+ /** \todo Need to abstract this away from HTML forms. */
+ struct form_successful_control *multipart; /**< Multipart data */
+ } data; /**< POST data content */
+} llcache_post_data;
+
+/** Low-level cache event types */
+typedef enum {
+ LLCACHE_EVENT_HAD_HEADERS, /**< Received all headers */
+ LLCACHE_EVENT_HAD_DATA, /**< Received some data */
+ LLCACHE_EVENT_DONE /**< Finished fetching data */
+} llcache_event_type;
+
+/** Low-level cache events */
+typedef struct {
+ llcache_event_type type; /**< Type of event */
+ struct {
+ const uint8_t *buf; /**< Buffer of data */
+ size_t len; /**< Length of buffer, in bytes */
+ } data; /**< Received data */
+} llcache_event;
+
+/** Client callback for low-level cache events
+ *
+ * \param object Object for which event is issued
+ * \param event Event data
+ * \param pw Pointer to client-specific data
+ */
+/** \todo Need to return an error code */
+typedef void (*llcache_client_callback)(llcache_object *object,
+ llcache_event *event, void *pw);
+
+/** Flags for low-level cache object retrieval */
+#define LLCACHE_RETRIEVE_FORCE_FETCH (1 << 0) /* Force a new fetch */
+#define LLCACHE_RETRIEVE_VERIFIABLE (1 << 1) /* Requested URL was verified */
+#define LLCACHE_RETRIEVE_SNIFF_TYPE (1 << 2) /* Permit content-type sniffing */
+
+/**
+ * Retrieve a low-level cache object
+ *
+ * \param url URL of the object to fetch
+ * \param flags Object retrieval flags
+ * \param referer Referring URL, or NULL if none
+ * \param post POST data, or NULL for a GET request
+ * \param cb Client callback for events
+ * \param pw Pointer to client-specific data
+ * \return Pointer to cache object, or NULL on failure
+ *
+ * \todo Would it be better to have an error code here?
+ */
+llcache_object *llcache_object_retrieve(const char *url, uint32_t flags,
+ const char *referer, llcache_post_data *post,
+ llcache_client_callback cb, void *pw);
+
+/**
+ * Remove a callback from a low-level cache object
+ *
+ * \param object Object to remove callback from
+ * \param cb Callback to remove
+ * \param pw Pointer to client-specific data
+ *
+ * \todo Return an error code?
+ */
+void llcache_object_remove_callback(llcache_object *object,
+ llcache_client_callback cb, void *pw);
+
+/**
+ * Retrieve the post-redirect URL of a low-level cache object
+ *
+ * \param object Object to retrieve URL from
+ * \return Post-redirect URL of cache object
+ */
+const char *llcache_object_get_url(llcache_object *object);
+
+/**
+ * Retrieve a header value associated with a low-level cache object
+ *
+ * \param object Object to retrieve header from
+ * \param key Header name
+ * \return Header value, or NULL if header does not exist
+ *
+ * \todo Make the key an enumeration, to avoid needless string comparisons
+ * \todo Forcing the client to parse the header value seems wrong.
+ * Better would be to return the actual value part and an array of
+ * key-value pairs for any additional parameters.
+ */
+const char *llcache_object_get_header(llcache_object *object, const char *key);
+
+#endif
13 years, 8 months
r9607 jmb - /trunk/debian/netsurf/control
by netsurf＠semichrome.net
Author: jmb
Date: Mon Oct 5 06:23:46 2009
New Revision: 9607
URL: http://source.netsurf-browser.org?rev=9607&view=rev
Log:
ttf-dejavu-core doesn't include all the fonts that the framebuffer needs.
Depend on ttf-dejavu, instead, which will pull in ttf-dejavu-extra, too.
Modified:
trunk/debian/netsurf/control
Modified: trunk/debian/netsurf/control
URL: http://source.netsurf-browser.org/trunk/debian/netsurf/control?rev=9607&r...
==============================================================================
--- trunk/debian/netsurf/control (original)
+++ trunk/debian/netsurf/control Mon Oct 5 06:23:46 2009
@@ -30,7 +30,7 @@
Package: netsurf-framebuffer-common
Architecture: all
-Depends: ttf-dejavu-core
+Depends: ttf-dejavu
Recommends: netsurf-linuxfb | netsurf-sdl | netsurf-vnc
Description: Common resources for all NetSurf framebuffer targets
NetSurf is a multi-platform lightweight web browser. Its aim is to provide
13 years, 8 months
r9606 jmb - /trunk/netsurf/framebuffer/font_freetype.c
by netsurf＠semichrome.net
Author: jmb
Date: Mon Oct 5 06:22:09 2009
New Revision: 9606
URL: http://source.netsurf-browser.org?rev=9606&view=rev
Log:
Use DejaVu instead of Vera, seeing as Debian have removed Vera from sid.
Modified:
trunk/netsurf/framebuffer/font_freetype.c
Modified: trunk/netsurf/framebuffer/font_freetype.c
URL: http://source.netsurf-browser.org/trunk/netsurf/framebuffer/font_freetype...
==============================================================================
--- trunk/netsurf/framebuffer/font_freetype.c (original)
+++ trunk/netsurf/framebuffer/font_freetype.c Mon Oct 5 06:22:09 2009
@@ -33,7 +33,7 @@
#include "framebuffer/options.h"
#include "framebuffer/findfile.h"
-#define VERA_PATH "/usr/share/fonts/truetype/ttf-bitstream-vera/"
+#define DEJAVU_PATH "/usr/share/fonts/truetype/ttf-dejavu/"
static FT_Library library;
static FTC_Manager ft_cmanager;
@@ -167,7 +167,7 @@
fb_faces[FB_FACE_SANS_SERIF] =
fb_new_face(option_fb_face_sans_serif,
"sans_serif.ttf",
- VERA_PATH"Vera.ttf");
+ DEJAVU_PATH"DejaVuSans.ttf");
if (fb_faces[FB_FACE_SANS_SERIF] == NULL) {
LOG(("Could not find default font (code %d)\n", error));
FTC_Manager_Done(ft_cmanager );
@@ -178,32 +178,32 @@
fb_faces[FB_FACE_SANS_SERIF_BOLD] =
fb_new_face(option_fb_face_sans_serif_bold,
"sans_serif_bold.ttf",
- VERA_PATH"VeraBd.ttf");
+ DEJAVU_PATH"DejaVuSans-Bold.ttf");
fb_faces[FB_FACE_SANS_SERIF_ITALIC] =
fb_new_face(option_fb_face_sans_serif_italic,
"sans_serif_italic.ttf",
- VERA_PATH"VeraIt.ttf");
+ DEJAVU_PATH"DejaVuSans-Oblique.ttf");
fb_faces[FB_FACE_SANS_SERIF_ITALIC_BOLD] =
fb_new_face(option_fb_face_sans_serif_italic_bold,
"sans_serif_italic_bold.ttf",
- VERA_PATH"VeraBI.ttf");
+ DEJAVU_PATH"DejaVuSans-BoldOblique.ttf");
fb_faces[FB_FACE_MONOSPACE] =
fb_new_face(option_fb_face_monospace,
"monospace.ttf",
- VERA_PATH"VeraMono.ttf");
+ DEJAVU_PATH"DejaVuSansMono.ttf");
fb_faces[FB_FACE_SERIF] =
fb_new_face(option_fb_face_serif,
"serif.ttf",
- VERA_PATH"VeraSe.ttf");
+ DEJAVU_PATH"DejaVuSerif.ttf");
fb_faces[FB_FACE_SERIF_BOLD] =
fb_new_face(option_fb_face_serif_bold,
"serif_bold.ttf",
- VERA_PATH"VeraSeBd.ttf");
+ DEJAVU_PATH"DejaVuSerif-Bold.ttf");
/* set the default render mode */
if (option_fb_font_monochrome == true)
13 years, 8 months
r9605 jmb - /trunk/debian/netsurf/control
by netsurf＠semichrome.net
Author: jmb
Date: Mon Oct 5 06:14:10 2009
New Revision: 9605
URL: http://source.netsurf-browser.org?rev=9605&view=rev
Log:
Make netsurf-framebuffer-common depend on DejaVu rather than Vera
Modified:
trunk/debian/netsurf/control
Modified: trunk/debian/netsurf/control
URL: http://source.netsurf-browser.org/trunk/debian/netsurf/control?rev=9605&r...
==============================================================================
--- trunk/debian/netsurf/control (original)
+++ trunk/debian/netsurf/control Mon Oct 5 06:14:10 2009
@@ -30,7 +30,7 @@
Package: netsurf-framebuffer-common
Architecture: all
-Depends: ttf-bitstream-vera
+Depends: ttf-dejavu-core
Recommends: netsurf-linuxfb | netsurf-sdl | netsurf-vnc
Description: Common resources for all NetSurf framebuffer targets
NetSurf is a multi-platform lightweight web browser. Its aim is to provide
13 years, 8 months