May 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

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

r36292 - trunk/libvo/vo_gl.c
by reimar 28 May '13

28 May '13

Author: reimar Date: Tue May 28 22:43:50 2013 New Revision: 36292 Log: Fix border-pos handling. Modified: trunk/libvo/vo_gl.c Modified: trunk/libvo/vo_gl.c ============================================================================== --- trunk/libvo/vo_gl.c Mon May 27 22:36:58 2013 (r36291) +++ trunk/libvo/vo_gl.c Tue May 28 22:43:50 2013 (r36292) @@ -225,10 +225,12 @@ static void resize(void) { scale_y = (double)new_h / (double)vo_dheight; video_matrix[0] *= scale_x; video_matrix[4] *= scale_x; - video_matrix[12] = -1 + apply_border_pos(vo_dwidth, new_w, vo_border_pos_x) * 2.0 / vo_dwidth; + video_matrix[12] *= scale_x; + video_matrix[12] += (apply_border_pos(vo_dwidth, new_w, vo_border_pos_x) - apply_border_pos(vo_dwidth, new_w, 0.5)) * 2.0 / vo_dwidth; video_matrix[1] *= scale_y; video_matrix[5] *= scale_y; - video_matrix[13] = 1 - apply_border_pos(vo_dheight, new_h, vo_border_pos_y) * 2.0 / vo_dheight; + video_matrix[13] *= scale_y; + video_matrix[13] -= (apply_border_pos(vo_dheight, new_h, vo_border_pos_y) - apply_border_pos(vo_dheight, new_h, 0.5)) * 2.0 / vo_dheight; if (vo_rotate & 1) { int tmp = new_w; new_w = new_h; new_h = tmp; }

1 0

r36291 - trunk/libao2/ao_jack.c
by reimar 27 May '13

27 May '13

Author: reimar Date: Mon May 27 22:36:58 2013 New Revision: 36291 Log: Make comment clearer. Modified: trunk/libao2/ao_jack.c Modified: trunk/libao2/ao_jack.c ============================================================================== --- trunk/libao2/ao_jack.c Sun May 26 17:54:34 2013 (r36290) +++ trunk/libao2/ao_jack.c Mon May 27 22:36:58 2013 (r36291) @@ -254,7 +254,7 @@ static int init(int rate, int channels, if (channels > i) channels = i; num_ports = channels; - // create out output ports + // create out_* output ports for (i = 0; i < num_ports; i++) { char pname[30]; snprintf(pname, 30, "out_%d", i);

1 0

r36290 - trunk/gui/wm/ws.c
by ib 26 May '13

26 May '13

Author: ib Date: Sun May 26 17:54:34 2013 New Revision: 36290 Log: Handle events while waiting for window being mapped. Reported by Jens Stimpfle, debian jstimpfle de. Modified: trunk/gui/wm/ws.c Modified: trunk/gui/wm/ws.c ============================================================================== --- trunk/gui/wm/ws.c Sun May 26 17:51:54 2013 (r36289) +++ trunk/gui/wm/ws.c Sun May 26 17:54:34 2013 (r36290) @@ -755,9 +755,10 @@ static void wsWindowMapWait(wsWindow *wi XEvent xev; if (win->Property & wsWaitMap) { - do + do { XNextEvent(wsDisplay, &xev); - while (xev.type != MapNotify || xev.xmap.event != win->WindowID); + wsEvent(&xev); + } while (xev.type != MapNotify || xev.xmap.event != win->WindowID); win->Mapped = wsMapped; }

1 0

r36289 - trunk/gui/wm/ws.c
by ib 26 May '13

26 May '13

Author: ib Date: Sun May 26 17:51:54 2013 New Revision: 36289 Log: Cosmetic: Adjust indent. Additionally, merge variable definitions. Modified: trunk/gui/wm/ws.c Modified: trunk/gui/wm/ws.c ============================================================================== --- trunk/gui/wm/ws.c Sun May 26 17:48:47 2013 (r36288) +++ trunk/gui/wm/ws.c Sun May 26 17:51:54 2013 (r36289) @@ -786,23 +786,19 @@ Window LeaderWindow; // ---------------------------------------------------------------------------------------------- void wsWindowCreate(wsWindow *win, int x, int y, int w, int h, int p, int c, char *label) { - int depth; - - { - int i; - - for (i = 0; i < wsWLCount; i++) - if (wsWindowList[i] == NULL) - break; + int i, depth; - if (i == wsWLCount) { - mp_msg(MSGT_GPLAYER, MSGL_FATAL, MSGTR_WS_TooManyOpenWindows); - mplayer(MPLAYER_EXIT_GUI, EXIT_ERROR, 0); - } + for (i = 0; i < wsWLCount; i++) + if (wsWindowList[i] == NULL) + break; - wsWindowList[i] = win; + if (i == wsWLCount) { + mp_msg(MSGT_GPLAYER, MSGL_FATAL, MSGTR_WS_TooManyOpenWindows); + mplayer(MPLAYER_EXIT_GUI, EXIT_ERROR, 0); } + wsWindowList[i] = win; + win->Property = p; win->Decoration = ((p & wsShowFrame) != 0);

1 0

r36288 - trunk/gui/wm/ws.c
by ib 26 May '13

26 May '13

Author: ib Date: Sun May 26 17:48:47 2013 New Revision: 36288 Log: Relocate internal wsWindowList registration code. Register early. Modified: trunk/gui/wm/ws.c Modified: trunk/gui/wm/ws.c ============================================================================== --- trunk/gui/wm/ws.c Sun May 26 14:41:09 2013 (r36287) +++ trunk/gui/wm/ws.c Sun May 26 17:48:47 2013 (r36288) @@ -788,6 +788,21 @@ void wsWindowCreate(wsWindow *win, int x { int depth; + { + int i; + + for (i = 0; i < wsWLCount; i++) + if (wsWindowList[i] == NULL) + break; + + if (i == wsWLCount) { + mp_msg(MSGT_GPLAYER, MSGL_FATAL, MSGTR_WS_TooManyOpenWindows); + mplayer(MPLAYER_EXIT_GUI, EXIT_ERROR, 0); + } + + wsWindowList[i] = win; + } + win->Property = p; win->Decoration = ((p & wsShowFrame) != 0); @@ -909,21 +924,6 @@ void wsWindowCreate(wsWindow *win, int x wsImageCreate(win, win->Width, win->Height); /* End of creating -------------------------------------------------------------------------- */ - { - int i; - - for (i = 0; i < wsWLCount; i++) - if (wsWindowList[i] == NULL) - break; - - if (i == wsWLCount) { - mp_msg(MSGT_GPLAYER, MSGL_FATAL, MSGTR_WS_TooManyOpenWindows); - mplayer(MPLAYER_EXIT_GUI, EXIT_ERROR, 0); - } - - wsWindowList[i] = win; - } - XFlush(wsDisplay); XSync(wsDisplay, False);

1 0

r36287 - trunk/libvo/gl_common.c
by ib 26 May '13

26 May '13

Author: ib Date: Sun May 26 14:41:09 2013 New Revision: 36287 Log: Define new_gpu_program() conditionally. It won't be used else. Modified: trunk/libvo/gl_common.c Modified: trunk/libvo/gl_common.c ============================================================================== --- trunk/libvo/gl_common.c Sun May 26 14:40:44 2013 (r36286) +++ trunk/libvo/gl_common.c Sun May 26 14:41:09 2013 (r36287) @@ -1623,6 +1623,7 @@ static const char vertex_shader[] = " tcv = tca; tcv2 = tca2; tcv3 = tca3;\n" "}\n"; +#if defined(CONFIG_GL_EGL_X11) || defined(CONFIG_GL_EGL_ANDROID) static GLuint new_gpu_program(void) { GLuint program = mpglCreateProgram(); GLuint shader = compile_shader(GL_VERTEX_SHADER, vertex_shader); @@ -1630,6 +1631,7 @@ static GLuint new_gpu_program(void) { mpglDeleteShader(shader); return program; } +#endif static const char def_frag_shader[] = "precision mediump float;\n"

1 0

r36286 - trunk/libvo/aspect.c
by ib 26 May '13

26 May '13

Author: ib Date: Sun May 26 14:40:44 2013 New Revision: 36286 Log: Remove unused variable. Modified: trunk/libvo/aspect.c Modified: trunk/libvo/aspect.c ============================================================================== --- trunk/libvo/aspect.c Sat May 25 14:06:55 2013 (r36285) +++ trunk/libvo/aspect.c Sun May 26 14:40:44 2013 (r36286) @@ -56,7 +56,6 @@ static struct { } aspdat; static void aspect_rotate(void) { - int i; if (vo_rotate & 1) { aspdat.orgw = aspdat.orgh_norot; aspdat.orgh = aspdat.orgw_norot;

1 0

r36285 - trunk/sub/subreader.c
by reimar 25 May '13

25 May '13

Author: reimar Date: Sat May 25 14:06:55 2013 New Revision: 36285 Log: Discard parts that we do not actually care about instead of reading them in. Since more than one character can match, this could read beyond the target variable. Based on patch by wm4 (nfxjfg googlemail.com) Modified: trunk/sub/subreader.c Modified: trunk/sub/subreader.c ============================================================================== --- trunk/sub/subreader.c Sat May 25 10:42:25 2013 (r36284) +++ trunk/sub/subreader.c Sat May 25 14:06:55 2013 (r36285) @@ -378,14 +378,14 @@ static subtitle *sub_ass_read_line_subvi int h1, m1, s1, ms1, h2, m2, s2, ms2, j = 0; while (!current->text[0]) { - char line[LINE_LEN + 1], full_line[LINE_LEN + 1], sep; + char line[LINE_LEN + 1], full_line[LINE_LEN + 1]; int i; /* Parse SubRip header */ if (!stream_read_line(st, line, LINE_LEN, utf16)) return NULL; - if (sscanf(line, "%d:%d:%d%[,.:]%d --> %d:%d:%d%[,.:]%d", - &h1, &m1, &s1, &sep, &ms1, &h2, &m2, &s2, &sep, &ms2) < 10) + if (sscanf(line, "%d:%d:%d%*[,.:]%d --> %d:%d:%d%*[,.:]%d", + &h1, &m1, &s1, &ms1, &h2, &m2, &s2, &ms2) < 8) continue; current->start = h1 * 360000 + m1 * 6000 + s1 * 100 + ms1 / 10; @@ -442,7 +442,7 @@ static subtitle *sub_read_line_subviewer #endif while (!current->text[0]) { if (!stream_read_line (st, line, LINE_LEN, utf16)) return NULL; - if ((len=sscanf (line, "%d:%d:%d%[,.:]%d --> %d:%d:%d%[,.:]%d",&a1,&a2,&a3,(char *)&i,&a4,&b1,&b2,&b3,(char *)&i,&b4)) < 10) + if ((len=sscanf (line, "%d:%d:%d%*[,.:]%d --> %d:%d:%d%*[,.:]%d",&a1,&a2,&a3,&a4,&b1,&b2,&b3,&b4)) < 8) continue; current->start = a1*360000+a2*6000+a3*100+a4/10; current->end = b1*360000+b2*6000+b3*100+b4/10; @@ -1123,7 +1123,7 @@ static int sub_autodetect (stream_t* st, {*uses_time=1;return SUB_MPL2;} if (sscanf (line, "%d:%d:%d.%d,%d:%d:%d.%d", &i, &i, &i, &i, &i, &i, &i, &i)==8) {*uses_time=1;return SUB_SUBRIP;} - if (sscanf (line, "%d:%d:%d%[,.:]%d --> %d:%d:%d%[,.:]%d", &i, &i, &i, (char *)&i, &i, &i, &i, &i, (char *)&i, &i)==10) + if (sscanf (line, "%d:%d:%d%*[,.:]%d --> %d:%d:%d%*[,.:]%d", &i, &i, &i, &i, &i, &i, &i, &i)==8) {*uses_time=1;return SUB_SUBVIEWER;} if (sscanf (line, "{T %d:%d:%d:%d",&i, &i, &i, &i)==4) {*uses_time=1;return SUB_SUBVIEWER2;}

1 0