Gitweb links:
...log
http://git.netsurf-browser.org/netsurf.git/shortlog/b06fecab55f6e9ad5ac894c79673f3f04d69fe23
...commit
http://git.netsurf-browser.org/netsurf.git/commit/b06fecab55f6e9ad5ac894c79673f3f04d69fe23
...tree
http://git.netsurf-browser.org/netsurf.git/tree/b06fecab55f6e9ad5ac894c79673f3f04d69fe23
The branch, master has been updated
via b06fecab55f6e9ad5ac894c79673f3f04d69fe23 (commit)
via e1a9a98e05cfff8f9ff01d9df384f34451f2297f (commit)
from 25cdea33516b200b9740a091e4437e48c0607372 (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/b06fecab55f6e9ad5ac894c79673f3f04d69fe23
commit b06fecab55f6e9ad5ac894c79673f3f04d69fe23
Merge: e1a9a98 25cdea3
Author: Ole Loots <o...@monochrom.net>
Commit: Ole Loots <o...@monochrom.net>
Merge branch 'master' of git://git.netsurf-browser.org/netsurf
commitdiff
http://git.netsurf-browser.org/netsurf.git/commitdiff/e1a9a98e05cfff8f9ff01d9df384f34451f2297f
commit e1a9a98e05cfff8f9ff01d9df384f34451f2297f
Author: Ole Loots <o...@monochrom.net>
Commit: Ole Loots <o...@monochrom.net>
Fixed colour type for vs* functions, added comments.
diff --git a/atari/plot/plot.c b/atari/plot/plot.c
index 8499ac7..ac5ab1e 100755
--- a/atari/plot/plot.c
+++ b/atari/plot/plot.c
@@ -186,8 +186,13 @@ const char* plot_err_str(int i)
return(plot_error_codes[abs(i)]);
}
-
-inline static void vsl_rgbcolor(short vdih, uint32_t cin)
+/**
+ * Set line drawing color by passing netsurf XBGR "colour" type.
+ *
+ * \param vdih The vdi handle
+ * \param cin The netsurf colour value
+ */
+inline static void vsl_rgbcolor(short vdih, colour cin)
{
#ifdef WITH_8BPP_SUPPORT
if( vdi_sysinfo.scr_bpp > 8 ) {
@@ -207,7 +212,13 @@ inline static void vsl_rgbcolor(short vdih, uint32_t cin)
#endif
}
-inline static void vsf_rgbcolor(short vdih, uint32_t cin)
+/**
+ * Set fill color by passing netsurf XBGR "colour" type.
+ *
+ * \param vdih The vdi handle
+ * \param cin The netsurf colour value
+ */
+inline static void vsf_rgbcolor(short vdih, colour cin)
{
#ifdef WITH_8BPP_SUPPORT
if( vdi_sysinfo.scr_bpp > 8 ) {
@@ -229,9 +240,9 @@ inline static void vsf_rgbcolor(short vdih, uint32_t cin)
-/*
- Get current visible coords
-*/
+/**
+ * Get current visible coords
+ */
inline static void plot_get_visible_grect(GRECT * out)
{
out->g_x = view.vis_x;
@@ -396,6 +407,10 @@ bool plot_copy_rect(GRECT src, GRECT dst)
return(true);
}
+/**
+ * Fill the screen info structure.
+ *
+ */
static struct s_vdi_sysinfo * read_vdi_sysinfo(short vdih, struct
s_vdi_sysinfo * info) {
unsigned long cookie_EdDI=0;
@@ -551,7 +566,9 @@ inline void vdi1000_to_rgb(unsigned short * in, unsigned
char * out)
#ifdef WITH_8BPP_SUPPORT
-
+/**
+ * Set pixel within an 8 bit VDI standard bitmap.
+ */
inline static void set_stdpx( MFDB * dst, int wdplanesz, int x, int y,
unsigned char val )
{
short * buf;
@@ -584,6 +601,9 @@ inline static void set_stdpx( MFDB * dst, int wdplanesz,
int x, int y, unsigned
*buf = (val&(1<<7)) ? ((*buf)|(whichbit)) : ((*buf)&~(whichbit));
}
+/**
+ * Read pixel from an 8 bit VDI standard bitmap.
+ */
inline static unsigned char get_stdpx(MFDB * dst, int wdplanesz, int x, int y)
{
unsigned char ret=0;
@@ -694,7 +714,9 @@ static void dump_vdi_info(short vdih)
printf("};\n");
}
-// create snapshot, native screen format
+/**
+ * Create an snapshot of the screen image in device format.
+ */
static MFDB * snapshot_create_native_mfdb(int x, int y, int w, int h)
{
MFDB scr;
@@ -743,7 +765,9 @@ static MFDB * snapshot_create_native_mfdb(int x, int y, int
w, int h)
return( &buf_scr );
}
-// create snapshot, vdi std. format
+/**
+ * Create an snapshot of the screen image in VDI standard format (8 bit).
+ */
static MFDB * snapshot_create_std_mfdb(int x, int y, int w, int h)
{
/* allocate memory for the snapshot */
@@ -780,10 +804,9 @@ static MFDB * snapshot_create_std_mfdb(int x, int y, int
w, int h)
return( &buf_std );
}
-/*
- This will create an snapshot of the screen in netsurf ABGR format
-*/
-
+/*
+ * Create an snapshot of the screen in netsurf ABGR format
+ */
static struct bitmap * snapshot_create(int x, int y, int w, int h)
{
int err;
@@ -854,6 +877,9 @@ no_copy:
return( &snapshot );
}
+/**
+ * Notify the snapshot interface that the last snapshot is no longer in use.
+ */
static void snapshot_suspend(void)
{
if(size_buf_scr > CONV_KEEP_LIMIT ) {
@@ -893,6 +919,9 @@ static void snapshot_suspend(void)
}
}
+/**
+ * Shut down the snapshot interface.
+ */
static void snapshot_destroy(void)
{
-----------------------------------------------------------------------
Summary of changes:
atari/plot/plot.c | 55 ++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 42 insertions(+), 13 deletions(-)
diff --git a/atari/plot/plot.c b/atari/plot/plot.c
index 8499ac7..ac5ab1e 100755
--- a/atari/plot/plot.c
+++ b/atari/plot/plot.c
@@ -186,8 +186,13 @@ const char* plot_err_str(int i)
return(plot_error_codes[abs(i)]);
}
-
-inline static void vsl_rgbcolor(short vdih, uint32_t cin)
+/**
+ * Set line drawing color by passing netsurf XBGR "colour" type.
+ *
+ * \param vdih The vdi handle
+ * \param cin The netsurf colour value
+ */
+inline static void vsl_rgbcolor(short vdih, colour cin)
{
#ifdef WITH_8BPP_SUPPORT
if( vdi_sysinfo.scr_bpp > 8 ) {
@@ -207,7 +212,13 @@ inline static void vsl_rgbcolor(short vdih, uint32_t cin)
#endif
}
-inline static void vsf_rgbcolor(short vdih, uint32_t cin)
+/**
+ * Set fill color by passing netsurf XBGR "colour" type.
+ *
+ * \param vdih The vdi handle
+ * \param cin The netsurf colour value
+ */
+inline static void vsf_rgbcolor(short vdih, colour cin)
{
#ifdef WITH_8BPP_SUPPORT
if( vdi_sysinfo.scr_bpp > 8 ) {
@@ -229,9 +240,9 @@ inline static void vsf_rgbcolor(short vdih, uint32_t cin)
-/*
- Get current visible coords
-*/
+/**
+ * Get current visible coords
+ */
inline static void plot_get_visible_grect(GRECT * out)
{
out->g_x = view.vis_x;
@@ -396,6 +407,10 @@ bool plot_copy_rect(GRECT src, GRECT dst)
return(true);
}
+/**
+ * Fill the screen info structure.
+ *
+ */
static struct s_vdi_sysinfo * read_vdi_sysinfo(short vdih, struct
s_vdi_sysinfo * info) {
unsigned long cookie_EdDI=0;
@@ -551,7 +566,9 @@ inline void vdi1000_to_rgb(unsigned short * in, unsigned
char * out)
#ifdef WITH_8BPP_SUPPORT
-
+/**
+ * Set pixel within an 8 bit VDI standard bitmap.
+ */
inline static void set_stdpx( MFDB * dst, int wdplanesz, int x, int y,
unsigned char val )
{
short * buf;
@@ -584,6 +601,9 @@ inline static void set_stdpx( MFDB * dst, int wdplanesz,
int x, int y, unsigned
*buf = (val&(1<<7)) ? ((*buf)|(whichbit)) : ((*buf)&~(whichbit));
}
+/**
+ * Read pixel from an 8 bit VDI standard bitmap.
+ */
inline static unsigned char get_stdpx(MFDB * dst, int wdplanesz, int x, int y)
{
unsigned char ret=0;
@@ -694,7 +714,9 @@ static void dump_vdi_info(short vdih)
printf("};\n");
}
-// create snapshot, native screen format
+/**
+ * Create an snapshot of the screen image in device format.
+ */
static MFDB * snapshot_create_native_mfdb(int x, int y, int w, int h)
{
MFDB scr;
@@ -743,7 +765,9 @@ static MFDB * snapshot_create_native_mfdb(int x, int y, int
w, int h)
return( &buf_scr );
}
-// create snapshot, vdi std. format
+/**
+ * Create an snapshot of the screen image in VDI standard format (8 bit).
+ */
static MFDB * snapshot_create_std_mfdb(int x, int y, int w, int h)
{
/* allocate memory for the snapshot */
@@ -780,10 +804,9 @@ static MFDB * snapshot_create_std_mfdb(int x, int y, int
w, int h)
return( &buf_std );
}
-/*
- This will create an snapshot of the screen in netsurf ABGR format
-*/
-
+/*
+ * Create an snapshot of the screen in netsurf ABGR format
+ */
static struct bitmap * snapshot_create(int x, int y, int w, int h)
{
int err;
@@ -854,6 +877,9 @@ no_copy:
return( &snapshot );
}
+/**
+ * Notify the snapshot interface that the last snapshot is no longer in use.
+ */
static void snapshot_suspend(void)
{
if(size_buf_scr > CONV_KEEP_LIMIT ) {
@@ -893,6 +919,9 @@ static void snapshot_suspend(void)
}
}
+/**
+ * Shut down the snapshot interface.
+ */
static void snapshot_destroy(void)
{
--
NetSurf Browser
_______________________________________________
netsurf-commits mailing list
netsurf-commits@netsurf-browser.org
http://vlists.pepperfish.net/cgi-bin/mailman/listinfo/netsurf-commits-netsurf-browser.org
