r13394 tlsa - in /trunk/netsurf: desktop/browser.c desktop/browser.h desktop/frames.c render/form.c render/html_interaction.c render/textplain.c
by netsurf＠semichrome.net
Author: tlsa
Date: Tue Jan 10 16:02:19 2012
New Revision: 13394
URL: http://source.netsurf-browser.org?rev=13394&view=rev
Log:
Allow drag handlers to inform browser window layer of any pointer range constraints.
Modified:
trunk/netsurf/desktop/browser.c
trunk/netsurf/desktop/browser.h
trunk/netsurf/desktop/frames.c
trunk/netsurf/render/form.c
trunk/netsurf/render/html_interaction.c
trunk/netsurf/render/textplain.c
Modified: trunk/netsurf/desktop/browser.c
URL: http://source.netsurf-browser.org/trunk/netsurf/desktop/browser.c?rev=133...
==============================================================================
--- trunk/netsurf/desktop/browser.c (original)
+++ trunk/netsurf/desktop/browser.c Tue Jan 10 16:02:19 2012
@@ -380,7 +380,7 @@
/* exported interface, documented in browser.h */
void browser_window_set_drag_type(struct browser_window *bw,
- browser_drag_type type)
+ browser_drag_type type, struct rect *rect)
{
struct browser_window *top_bw = browser_window_get_root(bw);
@@ -390,6 +390,9 @@
top_bw->drag_window = bw;
bw->drag_type = type;
+
+ /* TODO: inform front end that the core is handling drag,
+ * pass rect */
}
/* exported interface, documented in browser.h */
@@ -2583,7 +2586,7 @@
break;
default:
- browser_window_set_drag_type(bw, DRAGGING_NONE);
+ browser_window_set_drag_type(bw, DRAGGING_NONE, NULL);
break;
}
}
@@ -2616,7 +2619,7 @@
void browser_window_page_drag_start(struct browser_window *bw, int x, int y)
{
- browser_window_set_drag_type(bw, DRAGGING_PAGE_SCROLL);
+ browser_window_set_drag_type(bw, DRAGGING_PAGE_SCROLL, NULL);
bw->drag_start_x = x;
bw->drag_start_y = y;
Modified: trunk/netsurf/desktop/browser.h
URL: http://source.netsurf-browser.org/trunk/netsurf/desktop/browser.h?rev=133...
==============================================================================
--- trunk/netsurf/desktop/browser.h (original)
+++ trunk/netsurf/desktop/browser.h Tue Jan 10 16:02:19 2012
@@ -413,9 +413,10 @@
*
* \param bw browser window to set the type of the current drag for
* \param type drag type
+ * \param rect area pointer may be confined to, during drag, or NULL
*/
void browser_window_set_drag_type(struct browser_window *bw,
- browser_drag_type type);
+ browser_drag_type type, struct rect *rect);
/*
* Get the root level browser window
Modified: trunk/netsurf/desktop/frames.c
URL: http://source.netsurf-browser.org/trunk/netsurf/desktop/frames.c?rev=1339...
==============================================================================
--- trunk/netsurf/desktop/frames.c (original)
+++ trunk/netsurf/desktop/frames.c Tue Jan 10 16:02:19 2012
@@ -75,14 +75,22 @@
}
break;
case SCROLLBAR_MSG_SCROLL_START:
+ {
+ struct rect rect = {
+ .x0 = scrollbar_data->x0,
+ .y0 = scrollbar_data->y0,
+ .x1 = scrollbar_data->x1,
+ .y1 = scrollbar_data->y1
+ };
+
if (scrollbar_is_horizontal(scrollbar_data->scrollbar))
- browser_window_set_drag_type(bw, DRAGGING_SCR_X);
+ browser_window_set_drag_type(bw, DRAGGING_SCR_X, &rect);
else
- browser_window_set_drag_type(bw, DRAGGING_SCR_Y);
-
+ browser_window_set_drag_type(bw, DRAGGING_SCR_Y, &rect);
+ }
break;
case SCROLLBAR_MSG_SCROLL_FINISHED:
- browser_window_set_drag_type(bw, DRAGGING_NONE);
+ browser_window_set_drag_type(bw, DRAGGING_NONE, NULL);
browser_window_set_pointer(bw, GUI_POINTER_DEFAULT);
break;
@@ -653,7 +661,8 @@
else if (bw->drag_resize_right)
sibling = &parent->children[row * parent->cols + (col + 1)];
if (sibling)
- change |= browser_window_resolve_frame_dimension(bw, sibling, x, y, true, false);
+ change |= browser_window_resolve_frame_dimension(bw, sibling,
+ x, y, true, false);
sibling = NULL;
if (bw->drag_resize_up)
@@ -661,14 +670,16 @@
else if (bw->drag_resize_down)
sibling = &parent->children[(row + 1) * parent->cols + col];
if (sibling)
- change |= browser_window_resolve_frame_dimension(bw, sibling, x, y, false, true);
+ change |= browser_window_resolve_frame_dimension(bw, sibling,
+ x, y, false, true);
if (change)
browser_window_recalculate_frameset(parent);
}
-bool browser_window_resolve_frame_dimension(struct browser_window *bw, struct browser_window *sibling,
+bool browser_window_resolve_frame_dimension(struct browser_window *bw,
+ struct browser_window *sibling,
int x, int y, bool width, bool height) {
int bw_dimension, sibling_dimension;
int bw_pixels, sibling_pixels;
@@ -784,8 +795,10 @@
}
-bool browser_window_resize_frames(struct browser_window *bw, browser_mouse_state mouse, int x, int y,
- gui_pointer_shape *pointer, const char **status, bool *action) {
+bool browser_window_resize_frames(struct browser_window *bw,
+ browser_mouse_state mouse, int x, int y,
+ gui_pointer_shape *pointer, const char **status,
+ bool *action) {
struct browser_window *parent;
bool left, right, up, down;
int i, resize_margin;
@@ -871,8 +884,13 @@
} else {
*pointer = GUI_POINTER_DOWN;
}
- if (mouse & (BROWSER_MOUSE_DRAG_1 | BROWSER_MOUSE_DRAG_2)) {
- browser_window_set_drag_type(bw, DRAGGING_FRAME);
+ if (mouse & (BROWSER_MOUSE_DRAG_1 |
+ BROWSER_MOUSE_DRAG_2)) {
+
+ /* TODO: Pass appropriate rectangle to allow
+ * front end to clamp pointer range */
+ browser_window_set_drag_type(bw,
+ DRAGGING_FRAME, NULL);
bw->drag_start_x = x;
bw->drag_start_y = y;
bw->drag_resize_left = left;
@@ -880,15 +898,6 @@
bw->drag_resize_up = up;
bw->drag_resize_down = down;
- /* TODO: Tell the front end the valid pointer
- * movement range for the drag, so that
- * they can clamp pointer.
- *
- * Probably need a general function for
- * this, to be used by all core-managed
- * drag ops.
- */
-
*status = messages_get("FrameDrag");
*action = true;
}
@@ -898,14 +907,14 @@
if (bw->children) {
for (i = 0; i < (bw->cols * bw->rows); i++)
- if (browser_window_resize_frames(&bw->children[i], mouse, x, y, pointer, status,
- action))
+ if (browser_window_resize_frames(&bw->children[i],
+ mouse, x, y, pointer, status, action))
return true;
}
if (bw->iframes) {
for (i = 0; i < bw->iframe_count; i++)
- if (browser_window_resize_frames(&bw->iframes[i], mouse, x, y, pointer, status,
- action))
+ if (browser_window_resize_frames(&bw->iframes[i],
+ mouse, x, y, pointer, status, action))
return true;
}
return false;
Modified: trunk/netsurf/render/form.c
URL: http://source.netsurf-browser.org/trunk/netsurf/render/form.c?rev=13394&r...
==============================================================================
--- trunk/netsurf/render/form.c (original)
+++ trunk/netsurf/render/form.c Tue Jan 10 16:02:19 2012
@@ -1287,7 +1287,16 @@
menu->height);
break;
case SCROLLBAR_MSG_SCROLL_START:
- browser_window_set_drag_type(html->bw, DRAGGING_OTHER);
+ {
+ struct rect rect = {
+ .x0 = scrollbar_data->x0,
+ .y0 = scrollbar_data->y0,
+ .x1 = scrollbar_data->x1,
+ .y1 = scrollbar_data->y1
+ };
+
+ browser_window_set_drag_type(html->bw, DRAGGING_OTHER,
+ &rect);
menu->scroll_capture = true;
@@ -1295,6 +1304,7 @@
gui_window_box_scroll_start(root_bw->window,
scrollbar_data->x0, scrollbar_data->y0,
scrollbar_data->x1, scrollbar_data->y1);
+ }
break;
case SCROLLBAR_MSG_SCROLL_FINISHED:
menu->scroll_capture = false;
Modified: trunk/netsurf/render/html_interaction.c
URL: http://source.netsurf-browser.org/trunk/netsurf/render/html_interaction.c...
==============================================================================
--- trunk/netsurf/render/html_interaction.c (original)
+++ trunk/netsurf/render/html_interaction.c Tue Jan 10 16:02:19 2012
@@ -108,7 +108,7 @@
if (idx != 0)
selection_track(&html->sel, mouse, idx);
- browser_window_set_drag_type(bw, DRAGGING_NONE);
+ browser_window_set_drag_type(bw, DRAGGING_NONE, NULL);
}
switch (bw->drag_type) {
@@ -255,7 +255,7 @@
}
/* Content related drags handled by now */
- browser_window_set_drag_type(bw, DRAGGING_NONE);
+ browser_window_set_drag_type(bw, DRAGGING_NONE, NULL);
/* search the box tree for a link, imagemap, form control, or
* box with scrollbars */
@@ -849,7 +849,15 @@
html_redraw_a_box(html->bw->current_content, box);
break;
case SCROLLBAR_MSG_SCROLL_START:
- browser_window_set_drag_type(html->bw, DRAGGING_OTHER);
+ {
+ struct rect rect = {
+ .x0 = scrollbar_data->x0,
+ .y0 = scrollbar_data->y0,
+ .x1 = scrollbar_data->x1,
+ .y1 = scrollbar_data->y1
+ };
+ browser_window_set_drag_type(html->bw, DRAGGING_OTHER,
+ &rect);
html->scrollbar = scrollbar_data->scrollbar;
@@ -857,6 +865,7 @@
gui_window_box_scroll_start(root_bw->window,
scrollbar_data->x0, scrollbar_data->y0,
scrollbar_data->x1, scrollbar_data->y1);
+ }
break;
case SCROLLBAR_MSG_SCROLL_FINISHED:
html->scrollbar = NULL;
Modified: trunk/netsurf/render/textplain.c
URL: http://source.netsurf-browser.org/trunk/netsurf/render/textplain.c?rev=13...
==============================================================================
--- trunk/netsurf/render/textplain.c (original)
+++ trunk/netsurf/render/textplain.c Tue Jan 10 16:02:19 2012
@@ -638,7 +638,7 @@
idx = textplain_offset_from_coords(c, x, y, dir);
selection_track(&text->sel, mouse, idx);
- browser_window_set_drag_type(bw, DRAGGING_NONE);
+ browser_window_set_drag_type(bw, DRAGGING_NONE, NULL);
}
switch (bw->drag_type) {
@@ -680,7 +680,7 @@
size_t idx;
int dir = 0;
- browser_window_set_drag_type(bw, DRAGGING_NONE);
+ browser_window_set_drag_type(bw, DRAGGING_NONE, NULL);
idx = textplain_offset_from_coords(c, x, y, dir);
if (selection_click(&text->sel, mouse, idx)) {
11 years, 4 months
r13393 chris_y - /trunk/netsurf/!NetSurf/Resources/it/Messages
by netsurf＠semichrome.net
Author: chris_y
Date: Mon Jan 9 12:37:26 2012
New Revision: 13393
URL: http://source.netsurf-browser.org?rev=13393&view=rev
Log:
Italian translation update from Samir Hawamdeh
Modified:
trunk/netsurf/!NetSurf/Resources/it/Messages
Modified: trunk/netsurf/!NetSurf/Resources/it/Messages
URL: http://source.netsurf-browser.org/trunk/netsurf/%21NetSurf/Resources/it/M...
==============================================================================
--- trunk/netsurf/!NetSurf/Resources/it/Messages (original)
+++ trunk/netsurf/!NetSurf/Resources/it/Messages Mon Jan 9 12:37:26 2012
@@ -1,6 +1,6 @@
-# Italian messages for NetSurf 2.9/3.0 Development (Revision 13151)
+# Italian messages for NetSurf 2.9/3.0 Development (Revision 13287)
# Translated by Samir Hawamdeh (http://www.betatesting.it/backforthefuture) for ATO Italia
-# 7.12.2011
+# 8.01.2012
# ========================================================================================
#
# Description
@@ -24,7 +24,7 @@
# Globals
NetSurf:NetSurf
-NetSurfCopyright:Copyright © 2003 - 2011 The NetSurf Developers
+NetSurfCopyright:Copyright © 2003 - 2012 The NetSurf Developers
# Menus
# =====
@@ -57,7 +57,7 @@
#
PageInfo:Info ^F1
Save:Salva F3
-SaveComp:Salva tutto ?F3
+SaveComp:Salva Tutto ?F3
Export:Esporta
SaveURL:Salva indirizzo
Print:Stampa STAMPA
@@ -176,7 +176,7 @@
# Generic tree menus (currently Hotlist and Global history)
#
Selection:Seleziona
-SelectAll:Seleziona tutto ^A
+SelectAll:Seleziona Tutto ^A
Clear:Cancella selezione ^Z
Copy:Copia nella clipboard ^C
Cut:Taglia nella clipboard ^X
@@ -263,7 +263,7 @@
CutNS:Taglia
CopyNS:Copia
PasteNS:Incolla
-SelectAllNS:Seleziona tutto
+SelectAllNS:Seleziona Tutto
ClearNS:Annulla selezione
# Browser menu
@@ -343,7 +343,7 @@
TreeSession:Fine sessione
TreeUnused:Inutilizzato
TreeImport:URL importati
-TreeNewLink:New address
+TreeNewLink:Nuovo indirizzo
TreeNewFolder:Nuova cartella
TreeLaunch:Visita URL
TreeDelete:Elimina
@@ -366,7 +366,7 @@
#
NewLink:Crea nuovo indirizzo
NewFolder:Crea nuova cartella
-EditTitle:Edit title
+EditTitle:Modifica titolo
EditLink:Modifica indirizzo
EditFolder:Rinomina cartella
@@ -605,7 +605,7 @@
NotFound:Non trovato
Next:Successivo
Prev:Precedente
-ShowAll:Mostra tutto
+ShowAll:Mostra Tutto
CaseSens:Maiuscole/Minuscole
# 401 login user interface tokens
11 years, 5 months
r13392 mono - /trunk/netsurf/atari/settings.c
by netsurf＠semichrome.net
Author: mono
Date: Fri Jan 6 18:28:35 2012
New Revision: 13392
URL: http://source.netsurf-browser.org?rev=13392&view=rev
Log:
set monochrom option on save was missing
Modified:
trunk/netsurf/atari/settings.c
Modified: trunk/netsurf/atari/settings.c
URL: http://source.netsurf-browser.org/trunk/netsurf/atari/settings.c?rev=1339...
==============================================================================
--- trunk/netsurf/atari/settings.c (original)
+++ trunk/netsurf/atari/settings.c Fri Jan 6 18:28:35 2012
@@ -632,6 +632,7 @@
option_minimum_gif_delay = (int)(tmp_option_minimum_gif_delay*100+0.5);
option_incremental_reflow = OBJ_SELECTED(CHOICES_CB_INCREMENTAL_REFLOW);
option_min_reflow_period = tmp_option_min_reflow_period;
+ option_atari_font_monochrom = !OBJ_SELECTED( CHOICES_CB_ANTI_ALIASING );
/* "Paths" tabs: */
option_ca_bundle = ObjcString( dlgtree, CHOICES_EDIT_CA_BUNDLE, NULL);
11 years, 5 months
r13391 tlsa - /trunk/netsurf/gtk/search.c
by netsurf＠semichrome.net
Author: tlsa
Date: Fri Jan 6 17:42:22 2012
New Revision: 13391
URL: http://source.netsurf-browser.org?rev=13391&view=rev
Log:
Remove search init function.
Modified:
trunk/netsurf/gtk/search.c
Modified: trunk/netsurf/gtk/search.c
URL: http://source.netsurf-browser.org/trunk/netsurf/gtk/search.c?rev=13391&r1...
==============================================================================
--- trunk/netsurf/gtk/search.c (original)
+++ trunk/netsurf/gtk/search.c Fri Jan 6 17:42:22 2012
@@ -42,7 +42,6 @@
#include "utils/messages.h"
#include "utils/utils.h"
-static void nsgtk_search_init(struct gtk_scaffolding *g);
static void nsgtk_search_set_status(bool found, void *p);
static void nsgtk_search_set_hourglass(bool active, void *p);
static void nsgtk_search_add_recent(const char *string, void *p);
@@ -62,7 +61,9 @@
struct gtk_scaffolding *g = (struct gtk_scaffolding *)data;
struct browser_window *bw = nsgtk_get_browser_window(
nsgtk_scaffolding_top_level(g));
- nsgtk_search_init(g);
+
+ assert(bw);
+
search_flags_t flags = SEARCH_FLAG_FORWARDS |
(gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(
nsgtk_scaffolding_search(g)->caseSens)) ?
@@ -84,7 +85,9 @@
struct gtk_scaffolding *g = (struct gtk_scaffolding *)data;
struct browser_window *bw = nsgtk_get_browser_window(
nsgtk_scaffolding_top_level(g));
- nsgtk_search_init(g);
+
+ assert(bw);
+
search_flags_t flags = 0 |(gtk_toggle_button_get_active(
GTK_TOGGLE_BUTTON(
nsgtk_scaffolding_search(g)->caseSens)) ?
@@ -99,24 +102,6 @@
return TRUE;
}
-/** preparatory code when the search bar is made visible initially */
-
-void nsgtk_search_init(struct gtk_scaffolding *g)
-{
- hlcache_handle *c;
-
- assert(nsgtk_get_browser_window(nsgtk_scaffolding_top_level(g))
- != NULL);
-
- c = nsgtk_get_browser_window(nsgtk_scaffolding_top_level(g))->
- current_content;
-
- if ((!c) || (content_get_type(c) != CONTENT_HTML &&
- content_get_type(c) != CONTENT_TEXTPLAIN))
- return;
-
-}
-
/** connected to the search close button */
gboolean nsgtk_search_close_button_clicked(GtkWidget *widget, gpointer data)
@@ -163,7 +148,9 @@
nsgtk_scaffolding *g = (nsgtk_scaffolding *)data;
struct browser_window *bw = nsgtk_get_browser_window(
nsgtk_scaffolding_top_level(g));
- nsgtk_search_init(g);
+
+ assert(bw);
+
search_flags_t flags = SEARCH_FLAG_FORWARDS |
(gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(
nsgtk_scaffolding_search(g)->caseSens)) ?
11 years, 5 months
r13390 tlsa - /trunk/netsurf/desktop/browser.c
by netsurf＠semichrome.net
Author: tlsa
Date: Fri Jan 6 17:32:38 2012
New Revision: 13390
URL: http://source.netsurf-browser.org?rev=13390&view=rev
Log:
Browser window destruction destroys search context.
Modified:
trunk/netsurf/desktop/browser.c
Modified: trunk/netsurf/desktop/browser.c
URL: http://source.netsurf-browser.org/trunk/netsurf/desktop/browser.c?rev=133...
==============================================================================
--- trunk/netsurf/desktop/browser.c (original)
+++ trunk/netsurf/desktop/browser.c Fri Jan 6 17:32:38 2012
@@ -1901,6 +1901,10 @@
browser_window_set_selection(top, NULL);
}
}
+
+ /* Destroying a search context causes it to redraw any deselected,
+ * content areas, so do this first */
+ browser_window_search_destroy_context(bw);
/* Destruction order is important: we must ensure that the frontend
* destroys any window(s) associated with this browser window before
11 years, 5 months
r13389 mono - in /trunk/netsurf/atari/res: netsurf.rsc netsurf.rsh netsurf.rsm
by netsurf＠semichrome.net
Author: mono
Date: Fri Jan 6 17:30:59 2012
New Revision: 13389
URL: http://source.netsurf-browser.org?rev=13389&view=rev
Log:
Updated resources ( mainmenu and settings dialog updated for background_images, foreground_images, font_monochrom )
Modified:
trunk/netsurf/atari/res/netsurf.rsc
trunk/netsurf/atari/res/netsurf.rsh
trunk/netsurf/atari/res/netsurf.rsm
Modified: trunk/netsurf/atari/res/netsurf.rsc
URL: http://source.netsurf-browser.org/trunk/netsurf/atari/res/netsurf.rsc?rev...
==============================================================================
Binary files - no diff available.
Modified: trunk/netsurf/atari/res/netsurf.rsh
URL: http://source.netsurf-browser.org/trunk/netsurf/atari/res/netsurf.rsh?rev...
==============================================================================
--- trunk/netsurf/atari/res/netsurf.rsh (original)
+++ trunk/netsurf/atari/res/netsurf.rsh Fri Jan 6 17:30:59 2012
@@ -27,16 +27,18 @@
#define MAINMENU_M_TOOLBARS 41 /* STRING in tree MAINMENU */
#define MAINMENU_M_SAVEWIN 43 /* STRING in tree MAINMENU */
#define MAINMENU_M_DEBUG_RENDER 44 /* STRING in tree MAINMENU */
-#define MAINMENU_M_BACK 46 /* STRING in tree MAINMENU */
-#define MAINMENU_M_FORWARD 47 /* STRING in tree MAINMENU */
-#define MAINMENU_M_HOME 48 /* STRING in tree MAINMENU */
-#define MAINMENU_M_LHISTORY 50 /* STRING in tree MAINMENU */
-#define MAINMENU_M_GHISTORY 51 /* STRING in tree MAINMENU */
-#define MAINMENU_M_ADD_BOOKMARK 53 /* STRING in tree MAINMENU */
-#define MAINMENU_M_BOOKMARKS 54 /* STRING in tree MAINMENU */
-#define MAINMENU_M_CHOICES 56 /* STRING in tree MAINMENU */
-#define MAINMENU_M_VLOG 57 /* STRING in tree MAINMENU */
-#define MAINMENU_M_HELP_CONTENT 59 /* STRING in tree MAINMENU */
+#define MAINMENU_M_BG_IMAGES 45 /* STRING in tree MAINMENU */
+#define MAINMENU_M_FG_IMAGES 46 /* STRING in tree MAINMENU */
+#define MAINMENU_M_BACK 48 /* STRING in tree MAINMENU */
+#define MAINMENU_M_FORWARD 49 /* STRING in tree MAINMENU */
+#define MAINMENU_M_HOME 50 /* STRING in tree MAINMENU */
+#define MAINMENU_M_LHISTORY 52 /* STRING in tree MAINMENU */
+#define MAINMENU_M_GHISTORY 53 /* STRING in tree MAINMENU */
+#define MAINMENU_M_ADD_BOOKMARK 55 /* STRING in tree MAINMENU */
+#define MAINMENU_M_BOOKMARKS 56 /* STRING in tree MAINMENU */
+#define MAINMENU_M_CHOICES 58 /* STRING in tree MAINMENU */
+#define MAINMENU_M_VLOG 59 /* STRING in tree MAINMENU */
+#define MAINMENU_M_HELP_CONTENT 61 /* STRING in tree MAINMENU */
#define TOOLBAR 1 /* form/dial */
#define TOOLBAR_BT_BACK 2 /* CICON in tree TOOLBAR */
@@ -149,6 +151,7 @@
#define CHOICES_EDIT_MIN_REFLOW_PERIOD 33 /* FTEXT in tree CHOICES */
#define CHOICES_DEC_INCREMENTAL_REFLOW 34 /* BOXCHAR in tree CHOICES */
#define CHOICES_INC_INCREMENTAL_REFLOW 35 /* BOXCHAR in tree CHOICES */
+#define CHOICES_CB_ANTI_ALIASING 102 /* BUTTON in tree CHOICES */
#define CHOICES_TAB_PATH 37 /* BUTTON in tree CHOICES */
#define CHOICES_EDIT_CA_CERTS_PATH 42 /* FTEXT in tree CHOICES */
#define CHOICES_EDIT_DOWNLOAD_PATH 43 /* FTEXT in tree CHOICES */
@@ -176,15 +179,17 @@
#define CHOICES_CB_PROXY_AUTH 79 /* BUTTON in tree CHOICES */
#define CHOICES_EDIT_PROXY_USERNAME 80 /* FTEXT in tree CHOICES */
#define CHOICES_EDIT_PROXY_PASSWORD 81 /* FTEXT in tree CHOICES */
-#define CHOICES_EDIT_PROXY_PORT 99 /* FTEXT in tree CHOICES */
-#define CHOICES_INC_MAX_FETCHERS_PER_HOST 87 /* BOXCHAR in tree CHOICES */
-#define CHOICES_INC_CACHED_CONNECTIONS 88 /* BOXCHAR in tree CHOICES */
-#define CHOICES_DEC_MAX_FETCHERS_PER_HOST 89 /* BOXCHAR in tree CHOICES */
-#define CHOICES_DEC_CACHED_CONNECTIONS 90 /* BOXCHAR in tree CHOICES */
-#define CHOICES_EDIT_MAX_FETCHERS_PER_HOST 91 /* FTEXT in tree CHOICES */
-#define CHOICES_EDIT_MAX_CACHED_CONNECTIONS 92 /* FTEXT in tree CHOICES */
-#define CHOICES_EDIT_MAX_FETCHERS 94 /* FTEXT in tree CHOICES */
-#define CHOICES_DEC_MAX_FETCHERS 95 /* BOXCHAR in tree CHOICES */
-#define CHOICES_INC_MAX_FETCHERS 96 /* BOXCHAR in tree CHOICES */
-#define CHOICES_ABORT 97 /* BUTTON in tree CHOICES */
-#define CHOICES_OK 98 /* BUTTON in tree CHOICES */
+#define CHOICES_EDIT_PROXY_PORT 83 /* FTEXT in tree CHOICES */
+#define CHOICES_INC_MAX_FETCHERS_PER_HOST 88 /* BOXCHAR in tree CHOICES */
+#define CHOICES_INC_CACHED_CONNECTIONS 89 /* BOXCHAR in tree CHOICES */
+#define CHOICES_DEC_MAX_FETCHERS_PER_HOST 90 /* BOXCHAR in tree CHOICES */
+#define CHOICES_DEC_CACHED_CONNECTIONS 91 /* BOXCHAR in tree CHOICES */
+#define CHOICES_EDIT_MAX_FETCHERS_PER_HOST 92 /* FTEXT in tree CHOICES */
+#define CHOICES_EDIT_MAX_CACHED_CONNECTIONS 93 /* FTEXT in tree CHOICES */
+#define CHOICES_EDIT_MAX_FETCHERS 95 /* FTEXT in tree CHOICES */
+#define CHOICES_DEC_MAX_FETCHERS 96 /* BOXCHAR in tree CHOICES */
+#define CHOICES_INC_MAX_FETCHERS 97 /* BOXCHAR in tree CHOICES */
+#define CHOICES_CB_FG_IMAGES 100 /* BUTTON in tree CHOICES */
+#define CHOICES_CB_BG_IMAGES 101 /* BUTTON in tree CHOICES */
+#define CHOICES_ABORT 98 /* BUTTON in tree CHOICES */
+#define CHOICES_OK 99 /* BUTTON in tree CHOICES */
Modified: trunk/netsurf/atari/res/netsurf.rsm
URL: http://source.netsurf-browser.org/trunk/netsurf/atari/res/netsurf.rsm?rev...
==============================================================================
--- trunk/netsurf/atari/res/netsurf.rsm (original)
+++ trunk/netsurf/atari/res/netsurf.rsm Fri Jan 6 17:30:59 2012
@@ -3,8 +3,8 @@
#N 99@32@AZAaza___ _@AZAaza090___ _@@_@
#FoC-Header@rsm2out@C-Header@rsh@@@[C-Header@0@
#R 0@0@1@1@1@1@
-#M 20010100@0@7728@594@
-#T 0@1@MAINMENU@@60@@
+#M 20010100@0@7728@596@
+#T 0@1@MAINMENU@@62@@
#O 4@32@T_FILE@@
#O 5@32@T_EDIT@@
#O 6@32@T_VIEW@@
@@ -31,16 +31,18 @@
#O 41@28@M_TOOLBARS@@
#O 43@28@M_SAVEWIN@@
#O 44@28@M_DEBUG_RENDER@@
-#O 46@28@M_BACK@@
-#O 47@28@M_FORWARD@@
-#O 48@28@M_HOME@@
-#O 50@28@M_LHISTORY@@
-#O 51@28@M_GHISTORY@@
-#O 53@28@M_ADD_BOOKMARK@@
-#O 54@28@M_BOOKMARKS@@
-#O 56@28@M_CHOICES@@
-#O 57@28@M_VLOG@@
-#O 59@28@M_HELP_CONTENT@@
+#O 45@28@M_BG_IMAGES@@
+#O 46@28@M_FG_IMAGES@@
+#O 48@28@M_BACK@@
+#O 49@28@M_FORWARD@@
+#O 50@28@M_HOME@@
+#O 52@28@M_LHISTORY@@
+#O 53@28@M_GHISTORY@@
+#O 55@28@M_ADD_BOOKMARK@@
+#O 56@28@M_BOOKMARKS@@
+#O 58@28@M_CHOICES@@
+#O 59@28@M_VLOG@@
+#O 61@28@M_HELP_CONTENT@@
#T 1@2@TOOLBAR@@7@@
#O 2@33@BT_BACK@@
#O 3@33@BT_HOME@@
@@ -114,7 +116,7 @@
#O 8@21@COPY_URL@@
#O 9@21@SAVE_AS@@
#O 10@21@VIEW_SOURCE@@
-#T 13@2@CHOICES@@100@@
+#T 13@2@CHOICES@@103@@
#O 1@26@REG_BROWSER@@
#O 2@26@REG_RENDER@@
#O 3@26@REG_STYLE@@
@@ -139,6 +141,7 @@
#O 33@29@EDIT_MIN_REFLOW_PERIOD@@
#O 34@27@DEC_INCREMENTAL_REFLOW@@
#O 35@27@INC_INCREMENTAL_REFLOW@@
+#O 102@26@CB_ANTI_ALIASING@@
#O 37@26@TAB_PATH@@
#O 42@29@EDIT_CA_CERTS_PATH@@
#O 43@29@EDIT_DOWNLOAD_PATH@@
@@ -166,16 +169,18 @@
#O 79@26@CB_PROXY_AUTH@@
#O 80@29@EDIT_PROXY_USERNAME@@
#O 81@29@EDIT_PROXY_PASSWORD@@
-#O 99@29@EDIT_PROXY_PORT@@
-#O 87@27@INC_MAX_FETCHERS_PER_HOST@@
-#O 88@27@INC_CACHED_CONNECTIONS@@
-#O 89@27@DEC_MAX_FETCHERS_PER_HOST@@
-#O 90@27@DEC_CACHED_CONNECTIONS@@
-#O 91@29@EDIT_MAX_FETCHERS_PER_HOST@@
-#O 92@29@EDIT_MAX_CACHED_CONNECTIONS@@
-#O 94@29@EDIT_MAX_FETCHERS@@
-#O 95@27@DEC_MAX_FETCHERS@@
-#O 96@27@INC_MAX_FETCHERS@@
-#O 97@26@ABORT@@
-#O 98@26@OK@@
-#c 8157@
+#O 83@29@EDIT_PROXY_PORT@@
+#O 88@27@INC_MAX_FETCHERS_PER_HOST@@
+#O 89@27@INC_CACHED_CONNECTIONS@@
+#O 90@27@DEC_MAX_FETCHERS_PER_HOST@@
+#O 91@27@DEC_CACHED_CONNECTIONS@@
+#O 92@29@EDIT_MAX_FETCHERS_PER_HOST@@
+#O 93@29@EDIT_MAX_CACHED_CONNECTIONS@@
+#O 95@29@EDIT_MAX_FETCHERS@@
+#O 96@27@DEC_MAX_FETCHERS@@
+#O 97@27@INC_MAX_FETCHERS@@
+#O 100@26@CB_FG_IMAGES@@
+#O 101@26@CB_BG_IMAGES@@
+#O 98@26@ABORT@@
+#O 99@26@OK@@
+#c 18899@
11 years, 5 months
r13388 mono - /trunk/netsurf/atari/settings.c
by netsurf＠semichrome.net
Author: mono
Date: Fri Jan 6 17:29:58 2012
New Revision: 13388
URL: http://source.netsurf-browser.org?rev=13388&view=rev
Log:
fix enable/disable of checkbox when font renderer is changed.
Modified:
trunk/netsurf/atari/settings.c
Modified: trunk/netsurf/atari/settings.c
URL: http://source.netsurf-browser.org/trunk/netsurf/atari/settings.c?rev=1338...
==============================================================================
--- trunk/netsurf/atari/settings.c (original)
+++ trunk/netsurf/atari/settings.c Fri Jan 6 17:29:58 2012
@@ -59,7 +59,7 @@
#define ENABLE_OBJ(idx) SET_BIT(dlgtree[idx].ob_state, DISABLED, 0); \
ObjcDraw( OC_FORM, dlgwin, idx, 1 )
-#define FORMEVENT(idx) form_event( NULL, idx, 1, NULL );
+#define FORMEVENT(idx) form_event( NULL, idx, 0, NULL );
#define INPUT_HOMEPAGE_URL_MAX_LEN 44
#define INPUT_LOCALE_MAX_LEN 6
@@ -208,7 +208,7 @@
}
static void __CDECL
-form_event( WINDOW *win, int index, int intern, void *unused2)
+form_event( WINDOW *win, int index, int external, void *unused2)
{
char spare[255];
bool is_button = false;
@@ -266,7 +266,7 @@
break;
case CHOICES_BT_SEL_FONT_RENDERER:
- if( !intern ){
+ if( external ){
objc_offset( FORM(win), CHOICES_BT_SEL_FONT_RENDERER, &x, &y);
choice = MenuPopUp ( font_driver_items, x, y,
num_font_drivers,
11 years, 5 months
r13387 mono - in /trunk/netsurf/atari: global_evnt.c global_evnt.h
by netsurf＠semichrome.net
Author: mono
Date: Fri Jan 6 17:23:31 2012
New Revision: 13387
URL: http://source.netsurf-browser.org?rev=13387&view=rev
Log:
Added menu items for foreground_images,background_images for fast access.
Modified:
trunk/netsurf/atari/global_evnt.c
trunk/netsurf/atari/global_evnt.h
Modified: trunk/netsurf/atari/global_evnt.c
URL: http://source.netsurf-browser.org/trunk/netsurf/atari/global_evnt.c?rev=1...
==============================================================================
--- trunk/netsurf/atari/global_evnt.c (original)
+++ trunk/netsurf/atari/global_evnt.c Fri Jan 6 17:23:31 2012
@@ -271,8 +271,20 @@
(html_redraw_debug) ? 1 : 0 );
}
}
-}
-
+}
+
+static void __CDECL menu_fg_images(WINDOW *win, int item, int title, void *data)
+{
+ option_foreground_images = !option_foreground_images;
+ MenuIcheck( NULL, MAINMENU_M_FG_IMAGES, (option_foreground_images) ? 1 : 0);
+}
+
+static void __CDECL menu_bg_images(WINDOW *win, int item, int title, void *data)
+{
+ option_background_images = !option_background_images;
+ MenuIcheck( NULL, MAINMENU_M_BG_IMAGES, (option_background_images) ? 1 : 0);
+}
+
static void __CDECL menu_back(WINDOW *win, int item, int title, void *data)
{
LOG(("%s", __FUNCTION__));
@@ -360,7 +372,9 @@
{T_VIEW, MAINMENU_M_RELOAD, "Reload", menu_reload, {0,NK_F5,0}, NULL},
{T_VIEW, MAINMENU_M_TOOLBARS, "Toolbars", menu_toolbars, {0,0,0}, NULL},
{T_VIEW, MAINMENU_M_SAVEWIN, "", menu_savewin, {0,0,0}, NULL},
- {T_VIEW, MAINMENU_M_DEBUG_RENDER, "", menu_debug_render, {0,0,0}, NULL},
+ {T_VIEW, MAINMENU_M_DEBUG_RENDER, "", menu_debug_render, {0,0,0}, NULL},
+ {T_VIEW, MAINMENU_M_FG_IMAGES, "", menu_fg_images, {0,0,0}, NULL},
+ {T_VIEW, MAINMENU_M_BG_IMAGES, "", menu_bg_images, {0,0,0}, NULL},
{T_VIEW, MAINMENU_M_STOP, "Stop", menu_stop, {0,0,0}, NULL},
{T_NAV, MAINMENU_M_BACK, "Back", menu_back, {0,0,0}, NULL},
{T_NAV, MAINMENU_M_FORWARD, "Forward", menu_forward, {0,0,0}, NULL},
@@ -654,6 +668,13 @@
count++;
}
}
+}
+
+void main_menu_update( void )
+{
+ MenuIcheck( NULL, MAINMENU_M_DEBUG_RENDER, (html_redraw_debug) ? 1 : 0);
+ MenuIcheck( NULL, MAINMENU_M_FG_IMAGES, (option_foreground_images) ? 1 : 0);
+ MenuIcheck( NULL, MAINMENU_M_BG_IMAGES, (option_background_images) ? 1 : 0);
}
@@ -749,7 +770,8 @@
MenuText( NULL, menu_evnt_tbl[i].rid, menu_evnt_tbl[i].menustr );
}
i++;
- }
+ }
+ main_menu_update();
/* TODO: Fix pixel sizes for Titles and Items (for non-8px fonts) */
}
Modified: trunk/netsurf/atari/global_evnt.h
URL: http://source.netsurf-browser.org/trunk/netsurf/atari/global_evnt.h?rev=1...
==============================================================================
--- trunk/netsurf/atari/global_evnt.h (original)
+++ trunk/netsurf/atari/global_evnt.h Fri Jan 6 17:23:31 2012
@@ -56,7 +56,8 @@
*/
void bind_global_events( void );
-void unbind_global_events( void );
+void unbind_global_events( void );
+void main_menu_update( void );
#endif
11 years, 5 months
r13386 mono - /trunk/netsurf/atari/settings.c
by netsurf＠semichrome.net
Author: mono
Date: Fri Jan 6 17:22:08 2012
New Revision: 13386
URL: http://source.netsurf-browser.org?rev=13386&view=rev
Log:
Added settings for: foreground_images, background_images, monochrom glyph rendering.
Modified:
trunk/netsurf/atari/settings.c
Modified: trunk/netsurf/atari/settings.c
URL: http://source.netsurf-browser.org/trunk/netsurf/atari/settings.c?rev=1338...
==============================================================================
--- trunk/netsurf/atari/settings.c (original)
+++ trunk/netsurf/atari/settings.c Fri Jan 6 17:22:08 2012
@@ -11,6 +11,7 @@
#include "desktop/options.h"
#include "atari/res/netsurf.rsh"
#include "atari/settings.h"
+#include "atari/global_evnt.h"
#include "atari/misc.h"
#include "atari/options.h"
@@ -58,7 +59,7 @@
#define ENABLE_OBJ(idx) SET_BIT(dlgtree[idx].ob_state, DISABLED, 0); \
ObjcDraw( OC_FORM, dlgwin, idx, 1 )
-#define FORMEVENT(idx) form_event( NULL, idx, 0, NULL );
+#define FORMEVENT(idx) form_event( NULL, idx, 1, NULL );
#define INPUT_HOMEPAGE_URL_MAX_LEN 44
#define INPUT_LOCALE_MAX_LEN 6
@@ -106,7 +107,7 @@
ObjcAttachFormFunc( dlgwin, CHOICES_ABORT, closeform, NULL);
ObjcAttachFormFunc( dlgwin, CHOICES_OK, saveform, NULL);
- /* Connect dialog element events to generic event handler: */
+ /* Connect interactive dialog elements to generic event handler: */
ObjcAttachFormFunc( dlgwin, CHOICES_CB_USE_PROXY, form_event, NULL);
ObjcAttachFormFunc( dlgwin, CHOICES_CB_PROXY_AUTH, form_event, NULL);
ObjcAttachFormFunc( dlgwin, CHOICES_EDIT_DOWNLOAD_PATH, form_event, NULL);
@@ -195,8 +196,9 @@
options_write( (const char*)&options );
options_read( (const char*)&options );
close_settings();
- ObjcChange( OC_FORM, win, index, NORMAL, TRUE);
+ ObjcChange( OC_FORM, win, index, NORMAL, TRUE);
form_alert(1, "[1][Some options require an netsurf restart!][OK]");
+ main_menu_update();
}
static void __CDECL clear_history( WINDOW *win, int index, int unused,
@@ -206,11 +208,12 @@
}
static void __CDECL
-form_event( WINDOW *win, int index, int unused, void *unused2)
+form_event( WINDOW *win, int index, int intern, void *unused2)
{
char spare[255];
bool is_button = false;
bool checked = OBJ_SELECTED( index );
+ char * tmp;
/* For font driver popup: */
const char *font_driver_items[] = {"freetype", "internal" };
@@ -263,16 +266,24 @@
break;
case CHOICES_BT_SEL_FONT_RENDERER:
- objc_offset( FORM(win), CHOICES_BT_SEL_FONT_RENDERER, &x, &y);
- choice = MenuPopUp ( font_driver_items, x, y,
- num_font_drivers,
- -1, -1, P_LIST + P_WNDW + P_CHCK );
- if( choice > 0 &&
- choice <= num_font_drivers ){
- ObjcStrCpy( dlgtree, CHOICES_BT_SEL_FONT_RENDERER,
- (char*)font_driver_items[choice-1] );
- }
- ObjcChange( OC_FORM, win, index, NORMAL, TRUE);
+ if( !intern ){
+ objc_offset( FORM(win), CHOICES_BT_SEL_FONT_RENDERER, &x, &y);
+ choice = MenuPopUp ( font_driver_items, x, y,
+ num_font_drivers,
+ -1, -1, P_LIST + P_WNDW + P_CHCK );
+ if( choice > 0 &&
+ choice <= num_font_drivers ){
+ ObjcStrCpy( dlgtree, CHOICES_BT_SEL_FONT_RENDERER,
+ (char*)font_driver_items[choice-1] );
+ }
+ ObjcChange( OC_FORM, win, index, NORMAL, TRUE);
+ }
+ tmp = ObjcString( dlgtree, CHOICES_BT_SEL_FONT_RENDERER, NULL);
+ if( strcmp(tmp, "freetype") == 0 ){
+ ENABLE_OBJ( CHOICES_CB_ANTI_ALIASING );
+ } else {
+ DISABLE_OBJ( CHOICES_CB_ANTI_ALIASING );
+ }
break;
case CHOICES_BT_SEL_LOCALE:
@@ -457,9 +468,11 @@
// enable / disable objects depending on radio button values.
FORMEVENT(CHOICES_CB_USE_PROXY);
FORMEVENT(CHOICES_CB_PROXY_AUTH);
-}
-
-
+ FORMEVENT(CHOICES_BT_SEL_FONT_RENDERER);
+}
+
+
+/* this gets called each time the settings dialog is opened: */
static void display_settings( void )
{
char spare[255];
@@ -519,6 +532,8 @@
SELECTED, option_animate_images ? 1 : 0 );
SET_BIT(dlgtree[CHOICES_CB_INCREMENTAL_REFLOW].ob_state,
SELECTED, option_incremental_reflow ? 1 : 0 );
+ SET_BIT(dlgtree[CHOICES_CB_ANTI_ALIASING].ob_state,
+ SELECTED, option_atari_font_monochrom ? 0 : 1 );
tmp_option_min_reflow_period = option_min_reflow_period;
sprintf( spare, "%04d", tmp_option_min_reflow_period );
@@ -540,10 +555,14 @@
INPUT_PROXY_USERNAME_MAX_LEN );
set_text( CHOICES_EDIT_PROXY_PASSWORD, option_http_proxy_auth_pass,
INPUT_PROXY_PASSWORD_MAX_LEN );
- if( option_http_proxy )
- OBJ_CHECK( CHOICES_CB_USE_PROXY );
- if( option_http_proxy_auth )
- OBJ_CHECK( CHOICES_CB_PROXY_AUTH );
+ SET_BIT(dlgtree[CHOICES_CB_USE_PROXY].ob_state,
+ SELECTED, option_http_proxy ? 1 : 0 );
+ SET_BIT(dlgtree[CHOICES_CB_PROXY_AUTH].ob_state,
+ SELECTED, option_http_proxy_auth ? 1 : 0 );
+ SET_BIT(dlgtree[CHOICES_CB_FG_IMAGES].ob_state,
+ SELECTED, option_foreground_images ? 1 : 0 );
+ SET_BIT(dlgtree[CHOICES_CB_BG_IMAGES].ob_state,
+ SELECTED, option_background_images ? 1 : 0 );
tmp_option_max_cached_fetch_handles = option_max_cached_fetch_handles;
sprintf( spare, "%2d", option_max_cached_fetch_handles );
@@ -570,7 +589,7 @@
/* Only first tab is refreshed: */
ObjcDraw( OC_FORM, dlgwin, CHOICES_TAB_BROWSER, 4 );
- // update elements chained to form events:
+ // update elements (enable/disable) chained to form events:
toggle_objects();
}
@@ -598,6 +617,8 @@
atoi( ObjcString( dlgtree, CHOICES_EDIT_MAX_CACHED_CONNECTIONS, NULL));
option_max_fetchers =
atoi( ObjcString( dlgtree, CHOICES_EDIT_MAX_FETCHERS, NULL) );
+ option_foreground_images = OBJ_SELECTED( CHOICES_CB_FG_IMAGES );
+ option_background_images = OBJ_SELECTED( CHOICES_CB_BG_IMAGES );
/* "Style" tab: */
option_font_min_size = tmp_option_font_min_size;
11 years, 5 months
r13385 tlsa - /trunk/netsurf/gtk/search.c
by netsurf＠semichrome.net
Author: tlsa
Date: Fri Jan 6 17:10:04 2012
New Revision: 13385
URL: http://source.netsurf-browser.org?rev=13385&view=rev
Log:
Search-as-you-type.
Modified:
trunk/netsurf/gtk/search.c
Modified: trunk/netsurf/gtk/search.c
URL: http://source.netsurf-browser.org/trunk/netsurf/gtk/search.c?rev=13385&r1...
==============================================================================
--- trunk/netsurf/gtk/search.c (original)
+++ trunk/netsurf/gtk/search.c Fri Jan 6 17:10:04 2012
@@ -134,11 +134,25 @@
struct browser_window *bw = nsgtk_get_browser_window(
nsgtk_scaffolding_top_level(g));
- if (bw != NULL)
- browser_window_search_destroy_context(bw);
+ assert(bw != NULL);
+
+ browser_window_search_destroy_context(bw);
nsgtk_search_set_forward_state(true, (void *)bw);
nsgtk_search_set_back_state(true, (void *)bw);
+
+ search_flags_t flags = SEARCH_FLAG_FORWARDS |
+ (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(
+ nsgtk_scaffolding_search(g)->caseSens)) ?
+ SEARCH_FLAG_CASE_SENSITIVE : 0) |
+ (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(
+ nsgtk_scaffolding_search(g)->checkAll)) ?
+ SEARCH_FLAG_SHOWALL : 0);
+
+ if (browser_window_search_verify_new(bw, &nsgtk_search_callbacks,
+ (void *)bw))
+ browser_window_search_step(bw, flags, gtk_entry_get_text(
+ nsgtk_scaffolding_search(g)->entry));
return TRUE;
}
11 years, 5 months