June 2013 - MPlayer-cvslog - lists.mplayerhq.hu

r35961 - in trunk: Changelog input/input.c libvo/x11_common.c osdep/getch2.c osdep/keycodes.h
by reimar 13 Feb '14

13 Feb '14

Author: reimar Date: Thu Mar 14 20:59:35 2013 New Revision: 35961 Log: Add support for binding any key in UTF-8 range. X11 part is a bit hackish since we need to use setlocale to get desired behaviour for XLookupString. Modified: trunk/Changelog trunk/input/input.c trunk/libvo/x11_common.c trunk/osdep/getch2.c trunk/osdep/keycodes.h Modified: trunk/Changelog ============================================================================== --- trunk/Changelog Wed Mar 13 11:13:13 2013 (r35960) +++ trunk/Changelog Thu Mar 14 20:59:35 2013 (r35961) @@ -13,6 +13,7 @@ MPlayer better than -vo gl (it is in many ways worse). * Fixes for DVB, teletext and closed-caption based subtitles. * Support teletext and CC subtitles in WTV. + * Support binding keys corresponding to non-ASCII characters. 1.1: "We gave up on 1.0" Modified: trunk/input/input.c ============================================================================== --- trunk/input/input.c Wed Mar 13 11:13:13 2013 (r35960) +++ trunk/input/input.c Thu Mar 14 20:59:35 2013 (r35961) @@ -38,6 +38,7 @@ #include "osdep/getch2.h" #include "osdep/keycodes.h" #include "osdep/timer.h" +#include "libavutil/common.h" #include "libavutil/avstring.h" #include "mp_msg.h" #include "help_mp.h" @@ -1474,6 +1475,7 @@ mp_input_get_key_name(int key) { int mp_input_get_key_from_name(const char *name) { + uint32_t utf8 = 0; int i,ret = 0,len = strlen(name); if(len == 1) { // Direct key code ret = (unsigned char)name[0]; @@ -1486,6 +1488,10 @@ mp_input_get_key_from_name(const char *n return key_names[i].key; } + GET_UTF8(utf8, (uint8_t)*name++, return -1;) + if (*name == 0 && utf8 < KEY_BASE) + return utf8; + return -1; } Modified: trunk/libvo/x11_common.c ============================================================================== --- trunk/libvo/x11_common.c Wed Mar 13 11:13:13 2013 (r35960) +++ trunk/libvo/x11_common.c Thu Mar 14 20:59:35 2013 (r35961) @@ -21,6 +21,7 @@ #include <math.h> #include <inttypes.h> #include <limits.h> +#include <locale.h> #include "config.h" #include "mp_msg.h" @@ -427,6 +428,9 @@ int vo_init(void) return 1; // already called } + // Required so that XLookupString returns UTF-8 + if (!setlocale(LC_CTYPE, "C.UTF-8") && !setlocale(LC_CTYPE, "en_US.utf8")) + mp_msg(MSGT_VO, MSGL_WARN, "Could not find a UTF-8 locale, some keys will no be handled.\n"); XSetErrorHandler(x11_errorhandler); dispName = XDisplayName(mDisplayName); @@ -810,11 +814,22 @@ static int check_resize(void) return rc; } +static int to_utf8(const uint8_t *in) +{ + uint32_t v = 0; + GET_UTF8(v, *in++, goto err;) + if (*in || v >= KEY_BASE) + goto err; + return v; +err: + return 0; +} + int vo_x11_check_events(Display * mydisplay) { int ret = 0; XEvent Event; - char buf[100]; + uint8_t buf[16] = {0}; KeySym keySym; static XComposeStatus stat; static int ctrl_state; @@ -852,7 +867,7 @@ int vo_x11_check_events(Display * mydisp case KeyPress: case KeyRelease: { - int key; + int key, utf8; #ifdef CONFIG_GUI if ( use_gui ) { break; } @@ -863,6 +878,8 @@ int vo_x11_check_events(Display * mydisp key = ((keySym & 0xff00) != 0 ? ((keySym & 0x00ff) + 256) : (keySym)); + utf8 = to_utf8(buf); + if (utf8) key = 0; if (key == wsLeftCtrl || key == wsRightCtrl) { ctrl_state = Event.type == KeyPress; mplayer_put_key(KEY_CTRL | @@ -880,7 +897,8 @@ int vo_x11_check_events(Display * mydisp (ctrl_state ? MP_KEY_DOWN : 0)); } if (!vo_x11_putkey_ext(keySym)) { - vo_x11_putkey(key); + if (utf8) mplayer_put_key(utf8); + else vo_x11_putkey(key); } ret |= VO_EVENT_KEYPRESS; } Modified: trunk/osdep/getch2.c ============================================================================== --- trunk/osdep/getch2.c Wed Mar 13 11:13:13 2013 (r35960) +++ trunk/osdep/getch2.c Thu Mar 14 20:59:35 2013 (r35961) @@ -60,6 +60,7 @@ #include "mp_fifo.h" #include "keycodes.h" #include "getch2.h" +#include "libavutil/common.h" #ifdef HAVE_TERMIOS static struct termios tio_orig; @@ -201,6 +202,14 @@ void getch2(void) len = 2; } code = KEY_ENTER; + } else if (code >= 0xc0) { + uint32_t utf8 = 0; + i = 0; + GET_UTF8(utf8, (i < getch2_len ? getch2_buf[i++] : 0), goto not_utf8;) + if (utf8 < KEY_BASE) { + code = utf8; + len = i; + } } } else if (getch2_len > 1) { @@ -262,6 +271,7 @@ void getch2(void) } } } + not_utf8: found: getch2_len -= len; for (i = 0; i < getch2_len; i++) Modified: trunk/osdep/keycodes.h ============================================================================== --- trunk/osdep/keycodes.h Wed Mar 13 11:13:13 2013 (r35960) +++ trunk/osdep/keycodes.h Thu Mar 14 20:59:35 2013 (r35961) @@ -23,7 +23,7 @@ #ifndef MPLAYER_KEYCODES_H #define MPLAYER_KEYCODES_H -#define KEY_BASE 0x100 +#define KEY_BASE 0x1000000 enum { KEY_TAB = 9, @@ -76,7 +76,7 @@ enum { KEY_VOLUME_DOWN, KEY_MUTE, /* Special internal/virtual keys */ - KEY_CLOSE_WIN = 0x1000, + KEY_CLOSE_WIN = KEY_BASE + 0x1000, }; /* Control keys short name */

