Skip to content

Commit

Permalink
Vita: - virtual keyboard transparency is now adjustable (START+dpad l…
Browse files Browse the repository at this point in the history
…eft/right)

- fixed bug in virtual keyboard initialization where the keyboard send an endless string of ' symbols on boot up before it was first opened
  • Loading branch information
rsn8887 committed Dec 25, 2016
1 parent 68f27c2 commit ae21396
Show file tree
Hide file tree
Showing 3 changed files with 51 additions and 5 deletions.
9 changes: 8 additions & 1 deletion src/od-joy.cpp
Expand Up @@ -324,7 +324,14 @@ void read_joystick(int nr, unsigned int *dir, int *button)
{
vkbd_displace_down();
}

else if (buttonStart && (dpadLeft || left))
{
vkbd_transparency_up();
}
else if (buttonStart && (dpadRight || right))
{
vkbd_transparency_down();
}
else
{
if (left || dpadLeft)
Expand Down
45 changes: 41 additions & 4 deletions src/vkbd/vkbd.cpp
Expand Up @@ -13,6 +13,7 @@ extern int keycode2amiga(SDL_keysym *prKeySym);

static int vkbd_x=VKBD_X;
static int vkbd_y=VKBD_Y;
static int vkbd_transparency=255;
static int vkbd_just_blinked=0;

int vkbd_shift=0;
Expand All @@ -31,6 +32,8 @@ void vkbd_quit(void) { }
int vkbd_process(void) { return -1234567; }
void vkbd_displace_up(void) { };
void vkbd_displace_down(void) { };
void vkbd_transparency_up(void) { };
void vkbd_transparency_down(void) { };
#else

#define MAX_KEY 110
Expand Down Expand Up @@ -338,9 +341,10 @@ int vkbd_init(void)
}
ksurShift=SDL_DisplayFormat(tmp);
SDL_FreeSurface(tmp);

SDL_SetAlpha(ksur, SDL_SRCALPHA | SDL_RLEACCEL, 125);
SDL_SetAlpha(ksurShift, SDL_SRCALPHA | SDL_RLEACCEL, 125);

vkbd_transparency=128; //default transparency is 128 for LARGEKEYBOARD
SDL_SetAlpha(ksur, SDL_SRCALPHA | SDL_RLEACCEL, vkbd_transparency);
SDL_SetAlpha(ksurShift, SDL_SRCALPHA | SDL_RLEACCEL, vkbd_transparency);
#else //LARGEKEYBOARD
//if using the small keyboard, load in the zoomed keys instead
for(i=0;i<MAX_KEY;i++)
Expand Down Expand Up @@ -383,7 +387,7 @@ int vkbd_init(void)
#endif
vkbd_mode=0;
vkbd_move=0;
vkbd_key=0;
vkbd_key=-1234567;
vkbd_button2=(SDLKey)0;
vkbd_keysave=-1234567;
return 0;
Expand Down Expand Up @@ -425,6 +429,39 @@ void vkbd_redraw(void)
#endif
}

void vkbd_transparency_up(void)
{
if (vkbd_transparency>53)
vkbd_transparency-=4;
else
vkbd_transparency=50;
SDL_SetAlpha(ksur, SDL_SRCALPHA | SDL_RLEACCEL, vkbd_transparency);
#ifdef LARGEKEYBOARD
SDL_SetAlpha(ksurShift, SDL_SRCALPHA | SDL_RLEACCEL, vkbd_transparency);
#endif
}

void vkbd_transparency_down(void)
{
if (vkbd_transparency<252)
{
vkbd_transparency+=4; //some transparency
SDL_SetAlpha(ksur, SDL_SRCALPHA | SDL_RLEACCEL, vkbd_transparency);
#ifdef LARGEKEYBOARD
SDL_SetAlpha(ksurShift, SDL_SRCALPHA | SDL_RLEACCEL, vkbd_transparency);
#endif
}
else
{
vkbd_transparency=255; //fully opaque
SDL_SetAlpha(ksur, 0, vkbd_transparency);
#ifdef LARGEKEYBOARD
SDL_SetAlpha(ksurShift, 0, vkbd_transparency);
#endif
}
}


void vkbd_displace_up(void)
{
if (vkbd_y>3)
Expand Down
2 changes: 2 additions & 0 deletions src/vkbd/vkbd.h
Expand Up @@ -17,6 +17,8 @@ int vkbd_process(void);
void vkbd_init_button2(void);
void vkbd_displace_up(void);
void vkbd_displace_down(void);
void vkbd_transparency_up(void);
void vkbd_transparency_down(void);

extern int vkbd_mode;
extern int vkbd_move;
Expand Down

0 comments on commit ae21396

Please sign in to comment.