np2/win9x/dialog/d_bmp.cpp - diff

Return to d_bmp.cpp CVS log

Up to [RetroPC.NET] / np2 / win9x / dialog

Diff for /np2/win9x/dialog/d_bmp.cpp between versions 1.5 and 1.8

version 1.5, 2004/06/21 15:19:15	version 1.8, 2005/03/20 13:12:50
Line 2	Line 2
#include "strres.h"	#include "strres.h"
#include "resource.h"	#include "resource.h"
#include "np2.h"	#include "np2.h"
	#include "oemtext.h"
#include "dosio.h"	#include "dosio.h"
#include "sysmng.h"	#include "sysmng.h"
#include "dialog.h"	#include "dialog.h"
Line 12	Line 13
#include "font.h"	#include "font.h"


static const char fontui_title[] = "Select font file";	static const TCHAR fontui_title[] = _T("Select font file");
static const char fontui_filter[] = \	static const TCHAR fontui_filter[] = \
"PC-98 BMP font (*.bmp)\0" \	_T("PC-98 BMP font (*.bmp)\0") \
"*.bmp\0" \	_T("*.bmp\0") \
"Virtual98 font\0" \	_T("Virtual98 font\0") \
"font.rom\0" \	_T("font.rom\0") \
"All supported files\0" \	_T("All supported files\0") \
"*.bmp;" \	_T("*.bmp;") \
"pc88.fnt;kanji1.rom;kanji2.rom;" \	_T("pc88.fnt;kanji1.rom;kanji2.rom;") \
"font.rom;" \	_T("font.rom;") \
"subsys_c.rom;kanji.rom;" \	_T("subsys_c.rom;kanji.rom;") \
"fnt0808.x1;fnt0816.x1;fnt1616.x1;" \	_T("fnt0808.x1;fnt0816.x1;fnt1616.x1;") \
"cgrom.dat\0";	_T("cgrom.dat\0");
static const FILESEL fontui = {fontui_title, str_bmp, fontui_filter, 3};	static const FILESEL fontui = {fontui_title, tchar_bmp, fontui_filter, 3};

static const char bmpui_file[] = "NP2_%04d.BMP";	static const OEMCHAR bmpui_file[] = OEMTEXT("NP2_%04d.BMP");
static const char bmpui_title[] = "Save as bitmap file";
static const char bmpui_filter1[] = "1bit-bitmap (.bmp)\0.bmp\0";	static const TCHAR bmpui_title[] = _T("Save as bitmap file");
static const char bmpui_filter4[] = "4bit-bitmap (.bmp)\0.bmp\0";	static const TCHAR bmpui_filter1[] = \
static const char bmpui_filter8[] = "8bit-bitmap (.bmp)\0.bmp\0";	_T("1bit-bitmap (.bmp)\0.bmp\0") \
static const char bmpui_filter24[] = "24bit-bitmap (.bmp)\0.bmp\0";	_T("Graphics Interchange Format (.gif)\0.gif\0");
static const char *bmpui_filter[4] = {	static const TCHAR bmpui_filter4[] = \
	_T("4bit-bitmap (.bmp)\0.bmp\0") \
	_T("Graphics Interchange Format (.gif)\0.gif\0");
	static const TCHAR bmpui_filter8[] = \
	_T("8bit-bitmap (.bmp)\0.bmp\0")
	_T("Graphics Interchange Format (.gif)\0.gif\0");
	static const TCHAR bmpui_filter24[] = _T("24bit-bitmap (.bmp)\0.bmp\0");
	static const TCHAR *bmpui_filter[4] = {
bmpui_filter1, bmpui_filter4, bmpui_filter8, bmpui_filter24};	bmpui_filter1, bmpui_filter4, bmpui_filter8, bmpui_filter24};


void dialog_font(HWND hWnd) {	void dialog_font(HWND hWnd) {

char path[MAX_PATH];	OEMCHAR path[MAX_PATH];

file_cpyname(path, np2cfg.fontfile, sizeof(path));	file_cpyname(path, np2cfg.fontfile, NELEMENTS(path));
if ((dlgs_selectfile(hWnd, &fontui, path, sizeof(path), NULL)) &&	if ((dlgs_selectfile(hWnd, &fontui, path, NELEMENTS(path), NULL)) &&
(font_load(path, FALSE))) {	(font_load(path, FALSE))) {
gdcs.textdisp \|= GDCSCRN_ALLDRAW2;	gdcs.textdisp \|= GDCSCRN_ALLDRAW2;
milstr_ncpy(np2cfg.fontfile, path, sizeof(np2cfg.fontfile));	milstr_ncpy(np2cfg.fontfile, path, NELEMENTS(np2cfg.fontfile));
sysmng_update(SYS_UPDATECFG);	sysmng_update(SYS_UPDATECFG);
}	}
}	}
Line 54 void dialog_writebmp(HWND hWnd) {	Line 62 void dialog_writebmp(HWND hWnd) {

SCRNSAVE ss;	SCRNSAVE ss;
FILESEL bmpui;	FILESEL bmpui;
char path[MAX_PATH];	OEMCHAR path[MAX_PATH];
const char *ext;	const OEMCHAR *ext;

ss = scrnsave_get();	ss = scrnsave_get();
if (ss == NULL) {	if (ss == NULL) {
return;	return;
}	}
bmpui.title = bmpui_title;	bmpui.title = bmpui_title;
bmpui.ext = str_bmp;	bmpui.ext = tchar_bmp;
bmpui.filter = bmpui_filter[ss->type];	bmpui.filter = bmpui_filter[ss->type];
bmpui.defindex = 1;	bmpui.defindex = 1;
file_cpyname(path, bmpfilefolder, sizeof(path));	file_cpyname(path, bmpfilefolder, NELEMENTS(path));
file_cutname(path);	file_cutname(path);
file_catname(path, bmpui_file, sizeof(path));	file_catname(path, bmpui_file, NELEMENTS(path));
if (dlgs_selectwritenum(hWnd, &bmpui, path, sizeof(path))) {	if (dlgs_selectwritenum(hWnd, &bmpui, path, NELEMENTS(path))) {
file_cpyname(bmpfilefolder, path, sizeof(bmpfilefolder));	file_cpyname(bmpfilefolder, path, NELEMENTS(bmpfilefolder));
sysmng_update(SYS_UPDATEOSCFG);	sysmng_update(SYS_UPDATEOSCFG);
ext = file_getext(path);	ext = file_getext(path);
if ((ss->type <= SCRNSAVE_8BIT) &&	if ((ss->type <= SCRNSAVE_8BIT) &&
(!file_cmpname(ext, "gif"))) {	(!file_cmpname(ext, OEMTEXT("gif")))) {
scrnsave_writegif(ss, path, SCRNSAVE_AUTO);	scrnsave_writegif(ss, path, SCRNSAVE_AUTO);
}	}
else if (!file_cmpname(ext, str_bmp)) {	else if (!file_cmpname(ext, str_bmp)) {

RetroPC.NET-CVS <cvs@retropc.net>

Removed from v.1.5
changed lines
	Added in v.1.8