np2/generic/keydisp.c - diff

Return to keydisp.c CVS log

Up to [RetroPC.NET] / np2 / generic

Diff for /np2/generic/keydisp.c between versions 1.6 and 1.7

version 1.6, 2004/01/27 15:38:20	version 1.7, 2004/04/08 13:51:52
Line 645 static int getdispkeys(void) {	Line 645 static int getdispkeys(void) {

static void clearrect(CMNVRAM *vram, int x, int y, int cx, int cy) {	static void clearrect(CMNVRAM *vram, int x, int y, int cx, int cy) {

	CMNPAL col;

switch(vram->bpp) {	switch(vram->bpp) {
#if defined(SUPPORT_8BPP)	#if defined(SUPPORT_8BPP)
case 8:	case 8:
cmndraw8_fill(vram, x, y, cx, cy, keydisp.pal8[KEYDISP_PALBG]);	col.pal8 = keydisp.pal8[KEYDISP_PALBG];
break;	break;
#endif	#endif
#if defined(SUPPORT_16BPP)	#if defined(SUPPORT_16BPP)
case 16:	case 16:
cmndraw16_fill(vram, x, y, cx, cy, keydisp.pal16[KEYDISP_LEVEL]);	col.pal16 = keydisp.pal16[KEYDISP_LEVEL];
break;	break;
#endif	#endif
#if defined(SUPPORT_24BPP)	#if defined(SUPPORT_24BPP)
case 24:	case 24:
cmndraw24_fill(vram, x, y, cx, cy, keydisp.pal32[KEYDISP_LEVEL]);
break;
#endif	#endif
#if defined(SUPPORT_32BPP)	#if defined(SUPPORT_32BPP)
case 32:	case 32:
cmndraw32_fill(vram, x, y, cx, cy, keydisp.pal32[KEYDISP_LEVEL]);	#endif
	#if defined(SUPPORT_24BPP) \|\| defined(SUPPORT_32BPP)
	col.pal32 = keydisp.pal32[KEYDISP_LEVEL];
break;	break;
#endif	#endif
	default:
	return;
}	}
	cmndraw_fill(vram, x, y, cx, cy, col);
}	}

static void drawkeybg(CMNVRAM *vram) {	static void drawkeybg(CMNVRAM *vram) {

	CMNPAL bg;
	CMNPAL fg;
int i;	int i;

switch(vram->bpp) {	switch(vram->bpp) {
#if defined(SUPPORT_8BPP)	#if defined(SUPPORT_8BPP)
case 8:	case 8:
for (i=0; i<10; i++) {	bg.pal8 = keydisp.pal8[KEYDISP_PALBG];
cmndraw8_setpat(vram, keybrd1, i * KEYDISP_KEYCX, 0,	fg.pal8 = keydisp.pal8[KEYDISP_PALFG];
keydisp.pal8[KEYDISP_PALBG], keydisp.pal8[KEYDISP_PALFG]);
}
cmndraw8_setpat(vram, keybrd2, 10 * KEYDISP_KEYCX, 0,
keydisp.pal8[KEYDISP_PALBG], keydisp.pal8[KEYDISP_PALFG]);
break;	break;
#endif	#endif
#if defined(SUPPORT_16BPP)	#if defined(SUPPORT_16BPP)
case 16:	case 16:
for (i=0; i<10; i++) {	bg.pal16 = keydisp.pal16[KEYDISP_LEVEL];
cmndraw16_setpat(vram, keybrd1, i * KEYDISP_KEYCX, 0,	fg.pal16 = keydisp.pal16[0];
keydisp.pal16[KEYDISP_LEVEL], keydisp.pal16[0]);
}
cmndraw16_setpat(vram, keybrd2, 10 * KEYDISP_KEYCX, 0,
keydisp.pal16[KEYDISP_LEVEL], keydisp.pal16[0]);
break;	break;
#endif	#endif
#if defined(SUPPORT_24BPP)	#if defined(SUPPORT_24BPP)
case 24:	case 24:
for (i=0; i<10; i++) {	bg.pal32 = keydisp.pal32[KEYDISP_LEVEL];
cmndraw24_setpat(vram, keybrd1, i * KEYDISP_KEYCX, 0,	fg.pal32 = keydisp.pal32[0];
keydisp.pal32[KEYDISP_LEVEL], keydisp.pal32[0]);
}
cmndraw24_setpat(vram, keybrd2, 10 * KEYDISP_KEYCX, 0,
keydisp.pal32[KEYDISP_LEVEL], keydisp.pal32[0]);
break;	break;
#endif	#endif
#if defined(SUPPORT_32BPP)	#if defined(SUPPORT_32BPP)
case 32:	case 32:
for (i=0; i<10; i++) {	bg.pal32 = keydisp.pal32[KEYDISP_LEVEL];
cmndraw32_setpat(vram, keybrd1, i * KEYDISP_KEYCX, 0,	fg.pal32 = keydisp.pal32[0];
keydisp.pal32[KEYDISP_LEVEL], keydisp.pal32[0]);
}
cmndraw32_setpat(vram, keybrd2, 10 * KEYDISP_KEYCX, 0,
keydisp.pal32[KEYDISP_LEVEL], keydisp.pal32[0]);
break;	break;
#endif	#endif
	default:
	return;
	}
	for (i=0; i<10; i++) {
	cmndraw_setpat(vram, keybrd1, i * KEYDISP_KEYCX, 0, bg, fg);
}	}
	cmndraw_setpat(vram, keybrd2, 10 * KEYDISP_KEYCX, 0, bg, fg);
}	}

static BOOL draw1key(CMNVRAM vram, KDCHANNEL kdch, UINT n) {	static BOOL draw1key(CMNVRAM vram, KDCHANNEL kdch, UINT n) {

KDKEYPOS *pos;	KDKEYPOS *pos;
UINT pal;	UINT pal;
#if defined(SUPPORT_8BPP)	CMNPAL fg;
BYTE pal8;
#endif

pos = keydisp.keypos + (kdch->k[n] & 0x7f);	pos = keydisp.keypos + (kdch->k[n] & 0x7f);
pal = kdch->r[n] & 0x7f;	pal = kdch->r[n] & 0x7f;
Line 731 static BOOL draw1key(CMNVRAM *vram, KDCH	Line 726 static BOOL draw1key(CMNVRAM *vram, KDCH
#if defined(SUPPORT_8BPP)	#if defined(SUPPORT_8BPP)
case 8:	case 8:
if (pal != (KEYDISP_LEVEL - 1)) {	if (pal != (KEYDISP_LEVEL - 1)) {
pal8 = keydisp.pal8[(pos->pals)?KEYDISP_PALBG:KEYDISP_PALFG];	fg.pal8 = keydisp.pal8[
cmndraw8_setfg(vram, pos->data, pos->posx, 0, pal8);	(pos->pals)?KEYDISP_PALBG:KEYDISP_PALFG];
	cmndraw_setfg(vram, pos->data, pos->posx, 0, fg);
kdch->r[n] = 0;	kdch->r[n] = 0;
return(TRUE);	return(TRUE);
}	}
cmndraw8_setfg(vram, pos->data, pos->posx, 0,	fg.pal8 = keydisp.pal8[KEYDISP_PALHIT];
keydisp.pal8[KEYDISP_PALHIT]);
break;	break;
#endif	#endif
#if defined(SUPPORT_16BPP)	#if defined(SUPPORT_16BPP)
case 16:	case 16:
cmndraw16_setfg(vram, pos->data, pos->posx, 0,	fg.pal16 = keydisp.pal16[pal + pos->pals];
keydisp.pal16[pal + pos->pals]);
break;	break;
#endif	#endif
#if defined(SUPPORT_24BPP)	#if defined(SUPPORT_24BPP)
case 24:	case 24:
cmndraw24_setfg(vram, pos->data, pos->posx, 0,	fg.pal32 = keydisp.pal32[pal + pos->pals];
keydisp.pal32[pal + pos->pals]);
break;	break;
#endif	#endif
#if defined(SUPPORT_32BPP)	#if defined(SUPPORT_32BPP)
case 32:	case 32:
cmndraw32_setfg(vram, pos->data, pos->posx, 0,	fg.pal32 = keydisp.pal32[pal + pos->pals];
keydisp.pal32[pal + pos->pals]);
break;	break;
#endif	#endif
	default:
	return(FALSE);
}	}
	cmndraw_setfg(vram, pos->data, pos->posx, 0, fg);
return(FALSE);	return(FALSE);
}	}

Line 959 BOOL keydisp_paint(CMNVRAM *vram, BOOL r	Line 954 BOOL keydisp_paint(CMNVRAM *vram, BOOL r
kdpnt_exit:	kdpnt_exit:
return(draw);	return(draw);
}	}

#endif	#endif

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

Removed from v.1.6
changed lines
	Added in v.1.7