Gitweb links: ...log http://git.netsurf-browser.org/netsurf.git/shortlog/ff2f1f1836f4a3b33bbfa... ...commit http://git.netsurf-browser.org/netsurf.git/commit/ff2f1f1836f4a3b33bbfaaf... ...tree http://git.netsurf-browser.org/netsurf.git/tree/ff2f1f1836f4a3b33bbfaafbb... The branch, master has been updated via ff2f1f1836f4a3b33bbfaafbb2bbdc2c1dba4d63 (commit) from e237ebac8f6cca443a52966de74934d98096be1f (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/ff2f1f1836f4a3b33bb... commit ff2f1f1836f4a3b33bbfaafbb2bbdc2c1dba4d63 Author: Ole Loots <ole(a)monochrom.net&gt; Commit: Ole Loots <ole(a)monochrom.net&gt; Added missing copyright headers diff --git a/atari/Makefile.target b/atari/Makefile.target index f249b69..283d634 100644 --- a/atari/Makefile.target +++ b/atari/Makefile.target @@ -2,20 +2,23 @@ # Atari target setup # ---------------------------------------------------------------------------- -ifeq ($(ATARI_ARCH),68020-60) +ifeq ($(ATARI_ARCH),68000) PRGSUFFIX := 000.app +PKGNAME := ns000.zip endif ifeq ($(ATARI_ARCH),68020-60) CFLAGS += -m68020-60 LDFLAGS += -m68020-60 PRGSUFFIX := 020.app +PKGNAME := ns020.zip endif ifeq ($(ATARI_ARCH),5475) CFLAGS += -mcpu=5475 LDFLAGS += -mcpu=5475 PRGSUFFIX := v4e.app +PKGNAME := nsv4e.zip endif # non-pkgconfig components @@ -83,10 +86,35 @@ EXETARGET := ns$(SUBTARGET)$(PRGSUFFIX) # Install target # ---------------------------------------------------------------------------- -install-atari: +ATARI_INSTALL_TARGET_DIR := nsatari.package +ATARI_RES_DIR := atari/res + + +# ---------------------------------------------------------------------------- +# Install target +# ---------------------------------------------------------------------------- + +install-atari: # ---------------------------------------------------------------------------- # Package target # ---------------------------------------------------------------------------- -package-atari: \ No newline at end of file +package-atari: $(PKGNAME) + $(VQ)echo Creating $(PKGNAME) + +$(PKGNAME): $(EXETARGET) + $(Q)rm -rf $(ATARI_INSTALL_TARGET_DIR) + $(Q)mkdir $(ATARI_INSTALL_TARGET_DIR)/ + $(Q)mkdir $(ATARI_INSTALL_TARGET_DIR)/netsurf + $(Q)mkdir $(ATARI_INSTALL_TARGET_DIR)/netsurf/doc + $(Q)mkdir $(ATARI_INSTALL_TARGET_DIR)/netsurf/download + $(Q)mkdir $(ATARI_INSTALL_TARGET_DIR)/netsurf/res + $(Q)mkdir $(ATARI_INSTALL_TARGET_DIR)/netsurf/res/fonts + #$(Q)mkdir $(ATARI_INSTALL_TARGET_DIR)/netsurf/res/icons + $(Q)touch $(ATARI_INSTALL_TARGET_DIR)/netsurf/res/cookies + $(Q)cp $(ATARI_RES_DIR)/netsurf.rsc $(ATARI_INSTALL_TARGET_DIR)/netsurf/res/netsurf.rsc + $(Q)cp $(ATARI_RES_DIR)/icons/ $(ATARI_INSTALL_TARGET_DIR)/netsurf/res/icons/ -R + + + $(Q)cp $(EXETARGET) $(ATARI_INSTALL_TARGET_DIR)/netsurf diff --git a/atari/ctxmenu.h b/atari/ctxmenu.h index 1c0b131..079860d 100644 --- a/atari/ctxmenu.h +++ b/atari/ctxmenu.h @@ -1,3 +1,21 @@ +/* + * Copyright 2012 Ole Loots <ole(a)monochrom.net&gt; + * + * 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/>;. + */ + #ifndef CTXMENU_H_INCLUDED #define CTXMENU_H_INCLUDED diff --git a/atari/encoding.c b/atari/encoding.c index 93737b5..2cd2670 100644 --- a/atari/encoding.c +++ b/atari/encoding.c @@ -1,3 +1,21 @@ +/* + * Copyright 2012 Ole Loots <ole(a)monochrom.net&gt; + * + * 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/>;. + */ + #include "atari/encoding.h" diff --git a/atari/encoding.h b/atari/encoding.h index 80b51c8..7b9cc82 100644 --- a/atari/encoding.h +++ b/atari/encoding.h @@ -1,3 +1,21 @@ +/* + * Copyright 2012 Ole Loots <ole(a)monochrom.net&gt; + * + * 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/>;. + */ + #ifndef NS_ATARI_ENCODING_H #define NS_ATARI_ENCODING_H diff --git a/atari/font.c b/atari/font.c index 7137658..afb1209 100755 --- a/atari/font.c +++ b/atari/font.c @@ -18,6 +18,24 @@ #include <inttypes.h> #include <assert.h> +/* + * Copyright 2012 Ole Loots <ole(a)monochrom.net&gt; + * + * 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/>;. + */ + #include <stdbool.h> #include <windom.h> diff --git a/atari/plot/fontplot.c b/atari/plot/fontplot.c index ba4e267..b80965b 100644 --- a/atari/plot/fontplot.c +++ b/atari/plot/fontplot.c @@ -1,3 +1,21 @@ +/* + * Copyright 2010 Ole Loots <ole(a)monochrom.net&gt; + * + * 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/>;. + */ + #include "atari/plot/fontplot.h" const struct s_font_driver_table_entry font_driver_table[] = diff --git a/atari/redrawslots.h b/atari/redrawslots.h index ae4b77f..d1f0fc2 100644 --- a/atari/redrawslots.h +++ b/atari/redrawslots.h @@ -1,3 +1,22 @@ +/* + * Copyright 2012 Ole Loots <ole(a)monochrom.net&gt; + * + * 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/>;. + */ + + #ifndef ATARI_REDRAW_SLOTS_H #define ATARI_REDRAW_SLOTS_H diff --git a/atari/save.h b/atari/save.h index 00852d0..0775723 100644 --- a/atari/save.h +++ b/atari/save.h @@ -1,3 +1,21 @@ +/* + * Copyright 2012 Ole Loots <ole(a)monochrom.net&gt; + * + * 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/>;. + */ + #ifndef NSATARI_SAVE_H #define NSATARI_SAVE_H diff --git a/atari/schedule.h b/atari/schedule.h index 0ca3f91..e21b759 100755 --- a/atari/schedule.h +++ b/atari/schedule.h @@ -1,5 +1,6 @@ /* * Copyright 2008 Vincent Sanders <vince(a)simtec.co.uk&gt; + * 2012 Ole Loots <ole(a)monochrom.net&gt; * * This file is part of NetSurf, http://www.netsurf-browser.org/ * diff --git a/atari/search.c b/atari/search.c index d23724b..b5e2fdd 100644 --- a/atari/search.c +++ b/atari/search.c @@ -1,3 +1,21 @@ +/* + * Copyright 2012 Ole Loots <ole(a)monochrom.net&gt; + * + * 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/>;. + */ + #include <limits.h> #include <stdlib.h> #include <stdio.h> diff --git a/atari/search.h b/atari/search.h index 7521004..7913803 100644 --- a/atari/search.h +++ b/atari/search.h @@ -1,3 +1,21 @@ +/* + * Copyright 2012 Ole Loots <ole(a)monochrom.net&gt; + * + * 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/>;. + */ + #ifndef NS_ATARI_SEARCH_H #define NS_ATARI_SEARCH_H @@ -21,4 +39,4 @@ typedef struct s_search_form_session * SEARCH_FORM_SESSION; SEARCH_FORM_SESSION open_browser_search(struct gui_window * gw); void search_destroy( struct gui_window * gw ); -#endif \ No newline at end of file +#endif diff --git a/atari/settings.c b/atari/settings.c index b2a4baf..0192a97 100644 --- a/atari/settings.c +++ b/atari/settings.c @@ -1,3 +1,21 @@ +/* + * Copyright 2012 Ole Loots <ole(a)monochrom.net&gt; + * + * 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/>;. + */ + #include <sys/types.h> #include <sys/stat.h> #include <dirent.h> @@ -228,7 +246,7 @@ static colour color_popup(int x, int y, colour current) #define GRID_ROWS 9 #define GRID_COLS 27 colour retval = current; - int boxwidth=6, boxheight=8; + int boxwidth=6, boxheight=8; struct bitmap *palette_img; MFDB bg, screen; GRECT bgarea = {x, y, GRID_COLS*boxwidth+4, GRID_ROWS*boxheight+4}; @@ -250,23 +268,23 @@ static colour color_popup(int x, int y, colour current) .stroke_width = 2, .fill_type = PLOT_OP_TYPE_NONE, .fill_colour = 0 - }; - + }; + /* create a palette array (web colors): */ for (r=0; r<6; r++) { for (g=0; g<6; g++) { for (b=0; b<6; b++) { - palette[i] = ((web_std_colors[b]<<16) - | (web_std_colors[g]<<8) - | web_std_colors[r]); + palette[i] = ((web_std_colors[b]<<16) + | (web_std_colors[g]<<8) + | web_std_colors[r]); i++; } } } - + /* setup the gray color values: */ int z = 0; - colour grays[15] = {0x111111, 0x222222, 0x333333, 0x444444, + colour grays[15] = {0x111111, 0x222222, 0x333333, 0x444444, 0x555555, 0x666666, 0x777777, 0x888888, 0x999999, 0x999999, 0xAAAAAA, 0xBBBBBB, 0xCCCCCC, 0xDDDDDD, 0xEEEEEE}; @@ -277,19 +295,19 @@ static colour color_popup(int x, int y, colour current) palette[i] = 0x000000; z++; } - + /* hide the mouse */ v_hide_c (app.graf.handle); - - plot_set_dimensions(x, y, + + plot_set_dimensions(x, y, (GRID_COLS*boxwidth)+4, (GRID_ROWS*boxheight)+4); plot_lock(); - // store background: + // store background: short pxy[8]; init_mfdb(app.nplanes, bgarea.g_w, bgarea.g_h, 0, &bg); init_mfdb(0, bgarea.g_w, bgarea.g_h, 0, &screen); - + pxy[0] = bgarea.g_x; pxy[1] = bgarea.g_y; pxy[2] = bgarea.g_x + bgarea.g_w - 1; @@ -303,31 +321,31 @@ static colour color_popup(int x, int y, colour current) vro_cpyfm (app.graf.handle, S_ONLY, pxy, &screen, &bg); /* - plot_rectangle(x+1, y+1, x+(GRID_COLS*boxwidth)+3, + plot_rectangle(x+1, y+1, x+(GRID_COLS*boxwidth)+3, y+(GRID_ROWS*boxheight)+3, &outline); - + plot_line(x, y, x+(GRID_COLS*boxwidth)+2, y+(GRID_ROWS*boxheight)+2, &outline); */ plot_line(x, y, x+(GRID_COLS*boxwidth)+2, y, &outline); - plot_line(x, y+(GRID_ROWS*boxheight)+2, x+(GRID_COLS*boxwidth)+2, + plot_line(x, y+(GRID_ROWS*boxheight)+2, x+(GRID_COLS*boxwidth)+2, y+(GRID_ROWS*boxheight)+2, &outline); /* draw a 27*8 grid: */ for (i=0; i<243; i++){ drawcolour.fill_colour = palette[i]; - plot_rectangle(xpos+2, ypos+2, xpos+boxwidth+2, ypos+boxheight+2, + plot_rectangle(xpos+2, ypos+2, xpos+boxwidth+2, ypos+boxheight+2, &drawcolour); xpos += boxwidth; if (xpos >= GRID_COLS*boxwidth) { xpos = 0; ypos += boxheight; - } + } } - + /* restore the mouse */ v_show_c ( app.graf.handle, 1); @@ -339,7 +357,7 @@ static colour color_popup(int x, int y, colour current) /* calulate clicked grid coords: */ int row = ((evnt.my-y)/boxheight); int col = ((evnt.mx-x)/boxwidth); - + if (row >= 0 && row <= GRID_ROWS-1 && col >= 0 && col <= GRID_COLS-1) { assert( (GRID_COLS*row)+(col) >= 0 ); assert( (GRID_COLS*row)+(col) < 243 ); @@ -354,7 +372,7 @@ static colour color_popup(int x, int y, colour current) #undef GRID_COLS #undef GRID_ROWS - + return(retval); } @@ -837,7 +855,7 @@ static void display_settings( void ) snprintf( spare, 255, "%3d", nsoption_int(font_size) ); set_text( CHOICES_EDIT_DEF_FONT_SIZE, spare , 3 ); - set_text(CHOICES_BT_TOOLBAR_ICONSET, + set_text(CHOICES_BT_TOOLBAR_ICONSET, nsoption_charp(atari_image_toolbar_folder), LABEL_ICONSET_MAX_LEN); tmp_option_atari_toolbar_bg = nsoption_int(atari_toolbar_bg); ----------------------------------------------------------------------- Summary of changes: atari/Makefile.target | 34 ++++++++++++++++++++++++-- atari/ctxmenu.h | 18 ++++++++++++++ atari/encoding.c | 18 ++++++++++++++ atari/encoding.h | 18 ++++++++++++++ atari/font.c | 18 ++++++++++++++ atari/plot/fontplot.c | 18 ++++++++++++++ atari/redrawslots.h | 19 +++++++++++++++ atari/save.h | 18 ++++++++++++++ atari/schedule.h | 1 + atari/search.c | 18 ++++++++++++++ atari/search.h | 20 +++++++++++++++- atari/settings.c | 62 +++++++++++++++++++++++++++++++----------------- 12 files changed, 236 insertions(+), 26 deletions(-) diff --git a/atari/Makefile.target b/atari/Makefile.target index f249b69..283d634 100644 --- a/atari/Makefile.target +++ b/atari/Makefile.target @@ -2,20 +2,23 @@ # Atari target setup # ---------------------------------------------------------------------------- -ifeq ($(ATARI_ARCH),68020-60) +ifeq ($(ATARI_ARCH),68000) PRGSUFFIX := 000.app +PKGNAME := ns000.zip endif ifeq ($(ATARI_ARCH),68020-60) CFLAGS += -m68020-60 LDFLAGS += -m68020-60 PRGSUFFIX := 020.app +PKGNAME := ns020.zip endif ifeq ($(ATARI_ARCH),5475) CFLAGS += -mcpu=5475 LDFLAGS += -mcpu=5475 PRGSUFFIX := v4e.app +PKGNAME := nsv4e.zip endif # non-pkgconfig components @@ -83,10 +86,35 @@ EXETARGET := ns$(SUBTARGET)$(PRGSUFFIX) # Install target # ---------------------------------------------------------------------------- -install-atari: +ATARI_INSTALL_TARGET_DIR := nsatari.package +ATARI_RES_DIR := atari/res + + +# ---------------------------------------------------------------------------- +# Install target +# ---------------------------------------------------------------------------- + +install-atari: # ---------------------------------------------------------------------------- # Package target # ---------------------------------------------------------------------------- -package-atari: \ No newline at end of file +package-atari: $(PKGNAME) + $(VQ)echo Creating $(PKGNAME) + +$(PKGNAME): $(EXETARGET) + $(Q)rm -rf $(ATARI_INSTALL_TARGET_DIR) + $(Q)mkdir $(ATARI_INSTALL_TARGET_DIR)/ + $(Q)mkdir $(ATARI_INSTALL_TARGET_DIR)/netsurf + $(Q)mkdir $(ATARI_INSTALL_TARGET_DIR)/netsurf/doc + $(Q)mkdir $(ATARI_INSTALL_TARGET_DIR)/netsurf/download + $(Q)mkdir $(ATARI_INSTALL_TARGET_DIR)/netsurf/res + $(Q)mkdir $(ATARI_INSTALL_TARGET_DIR)/netsurf/res/fonts + #$(Q)mkdir $(ATARI_INSTALL_TARGET_DIR)/netsurf/res/icons + $(Q)touch $(ATARI_INSTALL_TARGET_DIR)/netsurf/res/cookies + $(Q)cp $(ATARI_RES_DIR)/netsurf.rsc $(ATARI_INSTALL_TARGET_DIR)/netsurf/res/netsurf.rsc + $(Q)cp $(ATARI_RES_DIR)/icons/ $(ATARI_INSTALL_TARGET_DIR)/netsurf/res/icons/ -R + + + $(Q)cp $(EXETARGET) $(ATARI_INSTALL_TARGET_DIR)/netsurf diff --git a/atari/ctxmenu.h b/atari/ctxmenu.h index 1c0b131..079860d 100644 --- a/atari/ctxmenu.h +++ b/atari/ctxmenu.h @@ -1,3 +1,21 @@ +/* + * Copyright 2012 Ole Loots <ole(a)monochrom.net&gt; + * + * 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/>;. + */ + #ifndef CTXMENU_H_INCLUDED #define CTXMENU_H_INCLUDED diff --git a/atari/encoding.c b/atari/encoding.c index 93737b5..2cd2670 100644 --- a/atari/encoding.c +++ b/atari/encoding.c @@ -1,3 +1,21 @@ +/* + * Copyright 2012 Ole Loots <ole(a)monochrom.net&gt; + * + * 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/>;. + */ + #include "atari/encoding.h" diff --git a/atari/encoding.h b/atari/encoding.h index 80b51c8..7b9cc82 100644 --- a/atari/encoding.h +++ b/atari/encoding.h @@ -1,3 +1,21 @@ +/* + * Copyright 2012 Ole Loots <ole(a)monochrom.net&gt; + * + * 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/>;. + */ + #ifndef NS_ATARI_ENCODING_H #define NS_ATARI_ENCODING_H diff --git a/atari/font.c b/atari/font.c index 7137658..afb1209 100755 --- a/atari/font.c +++ b/atari/font.c @@ -18,6 +18,24 @@ #include <inttypes.h> #include <assert.h> +/* + * Copyright 2012 Ole Loots <ole(a)monochrom.net&gt; + * + * 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/>;. + */ + #include <stdbool.h> #include <windom.h> diff --git a/atari/plot/fontplot.c b/atari/plot/fontplot.c index ba4e267..b80965b 100644 --- a/atari/plot/fontplot.c +++ b/atari/plot/fontplot.c @@ -1,3 +1,21 @@ +/* + * Copyright 2010 Ole Loots <ole(a)monochrom.net&gt; + * + * 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/>;. + */ + #include "atari/plot/fontplot.h" const struct s_font_driver_table_entry font_driver_table[] = diff --git a/atari/redrawslots.h b/atari/redrawslots.h index ae4b77f..d1f0fc2 100644 --- a/atari/redrawslots.h +++ b/atari/redrawslots.h @@ -1,3 +1,22 @@ +/* + * Copyright 2012 Ole Loots <ole(a)monochrom.net&gt; + * + * 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/>;. + */ + + #ifndef ATARI_REDRAW_SLOTS_H #define ATARI_REDRAW_SLOTS_H diff --git a/atari/save.h b/atari/save.h index 00852d0..0775723 100644 --- a/atari/save.h +++ b/atari/save.h @@ -1,3 +1,21 @@ +/* + * Copyright 2012 Ole Loots <ole(a)monochrom.net&gt; + * + * 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/>;. + */ + #ifndef NSATARI_SAVE_H #define NSATARI_SAVE_H diff --git a/atari/schedule.h b/atari/schedule.h index 0ca3f91..e21b759 100755 --- a/atari/schedule.h +++ b/atari/schedule.h @@ -1,5 +1,6 @@ /* * Copyright 2008 Vincent Sanders <vince(a)simtec.co.uk&gt; + * 2012 Ole Loots <ole(a)monochrom.net&gt; * * This file is part of NetSurf, http://www.netsurf-browser.org/ * diff --git a/atari/search.c b/atari/search.c index d23724b..b5e2fdd 100644 --- a/atari/search.c +++ b/atari/search.c @@ -1,3 +1,21 @@ +/* + * Copyright 2012 Ole Loots <ole(a)monochrom.net&gt; + * + * 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/>;. + */ + #include <limits.h> #include <stdlib.h> #include <stdio.h> diff --git a/atari/search.h b/atari/search.h index 7521004..7913803 100644 --- a/atari/search.h +++ b/atari/search.h @@ -1,3 +1,21 @@ +/* + * Copyright 2012 Ole Loots <ole(a)monochrom.net&gt; + * + * 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/>;. + */ + #ifndef NS_ATARI_SEARCH_H #define NS_ATARI_SEARCH_H @@ -21,4 +39,4 @@ typedef struct s_search_form_session * SEARCH_FORM_SESSION; SEARCH_FORM_SESSION open_browser_search(struct gui_window * gw); void search_destroy( struct gui_window * gw ); -#endif \ No newline at end of file +#endif diff --git a/atari/settings.c b/atari/settings.c index b2a4baf..0192a97 100644 --- a/atari/settings.c +++ b/atari/settings.c @@ -1,3 +1,21 @@ +/* + * Copyright 2012 Ole Loots <ole(a)monochrom.net&gt; + * + * 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/>;. + */ + #include <sys/types.h> #include <sys/stat.h> #include <dirent.h> @@ -228,7 +246,7 @@ static colour color_popup(int x, int y, colour current) #define GRID_ROWS 9 #define GRID_COLS 27 colour retval = current; - int boxwidth=6, boxheight=8; + int boxwidth=6, boxheight=8; struct bitmap *palette_img; MFDB bg, screen; GRECT bgarea = {x, y, GRID_COLS*boxwidth+4, GRID_ROWS*boxheight+4}; @@ -250,23 +268,23 @@ static colour color_popup(int x, int y, colour current) .stroke_width = 2, .fill_type = PLOT_OP_TYPE_NONE, .fill_colour = 0 - }; - + }; + /* create a palette array (web colors): */ for (r=0; r<6; r++) { for (g=0; g<6; g++) { for (b=0; b<6; b++) { - palette[i] = ((web_std_colors[b]<<16) - | (web_std_colors[g]<<8) - | web_std_colors[r]); + palette[i] = ((web_std_colors[b]<<16) + | (web_std_colors[g]<<8) + | web_std_colors[r]); i++; } } } - + /* setup the gray color values: */ int z = 0; - colour grays[15] = {0x111111, 0x222222, 0x333333, 0x444444, + colour grays[15] = {0x111111, 0x222222, 0x333333, 0x444444, 0x555555, 0x666666, 0x777777, 0x888888, 0x999999, 0x999999, 0xAAAAAA, 0xBBBBBB, 0xCCCCCC, 0xDDDDDD, 0xEEEEEE}; @@ -277,19 +295,19 @@ static colour color_popup(int x, int y, colour current) palette[i] = 0x000000; z++; } - + /* hide the mouse */ v_hide_c (app.graf.handle); - - plot_set_dimensions(x, y, + + plot_set_dimensions(x, y, (GRID_COLS*boxwidth)+4, (GRID_ROWS*boxheight)+4); plot_lock(); - // store background: + // store background: short pxy[8]; init_mfdb(app.nplanes, bgarea.g_w, bgarea.g_h, 0, &bg); init_mfdb(0, bgarea.g_w, bgarea.g_h, 0, &screen); - + pxy[0] = bgarea.g_x; pxy[1] = bgarea.g_y; pxy[2] = bgarea.g_x + bgarea.g_w - 1; @@ -303,31 +321,31 @@ static colour color_popup(int x, int y, colour current) vro_cpyfm (app.graf.handle, S_ONLY, pxy, &screen, &bg); /* - plot_rectangle(x+1, y+1, x+(GRID_COLS*boxwidth)+3, + plot_rectangle(x+1, y+1, x+(GRID_COLS*boxwidth)+3, y+(GRID_ROWS*boxheight)+3, &outline); - + plot_line(x, y, x+(GRID_COLS*boxwidth)+2, y+(GRID_ROWS*boxheight)+2, &outline); */ plot_line(x, y, x+(GRID_COLS*boxwidth)+2, y, &outline); - plot_line(x, y+(GRID_ROWS*boxheight)+2, x+(GRID_COLS*boxwidth)+2, + plot_line(x, y+(GRID_ROWS*boxheight)+2, x+(GRID_COLS*boxwidth)+2, y+(GRID_ROWS*boxheight)+2, &outline); /* draw a 27*8 grid: */ for (i=0; i<243; i++){ drawcolour.fill_colour = palette[i]; - plot_rectangle(xpos+2, ypos+2, xpos+boxwidth+2, ypos+boxheight+2, + plot_rectangle(xpos+2, ypos+2, xpos+boxwidth+2, ypos+boxheight+2, &drawcolour); xpos += boxwidth; if (xpos >= GRID_COLS*boxwidth) { xpos = 0; ypos += boxheight; - } + } } - + /* restore the mouse */ v_show_c ( app.graf.handle, 1); @@ -339,7 +357,7 @@ static colour color_popup(int x, int y, colour current) /* calulate clicked grid coords: */ int row = ((evnt.my-y)/boxheight); int col = ((evnt.mx-x)/boxwidth); - + if (row >= 0 && row <= GRID_ROWS-1 && col >= 0 && col <= GRID_COLS-1) { assert( (GRID_COLS*row)+(col) >= 0 ); assert( (GRID_COLS*row)+(col) < 243 ); @@ -354,7 +372,7 @@ static colour color_popup(int x, int y, colour current) #undef GRID_COLS #undef GRID_ROWS - + return(retval); } @@ -837,7 +855,7 @@ static void display_settings( void ) snprintf( spare, 255, "%3d", nsoption_int(font_size) ); set_text( CHOICES_EDIT_DEF_FONT_SIZE, spare , 3 ); - set_text(CHOICES_BT_TOOLBAR_ICONSET, + set_text(CHOICES_BT_TOOLBAR_ICONSET, nsoption_charp(atari_image_toolbar_folder), LABEL_ICONSET_MAX_LEN); tmp_option_atari_toolbar_bg = nsoption_int(atari_toolbar_bg); -- NetSurf Browser