netsurf: branch master updated. release/3.0-169-g8b586b2
by NetSurf Browser Project
Gitweb links:
...log http://git.netsurf-browser.org/netsurf.git/shortlog/8b586b2d67dad1f7d8740...
...commit http://git.netsurf-browser.org/netsurf.git/commit/8b586b2d67dad1f7d874091...
...tree http://git.netsurf-browser.org/netsurf.git/tree/8b586b2d67dad1f7d87409166...
The branch, master has been updated
via 8b586b2d67dad1f7d874091664ab582936e15dc4 (commit)
from 864762cbe60d04ba978ddbd9bf125240dd26f631 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commitdiff http://git.netsurf-browser.org/netsurf.git/commit/?id=8b586b2d67dad1f7d87...
commit 8b586b2d67dad1f7d874091664ab582936e15dc4
Author: Chris Young <chris(a)unsatisfactorysoftware.co.uk>
Commit: Chris Young <chris(a)unsatisfactorysoftware.co.uk>
Fix a crash when edit settings if NetSurf is running on the WB screen
Rename use_pubscreen to make it clearer what the option is for
diff --git a/amiga/arexx.c b/amiga/arexx.c
index 5ff7792..ed05f6c 100644
--- a/amiga/arexx.c
+++ b/amiga/arexx.c
@@ -455,13 +455,13 @@ STATIC VOID rx_pubscreen(struct ARexxCmd *cmd, struct RexxMsg *rxm __attribute__
{
cmd->ac_RC = 0;
- if(nsoption_charp(use_pubscreen) == NULL)
+ if(nsoption_charp(pubscreen_name) == NULL)
{
strcpy(result,"NetSurf");
}
else
{
- strcpy(result, nsoption_charp(use_pubscreen));
+ strcpy(result, nsoption_charp(pubscreen_name));
}
cmd->ac_Result = result;
diff --git a/amiga/dist/Install b/amiga/dist/Install
index c2eabb7..3977629 100755
--- a/amiga/dist/Install
+++ b/amiga/dist/Install
@@ -558,7 +558,7 @@
(help @textfile-help)
(dest #user-options)
(append "theme:" #theme "\n")
- (append "use_pubscreen:Workbench\n")
+ (append "pubscreen_name:Workbench\n")
)
(if (= #hotlist-exist 0)
diff --git a/amiga/drag.c b/amiga/drag.c
index be4d490..1123ba2 100644
--- a/amiga/drag.c
+++ b/amiga/drag.c
@@ -55,7 +55,7 @@ void gui_drag_save_object(gui_save_type type, hlcache_handle *c,
{
const char *filetype = NULL;
- if(strcmp(nsoption_charp(use_pubscreen), "Workbench")) return;
+ if(strcmp(nsoption_charp(pubscreen_name), "Workbench")) return;
switch(type)
{
@@ -106,7 +106,7 @@ void ami_drag_save(struct Window *win)
ami_drag_icon_close(NULL);
ami_autoscroll = FALSE;
- if(nsoption_charp(use_pubscreen) && (strcmp(nsoption_charp(use_pubscreen),"Workbench") == 0))
+ if(nsoption_charp(pubscreen_name) && (strcmp(nsoption_charp(pubscreen_name),"Workbench") == 0))
{
which = WhichWorkbenchObject(NULL,scrn->MouseX,scrn->MouseY,
WBOBJA_Type,&type,
diff --git a/amiga/gui.c b/amiga/gui.c
index b1786ce..536981c 100644
--- a/amiga/gui.c
+++ b/amiga/gui.c
@@ -690,7 +690,7 @@ void ami_openscreen(void)
compositing = ~0UL;
else compositing = nsoption_int(screen_compositing);
- if (nsoption_charp(use_pubscreen) == NULL)
+ if (nsoption_charp(pubscreen_name) == NULL)
{
if((nsoption_charp(screen_modeid)) &&
(strncmp(nsoption_charp(screen_modeid), "0x", 2) == 0))
@@ -739,15 +739,15 @@ void ami_openscreen(void)
}
else
{
- nsoption_set_charp(use_pubscreen,
+ nsoption_set_charp(pubscreen_name,
strdup("Workbench"));
}
}
}
- if (nsoption_charp(use_pubscreen) != NULL)
+ if (nsoption_charp(pubscreen_name) != NULL)
{
- scrn = LockPubScreen(nsoption_charp(use_pubscreen));
+ scrn = LockPubScreen(nsoption_charp(pubscreen_name));
if(scrn == NULL)
{
@@ -3275,9 +3275,9 @@ struct gui_window *gui_create_browser_window(struct browser_window *bw,
ULONG addtabclosegadget = TAG_IGNORE;
ULONG iconifygadget = FALSE;
- if (nsoption_charp(use_pubscreen) &&
+ if (nsoption_charp(pubscreen_name) &&
(locked_screen == TRUE) &&
- (strcmp(nsoption_charp(use_pubscreen), "Workbench") == 0))
+ (strcmp(nsoption_charp(pubscreen_name), "Workbench") == 0))
iconifygadget = TRUE;
ami_create_menu(g->shared);
diff --git a/amiga/gui_options.c b/amiga/gui_options.c
index 1c06e34..a68a4ec 100755
--- a/amiga/gui_options.c
+++ b/amiga/gui_options.c
@@ -415,9 +415,9 @@ void ami_gui_opts_open(void)
return;
}
- if(nsoption_charp(use_pubscreen))
+ if(nsoption_charp(pubscreen_name))
{
- if(strcmp(nsoption_charp(use_pubscreen),"Workbench") == 0)
+ if(strcmp(nsoption_charp(pubscreen_name),"Workbench") == 0)
{
screenoptsselected = 1;
screennamedisabled = TRUE;
@@ -694,7 +694,7 @@ void ami_gui_opts_open(void)
GA_ID, GID_OPTS_SCREENNAME,
GA_RelVerify, TRUE,
GA_Disabled,screennamedisabled,
- STRINGA_TextVal, nsoption_bool(use_pubscreen),
+ STRINGA_TextVal, nsoption_charp(pubscreen_name),
STRINGA_BufferPos,0,
StringEnd,
LayoutEnd,
@@ -1573,16 +1573,16 @@ void ami_gui_opts_use(bool save)
switch(data)
{
case 0:
- nsoption_set_charp(use_pubscreen, strdup("\0"));
+ nsoption_set_charp(pubscreen_name, strdup("\0"));
break;
case 1:
- nsoption_set_charp(use_pubscreen, (char *)strdup("Workbench"));
+ nsoption_set_charp(pubscreen_name, (char *)strdup("Workbench"));
break;
case 2:
GetAttr(STRINGA_TextVal,gow->objects[GID_OPTS_SCREENNAME],(ULONG *)&data);
- nsoption_set_charp(use_pubscreen, (char *)strdup((char *)data));
+ nsoption_set_charp(pubscreen_name, (char *)strdup((char *)data));
break;
}
diff --git a/amiga/options.h b/amiga/options.h
index a9278e7..b95ddf1 100644
--- a/amiga/options.h
+++ b/amiga/options.h
@@ -27,7 +27,7 @@
NSOPTION_STRING(url_file, NULL)
NSOPTION_STRING(hotlist_file, NULL)
-NSOPTION_STRING(use_pubscreen, NULL)
+NSOPTION_STRING(pubscreen_name, NULL)
NSOPTION_STRING(screen_modeid, NULL)
NSOPTION_INTEGER(screen_compositing, -1)
NSOPTION_INTEGER(screen_ydpi, 85)
-----------------------------------------------------------------------
Summary of changes:
amiga/arexx.c | 4 ++--
amiga/dist/Install | 2 +-
amiga/drag.c | 4 ++--
amiga/gui.c | 12 ++++++------
amiga/gui_options.c | 12 ++++++------
amiga/options.h | 2 +-
6 files changed, 18 insertions(+), 18 deletions(-)
diff --git a/amiga/arexx.c b/amiga/arexx.c
index 5ff7792..ed05f6c 100644
--- a/amiga/arexx.c
+++ b/amiga/arexx.c
@@ -455,13 +455,13 @@ STATIC VOID rx_pubscreen(struct ARexxCmd *cmd, struct RexxMsg *rxm __attribute__
{
cmd->ac_RC = 0;
- if(nsoption_charp(use_pubscreen) == NULL)
+ if(nsoption_charp(pubscreen_name) == NULL)
{
strcpy(result,"NetSurf");
}
else
{
- strcpy(result, nsoption_charp(use_pubscreen));
+ strcpy(result, nsoption_charp(pubscreen_name));
}
cmd->ac_Result = result;
diff --git a/amiga/dist/Install b/amiga/dist/Install
index c2eabb7..3977629 100755
--- a/amiga/dist/Install
+++ b/amiga/dist/Install
@@ -558,7 +558,7 @@
(help @textfile-help)
(dest #user-options)
(append "theme:" #theme "\n")
- (append "use_pubscreen:Workbench\n")
+ (append "pubscreen_name:Workbench\n")
)
(if (= #hotlist-exist 0)
diff --git a/amiga/drag.c b/amiga/drag.c
index be4d490..1123ba2 100644
--- a/amiga/drag.c
+++ b/amiga/drag.c
@@ -55,7 +55,7 @@ void gui_drag_save_object(gui_save_type type, hlcache_handle *c,
{
const char *filetype = NULL;
- if(strcmp(nsoption_charp(use_pubscreen), "Workbench")) return;
+ if(strcmp(nsoption_charp(pubscreen_name), "Workbench")) return;
switch(type)
{
@@ -106,7 +106,7 @@ void ami_drag_save(struct Window *win)
ami_drag_icon_close(NULL);
ami_autoscroll = FALSE;
- if(nsoption_charp(use_pubscreen) && (strcmp(nsoption_charp(use_pubscreen),"Workbench") == 0))
+ if(nsoption_charp(pubscreen_name) && (strcmp(nsoption_charp(pubscreen_name),"Workbench") == 0))
{
which = WhichWorkbenchObject(NULL,scrn->MouseX,scrn->MouseY,
WBOBJA_Type,&type,
diff --git a/amiga/gui.c b/amiga/gui.c
index b1786ce..536981c 100644
--- a/amiga/gui.c
+++ b/amiga/gui.c
@@ -690,7 +690,7 @@ void ami_openscreen(void)
compositing = ~0UL;
else compositing = nsoption_int(screen_compositing);
- if (nsoption_charp(use_pubscreen) == NULL)
+ if (nsoption_charp(pubscreen_name) == NULL)
{
if((nsoption_charp(screen_modeid)) &&
(strncmp(nsoption_charp(screen_modeid), "0x", 2) == 0))
@@ -739,15 +739,15 @@ void ami_openscreen(void)
}
else
{
- nsoption_set_charp(use_pubscreen,
+ nsoption_set_charp(pubscreen_name,
strdup("Workbench"));
}
}
}
- if (nsoption_charp(use_pubscreen) != NULL)
+ if (nsoption_charp(pubscreen_name) != NULL)
{
- scrn = LockPubScreen(nsoption_charp(use_pubscreen));
+ scrn = LockPubScreen(nsoption_charp(pubscreen_name));
if(scrn == NULL)
{
@@ -3275,9 +3275,9 @@ struct gui_window *gui_create_browser_window(struct browser_window *bw,
ULONG addtabclosegadget = TAG_IGNORE;
ULONG iconifygadget = FALSE;
- if (nsoption_charp(use_pubscreen) &&
+ if (nsoption_charp(pubscreen_name) &&
(locked_screen == TRUE) &&
- (strcmp(nsoption_charp(use_pubscreen), "Workbench") == 0))
+ (strcmp(nsoption_charp(pubscreen_name), "Workbench") == 0))
iconifygadget = TRUE;
ami_create_menu(g->shared);
diff --git a/amiga/gui_options.c b/amiga/gui_options.c
index 1c06e34..a68a4ec 100755
--- a/amiga/gui_options.c
+++ b/amiga/gui_options.c
@@ -415,9 +415,9 @@ void ami_gui_opts_open(void)
return;
}
- if(nsoption_charp(use_pubscreen))
+ if(nsoption_charp(pubscreen_name))
{
- if(strcmp(nsoption_charp(use_pubscreen),"Workbench") == 0)
+ if(strcmp(nsoption_charp(pubscreen_name),"Workbench") == 0)
{
screenoptsselected = 1;
screennamedisabled = TRUE;
@@ -694,7 +694,7 @@ void ami_gui_opts_open(void)
GA_ID, GID_OPTS_SCREENNAME,
GA_RelVerify, TRUE,
GA_Disabled,screennamedisabled,
- STRINGA_TextVal, nsoption_bool(use_pubscreen),
+ STRINGA_TextVal, nsoption_charp(pubscreen_name),
STRINGA_BufferPos,0,
StringEnd,
LayoutEnd,
@@ -1573,16 +1573,16 @@ void ami_gui_opts_use(bool save)
switch(data)
{
case 0:
- nsoption_set_charp(use_pubscreen, strdup("\0"));
+ nsoption_set_charp(pubscreen_name, strdup("\0"));
break;
case 1:
- nsoption_set_charp(use_pubscreen, (char *)strdup("Workbench"));
+ nsoption_set_charp(pubscreen_name, (char *)strdup("Workbench"));
break;
case 2:
GetAttr(STRINGA_TextVal,gow->objects[GID_OPTS_SCREENNAME],(ULONG *)&data);
- nsoption_set_charp(use_pubscreen, (char *)strdup((char *)data));
+ nsoption_set_charp(pubscreen_name, (char *)strdup((char *)data));
break;
}
diff --git a/amiga/options.h b/amiga/options.h
index a9278e7..b95ddf1 100644
--- a/amiga/options.h
+++ b/amiga/options.h
@@ -27,7 +27,7 @@
NSOPTION_STRING(url_file, NULL)
NSOPTION_STRING(hotlist_file, NULL)
-NSOPTION_STRING(use_pubscreen, NULL)
+NSOPTION_STRING(pubscreen_name, NULL)
NSOPTION_STRING(screen_modeid, NULL)
NSOPTION_INTEGER(screen_compositing, -1)
NSOPTION_INTEGER(screen_ydpi, 85)
--
NetSurf Browser
9 years, 9 months
netsurf: branch master updated. release/3.0-168-g864762c
by NetSurf Browser Project
Gitweb links:
...log http://git.netsurf-browser.org/netsurf.git/shortlog/864762cbe60d04ba978dd...
...commit http://git.netsurf-browser.org/netsurf.git/commit/864762cbe60d04ba978ddbd...
...tree http://git.netsurf-browser.org/netsurf.git/tree/864762cbe60d04ba978ddbd9b...
The branch, master has been updated
via 864762cbe60d04ba978ddbd9bf125240dd26f631 (commit)
via fe2a80fe109e0e8dc60957ded5a93b39f429e1f1 (commit)
via ddbc8c7f6350f9978cc50deae74ecb4c053d790e (commit)
via 2bce0185fe219181312ac377e659790291931e36 (commit)
via f16f2f2904bd554955dd601f4c404489cff3439f (commit)
via 36b40e219a8edc587d6a196af83c4b30a94f200b (commit)
via 034ba7c2f2077bbc4f20628971bf2b061031ff9f (commit)
from 9b39408dffe09940589c2f00026c0e605d836b78 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commitdiff http://git.netsurf-browser.org/netsurf.git/commit/?id=864762cbe60d04ba978...
commit 864762cbe60d04ba978ddbd9bf125240dd26f631
Merge: 9b39408 fe2a80f
Author: Chris Young <chris(a)unsatisfactorysoftware.co.uk>
Commit: Chris Young <chris(a)unsatisfactorysoftware.co.uk>
Merge branch 'chris/gadtools-53-5'
-----------------------------------------------------------------------
Summary of changes:
amiga/menu.c | 47 ++++++++++++++++++++++++++++++-----------------
desktop/tree.c | 11 +++++++++++
desktop/tree.h | 1 +
desktop/tree_url_node.c | 11 +++++++++++
desktop/tree_url_node.h | 1 +
5 files changed, 54 insertions(+), 17 deletions(-)
diff --git a/amiga/menu.c b/amiga/menu.c
index 5cd7e6a..d5e67b9 100644
--- a/amiga/menu.c
+++ b/amiga/menu.c
@@ -1,5 +1,5 @@
/*
- * Copyright 2008-9 Chris Young <chris(a)unsatisfactorysoftware.co.uk>
+ * Copyright 2008-9,2013 Chris Young <chris(a)unsatisfactorysoftware.co.uk>
*
* This file is part of NetSurf, http://www.netsurf-browser.org/
*
@@ -64,17 +64,6 @@
#include "utils/messages.h"
#include "utils/schedule.h"
-#define IMAGE_MENU_ITEM(n, i, t) \
- gwin->menulab[n] = LabelObject, \
- LABEL_DrawInfo, dri, \
- LABEL_DisposeImage, TRUE, \
- LABEL_Image, BitMapObject, \
- BITMAP_Screen, scrn, \
- BITMAP_SourceFile, i, \
- BitMapEnd, \
- LABEL_Text, t, \
- LabelEnd;
-
BOOL menualreadyinit;
const char * const netsurf_version;
const char * const verdate;
@@ -169,7 +158,33 @@ static void ami_menu_alloc_item(struct gui_window_2 *gwin, int num, UBYTE type,
gwin->menulab[num] = ami_utf8_easy(messages_get(label));
}
}
-
+
+ if((GadToolsBase->lib_Version > 53) ||
+ ((GadToolsBase->lib_Version == 53) && (GadToolsBase->lib_Revision >= 5))) {
+ /* GadTools 53.5+ only. For now we will only create the menu
+ using label.image if there's a bitmap associated with the item. */
+ if(bm != NULL) {
+ struct DrawInfo *dri = GetScreenDrawInfo(scrn);
+ struct BitMap *menu_icon = ami_bitmap_get_native(bm, 16, 16, NULL);
+
+ gwin->menuobj[num] = LabelObject,
+ LABEL_DrawInfo, dri,
+ LABEL_DisposeImage, TRUE,
+ LABEL_Image, BitMapObject,
+ BITMAP_Screen, scrn,
+ BITMAP_BitMap, menu_icon,
+ BITMAP_Width, 16,
+ BITMAP_Height, 16,
+ BitMapEnd,
+ LABEL_Text, gwin->menulab[num],
+ LabelEnd;
+
+ gwin->menutype[num] |= MENU_IMAGE;
+
+ FreeScreenDrawInfo(scrn, dri);
+ }
+ }
+
if(key) gwin->menukey[num] = key;
if(func) gwin->menu_hook[num].h_Entry = (HOOKFUNC)func;
if(hookdata) gwin->menu_hook[num].h_Data = hookdata;
@@ -178,7 +193,6 @@ static void ami_menu_alloc_item(struct gui_window_2 *gwin, int num, UBYTE type,
void ami_init_menulabs(struct gui_window_2 *gwin)
{
int i;
- struct DrawInfo *dri = GetScreenDrawInfo(scrn);
gwin->menutype = AllocVec(AMI_MENU_AREXX_MAX + 1, MEMF_PRIVATE | MEMF_CLEAR);
@@ -290,8 +304,6 @@ void ami_init_menulabs(struct gui_window_2 *gwin)
ami_menu_item_arexx_execute, NULL);
ami_menu_alloc_item(gwin, M_BAR_A1, NM_ITEM, NM_BARLABEL, 0, NULL, NULL, NULL);
gwin->menutype[AMI_MENU_AREXX_MAX] = NM_END;
-
- FreeScreenDrawInfo(scrn, dri);
}
/* Menu refresh for hotlist */
@@ -458,7 +470,8 @@ void ami_menu_scan_2(struct tree *tree, struct node *root, WORD *gen,
if(*gen == 1) menu_type = NM_ITEM;
if(*gen == 2) menu_type = NM_SUB;
- ami_menu_alloc_item(gwin, *item, menu_type, tree_url_node_get_title(node), 0, NULL,
+ ami_menu_alloc_item(gwin, *item, menu_type, tree_url_node_get_title(node),
+ 0, tree_url_node_get_icon(node),
ami_menu_item_hotlist_entries, (void *)tree_url_node_get_url(node));
if(tree_node_is_folder(node) && (!tree_node_get_child(node)))
gwin->menu[*item].nm_Flags = NM_ITEMDISABLED;
diff --git a/desktop/tree.c b/desktop/tree.c
index 25bd948..2e35b5b 100644
--- a/desktop/tree.c
+++ b/desktop/tree.c
@@ -1552,6 +1552,17 @@ const char *tree_node_element_get_text(struct node_element *element)
/**
+ * Returns the node element's icon
+ *
+ * \return the node element's icon
+ */
+struct bitmap *tree_node_element_get_icon(struct node_element *element)
+{
+ return element->bitmap;
+}
+
+
+/**
* Get the root node of a tree
*
* \param tree the tree to get the root of
diff --git a/desktop/tree.h b/desktop/tree.h
index 00ac999..20ade30 100644
--- a/desktop/tree.h
+++ b/desktop/tree.h
@@ -200,6 +200,7 @@ void tree_update_node_element(struct tree *tree, struct node_element *element,
const char *text, void *bitmap);
bool tree_update_element_text(struct tree *tree, struct node_element *element, char *text);
const char *tree_node_element_get_text(struct node_element *element);
+struct bitmap *tree_node_element_get_icon(struct node_element *element);
struct node *tree_get_root(struct tree *tree);
bool tree_is_edited(struct tree *tree);
tree_drag_type tree_drag_status(struct tree *tree);
diff --git a/desktop/tree_url_node.c b/desktop/tree_url_node.c
index 945893f..8472fff 100644
--- a/desktop/tree_url_node.c
+++ b/desktop/tree_url_node.c
@@ -339,6 +339,17 @@ const char *tree_url_node_get_url(struct node *node)
return tree_node_element_get_text(element);
}
+
+struct bitmap *tree_url_node_get_icon(struct node *node)
+{
+ struct node_element *element;
+ element = tree_node_find_element(node, TREE_ELEMENT_TITLE, NULL);
+ if (element == NULL)
+ return NULL;
+ return tree_node_element_get_icon(element);
+}
+
+
void tree_url_node_edit_title(struct tree *tree, struct node *node)
{
struct node_element *element;
diff --git a/desktop/tree_url_node.h b/desktop/tree_url_node.h
index 1f0231d..bcbc192 100644
--- a/desktop/tree_url_node.h
+++ b/desktop/tree_url_node.h
@@ -43,6 +43,7 @@ void tree_update_URL_node(struct tree *tree, struct node *node,
nsurl *url, const struct url_data *data);
const char *tree_url_node_get_title(struct node *node);
const char *tree_url_node_get_url(struct node *node);
+struct bitmap *tree_url_node_get_icon(struct node *node);
void tree_url_node_edit_title(struct tree *tree, struct node *node);
void tree_url_node_edit_url(struct tree *tree, struct node *node);
--
NetSurf Browser
9 years, 9 months
netsurf: branch master updated. release/3.0-161-g9b39408
by NetSurf Browser Project
Gitweb links:
...log http://git.netsurf-browser.org/netsurf.git/shortlog/9b39408dffe09940589c2...
...commit http://git.netsurf-browser.org/netsurf.git/commit/9b39408dffe09940589c2f0...
...tree http://git.netsurf-browser.org/netsurf.git/tree/9b39408dffe09940589c2f000...
The branch, master has been updated
via 9b39408dffe09940589c2f00026c0e605d836b78 (commit)
via ac1865f36181d3b25045d0ab284b70b697b6a2ed (commit)
from b2aa0c129c73201b7e1e466d9996e5e491464592 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commitdiff http://git.netsurf-browser.org/netsurf.git/commit/?id=9b39408dffe09940589...
commit 9b39408dffe09940589c2f00026c0e605d836b78
Author: Chris Young <chris(a)unsatisfactorysoftware.co.uk>
Commit: Chris Young <chris(a)unsatisfactorysoftware.co.uk>
Use macro directly
diff --git a/amiga/plotters.c b/amiga/plotters.c
index a4ddb61..d95915c 100755
--- a/amiga/plotters.c
+++ b/amiga/plotters.c
@@ -102,9 +102,6 @@ const struct plotter_table amiplot = {
.option_knockout = true,
};
-colour ami_abgr_to_argb(colour c) {
- return ns_color_to_nscss(c);
-}
#ifdef NS_AMIGA_CAIRO
void ami_cairo_set_colour(cairo_t *cr,colour c)
@@ -288,7 +285,7 @@ static void ami_plot_setapen(ULONG colour)
{
if(palette_mapped == false) {
SetRPAttrs(glob->rp, RPTAG_APenColor,
- ami_abgr_to_argb(colour),
+ ns_color_to_nscss(colour),
TAG_DONE);
} else {
ULONG pen = ami_plot_obtain_pen(glob->shared_pens, colour);
@@ -300,7 +297,7 @@ static void ami_plot_setopen(ULONG colour)
{
if(palette_mapped == false) {
SetRPAttrs(glob->rp, RPTAG_OPenColor,
- ami_abgr_to_argb(colour),
+ ns_color_to_nscss(colour),
TAG_DONE);
} else {
ULONG pen = ami_plot_obtain_pen(glob->shared_pens, colour);
commitdiff http://git.netsurf-browser.org/netsurf.git/commit/?id=ac1865f36181d3b2504...
commit ac1865f36181d3b25045d0ab284b70b697b6a2ed
Author: Chris Young <chris(a)unsatisfactorysoftware.co.uk>
Commit: Chris Young <chris(a)unsatisfactorysoftware.co.uk>
Set more sensible default window size
diff --git a/amiga/gui.c b/amiga/gui.c
index af6a6d8..b1786ce 100644
--- a/amiga/gui.c
+++ b/amiga/gui.c
@@ -443,6 +443,22 @@ colour_option_from_pen(struct nsoption_s *opts,
return NSERROR_OK;
}
+static void ami_set_screen_defaults(struct Screen *scrn)
+{
+ if((nsoption_int(window_x) == 0) &&
+ (nsoption_int(window_y) == 0) &&
+ (nsoption_int(window_width) == 0) &&
+ (nsoption_int(window_height) == 0)) {
+ nsoption_set_int(window_x, 0);
+ nsoption_set_int(window_y, scrn->BarHeight + 1);
+ nsoption_set_int(window_width, scrn->Width);
+ nsoption_set_int(window_height, scrn->Height - scrn->BarHeight - 1);
+ }
+
+ /* TODO: Update screen colour defaults here */
+}
+
+
/**
* Set option defaults for amiga frontend
*
@@ -531,9 +547,6 @@ static nserror ami_set_options(struct nsoption_s *defaults)
tree_set_icon_dir(strdup("ENV:Sys"));
- if(!nsoption_int(window_width)) nsoption_set_int(window_width, 800);
- if(!nsoption_int(window_height)) nsoption_set_int(window_height, 600);
-
#ifndef __amigaos4__
nsoption_set_bool(download_notify, false);
nsoption_set_bool(context_menu, false);
@@ -745,10 +758,7 @@ void ami_openscreen(void)
dri = GetScreenDrawInfo(scrn);
ami_font_setdevicedpi(id);
-/* TODO: Reset system colours so they are correct for the new screen
- gui_system_colour_finalize();
- gui_system_colour_init();
-*/
+ ami_set_screen_defaults(scrn);
//ami_help_new_screen(scrn);
}
-----------------------------------------------------------------------
Summary of changes:
amiga/gui.c | 24 +++++++++++++++++-------
amiga/plotters.c | 7 ++-----
2 files changed, 19 insertions(+), 12 deletions(-)
diff --git a/amiga/gui.c b/amiga/gui.c
index af6a6d8..b1786ce 100644
--- a/amiga/gui.c
+++ b/amiga/gui.c
@@ -443,6 +443,22 @@ colour_option_from_pen(struct nsoption_s *opts,
return NSERROR_OK;
}
+static void ami_set_screen_defaults(struct Screen *scrn)
+{
+ if((nsoption_int(window_x) == 0) &&
+ (nsoption_int(window_y) == 0) &&
+ (nsoption_int(window_width) == 0) &&
+ (nsoption_int(window_height) == 0)) {
+ nsoption_set_int(window_x, 0);
+ nsoption_set_int(window_y, scrn->BarHeight + 1);
+ nsoption_set_int(window_width, scrn->Width);
+ nsoption_set_int(window_height, scrn->Height - scrn->BarHeight - 1);
+ }
+
+ /* TODO: Update screen colour defaults here */
+}
+
+
/**
* Set option defaults for amiga frontend
*
@@ -531,9 +547,6 @@ static nserror ami_set_options(struct nsoption_s *defaults)
tree_set_icon_dir(strdup("ENV:Sys"));
- if(!nsoption_int(window_width)) nsoption_set_int(window_width, 800);
- if(!nsoption_int(window_height)) nsoption_set_int(window_height, 600);
-
#ifndef __amigaos4__
nsoption_set_bool(download_notify, false);
nsoption_set_bool(context_menu, false);
@@ -745,10 +758,7 @@ void ami_openscreen(void)
dri = GetScreenDrawInfo(scrn);
ami_font_setdevicedpi(id);
-/* TODO: Reset system colours so they are correct for the new screen
- gui_system_colour_finalize();
- gui_system_colour_init();
-*/
+ ami_set_screen_defaults(scrn);
//ami_help_new_screen(scrn);
}
diff --git a/amiga/plotters.c b/amiga/plotters.c
index a4ddb61..d95915c 100755
--- a/amiga/plotters.c
+++ b/amiga/plotters.c
@@ -102,9 +102,6 @@ const struct plotter_table amiplot = {
.option_knockout = true,
};
-colour ami_abgr_to_argb(colour c) {
- return ns_color_to_nscss(c);
-}
#ifdef NS_AMIGA_CAIRO
void ami_cairo_set_colour(cairo_t *cr,colour c)
@@ -288,7 +285,7 @@ static void ami_plot_setapen(ULONG colour)
{
if(palette_mapped == false) {
SetRPAttrs(glob->rp, RPTAG_APenColor,
- ami_abgr_to_argb(colour),
+ ns_color_to_nscss(colour),
TAG_DONE);
} else {
ULONG pen = ami_plot_obtain_pen(glob->shared_pens, colour);
@@ -300,7 +297,7 @@ static void ami_plot_setopen(ULONG colour)
{
if(palette_mapped == false) {
SetRPAttrs(glob->rp, RPTAG_OPenColor,
- ami_abgr_to_argb(colour),
+ ns_color_to_nscss(colour),
TAG_DONE);
} else {
ULONG pen = ami_plot_obtain_pen(glob->shared_pens, colour);
--
NetSurf Browser
9 years, 9 months
netsurf: branch master updated. release/3.0-159-gb2aa0c1
by NetSurf Browser Project
Gitweb links:
...log http://git.netsurf-browser.org/netsurf.git/shortlog/b2aa0c129c73201b7e1e4...
...commit http://git.netsurf-browser.org/netsurf.git/commit/b2aa0c129c73201b7e1e466...
...tree http://git.netsurf-browser.org/netsurf.git/tree/b2aa0c129c73201b7e1e466d9...
The branch, master has been updated
via b2aa0c129c73201b7e1e466d9996e5e491464592 (commit)
from e2056974ca152a9c2cd14545bc610546c59264cc (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commitdiff http://git.netsurf-browser.org/netsurf.git/commit/?id=b2aa0c129c73201b7e1...
commit b2aa0c129c73201b7e1e466d9996e5e491464592
Author: Michael Drake <tlsa(a)netsurf-browser.org>
Commit: Michael Drake <tlsa(a)netsurf-browser.org>
Remove 0.5px vertical displacement of text.
diff --git a/gtk/font_pango.c b/gtk/font_pango.c
index aa4fae3..6c7f159 100644
--- a/gtk/font_pango.c
+++ b/gtk/font_pango.c
@@ -253,7 +253,7 @@ bool nsfont_paint(int x, int y, const char *string, size_t length,
pango_layout_set_text(layout, string, length);
line = pango_layout_get_line(layout, 0);
- cairo_move_to(current_cr, x, y + 0.5);
+ cairo_move_to(current_cr, x, y);
nsgtk_set_colour(fstyle->foreground);
pango_cairo_show_layout_line(current_cr, line);
-----------------------------------------------------------------------
Summary of changes:
gtk/font_pango.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/gtk/font_pango.c b/gtk/font_pango.c
index aa4fae3..6c7f159 100644
--- a/gtk/font_pango.c
+++ b/gtk/font_pango.c
@@ -253,7 +253,7 @@ bool nsfont_paint(int x, int y, const char *string, size_t length,
pango_layout_set_text(layout, string, length);
line = pango_layout_get_line(layout, 0);
- cairo_move_to(current_cr, x, y + 0.5);
+ cairo_move_to(current_cr, x, y);
nsgtk_set_colour(fstyle->foreground);
pango_cairo_show_layout_line(current_cr, line);
--
NetSurf Browser
9 years, 9 months
netsurf: branch master updated. release/3.0-158-ge205697
by NetSurf Browser Project
Gitweb links:
...log http://git.netsurf-browser.org/netsurf.git/shortlog/e2056974ca152a9c2cd14...
...commit http://git.netsurf-browser.org/netsurf.git/commit/e2056974ca152a9c2cd1454...
...tree http://git.netsurf-browser.org/netsurf.git/tree/e2056974ca152a9c2cd14545b...
The branch, master has been updated
via e2056974ca152a9c2cd14545bc610546c59264cc (commit)
from 22ce03aed6e011a53a8adbbbf2cf4df798d8cc45 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commitdiff http://git.netsurf-browser.org/netsurf.git/commit/?id=e2056974ca152a9c2cd...
commit e2056974ca152a9c2cd14545bc610546c59264cc
Author: Vincent Sanders <vince(a)kyllikki.org>
Commit: Vincent Sanders <vince(a)kyllikki.org>
fixup script message handling
diff --git a/render/html_script.c b/render/html_script.c
index 89d6741..4aa8aff 100644
--- a/render/html_script.c
+++ b/render/html_script.c
@@ -285,12 +285,6 @@ convert_script_sync_cb(hlcache_handle *script,
assert(i != parent->scripts_count);
switch (event->type) {
- case CONTENT_MSG_LOADING:
- break;
-
- case CONTENT_MSG_READY:
- break;
-
case CONTENT_MSG_DONE:
LOG(("script %d done '%s'", i,
nsurl_access(hlcache_handle_get_url(script))));
@@ -339,10 +333,18 @@ convert_script_sync_cb(hlcache_handle *script,
break;
+ case CONTENT_MSG_LOADING:
+ case CONTENT_MSG_READY:
case CONTENT_MSG_STATUS:
+ case CONTENT_MSG_REDIRECT:
+ /* messages content handler will legitamately recive
+ * but does not need to handle
+ */
break;
default:
+ /* all other messages are unexpected and fatal */
+ LOG(("Unhandled message type %d", event->type));
assert(0);
}
-----------------------------------------------------------------------
Summary of changes:
render/html_script.c | 14 ++++++++------
1 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/render/html_script.c b/render/html_script.c
index 89d6741..4aa8aff 100644
--- a/render/html_script.c
+++ b/render/html_script.c
@@ -285,12 +285,6 @@ convert_script_sync_cb(hlcache_handle *script,
assert(i != parent->scripts_count);
switch (event->type) {
- case CONTENT_MSG_LOADING:
- break;
-
- case CONTENT_MSG_READY:
- break;
-
case CONTENT_MSG_DONE:
LOG(("script %d done '%s'", i,
nsurl_access(hlcache_handle_get_url(script))));
@@ -339,10 +333,18 @@ convert_script_sync_cb(hlcache_handle *script,
break;
+ case CONTENT_MSG_LOADING:
+ case CONTENT_MSG_READY:
case CONTENT_MSG_STATUS:
+ case CONTENT_MSG_REDIRECT:
+ /* messages content handler will legitamately recive
+ * but does not need to handle
+ */
break;
default:
+ /* all other messages are unexpected and fatal */
+ LOG(("Unhandled message type %d", event->type));
assert(0);
}
--
NetSurf Browser
9 years, 9 months
netsurf: branch master updated. release/3.0-157-g22ce03a
by NetSurf Browser Project
Gitweb links:
...log http://git.netsurf-browser.org/netsurf.git/shortlog/22ce03aed6e011a53a8ad...
...commit http://git.netsurf-browser.org/netsurf.git/commit/22ce03aed6e011a53a8adbb...
...tree http://git.netsurf-browser.org/netsurf.git/tree/22ce03aed6e011a53a8adbbbf...
The branch, master has been updated
via 22ce03aed6e011a53a8adbbbf2cf4df798d8cc45 (commit)
from 817e85f8823f6847b49c39622b6d62ac86871391 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commitdiff http://git.netsurf-browser.org/netsurf.git/commit/?id=22ce03aed6e011a53a8...
commit 22ce03aed6e011a53a8adbbbf2cf4df798d8cc45
Author: Chris Young <chris(a)unsatisfactorysoftware.co.uk>
Commit: Chris Young <chris(a)unsatisfactorysoftware.co.uk>
Tentatively replace colour conversion with core macro
diff --git a/amiga/plotters.c b/amiga/plotters.c
index c8a5c20..a4ddb61 100755
--- a/amiga/plotters.c
+++ b/amiga/plotters.c
@@ -22,6 +22,7 @@
#include "amiga/gui.h"
#include "amiga/utf8.h"
+#include "css/utils.h"
#include "utils/nsoption.h"
#include "utils/utils.h"
#include "utils/log.h"
@@ -102,15 +103,7 @@ const struct plotter_table amiplot = {
};
colour ami_abgr_to_argb(colour c) {
- colour argb = 0x00000000;
-
- /* NB: We force the alpha byte to be 0xff, as it is not set by the core. */
- argb = 0xff000000 |
- ((c & 0x00ff0000) >> 16) |
- (c & 0x0000ff00) |
- ((c & 0x000000ff) << 16);
-
- return argb;
+ return ns_color_to_nscss(c);
}
#ifdef NS_AMIGA_CAIRO
-----------------------------------------------------------------------
Summary of changes:
amiga/plotters.c | 11 ++---------
1 files changed, 2 insertions(+), 9 deletions(-)
diff --git a/amiga/plotters.c b/amiga/plotters.c
index c8a5c20..a4ddb61 100755
--- a/amiga/plotters.c
+++ b/amiga/plotters.c
@@ -22,6 +22,7 @@
#include "amiga/gui.h"
#include "amiga/utf8.h"
+#include "css/utils.h"
#include "utils/nsoption.h"
#include "utils/utils.h"
#include "utils/log.h"
@@ -102,15 +103,7 @@ const struct plotter_table amiplot = {
};
colour ami_abgr_to_argb(colour c) {
- colour argb = 0x00000000;
-
- /* NB: We force the alpha byte to be 0xff, as it is not set by the core. */
- argb = 0xff000000 |
- ((c & 0x00ff0000) >> 16) |
- (c & 0x0000ff00) |
- ((c & 0x000000ff) << 16);
-
- return argb;
+ return ns_color_to_nscss(c);
}
#ifdef NS_AMIGA_CAIRO
--
NetSurf Browser
9 years, 9 months
netsurf: branch master updated. release/3.0-156-g817e85f
by NetSurf Browser Project
Gitweb links:
...log http://git.netsurf-browser.org/netsurf.git/shortlog/817e85f8823f6847b49c3...
...commit http://git.netsurf-browser.org/netsurf.git/commit/817e85f8823f6847b49c396...
...tree http://git.netsurf-browser.org/netsurf.git/tree/817e85f8823f6847b49c39622...
The branch, master has been updated
via 817e85f8823f6847b49c39622b6d62ac86871391 (commit)
from ec3491280a67ea55d322baf736d538815a4a6087 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commitdiff http://git.netsurf-browser.org/netsurf.git/commit/?id=817e85f8823f6847b49...
commit 817e85f8823f6847b49c39622b6d62ac86871391
Author: Michael Drake <tlsa(a)netsurf-browser.org>
Commit: Michael Drake <tlsa(a)netsurf-browser.org>
Ensure readable default colours.
diff --git a/desktop/options.h b/desktop/options.h
index bd4959e..7956618 100644
--- a/desktop/options.h
+++ b/desktop/options.h
@@ -244,31 +244,31 @@ NSOPTION_BOOL(enable_PDF_compression, true)
NSOPTION_BOOL(enable_PDF_password, false)
/******** System colours ********/
-NSOPTION_COLOUR(sys_colour_ActiveBorder, 0x00000000)
-NSOPTION_COLOUR(sys_colour_ActiveCaption, 0x00dddddd)
-NSOPTION_COLOUR(sys_colour_AppWorkspace, 0x00eeeeee)
-NSOPTION_COLOUR(sys_colour_Background, 0x00aa0000)
-NSOPTION_COLOUR(sys_colour_ButtonFace, 0x00aaaaaa)
-NSOPTION_COLOUR(sys_colour_ButtonHighlight, 0x00dddddd)
-NSOPTION_COLOUR(sys_colour_ButtonShadow, 0x00bbbbbb)
-NSOPTION_COLOUR(sys_colour_ButtonText, 0x00000000)
-NSOPTION_COLOUR(sys_colour_CaptionText, 0x00000000)
-NSOPTION_COLOUR(sys_colour_GrayText, 0x00cccccc)
-NSOPTION_COLOUR(sys_colour_Highlight, 0x00ee0000)
-NSOPTION_COLOUR(sys_colour_HighlightText, 0x00000000)
-NSOPTION_COLOUR(sys_colour_InactiveBorder, 0x00ffffff)
-NSOPTION_COLOUR(sys_colour_InactiveCaption, 0x00ffffff)
-NSOPTION_COLOUR(sys_colour_InactiveCaptionText, 0x00cccccc)
-NSOPTION_COLOUR(sys_colour_InfoBackground, 0x00aaaaaa)
+NSOPTION_COLOUR(sys_colour_ActiveBorder, 0x00d3d3d3)
+NSOPTION_COLOUR(sys_colour_ActiveCaption, 0x00f1f1f1)
+NSOPTION_COLOUR(sys_colour_AppWorkspace, 0x00f1f1f1)
+NSOPTION_COLOUR(sys_colour_Background, 0x006e6e6e)
+NSOPTION_COLOUR(sys_colour_ButtonFace, 0x00f9f9f9)
+NSOPTION_COLOUR(sys_colour_ButtonHighlight, 0x00ffffff)
+NSOPTION_COLOUR(sys_colour_ButtonShadow, 0x00aeaeae)
+NSOPTION_COLOUR(sys_colour_ButtonText, 0x004c4c4c)
+NSOPTION_COLOUR(sys_colour_CaptionText, 0x004c4c4c)
+NSOPTION_COLOUR(sys_colour_GrayText, 0x00505050)
+NSOPTION_COLOUR(sys_colour_Highlight, 0x00c00800)
+NSOPTION_COLOUR(sys_colour_HighlightText, 0x00ffffff)
+NSOPTION_COLOUR(sys_colour_InactiveBorder, 0x00f1f1f1)
+NSOPTION_COLOUR(sys_colour_InactiveCaption, 0x00e6e6e6)
+NSOPTION_COLOUR(sys_colour_InactiveCaptionText, 0x00a6a6a6)
+NSOPTION_COLOUR(sys_colour_InfoBackground, 0x008fdfef)
NSOPTION_COLOUR(sys_colour_InfoText, 0x00000000)
-NSOPTION_COLOUR(sys_colour_Menu, 0x00aaaaaa)
-NSOPTION_COLOUR(sys_colour_MenuText, 0x00000000)
-NSOPTION_COLOUR(sys_colour_Scrollbar, 0x00aaaaaa)
-NSOPTION_COLOUR(sys_colour_ThreeDDarkShadow, 0x00555555)
-NSOPTION_COLOUR(sys_colour_ThreeDFace, 0x00dddddd)
-NSOPTION_COLOUR(sys_colour_ThreeDHighlight, 0x00aaaaaa)
-NSOPTION_COLOUR(sys_colour_ThreeDLightShadow, 0x00999999)
-NSOPTION_COLOUR(sys_colour_ThreeDShadow, 0x00777777)
-NSOPTION_COLOUR(sys_colour_Window, 0x00aaaaaa)
-NSOPTION_COLOUR(sys_colour_WindowFrame, 0x00000000)
+NSOPTION_COLOUR(sys_colour_Menu, 0x00f1f1f1)
+NSOPTION_COLOUR(sys_colour_MenuText, 0x004e4e4e)
+NSOPTION_COLOUR(sys_colour_Scrollbar, 0x00cccccc)
+NSOPTION_COLOUR(sys_colour_ThreeDDarkShadow, 0x00aeaeae)
+NSOPTION_COLOUR(sys_colour_ThreeDFace, 0x00f9f9f9)
+NSOPTION_COLOUR(sys_colour_ThreeDHighlight, 0x00ffffff)
+NSOPTION_COLOUR(sys_colour_ThreeDLightShadow, 0x00ffffff)
+NSOPTION_COLOUR(sys_colour_ThreeDShadow, 0x00d5d5d5)
+NSOPTION_COLOUR(sys_colour_Window, 0x00f1f1f1)
+NSOPTION_COLOUR(sys_colour_WindowFrame, 0x004e4e4e)
NSOPTION_COLOUR(sys_colour_WindowText, 0x00000000)
-----------------------------------------------------------------------
Summary of changes:
desktop/options.h | 52 ++++++++++++++++++++++++++--------------------------
1 files changed, 26 insertions(+), 26 deletions(-)
diff --git a/desktop/options.h b/desktop/options.h
index bd4959e..7956618 100644
--- a/desktop/options.h
+++ b/desktop/options.h
@@ -244,31 +244,31 @@ NSOPTION_BOOL(enable_PDF_compression, true)
NSOPTION_BOOL(enable_PDF_password, false)
/******** System colours ********/
-NSOPTION_COLOUR(sys_colour_ActiveBorder, 0x00000000)
-NSOPTION_COLOUR(sys_colour_ActiveCaption, 0x00dddddd)
-NSOPTION_COLOUR(sys_colour_AppWorkspace, 0x00eeeeee)
-NSOPTION_COLOUR(sys_colour_Background, 0x00aa0000)
-NSOPTION_COLOUR(sys_colour_ButtonFace, 0x00aaaaaa)
-NSOPTION_COLOUR(sys_colour_ButtonHighlight, 0x00dddddd)
-NSOPTION_COLOUR(sys_colour_ButtonShadow, 0x00bbbbbb)
-NSOPTION_COLOUR(sys_colour_ButtonText, 0x00000000)
-NSOPTION_COLOUR(sys_colour_CaptionText, 0x00000000)
-NSOPTION_COLOUR(sys_colour_GrayText, 0x00cccccc)
-NSOPTION_COLOUR(sys_colour_Highlight, 0x00ee0000)
-NSOPTION_COLOUR(sys_colour_HighlightText, 0x00000000)
-NSOPTION_COLOUR(sys_colour_InactiveBorder, 0x00ffffff)
-NSOPTION_COLOUR(sys_colour_InactiveCaption, 0x00ffffff)
-NSOPTION_COLOUR(sys_colour_InactiveCaptionText, 0x00cccccc)
-NSOPTION_COLOUR(sys_colour_InfoBackground, 0x00aaaaaa)
+NSOPTION_COLOUR(sys_colour_ActiveBorder, 0x00d3d3d3)
+NSOPTION_COLOUR(sys_colour_ActiveCaption, 0x00f1f1f1)
+NSOPTION_COLOUR(sys_colour_AppWorkspace, 0x00f1f1f1)
+NSOPTION_COLOUR(sys_colour_Background, 0x006e6e6e)
+NSOPTION_COLOUR(sys_colour_ButtonFace, 0x00f9f9f9)
+NSOPTION_COLOUR(sys_colour_ButtonHighlight, 0x00ffffff)
+NSOPTION_COLOUR(sys_colour_ButtonShadow, 0x00aeaeae)
+NSOPTION_COLOUR(sys_colour_ButtonText, 0x004c4c4c)
+NSOPTION_COLOUR(sys_colour_CaptionText, 0x004c4c4c)
+NSOPTION_COLOUR(sys_colour_GrayText, 0x00505050)
+NSOPTION_COLOUR(sys_colour_Highlight, 0x00c00800)
+NSOPTION_COLOUR(sys_colour_HighlightText, 0x00ffffff)
+NSOPTION_COLOUR(sys_colour_InactiveBorder, 0x00f1f1f1)
+NSOPTION_COLOUR(sys_colour_InactiveCaption, 0x00e6e6e6)
+NSOPTION_COLOUR(sys_colour_InactiveCaptionText, 0x00a6a6a6)
+NSOPTION_COLOUR(sys_colour_InfoBackground, 0x008fdfef)
NSOPTION_COLOUR(sys_colour_InfoText, 0x00000000)
-NSOPTION_COLOUR(sys_colour_Menu, 0x00aaaaaa)
-NSOPTION_COLOUR(sys_colour_MenuText, 0x00000000)
-NSOPTION_COLOUR(sys_colour_Scrollbar, 0x00aaaaaa)
-NSOPTION_COLOUR(sys_colour_ThreeDDarkShadow, 0x00555555)
-NSOPTION_COLOUR(sys_colour_ThreeDFace, 0x00dddddd)
-NSOPTION_COLOUR(sys_colour_ThreeDHighlight, 0x00aaaaaa)
-NSOPTION_COLOUR(sys_colour_ThreeDLightShadow, 0x00999999)
-NSOPTION_COLOUR(sys_colour_ThreeDShadow, 0x00777777)
-NSOPTION_COLOUR(sys_colour_Window, 0x00aaaaaa)
-NSOPTION_COLOUR(sys_colour_WindowFrame, 0x00000000)
+NSOPTION_COLOUR(sys_colour_Menu, 0x00f1f1f1)
+NSOPTION_COLOUR(sys_colour_MenuText, 0x004e4e4e)
+NSOPTION_COLOUR(sys_colour_Scrollbar, 0x00cccccc)
+NSOPTION_COLOUR(sys_colour_ThreeDDarkShadow, 0x00aeaeae)
+NSOPTION_COLOUR(sys_colour_ThreeDFace, 0x00f9f9f9)
+NSOPTION_COLOUR(sys_colour_ThreeDHighlight, 0x00ffffff)
+NSOPTION_COLOUR(sys_colour_ThreeDLightShadow, 0x00ffffff)
+NSOPTION_COLOUR(sys_colour_ThreeDShadow, 0x00d5d5d5)
+NSOPTION_COLOUR(sys_colour_Window, 0x00f1f1f1)
+NSOPTION_COLOUR(sys_colour_WindowFrame, 0x004e4e4e)
NSOPTION_COLOUR(sys_colour_WindowText, 0x00000000)
--
NetSurf Browser
9 years, 9 months
netsurf: branch master updated. release/3.0-155-gec34912
by NetSurf Browser Project
Gitweb links:
...log http://git.netsurf-browser.org/netsurf.git/shortlog/ec3491280a67ea55d322b...
...commit http://git.netsurf-browser.org/netsurf.git/commit/ec3491280a67ea55d322baf...
...tree http://git.netsurf-browser.org/netsurf.git/tree/ec3491280a67ea55d322baf73...
The branch, master has been updated
via ec3491280a67ea55d322baf736d538815a4a6087 (commit)
from 92d6c14c8dfd7b4978deca602d51d3afbbfdcfe7 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commitdiff http://git.netsurf-browser.org/netsurf.git/commit/?id=ec3491280a67ea55d32...
commit ec3491280a67ea55d322baf736d538815a4a6087
Author: Michael Drake <tlsa(a)netsurf-browser.org>
Commit: Michael Drake <tlsa(a)netsurf-browser.org>
Move NetSurf to CSS colour conversion macro. Make both conversion macros the same.
diff --git a/css/utils.h b/css/utils.h
index 9d40aba..f3131f1 100644
--- a/css/utils.h
+++ b/css/utils.h
@@ -27,17 +27,32 @@ extern css_fixed nscss_screen_dpi;
/**
* Convert a CSS color to a NetSurf colour primitive
- *
+ *
* ARGB -> (1-A)BGR
*
* \param color The CSS color to convert
* \return Corresponding NetSurf colour primitive
*/
-#define nscss_color_to_ns(color) \
- (0xff000000 - ((color) & 0xff000000)) | \
- (((color) & 0xff0000) >> 16) | \
- ((color) & 0xff00) | \
- (((color) & 0xff) << 16)
+#define nscss_color_to_ns(c) \
+ ( ((~c) & 0xff000000) | \
+ ((( c) & 0xff0000 ) >> 16) | \
+ (( c) & 0xff00 ) | \
+ ((( c) & 0xff ) << 16))
+
+
+/**
+ * Convert a NetSurf color to a CSS colour primitive
+ *
+ * (1-A)BGR -> ARGB
+ *
+ * \param color The NetSurf color to convert
+ * \return Corresponding CSS colour primitive
+ */
+#define ns_color_to_nscss(c) \
+ ( ((~c) & 0xff000000) | \
+ ((( c) & 0xff0000 ) >> 16) | \
+ (( c) & 0xff00 ) | \
+ ((( c) & 0xff ) << 16))
/**
* Determine if a CSS color primitive is transparent
diff --git a/desktop/system_colour.c b/desktop/system_colour.c
index 7b4fded..4ef1709 100644
--- a/desktop/system_colour.c
+++ b/desktop/system_colour.c
@@ -23,6 +23,7 @@
#include "utils/utils.h"
#include "utils/log.h"
+#include "css/utils.h"
#include "desktop/gui.h"
#include "utils/nsoption.h"
@@ -82,8 +83,6 @@ colour gui_system_colour_char(const char *name)
return ret;
}
-#define ns_color_to_nscss(c) (((0xff - (((c) >> 24) & 0xff)) << 24) | ((c) & 0xFF00) | (((c) >> 16) & 0xFF) | (((c) & 0xFF) << 16))
-
css_error gui_system_colour(void *pw, lwc_string *name, css_color *colour)
{
unsigned int ccount;
-----------------------------------------------------------------------
Summary of changes:
css/utils.h | 27 +++++++++++++++++++++------
desktop/system_colour.c | 3 +--
2 files changed, 22 insertions(+), 8 deletions(-)
diff --git a/css/utils.h b/css/utils.h
index 9d40aba..f3131f1 100644
--- a/css/utils.h
+++ b/css/utils.h
@@ -27,17 +27,32 @@ extern css_fixed nscss_screen_dpi;
/**
* Convert a CSS color to a NetSurf colour primitive
- *
+ *
* ARGB -> (1-A)BGR
*
* \param color The CSS color to convert
* \return Corresponding NetSurf colour primitive
*/
-#define nscss_color_to_ns(color) \
- (0xff000000 - ((color) & 0xff000000)) | \
- (((color) & 0xff0000) >> 16) | \
- ((color) & 0xff00) | \
- (((color) & 0xff) << 16)
+#define nscss_color_to_ns(c) \
+ ( ((~c) & 0xff000000) | \
+ ((( c) & 0xff0000 ) >> 16) | \
+ (( c) & 0xff00 ) | \
+ ((( c) & 0xff ) << 16))
+
+
+/**
+ * Convert a NetSurf color to a CSS colour primitive
+ *
+ * (1-A)BGR -> ARGB
+ *
+ * \param color The NetSurf color to convert
+ * \return Corresponding CSS colour primitive
+ */
+#define ns_color_to_nscss(c) \
+ ( ((~c) & 0xff000000) | \
+ ((( c) & 0xff0000 ) >> 16) | \
+ (( c) & 0xff00 ) | \
+ ((( c) & 0xff ) << 16))
/**
* Determine if a CSS color primitive is transparent
diff --git a/desktop/system_colour.c b/desktop/system_colour.c
index 7b4fded..4ef1709 100644
--- a/desktop/system_colour.c
+++ b/desktop/system_colour.c
@@ -23,6 +23,7 @@
#include "utils/utils.h"
#include "utils/log.h"
+#include "css/utils.h"
#include "desktop/gui.h"
#include "utils/nsoption.h"
@@ -82,8 +83,6 @@ colour gui_system_colour_char(const char *name)
return ret;
}
-#define ns_color_to_nscss(c) (((0xff - (((c) >> 24) & 0xff)) << 24) | ((c) & 0xFF00) | (((c) >> 16) & 0xFF) | (((c) & 0xFF) << 16))
-
css_error gui_system_colour(void *pw, lwc_string *name, css_color *colour)
{
unsigned int ccount;
--
NetSurf Browser
9 years, 9 months
netsurf: branch master updated. release/3.0-154-g92d6c14
by NetSurf Browser Project
Gitweb links:
...log http://git.netsurf-browser.org/netsurf.git/shortlog/92d6c14c8dfd7b4978dec...
...commit http://git.netsurf-browser.org/netsurf.git/commit/92d6c14c8dfd7b4978deca6...
...tree http://git.netsurf-browser.org/netsurf.git/tree/92d6c14c8dfd7b4978deca602...
The branch, master has been updated
via 92d6c14c8dfd7b4978deca602d51d3afbbfdcfe7 (commit)
from 44badddbdfabac0b4c5ca8737f4152f5aca25b89 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commitdiff http://git.netsurf-browser.org/netsurf.git/commit/?id=92d6c14c8dfd7b4978d...
commit 92d6c14c8dfd7b4978deca602d51d3afbbfdcfe7
Author: Vincent Sanders <vince(a)netsurf-browser.org>
Commit: Vincent Sanders <vince(a)netsurf-browser.org>
remove ambiguity in subtraction and masking
diff --git a/desktop/system_colour.c b/desktop/system_colour.c
index 0944407..7b4fded 100644
--- a/desktop/system_colour.c
+++ b/desktop/system_colour.c
@@ -82,7 +82,7 @@ colour gui_system_colour_char(const char *name)
return ret;
}
-#define ns_color_to_nscss(c) (((0xff - ((c) >> 24) & 0xff) << 24) | ((c) & 0xFF00) | (((c) >> 16) & 0xFF) | (((c) & 0xFF) << 16))
+#define ns_color_to_nscss(c) (((0xff - (((c) >> 24) & 0xff)) << 24) | ((c) & 0xFF00) | (((c) >> 16) & 0xFF) | (((c) & 0xFF) << 16))
css_error gui_system_colour(void *pw, lwc_string *name, css_color *colour)
{
-----------------------------------------------------------------------
Summary of changes:
desktop/system_colour.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/desktop/system_colour.c b/desktop/system_colour.c
index 0944407..7b4fded 100644
--- a/desktop/system_colour.c
+++ b/desktop/system_colour.c
@@ -82,7 +82,7 @@ colour gui_system_colour_char(const char *name)
return ret;
}
-#define ns_color_to_nscss(c) (((0xff - ((c) >> 24) & 0xff) << 24) | ((c) & 0xFF00) | (((c) >> 16) & 0xFF) | (((c) & 0xFF) << 16))
+#define ns_color_to_nscss(c) (((0xff - (((c) >> 24) & 0xff)) << 24) | ((c) & 0xFF00) | (((c) >> 16) & 0xFF) | (((c) & 0xFF) << 16))
css_error gui_system_colour(void *pw, lwc_string *name, css_color *colour)
{
--
NetSurf Browser
9 years, 9 months
netsurf: branch master updated. release/3.0-153-g44baddd
by NetSurf Browser Project
Gitweb links:
...log http://git.netsurf-browser.org/netsurf.git/shortlog/44badddbdfabac0b4c5ca...
...commit http://git.netsurf-browser.org/netsurf.git/commit/44badddbdfabac0b4c5ca87...
...tree http://git.netsurf-browser.org/netsurf.git/tree/44badddbdfabac0b4c5ca8737...
The branch, master has been updated
via 44badddbdfabac0b4c5ca8737f4152f5aca25b89 (commit)
from a4f67018faf7755d077778b750524f3a7555f5c7 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commitdiff http://git.netsurf-browser.org/netsurf.git/commit/?id=44badddbdfabac0b4c5...
commit 44badddbdfabac0b4c5ca8737f4152f5aca25b89
Author: Vincent Sanders <vince(a)netsurf-browser.org>
Commit: Vincent Sanders <vince(a)netsurf-browser.org>
fix transparancy on css colour lookup
diff --git a/desktop/system_colour.c b/desktop/system_colour.c
index 7a66350..0944407 100644
--- a/desktop/system_colour.c
+++ b/desktop/system_colour.c
@@ -69,7 +69,7 @@ void gui_system_colour_finalize(void)
colour gui_system_colour_char(const char *name)
{
- colour ret = 0xff00000;
+ colour ret = 0;
unsigned int ccount;
for (ccount = 0; ccount < colour_list_len; ccount++) {
@@ -82,7 +82,7 @@ colour gui_system_colour_char(const char *name)
return ret;
}
-#define ns_color_to_nscss(c) ((0xff - ((c >> 24) & 0xFF)) | (c & 0xFF00) | ((c >> 16) & 0xFF) | ((c & 0xFF) << 16))
+#define ns_color_to_nscss(c) (((0xff - ((c) >> 24) & 0xff) << 24) | ((c) & 0xFF00) | (((c) >> 16) & 0xFF) | (((c) & 0xFF) << 16))
css_error gui_system_colour(void *pw, lwc_string *name, css_color *colour)
{
-----------------------------------------------------------------------
Summary of changes:
desktop/system_colour.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/desktop/system_colour.c b/desktop/system_colour.c
index 7a66350..0944407 100644
--- a/desktop/system_colour.c
+++ b/desktop/system_colour.c
@@ -69,7 +69,7 @@ void gui_system_colour_finalize(void)
colour gui_system_colour_char(const char *name)
{
- colour ret = 0xff00000;
+ colour ret = 0;
unsigned int ccount;
for (ccount = 0; ccount < colour_list_len; ccount++) {
@@ -82,7 +82,7 @@ colour gui_system_colour_char(const char *name)
return ret;
}
-#define ns_color_to_nscss(c) ((0xff - ((c >> 24) & 0xFF)) | (c & 0xFF00) | ((c >> 16) & 0xFF) | ((c & 0xFF) << 16))
+#define ns_color_to_nscss(c) (((0xff - ((c) >> 24) & 0xff) << 24) | ((c) & 0xFF00) | (((c) >> 16) & 0xFF) | (((c) & 0xFF) << 16))
css_error gui_system_colour(void *pw, lwc_string *name, css_color *colour)
{
--
NetSurf Browser
9 years, 9 months