mirror/mpv
0
0
Fork 0
mirror of https://github.com/mpv-player/mpv.git synced 2024-09-20 20:03:10 +02:00
Code

fix mwm bug's. faszom (C), and remove mixer.*

Browse Source 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@1861 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
pontscho 2001-09-06 09:36:48 +00:00
parent 2b15d7ecc1
commit d2f5c270fd
6 changed files with 26 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Gui/error.c
View File

@ -5,7 +5,7 @@
#include "error.h"
int debug_level = 6;
int debug_level = 2;
FILE * debug_file;
int debug_stderr = 0;

2
Gui/gui.mak
View File

@ -3,7 +3,7 @@ SKINSRC = skin/skin.c skin/font.c skin/cut.c
SKINOBJ = skin/skin.o skin/font.o skin/cut.o
MPLAYERSRCS = $(MPLAYERDIR)mplayer.c $(MPLAYERDIR)widgets.c $(MPLAYERDIR)play.c \
$(MPLAYERDIR)psignal.c $(MPLAYERDIR)mixer.c
$(MPLAYERDIR)psignal.c
MPLAYEROBJS = $(MPLAYERSRCS:.c=.o)
SRCS = $(SKINSRC) $(BITMAPSRCS) wm/ws.c wm/wsconv.c app.c config.c events.c timer.c language.c error.c

2
Gui/mplayer/mplayer.c
View File

@ -81,7 +81,7 @@ void mplInit( int argc,char* argv[], char *envp[], void* disp )
wsCreateWindow( &appMPlayer.mainWindow,
appMPlayer.main.x,appMPlayer.main.y,appMPlayer.main.width,appMPlayer.main.height,
wsNoBorder,wsShowMouseCursor|wsHandleMouseButton|wsHandleMouseMove,wsHideFrame|wsMaxSize|wsMinSize|wsShowWindow,"MPlayer" );
wsNoBorder,wsShowMouseCursor|wsHandleMouseButton|wsHandleMouseMove,wsHideFrame|wsMaxSize|wsShowWindow,"MPlayer" ); //wsMinSize|
wsSetShape( &appMPlayer.mainWindow,appMPlayer.main.Mask.Image );

2
Gui/mplayer/mw.h
View File

@ -318,6 +318,8 @@ NoPause:
case evBackward10sec: mplRelSeek( -10 ); break;
case evSetMoviePosition: mplAbsSeek( param ); break;
case evIncVolume: vo_x11_putkey( wsGrayMul ); break;
case evDecVolume: vo_x11_putkey( wsGrayDiv ); break;
case evMute: mplShMem->Mute=1; break;
case evSetVolume:
case evSetBalance: mplShMem->VolumeChanged=1; break;

3
Gui/mplayer/play.c
View File

@ -202,6 +202,7 @@ void ChangeSkin( void )
void EventHandling( void )
{
wsHandleEvents();mplTimerHandler(0); // handle GUI timer events
wsHandleEvents();
//mplTimerHandler(0); // handle GUI timer events
if ( mplShMem->SkinChange ) ChangeSkin();
}

50
Gui/wm/ws.c
View File

@ -374,15 +374,15 @@ void wsCreateWindow( wsTWindow * win,int X,int Y,int wX,int hY,int bW,int cV,uns
win->SizeHint.y=win->Y;
win->SizeHint.width=win->Width;
win->SizeHint.height=win->Height;
if ( D & wsMaxSize )
{
win->SizeHint.flags|=PMaxSize;
win->SizeHint.min_width=win->Width;
win->SizeHint.min_height=win->Height;
}
if ( D & wsMinSize )
{
win->SizeHint.flags|=PMinSize;
win->SizeHint.min_width=win->Width;
win->SizeHint.min_height=win->Height;
}
if ( D & wsMaxSize )
{
win->SizeHint.flags|=PMaxSize;
win->SizeHint.max_width=win->Width;
win->SizeHint.max_height=win->Height;
}
@ -613,7 +613,7 @@ buttonreleased:
case PropertyNotify:
break;
// fprintf(stderr,"[ws] PropertyNotify %s\n",XGetAtomName( wsDisplay,Event->xproperty.atom ) );
fprintf(stderr,"[ws] PropertyNotify %s\n",XGetAtomName( wsDisplay,Event->xproperty.atom ) );
if ( Event->xproperty.atom == wsWindowList[l]->AtomRemote )
{
Atom type;
@ -709,18 +709,6 @@ void wsFullScreen( wsTWindow * win )
win->Width=win->OldWidth;
win->Height=win->OldHeight;
win->isFullScreen=False;
if ( win->Property & wsMaxSize )
{
win->SizeHint.flags|=PMaxSize;
win->SizeHint.max_width=win->Width;
win->SizeHint.max_height=win->Height;
}
if ( win->Property & wsMinSize )
{
win->SizeHint.flags|=PMinSize;
win->SizeHint.min_width=win->Width;
win->SizeHint.min_height=win->Height;
}
decoration=win->Decorations;
wsScreenSaverOn( wsDisplay );
}
@ -731,18 +719,6 @@ void wsFullScreen( wsTWindow * win )
win->X=0; win->Y=0;
win->Width=wsMaxX; win->Height=wsMaxY;
win->isFullScreen=True;
// if ( win->Property & wsMaxSize )
// {
// win->SizeHint.flags|=PMaxSize;
// win->SizeHint.min_width=0;
// win->SizeHint.min_height=0;
// }
// if ( win->Property & wsMinSize )
// {
// win->SizeHint.flags|=PMinSize;
// win->SizeHint.max_width=4096;
// win->SizeHint.max_height=4096;
// }
wsScreenSaverOff( wsDisplay );
}
@ -751,6 +727,18 @@ void wsFullScreen( wsTWindow * win )
win->SizeHint.y=win->Y;
win->SizeHint.width=win->Width;
win->SizeHint.height=win->Height;
if ( win->Property & wsMaxSize )
{
win->SizeHint.flags|=PMaxSize;
win->SizeHint.max_width=win->Width;
win->SizeHint.max_height=win->Height;
}
if ( win->Property & wsMinSize )
{
win->SizeHint.flags|=PMinSize;
win->SizeHint.min_width=win->Width;
win->SizeHint.min_height=win->Height;
}
XSetWMNormalHints( wsDisplay,win->WindowID,&win->SizeHint );
XMoveResizeWindow( wsDisplay,win->WindowID,win->X,win->Y,win->Width,win->Height );