summaryrefslogtreecommitdiffstats
path: root/libmenu/menu.c
Commit message (Collapse)AuthorAgeFilesLines
* libmenu: remove OSD menu functionality (--menu)Uoti Urpala2011-10-251-776/+0
| | | | | | | | | | Something like the OSD menu functionality could be useful. However the current implementation has several problems and would require a relatively large amount of work to get into good shape. As far as I know there are few users of the existing functionality. Nobody is working on the existing code and keeping it compiling at all while changing other code would require extra work. So delete the menu code and some related code elsewhere that's used by nothing else.
* options: change option parsing to use bstrUoti Urpala2011-07-291-1/+2
| | | | | | Using bstr allows simpler parsing code, especially because it avoids the need to modify or copy strings just to terminate extracted substrings.
* cleanup: remove warnings under libmenu/Clément Bœsch2011-06-241-0/+4
|
* input: move all key code lists to input/keycodes.hUoti Urpala2011-05-021-1/+1
| | | | | | | | | | | | | Move the definitions of all special key codes (those not passed by ASCII value) to input/keycodes.h. Before they were spread between osdep/keycodes.h, input/joystick.h, input/mouse.h and input/ar.h, plus some special values in input.h. This was especially inconvenient as the codes had to be coordinated to not conflict between the files. The change requires a bit of ugliness as appleir.c includes <linux/input.h> which contains various conflicting KEY_* definitions. Work around this by adding a special preprocessor variable which can be used to avoid defining these in keycodes.h.
* sub/OSD: move some related files to sub/Uoti Urpala2011-01-261-2/+2
|
* cleanup: remove NULL checks before free() all over the codecboesch2010-11-141-3/+3
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32624 b3059339-0415-0410-9bf9-f77b7e298cf2
* manu.c: Remove unused static function menu_text_get_next_linediego2010-11-021-18/+0
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31727 b3059339-0415-0410-9bf9-f77b7e298cf2
* Merge svn changes up to r31141Uoti Urpala2010-05-071-0/+3
|\
| * Add support for 12-bit color mode on framebuffer devices.cehoyos2010-05-061-0/+3
| | | | | | | | | | | | | | Patch Janusz Krzysztofik, jkrzyszt A tis icnet pl git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31139 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Delete things related to old translation systemUoti Urpala2010-03-101-1/+0
| | | | | | | | | | Remove the help/ subdirectory, configure code to create toplevel help_mp.h, and all the '#include "help_mp.h"' lines from .c files.
* | Merge svn changes up to r30643Uoti Urpala2010-03-101-2/+4
|\|
| * Mark some more functions that are not used outside of their files as static.diego2010-02-181-2/+4
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30632 b3059339-0415-0410-9bf9-f77b7e298cf2
| * whitespace cosmetics: Remove all trailing whitespace.diego2009-05-131-14/+14
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29305 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Remove trailing whitespace from most filesUoti Urpala2009-07-071-14/+14
| |
* | Translation system changes part 2: replace macros by stringsAmar Takhar2009-07-071-13/+13
| | | | | | | | | | Replace all MSGTR_ macros in the source by the corresponding English string.
* | Translation system changes part 1: wrap translated stringsAmar Takhar2009-07-071-13/+13
| | | | | | | | | | Replace mp_msg() calls which have a translated string as the format argument with mp_tmsg and add _() around all other translated strings.
* | Merge svn changes up to r28149Uoti Urpala2008-12-141-0/+17
|\|
| * Add standard GPL headers.diego2008-12-131-0/+17
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28147 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Make various functions staticUoti Urpala2008-08-121-2/+2
| |
* | Merge svn changes up to r27441Uoti Urpala2008-08-081-5/+5
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: cfg-common-opts.h command.c configure input/input.c libmpcodecs/dec_video.c libmpcodecs/vd.c libmpdemux/stheader.h libvo/sub.c libvo/video_out.c libvo/vo_xv.c libvo/vosub_vidix.c libvo/x11_common.c libvo/x11_common.h mp_core.h mplayer.c stream/stream.h
| * Rename font-related preprocessor directives.diego2008-08-071-4/+4
| | | | | | | | | | | | | | Switch them from a HAVE_ to a CONFIG_ prefix. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27425 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Change a bunch of video/audio-output-specific preprocessor directives fromdiego2008-08-031-1/+1
| | | | | | | | | | | | | | a HAVE_ prefix to a CONFIG_ prefix. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27402 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r27399Uoti Urpala2008-08-021-3/+3
|\| | | | | | | | | | | | | | | | | | | Conflicts: libmpcodecs/vd.c libmpcodecs/ve_raw.c libvo/video_out.c libvo/x11_common.c mplayer.c
| * Rename some preprocessor directives from CONFIG_* to HAVE_* where appropriate;diego2008-08-011-3/+3
| | | | | | | | | | | | | | CONFIG_ prefix for configurable options, HAVE_ for system-dependent stuff. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27391 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r27374Uoti Urpala2008-07-301-3/+3
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: cfg-common-opts.h cfg-mplayer.h command.c configure libmpcodecs/dec_video.c libmpcodecs/vd.c libmpcodecs/vf_vo.c libmpdemux/demuxer.h libmpdemux/stheader.h mp_core.h mplayer.c stream/stream_radio.c
| * Start unifying names of internal preprocessor directives.diego2008-07-301-3/+3
| | | | | | | | | | | | | | | | Replace all USE_ prefixes by CONFIG_ prefixes to indicate options which are configurable. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27373 b3059339-0415-0410-9bf9-f77b7e298cf2
* | input: Move cmd_queue to context structUoti Urpala2008-04-301-2/+6
| | | | | | | | Menu instances now also need a input context pointer to queue commands.
* | Move global mconfig to mpctxUoti Urpala2008-04-261-4/+10
|/ | | | | | | | | | | The global was used in the function cfg_include which handles the -include option. Make the address available in that function by creating a new dynamically allocated option in m_config_new that has the address in the option's private data. asxparser.c also used the global. Making it available through all ways the code could get called required a number of relatively straightforward changes to playtree and menu code.
* Remove pointless #ifdefs around extern declarations.diego2008-02-201-2/+0
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26039 b3059339-0415-0410-9bf9-f77b7e298cf2
* From now on, libmenu does not steal all input keys from input modules.ulion2007-12-261-3/+3
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25530 b3059339-0415-0410-9bf9-f77b7e298cf2
* OSD menu support mouse selection.ulion2007-12-221-0/+10
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25489 b3059339-0415-0410-9bf9-f77b7e298cf2
* Calculate and draw osd accurately.ulion2007-12-191-2/+7
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25462 b3059339-0415-0410-9bf9-f77b7e298cf2
* Fix the menu uninit function name.ulion2007-12-181-1/+1
| | | | | | | NOTE: Nobody call this function by now, should be fixed. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25448 b3059339-0415-0410-9bf9-f77b7e298cf2
* Fix indent for last commit.ulion2007-12-171-15/+15
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25437 b3059339-0415-0410-9bf9-f77b7e298cf2
* Ignore elements of keybindings other than 'binding'.ulion2007-12-171-0/+2
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25436 b3059339-0415-0410-9bf9-f77b7e298cf2
* Remove NO_REPEAT mask from keycode, fix keycode matching for JOY_BTN0, etc.ulion2007-12-171-0/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25435 b3059339-0415-0410-9bf9-f77b7e298cf2
* Display parsed keycode in verbose output.ulion2007-12-171-2/+2
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25434 b3059339-0415-0410-9bf9-f77b7e298cf2
* Support chapter in OSD menu.ulion2007-12-141-0/+2
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25392 b3059339-0415-0410-9bf9-f77b7e298cf2
* Fix memory leak. I thought asx_get_attrib() return a const char *,ulion2007-12-121-5/+9
| | | | | | | but indeed it return string by strdup. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25375 b3059339-0415-0410-9bf9-f77b7e298cf2
* Support to run multiple mplayer commands set in menu.confulion2007-12-111-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25348 b3059339-0415-0410-9bf9-f77b7e298cf2
* Remove hardcoded key->cmd bindings in libmenu, support custom key bindingsulion2007-12-041-20/+100
| | | | | | | by menu config file. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25291 b3059339-0415-0410-9bf9-f77b7e298cf2
* Add type info to menu_t, now we can get the menu name and the type name of menu.ulion2007-12-021-2/+3
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25236 b3059339-0415-0410-9bf9-f77b7e298cf2
* Warning fixes:ulion2007-11-051-8/+8
| | | | | | | | | | | | | | | menu.c:303: warning: passing argument 1 of 'utf8_get_char' from incompatible pointer type menu.c:370: warning: passing argument 1 of 'utf8_get_char' from incompatible pointer type menu.c:463: warning: passing argument 1 of 'utf8_get_char' from incompatible pointer type menu.c:537: warning: passing argument 1 of 'utf8_get_char' from incompatible pointer type menu.c:565: warning: passing argument 1 of 'utf8_get_char' from incompatible pointer type menu.c:577: warning: passing argument 1 of 'utf8_get_char' from incompatible pointer type menu.c:597: warning: passing argument 1 of 'utf8_get_char' from incompatible pointer type menu.c:612: warning: passing argument 1 of 'utf8_get_char' from incompatible pointer type git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24968 b3059339-0415-0410-9bf9-f77b7e298cf2
* get rid of -menu-utf8 and -menu-unicode once for all, patch by Guillaume Lecerfben2007-05-201-30/+9
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23355 b3059339-0415-0410-9bf9-f77b7e298cf2
* fix libmenu compilation with fridibi enabledben2007-05-071-3/+3
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23256 b3059339-0415-0410-9bf9-f77b7e298cf2
* cast to what's really expectedben2007-05-071-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23255 b3059339-0415-0410-9bf9-f77b7e298cf2
* use already existing function to get utf8 char in libmenu (thx to reimar)ben2007-05-071-8/+4
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23250 b3059339-0415-0410-9bf9-f77b7e298cf2
* used FFMAX macro as pointed out by reimarben2007-05-071-1/+2
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23249 b3059339-0415-0410-9bf9-f77b7e298cf2
* removed useless casts as pointed out by reimarben2007-05-071-6/+6
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23248 b3059339-0415-0410-9bf9-f77b7e298cf2
* support for hebrew through fribidi in libmenu (geexbox patch #580)ben2007-05-071-0/+56
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23246 b3059339-0415-0410-9bf9-f77b7e298cf2
* support for unicode/utf8 in libmenu (geexbox patch #545)ben2007-05-071-13/+36
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23245 b3059339-0415-0410-9bf9-f77b7e298cf2
* Fix menu to work with mpctxuau2007-02-211-1/+4
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22302 b3059339-0415-0410-9bf9-f77b7e298cf2
* fix gprof support (aka work around gprof's brain dead design)gpoirier2007-01-041-10/+10
| | | | | | | | | | | as stated here: http://sourceware.org/binutils/docs-2.17/gprof/Implementation.html mcount() is a symbol reserved by gprof to perform instrumentation, so we shouldn't declare a symbol that has this name Fixes issue discussed here: date: Jan 3, 2007 3:17 PM subject: [MPlayer-advusers] gcc, mplayer and profile (mcount) git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21815 b3059339-0415-0410-9bf9-f77b7e298cf2
* Fix possible crash: negative values may no be passed to render_one_glyphreimar2006-10-291-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20523 b3059339-0415-0410-9bf9-f77b7e298cf2
* Explicitly include libmpcodecs/img_format.h and libvo/fastmemcpy.h.diego2006-08-181-2/+2
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19437 b3059339-0415-0410-9bf9-f77b7e298cf2
* introduce new 'stream' directory for all stream layer related components and ↵ben2006-07-311-1/+1
| | | | | | split them from libmpdemux git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19277 b3059339-0415-0410-9bf9-f77b7e298cf2
* There is a draw_alpha for uyvy, use it.albeu2006-04-221-0/+2
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18195 b3059339-0415-0410-9bf9-f77b7e298cf2
* Fix menu background drawing.albeu2006-04-221-4/+8
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18194 b3059339-0415-0410-9bf9-f77b7e298cf2
* Part1 of several printf2mp_msg changes in patch from Otvos Attila oattila AT ↵reynaldo2006-03-301-11/+13
| | | | | | chello DOT hu git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17995 b3059339-0415-0410-9bf9-f77b7e298cf2
* Add a function to draw flat boxes and use it to make the listalbeu2006-03-301-0/+28
| | | | | | | | menu and console look much cooler. Idea take from Otvos Atilla's patches (oattila_At_chello--.--hu). git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17994 b3059339-0415-0410-9bf9-f77b7e298cf2
* Allow 6 ways (up/down/left/right/ok/cancel) navigation.albeu2006-03-251-0/+4
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17946 b3059339-0415-0410-9bf9-f77b7e298cf2
* Unify include paths, -I.. is in CFLAGS.diego2005-10-261-8/+8
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16863 b3059339-0415-0410-9bf9-f77b7e298cf2
* Finnaly commit Nico's dvb menu. Sorry for committing thisalbeu2003-08-161-0/+7
| | | | | | | months later :( git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@10627 b3059339-0415-0410-9bf9-f77b7e298cf2
* output typo fixes: unknow --> unknowndiego2003-07-091-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@10398 b3059339-0415-0410-9bf9-f77b7e298cf2
* linux->osdeparpi2003-02-091-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@9381 b3059339-0415-0410-9bf9-f77b7e298cf2
* Fixes a problem where the menu won't work, if you just use freetype fontsarpi2003-02-021-0/+2
| | | | | | | | and have no font.desc. patch by Andreas Hess <jaska@gmx.net> git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@9213 b3059339-0415-0410-9bf9-f77b7e298cf2
* mplayer crashes if one tries to use osd menu without having a fontarpi2003-01-261-2/+4
| | | | | | | | installed. The patch to menu.c is one way to fix that. patch by Björn Sandell <biorn@dce.chalmers.se> git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@9104 b3059339-0415-0410-9bf9-f77b7e298cf2
* This patch fixes the reading of the menu.conf, because stream_open()arpi2002-12-281-4/+8
| | | | | | | | isn't a good idea, it messes with dvd playback. Andreas Hess <jaska@gmx.net> git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8605 b3059339-0415-0410-9bf9-f77b7e298cf2
* better fix for my previous 10lcolin2002-11-221-1/+0