diff options
| author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2010-03-10 01:25:15 +0200 |
|---|---|---|
| committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2010-03-10 01:25:15 +0200 |
| commit | acdce0176ae3722ad38a23aae0cf0bf03a82f9c4 (patch) | |
| tree | 57a30f1d44ea193586d5723faac7ffb96a3a73aa /osdep/getch2.h | |
| parent | ef3ef5e218588b5f68b427729a3c2c1a8083e499 (diff) | |
| parent | 5a2289137f43501281dba83fe98b5f67be63f9ef (diff) | |
| download | mpv-acdce0176ae3722ad38a23aae0cf0bf03a82f9c4.tar.bz2 mpv-acdce0176ae3722ad38a23aae0cf0bf03a82f9c4.tar.xz | |
Merge svn changes up to r30732
Diffstat (limited to 'osdep/getch2.h')
| -rw-r--r-- | osdep/getch2.h | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/osdep/getch2.h b/osdep/getch2.h index 1156aedf7a..7ee40d9e98 100644 --- a/osdep/getch2.h +++ b/osdep/getch2.h @@ -24,6 +24,8 @@ #ifndef MPLAYER_GETCH2_H #define MPLAYER_GETCH2_H +#include "config.h" + /* Screen size. Initialized by load_termcap() and get_screen_size() */ extern int screen_width; extern int screen_height; @@ -45,10 +47,20 @@ void getch2_disable(void); struct mp_fifo; void getch2(struct mp_fifo *fifo); -/* slave cmd function for Windows and OS/2 */ -int mp_input_slave_cmd_func(int fd,char* dest,int size); +#ifdef CONFIG_ICONV +/** + * \brief gets the name of the system's terminal character set + * \return a malloced string indicating the system charset + * + * Be warned that this function on many systems is in no way thread-safe + * since it modifies global data + */ +char *get_term_charset(void); +#endif #if defined(__MINGW32__) || defined(__OS2__) +/* slave cmd function for Windows and OS/2 */ +int mp_input_slave_cmd_func(int fd,char* dest,int size); #define USE_SELECT 0 #define MP_INPUT_SLAVE_CMD_FUNC mp_input_slave_cmd_func #else |