mirrors/netsurf
1
0
Fork 0
mirror of https://github.com/netsurf-browser/netsurf synced 2024-11-27 08:50:02 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fix warnings, moved prototypes, housekeeping

Browse Source
This commit is contained in:
Ole Loots 2012-08-27 20:14:27 +02:00
parent 02593d170a
commit b806c94c1d
6 changed files with 17 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
atari/download.c
View File

@ -46,8 +46,6 @@
#include "atari/res/netsurf.rsh" #include "atari/res/netsurf.rsh"
#include "atari/download.h" #include "atari/download.h"
#include "atari/osspec.h" #include "atari/osspec.h"
/*TODO: get filename from core. */
extern struct gui_window * input_window; extern struct gui_window * input_window;

2
atari/gui.c
View File

@ -958,7 +958,7 @@ static void gui_init(int argc, char** argv)
} }
if (nsoption_charp(cookie_file) == NULL ){ if (nsoption_charp(cookie_file) == NULL ){
nsoption_set_charp(cookie_file, "cookies"); nsoption_set_charp(cookie_file, (char*)"cookies");
} }
LOG(("Loading cookies from: %s", nsoption_charp(cookie_file) )); LOG(("Loading cookies from: %s", nsoption_charp(cookie_file) ));
if( strlen(nsoption_charp(cookie_file)) ){ if( strlen(nsoption_charp(cookie_file)) ){

4
atari/history.c
View File

@ -28,6 +28,7 @@
#include "desktop/gui.h" #include "desktop/gui.h"
#include "desktop/history_global_core.h" #include "desktop/history_global_core.h"
#include "desktop/browser.h" #include "desktop/browser.h"
#include "utils/messages.h"
#include "content/content.h" #include "content/content.h"
#include "content/hlcache.h" #include "content/hlcache.h"
#include "content/urldb.h" #include "content/urldb.h"
@ -105,8 +106,7 @@ bool global_history_init( void )
LOG(("Failed to allocate history window")); LOG(("Failed to allocate history window"));
return( false ); return( false );
} }
/* TODO: load history strings from messages */ WindSetStr(gl_history.window, WF_NAME, messages_get("GlobalHistory"));
WindSetStr( gl_history.window, WF_NAME, (char*)"History" );
//WindSetPtr( gl_history.window, WF_TOOLBAR, tree, evnt_history_toolbar ); //WindSetPtr( gl_history.window, WF_TOOLBAR, tree, evnt_history_toolbar );
EvntAttach( gl_history.window, WM_CLOSED, evnt_history_close ); EvntAttach( gl_history.window, WM_CLOSED, evnt_history_close );
EvntAttach( gl_history.window, WM_XBUTTON,evnt_history_mbutton ); EvntAttach( gl_history.window, WM_XBUTTON,evnt_history_mbutton );

3
atari/hotlist.c
View File

@ -103,8 +103,7 @@ void hotlist_init(void)
LOG(("Failed to allocate Hotlist")); LOG(("Failed to allocate Hotlist"));
return; return;
} }
/* TODO: load hotlist strings from messages */ WindSetStr( hl.window, WF_NAME, (char*)messages_get("Hotlist") );
WindSetStr( hl.window, WF_NAME, (char*)"Hotlist" );
WindSetPtr( hl.window, WF_TOOLBAR, tree, evnt_hl_toolbar ); WindSetPtr( hl.window, WF_TOOLBAR, tree, evnt_hl_toolbar );
EvntAttach( hl.window, WM_CLOSED, evnt_hl_close ); EvntAttach( hl.window, WM_CLOSED, evnt_hl_close );
EvntAttach( hl.window, WM_XBUTTON,evnt_hl_mbutton ); EvntAttach( hl.window, WM_XBUTTON,evnt_hl_mbutton );

21
atari/plot/plot.c
View File

