Added missing copyright headers
This commit is contained in:
parent
e237ebac8f
commit
ff2f1f1836
|
@ -2,20 +2,23 @@
|
||||||
# Atari target setup
|
# Atari target setup
|
||||||
# ----------------------------------------------------------------------------
|
# ----------------------------------------------------------------------------
|
||||||
|
|
||||||
ifeq ($(ATARI_ARCH),68020-60)
|
ifeq ($(ATARI_ARCH),68000)
|
||||||
PRGSUFFIX := 000.app
|
PRGSUFFIX := 000.app
|
||||||
|
PKGNAME := ns000.zip
|
||||||
endif
|
endif
|
||||||
|
|
||||||
ifeq ($(ATARI_ARCH),68020-60)
|
ifeq ($(ATARI_ARCH),68020-60)
|
||||||
CFLAGS += -m68020-60
|
CFLAGS += -m68020-60
|
||||||
LDFLAGS += -m68020-60
|
LDFLAGS += -m68020-60
|
||||||
PRGSUFFIX := 020.app
|
PRGSUFFIX := 020.app
|
||||||
|
PKGNAME := ns020.zip
|
||||||
endif
|
endif
|
||||||
|
|
||||||
ifeq ($(ATARI_ARCH),5475)
|
ifeq ($(ATARI_ARCH),5475)
|
||||||
CFLAGS += -mcpu=5475
|
CFLAGS += -mcpu=5475
|
||||||
LDFLAGS += -mcpu=5475
|
LDFLAGS += -mcpu=5475
|
||||||
PRGSUFFIX := v4e.app
|
PRGSUFFIX := v4e.app
|
||||||
|
PKGNAME := nsv4e.zip
|
||||||
endif
|
endif
|
||||||
|
|
||||||
# non-pkgconfig components
|
# non-pkgconfig components
|
||||||
|
@ -83,10 +86,35 @@ EXETARGET := ns$(SUBTARGET)$(PRGSUFFIX)
|
||||||
# Install target
|
# Install target
|
||||||
# ----------------------------------------------------------------------------
|
# ----------------------------------------------------------------------------
|
||||||
|
|
||||||
install-atari:
|
ATARI_INSTALL_TARGET_DIR := nsatari.package
|
||||||
|
ATARI_RES_DIR := atari/res
|
||||||
|
|
||||||
|
|
||||||
|
# ----------------------------------------------------------------------------
|
||||||
|
# Install target
|
||||||
|
# ----------------------------------------------------------------------------
|
||||||
|
|
||||||
|
install-atari:
|
||||||
|
|
||||||
# ----------------------------------------------------------------------------
|
# ----------------------------------------------------------------------------
|
||||||
# Package target
|
# Package target
|
||||||
# ----------------------------------------------------------------------------
|
# ----------------------------------------------------------------------------
|
||||||
|
|
||||||
package-atari:
|
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
|
||||||
|
|
|
@ -1,3 +1,21 @@
|
||||||
|
/*
|
||||||
|
* Copyright 2012 Ole Loots <ole@monochrom.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/>.
|
||||||
|
*/
|
||||||
|
|
||||||
#ifndef CTXMENU_H_INCLUDED
|
#ifndef CTXMENU_H_INCLUDED
|
||||||
#define CTXMENU_H_INCLUDED
|
#define CTXMENU_H_INCLUDED
|
||||||
|
|
||||||
|
|
|
@ -1,3 +1,21 @@
|
||||||
|
/*
|
||||||
|
* Copyright 2012 Ole Loots <ole@monochrom.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/>.
|
||||||
|
*/
|
||||||
|
|
||||||
#include "atari/encoding.h"
|
#include "atari/encoding.h"
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -1,3 +1,21 @@
|
||||||
|
/*
|
||||||
|
* Copyright 2012 Ole Loots <ole@monochrom.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/>.
|
||||||
|
*/
|
||||||
|
|
||||||
#ifndef NS_ATARI_ENCODING_H
|
#ifndef NS_ATARI_ENCODING_H
|
||||||
#define NS_ATARI_ENCODING_H
|
#define NS_ATARI_ENCODING_H
|
||||||
|
|
||||||
|
|
18
atari/font.c
18
atari/font.c
|
@ -18,6 +18,24 @@
|
||||||
|
|
||||||
#include <inttypes.h>
|
#include <inttypes.h>
|
||||||
#include <assert.h>
|
#include <assert.h>
|
||||||
|
/*
|
||||||
|
* Copyright 2012 Ole Loots <ole@monochrom.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/>.
|
||||||
|
*/
|
||||||
|
|
||||||
#include <stdbool.h>
|
#include <stdbool.h>
|
||||||
#include <windom.h>
|
#include <windom.h>
|
||||||
|
|
||||||
|
|
|
@ -1,3 +1,21 @@
|
||||||
|
/*
|
||||||
|
* Copyright 2010 Ole Loots <ole@monochrom.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/>.
|
||||||
|
*/
|
||||||
|
|
||||||
#include "atari/plot/fontplot.h"
|
#include "atari/plot/fontplot.h"
|
||||||
|
|
||||||
const struct s_font_driver_table_entry font_driver_table[] =
|
const struct s_font_driver_table_entry font_driver_table[] =
|
||||||
|
|
|
@ -1,3 +1,22 @@
|
||||||
|
/*
|
||||||
|
* Copyright 2012 Ole Loots <ole@monochrom.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/>.
|
||||||
|
*/
|
||||||
|
|
||||||
|
|
||||||
#ifndef ATARI_REDRAW_SLOTS_H
|
#ifndef ATARI_REDRAW_SLOTS_H
|
||||||
#define ATARI_REDRAW_SLOTS_H
|
#define ATARI_REDRAW_SLOTS_H
|
||||||
|
|
||||||
|
|
18
atari/save.h
18
atari/save.h
|
@ -1,3 +1,21 @@
|
||||||
|
/*
|
||||||
|
* Copyright 2012 Ole Loots <ole@monochrom.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/>.
|
||||||
|
*/
|
||||||
|
|
||||||
#ifndef NSATARI_SAVE_H
|
#ifndef NSATARI_SAVE_H
|
||||||
#define NSATARI_SAVE_H
|
#define NSATARI_SAVE_H
|
||||||
|
|
||||||
|
|
|
@ -1,5 +1,6 @@
|
||||||
/*
|
/*
|
||||||
* Copyright 2008 Vincent Sanders <vince@simtec.co.uk>
|
* Copyright 2008 Vincent Sanders <vince@simtec.co.uk>
|
||||||
|
* 2012 Ole Loots <ole@monochrom.net>
|
||||||
*
|
*
|
||||||
* This file is part of NetSurf, http://www.netsurf-browser.org/
|
* This file is part of NetSurf, http://www.netsurf-browser.org/
|
||||||
*
|
*
|
||||||
|
|
|
@ -1,3 +1,21 @@
|
||||||
|
/*
|
||||||
|
* Copyright 2012 Ole Loots <ole@monochrom.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/>.
|
||||||
|
*/
|
||||||
|
|
||||||
#include <limits.h>
|
#include <limits.h>
|
||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
|
|
|
@ -1,3 +1,21 @@
|
||||||
|
/*
|
||||||
|
* Copyright 2012 Ole Loots <ole@monochrom.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/>.
|
||||||
|
*/
|
||||||
|
|
||||||
#ifndef NS_ATARI_SEARCH_H
|
#ifndef NS_ATARI_SEARCH_H
|
||||||
#define 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);
|
SEARCH_FORM_SESSION open_browser_search(struct gui_window * gw);
|
||||||
void search_destroy( struct gui_window * gw );
|
void search_destroy( struct gui_window * gw );
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -1,3 +1,21 @@
|
||||||
|
/*
|
||||||
|
* Copyright 2012 Ole Loots <ole@monochrom.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/>.
|
||||||
|
*/
|
||||||
|
|
||||||
#include <sys/types.h>
|
#include <sys/types.h>
|
||||||
#include <sys/stat.h>
|
#include <sys/stat.h>
|
||||||
#include <dirent.h>
|
#include <dirent.h>
|
||||||
|
@ -228,7 +246,7 @@ static colour color_popup(int x, int y, colour current)
|
||||||
#define GRID_ROWS 9
|
#define GRID_ROWS 9
|
||||||
#define GRID_COLS 27
|
#define GRID_COLS 27
|
||||||
colour retval = current;
|
colour retval = current;
|
||||||
int boxwidth=6, boxheight=8;
|
int boxwidth=6, boxheight=8;
|
||||||
struct bitmap *palette_img;
|
struct bitmap *palette_img;
|
||||||
MFDB bg, screen;
|
MFDB bg, screen;
|
||||||
GRECT bgarea = {x, y, GRID_COLS*boxwidth+4, GRID_ROWS*boxheight+4};
|
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,
|
.stroke_width = 2,
|
||||||
.fill_type = PLOT_OP_TYPE_NONE,
|
.fill_type = PLOT_OP_TYPE_NONE,
|
||||||
.fill_colour = 0
|
.fill_colour = 0
|
||||||
};
|
};
|
||||||
|
|
||||||
/* create a palette array (web colors): */
|
/* create a palette array (web colors): */
|
||||||
for (r=0; r<6; r++) {
|
for (r=0; r<6; r++) {
|
||||||
for (g=0; g<6; g++) {
|
for (g=0; g<6; g++) {
|
||||||
for (b=0; b<6; b++) {
|
for (b=0; b<6; b++) {
|
||||||
palette[i] = ((web_std_colors[b]<<16)
|
palette[i] = ((web_std_colors[b]<<16)
|
||||||
| (web_std_colors[g]<<8)
|
| (web_std_colors[g]<<8)
|
||||||
| web_std_colors[r]);
|
| web_std_colors[r]);
|
||||||
i++;
|
i++;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/* setup the gray color values: */
|
/* setup the gray color values: */
|
||||||
int z = 0;
|
int z = 0;
|
||||||
colour grays[15] = {0x111111, 0x222222, 0x333333, 0x444444,
|
colour grays[15] = {0x111111, 0x222222, 0x333333, 0x444444,
|
||||||
0x555555, 0x666666, 0x777777, 0x888888,
|
0x555555, 0x666666, 0x777777, 0x888888,
|
||||||
0x999999, 0x999999, 0xAAAAAA, 0xBBBBBB,
|
0x999999, 0x999999, 0xAAAAAA, 0xBBBBBB,
|
||||||
0xCCCCCC, 0xDDDDDD, 0xEEEEEE};
|
0xCCCCCC, 0xDDDDDD, 0xEEEEEE};
|
||||||
|
@ -277,19 +295,19 @@ static colour color_popup(int x, int y, colour current)
|
||||||
palette[i] = 0x000000;
|
palette[i] = 0x000000;
|
||||||
z++;
|
z++;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* hide the mouse */
|
/* hide the mouse */
|
||||||
v_hide_c (app.graf.handle);
|
v_hide_c (app.graf.handle);
|
||||||
|
|
||||||
plot_set_dimensions(x, y,
|
plot_set_dimensions(x, y,
|
||||||
(GRID_COLS*boxwidth)+4, (GRID_ROWS*boxheight)+4);
|
(GRID_COLS*boxwidth)+4, (GRID_ROWS*boxheight)+4);
|
||||||
plot_lock();
|
plot_lock();
|
||||||
|
|
||||||
// store background:
|
// store background:
|
||||||
short pxy[8];
|
short pxy[8];
|
||||||
init_mfdb(app.nplanes, bgarea.g_w, bgarea.g_h, 0, &bg);
|
init_mfdb(app.nplanes, bgarea.g_w, bgarea.g_h, 0, &bg);
|
||||||
init_mfdb(0, bgarea.g_w, bgarea.g_h, 0, &screen);
|
init_mfdb(0, bgarea.g_w, bgarea.g_h, 0, &screen);
|
||||||
|
|
||||||
pxy[0] = bgarea.g_x;
|
pxy[0] = bgarea.g_x;
|
||||||
pxy[1] = bgarea.g_y;
|
pxy[1] = bgarea.g_y;
|
||||||
pxy[2] = bgarea.g_x + bgarea.g_w - 1;
|
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);
|
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);
|
y+(GRID_ROWS*boxheight)+3, &outline);
|
||||||
|
|
||||||
plot_line(x, y, x+(GRID_COLS*boxwidth)+2, y+(GRID_ROWS*boxheight)+2,
|
plot_line(x, y, x+(GRID_COLS*boxwidth)+2, y+(GRID_ROWS*boxheight)+2,
|
||||||
&outline);
|
&outline);
|
||||||
*/
|
*/
|
||||||
plot_line(x, y, x+(GRID_COLS*boxwidth)+2, y,
|
plot_line(x, y, x+(GRID_COLS*boxwidth)+2, y,
|
||||||
&outline);
|
&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,
|
y+(GRID_ROWS*boxheight)+2,
|
||||||
&outline);
|
&outline);
|
||||||
|
|
||||||
/* draw a 27*8 grid: */
|
/* draw a 27*8 grid: */
|
||||||
for (i=0; i<243; i++){
|
for (i=0; i<243; i++){
|
||||||
drawcolour.fill_colour = palette[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);
|
&drawcolour);
|
||||||
xpos += boxwidth;
|
xpos += boxwidth;
|
||||||
if (xpos >= GRID_COLS*boxwidth) {
|
if (xpos >= GRID_COLS*boxwidth) {
|
||||||
xpos = 0;
|
xpos = 0;
|
||||||
ypos += boxheight;
|
ypos += boxheight;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/* restore the mouse */
|
/* restore the mouse */
|
||||||
v_show_c ( app.graf.handle, 1);
|
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: */
|
/* calulate clicked grid coords: */
|
||||||
int row = ((evnt.my-y)/boxheight);
|
int row = ((evnt.my-y)/boxheight);
|
||||||
int col = ((evnt.mx-x)/boxwidth);
|
int col = ((evnt.mx-x)/boxwidth);
|
||||||
|
|
||||||
if (row >= 0 && row <= GRID_ROWS-1 && col >= 0 && col <= GRID_COLS-1) {
|
if (row >= 0 && row <= GRID_ROWS-1 && col >= 0 && col <= GRID_COLS-1) {
|
||||||
assert( (GRID_COLS*row)+(col) >= 0 );
|
assert( (GRID_COLS*row)+(col) >= 0 );
|
||||||
assert( (GRID_COLS*row)+(col) < 243 );
|
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_COLS
|
||||||
#undef GRID_ROWS
|
#undef GRID_ROWS
|
||||||
|
|
||||||
return(retval);
|
return(retval);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -837,7 +855,7 @@ static void display_settings( void )
|
||||||
snprintf( spare, 255, "%3d", nsoption_int(font_size) );
|
snprintf( spare, 255, "%3d", nsoption_int(font_size) );
|
||||||
set_text( CHOICES_EDIT_DEF_FONT_SIZE, spare , 3 );
|
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);
|
nsoption_charp(atari_image_toolbar_folder), LABEL_ICONSET_MAX_LEN);
|
||||||
|
|
||||||
tmp_option_atari_toolbar_bg = nsoption_int(atari_toolbar_bg);
|
tmp_option_atari_toolbar_bg = nsoption_int(atari_toolbar_bg);
|
||||||
|
|
Loading…
Reference in New Issue