3 10

r36350 - trunk/etc/codecs.conf
by compn 19 Jun '13

19 Jun '13

Author: compn Date: Wed Jun 19 16:40:58 2013 New Revision: 36350 Log: codecs.conf add xd51 to mpeg2 Modified: trunk/etc/codecs.conf Modified: trunk/etc/codecs.conf ============================================================================== --- trunk/etc/codecs.conf Mon Jun 17 14:27:36 2013 (r36349) +++ trunk/etc/codecs.conf Wed Jun 19 16:40:58 2013 (r36350) @@ -374,6 +374,7 @@ videocodec ffmpeg2 fourcc xd5a,xd5b,xd5c fourcc xd5d,xd5e,xd5f fourcc xd59,xd54,xd55 + fourcc xd51 fourcc mx5n,mx4n,mx4p fourcc mx3n,mx3p fourcc AVmp @@ -417,6 +418,7 @@ videocodec ffmpeg12 fourcc xd5a,xd5b,xd5c fourcc xd5d,xd5e,xd5f fourcc xd59,xd54,xd55 + fourcc xd51 fourcc mx5n,mx4n,mx4p fourcc mx3n,mx3p fourcc AVmp @@ -460,6 +462,7 @@ videocodec mpeg12 fourcc xd5a,xd5b,xd5c fourcc xd5d,xd5e,xd5f fourcc xd59,xd54,xd55 + fourcc xd51 fourcc mx5n,mx4n,mx4p fourcc mx3n,mx3p fourcc AVmp @@ -497,6 +500,7 @@ videocodec ffmpeg12mc fourcc xd5a,xd5b,xd5c fourcc xd5d,xd5e,xd5f fourcc xd59,xd54,xd55 + fourcc xd51 fourcc mx5n,mx4n,mx4p fourcc mx3n,mx3p fourcc AVmp @@ -563,7 +567,7 @@ videocodec ffmpeg2crystalhd fourcc xdvd,xdve,xdvf fourcc xd5a,xd5b,xd5c fourcc xd5d,xd5e,xd5f - fourcc xd59,xd54 + fourcc xd59,xd54,xd51 fourcc mx5n,mx4n,mx4p fourcc mx3n,mx3p fourcc AVmp @@ -597,6 +601,7 @@ videocodec mpegpes fourcc xd5a,xd5b,xd5c fourcc xd5d,xd5e,xd5f fourcc xd59,xd54,xd55 + fourcc xd51 fourcc mx5n,mx4n,mx4p fourcc mx3n,mx3p fourcc AVmp

