r4292 mmu_man - /trunk/netsurf/beos/
by netsurf＠semichrome.net
Author: mmu_man
Date: Fri Jun 6 20:13:07 2008
New Revision: 4292
URL: http://source.netsurf-browser.org?rev=4292&view=rev
Log:
Add copyrights
Notes on a plot_path implementation.
Modified:
trunk/netsurf/beos/beos_bitmap.cpp
trunk/netsurf/beos/beos_bitmap.h
trunk/netsurf/beos/beos_fetch_rsrc.cpp
trunk/netsurf/beos/beos_fetch_rsrc.h
trunk/netsurf/beos/beos_filetype.cpp
trunk/netsurf/beos/beos_filetype.h
trunk/netsurf/beos/beos_font.cpp
trunk/netsurf/beos/beos_font.h
trunk/netsurf/beos/beos_gui.cpp
trunk/netsurf/beos/beos_gui.h
trunk/netsurf/beos/beos_history.cpp
trunk/netsurf/beos/beos_history.h
trunk/netsurf/beos/beos_login.cpp
trunk/netsurf/beos/beos_options.cpp
trunk/netsurf/beos/beos_options.h
trunk/netsurf/beos/beos_plotters.cpp
trunk/netsurf/beos/beos_plotters.h
trunk/netsurf/beos/beos_res.rdef
trunk/netsurf/beos/beos_scaffolding.cpp
trunk/netsurf/beos/beos_scaffolding.h
trunk/netsurf/beos/beos_schedule.cpp
trunk/netsurf/beos/beos_schedule.h
trunk/netsurf/beos/beos_throbber.cpp
trunk/netsurf/beos/beos_throbber.h
trunk/netsurf/beos/beos_thumbnail.cpp
trunk/netsurf/beos/beos_treeview.cpp
trunk/netsurf/beos/beos_window.cpp
trunk/netsurf/beos/beos_window.h
trunk/netsurf/beos/options.h
Modified: trunk/netsurf/beos/beos_bitmap.cpp
URL: http://source.netsurf-browser.org/trunk/netsurf/beos/beos_bitmap.cpp?rev=...
==============================================================================
--- trunk/netsurf/beos/beos_bitmap.cpp (original)
+++ trunk/netsurf/beos/beos_bitmap.cpp Fri Jun 6 20:13:07 2008
@@ -1,4 +1,5 @@
/*
+ * Copyright 2008 François Revol <mmu_man(a)users.sourceforge.net>
* Copyright 2004 James Bursa <bursa(a)users.sourceforge.net>
*
* This file is part of NetSurf, http://www.netsurf-browser.org/
Modified: trunk/netsurf/beos/beos_bitmap.h
URL: http://source.netsurf-browser.org/trunk/netsurf/beos/beos_bitmap.h?rev=42...
==============================================================================
--- trunk/netsurf/beos/beos_bitmap.h (original)
+++ trunk/netsurf/beos/beos_bitmap.h Fri Jun 6 20:13:07 2008
@@ -1,4 +1,5 @@
/*
+ * Copyright 2008 François Revol <mmu_man(a)users.sourceforge.net>
* Copyright 2006 Daniel Silverstone <dsilvers(a)digital-scurf.org>
*
* This file is part of NetSurf, http://www.netsurf-browser.org/
Modified: trunk/netsurf/beos/beos_fetch_rsrc.cpp
URL: http://source.netsurf-browser.org/trunk/netsurf/beos/beos_fetch_rsrc.cpp?...
==============================================================================
--- trunk/netsurf/beos/beos_fetch_rsrc.cpp (original)
+++ trunk/netsurf/beos/beos_fetch_rsrc.cpp Fri Jun 6 20:13:07 2008
@@ -1,4 +1,5 @@
/*
+ * Copyright 2008 François Revol <mmu_man(a)users.sourceforge.net>
* Copyright 2008 Rob Kendrick <rjek(a)netsurf-browser.org>
*
* This file is part of NetSurf.
@@ -17,7 +18,6 @@
*/
/* rsrc: URL handling. */
-#warning XXX: WRITEME
#define _GNU_SOURCE
Modified: trunk/netsurf/beos/beos_fetch_rsrc.h
URL: http://source.netsurf-browser.org/trunk/netsurf/beos/beos_fetch_rsrc.h?re...
==============================================================================
--- trunk/netsurf/beos/beos_fetch_rsrc.h (original)
+++ trunk/netsurf/beos/beos_fetch_rsrc.h Fri Jun 6 20:13:07 2008
@@ -1,4 +1,5 @@
/*
+ * Copyright 2008 François Revol <mmu_man(a)users.sourceforge.net>
* Copyright 2008 Rob Kendrick <rjek(a)netsurf-browser.org>
*
* This file is part of NetSurf.
Modified: trunk/netsurf/beos/beos_filetype.cpp
URL: http://source.netsurf-browser.org/trunk/netsurf/beos/beos_filetype.cpp?re...
==============================================================================
--- trunk/netsurf/beos/beos_filetype.cpp (original)
+++ trunk/netsurf/beos/beos_filetype.cpp Fri Jun 6 20:13:07 2008
@@ -1,4 +1,5 @@
/*
+ * Copyright 2008 François Revol <mmu_man(a)users.sourceforge.net>
* Copyright 2007 Rob Kendrick <rjek(a)netsurf-browser.org>
* Copyright 2007 Vincent Sanders <vince(a)debian.org>
*
Modified: trunk/netsurf/beos/beos_filetype.h
URL: http://source.netsurf-browser.org/trunk/netsurf/beos/beos_filetype.h?rev=...
==============================================================================
--- trunk/netsurf/beos/beos_filetype.h (original)
+++ trunk/netsurf/beos/beos_filetype.h Fri Jun 6 20:13:07 2008
@@ -1,4 +1,5 @@
/*
+ * Copyright 2008 François Revol <mmu_man(a)users.sourceforge.net>
* Copyright 2007 Rob Kendrick <rjek(a)netsurf-browser.org>
* Copyright 2007 Vincent Sanders <vince(a)debian.org>
*
Modified: trunk/netsurf/beos/beos_font.cpp
URL: http://source.netsurf-browser.org/trunk/netsurf/beos/beos_font.cpp?rev=42...
==============================================================================
--- trunk/netsurf/beos/beos_font.cpp (original)
+++ trunk/netsurf/beos/beos_font.cpp Fri Jun 6 20:13:07 2008
@@ -1,4 +1,5 @@
/*
+ * Copyright 2008 François Revol <mmu_man(a)users.sourceforge.net>
* Copyright 2005 James Bursa <bursa(a)users.sourceforge.net>
*
* This file is part of NetSurf, http://www.netsurf-browser.org/
Modified: trunk/netsurf/beos/beos_font.h
URL: http://source.netsurf-browser.org/trunk/netsurf/beos/beos_font.h?rev=4292...
==============================================================================
--- trunk/netsurf/beos/beos_font.h (original)
+++ trunk/netsurf/beos/beos_font.h Fri Jun 6 20:13:07 2008
@@ -1,4 +1,5 @@
/*
+ * Copyright 2008 François Revol <mmu_man(a)users.sourceforge.net>
* Copyright 2005 James Bursa <bursa(a)users.sourceforge.net>
*
* This file is part of NetSurf, http://www.netsurf-browser.org/
Modified: trunk/netsurf/beos/beos_gui.cpp
URL: http://source.netsurf-browser.org/trunk/netsurf/beos/beos_gui.cpp?rev=429...
==============================================================================
--- trunk/netsurf/beos/beos_gui.cpp (original)
+++ trunk/netsurf/beos/beos_gui.cpp Fri Jun 6 20:13:07 2008
@@ -1,4 +1,5 @@
/*
+ * Copyright 2008 François Revol <mmu_man(a)users.sourceforge.net>
* Copyright 2005 James Bursa <bursa(a)users.sourceforge.net>
*
* This file is part of NetSurf, http://www.netsurf-browser.org/
Modified: trunk/netsurf/beos/beos_gui.h
URL: http://source.netsurf-browser.org/trunk/netsurf/beos/beos_gui.h?rev=4292&...
==============================================================================
--- trunk/netsurf/beos/beos_gui.h (original)
+++ trunk/netsurf/beos/beos_gui.h Fri Jun 6 20:13:07 2008
@@ -1,4 +1,5 @@
/*
+ * Copyright 2008 François Revol <mmu_man(a)users.sourceforge.net>
* Copyright 2005 James Bursa <bursa(a)users.sourceforge.net>
*
* This file is part of NetSurf, http://www.netsurf-browser.org/
Modified: trunk/netsurf/beos/beos_history.cpp
URL: http://source.netsurf-browser.org/trunk/netsurf/beos/beos_history.cpp?rev...
==============================================================================
--- trunk/netsurf/beos/beos_history.cpp (original)
+++ trunk/netsurf/beos/beos_history.cpp Fri Jun 6 20:13:07 2008
@@ -1,4 +1,5 @@
/*
+ * Copyright 2008 François Revol <mmu_man(a)users.sourceforge.net>
* Copyright 2006 Rob Kendrick <rjek(a)rjek.com>
*
* This file is part of NetSurf, http://www.netsurf-browser.org/
Modified: trunk/netsurf/beos/beos_history.h
URL: http://source.netsurf-browser.org/trunk/netsurf/beos/beos_history.h?rev=4...
==============================================================================
--- trunk/netsurf/beos/beos_history.h (original)
+++ trunk/netsurf/beos/beos_history.h Fri Jun 6 20:13:07 2008
@@ -1,4 +1,5 @@
/*
+ * Copyright 2008 François Revol <mmu_man(a)users.sourceforge.net>
* Copyright 2006 Rob Kendrick <rjek(a)rjek.com>
*
* This file is part of NetSurf, http://www.netsurf-browser.org/
Modified: trunk/netsurf/beos/beos_login.cpp
URL: http://source.netsurf-browser.org/trunk/netsurf/beos/beos_login.cpp?rev=4...
==============================================================================
--- trunk/netsurf/beos/beos_login.cpp (original)
+++ trunk/netsurf/beos/beos_login.cpp Fri Jun 6 20:13:07 2008
@@ -1,4 +1,5 @@
/*
+ * Copyright 2008 François Revol <mmu_man(a)users.sourceforge.net>
* Copyright 2006 Rob Kendrick <rjek(a)rjek.com>
*
* This file is part of NetSurf, http://www.netsurf-browser.org/
Modified: trunk/netsurf/beos/beos_options.cpp
URL: http://source.netsurf-browser.org/trunk/netsurf/beos/beos_options.cpp?rev...
==============================================================================
--- trunk/netsurf/beos/beos_options.cpp (original)
+++ trunk/netsurf/beos/beos_options.cpp Fri Jun 6 20:13:07 2008
@@ -1,4 +1,5 @@
/*
+ * Copyright 2008 François Revol <mmu_man(a)users.sourceforge.net>
* Copyright 2006 Rob Kendrick <rjek(a)rjek.com>
*
* This file is part of NetSurf, http://www.netsurf-browser.org/
Modified: trunk/netsurf/beos/beos_options.h
URL: http://source.netsurf-browser.org/trunk/netsurf/beos/beos_options.h?rev=4...
==============================================================================
--- trunk/netsurf/beos/beos_options.h (original)
+++ trunk/netsurf/beos/beos_options.h Fri Jun 6 20:13:07 2008
@@ -1,4 +1,5 @@
/*
+ * Copyright 2008 François Revol <mmu_man(a)users.sourceforge.net>
* Copyright 2006 Rob Kendrick <rjek(a)rjek.com>
*
* This file is part of NetSurf, http://www.netsurf-browser.org/
Modified: trunk/netsurf/beos/beos_plotters.cpp
URL: http://source.netsurf-browser.org/trunk/netsurf/beos/beos_plotters.cpp?re...
==============================================================================
--- trunk/netsurf/beos/beos_plotters.cpp (original)
+++ trunk/netsurf/beos/beos_plotters.cpp Fri Jun 6 20:13:07 2008
@@ -1,4 +1,5 @@
/*
+ * Copyright 2008 François Revol <mmu_man(a)users.sourceforge.net>
* Copyright 2006 Rob Kendrick <rjek(a)rjek.com>
* Copyright 2005 James Bursa <bursa(a)users.sourceforge.net>
*
@@ -27,6 +28,7 @@
#include <GraphicsDefs.h>
#include <Region.h>
#include <View.h>
+#include <Shape.h>
extern "C" {
#include "desktop/plotters.h"
#include "render/font.h"
@@ -687,6 +689,52 @@
bool nsbeos_plot_path(float *p, unsigned int n, colour fill, float width,
colour c, float *transform)
{
+ unsigned int i;
+
+ if (n == 0)
+ return true;
+
+ if (p[0] != PLOTTER_PATH_MOVE) {
+ LOG(("path doesn't start with a move"));
+ return false;
+ }
+
+ BShape shape;
+
+#if 0
+ for (i = 0; i < n; ) {
+ if (p[i] == PLOTTER_PATH_MOVE) {
+ path[i] = draw_MOVE_TO;
+ path[i + 1] = p[i + 1] * 2 * 256;
+ path[i + 2] = -p[i + 2] * 2 * 256;
+ i += 3;
+ } else if (p[i] == PLOTTER_PATH_CLOSE) {
+ path[i] = draw_CLOSE_LINE;
+ i++;
+ } else if (p[i] == PLOTTER_PATH_LINE) {
+ path[i] = draw_LINE_TO;
+ path[i + 1] = p[i + 1] * 2 * 256;
+ path[i + 2] = -p[i + 2] * 2 * 256;
+ i += 3;
+ } else if (p[i] == PLOTTER_PATH_BEZIER) {
+ path[i] = draw_BEZIER_TO;
+ path[i + 1] = p[i + 1] * 2 * 256;
+ path[i + 2] = -p[i + 2] * 2 * 256;
+ path[i + 3] = p[i + 3] * 2 * 256;
+ path[i + 4] = -p[i + 4] * 2 * 256;
+ path[i + 5] = p[i + 5] * 2 * 256;
+ path[i + 6] = -p[i + 6] * 2 * 256;
+ i += 7;
+ } else {
+ LOG(("bad path command %f", p[i]));
+ goto error;
+ }
+ }
+ path[i] = draw_END_PATH;
+ path[i + 1] = 0;
+#endif
+
+ //StrokeBezier
#warning WRITEME
#if 0 /* GTK */
/* Only the internal SVG renderer uses this plot call currently,
Modified: trunk/netsurf/beos/beos_plotters.h
URL: http://source.netsurf-browser.org/trunk/netsurf/beos/beos_plotters.h?rev=...
==============================================================================
--- trunk/netsurf/beos/beos_plotters.h (original)
+++ trunk/netsurf/beos/beos_plotters.h Fri Jun 6 20:13:07 2008
@@ -1,4 +1,5 @@
/*
+ * Copyright 2008 François Revol <mmu_man(a)users.sourceforge.net>
* Copyright 2005 James Bursa <bursa(a)users.sourceforge.net>
*
* This file is part of NetSurf, http://www.netsurf-browser.org/
Modified: trunk/netsurf/beos/beos_res.rdef
URL: http://source.netsurf-browser.org/trunk/netsurf/beos/beos_res.rdef?rev=42...
==============================================================================
--- trunk/netsurf/beos/beos_res.rdef (original)
+++ trunk/netsurf/beos/beos_res.rdef Fri Jun 6 20:13:07 2008
@@ -1,10 +1,20 @@
/*
-** /boot/home/beos_res.rdef
-**
-** Automatically generated by BResourceParser on
-** Saturday, May 17, 2008 at 23:10:33.
-**
-*/
+ * Copyright 2008 François Revol <mmu_man(a)users.sourceforge.net>
+ *
+ * This file is part of NetSurf, http://www.netsurf-browser.org/
+ *
+ * NetSurf is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License.
+ *
+ * NetSurf is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
enum {
R_ResBackNavActive = 1042,
Modified: trunk/netsurf/beos/beos_scaffolding.cpp
URL: http://source.netsurf-browser.org/trunk/netsurf/beos/beos_scaffolding.cpp...
==============================================================================
--- trunk/netsurf/beos/beos_scaffolding.cpp (original)
+++ trunk/netsurf/beos/beos_scaffolding.cpp Fri Jun 6 20:13:07 2008
@@ -1,4 +1,5 @@
/*
+ * Copyright 2008 François Revol <mmu_man(a)users.sourceforge.net>
* Copyright 2006 Rob Kendrick <rjek(a)rjek.com>
*
* This file is part of NetSurf, http://www.netsurf-browser.org/
Modified: trunk/netsurf/beos/beos_scaffolding.h
URL: http://source.netsurf-browser.org/trunk/netsurf/beos/beos_scaffolding.h?r...
==============================================================================
--- trunk/netsurf/beos/beos_scaffolding.h (original)
+++ trunk/netsurf/beos/beos_scaffolding.h Fri Jun 6 20:13:07 2008
@@ -1,4 +1,5 @@
/*
+ * Copyright 2008 François Revol <mmu_man(a)users.sourceforge.net>
* Copyright 2005 James Bursa <bursa(a)users.sourceforge.net>
*
* This file is part of NetSurf, http://www.netsurf-browser.org/
Modified: trunk/netsurf/beos/beos_schedule.cpp
URL: http://source.netsurf-browser.org/trunk/netsurf/beos/beos_schedule.cpp?re...
==============================================================================
--- trunk/netsurf/beos/beos_schedule.cpp (original)
+++ trunk/netsurf/beos/beos_schedule.cpp Fri Jun 6 20:13:07 2008
@@ -1,4 +1,5 @@
/*
+ * Copyright 2008 François Revol <mmu_man(a)users.sourceforge.net>
* Copyright 2006-2007 Daniel Silverstone <dsilvers(a)digital-scurf.org>
*
* This file is part of NetSurf, http://www.netsurf-browser.org/
Modified: trunk/netsurf/beos/beos_schedule.h
URL: http://source.netsurf-browser.org/trunk/netsurf/beos/beos_schedule.h?rev=...
==============================================================================
--- trunk/netsurf/beos/beos_schedule.h (original)
+++ trunk/netsurf/beos/beos_schedule.h Fri Jun 6 20:13:07 2008
@@ -1,4 +1,5 @@
/*
+ * Copyright 2008 François Revol <mmu_man(a)users.sourceforge.net>
* Copyright 2006 Daniel Silverstone <dsilvers(a)digital-scurf.org>
*
* This file is part of NetSurf, http://www.netsurf-browser.org/
Modified: trunk/netsurf/beos/beos_throbber.cpp
URL: http://source.netsurf-browser.org/trunk/netsurf/beos/beos_throbber.cpp?re...
==============================================================================
--- trunk/netsurf/beos/beos_throbber.cpp (original)
+++ trunk/netsurf/beos/beos_throbber.cpp Fri Jun 6 20:13:07 2008
@@ -1,4 +1,5 @@
/*
+ * Copyright 2008 François Revol <mmu_man(a)users.sourceforge.net>
* Copyright 2006 Rob Kendrick <rjek(a)rjek.com>
*
* This file is part of NetSurf, http://www.netsurf-browser.org/
Modified: trunk/netsurf/beos/beos_throbber.h
URL: http://source.netsurf-browser.org/trunk/netsurf/beos/beos_throbber.h?rev=...
==============================================================================
--- trunk/netsurf/beos/beos_throbber.h (original)
+++ trunk/netsurf/beos/beos_throbber.h Fri Jun 6 20:13:07 2008
@@ -1,4 +1,5 @@
/*
+ * Copyright 2008 François Revol <mmu_man(a)users.sourceforge.net>
* Copyright 2006 Rob Kendrick <rjek(a)rjek.com>
*
* This file is part of NetSurf, http://www.netsurf-browser.org/
Modified: trunk/netsurf/beos/beos_thumbnail.cpp
URL: http://source.netsurf-browser.org/trunk/netsurf/beos/beos_thumbnail.cpp?r...
==============================================================================
--- trunk/netsurf/beos/beos_thumbnail.cpp (original)
+++ trunk/netsurf/beos/beos_thumbnail.cpp Fri Jun 6 20:13:07 2008
@@ -1,4 +1,5 @@
/*
+ * Copyright 2008 François Revol <mmu_man(a)users.sourceforge.net>
* Copyright 2006 Rob Kendrick <rjek(a)rjek.com>
*
* This file is part of NetSurf, http://www.netsurf-browser.org/
Modified: trunk/netsurf/beos/beos_treeview.cpp
URL: http://source.netsurf-browser.org/trunk/netsurf/beos/beos_treeview.cpp?re...
==============================================================================
--- trunk/netsurf/beos/beos_treeview.cpp (original)
+++ trunk/netsurf/beos/beos_treeview.cpp Fri Jun 6 20:13:07 2008
@@ -1,4 +1,5 @@
/*
+ * Copyright 2008 François Revol <mmu_man(a)users.sourceforge.net>
* Copyright 2004 Richard Wilson <not_ginger_matt(a)users.sourceforge.net>
*
* This file is part of NetSurf, http://www.netsurf-browser.org/
Modified: trunk/netsurf/beos/beos_window.cpp
URL: http://source.netsurf-browser.org/trunk/netsurf/beos/beos_window.cpp?rev=...
==============================================================================
--- trunk/netsurf/beos/beos_window.cpp (original)
+++ trunk/netsurf/beos/beos_window.cpp Fri Jun 6 20:13:07 2008
@@ -1,4 +1,5 @@
/*
+ * Copyright 2008 François Revol <mmu_man(a)users.sourceforge.net>
* Copyright 2006 Daniel Silverstone <dsilvers(a)digital-scurf.org>
* Copyright 2006 Rob Kendrick <rjek(a)rjek.com>
*
@@ -108,7 +109,7 @@
NSBrowserFrameView::NSBrowserFrameView(BRect frame, struct gui_window *gui)
: BView(frame, "NSBrowserFrameView", B_FOLLOW_ALL_SIDES,
- B_WILL_DRAW | B_NAVIGABLE | B_FRAME_EVENTS),
+ B_WILL_DRAW | B_NAVIGABLE | B_FRAME_EVENTS /*| B_SUBPIXEL_PRECISE*/),
fGuiWindow(gui)
{
}
Modified: trunk/netsurf/beos/beos_window.h
URL: http://source.netsurf-browser.org/trunk/netsurf/beos/beos_window.h?rev=42...
==============================================================================
--- trunk/netsurf/beos/beos_window.h (original)
+++ trunk/netsurf/beos/beos_window.h Fri Jun 6 20:13:07 2008
@@ -1,4 +1,5 @@
/*
+ * Copyright 2008 François Revol <mmu_man(a)users.sourceforge.net>
* Copyright 2006 Daniel Silverstone <dsilvers(a)digital-scurf.org>
*
* This file is part of NetSurf, http://www.netsurf-browser.org/
Modified: trunk/netsurf/beos/options.h
URL: http://source.netsurf-browser.org/trunk/netsurf/beos/options.h?rev=4292&r...
==============================================================================
--- trunk/netsurf/beos/options.h (original)
+++ trunk/netsurf/beos/options.h Fri Jun 6 20:13:07 2008
@@ -1,4 +1,5 @@
/*
+ * Copyright 2008 François Revol <mmu_man(a)users.sourceforge.net>
* Copyright 2006 Rob Kendrick <rjek(a)rjek.com>
*
* This file is part of NetSurf, http://www.netsurf-browser.org/
15 years, 3 months
r4291 mmu_man - /trunk/netsurf/Docs/BUILDING-BeOS
by netsurf＠semichrome.net
Author: mmu_man
Date: Fri Jun 6 20:07:50 2008
New Revision: 4291
URL: http://source.netsurf-browser.org?rev=4291&view=rev
Log:
Forgot to tell about the need to make css/scanner.c on Linux and copy it back as re2c wants gcc4.
Modified:
trunk/netsurf/Docs/BUILDING-BeOS
Modified: trunk/netsurf/Docs/BUILDING-BeOS
URL: http://source.netsurf-browser.org/trunk/netsurf/Docs/BUILDING-BeOS?rev=42...
==============================================================================
--- trunk/netsurf/Docs/BUILDING-BeOS (original)
+++ trunk/netsurf/Docs/BUILDING-BeOS Fri Jun 6 20:07:50 2008
@@ -72,6 +72,26 @@
$ cp lemon lempar.c /boot/home/config/bin/
+ RE2C
+------
+
+ BeOS doesn't come with the re2c lexer. Unfortunately it requires gcc4
+ currently, so it cannot be built on BeOS. It might be possible on gcc4 built
+ Haiku.
+ The workaround is currently to generate the scanner.c file from Linux, and
+ copy it back to the source tree. Touching it in the future will make sure
+ make won't try to rebuild it.
+
+ (on Linux)
+ $ make css/scanner.c
+
+ (copy to the BeOS box)
+
+ (on BeOS/Haiku)
+ $ cp <somewhere>/scanner.c css/
+ $ touch -t 201801010000 css/scanner.c
+
+
cURL
------
15 years, 3 months
r4290 mmu_man - /trunk/netsurf/Docs/BUILDING-BeOS
by netsurf＠semichrome.net
Author: mmu_man
Date: Fri Jun 6 20:00:47 2008
New Revision: 4290
URL: http://source.netsurf-browser.org?rev=4290&view=rev
Log:
Detailed the needed steps and deps for the BeOS build.
Modified:
trunk/netsurf/Docs/BUILDING-BeOS
Modified: trunk/netsurf/Docs/BUILDING-BeOS
URL: http://source.netsurf-browser.org/trunk/netsurf/Docs/BUILDING-BeOS?rev=42...
==============================================================================
--- trunk/netsurf/Docs/BUILDING-BeOS (original)
+++ trunk/netsurf/Docs/BUILDING-BeOS Fri Jun 6 20:00:47 2008
@@ -6,8 +6,114 @@
of NetSurf and provides guidance on obtaining NetSurf's build dependencies.
BeOS NetSurf has been tested on Zeta only for now. There are still some
- issues to sort out for other BeOs versions.
+ issues to sort out for other BeOS versions.
There are still pending fixes against SVN before it can be build from BeOS
or Haiku.
+
+
+ Building and executing NetSurf
+=================================
+
+ To build NetSurf on a BeOS or Haiku, provided you have the relevant
+ build dependencies installed, simply run:
+
+ $ make
+
+ If that produces errors, you probably don't have some of NetSurf's build
+ dependencies installed. See "Obtaining NetSurf's dependencies" below. You
+ may need to "make clean" before attempting to build after installing the
+ dependencies. Also note BeOS has an old make command that won't work, see
+ below.
+
+
+ Obtaining NetSurf's dependencies
+==================================
+
+ Many of NetSurf's dependencies are either installed or available for BeOS and
+ Haiku. The remainder must be installed manually.
+
+ TODO: add some more here.
+
+ rc
+----
+
+ Building NetSurf needs the Haiku resource compiler (rc), that allows
+ importing files from resource definitions (.rdef).
+
+ $ cd <haiku-trunk-directory>
+ $ TARGET_PLATFORM=r5 jam -q rc
+ $ cp generated/objects/dano/x86/release/tools/rc/rc /boot/home/config/bin/
+
+
+ GNU make 3.81
+---------------
+
+ BeOS has an old make tool, which won't work when building NetSurf.
+ Haiku has 3.81 which is the one that works. For BeOS, one has to replace
+ the original make with one built from the Haiku tree, or install it as gmake:
+
+ $ cd <haiku-trunk-directory>
+ $ TARGET_PLATFORM=r5 jam -q make
+ $ cp generated/objects/r5/x86/release/bin/make/make /boot/home/config/bin/gmake
+
+
+ Lemon
+-------
+
+ BeOS doesn't come with the lemon parser generator, you'll need to download
+ it and build it yourself.
+
+ TODO: fix paths
+ $ wget http://www.sqlite.org/cvstrac/getfile/sqlite/tool/lemon.c
+ $ wget http://www.sqlite.org/cvstrac/getfile/sqlite/tool/lempar.c
+ $ gcc -o lemon lemon.c
+ $ cp lemon lempar.c /boot/home/config/bin/
+
+
+ cURL
+------
+
+ NetSurf uses cURL to fetch files from the network.
+ There is a patch against the official version on HaikuPorts.
+
+ TODO
+
+
+ libmng
+--------
+
+ NetSurf uses libMNG to display MNG and PNG files.
+ It should build just fine on BeOS.
+
+
+ libjpeg
+---------
+
+ NetSurf uses libjpeg to display JPEG files.
+ It should already be available in your dev kit.
+
+
+ OpenSSL
+----------
+
+ NetSurf uses OpenSSL for encrypted transfers.
+
+
+ General requirements
+----------------------
+
+ There is currently an issue on stdbool.h (unsigned char bool vs enum bool)
+ which needs to be fixed, for now one can use the Haiku version of the header
+ and copy it over the gcc-provided one.
+ $ cd <haiku-trunk-directory>
+ $ cp headers/build/gcc-2.95.3/stdbool.h /boot/develop/tools/gnupro/lib/gcc-lib/i586-pc-beos/2.95.3-beos-060710/include/stdbool.h
+
+
+ NetSurf might build on BeOS R5 but probably won't work on anything else than
+ BONE.
+
+ This will pull in loads of things, like all the GTK dev libraries, the PNG
+ and JPEG libraries, colour management libraries, zlib, OpenSSL etc that
+ NetSurf also depends on.
15 years, 3 months
r4289 adrianl - /trunk/netsurf/riscos/window.c
by netsurf＠semichrome.net
Author: adrianl
Date: Fri Jun 6 19:50:15 2008
New Revision: 4289
URL: http://source.netsurf-browser.org?rev=4289&view=rev
Log:
Zoom using shift-scrollwheel
Modified:
trunk/netsurf/riscos/window.c
Modified: trunk/netsurf/riscos/window.c
URL: http://source.netsurf-browser.org/trunk/netsurf/riscos/window.c?rev=4289&...
==============================================================================
--- trunk/netsurf/riscos/window.c (original)
+++ trunk/netsurf/riscos/window.c Fri Jun 6 19:50:15 2008
@@ -2630,49 +2630,69 @@
*/
void ro_gui_scroll_request(wimp_scroll *scroll)
{
- int x, y;
struct gui_window *g = ro_gui_window_lookup(scroll->w);
- x = scroll->visible.x1 - scroll->visible.x0 - 32;
- y = scroll->visible.y1 - scroll->visible.y0 - 32;
- if (g && g->toolbar)
- y -= ro_gui_theme_toolbar_full_height(g->toolbar);
-
- switch (scroll->xmin) {
- case wimp_SCROLL_PAGE_LEFT:
- scroll->xscroll -= x;
- break;
- case wimp_SCROLL_COLUMN_LEFT:
- scroll->xscroll -= 32;
- break;
- case wimp_SCROLL_COLUMN_RIGHT:
- scroll->xscroll += 32;
- break;
- case wimp_SCROLL_PAGE_RIGHT:
- scroll->xscroll += x;
- break;
- default:
- break;
- }
-
- switch (scroll->ymin) {
- case wimp_SCROLL_PAGE_UP:
- scroll->yscroll += y;
- break;
- case wimp_SCROLL_LINE_UP:
- scroll->yscroll += 32;
- break;
- case wimp_SCROLL_LINE_DOWN:
- scroll->yscroll -= 32;
- break;
- case wimp_SCROLL_PAGE_DOWN:
- scroll->yscroll -= y;
- break;
- default:
- break;
- }
-
- wimp_open_window((wimp_open *) scroll);
+ if (g && ro_gui_shift_pressed() && g->bw->current_content) {
+ float scale;
+ if (scroll->ymin > 0) {
+ scale = g->bw->scale + 0.02;
+ if (scale > scale_snap_to[SCALE_SNAP_TO_SIZE - 1])
+ scale = scale_snap_to[SCALE_SNAP_TO_SIZE - 1];
+ } else {
+ scale = g->bw->scale - 0.02;
+ if (scale < scale_snap_to[0])
+ scale = scale_snap_to[0];
+ }
+ if (g->bw->scale != scale)
+ browser_window_set_scale(g->bw, scale, true);
+ } else {
+ int x = scroll->visible.x1 - scroll->visible.x0 - 32;
+ int y = scroll->visible.y1 - scroll->visible.y0 - 32;
+ os_error *error;
+
+ if (g && g->toolbar)
+ y -= ro_gui_theme_toolbar_full_height(g->toolbar);
+
+ switch (scroll->xmin) {
+ case wimp_SCROLL_PAGE_LEFT:
+ scroll->xscroll -= x;
+ break;
+ case wimp_SCROLL_COLUMN_LEFT:
+ scroll->xscroll -= 32;
+ break;
+ case wimp_SCROLL_COLUMN_RIGHT:
+ scroll->xscroll += 32;
+ break;
+ case wimp_SCROLL_PAGE_RIGHT:
+ scroll->xscroll += x;
+ break;
+ default:
+ break;
+ }
+
+ switch (scroll->ymin) {
+ case wimp_SCROLL_PAGE_UP:
+ scroll->yscroll += y;
+ break;
+ case wimp_SCROLL_LINE_UP:
+ scroll->yscroll += 32;
+ break;
+ case wimp_SCROLL_LINE_DOWN:
+ scroll->yscroll -= 32;
+ break;
+ case wimp_SCROLL_PAGE_DOWN:
+ scroll->yscroll -= y;
+ break;
+ default:
+ break;
+ }
+
+ error = xwimp_open_window((wimp_open *) scroll);
+ if (error) {
+ LOG(("xwimp_open_window: 0x%x: %s",
+ error->errnum, error->errmess));
+ }
+ }
}
15 years, 3 months
r4288 jmb - /trunk/netsurf/content/fetchcache.c
by netsurf＠semichrome.net
Author: jmb
Date: Fri Jun 6 18:51:51 2008
New Revision: 4288
URL: http://source.netsurf-browser.org?rev=4288&view=rev
Log:
Fix cache control
Modified:
trunk/netsurf/content/fetchcache.c
Modified: trunk/netsurf/content/fetchcache.c
URL: http://source.netsurf-browser.org/trunk/netsurf/content/fetchcache.c?rev=...
==============================================================================
--- trunk/netsurf/content/fetchcache.c (original)
+++ trunk/netsurf/content/fetchcache.c Fri Jun 6 18:51:51 2008
@@ -51,7 +51,8 @@
static void fetchcache_parse_header(struct content *c, const char *data,
size_t size);
static void fetchcache_error_page(struct content *c, const char *error);
-static void fetchcache_cache_update(struct content *c,
+static void fetchcache_cache_update(struct content *c);
+static void fetchcache_cache_clone(struct content *c,
const struct cache_data *data);
static void fetchcache_notmodified(struct content *c, const void *data);
static void fetchcache_redirect(struct content *c, const void *data,
@@ -471,6 +472,7 @@
break;
case FETCH_FINISHED:
+ fetchcache_cache_update(c);
c->fetch = 0;
content_set_status(c, messages_get("Converting"),
c->source_size);
@@ -738,13 +740,28 @@
/**
- * Update a content's cache info
- *
- * \param The content
- * \param Cache data
- */
-
-void fetchcache_cache_update(struct content *c,
+ * Update a content's cache state
+ *
+ * \param c The content
+ */
+
+void fetchcache_cache_update(struct content *c)
+{
+ if (c->cache_data.date == 0)
+ c->cache_data.date = time(NULL);
+
+ if (c->cache_data.no_cache)
+ c->fresh = false;
+}
+
+/**
+ * Clone cache info into a content
+ *
+ * \param c The content
+ * \param data Cache data
+ */
+
+void fetchcache_cache_clone(struct content *c,
const struct cache_data *data)
{
assert(c && data);
@@ -754,8 +771,6 @@
if (data->date != 0)
c->cache_data.date = data->date;
- else
- c->cache_data.date = time(0);
if (data->expires != 0)
c->cache_data.expires = data->expires;
@@ -767,7 +782,7 @@
c->cache_data.max_age = data->max_age;
if (data->no_cache)
- c->fresh = false;
+ c->cache_data.no_cache = data->no_cache;
if (data->etag) {
talloc_free(c->cache_data.etag);
@@ -853,8 +868,10 @@
c->fetch = 0;
c->status = CONTENT_STATUS_ERROR;
- /* and update fallback's cache control data */
- fetchcache_cache_update(fb, &c->cache_data);
+ /* clone our cache control data into the fallback */
+ fetchcache_cache_clone(fb, &c->cache_data);
+ /* and update the fallback's cache state */
+ fetchcache_cache_update(fb);
}
else {
/* No cached content, so unconditionally refetch */
15 years, 3 months
r4287 mikeL - /branches/mikeL/netsurf/gtk/gtk_window.c
by netsurf＠semichrome.net
Author: mikeL
Date: Fri Jun 6 18:21:32 2008
New Revision: 4287
URL: http://source.netsurf-browser.org?rev=4287&view=rev
Log:
Mouse code can now handle modifiers. Fixed bug where end of drag was not detected until mouse moved after being released. Improved mouse handling.
Modified:
branches/mikeL/netsurf/gtk/gtk_window.c
Modified: branches/mikeL/netsurf/gtk/gtk_window.c
URL: http://source.netsurf-browser.org/branches/mikeL/netsurf/gtk/gtk_window.c...
==============================================================================
--- branches/mikeL/netsurf/gtk/gtk_window.c (original)
+++ branches/mikeL/netsurf/gtk/gtk_window.c Fri Jun 6 18:21:32 2008
@@ -359,20 +359,25 @@
GdkEventMotion *event, gpointer data)
{
struct gui_window *g = data;
- switch (g->mouse->state) {
- /* If the mouse moves during a press, it is considered a drag
- * so we emit a "drag click" */
- case BROWSER_MOUSE_PRESS_1:
- browser_window_mouse_click(g->bw, BROWSER_MOUSE_DRAG_1,
- event->x / g->bw->scale, event->y / g->bw->scale);
- g->mouse->state |= BROWSER_MOUSE_HOLDING_1 ;
- break;
- case BROWSER_MOUSE_PRESS_2:
- browser_window_mouse_click(g->bw, BROWSER_MOUSE_DRAG_2,
- event->x / g->bw->scale, event->y / g->bw->scale);
- g->mouse->state |= BROWSER_MOUSE_HOLDING_2;
- break;
+
+ /* If the mouse moves during a press, it is considered a drag
+ * so we emit a "drag click" */
+ if (g->mouse->state & BROWSER_MOUSE_PRESS_1){
+ browser_window_mouse_click(g->bw,
+ /* Replaces PRESS with DRAG keeping any modifiers*/
+ g->mouse->state ^ (BROWSER_MOUSE_PRESS_1 | BROWSER_MOUSE_DRAG_1),
+ event->x / g->bw->scale, event->y / g->bw->scale);
+ /* Replaces PRESS with HOLDING and DRAG_ON keeping any modifiers */
+ g->mouse->state ^= BROWSER_MOUSE_PRESS_1 |
+ BROWSER_MOUSE_HOLDING_1 | BROWSER_MOUSE_DRAG_ON;
+ } else if (g->mouse->state & BROWSER_MOUSE_PRESS_2){
+ browser_window_mouse_click(g->bw,
+ g->mouse->state ^ (BROWSER_MOUSE_PRESS_1 | BROWSER_MOUSE_DRAG_1),
+ event->x / g->bw->scale, event->y / g->bw->scale);
+ g->mouse->state ^= BROWSER_MOUSE_PRESS_2 |
+ BROWSER_MOUSE_HOLDING_2 | BROWSER_MOUSE_DRAG_ON;
}
+
browser_window_mouse_track(g->bw, g->mouse->state, event->x / g->bw->scale,
event->y / g->bw->scale);
@@ -392,8 +397,16 @@
return TRUE;
}
- /* Assigns mouse state either 1 or 2 since these correspond to mouse presses */
- g->mouse->state = event->button;
+ switch (event->button) {
+ case 1: g->mouse->state = BROWSER_MOUSE_PRESS_1; break;
+ case 2: g->mouse->state = BROWSER_MOUSE_PRESS_2; break;
+ }
+ /* Handle the modifiers too */
+ if (event->state & GDK_SHIFT_MASK) g->mouse->state |= BROWSER_MOUSE_MOD_1;
+ if (event->state & GDK_CONTROL_MASK) g->mouse->state |= BROWSER_MOUSE_MOD_2;
+
+ browser_window_mouse_click(g->bw, g->mouse->state, event->x / g->bw->scale,
+ event->y / g->bw->scale);
}
gboolean nsgtk_window_button_release_event(GtkWidget *widget,
@@ -402,14 +415,15 @@
int button;
struct gui_window *g = data;
-/* If not dragging then we are waiting for a release to emit
+/* If the mouse state is PRESS then we are waiting for a release to emit
* a click event, otherwise just reset the state to nothing*/
- if (g->bw->drag_type == DRAGGING_NONE)
+ if (g->mouse->state & (BROWSER_MOUSE_PRESS_1|BROWSER_MOUSE_PRESS_2))
browser_window_mouse_click(g->bw, g->mouse->state * 4, event->x / g->bw->scale,
event->y / g->bw->scale);
-
+ else if (g->bw->drag_type != DRAGGING_NONE)
+ browser_window_mouse_drag_end(g->bw, 0, event->x, event->y);
+
g->mouse->state = 0;
-
return TRUE;
}
15 years, 3 months
r4286 mikeL - /branches/mikeL/netsurf/desktop/browser.c
by netsurf＠semichrome.net
Author: mikeL
Date: Fri Jun 6 17:15:00 2008
New Revision: 4286
URL: http://source.netsurf-browser.org?rev=4286&view=rev
Log:
Patched from trunk: scrollbars now respond on HOLDING
Modified:
branches/mikeL/netsurf/desktop/browser.c
Modified: branches/mikeL/netsurf/desktop/browser.c
URL: http://source.netsurf-browser.org/branches/mikeL/netsurf/desktop/browser....
==============================================================================
--- branches/mikeL/netsurf/desktop/browser.c (original)
+++ branches/mikeL/netsurf/desktop/browser.c Fri Jun 6 17:15:00 2008
@@ -1982,7 +1982,7 @@
(mouse & BROWSER_MOUSE_DRAG_ON));
bool but2 = (mouse & (BROWSER_MOUSE_PRESS_2 | BROWSER_MOUSE_DRAG_2)) ||
((mouse & BROWSER_MOUSE_HOLDING_2) &&
- (mouse & BROWSER_MOUSE_DRAG_ON));;
+ (mouse & BROWSER_MOUSE_DRAG_ON));
const int w = SCROLLBAR_WIDTH;
bool vscroll, hscroll;
int well_height, bar_top, bar_height;
@@ -2046,14 +2046,13 @@
} else if (z < w + bar_start + bar_size - w / 4) {
/* in scrollbar */
status = messages_get(vert ? "ScrollV" : "ScrollH");
-
- /* respond on the click rather than the drag because it gives
- the scrollbars a more solid, RISC OS feel */
- if (mouse & (BROWSER_MOUSE_PRESS_1 | BROWSER_MOUSE_PRESS_2)) {
+
+ if (mouse & (BROWSER_MOUSE_HOLDING_1|
+ BROWSER_MOUSE_HOLDING_2)) {
int x0 = 0, x1 = 0;
int y0 = 0, y1 = 0;
- if (mouse & BROWSER_MOUSE_PRESS_1) {
+ if (mouse & BROWSER_MOUSE_HOLDING_1) {
bw->drag_type = vert ? DRAGGING_VSCROLL :
DRAGGING_HSCROLL;
} else
15 years, 3 months
r4285 tlsa - /trunk/netsurf/desktop/browser.c
by netsurf＠semichrome.net
Author: tlsa
Date: Fri Jun 6 13:26:26 2008
New Revision: 4285
URL: http://source.netsurf-browser.org?rev=4285&view=rev
Log:
Fix up.
Modified:
trunk/netsurf/desktop/browser.c
Modified: trunk/netsurf/desktop/browser.c
URL: http://source.netsurf-browser.org/trunk/netsurf/desktop/browser.c?rev=428...
==============================================================================
--- trunk/netsurf/desktop/browser.c (original)
+++ trunk/netsurf/desktop/browser.c Fri Jun 6 13:26:26 2008
@@ -1978,10 +1978,10 @@
{
bool but1 = ((mouse & BROWSER_MOUSE_PRESS_1) ||
((mouse & BROWSER_MOUSE_HOLDING_1) &&
- (mouse & BROWSER_MOUSE_DRAG_ON));
+ (mouse & BROWSER_MOUSE_DRAG_ON)));
bool but2 = ((mouse & BROWSER_MOUSE_PRESS_2) ||
((mouse & BROWSER_MOUSE_HOLDING_2) &&
- (mouse & BROWSER_MOUSE_DRAG_ON));
+ (mouse & BROWSER_MOUSE_DRAG_ON)));
const int w = SCROLLBAR_WIDTH;
bool vscroll, hscroll;
int well_height, bar_top, bar_height;
15 years, 3 months
r4284 tlsa - /trunk/netsurf/desktop/browser.c
by netsurf＠semichrome.net
Author: tlsa
Date: Fri Jun 6 13:23:40 2008
New Revision: 4284
URL: http://source.netsurf-browser.org?rev=4284&view=rev
Log:
Remove stray semicolon.
Modified:
trunk/netsurf/desktop/browser.c
Modified: trunk/netsurf/desktop/browser.c
URL: http://source.netsurf-browser.org/trunk/netsurf/desktop/browser.c?rev=428...
==============================================================================
--- trunk/netsurf/desktop/browser.c (original)
+++ trunk/netsurf/desktop/browser.c Fri Jun 6 13:23:40 2008
@@ -1976,10 +1976,10 @@
browser_mouse_state mouse, struct box *box,
int box_x, int box_y, int x, int y)
{
- bool but1 = (mouse & (BROWSER_MOUSE_PRESS_1 | BROWSER_MOUSE_DRAG_1)) ||
+ bool but1 = ((mouse & BROWSER_MOUSE_PRESS_1) ||
((mouse & BROWSER_MOUSE_HOLDING_1) &&
(mouse & BROWSER_MOUSE_DRAG_ON));
- bool but2 = (mouse & (BROWSER_MOUSE_PRESS_2 | BROWSER_MOUSE_DRAG_2)) ||
+ bool but2 = ((mouse & BROWSER_MOUSE_PRESS_2) ||
((mouse & BROWSER_MOUSE_HOLDING_2) &&
(mouse & BROWSER_MOUSE_DRAG_ON));
const int w = SCROLLBAR_WIDTH;
15 years, 3 months
r4283 tlsa - /trunk/netsurf/desktop/browser.c
by netsurf＠semichrome.net
Author: tlsa
Date: Fri Jun 6 13:21:50 2008
New Revision: 4283
URL: http://source.netsurf-browser.org?rev=4283&view=rev
Log:
Remove stray semicolon.
Modified:
trunk/netsurf/desktop/browser.c
Modified: trunk/netsurf/desktop/browser.c
URL: http://source.netsurf-browser.org/trunk/netsurf/desktop/browser.c?rev=428...
==============================================================================
--- trunk/netsurf/desktop/browser.c (original)
+++ trunk/netsurf/desktop/browser.c Fri Jun 6 13:21:50 2008
@@ -1981,7 +1981,7 @@
(mouse & BROWSER_MOUSE_DRAG_ON));
bool but2 = (mouse & (BROWSER_MOUSE_PRESS_2 | BROWSER_MOUSE_DRAG_2)) ||
((mouse & BROWSER_MOUSE_HOLDING_2) &&
- (mouse & BROWSER_MOUSE_DRAG_ON));;
+ (mouse & BROWSER_MOUSE_DRAG_ON));
const int w = SCROLLBAR_WIDTH;
bool vscroll, hscroll;
int well_height, bar_top, bar_height;
15 years, 3 months