r12460 chris_y - /trunk/netsurf/desktop/tree.c
by netsurf＠semichrome.net
Author: chris_y
Date: Sat Jun 4 15:46:08 2011
New Revision: 12460
URL: http://source.netsurf-browser.org?rev=12460&view=rev
Log:
Remove at least one instance of unnecessary recalculation
Modified:
trunk/netsurf/desktop/tree.c
Modified: trunk/netsurf/desktop/tree.c
URL: http://source.netsurf-browser.org/trunk/netsurf/desktop/tree.c?rev=12460&...
==============================================================================
--- trunk/netsurf/desktop/tree.c (original)
+++ trunk/netsurf/desktop/tree.c Sat Jun 4 15:46:08 2011
@@ -824,7 +824,7 @@
* \param element the node element to update
*/
static void tree_handle_node_element_changed(struct tree *tree,
- struct node_element *element)
+ struct node_element *element, bool text_changed)
{
int width, height;
@@ -832,10 +832,13 @@
width = element->box.width;
height = element->box.height;
- #ifdef TREE_NOISY_DEBUG
- if(element->text) LOG(("%s", element->text));
- #endif
- tree_recalculate_node_element(tree, element);
+
+ if(text_changed == true) {
+ #ifdef TREE_NOISY_DEBUG
+ if(element->text) LOG(("%s", element->text));
+ #endif
+ tree_recalculate_node_element(tree, element);
+ }
if (element->box.height != height) {
tree_recalculate_node_sizes(tree, element->parent, false);
@@ -936,7 +939,7 @@
if (text != NULL)
tree_update_node_element(tree, element, text, NULL);
else
- tree_handle_node_element_changed(tree, element);
+ tree_handle_node_element_changed(tree, element, true);
tree_recalculate_size(tree);
@@ -1423,6 +1426,7 @@
{
node_callback_resp response;
struct node_msg_data msg_data;
+ bool text_changed = false;
assert(element != NULL);
@@ -1432,6 +1436,8 @@
if (text != NULL && (element->type == NODE_ELEMENT_TEXT ||
element->type == NODE_ELEMENT_TEXT_PLUS_ICON)) {
if (element->text != NULL) {
+ if(strcmp(element->text, text) == 0) text_changed = true;
+
response = NODE_CALLBACK_NOT_HANDLED;
if (!element->editable &&
element->parent->user_callback !=
@@ -1474,7 +1480,7 @@
element->bitmap = bitmap;
}
- tree_handle_node_element_changed(tree, element);
+ tree_handle_node_element_changed(tree, element, text_changed);
}
@@ -2324,7 +2330,7 @@
tree_set_node_selected(tree, tree->root->child, true,
false);
node->selected = true;
- tree_handle_node_element_changed(tree, &node->data);
+ tree_handle_node_element_changed(tree, &node->data, false);
}
return true;
}
@@ -2334,7 +2340,7 @@
if (tree->flags & TREE_NO_SELECT)
return true;
node->selected = !node->selected;
- tree_handle_node_element_changed(tree, &node->data);
+ tree_handle_node_element_changed(tree, &node->data, false);
return true;
}
@@ -2348,7 +2354,7 @@
tree_set_node_selected(tree, tree->root->child, true,
false);
node->selected = true;
- tree_handle_node_element_changed(tree, &node->data);
+ tree_handle_node_element_changed(tree, &node->data, false);
}
if (tree->flags & TREE_MOVABLE)
@@ -2412,11 +2418,11 @@
if (invert) {
node->selected = !node->selected;
tree_handle_node_element_changed(tree,
- &node->data);
+ &node->data, false);
} else if (!node->selected) {
node->selected = true;
tree_handle_node_element_changed(tree,
- &node->data);
+ &node->data, false);
}
}
}
@@ -2721,7 +2727,7 @@
}
textarea_set_text(tree->textarea, element->text);
- tree_handle_node_element_changed(tree, element);
+ tree_handle_node_element_changed(tree, element, true);
tree_recalculate_size(tree);
tree->callbacks->scroll_visible(element->box.y, element->box.height,
tree->client_data);
12 years
r12459 chris_y - /trunk/netsurf/desktop/tree.c
by netsurf＠semichrome.net
Author: chris_y
Date: Sat Jun 4 15:22:24 2011
New Revision: 12459
URL: http://source.netsurf-browser.org?rev=12459&view=rev
Log:
Extra logging to track the source of node size calculations
A couple of minor changes to prevent unnecessary recalculation
Modified:
trunk/netsurf/desktop/tree.c
Modified: trunk/netsurf/desktop/tree.c
URL: http://source.netsurf-browser.org/trunk/netsurf/desktop/tree.c?rev=12459&...
==============================================================================
--- trunk/netsurf/desktop/tree.c (original)
+++ trunk/netsurf/desktop/tree.c Sat Jun 4 15:22:24 2011
@@ -42,6 +42,8 @@
#include "utils/utils.h"
#include "utils/url.h"
+#define TREE_NOISY_DEBUG 1
+
#define MAXIMUM_URL_LENGTH 1024
#define TREE_TEXT_SIZE_PT 11
@@ -473,8 +475,12 @@
if (node->expanded) {
for (element = &node->data; element != NULL;
element = element->next) {
- if (recalculate_sizes)
+ if (recalculate_sizes) {
+ #ifdef TREE_NOISY_DEBUG
+ if(element->text) LOG(("%s", element->text));
+ #endif
tree_recalculate_node_element(tree, element);
+ }
node->box.width = (node->box.width > element->box.x +
element->box.width - node->box.x) ?
node->box.width :
@@ -485,10 +491,13 @@
} else {
if (recalculate_sizes)
for (element = &node->data; element != NULL;
- element = element->next)
+ element = element->next) {
+ #ifdef TREE_NOISY_DEBUG
+ if(element->text) LOG(("%s", element->text));
+ #endif
tree_recalculate_node_element(tree, element);
- else
- tree_recalculate_node_element(tree, &node->data);
+ }
+
node->box.width = node->data.box.width;
node->box.height = node->data.box.height;
}
@@ -823,6 +832,9 @@
width = element->box.width;
height = element->box.height;
+ #ifdef TREE_NOISY_DEBUG
+ if(element->text) LOG(("%s", element->text));
+ #endif
tree_recalculate_node_element(tree, element);
if (element->box.height != height) {
@@ -1454,6 +1466,11 @@
if (response != NODE_CALLBACK_HANDLED)
free(element->bitmap);
}
+ else {
+ /* Increase the box width to accomodate the new icon */
+ element->box.width += NODE_INSTEP;
+ }
+
element->bitmap = bitmap;
}
12 years
r12458 tlsa - /trunk/netsurf/desktop/frames.c
by netsurf＠semichrome.net
Author: tlsa
Date: Sat Jun 4 09:38:50 2011
New Revision: 12458
URL: http://source.netsurf-browser.org?rev=12458&view=rev
Log:
Remove redundant code.
Modified:
trunk/netsurf/desktop/frames.c
Modified: trunk/netsurf/desktop/frames.c
URL: http://source.netsurf-browser.org/trunk/netsurf/desktop/frames.c?rev=1245...
==============================================================================
--- trunk/netsurf/desktop/frames.c (original)
+++ trunk/netsurf/desktop/frames.c Sat Jun 4 09:38:50 2011
@@ -121,7 +121,6 @@
void browser_window_recalculate_iframes(struct browser_window *bw) {
struct browser_window *window;
struct rect rect;
- int bw_width, bw_height;
int index;
#ifdef nsamiga
@@ -136,14 +135,6 @@
assert(bw->window != NULL);
/* update window dimensions */
- gui_window_get_dimensions(bw->window, &bw_width, &bw_height, false);
- if (!bw->parent) {
- bw->x0 = 0;
- bw->y0 = 0;
- bw->x1 = bw_width;
- bw->y1 = bw_height;
- }
-
for (index = 0; index < bw->iframe_count; index++) {
window = &(bw->iframes[index]);
12 years
r12457 tlsa - /trunk/netsurf/gtk/scaffolding.c
by netsurf＠semichrome.net
Author: tlsa
Date: Sat Jun 4 08:51:42 2011
New Revision: 12457
URL: http://source.netsurf-browser.org?rev=12457&view=rev
Log:
New window opens with homepage, rather than current page.
Modified:
trunk/netsurf/gtk/scaffolding.c
Modified: trunk/netsurf/gtk/scaffolding.c
URL: http://source.netsurf-browser.org/trunk/netsurf/gtk/scaffolding.c?rev=124...
==============================================================================
--- trunk/netsurf/gtk/scaffolding.c (original)
+++ trunk/netsurf/gtk/scaffolding.c Sat Jun 4 08:51:42 2011
@@ -527,7 +527,13 @@
MULTIHANDLER(newwindow)
{
struct browser_window *bw = gui_window_get_browser_window(g->top_level);
- const char *url = gtk_entry_get_text(GTK_ENTRY(g->url_bar));
+ const char *url = option_homepage_url;
+
+ if ((url != NULL) && (url[0] == '\0'))
+ url = NULL;
+
+ if (url == NULL)
+ url = NETSURF_HOMEPAGE;
browser_window_create(url, bw, NULL, false, false);
12 years
r12456 mono - /trunk/netsurf/atari/scripts/mkpkg.sh
by netsurf＠semichrome.net
Author: mono
Date: Fri Jun 3 17:37:20 2011
New Revision: 12456
URL: http://source.netsurf-browser.org?rev=12456&view=rev
Log:
lowered stack value (the large value was added because of excesive stack usage within mintlibs regex, but it can be avoided when using malloc within regex impl.), added missing internal.css
Modified:
trunk/netsurf/atari/scripts/mkpkg.sh
Modified: trunk/netsurf/atari/scripts/mkpkg.sh
URL: http://source.netsurf-browser.org/trunk/netsurf/atari/scripts/mkpkg.sh?re...
==============================================================================
--- trunk/netsurf/atari/scripts/mkpkg.sh (original)
+++ trunk/netsurf/atari/scripts/mkpkg.sh Fri Jun 3 17:37:20 2011
@@ -102,12 +102,13 @@
cp $src"ns.prg" $dst
chmod +x $dst"ns.prg"
strip $dst"ns.prg"
-stack -S 1000k $dst"ns.prg"
+stack -S 256k $dst"ns.prg"
cp $src"atari/res/" $dst -rL
cp $src"\!NetSurf/Resources/AdBlock,f79" $dst"res/adblock.css" -rL
cp $src"\!NetSurf/Resources/CSS,f79" $dst"res/default.css" -rL
-cp $src"\!NetSurf/Resources/CSS,f79" $dst"res/quirks.css" -rL
+cp $src"\!NetSurf/Resources/Quirks,f79" $dst"res/quirks.css" -rL
+cp $src"\!NetSurf/Resources/internal.css,f79" $dst"res/internal.css" -rL
cp $src"\!NetSurf/Resources/SearchEngines" $dst"res/search" -rL
cp $src"\!NetSurf/Resources/ca-bundle" $dst"res/cabundle" -rL
cp $src"\!NetSurf/Resources/en/Messages" $dst"res/messages" -rL
12 years
r12455 chris_y - in /trunk/netsurf/amiga: arexx.c gui.h
by netsurf＠semichrome.net
Author: chris_y
Date: Fri Jun 3 13:20:56 2011
New Revision: 12455
URL: http://source.netsurf-browser.org?rev=12455&view=rev
Log:
Make GUI update when back/forward commands used from ARexx
Modified:
trunk/netsurf/amiga/arexx.c
trunk/netsurf/amiga/gui.h
Modified: trunk/netsurf/amiga/arexx.c
URL: http://source.netsurf-browser.org/trunk/netsurf/amiga/arexx.c?rev=12455&r...
==============================================================================
--- trunk/netsurf/amiga/arexx.c (original)
+++ trunk/netsurf/amiga/arexx.c Fri Jun 3 13:20:56 2011
@@ -23,7 +23,6 @@
#include "amiga/gui.h"
#include "amiga/options.h"
#include "desktop/browser.h"
-#include "desktop/history_core.h"
#include "utils/testament.h"
#include <string.h>
@@ -431,13 +430,7 @@
if((cmd->ac_ArgList[0]) && (cmd->ac_ArgList[1]))
bw = ami_find_tab(*(ULONG *)cmd->ac_ArgList[0], *(ULONG *)cmd->ac_ArgList[1]);
- if(bw)
- {
- if(browser_window_back_available(bw))
- {
- history_back(bw, bw->history);
- }
- }
+ if(bw) ami_gui_history(bw->window->shared, true);
}
STATIC VOID rx_forward(struct ARexxCmd *cmd, struct RexxMsg *rxm __attribute__((unused)))
@@ -449,13 +442,8 @@
if((cmd->ac_ArgList[0]) && (cmd->ac_ArgList[1]))
bw = ami_find_tab(*(ULONG *)cmd->ac_ArgList[0], *(ULONG *)cmd->ac_ArgList[1]);
- if(bw)
- {
- if(browser_window_forward_available(bw))
- {
- history_forward(bw, bw->history);
- }
- }
+ if(bw) ami_gui_history(bw->window->shared, false);
+
}
STATIC VOID rx_home(struct ARexxCmd *cmd, struct RexxMsg *rxm __attribute__((unused)))
Modified: trunk/netsurf/amiga/gui.h
URL: http://source.netsurf-browser.org/trunk/netsurf/amiga/gui.h?rev=12455&r1=...
==============================================================================
--- trunk/netsurf/amiga/gui.h (original)
+++ trunk/netsurf/amiga/gui.h Fri Jun 3 13:20:56 2011
@@ -138,6 +138,7 @@
int ami_key_to_nskey(ULONG keycode, struct InputEvent *ie);
struct box *ami_text_box_at_point(struct gui_window_2 *gwin, ULONG *x, ULONG *y);
BOOL ami_gadget_hit(Object *obj, int x, int y);
+void ami_gui_history(struct gui_window_2 *gwin, bool back);
struct TextFont *origrpfont;
struct MinList *window_list;
12 years
r12454 chris_y - /trunk/netsurf/amiga/gui.c
by netsurf＠semichrome.net
Author: chris_y
Date: Fri Jun 3 13:11:19 2011
New Revision: 12454
URL: http://source.netsurf-browser.org?rev=12454&view=rev
Log:
up = down and down = up
Modified:
trunk/netsurf/amiga/gui.c
Modified: trunk/netsurf/amiga/gui.c
URL: http://source.netsurf-browser.org/trunk/netsurf/amiga/gui.c?rev=12454&r1=...
==============================================================================
--- trunk/netsurf/amiga/gui.c (original)
+++ trunk/netsurf/amiga/gui.c Fri Jun 3 13:11:19 2011
@@ -126,10 +126,10 @@
#include <string.h>
/* Extra mouse button defines to match those in intuition/intuition.h */
-#define SIDEUP (IECODE_4TH_BUTTON)
-#define SIDEDOWN (IECODE_4TH_BUTTON | IECODE_UP_PREFIX)
-#define EXTRAUP (IECODE_5TH_BUTTON)
-#define EXTRADOWN (IECODE_5TH_BUTTON | IECODE_UP_PREFIX)
+#define SIDEDOWN (IECODE_4TH_BUTTON)
+#define SIDEUP (IECODE_4TH_BUTTON | IECODE_UP_PREFIX)
+#define EXTRADOWN (IECODE_5TH_BUTTON)
+#define EXTRAUP (IECODE_5TH_BUTTON | IECODE_UP_PREFIX)
char *default_stylesheet_url;
char *quirks_stylesheet_url;
12 years
r12453 chris_y - /trunk/netsurf/amiga/gui.c
by netsurf＠semichrome.net
Author: chris_y
Date: Fri Jun 3 13:08:17 2011
New Revision: 12453
URL: http://source.netsurf-browser.org?rev=12453&view=rev
Log:
Make 4th mouse button go back in history, and 5th go forward. Untested.
Modified:
trunk/netsurf/amiga/gui.c
Modified: trunk/netsurf/amiga/gui.c
URL: http://source.netsurf-browser.org/trunk/netsurf/amiga/gui.c?rev=12453&r1=...
==============================================================================
--- trunk/netsurf/amiga/gui.c (original)
+++ trunk/netsurf/amiga/gui.c Fri Jun 3 13:08:17 2011
@@ -125,6 +125,12 @@
#include <math.h>
#include <string.h>
+/* Extra mouse button defines to match those in intuition/intuition.h */
+#define SIDEUP (IECODE_4TH_BUTTON)
+#define SIDEDOWN (IECODE_4TH_BUTTON | IECODE_UP_PREFIX)
+#define EXTRAUP (IECODE_5TH_BUTTON)
+#define EXTRADOWN (IECODE_5TH_BUTTON | IECODE_UP_PREFIX)
+
char *default_stylesheet_url;
char *quirks_stylesheet_url;
char *adblock_stylesheet_url;
@@ -788,6 +794,22 @@
ami_mime_free();
return 0;
+}
+
+void ami_gui_history(struct gui_window_2 *gwin, bool back)
+{
+ if(back == true)
+ {
+ if(browser_window_back_available(gwin->bw))
+ history_back(gwin->bw, gwin->bw->history);
+ }
+ else
+ {
+ if(browser_window_forward_available(gwin->bw))
+ history_forward(gwin->bw, gwin->bw->history);
+ }
+
+ ami_update_buttons(gwin);
}
int ami_key_to_nskey(ULONG keycode, struct InputEvent *ie)
@@ -1264,6 +1286,14 @@
}
gwin->mouse_state=0;
break;
+
+ case SIDEUP:
+ ami_gui_history(gwin, true);
+ break;
+
+ case SIDEDOWN:
+ ami_gui_history(gwin, false);
+ break;
}
if(drag_save_data && !gwin->mouse_state)
@@ -1350,21 +1380,11 @@
break;
case GID_BACK:
- if(browser_window_back_available(gwin->bw))
- {
- history_back(gwin->bw,gwin->bw->history);
- }
-
- ami_update_buttons(gwin);
+ ami_gui_history(gwin, true);
break;
case GID_FORWARD:
- if(browser_window_forward_available(gwin->bw))
- {
- history_forward(gwin->bw,gwin->bw->history);
- }
-
- ami_update_buttons(gwin);
+ ami_gui_history(gwin, false);
break;
default:
12 years