1 0

r36349 - in trunk: configure osdep/osdep.h stream/stream_file.c sub/subreader.c sub/vobsub.c
by komh 17 Jun '13

17 Jun '13

Author: komh Date: Mon Jun 17 14:27:36 2013 New Revision: 36349 Log: Check if path is too long Some buggy libc such as OS/2 kLIBC crashes if path is too long. Modified: trunk/configure trunk/osdep/osdep.h trunk/stream/stream_file.c trunk/sub/subreader.c trunk/sub/vobsub.c Modified: trunk/configure ============================================================================== --- trunk/configure Mon Jun 17 00:35:51 2013 (r36348) +++ trunk/configure Mon Jun 17 14:27:36 2013 (r36349) @@ -855,6 +855,7 @@ _stream_cache=yes _priority=no def_dos_paths="#define HAVE_DOS_PATHS 0" def_stream_cache="#define CONFIG_STREAM_CACHE 1" +def_path_max_check="#define CONFIG_PATH_MAX_CHECK 0" def_priority="#undef CONFIG_PRIORITY" def_pthread_cache="#undef PTHREAD_CACHE" shmem=no @@ -1780,6 +1781,7 @@ if os2 ; then _priority=yes def_dos_paths="#define HAVE_DOS_PATHS 1" def_priority="#define CONFIG_PRIORITY 1" + def_path_max_check="#define CONFIG_PATH_MAX_CHECK 1" fi if wine ; then @@ -8723,6 +8725,7 @@ $def_macosx_bundle $def_macosx_finder $def_maemo $def_memalign_hack +$def_path_max_check $def_priority $def_quicktime $def_restrict_keyword Modified: trunk/osdep/osdep.h ============================================================================== --- trunk/osdep/osdep.h Mon Jun 17 00:35:51 2013 (r36348) +++ trunk/osdep/osdep.h Mon Jun 17 14:27:36 2013 (r36349) @@ -23,6 +23,28 @@ #ifndef MPLAYER_OSDEP_H #define MPLAYER_OSDEP_H +#include "config.h" + +#if CONFIG_PATH_MAX_CHECK +#include <stdio.h> /* fopen() */ +#include <dirent.h> /* opendir() */ +#include <io.h> /* open() */ +#include <fcntl.h> /* open() */ +#include <string.h> /* strlen() */ +#include <limits.h> /* PATH_MAX */ +#include <errno.h> /* errno */ + +#define fopen(n, m) \ + (strlen(n) >= PATH_MAX ? (errno = ENAMETOOLONG, NULL) : (fopen)(n, m)) + +#define opendir(n) \ + (strlen(n) >= PATH_MAX ? (errno = ENOENT, NULL) : (opendir)(n)) + +#define open(n, ...) \ + (strlen(n) >= PATH_MAX ? (errno = ENAMETOOLONG, -1) : \ + (open)(n, __VA_ARGS__)) +#endif /* CONFIG_PATH_MAX_CHECK */ + #ifdef __OS2__ #define INCL_DOS #define INCL_DOSDEVIOCTL Modified: trunk/stream/stream_file.c ============================================================================== --- trunk/stream/stream_file.c Mon Jun 17 00:35:51 2013 (r36348) +++ trunk/stream/stream_file.c Mon Jun 17 14:27:36 2013 (r36349) @@ -36,6 +36,7 @@ #include "help_mp.h" #include "m_option.h" #include "m_struct.h" +#include "osdep/osdep.h" static struct stream_priv_s { char* filename; Modified: trunk/sub/subreader.c ============================================================================== --- trunk/sub/subreader.c Mon Jun 17 00:35:51 2013 (r36348) +++ trunk/sub/subreader.c Mon Jun 17 14:27:36 2013 (r36349) @@ -42,6 +42,7 @@ #include "stream/stream.h" #include "libavutil/common.h" #include "libavutil/avstring.h" +#include "osdep/osdep.h" #ifdef CONFIG_ENCA #include <enca.h> Modified: trunk/sub/vobsub.c ============================================================================== --- trunk/sub/vobsub.c Mon Jun 17 00:35:51 2013 (r36348) +++ trunk/sub/vobsub.c Mon Jun 17 14:27:36 2013 (r36349) @@ -42,6 +42,7 @@ #include "unrar_exec.h" #include "libavutil/common.h" #include "libavutil/intreadwrite.h" +#include "osdep/osdep.h" // Record the original -vobsubid set by commandline, since vobsub_id will be // overridden if slang match any of vobsub streams.

