mirror of
https://github.com/Rockbox/rockbox.git
synced 2025-11-21 02:52:50 -05:00
RTL language enhancements by Tomers Shalev and I.
3 new tokens: %ax - the next token should follow the language direction (what that means is defined by the individual tokens) %aL - align left on LTR language (same as %al), right on RTL languages %aR - align right on LTR language (same as %ar), left on RTL languages This commit adds %ax support to the %V and %Cl tokens. git-svn-id: svn://svn.rockbox.org/rockbox/trunk@24193 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Jonathan Gordon
parent
57667c51cf
commit
91e6b06be9
13 changed files with 89 additions and 36 deletions
|
|
@ -548,6 +548,7 @@ int ft_enter(struct tree_context* c)
|
|||
MAX_FILENAME);
|
||||
talk_init(); /* use voice of same language */
|
||||
viewportmanager_theme_changed(THEME_LANGUAGE);
|
||||
settings_apply_skins();
|
||||
splash(HZ, ID2P(LANG_LANGUAGE_LOADED));
|
||||
break;
|
||||
|
||||
|
|
|
|||
|
|
@ -31,6 +31,7 @@
|
|||
#endif
|
||||
#include "abrepeat.h"
|
||||
#include "lang.h"
|
||||
#include "language.h"
|
||||
#include "statusbar.h"
|
||||
#include "scrollbar.h"
|
||||
#include "screen_access.h"
|
||||
|
|
@ -528,8 +529,10 @@ static bool get_line(struct gui_wps *gwps,
|
|||
#endif
|
||||
|
||||
case WPS_TOKEN_ALIGN_LEFT:
|
||||
case WPS_TOKEN_ALIGN_LEFT_RTL:
|
||||
case WPS_TOKEN_ALIGN_CENTER:
|
||||
case WPS_TOKEN_ALIGN_RIGHT:
|
||||
case WPS_TOKEN_ALIGN_RIGHT_RTL:
|
||||
/* remember where the current aligned text started */
|
||||
switch (cur_align)
|
||||
{
|
||||
|
|
@ -551,12 +554,20 @@ static bool get_line(struct gui_wps *gwps,
|
|||
case WPS_TOKEN_ALIGN_LEFT:
|
||||
cur_align = WPS_ALIGN_LEFT;
|
||||
break;
|
||||
case WPS_TOKEN_ALIGN_LEFT_RTL:
|
||||
cur_align = lang_is_rtl() ? WPS_ALIGN_RIGHT :
|
||||
WPS_ALIGN_LEFT;
|
||||
break;
|
||||
case WPS_TOKEN_ALIGN_CENTER:
|
||||
cur_align = WPS_ALIGN_CENTER;
|
||||
break;
|
||||
case WPS_TOKEN_ALIGN_RIGHT:
|
||||
cur_align = WPS_ALIGN_RIGHT;
|
||||
break;
|
||||
case WPS_TOKEN_ALIGN_RIGHT_RTL:
|
||||
cur_align = lang_is_rtl() ? WPS_ALIGN_LEFT :
|
||||
WPS_ALIGN_RIGHT;
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -89,6 +89,8 @@ static struct skin_viewport *curr_vp;
|
|||
/* the current line, linked to the above viewport */
|
||||
static struct skin_line *curr_line;
|
||||
|
||||
static int follow_lang_direction = 0;
|
||||
|
||||
#ifdef HAVE_LCD_BITMAP
|
||||
|
||||
#if LCD_DEPTH > 1
|
||||
|
|
@ -140,6 +142,19 @@ static int parse_dir_level(const char *wps_bufptr,
|
|||
struct wps_token *token, struct wps_data *wps_data);
|
||||
static int parse_setting_and_lang(const char *wps_bufptr,
|
||||
struct wps_token *token, struct wps_data *wps_data);
|
||||
|
||||
|
||||
int parse_languagedirection(const char *wps_bufptr,
|
||||
struct wps_token *token, struct wps_data *wps_data)
|
||||
{
|
||||
(void)wps_bufptr;
|
||||
(void)token;
|
||||
(void)wps_data;
|
||||
follow_lang_direction = 2; /* 2 because it is decremented immediatly after
|
||||
this token is parsed, after the next token it
|
||||
will be 0 again. */
|
||||
return 0;
|
||||
}
|
||||
|
||||
#ifdef HAVE_LCD_BITMAP
|
||||
static int parse_viewport_display(const char *wps_bufptr,
|
||||
|
|
@ -189,7 +204,10 @@ static const struct wps_tag all_tags[] = {
|
|||
|
||||
{ WPS_TOKEN_ALIGN_CENTER, "ac", 0, NULL },
|
||||
{ WPS_TOKEN_ALIGN_LEFT, "al", 0, NULL },
|
||||
{ WPS_TOKEN_ALIGN_LEFT_RTL, "aL", 0, NULL },
|
||||
{ WPS_TOKEN_ALIGN_RIGHT, "ar", 0, NULL },
|
||||
{ WPS_TOKEN_ALIGN_RIGHT_RTL, "aR", 0, NULL },
|
||||
{ WPS_NO_TOKEN, "ax", 0, parse_languagedirection },
|
||||
|
||||
{ WPS_TOKEN_BATTERY_PERCENT, "bl", WPS_REFRESH_DYNAMIC, NULL },
|
||||
{ WPS_TOKEN_BATTERY_VOLTS, "bv", WPS_REFRESH_DYNAMIC, NULL },
|
||||
|
|
@ -748,15 +766,22 @@ static int parse_viewport(const char *wps_bufptr,
|
|||
ptr++;
|
||||
struct viewport *vp = &skin_vp->vp;
|
||||
/* format: %V|x|y|width|height|font|fg_pattern|bg_pattern| */
|
||||
|
||||
if (!(ptr = viewport_parse_viewport(vp, curr_screen, ptr, '|')))
|
||||
return WPS_ERROR_INVALID_PARAM;
|
||||
|
||||
vp->flags &= ~VP_FLAG_ALIGN_RIGHT; /* ignore right-to-left languages */
|
||||
|
||||
/* Check for trailing | */
|
||||
if (*ptr != '|')
|
||||
return WPS_ERROR_INVALID_PARAM;
|
||||
|
||||
if (follow_lang_direction && lang_is_rtl())
|
||||
{
|
||||
vp->flags |= VP_FLAG_ALIGN_RIGHT;
|
||||
vp->x = screens[curr_screen].lcdwidth - vp->width - vp->x;
|
||||
}
|
||||
else
|
||||
vp->flags &= ~VP_FLAG_ALIGN_RIGHT; /* ignore right-to-left languages */
|
||||
|
||||
|
||||
|
||||
struct skin_token_list *list = new_skin_token_list_item(NULL, skin_vp);
|
||||
if (!list)
|
||||
|
|
@ -954,6 +979,7 @@ static int parse_progressbar(const char *wps_bufptr,
|
|||
}
|
||||
pb->have_bitmap_pb = false;
|
||||
pb->bm.data = NULL; /* no bitmap specified */
|
||||
pb->follow_lang_direction = follow_lang_direction > 0;
|
||||
|
||||
if (*wps_bufptr != '|') /* regular old style */
|
||||
{
|
||||
|
|
@ -1041,6 +1067,7 @@ static int parse_albumart_load(const char *wps_bufptr,
|
|||
bool parsing;
|
||||
struct dim dimensions;
|
||||
int albumart_slot;
|
||||
bool swap_for_rtl = lang_is_rtl() && follow_lang_direction;
|
||||
struct skin_albumart *aa = skin_buffer_alloc(sizeof(struct skin_albumart));
|
||||
(void)token; /* silence warning */
|
||||
if (!aa)
|
||||
|
|
@ -1085,7 +1112,10 @@ static int parse_albumart_load(const char *wps_bufptr,
|
|||
case 'l':
|
||||
case 'L':
|
||||
case '+':
|
||||
aa->xalign = WPS_ALBUMART_ALIGN_LEFT;
|
||||
if (swap_for_rtl)
|
||||
aa->xalign = WPS_ALBUMART_ALIGN_RIGHT;
|
||||
else
|
||||
aa->xalign = WPS_ALBUMART_ALIGN_LEFT;
|
||||
break;
|
||||
case 'c':
|
||||
case 'C':
|
||||
|
|
@ -1094,7 +1124,10 @@ static int parse_albumart_load(const char *wps_bufptr,
|
|||
case 'r':
|
||||
case 'R':
|
||||
case '-':
|
||||
aa->xalign = WPS_ALBUMART_ALIGN_RIGHT;
|
||||
if (swap_for_rtl)
|
||||
aa->xalign = WPS_ALBUMART_ALIGN_LEFT;
|
||||
else
|
||||
aa->xalign = WPS_ALBUMART_ALIGN_RIGHT;
|
||||
break;
|
||||
case 'd':
|
||||
case 'D':
|
||||
|
|
@ -1168,6 +1201,9 @@ static int parse_albumart_load(const char *wps_bufptr,
|
|||
aa->height = 0;
|
||||
else if (aa->height > LCD_HEIGHT)
|
||||
aa->height = LCD_HEIGHT;
|
||||
|
||||
if (swap_for_rtl)
|
||||
aa->x = LCD_WIDTH - (aa->x + aa->width);
|
||||
|
||||
aa->state = WPS_ALBUMART_LOAD;
|
||||
aa->draw = false;
|
||||
|
|
@ -1500,6 +1536,8 @@ static bool wps_parse(struct wps_data *data, const char *wps_bufptr, bool debug)
|
|||
|
||||
while (*wps_bufptr && !fail)
|
||||
{
|
||||
if (follow_lang_direction)
|
||||
follow_lang_direction--;
|
||||
/* first make sure there is enough room for tokens */
|
||||
if (max_tokens <= data->num_tokens + 5)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -38,8 +38,10 @@ enum wps_token_type {
|
|||
|
||||
/* Alignment */
|
||||
WPS_TOKEN_ALIGN_LEFT,
|
||||
WPS_TOKEN_ALIGN_LEFT_RTL,
|
||||
WPS_TOKEN_ALIGN_CENTER,
|
||||
WPS_TOKEN_ALIGN_RIGHT,
|
||||
WPS_TOKEN_ALIGN_RIGHT_RTL,
|
||||
|
||||
/* Sublines */
|
||||
WPS_TOKEN_SUBLINE_TIMEOUT,
|
||||
|
|
|
|||
|
|
@ -99,6 +99,7 @@ struct progressbar {
|
|||
short y;
|
||||
short width;
|
||||
short height;
|
||||
bool follow_lang_direction;
|
||||
/*progressbar image*/
|
||||
struct bitmap bm;
|
||||
bool have_bitmap_pb;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue