2013-05-31 13:08:59 +04:00
|
|
|
/*
|
|
|
|
* Copyright 2012 - 2013 Michael Drake <tlsa@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/>.
|
|
|
|
*/
|
|
|
|
|
|
|
|
|
|
|
|
#include <stdlib.h>
|
2014-07-17 03:18:44 +04:00
|
|
|
#include <string.h>
|
2016-06-14 01:34:45 +03:00
|
|
|
#include <time.h>
|
2013-05-31 13:08:59 +04:00
|
|
|
|
|
|
|
#include "utils/messages.h"
|
|
|
|
#include "utils/utils.h"
|
2013-08-28 14:43:34 +04:00
|
|
|
#include "utils/utf8.h"
|
|
|
|
#include "utils/libdom.h"
|
2013-05-31 13:08:59 +04:00
|
|
|
#include "utils/log.h"
|
2016-06-14 01:34:45 +03:00
|
|
|
#include "utils/nsurl.h"
|
2014-05-18 21:51:18 +04:00
|
|
|
#include "content/urldb.h"
|
|
|
|
|
|
|
|
#include "desktop/global_history.h"
|
|
|
|
#include "desktop/treeview.h"
|
2016-05-30 19:32:57 +03:00
|
|
|
#include "netsurf/browser_window.h"
|
2013-05-31 13:08:59 +04:00
|
|
|
|
|
|
|
#define N_DAYS 28
|
|
|
|
#define N_SEC_PER_DAY (60 * 60 * 24)
|
|
|
|
|
|
|
|
enum global_history_folders {
|
|
|
|
GH_TODAY = 0,
|
|
|
|
GH_YESTERDAY,
|
|
|
|
GH_2_DAYS_AGO,
|
|
|
|
GH_3_DAYS_AGO,
|
|
|
|
GH_4_DAYS_AGO,
|
|
|
|
GH_5_DAYS_AGO,
|
|
|
|
GH_6_DAYS_AGO,
|
|
|
|
GH_LAST_WEEK,
|
|
|
|
GH_2_WEEKS_AGO,
|
|
|
|
GH_3_WEEKS_AGO,
|
|
|
|
GH_N_FOLDERS
|
|
|
|
};
|
|
|
|
|
2013-07-25 02:03:16 +04:00
|
|
|
enum global_history_fields {
|
|
|
|
GH_TITLE,
|
|
|
|
GH_URL,
|
|
|
|
GH_LAST_VISIT,
|
|
|
|
GH_VISITS,
|
|
|
|
GH_PERIOD,
|
|
|
|
N_FIELDS
|
|
|
|
};
|
|
|
|
|
2013-05-31 13:08:59 +04:00
|
|
|
struct global_history_folder {
|
2013-07-03 16:48:53 +04:00
|
|
|
treeview_node *folder;
|
2013-05-31 13:08:59 +04:00
|
|
|
struct treeview_field_data data;
|
|
|
|
};
|
|
|
|
|
|
|
|
struct global_history_ctx {
|
2013-07-03 16:48:53 +04:00
|
|
|
treeview *tree;
|
2013-05-31 13:08:59 +04:00
|
|
|
struct treeview_field_desc fields[N_FIELDS];
|
|
|
|
struct global_history_folder folders[GH_N_FOLDERS];
|
|
|
|
time_t today;
|
|
|
|
int weekday;
|
2013-07-01 19:16:11 +04:00
|
|
|
bool built;
|
2013-05-31 13:08:59 +04:00
|
|
|
};
|
|
|
|
struct global_history_ctx gh_ctx;
|
|
|
|
|
|
|
|
struct global_history_entry {
|
2013-07-16 00:51:45 +04:00
|
|
|
bool user_delete;
|
|
|
|
|
2013-06-03 20:06:47 +04:00
|
|
|
int slot;
|
2013-05-31 13:08:59 +04:00
|
|
|
nsurl *url;
|
|
|
|
time_t t;
|
2013-07-03 16:48:53 +04:00
|
|
|
treeview_node *entry;
|
2013-05-31 13:08:59 +04:00
|
|
|
struct global_history_entry *next;
|
|
|
|
struct global_history_entry *prev;
|
|
|
|
|
|
|
|
struct treeview_field_data data[N_FIELDS - 1];
|
|
|
|
};
|
|
|
|
struct global_history_entry *gh_list[N_DAYS];
|
|
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Find an entry in the global history
|
|
|
|
*
|
|
|
|
* \param url The URL to find
|
2013-06-18 21:54:06 +04:00
|
|
|
* \return Pointer to history entry, or NULL if not found
|
2013-05-31 13:08:59 +04:00
|
|
|
*/
|
2013-06-03 20:06:47 +04:00
|
|
|
static struct global_history_entry *global_history_find(nsurl *url)
|
2013-05-31 13:08:59 +04:00
|
|
|
{
|
|
|
|
int i;
|
|
|
|
struct global_history_entry *e;
|
|
|
|
|
|
|
|
for (i = 0; i < N_DAYS; i++) {
|
|
|
|
e = gh_list[i];
|
|
|
|
|
|
|
|
while (e != NULL) {
|
|
|
|
if (nsurl_compare(e->url, url,
|
|
|
|
NSURL_COMPLETE) == true) {
|
2013-06-18 21:54:06 +04:00
|
|
|
/* Got a match */
|
2013-05-31 13:08:59 +04:00
|
|
|
return e;
|
|
|
|
}
|
|
|
|
e = e->next;
|
|
|
|
}
|
|
|
|
|
|
|
|
}
|
2013-06-18 21:54:06 +04:00
|
|
|
|
|
|
|
/* No match found */
|
2013-05-31 13:08:59 +04:00
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
2013-06-18 22:26:49 +04:00
|
|
|
|
|
|
|
/**
|
|
|
|
* Initialise the treeview directories
|
|
|
|
*
|
2013-06-18 22:53:57 +04:00
|
|
|
* \param f Ident for folder to create
|
|
|
|
* \return NSERROR_OK on success, appropriate error otherwise
|
2013-06-18 22:26:49 +04:00
|
|
|
*/
|
|
|
|
static nserror global_history_create_dir(enum global_history_folders f)
|
|
|
|
{
|
|
|
|
nserror err;
|
2013-07-03 16:48:53 +04:00
|
|
|
treeview_node *relation = NULL;
|
2013-06-18 22:26:49 +04:00
|
|
|
enum treeview_relationship rel = TREE_REL_FIRST_CHILD;
|
|
|
|
const char *label;
|
|
|
|
int i;
|
|
|
|
|
|
|
|
switch (f) {
|
|
|
|
case GH_TODAY:
|
|
|
|
label = "DateToday";
|
|
|
|
break;
|
2015-05-03 19:21:12 +03:00
|
|
|
|
2013-06-18 22:26:49 +04:00
|
|
|
case GH_YESTERDAY:
|
|
|
|
label = "DateYesterday";
|
|
|
|
break;
|
2015-05-03 19:21:12 +03:00
|
|
|
|
2013-06-18 22:26:49 +04:00
|
|
|
case GH_2_DAYS_AGO:
|
|
|
|
label = "Date2Days";
|
|
|
|
break;
|
2015-05-03 19:21:12 +03:00
|
|
|
|
2013-06-18 22:26:49 +04:00
|
|
|
case GH_3_DAYS_AGO:
|
|
|
|
label = "Date3Days";
|
|
|
|
break;
|
2015-05-03 19:21:12 +03:00
|
|
|
|
2013-06-18 22:26:49 +04:00
|
|
|
case GH_4_DAYS_AGO:
|
|
|
|
label = "Date4Days";
|
|
|
|
break;
|
2015-05-03 19:21:12 +03:00
|
|
|
|
2013-06-18 22:26:49 +04:00
|
|
|
case GH_5_DAYS_AGO:
|
|
|
|
label = "Date5Days";
|
|
|
|
break;
|
2015-05-03 19:21:12 +03:00
|
|
|
|
2013-06-18 22:26:49 +04:00
|
|
|
case GH_6_DAYS_AGO:
|
|
|
|
label = "Date6Days";
|
|
|
|
break;
|
2015-05-03 19:21:12 +03:00
|
|
|
|
2013-06-18 22:26:49 +04:00
|
|
|
case GH_LAST_WEEK:
|
|
|
|
label = "Date1Week";
|
|
|
|
break;
|
2015-05-03 19:21:12 +03:00
|
|
|
|
2013-06-18 22:26:49 +04:00
|
|
|
case GH_2_WEEKS_AGO:
|
|
|
|
label = "Date2Week";
|
|
|
|
break;
|
2015-05-03 19:21:12 +03:00
|
|
|
|
2013-06-18 22:26:49 +04:00
|
|
|
case GH_3_WEEKS_AGO:
|
|
|
|
label = "Date3Week";
|
|
|
|
break;
|
2015-05-03 19:21:12 +03:00
|
|
|
|
2013-06-18 22:26:49 +04:00
|
|
|
default:
|
2015-05-03 19:21:12 +03:00
|
|
|
return NSERROR_BAD_PARAMETER;
|
2013-06-18 22:26:49 +04:00
|
|
|
}
|
|
|
|
|
|
|
|
label = messages_get(label);
|
|
|
|
|
|
|
|
for (i = f - 1; i >= 0; i--) {
|
|
|
|
if (gh_ctx.folders[i].folder != NULL) {
|
|
|
|
relation = gh_ctx.folders[i].folder;
|
|
|
|
rel = TREE_REL_NEXT_SIBLING;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
gh_ctx.folders[f].data.field = gh_ctx.fields[N_FIELDS - 1].field;
|
|
|
|
gh_ctx.folders[f].data.value = label;
|
|
|
|
gh_ctx.folders[f].data.value_len = strlen(label);
|
|
|
|
err = treeview_create_node_folder(gh_ctx.tree,
|
|
|
|
&gh_ctx.folders[f].folder,
|
|
|
|
relation, rel,
|
|
|
|
&gh_ctx.folders[f].data,
|
2013-07-01 19:16:11 +04:00
|
|
|
&gh_ctx.folders[f],
|
2013-08-30 15:51:40 +04:00
|
|
|
gh_ctx.built ? TREE_OPTION_NONE :
|
|
|
|
TREE_OPTION_SUPPRESS_RESIZE |
|
|
|
|
TREE_OPTION_SUPPRESS_REDRAW);
|
2013-06-18 22:26:49 +04:00
|
|
|
|
|
|
|
return err;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2013-06-18 21:54:06 +04:00
|
|
|
/**
|
|
|
|
* Get the treeview folder for history entires in a particular slot
|
|
|
|
*
|
|
|
|
* \param parent Updated to parent folder.
|
|
|
|
* \param slot Global history slot of entry we want folder node for
|
|
|
|
* \return NSERROR_OK on success, appropriate error otherwise
|
|
|
|
*/
|
2013-05-31 13:08:59 +04:00
|
|
|
static inline nserror global_history_get_parent_treeview_node(
|
2013-07-03 16:48:53 +04:00
|
|
|
treeview_node **parent, int slot)
|
2013-05-31 13:08:59 +04:00
|
|
|
{
|
|
|
|
int folder_index;
|
|
|
|
struct global_history_folder *f;
|
2013-06-18 22:26:49 +04:00
|
|
|
nserror err;
|
2013-05-31 13:08:59 +04:00
|
|
|
|
|
|
|
if (slot < 7) {
|
|
|
|
folder_index = slot;
|
|
|
|
|
|
|
|
} else if (slot < 14) {
|
|
|
|
folder_index = GH_LAST_WEEK;
|
|
|
|
|
|
|
|
} else if (slot < 21) {
|
|
|
|
folder_index = GH_2_WEEKS_AGO;
|
|
|
|
|
|
|
|
} else if (slot < N_DAYS) {
|
|
|
|
folder_index = GH_3_WEEKS_AGO;
|
|
|
|
|
|
|
|
} else {
|
|
|
|
/* Slot value is invalid */
|
|
|
|
return NSERROR_BAD_PARAMETER;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Get the folder */
|
|
|
|
f = &(gh_ctx.folders[folder_index]);
|
|
|
|
|
2013-06-18 22:26:49 +04:00
|
|
|
if (f->folder == NULL) {
|
|
|
|
err = global_history_create_dir(folder_index);
|
|
|
|
if (err != NSERROR_OK) {
|
|
|
|
*parent = NULL;
|
|
|
|
return err;
|
|
|
|
}
|
|
|
|
}
|
2013-06-18 21:54:06 +04:00
|
|
|
|
2013-05-31 13:08:59 +04:00
|
|
|
/* Return the parent treeview folder */
|
|
|
|
*parent = f->folder;
|
|
|
|
return NSERROR_OK;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2013-06-18 22:53:57 +04:00
|
|
|
/**
|
|
|
|
* Set a global history entry's data from the url_data.
|
|
|
|
*
|
|
|
|
* \param e Global history entry to set up
|
2014-11-10 00:49:33 +03:00
|
|
|
* \param data Data associated with entry's URL
|
2013-06-18 22:53:57 +04:00
|
|
|
* \return NSERROR_OK on success, appropriate error otherwise
|
|
|
|
*/
|
2013-05-31 13:08:59 +04:00
|
|
|
static nserror global_history_create_treeview_field_data(
|
|
|
|
struct global_history_entry *e,
|
|
|
|
const struct url_data *data)
|
|
|
|
{
|
2013-11-11 18:32:07 +04:00
|
|
|
const char *title = (data->title != NULL) ?
|
|
|
|
data->title : messages_get("NoTitle");
|
2013-06-05 00:53:28 +04:00
|
|
|
char buffer[16];
|
|
|
|
const char *last_visited;
|
|
|
|
char *last_visited2;
|
|
|
|
int len;
|
2013-06-04 18:31:29 +04:00
|
|
|
|
2013-07-25 02:03:16 +04:00
|
|
|
e->data[GH_TITLE].field = gh_ctx.fields[GH_TITLE].field;
|
|
|
|
e->data[GH_TITLE].value = strdup(title);
|
|
|
|
e->data[GH_TITLE].value_len = (e->data[GH_TITLE].value != NULL) ?
|
|
|
|
strlen(title) : 0;
|
2013-05-31 13:08:59 +04:00
|
|
|
|
2013-07-25 02:03:16 +04:00
|
|
|
e->data[GH_URL].field = gh_ctx.fields[GH_URL].field;
|
|
|
|
e->data[GH_URL].value = nsurl_access(e->url);
|
|
|
|
e->data[GH_URL].value_len = nsurl_length(e->url);
|
2013-05-31 13:08:59 +04:00
|
|
|
|
2013-06-05 00:53:28 +04:00
|
|
|
last_visited = ctime(&data->last_visit);
|
|
|
|
last_visited2 = strdup(last_visited);
|
|
|
|
if (last_visited2 != NULL) {
|
|
|
|
assert(last_visited2[24] == '\n');
|
|
|
|
last_visited2[24] = '\0';
|
|
|
|
}
|
|
|
|
|
2013-07-25 02:03:16 +04:00
|
|
|
e->data[GH_LAST_VISIT].field = gh_ctx.fields[GH_LAST_VISIT].field;
|
|
|
|
e->data[GH_LAST_VISIT].value = last_visited2;
|
|
|
|
e->data[GH_LAST_VISIT].value_len = (last_visited2 != NULL) ? 24 : 0;
|
2013-06-05 00:53:28 +04:00
|
|
|
|
|
|
|
len = snprintf(buffer, 16, "%u", data->visits);
|
|
|
|
if (len == 16) {
|
|
|
|
len--;
|
|
|
|
buffer[len] = '\0';
|
|
|
|
}
|
2013-05-31 13:08:59 +04:00
|
|
|
|
2013-07-25 02:03:16 +04:00
|
|
|
e->data[GH_VISITS].field = gh_ctx.fields[GH_VISITS].field;
|
|
|
|
e->data[GH_VISITS].value = strdup(buffer);
|
|
|
|
e->data[GH_VISITS].value_len = len;
|
2013-05-31 13:08:59 +04:00
|
|
|
|
|
|
|
return NSERROR_OK;
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Add a global history entry to the treeview
|
|
|
|
*
|
|
|
|
* \param e entry to add to treeview
|
|
|
|
* \param slot global history slot containing entry
|
|
|
|
* \return NSERROR_OK on success, or appropriate error otherwise
|
|
|
|
*
|
|
|
|
* It is assumed that the entry is unique (for its URL) in the global
|
|
|
|
* history table
|
|
|
|
*/
|
|
|
|
static nserror global_history_entry_insert(struct global_history_entry *e,
|
|
|
|
int slot)
|
|
|
|
{
|
|
|
|
nserror err;
|
|
|
|
|
2013-07-03 16:48:53 +04:00
|
|
|
treeview_node *parent;
|
2013-05-31 13:08:59 +04:00
|
|
|
err = global_history_get_parent_treeview_node(&parent, slot);
|
|
|
|
if (err != NSERROR_OK) {
|
|
|
|
return err;
|
|
|
|
}
|
|
|
|
|
|
|
|
err = treeview_create_node_entry(gh_ctx.tree, &(e->entry),
|
2013-07-01 19:16:11 +04:00
|
|
|
parent, TREE_REL_FIRST_CHILD, e->data, e,
|
2013-08-30 15:51:40 +04:00
|
|
|
gh_ctx.built ? TREE_OPTION_NONE :
|
|
|
|
TREE_OPTION_SUPPRESS_RESIZE |
|
|
|
|
TREE_OPTION_SUPPRESS_REDRAW);
|
2013-05-31 13:08:59 +04:00
|
|
|
if (err != NSERROR_OK) {
|
|
|
|
return err;
|
|
|
|
}
|
|
|
|
|
|
|
|
return NSERROR_OK;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2013-06-18 22:53:57 +04:00
|
|
|
/**
|
|
|
|
* Add an entry to the global history (creates the entry).
|
|
|
|
*
|
|
|
|
* If the treeview has already been created, the entry will be added to the
|
|
|
|
* treeview. Otherwise, the entry will have to be added to the treeview later.
|
|
|
|
*
|
|
|
|
* When we first create the global history we create it without the treeview, to
|
|
|
|
* simplfy sorting the entries.
|
|
|
|
*
|
|
|
|
* \param url URL for entry to add to history
|
2013-06-18 23:10:08 +04:00
|
|
|
* \param slot Global history slot to contain history entry
|
2013-06-18 22:53:57 +04:00
|
|
|
* \param data URL data for the entry
|
|
|
|
* \param got_treeview Whether the treeview has been created already
|
|
|
|
* \return NSERROR_OK on success, or appropriate error otherwise
|
|
|
|
*/
|
2013-05-31 13:08:59 +04:00
|
|
|
static nserror global_history_add_entry_internal(nsurl *url, int slot,
|
|
|
|
const struct url_data *data, bool got_treeview)
|
|
|
|
{
|
|
|
|
nserror err;
|
|
|
|
struct global_history_entry *e;
|
|
|
|
|
|
|
|
/* Create new local history entry */
|
|
|
|
e = malloc(sizeof(struct global_history_entry));
|
|
|
|
if (e == NULL) {
|
2013-07-25 14:42:04 +04:00
|
|
|
return NSERROR_NOMEM;
|
2013-05-31 13:08:59 +04:00
|
|
|
}
|
|
|
|
|
2013-07-16 00:51:45 +04:00
|
|
|
e->user_delete = false;
|
2013-06-03 20:06:47 +04:00
|
|
|
e->slot = slot;
|
2013-05-31 13:08:59 +04:00
|
|
|
e->url = nsurl_ref(url);
|
|
|
|
e->t = data->last_visit;
|
|
|
|
e->entry = NULL;
|
|
|
|
e->next = NULL;
|
|
|
|
e->prev = NULL;
|
|
|
|
|
|
|
|
err = global_history_create_treeview_field_data(e, data);
|
|
|
|
if (err != NSERROR_OK) {
|
|
|
|
return err;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (gh_list[slot] == NULL) {
|
|
|
|
/* list empty */
|
|
|
|
gh_list[slot] = e;
|
|
|
|
|
|
|
|
} else if (gh_list[slot]->t < e->t) {
|
|
|
|
/* Insert at list head */
|
|
|
|
e->next = gh_list[slot];
|
2013-06-03 20:06:47 +04:00
|
|
|
gh_list[slot]->prev = e;
|
2013-05-31 13:08:59 +04:00
|
|
|
gh_list[slot] = e;
|
|
|
|
} else {
|
|
|
|
struct global_history_entry *prev = gh_list[slot];
|
|
|
|
struct global_history_entry *curr = prev->next;
|
|
|
|
while (curr != NULL) {
|
|
|
|
if (curr->t < e->t) {
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
prev = curr;
|
|
|
|
curr = curr->next;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* insert after prev */
|
|
|
|
e->next = curr;
|
|
|
|
e->prev = prev;
|
|
|
|
prev->next = e;
|
|
|
|
|
|
|
|
if (curr != NULL)
|
|
|
|
curr->prev = e;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (got_treeview) {
|
|
|
|
err = global_history_entry_insert(e, slot);
|
|
|
|
if (err != NSERROR_OK) {
|
|
|
|
return err;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
return NSERROR_OK;
|
|
|
|
}
|
|
|
|
|
2013-06-18 21:54:06 +04:00
|
|
|
|
|
|
|
/**
|
|
|
|
* Delete a global history entry
|
|
|
|
*
|
|
|
|
* This does not delete the treeview node, rather it should only be called from
|
|
|
|
* the treeview node delete event message.
|
|
|
|
*
|
|
|
|
* \param e Entry to delete
|
|
|
|
*/
|
2013-05-31 13:08:59 +04:00
|
|
|
static void global_history_delete_entry_internal(
|
2013-06-03 20:06:47 +04:00
|
|
|
struct global_history_entry *e)
|
2013-05-31 13:08:59 +04:00
|
|
|
{
|
2013-06-18 21:54:06 +04:00
|
|
|
assert(e != NULL);
|
|
|
|
assert(e->entry == NULL);
|
|
|
|
|
2013-06-03 20:06:47 +04:00
|
|
|
/* Unlink */
|
|
|
|
if (gh_list[e->slot] == e) {
|
2013-05-31 13:08:59 +04:00
|
|
|
/* e is first entry */
|
2013-06-03 20:06:47 +04:00
|
|
|
gh_list[e->slot] = e->next;
|
2013-05-31 13:08:59 +04:00
|
|
|
|
|
|
|
if (e->next != NULL)
|
|
|
|
e->next->prev = NULL;
|
|
|
|
|
|
|
|
} else if (e->next == NULL) {
|
|
|
|
/* e is last entry */
|
|
|
|
e->prev->next = NULL;
|
|
|
|
|
|
|
|
} else {
|
|
|
|
/* e has an entry before and after */
|
|
|
|
e->prev->next = e->next;
|
|
|
|
e->next->prev = e->prev;
|
|
|
|
}
|
|
|
|
|
2013-07-16 00:51:45 +04:00
|
|
|
if (e->user_delete) {
|
|
|
|
/* User requested delete, so delete from urldb too. */
|
|
|
|
urldb_reset_url_visit_data(e->url);
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Destroy fields */
|
2013-07-25 02:03:16 +04:00
|
|
|
free((void *)e->data[GH_TITLE].value); /* Eww */
|
|
|
|
free((void *)e->data[GH_LAST_VISIT].value); /* Eww */
|
|
|
|
free((void *)e->data[GH_VISITS].value); /* Eww */
|
2013-06-03 20:06:47 +04:00
|
|
|
nsurl_unref(e->url);
|
2013-07-16 00:51:45 +04:00
|
|
|
|
|
|
|
/* Destroy entry */
|
2013-05-31 13:08:59 +04:00
|
|
|
free(e);
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Internal routine to actually perform global history addition
|
|
|
|
*
|
|
|
|
* \param url The URL to add
|
|
|
|
* \param data URL data associated with URL
|
|
|
|
* \return true (for urldb_iterate_entries)
|
|
|
|
*/
|
|
|
|
static bool global_history_add_entry(nsurl *url,
|
|
|
|
const struct url_data *data)
|
|
|
|
{
|
|
|
|
int slot;
|
|
|
|
time_t visit_date;
|
|
|
|
time_t earliest_date = gh_ctx.today - (N_DAYS - 1) * N_SEC_PER_DAY;
|
|
|
|
bool got_treeview = gh_ctx.tree != NULL;
|
|
|
|
|
|
|
|
assert((url != NULL) && (data != NULL));
|
|
|
|
|
|
|
|
visit_date = data->last_visit;
|
|
|
|
|
|
|
|
/* Find day array slot for entry */
|
|
|
|
if (visit_date >= gh_ctx.today) {
|
|
|
|
slot = 0;
|
|
|
|
} else if (visit_date >= earliest_date) {
|
|
|
|
slot = (gh_ctx.today - visit_date) / N_SEC_PER_DAY + 1;
|
|
|
|
} else {
|
|
|
|
/* too old */
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (got_treeview == true) {
|
|
|
|
/* The treeview for global history already exists */
|
2013-07-16 16:13:33 +04:00
|
|
|
struct global_history_entry *e;
|
2013-05-31 13:08:59 +04:00
|
|
|
|
2013-07-16 16:13:33 +04:00
|
|
|
/* Delete any existing entry for this URL */
|
2013-06-03 20:06:47 +04:00
|
|
|
e = global_history_find(url);
|
2013-05-31 13:08:59 +04:00
|
|
|
if (e != NULL) {
|
2013-08-30 15:51:40 +04:00
|
|
|
treeview_delete_node(gh_ctx.tree, e->entry,
|
|
|
|
TREE_OPTION_SUPPRESS_REDRAW |
|
|
|
|
TREE_OPTION_SUPPRESS_RESIZE);
|
2013-05-31 13:08:59 +04:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if (global_history_add_entry_internal(url, slot, data,
|
|
|
|
got_treeview) != NSERROR_OK) {
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Initialise the treeview entry feilds
|
|
|
|
*
|
2013-08-14 15:11:20 +04:00
|
|
|
* \return NSERROR_OK on success, or appropriate error otherwise
|
2013-05-31 13:08:59 +04:00
|
|
|
*/
|
|
|
|
static nserror global_history_initialise_entry_fields(void)
|
|
|
|
{
|
|
|
|
int i;
|
2013-07-01 23:05:09 +04:00
|
|
|
const char *label;
|
2013-05-31 13:08:59 +04:00
|
|
|
|
|
|
|
for (i = 0; i < N_FIELDS; i++)
|
|
|
|
gh_ctx.fields[i].field = NULL;
|
|
|
|
|
2013-07-25 02:03:16 +04:00
|
|
|
gh_ctx.fields[GH_TITLE].flags = TREE_FLAG_DEFAULT;
|
2013-07-01 23:05:09 +04:00
|
|
|
label = "TreeviewLabelTitle";
|
|
|
|
label = messages_get(label);
|
|
|
|
if (lwc_intern_string(label, strlen(label),
|
2013-07-25 02:03:16 +04:00
|
|
|
&gh_ctx.fields[GH_TITLE].field) !=
|
2013-05-31 13:08:59 +04:00
|
|
|
lwc_error_ok) {
|
|
|
|
goto error;
|
|
|
|
}
|
|
|
|
|
2017-09-19 01:14:15 +03:00
|
|
|
gh_ctx.fields[GH_URL].flags =
|
|
|
|
TREE_FLAG_COPY_TEXT |
|
|
|
|
TREE_FLAG_SEARCHABLE;
|
2013-07-01 23:05:09 +04:00
|
|
|
label = "TreeviewLabelURL";
|
|
|
|
label = messages_get(label);
|
|
|
|
if (lwc_intern_string(label, strlen(label),
|
2013-07-25 02:03:16 +04:00
|
|
|
&gh_ctx.fields[GH_URL].field) !=
|
2013-05-31 13:08:59 +04:00
|
|
|
lwc_error_ok) {
|
|
|
|
goto error;
|
|
|
|
}
|
|
|
|
|
2013-07-25 02:03:16 +04:00
|
|
|
gh_ctx.fields[GH_LAST_VISIT].flags = TREE_FLAG_SHOW_NAME;
|
2013-07-01 23:05:09 +04:00
|
|
|
label = "TreeviewLabelLastVisit";
|
|
|
|
label = messages_get(label);
|
|
|
|
if (lwc_intern_string(label, strlen(label),
|
2013-07-25 02:03:16 +04:00
|
|
|
&gh_ctx.fields[GH_LAST_VISIT].field) !=
|
2013-05-31 13:08:59 +04:00
|
|
|
lwc_error_ok) {
|
|
|
|
goto error;
|
|
|
|
}
|
|
|
|
|
2013-07-25 02:03:16 +04:00
|
|
|
gh_ctx.fields[GH_VISITS].flags = TREE_FLAG_SHOW_NAME;
|
2013-07-01 23:05:09 +04:00
|
|
|
label = "TreeviewLabelVisits";
|
|
|
|
label = messages_get(label);
|
|
|
|
if (lwc_intern_string(label, strlen(label),
|
2013-07-25 02:03:16 +04:00
|
|
|
&gh_ctx.fields[GH_VISITS].field) !=
|
2013-05-31 13:08:59 +04:00
|
|
|
lwc_error_ok) {
|
|
|
|
goto error;
|
|
|
|
}
|
|
|
|
|
2013-07-25 02:03:16 +04:00
|
|
|
gh_ctx.fields[GH_PERIOD].flags = TREE_FLAG_DEFAULT;
|
2013-07-01 23:05:09 +04:00
|
|
|
label = "TreeviewLabelPeriod";
|
|
|
|
label = messages_get(label);
|
|
|
|
if (lwc_intern_string(label, strlen(label),
|
2013-07-25 02:03:16 +04:00
|
|
|
&gh_ctx.fields[GH_PERIOD].field) !=
|
2013-05-31 13:08:59 +04:00
|
|
|
lwc_error_ok) {
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
|
|
|
return NSERROR_OK;
|
|
|
|
|
|
|
|
error:
|
2013-06-03 20:06:47 +04:00
|
|
|
for (i = 0; i < N_FIELDS; i++)
|
2013-05-31 13:08:59 +04:00
|
|
|
if (gh_ctx.fields[i].field != NULL)
|
|
|
|
lwc_string_unref(gh_ctx.fields[i].field);
|
|
|
|
|
|
|
|
return NSERROR_UNKNOWN;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Initialise the time
|
|
|
|
*
|
2013-08-14 15:11:20 +04:00
|
|
|
* \return NSERROR_OK on success, or appropriate error otherwise
|
2013-05-31 13:08:59 +04:00
|
|
|
*/
|
|
|
|
static nserror global_history_initialise_time(void)
|
|
|
|
{
|
|
|
|
struct tm *full_time;
|
|
|
|
time_t t;
|
|
|
|
|
|
|
|
/* get the current time */
|
|
|
|
t = time(NULL);
|
|
|
|
if (t == -1) {
|
Use coccinelle to change logging macro calls in c files
for F in $(git ls-files '*.c');do spatch --sp-file foo.cocci --in-place ${F};done
@@ expression E; @@
-LOG(E);
+NSLOG(netsurf, INFO, E);
@@ expression E, E1; @@
-LOG(E, E1);
+NSLOG(netsurf, INFO, E, E1);
@@ expression E, E1, E2; @@
-LOG(E, E1, E2);
+NSLOG(netsurf, INFO, E, E1, E2);
@@ expression E, E1, E2, E3; @@
-LOG(E, E1, E2, E3);
+NSLOG(netsurf, INFO, E, E1, E2, E3);
@@ expression E, E1, E2, E3, E4; @@
-LOG(E, E1, E2, E3, E4);
+NSLOG(netsurf, INFO, E, E1, E2, E3, E4);
@@ expression E, E1, E2, E3, E4, E5; @@
-LOG(E, E1, E2, E3, E4, E5);
+NSLOG(netsurf, INFO, E, E1, E2, E3, E4, E5);
@@ expression E, E1, E2, E3, E4, E5, E6; @@
-LOG(E, E1, E2, E3, E4, E5, E6);
+NSLOG(netsurf, INFO, E, E1, E2, E3, E4, E5, E6);
@@ expression E, E1, E2, E3, E4, E5, E6, E7; @@
-LOG(E, E1, E2, E3, E4, E5, E6, E7);
+NSLOG(netsurf, INFO, E, E1, E2, E3, E4, E5, E6, E7);
2017-09-06 20:28:12 +03:00
|
|
|
NSLOG(netsurf, INFO, "time info unaviable");
|
2013-05-31 13:08:59 +04:00
|
|
|
return NSERROR_UNKNOWN;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* get the time at the start of today */
|
|
|
|
full_time = localtime(&t);
|
|
|
|
full_time->tm_sec = 0;
|
|
|
|
full_time->tm_min = 0;
|
|
|
|
full_time->tm_hour = 0;
|
|
|
|
t = mktime(full_time);
|
|
|
|
if (t == -1) {
|
Use coccinelle to change logging macro calls in c files
for F in $(git ls-files '*.c');do spatch --sp-file foo.cocci --in-place ${F};done
@@ expression E; @@
-LOG(E);
+NSLOG(netsurf, INFO, E);
@@ expression E, E1; @@
-LOG(E, E1);
+NSLOG(netsurf, INFO, E, E1);
@@ expression E, E1, E2; @@
-LOG(E, E1, E2);
+NSLOG(netsurf, INFO, E, E1, E2);
@@ expression E, E1, E2, E3; @@
-LOG(E, E1, E2, E3);
+NSLOG(netsurf, INFO, E, E1, E2, E3);
@@ expression E, E1, E2, E3, E4; @@
-LOG(E, E1, E2, E3, E4);
+NSLOG(netsurf, INFO, E, E1, E2, E3, E4);
@@ expression E, E1, E2, E3, E4, E5; @@
-LOG(E, E1, E2, E3, E4, E5);
+NSLOG(netsurf, INFO, E, E1, E2, E3, E4, E5);
@@ expression E, E1, E2, E3, E4, E5, E6; @@
-LOG(E, E1, E2, E3, E4, E5, E6);
+NSLOG(netsurf, INFO, E, E1, E2, E3, E4, E5, E6);
@@ expression E, E1, E2, E3, E4, E5, E6, E7; @@
-LOG(E, E1, E2, E3, E4, E5, E6, E7);
+NSLOG(netsurf, INFO, E, E1, E2, E3, E4, E5, E6, E7);
2017-09-06 20:28:12 +03:00
|
|
|
NSLOG(netsurf, INFO, "mktime failed");
|
2013-05-31 13:08:59 +04:00
|
|
|
return NSERROR_UNKNOWN;
|
|
|
|
}
|
|
|
|
|
|
|
|
gh_ctx.today = t;
|
|
|
|
gh_ctx.weekday = full_time->tm_wday;
|
|
|
|
|
|
|
|
return NSERROR_OK;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Initialise the treeview entries
|
|
|
|
*
|
2013-08-14 15:11:20 +04:00
|
|
|
* \return NSERROR_OK on success, or appropriate error otherwise
|
2013-05-31 13:08:59 +04:00
|
|
|
*/
|
|
|
|
static nserror global_history_init_entries(void)
|
|
|
|
{
|
|
|
|
int i;
|
|
|
|
nserror err;
|
|
|
|
|
|
|
|
/* Itterate over all global history data, inserting it into treeview */
|
|
|
|
for (i = 0; i < N_DAYS; i++) {
|
2013-06-04 15:12:20 +04:00
|
|
|
struct global_history_entry *l = NULL;
|
2013-05-31 13:08:59 +04:00
|
|
|
struct global_history_entry *e = gh_list[i];
|
2013-06-04 15:12:20 +04:00
|
|
|
|
|
|
|
/* Insert in reverse order; find last */
|
2013-05-31 13:08:59 +04:00
|
|
|
while (e != NULL) {
|
2013-06-04 15:12:20 +04:00
|
|
|
l = e;
|
|
|
|
e = e->next;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Insert the entries into the treeview */
|
|
|
|
while (l != NULL) {
|
|
|
|
err = global_history_entry_insert(l, i);
|
2013-05-31 13:08:59 +04:00
|
|
|
if (err != NSERROR_OK) {
|
|
|
|
return err;
|
|
|
|
}
|
2013-06-04 15:12:20 +04:00
|
|
|
l = l->prev;
|
2013-05-31 13:08:59 +04:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
return NSERROR_OK;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
static nserror global_history_tree_node_folder_cb(
|
|
|
|
struct treeview_node_msg msg, void *data)
|
|
|
|
{
|
2013-07-16 16:13:33 +04:00
|
|
|
struct global_history_folder *f = data;
|
|
|
|
|
|
|
|
switch (msg.msg) {
|
|
|
|
case TREE_MSG_NODE_DELETE:
|
|
|
|
f->folder = NULL;
|
|
|
|
break;
|
|
|
|
|
|
|
|
case TREE_MSG_NODE_EDIT:
|
|
|
|
break;
|
|
|
|
|
|
|
|
case TREE_MSG_NODE_LAUNCH:
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
2013-05-31 13:08:59 +04:00
|
|
|
return NSERROR_OK;
|
|
|
|
}
|
2014-10-31 01:43:16 +03:00
|
|
|
|
|
|
|
static nserror
|
|
|
|
global_history_tree_node_entry_cb(struct treeview_node_msg msg, void *data)
|
2013-05-31 13:08:59 +04:00
|
|
|
{
|
2013-07-16 16:13:33 +04:00
|
|
|
struct global_history_entry *e = data;
|
2014-10-31 01:43:16 +03:00
|
|
|
nserror ret = NSERROR_OK;
|
2013-06-03 20:06:47 +04:00
|
|
|
|
|
|
|
switch (msg.msg) {
|
|
|
|
case TREE_MSG_NODE_DELETE:
|
2013-06-18 21:54:06 +04:00
|
|
|
e->entry = NULL;
|
2013-07-16 00:51:45 +04:00
|
|
|
e->user_delete = msg.data.delete.user;
|
2013-06-03 20:06:47 +04:00
|
|
|
global_history_delete_entry_internal(e);
|
|
|
|
break;
|
|
|
|
|
2013-06-04 18:11:24 +04:00
|
|
|
case TREE_MSG_NODE_EDIT:
|
|
|
|
break;
|
|
|
|
|
|
|
|
case TREE_MSG_NODE_LAUNCH:
|
2013-07-02 15:20:44 +04:00
|
|
|
{
|
2014-02-10 18:08:45 +04:00
|
|
|
struct browser_window *existing = NULL;
|
2014-10-31 01:43:16 +03:00
|
|
|
enum browser_window_create_flags flags = BW_CREATE_HISTORY;
|
2013-07-02 15:20:44 +04:00
|
|
|
|
2014-02-10 18:08:45 +04:00
|
|
|
/* TODO: Set existing to window that new tab appears in */
|
2013-07-02 15:20:44 +04:00
|
|
|
|
|
|
|
if (msg.data.node_launch.mouse &
|
|
|
|
(BROWSER_MOUSE_MOD_1 | BROWSER_MOUSE_MOD_2) ||
|
2014-02-10 18:08:45 +04:00
|
|
|
existing == NULL) {
|
2013-07-02 15:20:44 +04:00
|
|
|
/* Shift or Ctrl launch, open in new window rather
|
|
|
|
* than tab. */
|
2014-02-10 18:08:45 +04:00
|
|
|
/* TODO: flags ^= BW_CREATE_TAB; */
|
2013-07-02 15:20:44 +04:00
|
|
|
}
|
|
|
|
|
2014-10-31 01:43:16 +03:00
|
|
|
ret = browser_window_create(flags, e->url, NULL,
|
2014-02-10 18:08:45 +04:00
|
|
|
existing, NULL);
|
2013-07-02 15:20:44 +04:00
|
|
|
}
|
2013-06-03 20:06:47 +04:00
|
|
|
break;
|
|
|
|
}
|
2014-10-31 01:43:16 +03:00
|
|
|
return ret;
|
2013-05-31 13:08:59 +04:00
|
|
|
}
|
2014-10-31 01:43:16 +03:00
|
|
|
|
2013-07-25 18:06:09 +04:00
|
|
|
struct treeview_callback_table gh_tree_cb_t = {
|
2013-05-31 13:08:59 +04:00
|
|
|
.folder = global_history_tree_node_folder_cb,
|
|
|
|
.entry = global_history_tree_node_entry_cb
|
|
|
|
};
|
|
|
|
|
2013-06-18 20:26:36 +04:00
|
|
|
|
|
|
|
/* Exported interface, documented in global_history.h */
|
2013-05-31 13:08:59 +04:00
|
|
|
nserror global_history_init(struct core_window_callback_table *cw_t,
|
|
|
|
void *core_window_handle)
|
|
|
|
{
|
|
|
|
nserror err;
|
|
|
|
|
Treeview: Rationalise initialisation and finalisation.
Previously the expected behaviour for front ends using the correct
API for hotlist, global history, cookie manager, and ssl cert
viewer was that the front end would initialise the treeview module
on startup and finalise it on application exit.
However, this meant that the front ends had to include the core
treeview header, which they didn't otherwise need.
Since the tree module provided access to the new treeview utilities
through the old tree API, and was used by front ends with no changes
for the new treeview API, the tree layer refcounted initialisations
of treeview-based widgets, and only called the underlying treeview
init/fini functions when needed.
This change moves that refcounting into the treeview module. Now
the hotlist, global history, cookie manager, and ssl cert viewer
widgets call call treeview init/fini as part of their own
initialisation and finalisation. This means that front ends
using the correct APIs for treeview-based widgets don't need to
know anything about the underlying treeview, and the tree module
compatibility layer has had its treeview refcounting removed.
Finally, the treeview_init function took a font size parameter.
Now it does not and lit gets font size from config. We probably
want to add a new `treeview_font_size` option to nsoptions, and
have differnent defaults on different platforms. 12pt on RISC OS,
and 11pt elsewhere, most likely.
2016-08-10 20:36:41 +03:00
|
|
|
err = treeview_init();
|
|
|
|
if (err != NSERROR_OK) {
|
|
|
|
return err;
|
|
|
|
}
|
|
|
|
|
Use coccinelle to change logging macro calls in c files
for F in $(git ls-files '*.c');do spatch --sp-file foo.cocci --in-place ${F};done
@@ expression E; @@
-LOG(E);
+NSLOG(netsurf, INFO, E);
@@ expression E, E1; @@
-LOG(E, E1);
+NSLOG(netsurf, INFO, E, E1);
@@ expression E, E1, E2; @@
-LOG(E, E1, E2);
+NSLOG(netsurf, INFO, E, E1, E2);
@@ expression E, E1, E2, E3; @@
-LOG(E, E1, E2, E3);
+NSLOG(netsurf, INFO, E, E1, E2, E3);
@@ expression E, E1, E2, E3, E4; @@
-LOG(E, E1, E2, E3, E4);
+NSLOG(netsurf, INFO, E, E1, E2, E3, E4);
@@ expression E, E1, E2, E3, E4, E5; @@
-LOG(E, E1, E2, E3, E4, E5);
+NSLOG(netsurf, INFO, E, E1, E2, E3, E4, E5);
@@ expression E, E1, E2, E3, E4, E5, E6; @@
-LOG(E, E1, E2, E3, E4, E5, E6);
+NSLOG(netsurf, INFO, E, E1, E2, E3, E4, E5, E6);
@@ expression E, E1, E2, E3, E4, E5, E6, E7; @@
-LOG(E, E1, E2, E3, E4, E5, E6, E7);
+NSLOG(netsurf, INFO, E, E1, E2, E3, E4, E5, E6, E7);
2017-09-06 20:28:12 +03:00
|
|
|
NSLOG(netsurf, INFO, "Loading global history");
|
2013-05-31 13:08:59 +04:00
|
|
|
|
|
|
|
/* Init. global history treeview time */
|
|
|
|
err = global_history_initialise_time();
|
|
|
|
if (err != NSERROR_OK) {
|
|
|
|
gh_ctx.tree = NULL;
|
|
|
|
return err;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Init. global history treeview entry fields */
|
|
|
|
err = global_history_initialise_entry_fields();
|
|
|
|
if (err != NSERROR_OK) {
|
|
|
|
gh_ctx.tree = NULL;
|
|
|
|
return err;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Load the entries */
|
|
|
|
urldb_iterate_entries(global_history_add_entry);
|
|
|
|
|
|
|
|
/* Create the global history treeview */
|
2013-07-25 18:06:09 +04:00
|
|
|
err = treeview_create(&gh_ctx.tree, &gh_tree_cb_t,
|
2013-05-31 13:08:59 +04:00
|
|
|
N_FIELDS, gh_ctx.fields,
|
2013-07-03 14:19:16 +04:00
|
|
|
cw_t, core_window_handle,
|
2017-09-19 00:57:30 +03:00
|
|
|
TREEVIEW_NO_MOVES | TREEVIEW_DEL_EMPTY_DIRS |
|
|
|
|
TREEVIEW_SEARCHABLE);
|
2013-05-31 13:08:59 +04:00
|
|
|
if (err != NSERROR_OK) {
|
|
|
|
gh_ctx.tree = NULL;
|
|
|
|
return err;
|
|
|
|
}
|
|
|
|
|
2013-06-18 22:26:49 +04:00
|
|
|
/* Ensure there is a folder for today */
|
|
|
|
err = global_history_create_dir(GH_TODAY);
|
2013-05-31 13:08:59 +04:00
|
|
|
if (err != NSERROR_OK) {
|
|
|
|
return err;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Add the history to the treeview */
|
|
|
|
err = global_history_init_entries();
|
|
|
|
if (err != NSERROR_OK) {
|
|
|
|
return err;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Expand the "Today" folder node */
|
|
|
|
err = treeview_node_expand(gh_ctx.tree,
|
|
|
|
gh_ctx.folders[GH_TODAY].folder);
|
|
|
|
if (err != NSERROR_OK) {
|
|
|
|
return err;
|
|
|
|
}
|
|
|
|
|
2013-09-03 17:38:01 +04:00
|
|
|
/* History tree is built
|
|
|
|
* We suppress the treeview height callback on entry insertion before
|
|
|
|
* the treeview is built. */
|
|
|
|
gh_ctx.built = true;
|
|
|
|
|
|
|
|
/* Inform client of window height */
|
|
|
|
treeview_get_height(gh_ctx.tree);
|
|
|
|
|
Use coccinelle to change logging macro calls in c files
for F in $(git ls-files '*.c');do spatch --sp-file foo.cocci --in-place ${F};done
@@ expression E; @@
-LOG(E);
+NSLOG(netsurf, INFO, E);
@@ expression E, E1; @@
-LOG(E, E1);
+NSLOG(netsurf, INFO, E, E1);
@@ expression E, E1, E2; @@
-LOG(E, E1, E2);
+NSLOG(netsurf, INFO, E, E1, E2);
@@ expression E, E1, E2, E3; @@
-LOG(E, E1, E2, E3);
+NSLOG(netsurf, INFO, E, E1, E2, E3);
@@ expression E, E1, E2, E3, E4; @@
-LOG(E, E1, E2, E3, E4);
+NSLOG(netsurf, INFO, E, E1, E2, E3, E4);
@@ expression E, E1, E2, E3, E4, E5; @@
-LOG(E, E1, E2, E3, E4, E5);
+NSLOG(netsurf, INFO, E, E1, E2, E3, E4, E5);
@@ expression E, E1, E2, E3, E4, E5, E6; @@
-LOG(E, E1, E2, E3, E4, E5, E6);
+NSLOG(netsurf, INFO, E, E1, E2, E3, E4, E5, E6);
@@ expression E, E1, E2, E3, E4, E5, E6, E7; @@
-LOG(E, E1, E2, E3, E4, E5, E6, E7);
+NSLOG(netsurf, INFO, E, E1, E2, E3, E4, E5, E6, E7);
2017-09-06 20:28:12 +03:00
|
|
|
NSLOG(netsurf, INFO, "Loaded global history");
|
2013-05-31 13:08:59 +04:00
|
|
|
|
|
|
|
return NSERROR_OK;
|
|
|
|
}
|
|
|
|
|
2013-06-18 20:25:23 +04:00
|
|
|
|
|
|
|
/* Exported interface, documented in global_history.h */
|
|
|
|
nserror global_history_fini(void)
|
2013-05-31 13:08:59 +04:00
|
|
|
{
|
|
|
|
int i;
|
|
|
|
nserror err;
|
|
|
|
|
Use coccinelle to change logging macro calls in c files
for F in $(git ls-files '*.c');do spatch --sp-file foo.cocci --in-place ${F};done
@@ expression E; @@
-LOG(E);
+NSLOG(netsurf, INFO, E);
@@ expression E, E1; @@
-LOG(E, E1);
+NSLOG(netsurf, INFO, E, E1);
@@ expression E, E1, E2; @@
-LOG(E, E1, E2);
+NSLOG(netsurf, INFO, E, E1, E2);
@@ expression E, E1, E2, E3; @@
-LOG(E, E1, E2, E3);
+NSLOG(netsurf, INFO, E, E1, E2, E3);
@@ expression E, E1, E2, E3, E4; @@
-LOG(E, E1, E2, E3, E4);
+NSLOG(netsurf, INFO, E, E1, E2, E3, E4);
@@ expression E, E1, E2, E3, E4, E5; @@
-LOG(E, E1, E2, E3, E4, E5);
+NSLOG(netsurf, INFO, E, E1, E2, E3, E4, E5);
@@ expression E, E1, E2, E3, E4, E5, E6; @@
-LOG(E, E1, E2, E3, E4, E5, E6);
+NSLOG(netsurf, INFO, E, E1, E2, E3, E4, E5, E6);
@@ expression E, E1, E2, E3, E4, E5, E6, E7; @@
-LOG(E, E1, E2, E3, E4, E5, E6, E7);
+NSLOG(netsurf, INFO, E, E1, E2, E3, E4, E5, E6, E7);
2017-09-06 20:28:12 +03:00
|
|
|
NSLOG(netsurf, INFO, "Finalising global history");
|
2013-06-03 20:06:47 +04:00
|
|
|
|
2013-07-25 14:41:16 +04:00
|
|
|
gh_ctx.built = false;
|
|
|
|
|
2013-05-31 13:08:59 +04:00
|
|
|
/* Destroy the global history treeview */
|
|
|
|
err = treeview_destroy(gh_ctx.tree);
|
2017-01-08 03:46:23 +03:00
|
|
|
gh_ctx.tree = NULL;
|
2013-05-31 13:08:59 +04:00
|
|
|
|
|
|
|
/* Free global history treeview entry fields */
|
|
|
|
for (i = 0; i < N_FIELDS; i++)
|
|
|
|
if (gh_ctx.fields[i].field != NULL)
|
|
|
|
lwc_string_unref(gh_ctx.fields[i].field);
|
|
|
|
|
Treeview: Rationalise initialisation and finalisation.
Previously the expected behaviour for front ends using the correct
API for hotlist, global history, cookie manager, and ssl cert
viewer was that the front end would initialise the treeview module
on startup and finalise it on application exit.
However, this meant that the front ends had to include the core
treeview header, which they didn't otherwise need.
Since the tree module provided access to the new treeview utilities
through the old tree API, and was used by front ends with no changes
for the new treeview API, the tree layer refcounted initialisations
of treeview-based widgets, and only called the underlying treeview
init/fini functions when needed.
This change moves that refcounting into the treeview module. Now
the hotlist, global history, cookie manager, and ssl cert viewer
widgets call call treeview init/fini as part of their own
initialisation and finalisation. This means that front ends
using the correct APIs for treeview-based widgets don't need to
know anything about the underlying treeview, and the tree module
compatibility layer has had its treeview refcounting removed.
Finally, the treeview_init function took a font size parameter.
Now it does not and lit gets font size from config. We probably
want to add a new `treeview_font_size` option to nsoptions, and
have differnent defaults on different platforms. 12pt on RISC OS,
and 11pt elsewhere, most likely.
2016-08-10 20:36:41 +03:00
|
|
|
err = treeview_fini();
|
|
|
|
if (err != NSERROR_OK) {
|
|
|
|
return err;
|
|
|
|
}
|
|
|
|
|
Use coccinelle to change logging macro calls in c files
for F in $(git ls-files '*.c');do spatch --sp-file foo.cocci --in-place ${F};done
@@ expression E; @@
-LOG(E);
+NSLOG(netsurf, INFO, E);
@@ expression E, E1; @@
-LOG(E, E1);
+NSLOG(netsurf, INFO, E, E1);
@@ expression E, E1, E2; @@
-LOG(E, E1, E2);
+NSLOG(netsurf, INFO, E, E1, E2);
@@ expression E, E1, E2, E3; @@
-LOG(E, E1, E2, E3);
+NSLOG(netsurf, INFO, E, E1, E2, E3);
@@ expression E, E1, E2, E3, E4; @@
-LOG(E, E1, E2, E3, E4);
+NSLOG(netsurf, INFO, E, E1, E2, E3, E4);
@@ expression E, E1, E2, E3, E4, E5; @@
-LOG(E, E1, E2, E3, E4, E5);
+NSLOG(netsurf, INFO, E, E1, E2, E3, E4, E5);
@@ expression E, E1, E2, E3, E4, E5, E6; @@
-LOG(E, E1, E2, E3, E4, E5, E6);
+NSLOG(netsurf, INFO, E, E1, E2, E3, E4, E5, E6);
@@ expression E, E1, E2, E3, E4, E5, E6, E7; @@
-LOG(E, E1, E2, E3, E4, E5, E6, E7);
+NSLOG(netsurf, INFO, E, E1, E2, E3, E4, E5, E6, E7);
2017-09-06 20:28:12 +03:00
|
|
|
NSLOG(netsurf, INFO, "Finalised global history");
|
2013-06-03 20:06:47 +04:00
|
|
|
|
2013-07-25 14:07:40 +04:00
|
|
|
return err;
|
2013-05-31 13:08:59 +04:00
|
|
|
}
|
|
|
|
|
2013-06-18 20:26:36 +04:00
|
|
|
|
2013-07-16 16:13:33 +04:00
|
|
|
/* Exported interface, documented in global_history.h */
|
|
|
|
nserror global_history_add(nsurl *url)
|
|
|
|
{
|
|
|
|
const struct url_data *data;
|
|
|
|
|
2013-07-25 14:45:07 +04:00
|
|
|
/* If we don't have a global history at the moment, just return OK */
|
|
|
|
if (gh_ctx.tree == NULL)
|
|
|
|
return NSERROR_OK;
|
|
|
|
|
2013-07-16 16:13:33 +04:00
|
|
|
data = urldb_get_url_data(url);
|
|
|
|
if (data == NULL) {
|
Use coccinelle to change logging macro calls in c files
for F in $(git ls-files '*.c');do spatch --sp-file foo.cocci --in-place ${F};done
@@ expression E; @@
-LOG(E);
+NSLOG(netsurf, INFO, E);
@@ expression E, E1; @@
-LOG(E, E1);
+NSLOG(netsurf, INFO, E, E1);
@@ expression E, E1, E2; @@
-LOG(E, E1, E2);
+NSLOG(netsurf, INFO, E, E1, E2);
@@ expression E, E1, E2, E3; @@
-LOG(E, E1, E2, E3);
+NSLOG(netsurf, INFO, E, E1, E2, E3);
@@ expression E, E1, E2, E3, E4; @@
-LOG(E, E1, E2, E3, E4);
+NSLOG(netsurf, INFO, E, E1, E2, E3, E4);
@@ expression E, E1, E2, E3, E4, E5; @@
-LOG(E, E1, E2, E3, E4, E5);
+NSLOG(netsurf, INFO, E, E1, E2, E3, E4, E5);
@@ expression E, E1, E2, E3, E4, E5, E6; @@
-LOG(E, E1, E2, E3, E4, E5, E6);
+NSLOG(netsurf, INFO, E, E1, E2, E3, E4, E5, E6);
@@ expression E, E1, E2, E3, E4, E5, E6, E7; @@
-LOG(E, E1, E2, E3, E4, E5, E6, E7);
+NSLOG(netsurf, INFO, E, E1, E2, E3, E4, E5, E6, E7);
2017-09-06 20:28:12 +03:00
|
|
|
NSLOG(netsurf, INFO,
|
|
|
|
"Can't add URL to history that's not present in urldb.");
|
2013-07-16 16:13:33 +04:00
|
|
|
return NSERROR_BAD_PARAMETER;
|
|
|
|
}
|
|
|
|
|
|
|
|
global_history_add_entry(url, data);
|
|
|
|
|
|
|
|
return NSERROR_OK;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2013-08-28 14:43:34 +04:00
|
|
|
struct treeview_export_walk_ctx {
|
|
|
|
FILE *fp;
|
|
|
|
};
|
|
|
|
/** Callback for treeview_walk node entering */
|
|
|
|
static nserror global_history_export_enter_cb(void *ctx, void *node_data,
|
|
|
|
enum treeview_node_type type, bool *abort)
|
|
|
|
{
|
|
|
|
struct treeview_export_walk_ctx *tw = ctx;
|
2014-01-29 01:40:13 +04:00
|
|
|
nserror ret;
|
2013-08-28 14:43:34 +04:00
|
|
|
|
|
|
|
if (type == TREE_NODE_ENTRY) {
|
|
|
|
struct global_history_entry *e = node_data;
|
|
|
|
char *t_text;
|
|
|
|
char *u_text;
|
|
|
|
|
|
|
|
ret = utf8_to_html(e->data[GH_TITLE].value, "iso-8859-1",
|
|
|
|
e->data[GH_TITLE].value_len, &t_text);
|
2014-01-29 01:40:13 +04:00
|
|
|
if (ret != NSERROR_OK)
|
2013-08-28 14:43:34 +04:00
|
|
|
return NSERROR_SAVE_FAILED;
|
|
|
|
|
|
|
|
ret = utf8_to_html(e->data[GH_URL].value, "iso-8859-1",
|
|
|
|
e->data[GH_URL].value_len, &u_text);
|
2014-01-29 01:40:13 +04:00
|
|
|
if (ret != NSERROR_OK) {
|
2013-08-28 14:43:34 +04:00
|
|
|
free(t_text);
|
|
|
|
return NSERROR_SAVE_FAILED;
|
|
|
|
}
|
|
|
|
|
|
|
|
fprintf(tw->fp, "<li><a href=\"%s\">%s</a></li>\n",
|
|
|
|
u_text, t_text);
|
|
|
|
|
|
|
|
free(t_text);
|
|
|
|
free(u_text);
|
|
|
|
|
|
|
|
} else if (type == TREE_NODE_FOLDER) {
|
|
|
|
struct global_history_folder *f = node_data;
|
|
|
|
char *f_text;
|
|
|
|
|
|
|
|
ret = utf8_to_html(f->data.value, "iso-8859-1",
|
|
|
|
f->data.value_len, &f_text);
|
2014-01-29 01:40:13 +04:00
|
|
|
if (ret != NSERROR_OK)
|
2013-08-28 14:43:34 +04:00
|
|
|
return NSERROR_SAVE_FAILED;
|
|
|
|
|
|
|
|
fprintf(tw->fp, "<li><h4>%s</h4>\n<ul>\n", f_text);
|
|
|
|
|
|
|
|
free(f_text);
|
|
|
|
}
|
|
|
|
|
|
|
|
return NSERROR_OK;
|
|
|
|
}
|
|
|
|
/** Callback for treeview_walk node leaving */
|
|
|
|
static nserror global_history_export_leave_cb(void *ctx, void *node_data,
|
|
|
|
enum treeview_node_type type, bool *abort)
|
|
|
|
{
|
|
|
|
struct treeview_export_walk_ctx *tw = ctx;
|
|
|
|
|
|
|
|
if (type == TREE_NODE_FOLDER) {
|
|
|
|
fputs("</ul></li>\n", tw->fp);
|
|
|
|
}
|
|
|
|
|
|
|
|
return NSERROR_OK;
|
|
|
|
}
|
|
|
|
/* Exported interface, documented in global_history.h */
|
|
|
|
nserror global_history_export(const char *path, const char *title)
|
|
|
|
{
|
|
|
|
struct treeview_export_walk_ctx tw;
|
|
|
|
nserror err;
|
|
|
|
FILE *fp;
|
|
|
|
|
|
|
|
fp = fopen(path, "w");
|
|
|
|
if (fp == NULL)
|
|
|
|
return NSERROR_SAVE_FAILED;
|
|
|
|
|
|
|
|
if (title == NULL)
|
|
|
|
title = "NetSurf Browsing History";
|
|
|
|
|
|
|
|
fputs("<!DOCTYPE html "
|
|
|
|
"PUBLIC \"//W3C/DTD HTML 4.01//EN\" "
|
|
|
|
"\"http://www.w3.org/TR/html4/strict.dtd\">\n", fp);
|
|
|
|
fputs("<html>\n<head>\n", fp);
|
|
|
|
fputs("<meta http-equiv=\"Content-Type\" "
|
|
|
|
"content=\"text/html; charset=iso-8859-1\">\n", fp);
|
|
|
|
fprintf(fp, "<title>%s</title>\n", title);
|
|
|
|
fputs("</head>\n<body>\n<ul>\n", fp);
|
|
|
|
|
|
|
|
tw.fp = fp;
|
|
|
|
err = treeview_walk(gh_ctx.tree, NULL,
|
|
|
|
global_history_export_enter_cb,
|
|
|
|
global_history_export_leave_cb,
|
|
|
|
&tw, TREE_NODE_ENTRY | TREE_NODE_FOLDER);
|
|
|
|
if (err != NSERROR_OK)
|
|
|
|
return err;
|
|
|
|
|
|
|
|
fputs("</ul>\n</body>\n</html>\n", fp);
|
|
|
|
|
|
|
|
fclose(fp);
|
|
|
|
|
|
|
|
return NSERROR_OK;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2013-06-18 20:26:36 +04:00
|
|
|
/* Exported interface, documented in global_history.h */
|
2013-05-31 13:08:59 +04:00
|
|
|
void global_history_redraw(int x, int y, struct rect *clip,
|
|
|
|
const struct redraw_context *ctx)
|
|
|
|
{
|
|
|
|
treeview_redraw(gh_ctx.tree, x, y, clip, ctx);
|
|
|
|
}
|
|
|
|
|
2013-06-18 20:26:36 +04:00
|
|
|
|
|
|
|
/* Exported interface, documented in global_history.h */
|
2013-05-31 16:25:49 +04:00
|
|
|
void global_history_mouse_action(browser_mouse_state mouse, int x, int y)
|
|
|
|
{
|
|
|
|
treeview_mouse_action(gh_ctx.tree, mouse, x, y);
|
|
|
|
}
|
|
|
|
|
2013-07-01 14:48:43 +04:00
|
|
|
|
|
|
|
/* Exported interface, documented in global_history.h */
|
2016-08-05 01:40:34 +03:00
|
|
|
bool global_history_keypress(uint32_t key)
|
2013-07-01 14:48:43 +04:00
|
|
|
{
|
2016-08-05 01:40:34 +03:00
|
|
|
return treeview_keypress(gh_ctx.tree, key);
|
2013-07-01 14:48:43 +04:00
|
|
|
}
|
|
|
|
|
2013-08-28 17:23:22 +04:00
|
|
|
|
|
|
|
/* Exported interface, documented in global_history.h */
|
|
|
|
bool global_history_has_selection(void)
|
|
|
|
{
|
|
|
|
return treeview_has_selection(gh_ctx.tree);
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2013-09-13 17:24:25 +04:00
|
|
|
/* Exported interface, documented in global_history.h */
|
|
|
|
bool global_history_get_selection(nsurl **url, const char **title)
|
|
|
|
{
|
|
|
|
struct global_history_entry *e;
|
2014-05-24 18:09:20 +04:00
|
|
|
enum treeview_node_type type;
|
2013-09-13 17:24:25 +04:00
|
|
|
void *v;
|
|
|
|
|
2014-05-24 18:09:20 +04:00
|
|
|
type = treeview_get_selection(gh_ctx.tree, &v);
|
|
|
|
if (type != TREE_NODE_ENTRY || v == NULL) {
|
2013-09-13 17:24:25 +04:00
|
|
|
*url = NULL;
|
|
|
|
*title = NULL;
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
|
|
|
e = (struct global_history_entry *)v;
|
|
|
|
|
|
|
|
*url = e->url;
|
|
|
|
*title = e->data[GH_TITLE].value;
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2013-09-03 14:28:02 +04:00
|
|
|
/* Exported interface, documented in global_history.h */
|
|
|
|
nserror global_history_expand(bool only_folders)
|
|
|
|
{
|
|
|
|
return treeview_expand(gh_ctx.tree, only_folders);
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/* Exported interface, documented in global_history.h */
|
|
|
|
nserror global_history_contract(bool all)
|
|
|
|
{
|
|
|
|
return treeview_contract(gh_ctx.tree, all);
|
|
|
|
}
|
|
|
|
|