1 0

r36348 - trunk/configure
by cehoyos 16 Jun '13

16 Jun '13

Author: cehoyos Date: Mon Jun 17 00:35:51 2013 New Revision: 36348 Log: Silence two warnings: MPlayer currently does not support DXVA2 and VAAPI. Modified: trunk/configure Modified: trunk/configure ============================================================================== --- trunk/configure Sat Jun 15 21:59:24 2013 (r36347) +++ trunk/configure Mon Jun 17 00:35:51 2013 (r36348) @@ -9069,6 +9069,7 @@ $def_truncf #define CONFIG_AUDIO_FLOAT 0 #define CONFIG_AVCODEC 1 #define CONFIG_AVSERVER 0 +#define CONFIG_DXVA2 0 #define CONFIG_FASTDIV 0 #define CONFIG_FFSERVER 0 #define CONFIG_FTRAPV 0 @@ -9085,6 +9086,7 @@ $def_truncf #define CONFIG_SHARED 0 #define CONFIG_SMALL 0 #define CONFIG_SWSCALE_ALPHA 1 +#define CONFIG_VAAPI 0 #define HAVE_ALIGNED_STACK 1 #define HAVE_ASM_MOD_Q 1

1 0

r36293 - trunk/libvo/vo_vdpau.c
by reimar 16 Jun '13

16 Jun '13

