Pecus/libretro-atari800
1
0
Fork 0
mirror of https://github.com/Pecusx/libretro-atari800.git synced 2026-05-21 21:33:56 +02:00
Code Issues Packages Projects Releases Wiki Activity

Third (final??) attemp at a new Virtual Keyboard (#75)

Browse Source 
* Atari Console keys

Added: Help, Start, Select, Option and Reset keys.

* Atari TAB, RETURN and SPACE keys

* Return?

* Start, Option, Help and Emulator Menu buttons

* Help key on Pad

Added Atari Help key to joypad mapping.

* First try to new keyboard

* Shit on VKBD

* Control key handle

* Shift text UPPER when pressed

* Atari 8bit font

* Virtual Keyboard keys with Control

* Minor error

* 1st attemp to new vkbd layout

Virtual Keyoboard recreated. Added atari font, Ctrl and Shift funcionality.
Console buttons on second page.

* % and null character display on VKBD

* Revert "% and null character display on VKBD"

This reverts commit f4eb848f26.

* Displaying % and heart on VKBD - maybe...

* Set max key description lenght to 3

* Always display only 3 characters of key desc.

* Schift & Control status on VKBD

* Second page of VKBD

New second page.
New layout, atari cursor keys and F1-F4 now working.

* Minor mistake :)

* Correct atari F1-F4 handling

* Oooops... minor error

* Better keys handling

* Better Shift & Control indicators

* Much better Shift and Control colors :)

* Disable joystick input if Virtual Keyboard active

Only for testing

* Revert "Disable joystick input if Virtual Keyboard active"

This reverts commit 8b942c29e0.

* One page VKBD layout

Atari keyboard fits in one page!

* Atari del/Bk Sp properly handling

* VKBD opacity

Only for testing

* Keys names opacity

Test only

* Still testing VKBD opacity

* minor error

Still testing opacity

* Added VKbd opacity witch switch.

* Oppps...
This commit is contained in:
Pecusx
2021-05-29 09:37:42 +02:00
committed by GitHub
parent 86c87b543f
commit c39dc2ab03
8 changed files with 559 additions and 426 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libretro/graph.c
+31 -12
View File
@@ -8,6 +8,24 @@
#include "libretro-core.h"
extern int VIRTUAL_WIDTH;
extern int VKBD_OPACITY;
unsigned Opacity(unsigned color1, unsigned color2){
unsigned r,g,b;
if (VKBD_OPACITY==1){
r=(R_RGB565(color1)/2)+(R_RGB565(color2)/2);
g=(G_RGB565(color1)/2)+(G_RGB565(color2)/2);
b=(B_RGB565(color1)/2)+(B_RGB565(color2)/2);
return RGB565(r,g,b);
}
else
{
return color2;
}
}
void DrawFBoxBmp(char *buffer,int x,int y,int dx,int dy,unsigned color){
@@ -24,7 +42,7 @@ unsigned short *mbuffer=(unsigned short *)buffer;
for(j=y;j<y+dy;j++){
idx=i+j*VIRTUAL_WIDTH;
mbuffer[idx]=color;
mbuffer[idx]=Opacity(mbuffer[idx],color);
}
}
@@ -43,17 +61,17 @@ unsigned short *mbuffer=(unsigned short *)buffer;
for(i=x;i<x+dx;i++){
idx=i+y*VIRTUAL_WIDTH;
mbuffer[idx]=color;
mbuffer[idx]=Opacity(mbuffer[idx],color);
idx=i+(y+dy)*VIRTUAL_WIDTH;
mbuffer[idx]=color;
mbuffer[idx]=Opacity(mbuffer[idx],color);
}
for(j=y;j<y+dy;j++){
idx=x+j*VIRTUAL_WIDTH;
mbuffer[idx]=color;
mbuffer[idx]=Opacity(mbuffer[idx],color);
idx=(x+dx)+j*VIRTUAL_WIDTH;
mbuffer[idx]=color;
mbuffer[idx]=Opacity(mbuffer[idx],color);
}
}
@@ -69,7 +87,7 @@ unsigned short *mbuffer=(unsigned short *)buffer;
#endif
idx=x+y*VIRTUAL_WIDTH;
mbuffer[idx]=color;
mbuffer[idx]=Opacity(mbuffer[idx],color);
}
@@ -85,7 +103,7 @@ unsigned short *mbuffer=(unsigned short *)buffer;
for(i=x;i<x+dx;i++){
idx=i+y*VIRTUAL_WIDTH;
mbuffer[idx]=color;
mbuffer[idx]=Opacity(mbuffer[idx],color);
}
}
@@ -100,7 +118,7 @@ unsigned short *mbuffer=(unsigned short *)buffer;
#endif
for(j=y;j<y+dy;j++){
idx=x+j*VIRTUAL_WIDTH;
mbuffer[idx]=color;
mbuffer[idx]=Opacity(mbuffer[idx],color);
}
}
@@ -135,7 +153,7 @@ unsigned short *mbuffer=(unsigned short *)buffer;
} else {
idx=x1+y1*VIRTUAL_WIDTH;
mbuffer[idx]=color;
mbuffer[idx]=Opacity(mbuffer[idx],color);
return ;
}
}
@@ -174,7 +192,7 @@ unsigned short *mbuffer=(unsigned short *)buffer;
idx=x1+y1*VIRTUAL_WIDTH;
for (; x < dx; x++, idx +=pixx) {
mbuffer[idx]=color;
mbuffer[idx]=Opacity(mbuffer[idx],color);
y += dy;
if (y >= dx) {
y -= dx;
@@ -297,7 +315,8 @@ unsigned char *mbuffer=(unsigned char *)surf;
#endif
if(string==NULL)return;
for(strlen = 0; strlen<maxstrlen && string[strlen]; strlen++) {}
strlen = sizeof(string);
if (strlen>maxstrlen) strlen = maxstrlen;
int surfw=strlen * 7 * xscale;
int surfh=8 * yscale;
@@ -342,7 +361,7 @@ unsigned char *mbuffer=(unsigned char *)surf;
for(yrepeat = y; yrepeat < y+ surfh; yrepeat++)
for(xrepeat = x; xrepeat< x+surfw; xrepeat++,yptr++)
if(*yptr!=0)mbuffer[xrepeat+yrepeat*VIRTUAL_WIDTH] = *yptr;
if(*yptr!=0)mbuffer[xrepeat+yrepeat*VIRTUAL_WIDTH] = Opacity(mbuffer[xrepeat+yrepeat*VIRTUAL_WIDTH],*yptr);
free(linesurf);