New upstream version 21.0.2+dfsg1

This commit is contained in:
Sebastian Ramacher 2018-02-19 20:54:37 +01:00
parent 1f1bbb3518
commit baafb6325b
706 changed files with 49633 additions and 5044 deletions

View file

@ -1,3 +1,4 @@
TextFreetype2="Κείμενο (FreeType 2)"
Font="Γραμματοσειρά"
Text="Κείμενο"
TextFile="Αρχείο κειμένου (UTF-8 ή UTF-16)"

View file

@ -3,7 +3,7 @@ Font="글꼴"
Text="텍스트"
TextFile="텍스트 파일(UTF-8 혹은 UTF-16)"
TextFileFilter="텍스트 파일 (*.txt);;"
ChatLogMode="대화 기록 모드 (최근 여섯 줄만 표시)"
ChatLogMode="대화 기록 시작 (최근 여섯 줄만 표시)"
Color1="색상 1"
Color2="색상 2"
Outline="외곽선"

View file

@ -0,0 +1,14 @@
TextFreetype2="Văn bản (FreeType 2)"
Font="Phông chữ"
Text="Văn bản"
TextFile="Tệp văn bản (UTF-8 hoặc UTF-16)"
TextFileFilter="Tệp văn bản (*.txt);;"
ChatLogMode="Chế độ bản ghi chat (cuối 6 dòng)"
Color1="Màu 1"
Color2="Màu 2"
Outline="Phác thảo"
DropShadow="Đổ bóng"
ReadFromFile="Đọc từ tệp"
CustomWidth="Tùy chỉnh độ rộng ký tự"
WordWrap="Bọc từ"

View file

@ -238,7 +238,7 @@ static void ft2_video_tick(void *data, float seconds)
time_t t = get_modified_timestamp(srcdata->text_file);
srcdata->last_checked = os_gettime_ns();
if (srcdata->m_timestamp != t) {
if (srcdata->update_file) {
if (srcdata->log_mode)
read_from_end(srcdata, srcdata->text_file);
else
@ -246,6 +246,12 @@ static void ft2_video_tick(void *data, float seconds)
srcdata->text_file);
cache_glyphs(srcdata, srcdata->text);
set_up_vertex_buffer(srcdata);
srcdata->update_file = false;
}
if (srcdata->m_timestamp != t) {
srcdata->m_timestamp = t;
srcdata->update_file = true;
}
}

View file

@ -38,6 +38,7 @@ struct ft2_source {
char *text_file;
wchar_t *text;
time_t m_timestamp;
bool update_file;
uint64_t last_checked;
uint32_t cx, cy, max_h, custom_width;

View file

@ -377,8 +377,6 @@ void load_text_from_file(struct ft2_source *srcdata, const char *filename)
srcdata->text = bzalloc(filesize);
bytes_read = fread(srcdata->text, filesize - 2, 1, tmp_file);
srcdata->m_timestamp =
get_modified_timestamp(srcdata->text_file);
bfree(tmp_read);
fclose(tmp_file);
@ -386,7 +384,6 @@ void load_text_from_file(struct ft2_source *srcdata, const char *filename)
}
fseek(tmp_file, 0, SEEK_SET);
srcdata->m_timestamp = get_modified_timestamp(srcdata->text_file);
tmp_read = bzalloc(filesize + 1);
bytes_read = fread(tmp_read, filesize, 1, tmp_file);
@ -464,8 +461,6 @@ void read_from_end(struct ft2_source *srcdata, const char *filename)
tmp_file);
remove_cr(srcdata->text);
srcdata->m_timestamp =
get_modified_timestamp(srcdata->text_file);
bfree(tmp_read);
fclose(tmp_file);
@ -485,7 +480,6 @@ void read_from_end(struct ft2_source *srcdata, const char *filename)
srcdata->text, (strlen(tmp_read) + 1));
remove_cr(srcdata->text);
srcdata->m_timestamp = get_modified_timestamp(srcdata->text_file);
bfree(tmp_read);
}