np2/win9x/toolwin.cpp - diff

Return to toolwin.cpp CVS log

Up to [RetroPC.NET] / np2 / win9x

Diff for /np2/win9x/toolwin.cpp between versions 1.12 and 1.14

version 1.12, 2003/11/02 17:03:24	version 1.14, 2003/11/04 19:23:03
Line 35 enum {	Line 35 enum {

IDC_BASE = 3000,	IDC_BASE = 3000,

IDC_SKINSEL = 3100,	IDM_SKINSEL = 3100,
IDC_SKINDEF = 3101,	IDM_SKINDEF = 3101,
IDC_SKINMRU = 3102,	IDM_SKINMRU = 3102,
IDC_TOOLCLOSE = IDC_SKINMRU + SKINMRU_MAX	IDM_TOOLCLOSE = IDM_SKINMRU + SKINMRU_MAX
};	};

enum {	enum {
Line 557 const char *base;	Line 557 const char *base;
const char *file[SKINMRU_MAX];	const char *file[SKINMRU_MAX];

ret = CreatePopupMenu();	ret = CreatePopupMenu();
AppendMenu(ret, MF_STRING, IDC_SKINSEL, str_skinsel);	AppendMenu(ret, MF_STRING, IDM_SKINSEL, str_skinsel);
AppendMenu(ret, MF_SEPARATOR, 0, NULL);	AppendMenu(ret, MF_SEPARATOR, 0, NULL);

base = np2tool.skin;	base = np2tool.skin;
flag = (base[0] == '\0')?MF_CHECKED:0;	flag = (base[0] == '\0')?MF_CHECKED:0;
AppendMenu(ret, MF_STRING + flag, IDC_SKINDEF, str_skindef);	AppendMenu(ret, MF_STRING + flag, IDM_SKINDEF, str_skindef);
for (cnt=0; cnt<SKINMRU_MAX; cnt++) {	for (cnt=0; cnt<SKINMRU_MAX; cnt++) {
p = np2tool.skinmru[cnt];	p = np2tool.skinmru[cnt];
if (p[0] == '\0') {	if (p[0] == '\0') {
Line 583 const char *file[SKINMRU_MAX];	Line 583 const char *file[SKINMRU_MAX];
for (i=0; i<cnt; i++) {	for (i=0; i<cnt; i++) {
j = id[i];	j = id[i];
flag = (!file_cmpname(base, np2tool.skinmru[j]))?MF_CHECKED:0;	flag = (!file_cmpname(base, np2tool.skinmru[j]))?MF_CHECKED:0;
AppendMenu(ret, MF_STRING + flag, IDC_SKINMRU + j, file[j]);	AppendMenu(ret, MF_STRING + flag, IDM_SKINMRU + j, file[j]);
}	}
return(ret);	return(ret);
}	}
Line 610 const char *p;	Line 610 const char *p;
}	}
file_cpyname(np2tool.skinmru[0], p, sizeof(np2tool.skinmru[0]));	file_cpyname(np2tool.skinmru[0], p, sizeof(np2tool.skinmru[0]));
}	}
	ModifyMenu(np2class_gethmenu(hWnd), 0, MF_BYPOSITION \| MF_POPUP,
	(UINT)createskinmenu(), str_toolskin);
ModifyMenu(GetSystemMenu(hWnd, FALSE), 0, MF_BYPOSITION \| MF_POPUP,	ModifyMenu(GetSystemMenu(hWnd, FALSE), 0, MF_BYPOSITION \| MF_POPUP,
(UINT)createskinmenu(), str_toolskin);	(UINT)createskinmenu(), str_toolskin);
DrawMenuBar(hWnd);	DrawMenuBar(hWnd);
sysmng_update(SYS_UPDATEOSCFG);	sysmng_update(SYS_UPDATEOSCFG);

wlex = np2_winlocexallwin(hWndMain);	wlex = np2_winlocexallwin(hWndMain);
	winlocex_setholdwnd(wlex, hWnd);
toolwindestroy();	toolwindestroy();
hbmp = skinload(np2tool.skin);	hbmp = skinload(np2tool.skin);
if (hbmp == NULL) {	if (hbmp == NULL) {
Line 636 const char *p;	Line 639 const char *p;
static void openpopup(HWND hWnd, LPARAM lp) {	static void openpopup(HWND hWnd, LPARAM lp) {

HMENU hMenu;	HMENU hMenu;
	HMENU mainmenu;
POINT pt;	POINT pt;

hMenu = CreatePopupMenu();	hMenu = CreatePopupMenu();
	if (!winui_en) {
	mainmenu = np2class_gethmenu(hWndMain);
	menu_addmenubar(hMenu, mainmenu);
	}
AppendMenu(hMenu, MF_POPUP, (UINT)createskinmenu(), str_toolskin);	AppendMenu(hMenu, MF_POPUP, (UINT)createskinmenu(), str_toolskin);
AppendMenu(hMenu, MF_SEPARATOR, 0, NULL);	AppendMenu(hMenu, MF_SEPARATOR, 0, NULL);
AppendMenu(hMenu, MF_STRING, IDC_TOOLCLOSE, str_toolclose);	AppendMenu(hMenu, MF_STRING, IDM_TOOLCLOSE, str_toolclose);
pt.x = LOWORD(lp);	pt.x = LOWORD(lp);
pt.y = HIWORD(lp);	pt.y = HIWORD(lp);
ClientToScreen(hWnd, &pt);	ClientToScreen(hWnd, &pt);
Line 658 static LRESULT CALLBACK twproc(HWND hWnd	Line 666 static LRESULT CALLBACK twproc(HWND hWnd

switch(msg) {	switch(msg) {
case WM_CREATE:	case WM_CREATE:
	np2class_wmcreate(hWnd);
	ModifyMenu(np2class_gethmenu(hWnd), 0, MF_BYPOSITION \| MF_POPUP,
	(UINT)createskinmenu(), str_toolskin);
hMenu = GetSystemMenu(hWnd, FALSE);	hMenu = GetSystemMenu(hWnd, FALSE);
InsertMenu(hMenu, 0, MF_BYPOSITION \| MF_POPUP,	InsertMenu(hMenu, 0, MF_BYPOSITION \| MF_POPUP,
(UINT)createskinmenu(), str_toolskin);	(UINT)createskinmenu(), str_toolskin);
InsertMenu(hMenu, 1, MF_BYPOSITION \| MF_SEPARATOR, 0, NULL);	InsertMenu(hMenu, 1, MF_BYPOSITION \| MF_SEPARATOR, 0, NULL);

np2class_windowtype(hWnd, np2tool.type);	np2class_windowtype(hWnd, (np2tool.type & 1) << 1);
toolwincreate(hWnd);	toolwincreate(hWnd);
break;	break;

case WM_SYSCOMMAND:	case WM_SYSCOMMAND:
switch(wp) {	switch(wp) {
case IDC_SKINSEL:	case IDM_SKINSEL:
case IDC_SKINDEF:	case IDM_SKINDEF:
case IDC_SKINMRU + 0:	case IDM_SKINMRU + 0:
case IDC_SKINMRU + 1:	case IDM_SKINMRU + 1:
case IDC_SKINMRU + 2:	case IDM_SKINMRU + 2:
case IDC_SKINMRU + 3:	case IDM_SKINMRU + 3:
return(SendMessage(hWnd, WM_COMMAND, wp, lp));	return(SendMessage(hWnd, WM_COMMAND, wp, lp));

default:	default:
Line 691 static LRESULT CALLBACK twproc(HWND hWnd	Line 702 static LRESULT CALLBACK twproc(HWND hWnd
break;	break;

case IDC_BASE + IDC_TOOLFDD1BROWSE:	case IDC_BASE + IDC_TOOLFDD1BROWSE:
soundmng_disable(SNDPROC_TOOL);	if (!winui_en) {
dialog_changefdd(hWnd, 0);	SendMessage(hWndMain, WM_COMMAND, IDM_FDD1OPEN, 0);
soundmng_enable(SNDPROC_TOOL);	}
break;	break;

case IDC_BASE + IDC_TOOLFDD1EJECT:	case IDC_BASE + IDC_TOOLFDD1EJECT:
Line 708 static LRESULT CALLBACK twproc(HWND hWnd	Line 719 static LRESULT CALLBACK twproc(HWND hWnd
break;	break;

case IDC_BASE + IDC_TOOLFDD2BROWSE:	case IDC_BASE + IDC_TOOLFDD2BROWSE:
soundmng_disable(SNDPROC_TOOL);	if (!winui_en) {
dialog_changefdd(hWnd, 1);	SendMessage(hWndMain, WM_COMMAND, IDM_FDD2OPEN, 0);
soundmng_enable(SNDPROC_TOOL);	}
break;	break;

case IDC_BASE + IDC_TOOLFDD2EJECT:	case IDC_BASE + IDC_TOOLFDD2EJECT:
Line 719 static LRESULT CALLBACK twproc(HWND hWnd	Line 730 static LRESULT CALLBACK twproc(HWND hWnd
break;	break;

case IDC_BASE + IDC_TOOLRESET:	case IDC_BASE + IDC_TOOLRESET:
SendMessage(hWndMain, WM_COMMAND, IDM_RESET, 0);	if (!winui_en) {
SetForegroundWindow(hWndMain);	SendMessage(hWndMain, WM_COMMAND, IDM_RESET, 0);
	SetForegroundWindow(hWndMain);
	}
break;	break;

case IDC_BASE + IDC_TOOLPOWER:	case IDC_BASE + IDC_TOOLPOWER:
SendMessage(hWndMain, WM_CLOSE, 0, 0L);	if (!winui_en) {
	SendMessage(hWndMain, WM_CLOSE, 0, 0L);
	}
break;	break;

case IDC_SKINSEL:	case IDM_SKINSEL:
soundmng_disable(SNDPROC_TOOL);	soundmng_disable(SNDPROC_TOOL);
r = dlgs_selectfile(hWnd, &skinui, np2tool.skin,	r = dlgs_selectfile(hWnd, &skinui, np2tool.skin,
sizeof(np2tool.skin), NULL);	sizeof(np2tool.skin), NULL);
Line 737 static LRESULT CALLBACK twproc(HWND hWnd	Line 752 static LRESULT CALLBACK twproc(HWND hWnd
}	}
break;	break;

case IDC_SKINDEF:	case IDM_SKINDEF:
np2tool.skin[0] = '\0';	np2tool.skin[0] = '\0';
skinchange(hWnd);	skinchange(hWnd);
break;	break;

case IDC_SKINMRU + 0:	case IDM_SKINMRU + 0:
case IDC_SKINMRU + 1:	case IDM_SKINMRU + 1:
case IDC_SKINMRU + 2:	case IDM_SKINMRU + 2:
case IDC_SKINMRU + 3:	case IDM_SKINMRU + 3:
file_cpyname(np2tool.skin,	file_cpyname(np2tool.skin,
np2tool.skinmru[LOWORD(wp) - IDC_SKINMRU],	np2tool.skinmru[LOWORD(wp) - IDM_SKINMRU],
sizeof(np2tool.skin));	sizeof(np2tool.skin));
skinchange(hWnd);	skinchange(hWnd);
break;	break;

case IDC_TOOLCLOSE:	case IDM_TOOLCLOSE:
SendMessage(hWnd, WM_CLOSE, 0, 0);	SendMessage(hWnd, WM_CLOSE, 0, 0);
break;	break;

	default:
	if (!winui_en) {
	return(SendMessage(hWndMain, msg, wp, lp));
	}
	break;
}	}
break;	break;

Line 766 static LRESULT CALLBACK twproc(HWND hWnd	Line 787 static LRESULT CALLBACK twproc(HWND hWnd
}	}
return(0);	return(0);
}	}
break;	return(SendMessage(hWndMain, msg, wp, lp));

	case WM_KEYUP:
	if ((short)wp == VK_TAB) {
	return(0);
	}
	return(SendMessage(hWndMain, msg, wp, lp));

case WM_PAINT:	case WM_PAINT:
toolwinpaint(hWnd);	toolwinpaint(hWnd);
Line 818 static LRESULT CALLBACK twproc(HWND hWnd	Line 845 static LRESULT CALLBACK twproc(HWND hWnd
break;	break;

case WM_DESTROY:	case WM_DESTROY:
np2class_destroymenu(hWnd);	np2class_wmdestroy(hWnd);
toolwindestroy();	toolwindestroy();
toolwin.hwnd = NULL;	toolwin.hwnd = NULL;
break;	break;
Line 836 static LRESULT CALLBACK twproc(HWND hWnd	Line 863 static LRESULT CALLBACK twproc(HWND hWnd
case WM_LBUTTONDBLCLK:	case WM_LBUTTONDBLCLK:
np2tool.type ^= 1;	np2tool.type ^= 1;
wlex = np2_winlocexallwin(hWndMain);	wlex = np2_winlocexallwin(hWndMain);
np2class_windowtype(hWnd, np2tool.type);	winlocex_setholdwnd(wlex, hWnd);
	np2class_windowtype(hWnd, (np2tool.type & 1) << 1);
winlocex_move(wlex);	winlocex_move(wlex);
winlocex_destroy(wlex);	winlocex_destroy(wlex);
sysmng_update(SYS_UPDATEOSCFG);	sysmng_update(SYS_UPDATEOSCFG);
Line 860 BOOL toolwin_initapp(HINSTANCE hInstance	Line 888 BOOL toolwin_initapp(HINSTANCE hInstance
wc.hIcon = LoadIcon(hInstance, MAKEINTRESOURCE(IDI_ICON2));	wc.hIcon = LoadIcon(hInstance, MAKEINTRESOURCE(IDI_ICON2));
wc.hCursor = LoadCursor(NULL, IDC_ARROW);	wc.hCursor = LoadCursor(NULL, IDC_ARROW);
wc.hbrBackground = (HBRUSH)GetStockObject(NULL_BRUSH);	wc.hbrBackground = (HBRUSH)GetStockObject(NULL_BRUSH);
wc.lpszMenuName = NULL;	wc.lpszMenuName = MAKEINTRESOURCE(IDR_TOOLWIN);
wc.lpszClassName = np2toolclass;	wc.lpszClassName = np2toolclass;
return(RegisterClass(&wc));	return(RegisterClass(&wc));
}	}
Line 893 void toolwin_create(void) {	Line 921 void toolwin_create(void) {
}	}
UpdateWindow(hWnd);	UpdateWindow(hWnd);
ShowWindow(hWnd, SW_SHOWNOACTIVATE);	ShowWindow(hWnd, SW_SHOWNOACTIVATE);
	SetForegroundWindow(hWndMain);
return;	return;

twope_err2:	twope_err2:

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

Removed from v.1.12
changed lines
	Added in v.1.14