Author: reimar Date: Tue May 28 22:56:05 2013 New Revision: 36293 Log: Try to support -monitor-orientation with VDPAU. It doesn't work on my system with a radeon card, though maybe that feature just isn't implemented. Modified: trunk/libvo/vo_vdpau.c Modified: trunk/libvo/vo_vdpau.c ============================================================================== --- trunk/libvo/vo_vdpau.c Tue May 28 22:43:50 2013 (r36292) +++ trunk/libvo/vo_vdpau.c Tue May 28 22:56:05 2013 (r36293) @@ -266,6 +266,13 @@ static void video_to_output_surface(void } } +static const uint32_t rotate_flags[4] = { + VDP_OUTPUT_SURFACE_RENDER_ROTATE_0, + VDP_OUTPUT_SURFACE_RENDER_ROTATE_90, + VDP_OUTPUT_SURFACE_RENDER_ROTATE_180, + VDP_OUTPUT_SURFACE_RENDER_ROTATE_270 +}; + static void resize(void) { VdpStatus vdp_st; @@ -314,12 +321,12 @@ static void resize(void) vdp_st = vdp_output_surface_render_output_surface(output_surfaces[surface_num], NULL, VDP_INVALID_HANDLE, NULL, NULL, NULL, - VDP_OUTPUT_SURFACE_RENDER_ROTATE_0); + rotate_flags[vo_rotate & 3]); CHECK_ST_WARNING("Error when calling vdp_output_surface_render_output_surface") vdp_st = vdp_output_surface_render_output_surface(output_surfaces[1 - surface_num], NULL, VDP_INVALID_HANDLE, NULL, NULL, NULL, - VDP_OUTPUT_SURFACE_RENDER_ROTATE_0); + rotate_flags[vo_rotate & 3]); CHECK_ST_WARNING("Error when calling vdp_output_surface_render_output_surface") } else video_to_output_surface(); @@ -827,7 +834,7 @@ static void draw_osd_I8A8(int x0,int y0, &output_indexed_rect_vid, NULL, &blend_state, - VDP_OUTPUT_SURFACE_RENDER_ROTATE_0); + rotate_flags[vo_rotate & 3]); CHECK_ST_WARNING("Error when calling vdp_output_surface_render_output_surface") } @@ -851,7 +858,7 @@ static void draw_eosd(void) output_surface, &eosd_targets[i].dest, eosd_targets[i].surface, &eosd_targets[i].source, &eosd_targets[i].color, &blend_state, - VDP_OUTPUT_SURFACE_RENDER_ROTATE_0); + rotate_flags[vo_rotate & 3]); CHECK_ST_WARNING("EOSD: Error when rendering") } } @@ -1041,7 +1048,7 @@ static uint32_t draw_image(mp_image_t *m &out_rect_vid, output_surfaces[2], &src_rect_vid, NULL, NULL, - VDP_OUTPUT_SURFACE_RENDER_ROTATE_0); + rotate_flags[vo_rotate & 3]); CHECK_ST_ERROR("Error when calling vdp_output_surface_render_output_surface") } else if (!(mpi->flags & MP_IMGFLAG_DRAW_CALLBACK)) { VdpStatus vdp_st;

3 8

r36347 - trunk/libvo/vo_vdpau.c
by reimar 15 Jun '13

15 Jun '13

Author: reimar Date: Sat Jun 15 21:59:24 2013 New Revision: 36347 Log: Ensure surfaces are cleared after resize. Modified: trunk/libvo/vo_vdpau.c Modified: trunk/libvo/vo_vdpau.c ============================================================================== --- trunk/libvo/vo_vdpau.c Sat Jun 15 18:11:47 2013 (r36346) +++ trunk/libvo/vo_vdpau.c Sat Jun 15 21:59:24 2013 (r36347) @@ -326,6 +326,12 @@ static void resize(void) mp_msg(MSGT_VO, MSGL_DBG2, "OUT CREATE: %u\n", output_surfaces[i]); } } + // clear surfaces + for (i = 0; i <= NUM_OUTPUT_SURFACES; i++) { + vdp_output_surface_render_output_surface(output_surfaces[i], NULL, + VDP_INVALID_HANDLE, NULL, + NULL, NULL, VDP_OUTPUT_SURFACE_RENDER_ROTATE_0); + } video_to_output_surface(); if (visible_buf) { draw_eosd();

1 0

r36346 - trunk/binary.ver
by reimar 15 Jun '13

15 Jun '13