@ -69,13 +69,6 @@ static void snapshot_suspend(void);
/* destroy memory used by screenshot */ /* destroy memory used by screenshot */
static void snapshot_destroy(void); static void snapshot_destroy(void);
/* convert an bgra color to vdi1000 color */
void rgb_to_vdi1000( unsigned char * in, unsigned short * out );
/* convert an rgb color to an index into the web palette */
short rgb_to_666_index(unsigned char r, unsigned char g, unsigned char b);
#ifdef WITH_8BPP_SUPPORT #ifdef WITH_8BPP_SUPPORT
static unsigned short sys_pal[256][3]; /*RGB*/ static unsigned short sys_pal[256][3]; /*RGB*/
static unsigned short pal[256][3]; /*RGB*/ static unsigned short pal[256][3]; /*RGB*/
@ -188,7 +181,7 @@ const char* plot_err_str(int i)
/** /**
* Set line drawing color by passing netsurf XBGR "colour" type. * Set line drawing color by passing netsurf XBGR "colour" type.
* *
* \param vdih The vdi handle * \param vdih The vdi handle
* \param cin The netsurf colour value * \param cin The netsurf colour value
*/ */
@ -214,7 +207,7 @@ inline static void vsl_rgbcolor(short vdih, colour cin)
/** /**
* Set fill color by passing netsurf XBGR "colour" type. * Set fill color by passing netsurf XBGR "colour" type.
* *
* \param vdih The vdi handle * \param vdih The vdi handle
* \param cin The netsurf colour value * \param cin The netsurf colour value
*/ */
@ -567,7 +560,7 @@ inline void vdi1000_to_rgb(unsigned short * in, unsigned char * out)
#ifdef WITH_8BPP_SUPPORT #ifdef WITH_8BPP_SUPPORT
/** /**
* Set pixel within an 8 bit VDI standard bitmap. * 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 ) inline static void set_stdpx( MFDB * dst, int wdplanesz, int x, int y, unsigned char val )
{ {
@ -602,7 +595,7 @@ inline static void set_stdpx( MFDB * dst, int wdplanesz, int x, int y, unsigned
} }
/** /**
* Read pixel from an 8 bit VDI standard bitmap. * Read pixel from an 8 bit VDI standard bitmap.
*/ */
inline static unsigned char get_stdpx(MFDB * dst, int wdplanesz, int x, int y) inline static unsigned char get_stdpx(MFDB * dst, int wdplanesz, int x, int y)
{ {
@ -715,7 +708,7 @@ static void dump_vdi_info(short vdih)
} }
/** /**
* Create an snapshot of the screen image in device 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) static MFDB * snapshot_create_native_mfdb(int x, int y, int w, int h)
{ {
@ -766,7 +759,7 @@ static MFDB * snapshot_create_native_mfdb(int x, int y, int w, int h)
} }
/** /**
* Create an snapshot of the screen image in VDI standard format (8 bit). * 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) static MFDB * snapshot_create_std_mfdb(int x, int y, int w, int h)
{ {
@ -804,7 +797,7 @@ static MFDB * snapshot_create_std_mfdb(int x, int y, int w, int h)
return( &buf_std ); return( &buf_std );
} }
/* /*
* 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) static struct bitmap * snapshot_create(int x, int y, int w, int h)

6
atari/plot/plot.h
View File

@ -122,6 +122,12 @@ bool plot_copy_rect(GRECT src, GRECT dst);
/* convert an vdi color to bgra */ /* convert an vdi color to bgra */
void vdi1000_to_rgb( unsigned short * in, unsigned char * out ); void vdi1000_to_rgb( unsigned short * in, unsigned char * out );
/* convert an bgra color to vdi1000 color */
void rgb_to_vdi1000( unsigned char * in, unsigned short * out );
/* convert an rgb color to an index into the web palette */
short rgb_to_666_index(unsigned char r, unsigned char g, unsigned char b);
/* assign vdi line style to dst ( netsurf type ) */ /* assign vdi line style to dst ( netsurf type ) */
#define NSLT2VDI(dst, src) \ #define NSLT2VDI(dst, src) \
dst = 0;\ dst = 0;\