March 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

r36097 - trunk/gui/dialog/preferences.c
by ib 03 May '13

03 May '13

Author: ib Date: Fri Mar 29 18:28:44 2013 New Revision: 36097 Log: Remove HidePreferences(), HideAudioConfig() and HideDXR3Config(). Simply destroy the windows. (It's pointless to check whether the window is existing, because it cannot be called without an existing window.) In order to do so, relocate definition of AudioConfig. Additionally, remove unnecessary declarations. Modified: trunk/gui/dialog/preferences.c Modified: trunk/gui/dialog/preferences.c ============================================================================== --- trunk/gui/dialog/preferences.c Fri Mar 29 18:23:47 2013 (r36096) +++ trunk/gui/dialog/preferences.c Fri Mar 29 18:28:44 2013 (r36097) @@ -186,10 +186,10 @@ static char * ao_driver[3]; static char * vo_driver[3]; static int old_video_driver = 0; +static GtkWidget *AudioConfig; + void ShowDXR3Config( void ); - void HideDXR3Config( void ); void ShowAudioConfig( void ); - void HideAudioConfig( void ); static gboolean prHScaler( GtkWidget * widget,GdkEvent * event,gpointer user_data ); static void prToggled( GtkToggleButton * togglebutton,gpointer user_data ); @@ -198,18 +198,6 @@ static void prCListRow( GtkCList * clist static void prEntry( GtkEditable * editable,gpointer user_data ); #endif -static void HidePreferences( void ) -{ - if ( !Preferences ) return; - gtk_widget_hide( Preferences ); - gtk_widget_destroy( Preferences ); - Preferences=NULL; - HideAudioConfig(); -#ifdef CONFIG_DXR3 - HideDXR3Config(); -#endif -} - #if defined(CONFIG_FREETYPE) || defined(CONFIG_ICONV) static void prEntry( GtkEditable * editable,gpointer user_data ) { @@ -352,7 +340,20 @@ static void prButton( GtkButton * button setdup( &cdrom_device,gtk_entry_get_text( GTK_ENTRY( prECDRomDevice ) ) ); case bCancel: - HidePreferences(); + gtk_widget_destroy( Preferences ); + Preferences=NULL; + if ( AudioConfig ) + { + gtk_widget_destroy( AudioConfig ); + AudioConfig=NULL; + } +#ifdef CONFIG_DXR3 + if ( DXR3Config ) + { + gtk_widget_destroy( DXR3Config ); + DXR3Config=NULL; + } +#endif break; case bAConfig: if ( !ao_driver[0] ) break; @@ -1497,7 +1498,6 @@ static void setGtkEntryText(GtkWidget *d } #endif -static GtkWidget *AudioConfig; static GtkWidget *CEAudioDevice; static GtkWidget *CBAudioDevice; static GtkWidget *CEAudioMixer; @@ -1507,13 +1507,6 @@ static GtkWidget *CBAudioMixerChannel; static GtkWidget *BAudioOk; static GtkWidget *BAudioCancel; -void HideAudioConfig( void ) { - if (!AudioConfig) return; - gtk_widget_hide(AudioConfig); - gtk_widget_destroy(AudioConfig); - AudioConfig=NULL; -} - static void audioButton(GtkButton *button, gpointer user_data) { switch( (int)user_data ) { case 1: @@ -1550,7 +1543,8 @@ static void audioButton(GtkButton *butto } #endif case 0: - HideAudioConfig(); + gtk_widget_destroy(AudioConfig); + AudioConfig=NULL; break; } } @@ -1734,14 +1728,6 @@ void ShowDXR3Config( void ) gtkSetLayer( DXR3Config ); } -void HideDXR3Config( void ) -{ - if ( !DXR3Config ) return; - gtk_widget_hide( DXR3Config ); - gtk_widget_destroy( DXR3Config ); - DXR3Config=NULL; -} - static void dxr3Button( GtkButton * button,gpointer user_data ) { switch ( (int)user_data ) @@ -1750,7 +1736,8 @@ static void dxr3Button( GtkButton * butt nfree( gtkDXR3Device ); gtkDXR3Device=strdup( gtk_entry_get_text( GTK_ENTRY( CEDXR3Device ) ) ); gtkVfLAVC=gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON( RBVLavc ) ); case 1: // Cancel - HideDXR3Config(); + gtk_widget_destroy( DXR3Config ); + DXR3Config=NULL; break; } }

3 2

r36126 - in trunk/gui: app/cfg.c dialog/fileselect.c dialog/url.c interface.c interface.h skin/font.c skin/skin.c ui/actions.c ui/render.c util/bitmap.c util/string.c wm/ws.c
by ib 31 Mar '13

31 Mar '13

Author: ib Date: Mon Apr 1 01:09:34 2013 New Revision: 36126 Log: Cosmetic: Rearrange #includes. Modified: trunk/gui/app/cfg.c trunk/gui/dialog/fileselect.c trunk/gui/dialog/url.c trunk/gui/interface.c trunk/gui/interface.h trunk/gui/skin/font.c trunk/gui/skin/skin.c trunk/gui/ui/actions.c trunk/gui/ui/render.c trunk/gui/util/bitmap.c trunk/gui/util/string.c trunk/gui/wm/ws.c Modified: trunk/gui/app/cfg.c ============================================================================== --- trunk/gui/app/cfg.c Mon Apr 1 00:45:25 2013 (r36125) +++ trunk/gui/app/cfg.c Mon Apr 1 01:09:34 2013 (r36126) @@ -28,11 +28,6 @@ #include "config.h" #include "help_mp.h" -#include "libavutil/common.h" -#include "libmpcodecs/vd.h" -#include "libmpdemux/demuxer.h" -#include "libvo/video_out.h" -#include "libvo/x11_common.h" #include "mixer.h" #include "mp_core.h" #include "mp_msg.h" @@ -40,6 +35,11 @@ #include "mplayer.h" #include "parser-cfg.h" #include "path.h" +#include "libavutil/common.h" +#include "libmpcodecs/vd.h" +#include "libmpdemux/demuxer.h" +#include "libvo/video_out.h" +#include "libvo/x11_common.h" #include "stream/stream.h" #include "sub/ass_mp.h" #include "sub/font_load.h" Modified: trunk/gui/dialog/fileselect.c ============================================================================== --- trunk/gui/dialog/fileselect.c Mon Apr 1 00:45:25 2013 (r36125) +++ trunk/gui/dialog/fileselect.c Mon Apr 1 01:09:34 2013 (r36126) @@ -20,8 +20,8 @@ #include <stdlib.h> #include <string.h> #include <strings.h> -#include <sys/stat.h> #include <unistd.h> +#include <sys/stat.h> #include "fileselect.h" #include "dialog.h" @@ -30,10 +30,10 @@ #include "pixmaps/dir.xpm" #include "pixmaps/file.xpm" #include "pixmaps/up.xpm" +#include "gui/interface.h" #include "gui/app/app.h" #include "gui/app/cfg.h" #include "gui/app/gui.h" -#include "gui/interface.h" #include "gui/ui/actions.h" #include "gui/util/list.h" #include "gui/util/mem.h" @@ -44,8 +44,8 @@ #include "config.h" #include "help_mp.h" -#include "libavutil/common.h" #include "mpcommon.h" +#include "libavutil/common.h" #include "stream/stream.h" #ifdef __linux__ Modified: trunk/gui/dialog/url.c ============================================================================== --- trunk/gui/dialog/url.c Mon Apr 1 00:45:25 2013 (r36125) +++ trunk/gui/dialog/url.c Mon Apr 1 01:09:34 2013 (r36126) @@ -23,8 +23,8 @@ #include "url.h" #include "dialog.h" #include "tools.h" -#include "gui/app/app.h" #include "gui/interface.h" +#include "gui/app/app.h" #include "gui/ui/actions.h" #include "gui/util/list.h" #include "gui/util/string.h" Modified: trunk/gui/interface.c ============================================================================== --- trunk/gui/interface.c Mon Apr 1 00:45:25 2013 (r36125) +++ trunk/gui/interface.c Mon Apr 1 01:09:34 2013 (r36126) @@ -38,6 +38,11 @@ #include "codec-cfg.h" #include "config.h" #include "help_mp.h" +#include "mixer.h" +#include "mp_msg.h" +#include "mpcommon.h" +#include "mplayer.h" +#include "path.h" #include "input/input.h" #include "libaf/equalizer.h" #include "libavutil/common.h" @@ -47,11 +52,6 @@ #include "libmpcodecs/vf.h" #include "libvo/video_out.h" #include "libvo/x11_common.h" -#include "mixer.h" -#include "mp_msg.h" -#include "mpcommon.h" -#include "mplayer.h" -#include "path.h" #ifdef CONFIG_DVDREAD #include "stream/stream_dvd.h" #endif Modified: trunk/gui/interface.h ============================================================================== --- trunk/gui/interface.h Mon Apr 1 00:45:25 2013 (r36125) +++ trunk/gui/interface.h Mon Apr 1 01:09:34 2013 (r36126) @@ -19,11 +19,11 @@ #ifndef MPLAYER_GUI_INTERFACE_H #define MPLAYER_GUI_INTERFACE_H -#include "libaf/af.h" -#include "libmpdemux/stheader.h" #include "m_config.h" #include "mp_core.h" #include "playtree.h" +#include "libaf/af.h" +#include "libmpdemux/stheader.h" #include "stream/stream.h" // These are in support of the non-GUI files that interact with Modified: trunk/gui/skin/font.c ============================================================================== --- trunk/gui/skin/font.c Mon Apr 1 00:45:25 2013 (r36125) +++ trunk/gui/skin/font.c Mon Apr 1 01:09:34 2013 (r36126) @@ -32,8 +32,8 @@ #include "gui/util/mem.h" #include "gui/util/string.h" -#include "libavutil/avstring.h" #include "mp_msg.h" +#include "libavutil/avstring.h" #define MAX_FONTS 25 Modified: trunk/gui/skin/skin.c ============================================================================== --- trunk/gui/skin/skin.c Mon Apr 1 00:45:25 2013 (r36125) +++ trunk/gui/skin/skin.c Mon Apr 1 01:09:34 2013 (r36126) @@ -26,17 +26,17 @@ #include "skin.h" #include "font.h" +#include "gui/interface.h" #include "gui/app/app.h" #include "gui/app/gui.h" #include "gui/dialog/dialog.h" -#include "gui/interface.h" #include "gui/util/cut.h" #include "gui/util/string.h" #include "help_mp.h" +#include "mp_msg.h" #include "libavutil/avstring.h" #include "libavutil/common.h" -#include "mp_msg.h" typedef struct { const char *name; Modified: trunk/gui/ui/actions.c ============================================================================== --- trunk/gui/ui/actions.c Mon Apr 1 00:45:25 2013 (r36125) +++ trunk/gui/ui/actions.c Mon Apr 1 01:09:34 2013 (r36126) @@ -26,11 +26,11 @@ #include "actions.h" #include "ui.h" +#include "gui/interface.h" #include "gui/app/app.h" #include "gui/app/cfg.h" #include "gui/app/gui.h" #include "gui/dialog/dialog.h" -#include "gui/interface.h" #include "gui/skin/skin.h" #include "gui/util/list.h" #include "gui/util/mem.h" @@ -41,18 +41,18 @@ #include "access_mpcontext.h" #include "config.h" #include "help_mp.h" -#include "input/input.h" -#include "libmpcodecs/vd.h" -#include "libmpdemux/demuxer.h" -#include "libvo/video_out.h" -#include "libvo/wskeys.h" -#include "libvo/x11_common.h" #include "m_property.h" #include "mixer.h" #include "mp_core.h" #include "mp_msg.h" #include "mpcommon.h" #include "mplayer.h" +#include "input/input.h" +#include "libmpcodecs/vd.h" +#include "libmpdemux/demuxer.h" +#include "libvo/video_out.h" +#include "libvo/wskeys.h" +#include "libvo/x11_common.h" #include "osdep/timer.h" #include "stream/stream.h" #include "sub/sub.h" Modified: trunk/gui/ui/render.c ============================================================================== --- trunk/gui/ui/render.c Mon Apr 1 00:45:25 2013 (r36125) +++ trunk/gui/ui/render.c Mon Apr 1 01:09:34 2013 (r36126) @@ -27,8 +27,8 @@ #include "gui/util/string.h" #include "access_mpcontext.h" -#include "libavutil/avstring.h" #include "mixer.h" +#include "libavutil/avstring.h" #include "osdep/timer.h" #include "stream/stream.h" Modified: trunk/gui/util/bitmap.c ============================================================================== --- trunk/gui/util/bitmap.c Mon Apr 1 00:45:25 2013 (r36125) +++ trunk/gui/util/bitmap.c Mon Apr 1 01:09:34 2013 (r36126) @@ -30,11 +30,11 @@ #include "gui/app/gui.h" #include "help_mp.h" +#include "mp_msg.h" #include "libavcodec/avcodec.h" #include "libavutil/common.h" #include "libavutil/intreadwrite.h" #include "libvo/fastmemcpy.h" -#include "mp_msg.h" /** * @brief Check whether a (PNG) file exists. Modified: trunk/gui/util/string.c ============================================================================== --- trunk/gui/util/string.c Mon Apr 1 00:45:25 2013 (r36125) +++ trunk/gui/util/string.c Mon Apr 1 01:09:34 2013 (r36126) @@ -25,8 +25,8 @@ #include <string.h> #include "string.h" -#include "gui/app/gui.h" #include "gui/interface.h" +#include "gui/app/gui.h" #include "config.h" #include "help_mp.h" Modified: trunk/gui/wm/ws.c ============================================================================== --- trunk/gui/wm/ws.c Mon Apr 1 00:45:25 2013 (r36125) +++ trunk/gui/wm/ws.c Mon Apr 1 01:09:34 2013 (r36126) @@ -31,15 +31,15 @@ #include "config.h" #include "help_mp.h" +#include "mp_core.h" +#include "mp_msg.h" +#include "mpbswap.h" +#include "mplayer.h" #include "libavutil/imgutils.h" #include "libavutil/pixfmt.h" #include "libswscale/swscale.h" #include "libvo/video_out.h" #include "libvo/x11_common.h" -#include "mpbswap.h" -#include "mplayer.h" -#include "mp_core.h" -#include "mp_msg.h" #include "osdep/timer.h" #ifdef HAVE_SHM

1 0

r36125 - in trunk/gui/dialog: dialog.c dialog.h msgbox.c msgbox.h
by ib 31 Mar '13

31 Mar '13

Author: ib Date: Mon Apr 1 00:45:25 2013 New Revision: 36125 Log: Move variable declarations and definitions where they belong. Modified: trunk/gui/dialog/dialog.c trunk/gui/dialog/dialog.h trunk/gui/dialog/msgbox.c trunk/gui/dialog/msgbox.h Modified: trunk/gui/dialog/dialog.c ============================================================================== --- trunk/gui/dialog/dialog.c Mon Apr 1 00:41:03 2013 (r36124) +++ trunk/gui/dialog/dialog.c Mon Apr 1 00:45:25 2013 (r36125) @@ -51,9 +51,6 @@ static GtkWidget *PopUpMenu; -GtkWidget *WarningPixmap; -GtkWidget *ErrorPixmap; - static int gtkInitialized; #include "skinbrowser.h" Modified: trunk/gui/dialog/dialog.h ============================================================================== --- trunk/gui/dialog/dialog.h Mon Apr 1 00:41:03 2013 (r36124) +++ trunk/gui/dialog/dialog.h Mon Apr 1 00:45:25 2013 (r36125) @@ -28,11 +28,6 @@ #define GTK_MB_ERROR 4 #define GTK_MB_WARNING 8 -extern GtkWidget *WarningPixmap; -extern GtkWidget *ErrorPixmap; - -extern GtkWidget *gtkMessageBoxText; - typedef struct { Pixmap small; Pixmap small_mask; Modified: trunk/gui/dialog/msgbox.c ============================================================================== --- trunk/gui/dialog/msgbox.c Mon Apr 1 00:41:03 2013 (r36124) +++ trunk/gui/dialog/msgbox.c Mon Apr 1 00:45:25 2013 (r36125) @@ -30,6 +30,8 @@ GtkWidget * gtkMessageBoxText; GtkWidget * MessageBox = NULL; +GtkWidget * WarningPixmap; +GtkWidget * ErrorPixmap; static void on_Ok_released( GtkButton * button,gpointer user_data ) { Modified: trunk/gui/dialog/msgbox.h ============================================================================== --- trunk/gui/dialog/msgbox.h Mon Apr 1 00:41:03 2013 (r36124) +++ trunk/gui/dialog/msgbox.h Mon Apr 1 00:45:25 2013 (r36125) @@ -22,6 +22,9 @@ #include <gtk/gtk.h> extern GtkWidget * MessageBox; +extern GtkWidget * WarningPixmap; +extern GtkWidget * ErrorPixmap; +extern GtkWidget * gtkMessageBoxText; void ShowMessageBox( const char * msg );

1 0

r36124 - in trunk/gui/dialog: dialog.h skinbrowser.h
by ib 31 Mar '13

31 Mar '13

Author: ib Date: Mon Apr 1 00:41:03 2013 New Revision: 36124 Log: Move variable declarations where they belong. Modified: trunk/gui/dialog/dialog.h trunk/gui/dialog/skinbrowser.h Modified: trunk/gui/dialog/dialog.h ============================================================================== --- trunk/gui/dialog/dialog.h Mon Apr 1 00:36:42 2013 (r36123) +++ trunk/gui/dialog/dialog.h Mon Apr 1 00:41:03 2013 (r36124) @@ -31,12 +31,8 @@ extern GtkWidget *WarningPixmap; extern GtkWidget *ErrorPixmap; -extern GtkWidget *SkinList; extern GtkWidget *gtkMessageBoxText; -extern char *sbMPlayerDirInHome; -extern char *sbMPlayerPrefixDir; - typedef struct { Pixmap small; Pixmap small_mask; Modified: trunk/gui/dialog/skinbrowser.h ============================================================================== --- trunk/gui/dialog/skinbrowser.h Mon Apr 1 00:36:42 2013 (r36123) +++ trunk/gui/dialog/skinbrowser.h Mon Apr 1 00:41:03 2013 (r36124) @@ -23,6 +23,9 @@ extern char * sbSelectedSkin; extern GtkWidget * SkinBrowser; +extern GtkWidget *SkinList; +extern char *sbMPlayerDirInHome; +extern char *sbMPlayerPrefixDir; void ShowSkinBrowser( void );

1 0

r36123 - in trunk/gui/dialog: dialog.c dialog.h menu.c menu.h
by ib 31 Mar '13

31 Mar '13

Author: ib Date: Mon Apr 1 00:36:42 2013 New Revision: 36123 Log: Move variable declarations and definitions where they belong. Modified: trunk/gui/dialog/dialog.c trunk/gui/dialog/dialog.h trunk/gui/dialog/menu.c trunk/gui/dialog/menu.h Modified: trunk/gui/dialog/dialog.c ============================================================================== --- trunk/gui/dialog/dialog.c Mon Apr 1 00:28:22 2013 (r36122) +++ trunk/gui/dialog/dialog.c Mon Apr 1 00:36:42 2013 (r36123) @@ -54,8 +54,6 @@ static GtkWidget *PopUpMenu; GtkWidget *WarningPixmap; GtkWidget *ErrorPixmap; -int gtkPopupMenu; -int gtkPopupMenuParam; static int gtkInitialized; #include "skinbrowser.h" Modified: trunk/gui/dialog/dialog.h ============================================================================== --- trunk/gui/dialog/dialog.h Mon Apr 1 00:28:22 2013 (r36122) +++ trunk/gui/dialog/dialog.h Mon Apr 1 00:36:42 2013 (r36123) @@ -34,9 +34,6 @@ extern GtkWidget *ErrorPixmap; extern GtkWidget *SkinList; extern GtkWidget *gtkMessageBoxText; -extern int gtkPopupMenu; -extern int gtkPopupMenuParam; - extern char *sbMPlayerDirInHome; extern char *sbMPlayerPrefixDir; Modified: trunk/gui/dialog/menu.c ============================================================================== --- trunk/gui/dialog/menu.c Mon Apr 1 00:28:22 2013 (r36122) +++ trunk/gui/dialog/menu.c Mon Apr 1 00:36:42 2013 (r36123) @@ -86,6 +86,9 @@ #endif #include "pixmaps/empty1px.xpm" +int gtkPopupMenu; +int gtkPopupMenuParam; + static void ActivateMenuItem( int Item ) { // fprintf( stderr,"[menu] item: %d.%d\n",Item&0xffff,Item>>16 ); Modified: trunk/gui/dialog/menu.h ============================================================================== --- trunk/gui/dialog/menu.h Mon Apr 1 00:28:22 2013 (r36122) +++ trunk/gui/dialog/menu.h Mon Apr 1 00:36:42 2013 (r36123) @@ -21,6 +21,9 @@ #include <gtk/gtk.h> +extern int gtkPopupMenu; +extern int gtkPopupMenuParam; + GtkWidget * AddMenuItem( GtkWidget *window1, const char * immagine_xpm, GtkWidget * SubMenu, const char * label, int Number ); GtkWidget * AddSubMenu( GtkWidget *window1, const char * immagine_xpm, GtkWidget * Menu, const char * label ); GtkWidget * AddSeparator( GtkWidget * Menu );

1 0

r36122 - in trunk/gui/dialog: menu.c menu.h
by ib 31 Mar '13

31 Mar '13

Author: ib Date: Mon Apr 1 00:28:22 2013 New Revision: 36122 Log: Make variable DVDSubMenu static. It only has file scope and doesn't need to be declared extern. Modified: trunk/gui/dialog/menu.c trunk/gui/dialog/menu.h Modified: trunk/gui/dialog/menu.c ============================================================================== --- trunk/gui/dialog/menu.c Mon Apr 1 00:22:08 2013 (r36121) +++ trunk/gui/dialog/menu.c Mon Apr 1 00:28:22 2013 (r36122) @@ -402,7 +402,7 @@ static const char * GetLanguage( int lan #endif -GtkWidget * DVDSubMenu; +static GtkWidget * DVDSubMenu; GtkWidget * DVDTitleMenu; GtkWidget * DVDChapterMenu; GtkWidget * DVDAudioLanguageMenu; Modified: trunk/gui/dialog/menu.h ============================================================================== --- trunk/gui/dialog/menu.h Mon Apr 1 00:22:08 2013 (r36121) +++ trunk/gui/dialog/menu.h Mon Apr 1 00:28:22 2013 (r36122) @@ -21,8 +21,6 @@ #include <gtk/gtk.h> -extern GtkWidget * DVDSubMenu; - GtkWidget * AddMenuItem( GtkWidget *window1, const char * immagine_xpm, GtkWidget * SubMenu, const char * label, int Number ); GtkWidget * AddSubMenu( GtkWidget *window1, const char * immagine_xpm, GtkWidget * Menu, const char * label ); GtkWidget * AddSeparator( GtkWidget * Menu );

1 0

r36121 - trunk/gui/dialog/dialog.h
by ib 31 Mar '13

31 Mar '13

Author: ib Date: Mon Apr 1 00:22:08 2013 New Revision: 36121 Log: Remove unused declaration. Modified: trunk/gui/dialog/dialog.h Modified: trunk/gui/dialog/dialog.h ============================================================================== --- trunk/gui/dialog/dialog.h Mon Apr 1 00:13:32 2013 (r36120) +++ trunk/gui/dialog/dialog.h Mon Apr 1 00:22:08 2013 (r36121) @@ -28,8 +28,6 @@ #define GTK_MB_ERROR 4 #define GTK_MB_WARNING 8 -extern GtkWidget *Options; - extern GtkWidget *WarningPixmap; extern GtkWidget *ErrorPixmap;

1 0

r36120 - in trunk/gui: dialog/dialog.h dialog/playlist.c dialog/preferences.c dialog/skinbrowser.c wm/ws.c
by ib 31 Mar '13

31 Mar '13

Author: ib Date: Mon Apr 1 00:13:32 2013 New Revision: 36120 Log: Remove unnecessary #includes. Put #includes where they are needed. Modified: trunk/gui/dialog/dialog.h trunk/gui/dialog/playlist.c trunk/gui/dialog/preferences.c trunk/gui/dialog/skinbrowser.c trunk/gui/wm/ws.c Modified: trunk/gui/dialog/dialog.h ============================================================================== --- trunk/gui/dialog/dialog.h Sun Mar 31 23:58:33 2013 (r36119) +++ trunk/gui/dialog/dialog.h Mon Apr 1 00:13:32 2013 (r36120) @@ -19,16 +19,8 @@ #ifndef MPLAYER_GUI_DIALOG_H #define MPLAYER_GUI_DIALOG_H -#include <stdio.h> -#include <stdlib.h> -#include <gdk/gdkkeysyms.h> #include <gtk/gtk.h> #include <X11/Xlib.h> -#include <X11/Xproto.h> - -#include "osdep/shmem.h" -#include "gui/ui/actions.h" -#include "mplayer.h" #define GTK_MB_SIMPLE 0 #define GTK_MB_MODAL 1 Modified: trunk/gui/dialog/playlist.c ============================================================================== --- trunk/gui/dialog/playlist.c Sun Mar 31 23:58:33 2013 (r36119) +++ trunk/gui/dialog/playlist.c Mon Apr 1 00:13:32 2013 (r36120) @@ -34,6 +34,7 @@ #include "gui/app/gui.h" #include "gui/interface.h" #include "dialog.h" +#include "gui/ui/actions.h" #include "gui/util/list.h" #include "gui/util/mem.h" #include "gui/util/string.h" Modified: trunk/gui/dialog/preferences.c ============================================================================== --- trunk/gui/dialog/preferences.c Sun Mar 31 23:58:33 2013 (r36119) +++ trunk/gui/dialog/preferences.c Mon Apr 1 00:13:32 2013 (r36120) @@ -30,6 +30,7 @@ #include "help_mp.h" #include "mixer.h" #include "mpcommon.h" +#include "mplayer.h" #include "libao2/audio_out.h" #include "sub/sub.h" #include "libvo/video_out.h" Modified: trunk/gui/dialog/skinbrowser.c ============================================================================== --- trunk/gui/dialog/skinbrowser.c Sun Mar 31 23:58:33 2013 (r36119) +++ trunk/gui/dialog/skinbrowser.c Mon Apr 1 00:13:32 2013 (r36120) @@ -29,6 +29,7 @@ #include "gui/app/app.h" #include "gui/app/cfg.h" #include "gui/app/gui.h" +#include "gui/ui/actions.h" #include "gui/skin/skin.h" #include "help_mp.h" Modified: trunk/gui/wm/ws.c ============================================================================== --- trunk/gui/wm/ws.c Sun Mar 31 23:58:33 2013 (r36119) +++ trunk/gui/wm/ws.c Mon Apr 1 00:13:32 2013 (r36120) @@ -37,6 +37,7 @@ #include "libvo/video_out.h" #include "libvo/x11_common.h" #include "mpbswap.h" +#include "mplayer.h" #include "mp_core.h" #include "mp_msg.h" #include "osdep/timer.h"

1 0

r36119 - trunk/gui/dialog/dialog.h
by ib 31 Mar '13

31 Mar '13

Author: ib Date: Sun Mar 31 23:58:33 2013 New Revision: 36119 Log: Remove unused declaration. Modified: trunk/gui/dialog/dialog.h Modified: trunk/gui/dialog/dialog.h ============================================================================== --- trunk/gui/dialog/dialog.h Sun Mar 31 20:30:30 2013 (r36118) +++ trunk/gui/dialog/dialog.h Sun Mar 31 23:58:33 2013 (r36119) @@ -61,8 +61,6 @@ typedef struct { extern guiIcon_t guiIcon; -void widgetsCreate(void); - void gtkInit(char *display_name); void gtkAddIcon(GtkWidget *window);

1 0