netsurf: branch master updated. release/3.3-198-g123c8bc
by NetSurf Browser Project
Gitweb links:
...log http://git.netsurf-browser.org/netsurf.git/shortlog/123c8bc8b3d621d0e259a...
...commit http://git.netsurf-browser.org/netsurf.git/commit/123c8bc8b3d621d0e259ae9...
...tree http://git.netsurf-browser.org/netsurf.git/tree/123c8bc8b3d621d0e259ae9ce...
The branch, master has been updated
via 123c8bc8b3d621d0e259ae9ce99ebe753036ac0b (commit)
from 7736a611a2c9d13d697cfc8bc83f9dddbb99138c (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commitdiff http://git.netsurf-browser.org/netsurf.git/commit/?id=123c8bc8b3d621d0e25...
commit 123c8bc8b3d621d0e259ae9ce99ebe753036ac0b
Author: Vincent Sanders <vince(a)kyllikki.org>
Commit: Vincent Sanders <vince(a)kyllikki.org>
split out windows file operations into a separeate module
diff --git a/windows/Makefile.target b/windows/Makefile.target
index 5773a0c..6b8ce6a 100644
--- a/windows/Makefile.target
+++ b/windows/Makefile.target
@@ -58,7 +58,7 @@ S_RESOURCES := windows_resource.o
# S_WINDOWS are sources purely for the windows build
S_WINDOWS := main.c window.c gui.c drawable.c misc.c plot.c findfile.c \
- font.c bitmap.c about.c prefs.c download.c filetype.c \
+ font.c bitmap.c about.c prefs.c download.c filetype.c file.c \
localhistory.c schedule.c windbg.c pointers.c
S_WINDOWS := $(addprefix windows/,$(S_WINDOWS))
diff --git a/windows/file.c b/windows/file.c
new file mode 100644
index 0000000..f8372b4
--- /dev/null
+++ b/windows/file.c
@@ -0,0 +1,301 @@
+/*
+ * Copyright 2014, 2015 Vincent Sanders <vince(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
+ * Windows file operation table implementation.
+ */
+
+#include <stdbool.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <unistd.h>
+#include <windows.h>
+
+#include "utils/errors.h"
+#include "utils/nsurl.h"
+#include "utils/log.h"
+#include "utils/utils.h"
+#include "utils/corestrings.h"
+#include "utils/url.h"
+#include "utils/file.h"
+#include "desktop/browser.h"
+
+#include "windows/file.h"
+
+/**
+ * Generate a windows path from one or more component elemnts.
+ *
+ * If a string is allocated it must be freed by the caller.
+ *
+ * @param[in,out] str pointer to string pointer if this is NULL enough
+ * storage will be allocated for the complete path.
+ * @param[in,out] size The size of the space available if \a str not
+ * NULL on input and if not NULL set to the total
+ * output length on output.
+ * @param[in] nelm The number of elements.
+ * @param[in] ap The elements of the path as string pointers.
+ * @return NSERROR_OK and the complete path is written to str
+ * or error code on faliure.
+ */
+static nserror windows_mkpath(char **str, size_t *size, size_t nelm, va_list ap)
+{
+ return vsnstrjoin(str, size, '\\', nelm, ap);
+}
+
+
+/**
+ * Get the basename of a file using windows path handling.
+ *
+ * This gets the last element of a path and returns it.
+ *
+ * @param[in] path The path to extract the name from.
+ * @param[in,out] str Pointer to string pointer if this is NULL enough
+ * storage will be allocated for the path element.
+ * @param[in,out] size The size of the space available if \a
+ * str not NULL on input and set to the total
+ * output length on output.
+ * @return NSERROR_OK and the complete path is written to str
+ * or error code on faliure.
+ */
+static nserror windows_basename(const char *path, char **str, size_t *size)
+{
+ const char *leafname;
+ char *fname;
+
+ if (path == NULL) {
+ return NSERROR_BAD_PARAMETER;
+ }
+
+ leafname = strrchr(path, '\\');
+ if (!leafname) {
+ leafname = path;
+ } else {
+ leafname += 1;
+ }
+
+ fname = strdup(leafname);
+ if (fname == NULL) {
+ return NSERROR_NOMEM;
+ }
+
+ *str = fname;
+ if (size != NULL) {
+ *size = strlen(fname);
+ }
+ return NSERROR_OK;
+}
+
+
+/**
+ * Create a path from a nsurl using windows file handling.
+ *
+ * @param[in] url The url to encode.
+ * @param[out] path_out A string containing the result path which should
+ * be freed by the caller.
+ * @return NSERROR_OK and the path is written to \a path or error code
+ * on faliure.
+ */
+static nserror windows_nsurl_to_path(struct nsurl *url, char **path_out)
+{
+ lwc_string *urlpath;
+ char *path;
+ bool match;
+ lwc_string *scheme;
+ nserror res;
+
+ if ((url == NULL) || (path_out == NULL)) {
+ return NSERROR_BAD_PARAMETER;
+ }
+
+ scheme = nsurl_get_component(url, NSURL_SCHEME);
+
+ if (lwc_string_caseless_isequal(scheme, corestring_lwc_file,
+ &match) != lwc_error_ok)
+ {
+ return NSERROR_BAD_PARAMETER;
+ }
+ lwc_string_unref(scheme);
+ if (match == false) {
+ return NSERROR_BAD_PARAMETER;
+ }
+
+ urlpath = nsurl_get_component(url, NSURL_PATH);
+ if (urlpath == NULL) {
+ return NSERROR_BAD_PARAMETER;
+ }
+
+ res = url_unescape(lwc_string_data(urlpath), &path);
+ lwc_string_unref(urlpath);
+ if (res != NSERROR_OK) {
+ return res;
+ }
+
+ /* if there is a drive: prefix treat path as DOS filename */
+ if ((path[2] == ':') || (path[2] == '|')) {
+ char *sidx; /* slash index */
+
+ /* move the string down to remove leading / note the
+ * strlen is *not* copying too much data as we are
+ * moving the null too!
+ */
+ memmove(path, path + 1, strlen(path));
+
+ /* swap / for \ */
+ sidx = strrchr(path, '/');
+ while (sidx != NULL) {
+ *sidx = '\\';
+ sidx = strrchr(path, '/');
+ }
+ }
+ /* if the path does not have a drive letter we return the
+ * complete path.
+ */
+ /** @todo Need to check returning the unaltered path in this
+ * case is correct
+ */
+
+ *path_out = path;
+
+ return NSERROR_OK;
+}
+
+
+/**
+ * Create a nsurl from a path using windows file handling.
+ *
+ * Perform the necessary operations on a path to generate a nsurl.
+ *
+ * @param[in] path The path to convert.
+ * @param[out] url_out pointer to recive the nsurl, The returned url
+ * should be unreferenced by the caller.
+ * @return NSERROR_OK and the url is placed in \a url or error code on
+ * faliure.
+ */
+static nserror windows_path_to_nsurl(const char *path, struct nsurl **url_out)
+{
+ nserror ret;
+ int urllen;
+ char *urlstr;
+ char *sidx; /* slash index */
+
+ if ((path == NULL) || (url_out == NULL) || (*path == 0)) {
+ return NSERROR_BAD_PARAMETER;
+ }
+
+ /* build url as a string for nsurl constructor */
+ urllen = strlen(path) + FILE_SCHEME_PREFIX_LEN + 5;
+ urlstr = malloc(urllen);
+ if (urlstr == NULL) {
+ return NSERROR_NOMEM;
+ }
+
+ /** @todo check if this should be url escaping the path. */
+ if (*path == '/') {
+ /* unix style path start, so try wine Z: */
+ snprintf(urlstr, urllen, "%sZ%%3A%s", FILE_SCHEME_PREFIX, path);
+ } else {
+ snprintf(urlstr, urllen, "%s%s", FILE_SCHEME_PREFIX, path);
+ }
+
+ sidx = strrchr(urlstr, '\\');
+ while (sidx != NULL) {
+ *sidx = '/';
+ sidx = strrchr(urlstr, '\\');
+ }
+
+ ret = nsurl_create(urlstr, url_out);
+ free(urlstr);
+
+ return ret;
+}
+
+
+/**
+ * Ensure that all directory elements needed to store a filename exist.
+ *
+ * @param fname The filename to ensure the path to exists.
+ * @return NSERROR_OK on success or error code on failure.
+ */
+static nserror windows_mkdir_all(const char *fname)
+{
+ char *dname;
+ char *sep;
+ struct stat sb;
+
+ dname = strdup(fname);
+
+ sep = strrchr(dname, '\\');
+ if (sep == NULL) {
+ /* no directory separator path is just filename so its ok */
+ free(dname);
+ return NSERROR_OK;
+ }
+
+ *sep = 0; /* null terminate directory path */
+
+ if (stat(dname, &sb) == 0) {
+ free(dname);
+ if (S_ISDIR(sb.st_mode)) {
+ /* path to file exists and is a directory */
+ return NSERROR_OK;
+ }
+ return NSERROR_NOT_DIRECTORY;
+ }
+ *sep = '\\'; /* restore separator */
+
+ sep = dname;
+ while (*sep == '\\') {
+ sep++;
+ }
+ while ((sep = strchr(sep, '\\')) != NULL) {
+ *sep = 0;
+ if (stat(dname, &sb) != 0) {
+ if (nsmkdir(dname, S_IRWXU) != 0) {
+ /* could not create path element */
+ free(dname);
+ return NSERROR_NOT_FOUND;
+ }
+ } else {
+ if (! S_ISDIR(sb.st_mode)) {
+ /* path element not a directory */
+ free(dname);
+ return NSERROR_NOT_DIRECTORY;
+ }
+ }
+ *sep = '\\'; /* restore separator */
+ /* skip directory separators */
+ while (*sep == '\\') {
+ sep++;
+ }
+ }
+
+ free(dname);
+ return NSERROR_OK;
+}
+
+/* windows file handling */
+static struct gui_file_table file_table = {
+ .mkpath = windows_mkpath,
+ .basename = windows_basename,
+ .nsurl_to_path = windows_nsurl_to_path,
+ .path_to_nsurl = windows_path_to_nsurl,
+ .mkdir_all = windows_mkdir_all,
+};
+
+struct gui_file_table *win32_file_table = &file_table;
diff --git a/windows/file.h b/windows/file.h
new file mode 100644
index 0000000..5262dde
--- /dev/null
+++ b/windows/file.h
@@ -0,0 +1,29 @@
+/*
+ * Copyright 2015 Vincent Sanders <vince(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
+ * Windows file operation table interface.
+ */
+
+#ifndef _NETSURF_WINDOWS_FILE_H_
+#define _NETSURF_WINDOWS_FILE_H_
+
+struct gui_file_table *win32_file_table;
+
+#endif
diff --git a/windows/gui.c b/windows/gui.c
index 431e5c9..f9aca5a 100644
--- a/windows/gui.c
+++ b/windows/gui.c
@@ -149,268 +149,6 @@ static void gui_set_clipboard(const char *buffer, size_t length,
}
-/**
- * Generate a windows path from one or more component elemnts.
- *
- * If a string is allocated it must be freed by the caller.
- *
- * @param[in,out] str pointer to string pointer if this is NULL enough
- * storage will be allocated for the complete path.
- * @param[in,out] size The size of the space available if \a str not
- * NULL on input and if not NULL set to the total
- * output length on output.
- * @param[in] nelm The number of elements.
- * @param[in] ap The elements of the path as string pointers.
- * @return NSERROR_OK and the complete path is written to str
- * or error code on faliure.
- */
-static nserror windows_mkpath(char **str, size_t *size, size_t nelm, va_list ap)
-{
- return vsnstrjoin(str, size, '\\', nelm, ap);
-}
-
-
-/**
- * Get the basename of a file using windows path handling.
- *
- * This gets the last element of a path and returns it.
- *
- * @param[in] path The path to extract the name from.
- * @param[in,out] str Pointer to string pointer if this is NULL enough
- * storage will be allocated for the path element.
- * @param[in,out] size The size of the space available if \a
- * str not NULL on input and set to the total
- * output length on output.
- * @return NSERROR_OK and the complete path is written to str
- * or error code on faliure.
- */
-static nserror windows_basename(const char *path, char **str, size_t *size)
-{
- const char *leafname;
- char *fname;
-
- if (path == NULL) {
- return NSERROR_BAD_PARAMETER;
- }
-
- leafname = strrchr(path, '\\');
- if (!leafname) {
- leafname = path;
- } else {
- leafname += 1;
- }
-
- fname = strdup(leafname);
- if (fname == NULL) {
- return NSERROR_NOMEM;
- }
-
- *str = fname;
- if (size != NULL) {
- *size = strlen(fname);
- }
- return NSERROR_OK;
-}
-
-
-/**
- * Create a path from a nsurl using windows file handling.
- *
- * @param[in] url The url to encode.
- * @param[out] path_out A string containing the result path which should
- * be freed by the caller.
- * @return NSERROR_OK and the path is written to \a path or error code
- * on faliure.
- */
-static nserror windows_nsurl_to_path(struct nsurl *url, char **path_out)
-{
- lwc_string *urlpath;
- char *path;
- bool match;
- lwc_string *scheme;
- nserror res;
-
- if ((url == NULL) || (path_out == NULL)) {
- return NSERROR_BAD_PARAMETER;
- }
-
- scheme = nsurl_get_component(url, NSURL_SCHEME);
-
- if (lwc_string_caseless_isequal(scheme, corestring_lwc_file,
- &match) != lwc_error_ok)
- {
- return NSERROR_BAD_PARAMETER;
- }
- lwc_string_unref(scheme);
- if (match == false) {
- return NSERROR_BAD_PARAMETER;
- }
-
- urlpath = nsurl_get_component(url, NSURL_PATH);
- if (urlpath == NULL) {
- return NSERROR_BAD_PARAMETER;
- }
-
- res = url_unescape(lwc_string_data(urlpath), &path);
- lwc_string_unref(urlpath);
- if (res != NSERROR_OK) {
- return res;
- }
-
- /* if there is a drive: prefix treat path as DOS filename */
- if ((path[2] == ':') || (path[2] == '|')) {
- char *sidx; /* slash index */
-
- /* move the string down to remove leading / note the
- * strlen is *not* copying too much data as we are
- * moving the null too!
- */
- memmove(path, path + 1, strlen(path));
-
- /* swap / for \ */
- sidx = strrchr(path, '/');
- while (sidx != NULL) {
- *sidx = '\\';
- sidx = strrchr(path, '/');
- }
- }
- /* if the path does not have a drive letter we return the
- * complete path.
- */
- /** @todo Need to check returning the unaltered path in this
- * case is correct
- */
-
- *path_out = path;
-
- return NSERROR_OK;
-}
-
-
-/**
- * Create a nsurl from a path using windows file handling.
- *
- * Perform the necessary operations on a path to generate a nsurl.
- *
- * @param[in] path The path to convert.
- * @param[out] url_out pointer to recive the nsurl, The returned url
- * should be unreferenced by the caller.
- * @return NSERROR_OK and the url is placed in \a url or error code on
- * faliure.
- */
-static nserror windows_path_to_nsurl(const char *path, struct nsurl **url_out)
-{
- nserror ret;
- int urllen;
- char *urlstr;
- char *sidx; /* slash index */
-
- if ((path == NULL) || (url_out == NULL) || (*path == 0)) {
- return NSERROR_BAD_PARAMETER;
- }
-
- /* build url as a string for nsurl constructor */
- urllen = strlen(path) + FILE_SCHEME_PREFIX_LEN + 5;
- urlstr = malloc(urllen);
- if (urlstr == NULL) {
- return NSERROR_NOMEM;
- }
-
- /** @todo check if this should be url escaping the path. */
- if (*path == '/') {
- /* unix style path start, so try wine Z: */
- snprintf(urlstr, urllen, "%sZ%%3A%s", FILE_SCHEME_PREFIX, path);
- } else {
- snprintf(urlstr, urllen, "%s%s", FILE_SCHEME_PREFIX, path);
- }
-
- sidx = strrchr(urlstr, '\\');
- while (sidx != NULL) {
- *sidx = '/';
- sidx = strrchr(urlstr, '\\');
- }
-
- ret = nsurl_create(urlstr, url_out);
- free(urlstr);
-
- return ret;
-}
-
-
-/**
- * Ensure that all directory elements needed to store a filename exist.
- *
- * @param fname The filename to ensure the path to exists.
- * @return NSERROR_OK on success or error code on failure.
- */
-static nserror windows_mkdir_all(const char *fname)
-{
- char *dname;
- char *sep;
- struct stat sb;
-
- dname = strdup(fname);
-
- sep = strrchr(dname, '\\');
- if (sep == NULL) {
- /* no directory separator path is just filename so its ok */
- free(dname);
- return NSERROR_OK;
- }
-
- *sep = 0; /* null terminate directory path */
-
- if (stat(dname, &sb) == 0) {
- free(dname);
- if (S_ISDIR(sb.st_mode)) {
- /* path to file exists and is a directory */
- return NSERROR_OK;
- }
- return NSERROR_NOT_DIRECTORY;
- }
- *sep = '\\'; /* restore separator */
-
- sep = dname;
- while (*sep == '\\') {
- sep++;
- }
- while ((sep = strchr(sep, '\\')) != NULL) {
- *sep = 0;
- if (stat(dname, &sb) != 0) {
- if (nsmkdir(dname, S_IRWXU) != 0) {
- /* could not create path element */
- free(dname);
- return NSERROR_NOT_FOUND;
- }
- } else {
- if (! S_ISDIR(sb.st_mode)) {
- /* path element not a directory */
- free(dname);
- return NSERROR_NOT_DIRECTORY;
- }
- }
- *sep = '\\'; /* restore separator */
- /* skip directory separators */
- while (*sep == '\\') {
- sep++;
- }
- }
-
- free(dname);
- return NSERROR_OK;
-}
-
-/* windows file handling */
-static struct gui_file_table file_table = {
- .mkpath = windows_mkpath,
- .basename = windows_basename,
- .nsurl_to_path = windows_nsurl_to_path,
- .path_to_nsurl = windows_path_to_nsurl,
- .mkdir_all = windows_mkdir_all,
-};
-
-struct gui_file_table *win32_file_table = &file_table;
-
static struct gui_clipboard_table clipboard_table = {
.get = gui_get_clipboard,
diff --git a/windows/gui.h b/windows/gui.h
index 690cd93..f72cb2c 100644
--- a/windows/gui.h
+++ b/windows/gui.h
@@ -21,7 +21,6 @@
#define _NETSURF_WINDOWS_GUI_H_
struct gui_window;
-struct gui_file_table *win32_file_table;
struct gui_clipboard_table *win32_clipboard_table;
extern HINSTANCE hInstance;
diff --git a/windows/main.c b/windows/main.c
index b9ef44a..f4eec12 100644
--- a/windows/main.c
+++ b/windows/main.c
@@ -35,6 +35,7 @@
#include "desktop/netsurf.h"
#include "windows/findfile.h"
+#include "windows/file.h"
#include "windows/drawable.h"
#include "windows/download.h"
#include "windows/localhistory.h"
diff --git a/windows/windbg.h b/windows/windbg.h
index bb23b23..b2d8640 100644
--- a/windows/windbg.h
+++ b/windows/windbg.h
@@ -29,6 +29,6 @@ void win_perror(const char *lpszFunction);
((m) != WM_MOUSEMOVE) && \
((m) != WM_NCHITTEST) && \
((m) != WM_ENTERIDLE)) \
- LOG("%s, hwnd %p, w 0x%x, l 0x%x", msg_num_to_name(m), h, w, l);
+ LOG("%s, hwnd %p, w 0x%x, l 0x%Ix", msg_num_to_name(m), h, w, l);
#endif
-----------------------------------------------------------------------
Summary of changes:
windows/Makefile.target | 2 +-
{atari => windows}/file.c | 114 ++++++++--------
monkey/bitmap.h => windows/file.h | 13 +-
windows/gui.c | 262 -------------------------------------
windows/gui.h | 1 -
windows/main.c | 1 +
windows/windbg.h | 2 +-
7 files changed, 73 insertions(+), 322 deletions(-)
copy {atari => windows}/file.c (74%)
copy monkey/bitmap.h => windows/file.h (80%)
diff --git a/windows/Makefile.target b/windows/Makefile.target
index 5773a0c..6b8ce6a 100644
--- a/windows/Makefile.target
+++ b/windows/Makefile.target
@@ -58,7 +58,7 @@ S_RESOURCES := windows_resource.o
# S_WINDOWS are sources purely for the windows build
S_WINDOWS := main.c window.c gui.c drawable.c misc.c plot.c findfile.c \
- font.c bitmap.c about.c prefs.c download.c filetype.c \
+ font.c bitmap.c about.c prefs.c download.c filetype.c file.c \
localhistory.c schedule.c windbg.c pointers.c
S_WINDOWS := $(addprefix windows/,$(S_WINDOWS))
diff --git a/atari/file.c b/windows/file.c
similarity index 74%
copy from atari/file.c
copy to windows/file.c
index b6d465f..f8372b4 100644
--- a/atari/file.c
+++ b/windows/file.c
@@ -1,5 +1,5 @@
/*
- * Copyright 2014 Ole Loots <ole(a)monochrom.net>
+ * Copyright 2014, 2015 Vincent Sanders <vince(a)netsurf-browser.org>
*
* This file is part of NetSurf, http://www.netsurf-browser.org/
*
@@ -16,29 +16,30 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
+/**
+ * \file
+ * Windows file operation table implementation.
+ */
-#include <stdarg.h>
-#include <string.h>
-#include <stdio.h>
+#include <stdbool.h>
#include <sys/types.h>
#include <sys/stat.h>
#include <unistd.h>
+#include <windows.h>
+#include "utils/errors.h"
+#include "utils/nsurl.h"
+#include "utils/log.h"
#include "utils/utils.h"
#include "utils/corestrings.h"
#include "utils/url.h"
-#include "utils/nsurl.h"
#include "utils/file.h"
+#include "desktop/browser.h"
-/**
- * \file
- * Atari file handling callbacks.
- *
- * Most of this code was taken from windows/gui.c
- */
+#include "windows/file.h"
/**
- * Generate a GEMDOS path from one or more component elemnts.
+ * Generate a windows path from one or more component elemnts.
*
* If a string is allocated it must be freed by the caller.
*
@@ -52,13 +53,14 @@
* @return NSERROR_OK and the complete path is written to str
* or error code on faliure.
*/
-static nserror atari_mkpath(char **str, size_t *size, size_t nelm, va_list ap)
+static nserror windows_mkpath(char **str, size_t *size, size_t nelm, va_list ap)
{
return vsnstrjoin(str, size, '\\', nelm, ap);
}
+
/**
- * Get the basename of a file using GEMDOS path handling.
+ * Get the basename of a file using windows path handling.
*
* This gets the last element of a path and returns it.
*
@@ -71,7 +73,7 @@ static nserror atari_mkpath(char **str, size_t *size, size_t nelm, va_list ap)
* @return NSERROR_OK and the complete path is written to str
* or error code on faliure.
*/
-static nserror atari_basename(const char *path, char **str, size_t *size)
+static nserror windows_basename(const char *path, char **str, size_t *size)
{
const char *leafname;
char *fname;
@@ -99,8 +101,9 @@ static nserror atari_basename(const char *path, char **str, size_t *size)
return NSERROR_OK;
}
+
/**
- * Create a path from a nsurl using GEMDOS file handling.
+ * Create a path from a nsurl using windows file handling.
*
* @param[in] url The url to encode.
* @param[out] path_out A string containing the result path which should
@@ -108,7 +111,7 @@ static nserror atari_basename(const char *path, char **str, size_t *size)
* @return NSERROR_OK and the path is written to \a path or error code
* on faliure.
*/
-static nserror atari_nsurl_to_path(struct nsurl *url, char **path_out)
+static nserror windows_nsurl_to_path(struct nsurl *url, char **path_out)
{
lwc_string *urlpath;
char *path;
@@ -145,12 +148,20 @@ static nserror atari_nsurl_to_path(struct nsurl *url, char **path_out)
/* if there is a drive: prefix treat path as DOS filename */
if ((path[2] == ':') || (path[2] == '|')) {
+ char *sidx; /* slash index */
/* move the string down to remove leading / note the
* strlen is *not* copying too much data as we are
* moving the null too!
*/
memmove(path, path + 1, strlen(path));
+
+ /* swap / for \ */
+ sidx = strrchr(path, '/');
+ while (sidx != NULL) {
+ *sidx = '\\';
+ sidx = strrchr(path, '/');
+ }
}
/* if the path does not have a drive letter we return the
* complete path.
@@ -164,8 +175,9 @@ static nserror atari_nsurl_to_path(struct nsurl *url, char **path_out)
return NSERROR_OK;
}
+
/**
- * Create a nsurl from a path using GEMDOS file handling.
+ * Create a nsurl from a path using windows file handling.
*
* Perform the necessary operations on a path to generate a nsurl.
*
@@ -175,39 +187,37 @@ static nserror atari_nsurl_to_path(struct nsurl *url, char **path_out)
* @return NSERROR_OK and the url is placed in \a url or error code on
* faliure.
*/
-static nserror atari_path_to_nsurl(const char *path, struct nsurl **url_out)
+static nserror windows_path_to_nsurl(const char *path, struct nsurl **url_out)
{
nserror ret;
int urllen;
char *urlstr;
- char *escpath; /* escaped version of the path */
- char *escpaths;
+ char *sidx; /* slash index */
if ((path == NULL) || (url_out == NULL) || (*path == 0)) {
return NSERROR_BAD_PARAMETER;
}
- /* escape the path so it can be placed in a url */
- ret = url_escape(path, 0, false, "/", &escpath);
- if (ret != NSERROR_OK) {
- return ret;
- }
- /* remove unecessary / as file: paths are already absolute */
- escpaths = escpath;
- while (*escpaths == '/') {
- escpaths++;
- }
-
/* build url as a string for nsurl constructor */
- urllen = strlen(escpaths) + FILE_SCHEME_PREFIX_LEN + 1;
+ urllen = strlen(path) + FILE_SCHEME_PREFIX_LEN + 5;
urlstr = malloc(urllen);
if (urlstr == NULL) {
- free(escpath);
return NSERROR_NOMEM;
}
- snprintf(urlstr, urllen, "%s%s", FILE_SCHEME_PREFIX, escpaths);
- free(escpath);
+ /** @todo check if this should be url escaping the path. */
+ if (*path == '/') {
+ /* unix style path start, so try wine Z: */
+ snprintf(urlstr, urllen, "%sZ%%3A%s", FILE_SCHEME_PREFIX, path);
+ } else {
+ snprintf(urlstr, urllen, "%s%s", FILE_SCHEME_PREFIX, path);
+ }
+
+ sidx = strrchr(urlstr, '\\');
+ while (sidx != NULL) {
+ *sidx = '/';
+ sidx = strrchr(urlstr, '\\');
+ }
ret = nsurl_create(urlstr, url_out);
free(urlstr);
@@ -215,13 +225,14 @@ static nserror atari_path_to_nsurl(const char *path, struct nsurl **url_out)
return ret;
}
+
/**
* Ensure that all directory elements needed to store a filename exist.
*
* @param fname The filename to ensure the path to exists.
* @return NSERROR_OK on success or error code on failure.
*/
-static nserror atari_mkdir_all(const char *fname)
+static nserror windows_mkdir_all(const char *fname)
{
char *dname;
char *sep;
@@ -229,7 +240,7 @@ static nserror atari_mkdir_all(const char *fname)
dname = strdup(fname);
- sep = strrchr(dname, '/');
+ sep = strrchr(dname, '\\');
if (sep == NULL) {
/* no directory separator path is just filename so its ok */
free(dname);
@@ -246,13 +257,13 @@ static nserror atari_mkdir_all(const char *fname)
}
return NSERROR_NOT_DIRECTORY;
}
- *sep = '/'; /* restore separator */
+ *sep = '\\'; /* restore separator */
sep = dname;
- while (*sep == '/') {
+ while (*sep == '\\') {
sep++;
}
- while ((sep = strchr(sep, '/')) != NULL) {
+ while ((sep = strchr(sep, '\\')) != NULL) {
*sep = 0;
if (stat(dname, &sb) != 0) {
if (nsmkdir(dname, S_IRWXU) != 0) {
@@ -267,9 +278,9 @@ static nserror atari_mkdir_all(const char *fname)
return NSERROR_NOT_DIRECTORY;
}
}
- *sep = '/'; /* restore separator */
+ *sep = '\\'; /* restore separator */
/* skip directory separators */
- while (*sep == '/') {
+ while (*sep == '\\') {
sep++;
}
}
@@ -278,16 +289,13 @@ static nserror atari_mkdir_all(const char *fname)
return NSERROR_OK;
}
-
-/* atari file handling table */
+/* windows file handling */
static struct gui_file_table file_table = {
- .mkpath = atari_mkpath,
- .basename = atari_basename,
- .nsurl_to_path = atari_nsurl_to_path,
- .path_to_nsurl = atari_path_to_nsurl,
- .mkdir_all = atari_mkdir_all,
+ .mkpath = windows_mkpath,
+ .basename = windows_basename,
+ .nsurl_to_path = windows_nsurl_to_path,
+ .path_to_nsurl = windows_path_to_nsurl,
+ .mkdir_all = windows_mkdir_all,
};
-struct gui_file_table *atari_file_table = &file_table;
-
-
+struct gui_file_table *win32_file_table = &file_table;
diff --git a/monkey/bitmap.h b/windows/file.h
similarity index 80%
copy from monkey/bitmap.h
copy to windows/file.h
index e293ce9..5262dde 100644
--- a/monkey/bitmap.h
+++ b/windows/file.h
@@ -16,9 +16,14 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef NS_MONKEY_BITMAP_H
-#define NS_MONKEY_BITMAP_H
+/**
+ * \file
+ * Windows file operation table interface.
+ */
+
+#ifndef _NETSURF_WINDOWS_FILE_H_
+#define _NETSURF_WINDOWS_FILE_H_
-extern struct gui_bitmap_table *monkey_bitmap_table;
+struct gui_file_table *win32_file_table;
-#endif /* NS_MONKEY_BITMAP_H */
+#endif
diff --git a/windows/gui.c b/windows/gui.c
index 431e5c9..f9aca5a 100644
--- a/windows/gui.c
+++ b/windows/gui.c
@@ -149,268 +149,6 @@ static void gui_set_clipboard(const char *buffer, size_t length,
}
-/**
- * Generate a windows path from one or more component elemnts.
- *
- * If a string is allocated it must be freed by the caller.
- *
- * @param[in,out] str pointer to string pointer if this is NULL enough
- * storage will be allocated for the complete path.
- * @param[in,out] size The size of the space available if \a str not
- * NULL on input and if not NULL set to the total
- * output length on output.
- * @param[in] nelm The number of elements.
- * @param[in] ap The elements of the path as string pointers.
- * @return NSERROR_OK and the complete path is written to str
- * or error code on faliure.
- */
-static nserror windows_mkpath(char **str, size_t *size, size_t nelm, va_list ap)
-{
- return vsnstrjoin(str, size, '\\', nelm, ap);
-}
-
-
-/**
- * Get the basename of a file using windows path handling.
- *
- * This gets the last element of a path and returns it.
- *
- * @param[in] path The path to extract the name from.
- * @param[in,out] str Pointer to string pointer if this is NULL enough
- * storage will be allocated for the path element.
- * @param[in,out] size The size of the space available if \a
- * str not NULL on input and set to the total
- * output length on output.
- * @return NSERROR_OK and the complete path is written to str
- * or error code on faliure.
- */
-static nserror windows_basename(const char *path, char **str, size_t *size)
-{
- const char *leafname;
- char *fname;
-
- if (path == NULL) {
- return NSERROR_BAD_PARAMETER;
- }
-
- leafname = strrchr(path, '\\');
- if (!leafname) {
- leafname = path;
- } else {
- leafname += 1;
- }
-
- fname = strdup(leafname);
- if (fname == NULL) {
- return NSERROR_NOMEM;
- }
-
- *str = fname;
- if (size != NULL) {
- *size = strlen(fname);
- }
- return NSERROR_OK;
-}
-
-
-/**
- * Create a path from a nsurl using windows file handling.
- *
- * @param[in] url The url to encode.
- * @param[out] path_out A string containing the result path which should
- * be freed by the caller.
- * @return NSERROR_OK and the path is written to \a path or error code
- * on faliure.
- */
-static nserror windows_nsurl_to_path(struct nsurl *url, char **path_out)
-{
- lwc_string *urlpath;
- char *path;
- bool match;
- lwc_string *scheme;
- nserror res;
-
- if ((url == NULL) || (path_out == NULL)) {
- return NSERROR_BAD_PARAMETER;
- }
-
- scheme = nsurl_get_component(url, NSURL_SCHEME);
-
- if (lwc_string_caseless_isequal(scheme, corestring_lwc_file,
- &match) != lwc_error_ok)
- {
- return NSERROR_BAD_PARAMETER;
- }
- lwc_string_unref(scheme);
- if (match == false) {
- return NSERROR_BAD_PARAMETER;
- }
-
- urlpath = nsurl_get_component(url, NSURL_PATH);
- if (urlpath == NULL) {
- return NSERROR_BAD_PARAMETER;
- }
-
- res = url_unescape(lwc_string_data(urlpath), &path);
- lwc_string_unref(urlpath);
- if (res != NSERROR_OK) {
- return res;
- }
-
- /* if there is a drive: prefix treat path as DOS filename */
- if ((path[2] == ':') || (path[2] == '|')) {
- char *sidx; /* slash index */
-
- /* move the string down to remove leading / note the
- * strlen is *not* copying too much data as we are
- * moving the null too!
- */
- memmove(path, path + 1, strlen(path));
-
- /* swap / for \ */
- sidx = strrchr(path, '/');
- while (sidx != NULL) {
- *sidx = '\\';
- sidx = strrchr(path, '/');
- }
- }
- /* if the path does not have a drive letter we return the
- * complete path.
- */
- /** @todo Need to check returning the unaltered path in this
- * case is correct
- */
-
- *path_out = path;
-
- return NSERROR_OK;
-}
-
-
-/**
- * Create a nsurl from a path using windows file handling.
- *
- * Perform the necessary operations on a path to generate a nsurl.
- *
- * @param[in] path The path to convert.
- * @param[out] url_out pointer to recive the nsurl, The returned url
- * should be unreferenced by the caller.
- * @return NSERROR_OK and the url is placed in \a url or error code on
- * faliure.
- */
-static nserror windows_path_to_nsurl(const char *path, struct nsurl **url_out)
-{
- nserror ret;
- int urllen;
- char *urlstr;
- char *sidx; /* slash index */
-
- if ((path == NULL) || (url_out == NULL) || (*path == 0)) {
- return NSERROR_BAD_PARAMETER;
- }
-
- /* build url as a string for nsurl constructor */
- urllen = strlen(path) + FILE_SCHEME_PREFIX_LEN + 5;
- urlstr = malloc(urllen);
- if (urlstr == NULL) {
- return NSERROR_NOMEM;
- }
-
- /** @todo check if this should be url escaping the path. */
- if (*path == '/') {
- /* unix style path start, so try wine Z: */
- snprintf(urlstr, urllen, "%sZ%%3A%s", FILE_SCHEME_PREFIX, path);
- } else {
- snprintf(urlstr, urllen, "%s%s", FILE_SCHEME_PREFIX, path);
- }
-
- sidx = strrchr(urlstr, '\\');
- while (sidx != NULL) {
- *sidx = '/';
- sidx = strrchr(urlstr, '\\');
- }
-
- ret = nsurl_create(urlstr, url_out);
- free(urlstr);
-
- return ret;
-}
-
-
-/**
- * Ensure that all directory elements needed to store a filename exist.
- *
- * @param fname The filename to ensure the path to exists.
- * @return NSERROR_OK on success or error code on failure.
- */
-static nserror windows_mkdir_all(const char *fname)
-{
- char *dname;
- char *sep;
- struct stat sb;
-
- dname = strdup(fname);
-
- sep = strrchr(dname, '\\');
- if (sep == NULL) {
- /* no directory separator path is just filename so its ok */
- free(dname);
- return NSERROR_OK;
- }
-
- *sep = 0; /* null terminate directory path */
-
- if (stat(dname, &sb) == 0) {
- free(dname);
- if (S_ISDIR(sb.st_mode)) {
- /* path to file exists and is a directory */
- return NSERROR_OK;
- }
- return NSERROR_NOT_DIRECTORY;
- }
- *sep = '\\'; /* restore separator */
-
- sep = dname;
- while (*sep == '\\') {
- sep++;
- }
- while ((sep = strchr(sep, '\\')) != NULL) {
- *sep = 0;
- if (stat(dname, &sb) != 0) {
- if (nsmkdir(dname, S_IRWXU) != 0) {
- /* could not create path element */
- free(dname);
- return NSERROR_NOT_FOUND;
- }
- } else {
- if (! S_ISDIR(sb.st_mode)) {
- /* path element not a directory */
- free(dname);
- return NSERROR_NOT_DIRECTORY;
- }
- }
- *sep = '\\'; /* restore separator */
- /* skip directory separators */
- while (*sep == '\\') {
- sep++;
- }
- }
-
- free(dname);
- return NSERROR_OK;
-}
-
-/* windows file handling */
-static struct gui_file_table file_table = {
- .mkpath = windows_mkpath,
- .basename = windows_basename,
- .nsurl_to_path = windows_nsurl_to_path,
- .path_to_nsurl = windows_path_to_nsurl,
- .mkdir_all = windows_mkdir_all,
-};
-
-struct gui_file_table *win32_file_table = &file_table;
-
static struct gui_clipboard_table clipboard_table = {
.get = gui_get_clipboard,
diff --git a/windows/gui.h b/windows/gui.h
index 690cd93..f72cb2c 100644
--- a/windows/gui.h
+++ b/windows/gui.h
@@ -21,7 +21,6 @@
#define _NETSURF_WINDOWS_GUI_H_
struct gui_window;
-struct gui_file_table *win32_file_table;
struct gui_clipboard_table *win32_clipboard_table;
extern HINSTANCE hInstance;
diff --git a/windows/main.c b/windows/main.c
index b9ef44a..f4eec12 100644
--- a/windows/main.c
+++ b/windows/main.c
@@ -35,6 +35,7 @@
#include "desktop/netsurf.h"
#include "windows/findfile.h"
+#include "windows/file.h"
#include "windows/drawable.h"
#include "windows/download.h"
#include "windows/localhistory.h"
diff --git a/windows/windbg.h b/windows/windbg.h
index bb23b23..b2d8640 100644
--- a/windows/windbg.h
+++ b/windows/windbg.h
@@ -29,6 +29,6 @@ void win_perror(const char *lpszFunction);
((m) != WM_MOUSEMOVE) && \
((m) != WM_NCHITTEST) && \
((m) != WM_ENTERIDLE)) \
- LOG("%s, hwnd %p, w 0x%x, l 0x%x", msg_num_to_name(m), h, w, l);
+ LOG("%s, hwnd %p, w 0x%x, l 0x%Ix", msg_num_to_name(m), h, w, l);
#endif
--
NetSurf Browser
8 years, 3 months
- 1
- 0
netsurf: branch master updated. release/3.3-197-g7736a61
by NetSurf Browser Project
Gitweb links:
...log http://git.netsurf-browser.org/netsurf.git/shortlog/7736a611a2c9d13d697cf...
...commit http://git.netsurf-browser.org/netsurf.git/commit/7736a611a2c9d13d697cfc8...
...tree http://git.netsurf-browser.org/netsurf.git/tree/7736a611a2c9d13d697cfc8bc...
The branch, master has been updated
via 7736a611a2c9d13d697cfc8bc83f9dddbb99138c (commit)
from 55260cc9a06e7d62c5d242c4420ab5e5474242b0 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commitdiff http://git.netsurf-browser.org/netsurf.git/commit/?id=7736a611a2c9d13d697...
commit 7736a611a2c9d13d697cfc8bc83f9dddbb99138c
Author: Vincent Sanders <vince(a)kyllikki.org>
Commit: Vincent Sanders <vince(a)kyllikki.org>
Improve gtk scaffolding documentation
diff --git a/gtk/scaffolding.c b/gtk/scaffolding.c
index 8f161a4..4506ac2 100644
--- a/gtk/scaffolding.c
+++ b/gtk/scaffolding.c
@@ -98,42 +98,54 @@ static gboolean nsgtk_on_##q##_activate(GtkButton *widget, gpointer data)
/** Core scaffolding structure. */
struct nsgtk_scaffolding {
- GtkWindow *window;
- GtkNotebook *notebook;
- GtkWidget *url_bar;
- GtkEntryCompletion *url_bar_completion;
+ /** global linked list of scaffoldings for gui interface adjustments */
+ struct nsgtk_scaffolding *next, *prev;
- /** menu bar hierarchy */
- struct nsgtk_bar_submenu *menu_bar;
+ /** currently active gui browsing context */
+ struct gui_window *top_level;
- /** right click popup menu hierarchy */
- struct nsgtk_popup_menu *menu_popup;
+ /** local history window */
+ struct gtk_history_window *history_window;
- /** link popup menu */
- struct nsgtk_link_menu *link_menu;
+ /** Builder object scaffold was created from */
+ GtkBuilder *builder;
+
+ /** scaffold container window */
+ GtkWindow *window;
+ bool fullscreen; /**< flag for the scaffold window fullscreen status */
+
+ /** tab widget holding displayed pages */
+ GtkNotebook *notebook;
+
+ /** entry widget holding the url of the current displayed page */
+ GtkWidget *url_bar;
+ GtkEntryCompletion *url_bar_completion; /**< Completions for url_bar */
- GtkToolbar *tool_bar;
- struct nsgtk_button_connect *buttons[PLACEHOLDER_BUTTON];
- GtkImage *throbber;
- struct gtk_search *search;
- GtkWidget *webSearchEntry;
+ /** Activity throbber */
+ GtkImage *throbber;
+ int throb_frame; /**< Current frame of throbber animation */
- int offset;
- int toolbarmem;
- int toolbarbase;
- int historybase;
+ struct gtk_search *search;
+ /** Web search widget */
+ GtkWidget *webSearchEntry;
- GtkBuilder *builder;
+ /** controls toolbar */
+ GtkToolbar *tool_bar;
+ struct nsgtk_button_connect *buttons[PLACEHOLDER_BUTTON];
+ int offset;
+ int toolbarmem;
+ int toolbarbase;
+ int historybase;
- struct gtk_history_window *history_window;
+ /** menu bar hierarchy */
+ struct nsgtk_bar_submenu *menu_bar;
- int throb_frame;
- struct gui_window *top_level;
+ /** right click popup menu hierarchy */
+ struct nsgtk_popup_menu *menu_popup;
- bool fullscreen;
+ /** link popup menu */
+ struct nsgtk_link_menu *link_menu;
- /* keep global linked list for gui interface adjustments */
- struct nsgtk_scaffolding *next, *prev;
};
/** current scaffold for model dialogue use */
@@ -266,9 +278,9 @@ static gboolean scaffolding_window_delete_event(GtkWidget *widget,
}
/**
- * Update the back and forward button sensitivity.
+ * Update the scaffoling button sensitivity, url bar and local history size
*/
-static void nsgtk_window_update_back_forward(struct nsgtk_scaffolding *g)
+static void scaffolding_update_context(struct nsgtk_scaffolding *g)
{
int width, height;
struct browser_window *bw = nsgtk_get_browser_window(g->top_level);
@@ -1396,7 +1408,7 @@ MULTIHANDLER(back)
browser_window_search_clear(bw);
browser_window_history_back(bw, false);
- nsgtk_window_update_back_forward(g);
+ scaffolding_update_context(g);
return TRUE;
}
@@ -1413,7 +1425,7 @@ MULTIHANDLER(forward)
browser_window_search_clear(bw);
browser_window_history_forward(bw, false);
- nsgtk_window_update_back_forward(g);
+ scaffolding_update_context(g);
return TRUE;
}
@@ -1454,10 +1466,11 @@ MULTIHANDLER(localhistory)
/* if entries of the same url but different frag_ids have been added
* the history needs redrawing (what throbber code normally does)
*/
- browser_window_history_size(bw, &width, &height);
- nsgtk_window_update_back_forward(g);
+
+ scaffolding_update_context(g);
gtk_window_get_position(g->window, &x, &y);
gtk_window_get_size(g->window, &mainwidth, &mainheight);
+ browser_window_history_size(bw, &width, &height);
width = (width + g->historybase + margin > mainwidth) ?
mainwidth - g->historybase : width + margin;
height = (height + g->toolbarbase + margin > mainheight) ?
@@ -2346,7 +2359,7 @@ void gui_window_start_throbber(struct gui_window* _g)
g->buttons[RELOAD_BUTTON]->sensitivity = false;
nsgtk_scaffolding_set_sensitivity(g);
- nsgtk_window_update_back_forward(g);
+ scaffolding_update_context(g);
nsgtk_schedule(100, nsgtk_throb, g);
}
@@ -2356,7 +2369,7 @@ void gui_window_stop_throbber(struct gui_window* _g)
struct nsgtk_scaffolding *g = nsgtk_get_scaffold(_g);
if (g == NULL)
return;
- nsgtk_window_update_back_forward(g);
+ scaffolding_update_context(g);
nsgtk_schedule(-1, nsgtk_throb, g);
if (g->buttons[STOP_BUTTON] != NULL)
g->buttons[STOP_BUTTON]->sensitivity = false;
@@ -2654,7 +2667,7 @@ void nsgtk_scaffolding_set_top_level(struct gui_window *gw)
sc->top_level = gw;
/* Synchronise the history (will also update the URL bar) */
- nsgtk_window_update_back_forward(sc);
+ scaffolding_update_context(sc);
/* clear effects of potential searches */
browser_window_search_clear(bw);
-----------------------------------------------------------------------
Summary of changes:
gtk/scaffolding.c | 83 +++++++++++++++++++++++++++++++----------------------
1 file changed, 48 insertions(+), 35 deletions(-)
diff --git a/gtk/scaffolding.c b/gtk/scaffolding.c
index 8f161a4..4506ac2 100644
--- a/gtk/scaffolding.c
+++ b/gtk/scaffolding.c
@@ -98,42 +98,54 @@ static gboolean nsgtk_on_##q##_activate(GtkButton *widget, gpointer data)
/** Core scaffolding structure. */
struct nsgtk_scaffolding {
- GtkWindow *window;
- GtkNotebook *notebook;
- GtkWidget *url_bar;
- GtkEntryCompletion *url_bar_completion;
+ /** global linked list of scaffoldings for gui interface adjustments */
+ struct nsgtk_scaffolding *next, *prev;
- /** menu bar hierarchy */
- struct nsgtk_bar_submenu *menu_bar;
+ /** currently active gui browsing context */
+ struct gui_window *top_level;
- /** right click popup menu hierarchy */
- struct nsgtk_popup_menu *menu_popup;
+ /** local history window */
+ struct gtk_history_window *history_window;
- /** link popup menu */
- struct nsgtk_link_menu *link_menu;
+ /** Builder object scaffold was created from */
+ GtkBuilder *builder;
+
+ /** scaffold container window */
+ GtkWindow *window;
+ bool fullscreen; /**< flag for the scaffold window fullscreen status */
+
+ /** tab widget holding displayed pages */
+ GtkNotebook *notebook;
+
+ /** entry widget holding the url of the current displayed page */
+ GtkWidget *url_bar;
+ GtkEntryCompletion *url_bar_completion; /**< Completions for url_bar */
- GtkToolbar *tool_bar;
- struct nsgtk_button_connect *buttons[PLACEHOLDER_BUTTON];
- GtkImage *throbber;
- struct gtk_search *search;
- GtkWidget *webSearchEntry;
+ /** Activity throbber */
+ GtkImage *throbber;
+ int throb_frame; /**< Current frame of throbber animation */
- int offset;
- int toolbarmem;
- int toolbarbase;
- int historybase;
+ struct gtk_search *search;
+ /** Web search widget */
+ GtkWidget *webSearchEntry;
- GtkBuilder *builder;
+ /** controls toolbar */
+ GtkToolbar *tool_bar;
+ struct nsgtk_button_connect *buttons[PLACEHOLDER_BUTTON];
+ int offset;
+ int toolbarmem;
+ int toolbarbase;
+ int historybase;
- struct gtk_history_window *history_window;
+ /** menu bar hierarchy */
+ struct nsgtk_bar_submenu *menu_bar;
- int throb_frame;
- struct gui_window *top_level;
+ /** right click popup menu hierarchy */
+ struct nsgtk_popup_menu *menu_popup;
- bool fullscreen;
+ /** link popup menu */
+ struct nsgtk_link_menu *link_menu;
- /* keep global linked list for gui interface adjustments */
- struct nsgtk_scaffolding *next, *prev;
};
/** current scaffold for model dialogue use */
@@ -266,9 +278,9 @@ static gboolean scaffolding_window_delete_event(GtkWidget *widget,
}
/**
- * Update the back and forward button sensitivity.
+ * Update the scaffoling button sensitivity, url bar and local history size
*/
-static void nsgtk_window_update_back_forward(struct nsgtk_scaffolding *g)
+static void scaffolding_update_context(struct nsgtk_scaffolding *g)
{
int width, height;
struct browser_window *bw = nsgtk_get_browser_window(g->top_level);
@@ -1396,7 +1408,7 @@ MULTIHANDLER(back)
browser_window_search_clear(bw);
browser_window_history_back(bw, false);
- nsgtk_window_update_back_forward(g);
+ scaffolding_update_context(g);
return TRUE;
}
@@ -1413,7 +1425,7 @@ MULTIHANDLER(forward)
browser_window_search_clear(bw);
browser_window_history_forward(bw, false);
- nsgtk_window_update_back_forward(g);
+ scaffolding_update_context(g);
return TRUE;
}
@@ -1454,10 +1466,11 @@ MULTIHANDLER(localhistory)
/* if entries of the same url but different frag_ids have been added
* the history needs redrawing (what throbber code normally does)
*/
- browser_window_history_size(bw, &width, &height);
- nsgtk_window_update_back_forward(g);
+
+ scaffolding_update_context(g);
gtk_window_get_position(g->window, &x, &y);
gtk_window_get_size(g->window, &mainwidth, &mainheight);
+ browser_window_history_size(bw, &width, &height);
width = (width + g->historybase + margin > mainwidth) ?
mainwidth - g->historybase : width + margin;
height = (height + g->toolbarbase + margin > mainheight) ?
@@ -2346,7 +2359,7 @@ void gui_window_start_throbber(struct gui_window* _g)
g->buttons[RELOAD_BUTTON]->sensitivity = false;
nsgtk_scaffolding_set_sensitivity(g);
- nsgtk_window_update_back_forward(g);
+ scaffolding_update_context(g);
nsgtk_schedule(100, nsgtk_throb, g);
}
@@ -2356,7 +2369,7 @@ void gui_window_stop_throbber(struct gui_window* _g)
struct nsgtk_scaffolding *g = nsgtk_get_scaffold(_g);
if (g == NULL)
return;
- nsgtk_window_update_back_forward(g);
+ scaffolding_update_context(g);
nsgtk_schedule(-1, nsgtk_throb, g);
if (g->buttons[STOP_BUTTON] != NULL)
g->buttons[STOP_BUTTON]->sensitivity = false;
@@ -2654,7 +2667,7 @@ void nsgtk_scaffolding_set_top_level(struct gui_window *gw)
sc->top_level = gw;
/* Synchronise the history (will also update the URL bar) */
- nsgtk_window_update_back_forward(sc);
+ scaffolding_update_context(sc);
/* clear effects of potential searches */
browser_window_search_clear(bw);
--
NetSurf Browser
8 years, 3 months
- 1
- 0
netsurf: branch master updated. release/3.3-196-g55260cc
by NetSurf Browser Project
Gitweb links:
...log http://git.netsurf-browser.org/netsurf.git/shortlog/55260cc9a06e7d62c5d24...
...commit http://git.netsurf-browser.org/netsurf.git/commit/55260cc9a06e7d62c5d242c...
...tree http://git.netsurf-browser.org/netsurf.git/tree/55260cc9a06e7d62c5d242c44...
The branch, master has been updated
via 55260cc9a06e7d62c5d242c4420ab5e5474242b0 (commit)
from 65ef60d2b5ac0a39a14538b8abab5cdd9da6fad6 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commitdiff http://git.netsurf-browser.org/netsurf.git/commit/?id=55260cc9a06e7d62c5d...
commit 55260cc9a06e7d62c5d242c4420ab5e5474242b0
Author: Vincent Sanders <vince(a)kyllikki.org>
Commit: Vincent Sanders <vince(a)kyllikki.org>
Ensure gtk windows have a default favicon at creation.
This ensures newly created gtk gui windows have a default favicon
set. This is necessary because new tab creation displays the new
windows contents before an icon has been set and the icon will not be
changed from the previously viewed tabs icon.
diff --git a/gtk/window.c b/gtk/window.c
index 481ae3b..c50ed20 100644
--- a/gtk/window.c
+++ b/gtk/window.c
@@ -765,13 +765,14 @@ gui_window_create(struct browser_window *bw,
/* attach scaffold */
if (flags & GW_CREATE_TAB) {
+ /* open in new tab, attach to existing scaffold */
if (existing != NULL) {
g->scaffold = existing->scaffold;
} else {
g->scaffold = nsgtk_current_scaffolding();
}
} else {
- /* Now construct and attach a scaffold */
+ /* open in new window, create and attach to scaffold */
g->scaffold = nsgtk_new_scaffolding(g);
}
if (g->scaffold == NULL) {
@@ -788,6 +789,9 @@ gui_window_create(struct browser_window *bw,
g->paned = GTK_PANED(gtk_builder_get_object(tab_builder, "hpaned1"));
g->input_method = gtk_im_multicontext_new();
+ /* set a default favicon */
+ g_object_ref(favicon_pixbuf);
+ g->icon = favicon_pixbuf;
/* add new gui window to global list (push_top) */
if (window_list) {
@@ -850,13 +854,13 @@ gui_window_create(struct browser_window *bw,
nsgtk_paned_notify__position, g);
/* gtk container destructor */
- CONNECT(g->container, "destroy",
- window_destroy, g);
+ CONNECT(g->container, "destroy", window_destroy, g);
/* input method */
gtk_im_context_set_client_window(g->input_method,
nsgtk_layout_get_bin_window(g->layout));
gtk_im_context_set_use_preedit(g->input_method, FALSE);
+
/* input method signals */
CONNECT(g->input_method, "commit",
nsgtk_window_input_method_commit, g);
@@ -936,7 +940,10 @@ static void gui_window_destroy(struct gui_window *g)
}
/**
- * set favicon
+ * favicon setting for gtk gui window.
+ *
+ * \param gw gtk gui window to set favicon on.
+ * \param icon A handle to the new favicon content.
*/
static void gui_window_set_icon(struct gui_window *gw, hlcache_handle *icon)
{
-----------------------------------------------------------------------
Summary of changes:
gtk/window.c | 15 +++++++++++----
1 file changed, 11 insertions(+), 4 deletions(-)
diff --git a/gtk/window.c b/gtk/window.c
index 481ae3b..c50ed20 100644
--- a/gtk/window.c
+++ b/gtk/window.c
@@ -765,13 +765,14 @@ gui_window_create(struct browser_window *bw,
/* attach scaffold */
if (flags & GW_CREATE_TAB) {
+ /* open in new tab, attach to existing scaffold */
if (existing != NULL) {
g->scaffold = existing->scaffold;
} else {
g->scaffold = nsgtk_current_scaffolding();
}
} else {
- /* Now construct and attach a scaffold */
+ /* open in new window, create and attach to scaffold */
g->scaffold = nsgtk_new_scaffolding(g);
}
if (g->scaffold == NULL) {
@@ -788,6 +789,9 @@ gui_window_create(struct browser_window *bw,
g->paned = GTK_PANED(gtk_builder_get_object(tab_builder, "hpaned1"));
g->input_method = gtk_im_multicontext_new();
+ /* set a default favicon */
+ g_object_ref(favicon_pixbuf);
+ g->icon = favicon_pixbuf;
/* add new gui window to global list (push_top) */
if (window_list) {
@@ -850,13 +854,13 @@ gui_window_create(struct browser_window *bw,
nsgtk_paned_notify__position, g);
/* gtk container destructor */
- CONNECT(g->container, "destroy",
- window_destroy, g);
+ CONNECT(g->container, "destroy", window_destroy, g);
/* input method */
gtk_im_context_set_client_window(g->input_method,
nsgtk_layout_get_bin_window(g->layout));
gtk_im_context_set_use_preedit(g->input_method, FALSE);
+
/* input method signals */
CONNECT(g->input_method, "commit",
nsgtk_window_input_method_commit, g);
@@ -936,7 +940,10 @@ static void gui_window_destroy(struct gui_window *g)
}
/**
- * set favicon
+ * favicon setting for gtk gui window.
+ *
+ * \param gw gtk gui window to set favicon on.
+ * \param icon A handle to the new favicon content.
*/
static void gui_window_set_icon(struct gui_window *gw, hlcache_handle *icon)
{
--
NetSurf Browser
8 years, 3 months
- 1
- 0
netsurf: branch master updated. release/3.3-195-g65ef60d
by NetSurf Browser Project
Gitweb links:
...log http://git.netsurf-browser.org/netsurf.git/shortlog/65ef60d2b5ac0a39a1453...
...commit http://git.netsurf-browser.org/netsurf.git/commit/65ef60d2b5ac0a39a14538b...
...tree http://git.netsurf-browser.org/netsurf.git/tree/65ef60d2b5ac0a39a14538b8a...
The branch, master has been updated
via 65ef60d2b5ac0a39a14538b8abab5cdd9da6fad6 (commit)
from b208c60dddc639cfce3333f39ca542f34777407a (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commitdiff http://git.netsurf-browser.org/netsurf.git/commit/?id=65ef60d2b5ac0a39a14...
commit 65ef60d2b5ac0a39a14538b8abab5cdd9da6fad6
Author: Vincent Sanders <vince(a)kyllikki.org>
Commit: Vincent Sanders <vince(a)kyllikki.org>
Fix missing unistd includes to allow building with older headers
diff --git a/gtk/toolbar.c b/gtk/toolbar.c
index 2345f56..d37d989 100644
--- a/gtk/toolbar.c
+++ b/gtk/toolbar.c
@@ -17,6 +17,7 @@
*/
#include <string.h>
+#include <unistd.h>
#include <gtk/gtk.h>
#include "desktop/browser.h"
diff --git a/gtk/viewdata.c b/gtk/viewdata.c
index 7cd640f..bb8f86f 100644
--- a/gtk/viewdata.c
+++ b/gtk/viewdata.c
@@ -28,6 +28,7 @@
#include <stdlib.h>
#include <string.h>
#include <stdio.h>
+#include <unistd.h>
#include <gtk/gtk.h>
#include "utils/log.h"
@@ -826,7 +827,7 @@ editor_init_fname(const char *title,
int veci;
/* desktop file of default app for mimetype */
char *def_app_desktop = NULL;
- char *exec_cmd;
+ char *exec_cmd = NULL;
char **argv;
/* build string vector of search path */
-----------------------------------------------------------------------
Summary of changes:
gtk/toolbar.c | 1 +
gtk/viewdata.c | 3 ++-
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/gtk/toolbar.c b/gtk/toolbar.c
index 2345f56..d37d989 100644
--- a/gtk/toolbar.c
+++ b/gtk/toolbar.c
@@ -17,6 +17,7 @@
*/
#include <string.h>
+#include <unistd.h>
#include <gtk/gtk.h>
#include "desktop/browser.h"
diff --git a/gtk/viewdata.c b/gtk/viewdata.c
index 7cd640f..bb8f86f 100644
--- a/gtk/viewdata.c
+++ b/gtk/viewdata.c
@@ -28,6 +28,7 @@
#include <stdlib.h>
#include <string.h>
#include <stdio.h>
+#include <unistd.h>
#include <gtk/gtk.h>
#include "utils/log.h"
@@ -826,7 +827,7 @@ editor_init_fname(const char *title,
int veci;
/* desktop file of default app for mimetype */
char *def_app_desktop = NULL;
- char *exec_cmd;
+ char *exec_cmd = NULL;
char **argv;
/* build string vector of search path */
--
NetSurf Browser
8 years, 3 months
- 1
- 0
netsurf: branch master updated. release/3.3-194-gb208c60
by NetSurf Browser Project
Gitweb links:
...log http://git.netsurf-browser.org/netsurf.git/shortlog/b208c60dddc639cfce333...
...commit http://git.netsurf-browser.org/netsurf.git/commit/b208c60dddc639cfce3333f...
...tree http://git.netsurf-browser.org/netsurf.git/tree/b208c60dddc639cfce3333f39...
The branch, master has been updated
via b208c60dddc639cfce3333f39ca542f34777407a (commit)
from 1c5a5207fb2056b58be7a27a5135f39228702260 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commitdiff http://git.netsurf-browser.org/netsurf.git/commit/?id=b208c60dddc639cfce3...
commit b208c60dddc639cfce3333f39ca542f34777407a
Author: Vincent Sanders <vince(a)kyllikki.org>
Commit: Vincent Sanders <vince(a)kyllikki.org>
Add missing include to gtk scaffolding
Without unistd access, close and unlink were not properly defined
diff --git a/gtk/scaffolding.c b/gtk/scaffolding.c
index 215fe1a..8f161a4 100644
--- a/gtk/scaffolding.c
+++ b/gtk/scaffolding.c
@@ -22,6 +22,7 @@
#include <stdio.h>
#include <errno.h>
#include <stdlib.h>
+#include <unistd.h>
#include <gtk/gtk.h>
#include <gdk-pixbuf/gdk-pixbuf.h>
-----------------------------------------------------------------------
Summary of changes:
gtk/scaffolding.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/gtk/scaffolding.c b/gtk/scaffolding.c
index 215fe1a..8f161a4 100644
--- a/gtk/scaffolding.c
+++ b/gtk/scaffolding.c
@@ -22,6 +22,7 @@
#include <stdio.h>
#include <errno.h>
#include <stdlib.h>
+#include <unistd.h>
#include <gtk/gtk.h>
#include <gdk-pixbuf/gdk-pixbuf.h>
--
NetSurf Browser
8 years, 3 months
- 1
- 0
netsurf: branch master updated. release/3.3-193-g1c5a520
by NetSurf Browser Project
Gitweb links:
...log http://git.netsurf-browser.org/netsurf.git/shortlog/1c5a5207fb2056b58be7a...
...commit http://git.netsurf-browser.org/netsurf.git/commit/1c5a5207fb2056b58be7a27...
...tree http://git.netsurf-browser.org/netsurf.git/tree/1c5a5207fb2056b58be7a27a5...
The branch, master has been updated
via 1c5a5207fb2056b58be7a27a5135f39228702260 (commit)
from 796ac470b5e86e185ebfcd9b5d3f1a8686b7662f (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commitdiff http://git.netsurf-browser.org/netsurf.git/commit/?id=1c5a5207fb2056b58be...
commit 1c5a5207fb2056b58be7a27a5135f39228702260
Author: Vincent Sanders <vince(a)kyllikki.org>
Commit: Vincent Sanders <vince(a)kyllikki.org>
fix glib resource API usage even when gresource was disabled
diff --git a/gtk/resources.c b/gtk/resources.c
index b90fdd4..e2ca72e 100644
--- a/gtk/resources.c
+++ b/gtk/resources.c
@@ -468,7 +468,9 @@ nsgdk_pixbuf_new_from_resname(const char *resname, GdkPixbuf **pixbuf_out)
break;
case NSGTK_RESOURCE_GLIB:
+#ifdef WITH_GRESOURCE
new_pixbuf = gdk_pixbuf_new_from_resource(resource->path, &error);
+#endif
break;
case NSGTK_RESOURCE_INLINE:
@@ -540,6 +542,7 @@ nsgtk_data_from_resname(const char *resname,
const uint8_t ** data_out,
size_t *data_size_out)
{
+#ifdef WITH_GRESOURCE
struct nsgtk_resource_s *resource;
GBytes *data;
const gchar *buffer;
@@ -564,6 +567,12 @@ nsgtk_data_from_resname(const char *resname,
*data_size_out = (size_t)buffer_length;
return NSERROR_OK;
+#else
+ /** \todo consider adding compiled inline resources for things
+ * other than pixbufs.
+ */
+ return NSERROR_NOT_FOUND;
+#endif
}
/* exported interface documented in gtk/resources.h */
-----------------------------------------------------------------------
Summary of changes:
gtk/resources.c | 9 +++++++++
1 file changed, 9 insertions(+)
diff --git a/gtk/resources.c b/gtk/resources.c
index b90fdd4..e2ca72e 100644
--- a/gtk/resources.c
+++ b/gtk/resources.c
@@ -468,7 +468,9 @@ nsgdk_pixbuf_new_from_resname(const char *resname, GdkPixbuf **pixbuf_out)
break;
case NSGTK_RESOURCE_GLIB:
+#ifdef WITH_GRESOURCE
new_pixbuf = gdk_pixbuf_new_from_resource(resource->path, &error);
+#endif
break;
case NSGTK_RESOURCE_INLINE:
@@ -540,6 +542,7 @@ nsgtk_data_from_resname(const char *resname,
const uint8_t ** data_out,
size_t *data_size_out)
{
+#ifdef WITH_GRESOURCE
struct nsgtk_resource_s *resource;
GBytes *data;
const gchar *buffer;
@@ -564,6 +567,12 @@ nsgtk_data_from_resname(const char *resname,
*data_size_out = (size_t)buffer_length;
return NSERROR_OK;
+#else
+ /** \todo consider adding compiled inline resources for things
+ * other than pixbufs.
+ */
+ return NSERROR_NOT_FOUND;
+#endif
}
/* exported interface documented in gtk/resources.h */
--
NetSurf Browser
8 years, 3 months
- 1
- 0
netsurf: branch master updated. release/3.3-192-g796ac47
by NetSurf Browser Project
Gitweb links:
...log http://git.netsurf-browser.org/netsurf.git/shortlog/796ac470b5e86e185ebfc...
...commit http://git.netsurf-browser.org/netsurf.git/commit/796ac470b5e86e185ebfcd9...
...tree http://git.netsurf-browser.org/netsurf.git/tree/796ac470b5e86e185ebfcd9b5...
The branch, master has been updated
via 796ac470b5e86e185ebfcd9b5d3f1a8686b7662f (commit)
from 822e3a8fd05466df1ddd9450374e8d0aaeb7f272 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commitdiff http://git.netsurf-browser.org/netsurf.git/commit/?id=796ac470b5e86e185eb...
commit 796ac470b5e86e185ebfcd9b5d3f1a8686b7662f
Author: Vincent Sanders <vince(a)kyllikki.org>
Commit: Vincent Sanders <vince(a)kyllikki.org>
Improve resource code to not try and use g_resource calls when disabled.
diff --git a/gtk/resources.c b/gtk/resources.c
index 0c8c192..b90fdd4 100644
--- a/gtk/resources.c
+++ b/gtk/resources.c
@@ -256,12 +256,15 @@ static nserror
init_direct_resource(char **respath, struct nsgtk_resource_s *resource)
{
nserror res;
- GBytes *data;
res = init_resource(respath, resource);
+
+#ifdef WITH_GRESOURCE
if ((res == NSERROR_OK) &&
(resource->type == NSGTK_RESOURCE_GLIB)) {
/* found gresource we can convert */
+ GBytes *data;
+
data = g_resources_lookup_data(resource->path,
G_RESOURCE_LOOKUP_FLAGS_NONE,
NULL);
@@ -270,6 +273,7 @@ init_direct_resource(char **respath, struct nsgtk_resource_s *resource)
resource->path = (char *)data;
}
}
+#endif
return res;
}
-----------------------------------------------------------------------
Summary of changes:
gtk/resources.c | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/gtk/resources.c b/gtk/resources.c
index 0c8c192..b90fdd4 100644
--- a/gtk/resources.c
+++ b/gtk/resources.c
@@ -256,12 +256,15 @@ static nserror
init_direct_resource(char **respath, struct nsgtk_resource_s *resource)
{
nserror res;
- GBytes *data;
res = init_resource(respath, resource);
+
+#ifdef WITH_GRESOURCE
if ((res == NSERROR_OK) &&
(resource->type == NSGTK_RESOURCE_GLIB)) {
/* found gresource we can convert */
+ GBytes *data;
+
data = g_resources_lookup_data(resource->path,
G_RESOURCE_LOOKUP_FLAGS_NONE,
NULL);
@@ -270,6 +273,7 @@ init_direct_resource(char **respath, struct nsgtk_resource_s *resource)
resource->path = (char *)data;
}
}
+#endif
return res;
}
--
NetSurf Browser
8 years, 3 months
- 1
- 0
packaging/debian: branch squeeze updated. 0c3ed81bfee28fe50e63ef24d3b6ed03d08ceddd
by NetSurf Browser Project
Gitweb links:
...log http://git.netsurf-browser.org/packaging/debian.git/shortlog/0c3ed81bfee2...
...commit http://git.netsurf-browser.org/packaging/debian.git/commit/0c3ed81bfee28f...
...tree http://git.netsurf-browser.org/packaging/debian.git/tree/0c3ed81bfee28fe5...
The branch, squeeze has been updated
via 0c3ed81bfee28fe50e63ef24d3b6ed03d08ceddd (commit)
from 1dffaebd6e13d9c4d1da2d5dea6a6edf9fc17e54 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commitdiff http://git.netsurf-browser.org/packaging/debian.git/commit/?id=0c3ed81bfe...
commit 0c3ed81bfee28fe50e63ef24d3b6ed03d08ceddd
Author: Vincent Sanders <vince(a)kyllikki.org>
Commit: Vincent Sanders <vince(a)kyllikki.org>
Fix missing and changed package names
diff --git a/control b/control
index 7e339e7..12d2c39 100644
--- a/control
+++ b/control
@@ -2,7 +2,7 @@ Source: netsurf
Section: web
Priority: extra
Maintainer: Vincent Sanders <vince(a)debian.org>
-Build-Depends: debhelper (>= 8~), libcurl4-openssl-dev, libpng-dev, libgtk2.0-dev, flex, bison, libhtml-parser-perl, libmozjs-dev [!s390x], librsvg2-dev, libjpeg-dev, imagemagick, libfreetype6-dev, libvncserver-dev, libsdl1.2-dev, libxcb1-dev, libxcb-icccm4-dev, libxcb-image0-dev, libxcb-keysyms1-dev, libxcb-util0-dev, libssl-dev, gperf
+Build-Depends: debhelper (>= 8~), libcurl4-openssl-dev, libpng-dev, libgtk2.0-dev, flex, bison, libhtml-parser-perl, libmozjs-dev [!s390x], librsvg2-dev, libjpeg-dev, imagemagick, libfreetype6-dev, libvncserver-dev, libsdl1.2-dev, libxcb1-dev, libxcb-icccm1-dev, libxcb-image0-dev, libxcb-keysyms1-dev, libxcb-aux0-dev, libssl-dev, gperf
Standards-Version: 3.9.0
Homepage: http://www.netsurf-browser.org
Vcs-Browser: http://source.netsurf-browser.org/
-----------------------------------------------------------------------
Summary of changes:
control | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/control b/control
index 7e339e7..12d2c39 100644
--- a/control
+++ b/control
@@ -2,7 +2,7 @@ Source: netsurf
Section: web
Priority: extra
Maintainer: Vincent Sanders <vince(a)debian.org>
-Build-Depends: debhelper (>= 8~), libcurl4-openssl-dev, libpng-dev, libgtk2.0-dev, flex, bison, libhtml-parser-perl, libmozjs-dev [!s390x], librsvg2-dev, libjpeg-dev, imagemagick, libfreetype6-dev, libvncserver-dev, libsdl1.2-dev, libxcb1-dev, libxcb-icccm4-dev, libxcb-image0-dev, libxcb-keysyms1-dev, libxcb-util0-dev, libssl-dev, gperf
+Build-Depends: debhelper (>= 8~), libcurl4-openssl-dev, libpng-dev, libgtk2.0-dev, flex, bison, libhtml-parser-perl, libmozjs-dev [!s390x], librsvg2-dev, libjpeg-dev, imagemagick, libfreetype6-dev, libvncserver-dev, libsdl1.2-dev, libxcb1-dev, libxcb-icccm1-dev, libxcb-image0-dev, libxcb-keysyms1-dev, libxcb-aux0-dev, libssl-dev, gperf
Standards-Version: 3.9.0
Homepage: http://www.netsurf-browser.org
Vcs-Browser: http://source.netsurf-browser.org/
--
Debian Packaging for NetSurf
8 years, 3 months
- 1
- 0
packaging/debian: branch squeeze created. 1dffaebd6e13d9c4d1da2d5dea6a6edf9fc17e54
by NetSurf Browser Project
Gitweb links:
...log http://git.netsurf-browser.org/packaging/debian.git/shortlog/1dffaebd6e13...
...commit http://git.netsurf-browser.org/packaging/debian.git/commit/1dffaebd6e13d9...
...tree http://git.netsurf-browser.org/packaging/debian.git/tree/1dffaebd6e13d9c4...
The branch, squeeze has been created
at 1dffaebd6e13d9c4d1da2d5dea6a6edf9fc17e54 (commit)
- Log -----------------------------------------------------------------
commitdiff http://git.netsurf-browser.org/packaging/debian.git/commit/?id=1dffaebd6e...
commit 1dffaebd6e13d9c4d1da2d5dea6a6edf9fc17e54
Author: Vincent Sanders <vince(a)kyllikki.org>
Commit: Vincent Sanders <vince(a)kyllikki.org>
Update packaging to adapt to squeeze
diff --git a/compat b/compat
index ec63514..45a4fb7 100644
--- a/compat
+++ b/compat
@@ -1 +1 @@
-9
+8
diff --git a/control b/control
index a525ebe..7e339e7 100644
--- a/control
+++ b/control
@@ -2,8 +2,8 @@ Source: netsurf
Section: web
Priority: extra
Maintainer: Vincent Sanders <vince(a)debian.org>
-Build-Depends: debhelper (>= 9~), libcurl3-dev, libpng-dev, libgtk2.0-dev, flex, bison, libhtml-parser-perl, libmozjs185-dev [!s390x], librsvg2-dev, libjpeg-dev, imagemagick, libfreetype6-dev, libvncserver-dev, libsdl1.2-dev, libxcb1-dev, libxcb-icccm4-dev, libxcb-image0-dev, libxcb-keysyms1-dev, libxcb-util0-dev, libssl-dev, gperf
-Standards-Version: 3.9.6
+Build-Depends: debhelper (>= 8~), libcurl4-openssl-dev, libpng-dev, libgtk2.0-dev, flex, bison, libhtml-parser-perl, libmozjs-dev [!s390x], librsvg2-dev, libjpeg-dev, imagemagick, libfreetype6-dev, libvncserver-dev, libsdl1.2-dev, libxcb1-dev, libxcb-icccm4-dev, libxcb-image0-dev, libxcb-keysyms1-dev, libxcb-util0-dev, libssl-dev, gperf
+Standards-Version: 3.9.0
Homepage: http://www.netsurf-browser.org
Vcs-Browser: http://source.netsurf-browser.org/
Vcs-Git: git://git.netsurf-browser.org/netsurf-all.git
-----------------------------------------------------------------------
--
Debian Packaging for NetSurf
8 years, 3 months
- 1
- 0
packaging/debian: branch master updated. d3ed16b1c909fc4f3d2232f98bedcdbb148e10e2
by NetSurf Browser Project
Gitweb links:
...log http://git.netsurf-browser.org/packaging/debian.git/shortlog/d3ed16b1c909...
...commit http://git.netsurf-browser.org/packaging/debian.git/commit/d3ed16b1c909fc...
...tree http://git.netsurf-browser.org/packaging/debian.git/tree/d3ed16b1c909fc4f...
The branch, master has been updated
via d3ed16b1c909fc4f3d2232f98bedcdbb148e10e2 (commit)
from bdf8036819ef1cf72ac7bf3b0500078c6930bf30 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commitdiff http://git.netsurf-browser.org/packaging/debian.git/commit/?id=d3ed16b1c9...
commit d3ed16b1c909fc4f3d2232f98bedcdbb148e10e2
Author: Vincent Sanders <vince(a)kyllikki.org>
Commit: Vincent Sanders <vince(a)kyllikki.org>
copyright continuation lines missing a dot
diff --git a/copyright b/copyright
index 68a6f81..6d459c1 100644
--- a/copyright
+++ b/copyright
@@ -211,7 +211,7 @@ License: Unicode
documentation, and (c) there is clear notice in each modified Data File or
in the Software as well as in the documentation associated with the Data
File(s) or Software that the data or software has been modified.
-
+ .
THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY
KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF
@@ -221,7 +221,7 @@ License: Unicode
USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
PERFORMANCE OF THE DATA FILES OR SOFTWARE.
-
+ .
Except as contained in this notice, the name of a copyright holder shall
not be used in advertising or otherwise to promote the sale, use or other
dealings in these Data Files or Software without prior written
-----------------------------------------------------------------------
Summary of changes:
copyright | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/copyright b/copyright
index 68a6f81..6d459c1 100644
--- a/copyright
+++ b/copyright
@@ -211,7 +211,7 @@ License: Unicode
documentation, and (c) there is clear notice in each modified Data File or
in the Software as well as in the documentation associated with the Data
File(s) or Software that the data or software has been modified.
-
+ .
THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY
KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF
@@ -221,7 +221,7 @@ License: Unicode
USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
PERFORMANCE OF THE DATA FILES OR SOFTWARE.
-
+ .
Except as contained in this notice, the name of a copyright holder shall
not be used in advertising or otherwise to promote the sale, use or other
dealings in these Data Files or Software without prior written
--
Debian Packaging for NetSurf
8 years, 3 months
- 1
- 0