Gitweb links:
...log
http://git.netsurf-browser.org/netsurf.git/shortlog/34a3901501f12d9c7ed82332f79590ca62a094d1
...commit
http://git.netsurf-browser.org/netsurf.git/commit/34a3901501f12d9c7ed82332f79590ca62a094d1
...tree
http://git.netsurf-browser.org/netsurf.git/tree/34a3901501f12d9c7ed82332f79590ca62a094d1
The branch, master has been updated
via 34a3901501f12d9c7ed82332f79590ca62a094d1 (commit)
via b806c94c1d6c98cc3e5461f06032aacff6c00b42 (commit)
from 02593d170a7163a141acf6f2f72686a7bdbfb828 (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/34a3901501f12d9c7ed82332f79590ca62a094d1
commit 34a3901501f12d9c7ed82332f79590ca62a094d1
Author: Ole Loots <[email protected]>
Commit: Ole Loots <[email protected]>
A new window can now be opened in background mode.
diff --git a/atari/browser_win.c b/atari/browser_win.c
index 29e78ca..3b987bb 100755
--- a/atari/browser_win.c
+++ b/atari/browser_win.c
@@ -165,8 +165,9 @@ int window_create( struct gui_window * gw,
EvntDataAttach( gw->root->handle, WM_ICONDRAW, evnt_window_icondraw,
gw);
EvntDataAttach( gw->root->handle, WM_SLIDEXY, evnt_window_slider, gw );
- /* TODO: check if window is openend as "foreground" window... */
- window_set_focus( gw, BROWSER, gw->browser);
+ if (inflags & WIN_TOP) {
+ window_set_focus( gw, BROWSER, gw->browser);
+ }
return (err);
}
diff --git a/atari/browser_win.h b/atari/browser_win.h
index 9d56226..4cf8a26 100755
--- a/atari/browser_win.h
+++ b/atari/browser_win.h
@@ -22,10 +22,12 @@
#define GUIWIN_VISIBLE(gw) (gw->root->handle->status & WS_OPEN)
#define GEMWIN_VISIBLE(win) (win->status & WS_OPEN)
-#define WIDGET_STATUSBAR 0x1
-#define WIDGET_TOOLBAR 0x2
-#define WIDGET_SCROLL 0x4
-#define WIDGET_RESIZE 0x8
+#define WIDGET_STATUSBAR 0x1
+#define WIDGET_TOOLBAR 0x2
+#define WIDGET_SCROLL 0x4
+#define WIDGET_RESIZE 0x8
+
+#define WIN_TOP 0x100
/* WinDom & Custom bindings for gui window */
commitdiff
http://git.netsurf-browser.org/netsurf.git/commitdiff/b806c94c1d6c98cc3e5461f06032aacff6c00b42
commit b806c94c1d6c98cc3e5461f06032aacff6c00b42
Author: Ole Loots <[email protected]>
Commit: Ole Loots <[email protected]>
Fix warnings, moved prototypes, housekeeping
diff --git a/atari/download.c b/atari/download.c
index 8ced4c3..45be977 100755
--- a/atari/download.c
+++ b/atari/download.c
@@ -46,8 +46,6 @@
#include "atari/res/netsurf.rsh"
#include "atari/download.h"
#include "atari/osspec.h"
-
-/*TODO: get filename from core. */
extern struct gui_window * input_window;
diff --git a/atari/gui.c b/atari/gui.c
index deb28df..b780985 100755
--- a/atari/gui.c
+++ b/atari/gui.c
@@ -958,7 +958,7 @@ static void gui_init(int argc, char** argv)
}
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) ));
if( strlen(nsoption_charp(cookie_file)) ){
diff --git a/atari/history.c b/atari/history.c
index 00fcce9..d658fcb 100755
--- a/atari/history.c
+++ b/atari/history.c
@@ -28,6 +28,7 @@
#include "desktop/gui.h"
#include "desktop/history_global_core.h"
#include "desktop/browser.h"
+#include "utils/messages.h"
#include "content/content.h"
#include "content/hlcache.h"
#include "content/urldb.h"
@@ -105,8 +106,7 @@ bool global_history_init( void )
LOG(("Failed to allocate history window"));
return( false );
}
- /* TODO: load history strings from messages */
- WindSetStr( gl_history.window, WF_NAME, (char*)"History" );
+ WindSetStr(gl_history.window, WF_NAME,
messages_get("GlobalHistory"));
//WindSetPtr( gl_history.window, WF_TOOLBAR, tree,
evnt_history_toolbar );
EvntAttach( gl_history.window, WM_CLOSED, evnt_history_close );
EvntAttach( gl_history.window, WM_XBUTTON,evnt_history_mbutton
);
diff --git a/atari/hotlist.c b/atari/hotlist.c
index 68e5c31..bdd10d9 100755
--- a/atari/hotlist.c
+++ b/atari/hotlist.c
@@ -103,8 +103,7 @@ void hotlist_init(void)
LOG(("Failed to allocate Hotlist"));
return;
}
- /* TODO: load hotlist strings from messages */
- WindSetStr( hl.window, WF_NAME, (char*)"Hotlist" );
+ WindSetStr( hl.window, WF_NAME, (char*)messages_get("Hotlist")
);
WindSetPtr( hl.window, WF_TOOLBAR, tree, evnt_hl_toolbar );
EvntAttach( hl.window, WM_CLOSED, evnt_hl_close );
EvntAttach( hl.window, WM_XBUTTON,evnt_hl_mbutton );
diff --git a/atari/plot/plot.c b/atari/plot/plot.c
index ac5ab1e..66407ff 100755
--- a/atari/plot/plot.c
+++ b/atari/plot/plot.c
@@ -69,13 +69,6 @@ static void snapshot_suspend(void);
/* destroy memory used by screenshot */
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
static unsigned short sys_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.
- *
+ *
* \param vdih The vdi handle
* \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.
- *
+ *
* \param vdih The vdi handle
* \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
/**
- * 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 )
{
@@ -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)
{
@@ -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)
{
@@ -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)
{
@@ -804,7 +797,7 @@ static MFDB * snapshot_create_std_mfdb(int x, int y, int w,
int h)
return( &buf_std );
}
-/*
+/*
* Create an snapshot of the screen in netsurf ABGR format
*/
static struct bitmap * snapshot_create(int x, int y, int w, int h)
diff --git a/atari/plot/plot.h b/atari/plot/plot.h
index a5c7683..53a2645 100755
--- a/atari/plot/plot.h
+++ b/atari/plot/plot.h
@@ -122,6 +122,12 @@ bool plot_copy_rect(GRECT src, GRECT dst);
/* convert an vdi color to bgra */
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 ) */
#define NSLT2VDI(dst, src) \
dst = 0;\
-----------------------------------------------------------------------
Summary of changes:
atari/browser_win.c | 5 +++--
atari/browser_win.h | 10 ++++++----
atari/download.c | 2 --
atari/gui.c | 2 +-
atari/history.c | 4 ++--
atari/hotlist.c | 3 +--
atari/plot/plot.c | 21 +++++++--------------
atari/plot/plot.h | 6 ++++++
8 files changed, 26 insertions(+), 27 deletions(-)
diff --git a/atari/browser_win.c b/atari/browser_win.c
index 29e78ca..3b987bb 100755
--- a/atari/browser_win.c
+++ b/atari/browser_win.c
@@ -165,8 +165,9 @@ int window_create( struct gui_window * gw,
EvntDataAttach( gw->root->handle, WM_ICONDRAW, evnt_window_icondraw,
gw);
EvntDataAttach( gw->root->handle, WM_SLIDEXY, evnt_window_slider, gw );
- /* TODO: check if window is openend as "foreground" window... */
- window_set_focus( gw, BROWSER, gw->browser);
+ if (inflags & WIN_TOP) {
+ window_set_focus( gw, BROWSER, gw->browser);
+ }
return (err);
}
diff --git a/atari/browser_win.h b/atari/browser_win.h
index 9d56226..4cf8a26 100755
--- a/atari/browser_win.h
+++ b/atari/browser_win.h
@@ -22,10 +22,12 @@
#define GUIWIN_VISIBLE(gw) (gw->root->handle->status & WS_OPEN)
#define GEMWIN_VISIBLE(win) (win->status & WS_OPEN)
-#define WIDGET_STATUSBAR 0x1
-#define WIDGET_TOOLBAR 0x2
-#define WIDGET_SCROLL 0x4
-#define WIDGET_RESIZE 0x8
+#define WIDGET_STATUSBAR 0x1
+#define WIDGET_TOOLBAR 0x2
+#define WIDGET_SCROLL 0x4
+#define WIDGET_RESIZE 0x8
+
+#define WIN_TOP 0x100
/* WinDom & Custom bindings for gui window */
diff --git a/atari/download.c b/atari/download.c
index 8ced4c3..45be977 100755
--- a/atari/download.c
+++ b/atari/download.c
@@ -46,8 +46,6 @@
#include "atari/res/netsurf.rsh"
#include "atari/download.h"
#include "atari/osspec.h"
-
-/*TODO: get filename from core. */
extern struct gui_window * input_window;
diff --git a/atari/gui.c b/atari/gui.c
index deb28df..b780985 100755
--- a/atari/gui.c
+++ b/atari/gui.c
@@ -958,7 +958,7 @@ static void gui_init(int argc, char** argv)
}
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) ));
if( strlen(nsoption_charp(cookie_file)) ){
diff --git a/atari/history.c b/atari/history.c
index 00fcce9..d658fcb 100755
--- a/atari/history.c
+++ b/atari/history.c
@@ -28,6 +28,7 @@
#include "desktop/gui.h"
#include "desktop/history_global_core.h"
#include "desktop/browser.h"
+#include "utils/messages.h"
#include "content/content.h"
#include "content/hlcache.h"
#include "content/urldb.h"
@@ -105,8 +106,7 @@ bool global_history_init( void )
LOG(("Failed to allocate history window"));
return( false );
}
- /* TODO: load history strings from messages */
- WindSetStr( gl_history.window, WF_NAME, (char*)"History" );
+ WindSetStr(gl_history.window, WF_NAME,
messages_get("GlobalHistory"));
//WindSetPtr( gl_history.window, WF_TOOLBAR, tree,
evnt_history_toolbar );
EvntAttach( gl_history.window, WM_CLOSED, evnt_history_close );
EvntAttach( gl_history.window, WM_XBUTTON,evnt_history_mbutton
);
diff --git a/atari/hotlist.c b/atari/hotlist.c
index 68e5c31..bdd10d9 100755
--- a/atari/hotlist.c
+++ b/atari/hotlist.c
@@ -103,8 +103,7 @@ void hotlist_init(void)
LOG(("Failed to allocate Hotlist"));
return;
}
- /* TODO: load hotlist strings from messages */
- WindSetStr( hl.window, WF_NAME, (char*)"Hotlist" );
+ WindSetStr( hl.window, WF_NAME, (char*)messages_get("Hotlist")
);
WindSetPtr( hl.window, WF_TOOLBAR, tree, evnt_hl_toolbar );
EvntAttach( hl.window, WM_CLOSED, evnt_hl_close );
EvntAttach( hl.window, WM_XBUTTON,evnt_hl_mbutton );
diff --git a/atari/plot/plot.c b/atari/plot/plot.c
index ac5ab1e..66407ff 100755
--- a/atari/plot/plot.c
+++ b/atari/plot/plot.c
@@ -69,13 +69,6 @@ static void snapshot_suspend(void);
/* destroy memory used by screenshot */
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
static unsigned short sys_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.
- *
+ *
* \param vdih The vdi handle
* \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.
- *
+ *
* \param vdih The vdi handle
* \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
/**
- * 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 )
{
@@ -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)
{
@@ -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)
{
@@ -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)
{
@@ -804,7 +797,7 @@ static MFDB * snapshot_create_std_mfdb(int x, int y, int w,
int h)
return( &buf_std );
}
-/*
+/*
* Create an snapshot of the screen in netsurf ABGR format
*/
static struct bitmap * snapshot_create(int x, int y, int w, int h)
diff --git a/atari/plot/plot.h b/atari/plot/plot.h
index a5c7683..53a2645 100755
--- a/atari/plot/plot.h
+++ b/atari/plot/plot.h
@@ -122,6 +122,12 @@ bool plot_copy_rect(GRECT src, GRECT dst);
/* convert an vdi color to bgra */
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 ) */
#define NSLT2VDI(dst, src) \
dst = 0;\
--
NetSurf Browser
_______________________________________________
netsurf-commits mailing list
[email protected]
http://vlists.pepperfish.net/cgi-bin/mailman/listinfo/netsurf-commits-netsurf-browser.org