Author: reimar Date: Sat Jun 15 18:11:47 2013 New Revision: 36346 Log: Fix issues with glibc on 32 bit. Some glibc versions e.g. from RedHat will cause incorrect behaviour when a certain magic symbol is not encountered. This is just abhorrent and simply unacceptable, breaking well-behaving programs to the benefit of ancient programs, but let's try to make it work anyway (and hope they won't repeat the insanity). Modified: trunk/binary.ver Modified: trunk/binary.ver ============================================================================== --- trunk/binary.ver Wed Jun 12 20:54:25 2013 (r36345) +++ trunk/binary.ver Sat Jun 15 18:11:47 2013 (r36346) @@ -1,3 +1,5 @@ MPLAYER_1 { + # to support glibcs abhorrent backwards-compatibility hack + global: _IO_stdin_used; local: *; };

1 0

r36345 - trunk/libvo/matrixview.c
by reimar 12 Jun '13

12 Jun '13

Author: reimar Date: Wed Jun 12 20:54:25 2013 New Revision: 36345 Log: Simplify texture coordinate calculation. Modified: trunk/libvo/matrixview.c Modified: trunk/libvo/matrixview.c ============================================================================== --- trunk/libvo/matrixview.c Wed Jun 12 20:54:23 2013 (r36344) +++ trunk/libvo/matrixview.c Wed Jun 12 20:54:25 2013 (r36345) @@ -57,7 +57,6 @@ static void draw_char(int num, int light { int light2 = 0; float tx, ty; - int num2, num3; num %= 55; if (light < 10) light = 0; @@ -69,10 +68,8 @@ static void draw_char(int num, int light if (light > 255) light = 255; light2 = 128; } - num2 = num / 10; - num3 = num - (num2 * 10); - ty = (float)num2 / 6; - tx = (float)num3 / 10; + ty = (float)(num / 10) / 6; + tx = (float)(num % 10) / 10; mpglColor4ub(light2, light, light2, 255); // Basic polygon color mpglTexCoord2f(tx, ty);

1 0

r36344 - trunk/libvo/matrixview.c
by reimar 12 Jun '13

12 Jun '13

Author: reimar Date: Wed Jun 12 20:54:23 2013 New Revision: 36344 Log: Merge the 3 different drawing steps. Modified: trunk/libvo/matrixview.c Modified: trunk/libvo/matrixview.c ============================================================================== --- trunk/libvo/matrixview.c Wed Jun 12 20:54:22 2013 (r36343) +++ trunk/libvo/matrixview.c Wed Jun 12 20:54:23 2013 (r36344) @@ -51,41 +51,29 @@ static uint8_t *text_light; static float *bump_pic; -static void draw_char(int num, float light, float x, float y, float z) +static void draw_flare(float x, float y, float z); + +static void draw_char(int num, int light, int illuminated, float x, float y, float z) { + int light2 = 0; float tx, ty; int num2, num3; num %= 55; + if (light < 10) light = 0; //light = light / 255; //light=7-light;num+=(light*60); light *= matrix_brightness; + if (illuminated) { + draw_flare(x, y, z); + light += 128; + if (light > 255) light = 255; + light2 = 128; + } num2 = num / 10; num3 = num - (num2 * 10); ty = (float)num2 / 6; tx = (float)num3 / 10; - mpglColor4ub(0, light, 0, 255); // Basic polygon color - - mpglTexCoord2f(tx, ty); - mpglVertex3f(x, y, z); - mpglTexCoord2f(tx + 0.1, ty); - mpglVertex3f(x + 1, y, z); - mpglTexCoord2f(tx + 0.1, ty + 0.166); - mpglVertex3f(x + 1, y - 1, z); - mpglTexCoord2f(tx, ty + 0.166); - mpglVertex3f(x, y - 1, z); -} - -static void draw_illuminatedchar(int num, float x, float y, float z) -{ - float tx, ty; - int num2, num3; - - num %= 55; - num2 = num / 10; - num3 = num - (num2 * 10); - ty = (float)num2 / 6; - tx = (float)num3 / 10; - mpglColor4ub(128, 128, 128, 255); // Basic polygon color + mpglColor4ub(light2, light, light2, 255); // Basic polygon color mpglTexCoord2f(tx, ty); mpglVertex3f(x, y, z); @@ -117,6 +105,7 @@ static void draw_text(const uint8_t *pic int p = 0; int c, c_pic; int pic_fade = 255; + int illuminated; for (y = _text_y; y > -_text_y; y--) { for (x = -_text_x; x < _text_x; x++) { @@ -144,27 +133,9 @@ static void draw_text(const uint8_t *pic bump_pic[p] = Z_Depth; } - if (c > 10) - draw_char(text[p], c, x, y, bump_pic[p]); - - if (text_light[p] > 128 && text_light[p + text_x] < 10) - draw_illuminatedchar(text[p], x, y, - bump_pic[p]); - - p++; - } - } -} - -static void draw_flares(void) -{ - float x, y; - int p = 0; + illuminated = text_light[p] > 128 && text_light[p + text_x] < 10; + draw_char(text[p], c, illuminated, x, y, bump_pic[p]); - for (y = _text_y; y > -_text_y; y--) { - for (x = -_text_x; x < _text_x; x++) { - if (text_light[p] > 128 && text_light[p + text_x] < 10) - draw_flare(x, y, bump_pic[p]); p++; } } @@ -284,7 +255,6 @@ void matrixview_draw(double currentTime, // OK, let's start drawing our planer quads. mpglBegin(GL_QUADS); draw_text(data); - draw_flares(); mpglEnd(); make_change(currentTime);

1 0

r36343 - trunk/libvo/matrixview.c
by reimar 12 Jun '13

12 Jun '13

Author: reimar Date: Wed Jun 12 20:54:22 2013 New Revision: 36343 Log: Remove array that always contains only 0. Modified: trunk/libvo/matrixview.c Modified: trunk/libvo/matrixview.c ============================================================================== --- trunk/libvo/matrixview.c Wed Jun 12 20:54:20 2013 (r36342) +++ trunk/libvo/matrixview.c Wed Jun 12 20:54:22 2013 (r36343) @@ -48,7 +48,6 @@ static int text_y = 0; static uint8_t *speed; static uint8_t *text; static uint8_t *text_light; -static float *text_depth; static float *bump_pic; @@ -146,16 +145,11 @@ static void draw_text(const uint8_t *pic } if (c > 10) - draw_char(text[p], c, x, y, text_depth[p] + bump_pic[p]); - - if (text_depth[p] < 0.1) - text_depth[p] = 0; - else - text_depth[p] /= 1.1; + draw_char(text[p], c, x, y, bump_pic[p]); if (text_light[p] > 128 && text_light[p + text_x] < 10) draw_illuminatedchar(text[p], x, y, - text_depth[p] + bump_pic[p]); + bump_pic[p]); p++; } @@ -170,7 +164,7 @@ static void draw_flares(void) for (y = _text_y; y > -_text_y; y--) { for (x = -_text_x; x < _text_x; x++) { if (text_light[p] > 128 && text_light[p + text_x] < 10) - draw_flare(x, y, text_depth[p] + bump_pic[p]); + draw_flare(x, y, bump_pic[p]); p++; } } @@ -316,15 +310,12 @@ void matrixview_matrix_resize(int w, int text = NULL; free(text_light); text_light = NULL; - free(text_depth); - text_depth = NULL; if (w > MAX_TEXT_X || h > MAX_TEXT_Y) return; elems = w * (h + 1); speed = calloc(w, sizeof(*speed)); text = calloc(elems, sizeof(*text)); text_light = calloc(elems, sizeof(*text_light)); - text_depth = calloc(elems, sizeof(*text_depth)); bump_pic = calloc(elems, sizeof(*bump_pic)); text_x = w; text_y = h;

1 0