Mercurial > mplayer.hg
changeset 35762:6742a91ba28a
Cosmetic: Remove "Handle(r)" from function names.
author | ib |
---|---|
date | Thu, 24 Jan 2013 17:08:38 +0000 |
parents | fa2e5b53b2e3 |
children | ce6de800ee29 |
files | gui/interface.c gui/ui/actions.c gui/ui/main.c gui/ui/menu.c gui/ui/playbar.c gui/ui/ui.h gui/ui/video.c |
diffstat | 7 files changed, 27 insertions(+), 27 deletions(-) [+] |
line wrap: on
line diff
--- a/gui/interface.c Thu Jan 24 16:59:28 2013 +0000 +++ b/gui/interface.c Thu Jan 24 17:08:38 2013 +0000 @@ -193,14 +193,14 @@ mp_msg(MSGT_GPLAYER, MSGL_DBG2, "[interface] videoWindow ID: 0x%x\n", (int)guiApp.videoWindow.WindowID); guiApp.mainWindow.DrawHandler = uiMainDraw; - guiApp.mainWindow.MouseHandler = uiMainMouseHandle; - guiApp.mainWindow.KeyHandler = uiMainKeyHandle; - guiApp.mainWindow.DNDHandler = uiDNDHandler; + guiApp.mainWindow.MouseHandler = uiMainMouse; + guiApp.mainWindow.KeyHandler = uiMainKey; + guiApp.mainWindow.DNDHandler = uiDND; guiApp.videoWindow.DrawHandler = uiVideoDraw; - guiApp.videoWindow.MouseHandler = uiVideoMouseHandle; - guiApp.videoWindow.KeyHandler = uiMainKeyHandle; - guiApp.videoWindow.DNDHandler = uiDNDHandler; + guiApp.videoWindow.MouseHandler = uiVideoMouse; + guiApp.videoWindow.KeyHandler = uiMainKey; + guiApp.videoWindow.DNDHandler = uiDND; if (guiApp.video.Bitmap.Image) wsImageRender(&guiApp.videoWindow, guiApp.video.Bitmap.Image);
--- a/gui/ui/actions.c Thu Jan 24 16:59:28 2013 +0000 +++ b/gui/ui/actions.c Thu Jan 24 17:08:38 2013 +0000 @@ -226,9 +226,9 @@ wsWindowIcon(wsDisplay, guiApp.mainWindow.WindowID, &guiIcon); guiApp.mainWindow.DrawHandler = uiMainDraw; - guiApp.mainWindow.MouseHandler = uiMainMouseHandle; - guiApp.mainWindow.KeyHandler = uiMainKeyHandle; - guiApp.mainWindow.DNDHandler = uiDNDHandler; + guiApp.mainWindow.MouseHandler = uiMainMouse; + guiApp.mainWindow.KeyHandler = uiMainKey; + guiApp.mainWindow.DNDHandler = uiDND; wsXDNDMakeAwareness(&guiApp.mainWindow);
--- a/gui/ui/main.c Thu Jan 24 16:59:28 2013 +0000 +++ b/gui/ui/main.c Thu Jan 24 17:08:38 2013 +0000 @@ -419,7 +419,7 @@ } } -void uiMainMouseHandle( int Button,int X,int Y,int RX,int RY ) +void uiMainMouse( int Button,int X,int Y,int RX,int RY ) { static int itemtype = 0; int i; @@ -521,7 +521,7 @@ wsWindowMove( &guiApp.mainWindow,True,RX - abs( sx ),RY - abs( sy ) ); break; case itPRMButton: - uiMenuMouseHandle( RX,RY ); + uiMenuMouse( RX,RY ); break; case itPotmeter: item->value=(float)( X - item->x ) / item->width * 100.0f; @@ -541,7 +541,7 @@ } } -void uiMainKeyHandle( int KeyCode,int Type,int Key ) +void uiMainKey( int KeyCode,int Type,int Key ) { int msg = evNone; @@ -588,7 +588,7 @@ } /* this will be used to handle drag & drop files */ -void uiDNDHandler(int num,char** files) +void uiDND(int num,char** files) { struct stat buf; int f = 0;
--- a/gui/ui/menu.c Thu Jan 24 16:59:28 2013 +0000 +++ b/gui/ui/menu.c Thu Jan 24 17:08:38 2013 +0000 @@ -70,7 +70,7 @@ wsImageDraw( &guiApp.menuWindow ); } -void uiMenuMouseHandle( int RX,int RY ) +void uiMenuMouse( int RX,int RY ) { int x,y,i; @@ -168,7 +168,7 @@ menuIsInitialized=True; guiApp.menuWindow.DrawHandler=uiMenuDraw; -// guiApp.menuWindow.MouseHandler=uiMenuMouseHandle; -// guiApp.menuWindow.KeyHandler=uiMainKeyHandle; +// guiApp.menuWindow.MouseHandler=uiMenuMouse; +// guiApp.menuWindow.KeyHandler=uiMainKey; uiMenuRender=True; wsWindowRedraw( &guiApp.menuWindow ); }
--- a/gui/ui/playbar.c Thu Jan 24 16:59:28 2013 +0000 +++ b/gui/ui/playbar.c Thu Jan 24 17:08:38 2013 +0000 @@ -115,7 +115,7 @@ wsImageDraw( &guiApp.playbarWindow ); } -static void uiPlaybarMouseHandle( int Button, int X, int Y, int RX, int RY ) +static void uiPlaybarMouse( int Button, int X, int Y, int RX, int RY ) { static int itemtype = 0; int i; @@ -211,7 +211,7 @@ switch ( itemtype ) { case itPRMButton: - uiMenuMouseHandle( RX,RY ); + uiMenuMouse( RX,RY ); break; case itPotmeter: item->value=(float)( X - item->x ) / item->width * 100.0f; @@ -264,8 +264,8 @@ wsWindowShape( &guiApp.playbarWindow,guiApp.playbar.Mask.Image ); guiApp.playbarWindow.DrawHandler=uiPlaybarDraw; - guiApp.playbarWindow.MouseHandler=uiPlaybarMouseHandle; - guiApp.playbarWindow.KeyHandler=uiMainKeyHandle; + guiApp.playbarWindow.MouseHandler=uiPlaybarMouse; + guiApp.playbarWindow.KeyHandler=uiMainKey; playbarLength=guiApp.videoWindow.Height; }
--- a/gui/ui/ui.h Thu Jan 24 16:59:28 2013 +0000 +++ b/gui/ui/ui.h Thu Jan 24 17:08:38 2013 +0000 @@ -32,17 +32,17 @@ void uiMainDraw( void ); void uiEventHandling( int msg, float param ); -void uiMainMouseHandle( int Button, int X, int Y, int RX, int RY ); -void uiMainKeyHandle( int KeyCode, int Type, int Key ); -void uiDNDHandler(int num, char** files); +void uiMainMouse( int Button, int X, int Y, int RX, int RY ); +void uiMainKey( int KeyCode, int Type, int Key ); +void uiDND(int num, char** files); void uiVideoDraw( void ); -void uiVideoMouseHandle( int Button, int X, int Y, int RX, int RY ); +void uiVideoMouse( int Button, int X, int Y, int RX, int RY ); void uiMenuInit( void ); void uiHideMenu( int mx, int my, int w ); void uiShowMenu( int mx, int my ); -void uiMenuMouseHandle( int RX, int RY ); +void uiMenuMouse( int RX, int RY ); void uiPlaybarInit( void ); void uiPlaybarShow( int y );
--- a/gui/ui/video.c Thu Jan 24 16:59:28 2013 +0000 +++ b/gui/ui/video.c Thu Jan 24 17:08:38 2013 +0000 @@ -50,7 +50,7 @@ } } -void uiVideoMouseHandle( int Button,int X,int Y,int RX,int RY ) +void uiVideoMouse( int Button,int X,int Y,int RX,int RY ) { static int mplVideoMoved = 0; static int msButton = 0; @@ -89,7 +89,7 @@ } break; case wsPMMouseButton: - uiMenuMouseHandle( RX,RY ); + uiMenuMouse( RX,RY ); break; default: uiPlaybarShow( Y ); break; }