Gitweb links:
...log
http://git.netsurf-browser.org/netsurf.git/shortlog/1547aebdbb228fd5cc71145b6f7b0d437f1b038b
...commit
http://git.netsurf-browser.org/netsurf.git/commit/1547aebdbb228fd5cc71145b6f7b0d437f1b038b
...tree
http://git.netsurf-browser.org/netsurf.git/tree/1547aebdbb228fd5cc71145b6f7b0d437f1b038b
The branch, chris/palette-mapped-plotters has been updated
via 1547aebdbb228fd5cc71145b6f7b0d437f1b038b (commit)
via 61c268269aa5b91d03793c0a5906e9cb2ad91766 (commit)
via 67488450424a7a8be38c2e007c6d0e94e6c0834b (commit)
via b9446a3abb87d0b1999756e2132837b30c51cc97 (commit)
from 3ba621759c4fb20dc35724414cb59c665686d418 (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/commitdiff/1547aebdbb228fd5cc71145b6f7b0d437f1b038b
commit 1547aebdbb228fd5cc71145b6f7b0d437f1b038b
Author: Chris Young <[email protected]>
Commit: Chris Young <[email protected]>
remove depth gadget, as doesn't let us select <256 colours anyway
diff --git a/amiga/gui.c b/amiga/gui.c
index 03a2b7d..5ec3815 100755
--- a/amiga/gui.c
+++ b/amiga/gui.c
@@ -605,7 +605,6 @@ void ami_openscreen(void)
if(AslRequestTags(screenmodereq,
ASLSM_MinDepth, 0,
ASLSM_MaxDepth, 32,
- ASLSM_DoDepth, TRUE,
TAG_DONE))
{
char *modeid = malloc(20);
diff --git a/amiga/gui_options.c b/amiga/gui_options.c
index 383e7e4..59e9c90 100755
--- a/amiga/gui_options.c
+++ b/amiga/gui_options.c
@@ -671,7 +671,6 @@ void ami_gui_opts_open(void)
GETSCREENMODE_DisplayID,screenmodeid,
GETSCREENMODE_MinDepth, 0,
GETSCREENMODE_MaxDepth, 32,
-
GETSCREENMODE_DoDepth, TRUE,
GetScreenModeEnd,
LAYOUT_AddChild, gow->objects[GID_OPTS_SCREENNAME] = StringObject,
GA_ID, GID_OPTS_SCREENNAME,
commitdiff
http://git.netsurf-browser.org/netsurf.git/commitdiff/61c268269aa5b91d03793c0a5906e9cb2ad91766
commit 61c268269aa5b91d03793c0a5906e9cb2ad91766
Author: Chris Young <[email protected]>
Commit: Chris Young <[email protected]>
display depth gadget on screenmode requester
diff --git a/amiga/gui.c b/amiga/gui.c
index 6409ed5..03a2b7d 100755
--- a/amiga/gui.c
+++ b/amiga/gui.c
@@ -603,8 +603,9 @@ void ami_openscreen(void)
if(screenmodereq =
AllocAslRequest(ASL_ScreenModeRequest,NULL))
{
if(AslRequestTags(screenmodereq,
- ASLSM_MinDepth,0,
- ASLSM_MaxDepth,32,
+ ASLSM_MinDepth, 0,
+ ASLSM_MaxDepth, 32,
+ ASLSM_DoDepth, TRUE,
TAG_DONE))
{
char *modeid = malloc(20);
diff --git a/amiga/gui_options.c b/amiga/gui_options.c
index 59e9c90..383e7e4 100755
--- a/amiga/gui_options.c
+++ b/amiga/gui_options.c
@@ -671,6 +671,7 @@ void ami_gui_opts_open(void)
GETSCREENMODE_DisplayID,screenmodeid,
GETSCREENMODE_MinDepth, 0,
GETSCREENMODE_MaxDepth, 32,
+
GETSCREENMODE_DoDepth, TRUE,
GetScreenModeEnd,
LAYOUT_AddChild, gow->objects[GID_OPTS_SCREENNAME] = StringObject,
GA_ID, GID_OPTS_SCREENNAME,
commitdiff
http://git.netsurf-browser.org/netsurf.git/commitdiff/67488450424a7a8be38c2e007c6d0e94e6c0834b
commit 67488450424a7a8be38c2e007c6d0e94e6c0834b
Author: Chris Young <[email protected]>
Commit: Chris Young <[email protected]>
fix display of favicon in palette-mapped modes
diff --git a/amiga/gui.c b/amiga/gui.c
index f3670a4..6409ed5 100755
--- a/amiga/gui.c
+++ b/amiga/gui.c
@@ -3813,6 +3813,7 @@ void gui_window_set_icon(struct gui_window *g,
hlcache_handle *icon)
struct BitMap *bm = NULL;
struct IBox *bbox;
ULONG cur_tab = 0;
+ struct bitmap *icon_bitmap;
if(nsoption_bool(kiosk_mode) == true) return;
if(!g) return;
@@ -3821,9 +3822,9 @@ void gui_window_set_icon(struct gui_window *g,
hlcache_handle *icon)
g->shared->objects[GID_TABS],
(ULONG *)&cur_tab);
- if ((icon != NULL) && (content_get_bitmap(icon) != NULL))
+ if ((icon != NULL) && ((icon_bitmap = content_get_bitmap(icon)) !=
NULL))
{
- bm = ami_bitmap_get_native(content_get_bitmap(icon), 16, 16,
+ bm = ami_bitmap_get_native(icon_bitmap, 16, 16,
g->shared->win->RPort->BitMap);
}
@@ -3836,6 +3837,18 @@ void gui_window_set_icon(struct gui_window *g,
hlcache_handle *icon)
if(bm)
{
+ ULONG tag, tag_data, minterm;
+
+ if(ami_plot_screen_is_palettemapped() == false) {
+ tag = BLITA_UseSrcAlpha;
+ tag_data = !icon_bitmap->opaque;
+ minterm = 0xc0;
+ } else {
+ tag = BLITA_MaskPlane;
+ tag_data = (ULONG)icon_bitmap->native_mask;
+ minterm = 0xc0; /* should be (ABC|ABNC|ANBC); */
+ }
+
BltBitMapTags(BLITA_SrcX, 0,
BLITA_SrcY, 0,
BLITA_DestX, bbox->Left,
@@ -3846,7 +3859,8 @@ void gui_window_set_icon(struct gui_window *g,
hlcache_handle *icon)
BLITA_Dest,
g->shared->win->RPort,
BLITA_SrcType, BLITT_BITMAP,
BLITA_DestType, BLITT_RASTPORT,
- BLITA_UseSrcAlpha, TRUE,
+ BLITA_Minterm, minterm,
+ tag, tag_data,
TAG_DONE);
}
}
@@ -3876,15 +3890,15 @@ void gui_window_set_search_ico(hlcache_handle *ico)
struct nsObject *nnode;
struct gui_window_2 *gwin;
char fname[100];
+ struct bitmap *ico_bitmap;
if(IsMinListEmpty(window_list)) return;
if(nsoption_bool(kiosk_mode) == true) return;
if (ico == NULL) ico = search_web_ico();
- if ((ico != NULL) && (content_get_bitmap(ico) != NULL))
- {
- bm = ami_bitmap_get_native(content_get_bitmap(ico), 16, 16,
NULL);
- }
+ ico_bitmap = content_get_bitmap(ico);
+ if ((ico != NULL) && (ico_bitmap != NULL))
+ bm = ami_bitmap_get_native(ico_bitmap, 16, 16, NULL);
node = (struct nsObject *)GetHead((struct List *)window_list);
@@ -3906,6 +3920,18 @@ void gui_window_set_search_ico(hlcache_handle *ico)
if(bm)
{
+ ULONG tag, tag_data, minterm;
+
+ if(ami_plot_screen_is_palettemapped() == false)
{
+ tag = BLITA_UseSrcAlpha;
+ tag_data = !ico_bitmap->opaque;
+ minterm = 0xc0;
+ } else {
+ tag = BLITA_MaskPlane;
+ tag_data =
(ULONG)ico_bitmap->native_mask;
+ minterm = 0xc0; /* should be
(ABC|ABNC|ANBC); */
+ }
+
BltBitMapTags(BLITA_SrcX, 0,
BLITA_SrcY, 0,
BLITA_DestX, bbox->Left,
@@ -3916,7 +3942,8 @@ void gui_window_set_search_ico(hlcache_handle *ico)
BLITA_Dest,
gwin->win->RPort,
BLITA_SrcType,
BLITT_BITMAP,
BLITA_DestType,
BLITT_RASTPORT,
- BLITA_UseSrcAlpha, TRUE,
+ BLITA_Minterm, minterm,
+ tag, tag_data,
TAG_DONE);
}
}
commitdiff
http://git.netsurf-browser.org/netsurf.git/commitdiff/b9446a3abb87d0b1999756e2132837b30c51cc97
commit b9446a3abb87d0b1999756e2132837b30c51cc97
Author: Chris Young <[email protected]>
Commit: Chris Young <[email protected]>
rename old truecolour function
diff --git a/amiga/bitmap.c b/amiga/bitmap.c
index 69dc2dc..edc0916 100644
--- a/amiga/bitmap.c
+++ b/amiga/bitmap.c
@@ -351,7 +351,7 @@ struct bitmap *ami_bitmap_from_datatype(char *filename)
return bm;
}
-static struct BitMap *ami_getcachenativebm(struct bitmap *bitmap,int width,int
height,struct BitMap *friendbm)
+static struct BitMap *ami_bitmap_get_truecolour(struct bitmap *bitmap,int
width,int height,struct BitMap *friendbm)
{
struct RenderInfo ri;
struct BitMap *tbm = NULL;
@@ -518,6 +518,6 @@ struct BitMap *ami_bitmap_get_native(struct bitmap *bitmap,
if(ami_plot_screen_is_palettemapped() == true) {
return ami_bitmap_get_palettemapped(bitmap, width, height);
} else {
- return ami_getcachenativebm(bitmap, width, height, friendbm);
+ return ami_bitmap_get_truecolour(bitmap, width, height,
friendbm);
}
}
-----------------------------------------------------------------------
Summary of changes:
amiga/bitmap.c | 4 ++--
amiga/gui.c | 47 +++++++++++++++++++++++++++++++++++++----------
2 files changed, 39 insertions(+), 12 deletions(-)
diff --git a/amiga/bitmap.c b/amiga/bitmap.c
index 69dc2dc..edc0916 100644
--- a/amiga/bitmap.c
+++ b/amiga/bitmap.c
@@ -351,7 +351,7 @@ struct bitmap *ami_bitmap_from_datatype(char *filename)
return bm;
}
-static struct BitMap *ami_getcachenativebm(struct bitmap *bitmap,int width,int
height,struct BitMap *friendbm)
+static struct BitMap *ami_bitmap_get_truecolour(struct bitmap *bitmap,int
width,int height,struct BitMap *friendbm)
{
struct RenderInfo ri;
struct BitMap *tbm = NULL;
@@ -518,6 +518,6 @@ struct BitMap *ami_bitmap_get_native(struct bitmap *bitmap,
if(ami_plot_screen_is_palettemapped() == true) {
return ami_bitmap_get_palettemapped(bitmap, width, height);
} else {
- return ami_getcachenativebm(bitmap, width, height, friendbm);
+ return ami_bitmap_get_truecolour(bitmap, width, height,
friendbm);
}
}
diff --git a/amiga/gui.c b/amiga/gui.c
index f3670a4..5ec3815 100755
--- a/amiga/gui.c
+++ b/amiga/gui.c
@@ -603,8 +603,8 @@ void ami_openscreen(void)
if(screenmodereq =
AllocAslRequest(ASL_ScreenModeRequest,NULL))
{
if(AslRequestTags(screenmodereq,
- ASLSM_MinDepth,0,
- ASLSM_MaxDepth,32,
+ ASLSM_MinDepth, 0,
+ ASLSM_MaxDepth, 32,
TAG_DONE))
{
char *modeid = malloc(20);
@@ -3813,6 +3813,7 @@ void gui_window_set_icon(struct gui_window *g,
hlcache_handle *icon)
struct BitMap *bm = NULL;
struct IBox *bbox;
ULONG cur_tab = 0;
+ struct bitmap *icon_bitmap;
if(nsoption_bool(kiosk_mode) == true) return;
if(!g) return;
@@ -3821,9 +3822,9 @@ void gui_window_set_icon(struct gui_window *g,
hlcache_handle *icon)
g->shared->objects[GID_TABS],
(ULONG *)&cur_tab);
- if ((icon != NULL) && (content_get_bitmap(icon) != NULL))
+ if ((icon != NULL) && ((icon_bitmap = content_get_bitmap(icon)) !=
NULL))
{
- bm = ami_bitmap_get_native(content_get_bitmap(icon), 16, 16,
+ bm = ami_bitmap_get_native(icon_bitmap, 16, 16,
g->shared->win->RPort->BitMap);
}
@@ -3836,6 +3837,18 @@ void gui_window_set_icon(struct gui_window *g,
hlcache_handle *icon)
if(bm)
{
+ ULONG tag, tag_data, minterm;
+
+ if(ami_plot_screen_is_palettemapped() == false) {
+ tag = BLITA_UseSrcAlpha;
+ tag_data = !icon_bitmap->opaque;
+ minterm = 0xc0;
+ } else {
+ tag = BLITA_MaskPlane;
+ tag_data = (ULONG)icon_bitmap->native_mask;
+ minterm = 0xc0; /* should be (ABC|ABNC|ANBC); */
+ }
+
BltBitMapTags(BLITA_SrcX, 0,
BLITA_SrcY, 0,
BLITA_DestX, bbox->Left,
@@ -3846,7 +3859,8 @@ void gui_window_set_icon(struct gui_window *g,
hlcache_handle *icon)
BLITA_Dest,
g->shared->win->RPort,
BLITA_SrcType, BLITT_BITMAP,
BLITA_DestType, BLITT_RASTPORT,
- BLITA_UseSrcAlpha, TRUE,
+ BLITA_Minterm, minterm,
+ tag, tag_data,
TAG_DONE);
}
}
@@ -3876,15 +3890,15 @@ void gui_window_set_search_ico(hlcache_handle *ico)
struct nsObject *nnode;
struct gui_window_2 *gwin;
char fname[100];
+ struct bitmap *ico_bitmap;
if(IsMinListEmpty(window_list)) return;
if(nsoption_bool(kiosk_mode) == true) return;
if (ico == NULL) ico = search_web_ico();
- if ((ico != NULL) && (content_get_bitmap(ico) != NULL))
- {
- bm = ami_bitmap_get_native(content_get_bitmap(ico), 16, 16,
NULL);
- }
+ ico_bitmap = content_get_bitmap(ico);
+ if ((ico != NULL) && (ico_bitmap != NULL))
+ bm = ami_bitmap_get_native(ico_bitmap, 16, 16, NULL);
node = (struct nsObject *)GetHead((struct List *)window_list);
@@ -3906,6 +3920,18 @@ void gui_window_set_search_ico(hlcache_handle *ico)
if(bm)
{
+ ULONG tag, tag_data, minterm;
+
+ if(ami_plot_screen_is_palettemapped() == false)
{
+ tag = BLITA_UseSrcAlpha;
+ tag_data = !ico_bitmap->opaque;
+ minterm = 0xc0;
+ } else {
+ tag = BLITA_MaskPlane;
+ tag_data =
(ULONG)ico_bitmap->native_mask;
+ minterm = 0xc0; /* should be
(ABC|ABNC|ANBC); */
+ }
+
BltBitMapTags(BLITA_SrcX, 0,
BLITA_SrcY, 0,
BLITA_DestX, bbox->Left,
@@ -3916,7 +3942,8 @@ void gui_window_set_search_ico(hlcache_handle *ico)
BLITA_Dest,
gwin->win->RPort,
BLITA_SrcType,
BLITT_BITMAP,
BLITA_DestType,
BLITT_RASTPORT,
- BLITA_UseSrcAlpha, TRUE,
+ BLITA_Minterm, minterm,
+ tag, tag_data,
TAG_DONE);
}
}
--
NetSurf Browser
_______________________________________________
netsurf-commits mailing list
[email protected]
http://vlists.pepperfish.net/cgi-bin/mailman/listinfo/netsurf-commits-netsurf-browser.org
