mirrors
/
netsurf
mirror of https://github.com/netsurf-browser/netsurf
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix colour setting. GetRGB32 seems to have been designed for some futuristic 96bpp 

display device.

svn path=/trunk/netsurf/; revision=11554
This commit is contained in:
Chris Young 2011-01-30 22:57:56 +00:00
parent b03a9b6391
commit b1662d0b09
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
amiga/system_colour.c
View File

@ -30,6 +30,7 @@
#include <proto/graphics.h>
#include <proto/intuition.h>
#include <intuition/screens.h>
#include <datatypes/pictureclass.h>
struct gui_system_colour_ctx {
const char *name;
@ -326,18 +327,21 @@ css_error gui_system_colour(void *pw, lwc_string *name, css_color *colour)
css_color ami_css_colour_from_pen(struct Screen *screen, UWORD pen)
{
css_color colour = 0x00000000;
css_color css_colour = 0x00000000;
ULONG colour[3];
struct DrawInfo *drinfo = GetScreenDrawInfo(screen);
if(drinfo == NULL) return 0x00000000;
/* Get the colour of the pen being used for "pen", and force it opaque */
/* Get the colour of the pen being used for "pen" */
GetRGB32(screen->ViewPort.ColorMap, drinfo->dri_Pens[pen], 1, (ULONG *)&colour);
colour |= 0xff000000;
// printf("Pen %ld\n Palette entry %ld\n Colour %lx\n", pen, drinfo->dri_Pens[pen], colour);
/* convert it to a css_color */
css_colour = (0xff << 24) |
((colour[0] & 0xff000000) >> 8) |
((colour[1] & 0xff000000) >> 16) |
((colour[2] & 0xff000000) >> 24);
FreeScreenDrawInfo(screen, drinfo);
return colour;
return css_colour;
}