Mercurial > mplayer.hg
changeset 1860:c65abbc91c5c
fix mwm bug's. faszom (C), and remove mixer.*
| author | pontscho |
|---|---|
| date | Thu, 06 Sep 2001 09:36:48 +0000 |
| parents | 35036f9a1672 |
| children | 17660d830bcb |
| files | Gui/error.c Gui/gui.mak Gui/mplayer/mplayer.c Gui/mplayer/mw.h Gui/mplayer/play.c Gui/wm/ws.c |
| diffstat | 6 files changed, 26 insertions(+), 35 deletions(-) [+] |
line wrap: on
line diff
--- a/Gui/error.c Wed Sep 05 23:33:56 2001 +0000 +++ b/Gui/error.c Thu Sep 06 09:36:48 2001 +0000 @@ -5,7 +5,7 @@ #include "error.h" -int debug_level = 6; +int debug_level = 2; FILE * debug_file; int debug_stderr = 0;
--- a/Gui/gui.mak Wed Sep 05 23:33:56 2001 +0000 +++ b/Gui/gui.mak Thu Sep 06 09:36:48 2001 +0000 @@ -3,7 +3,7 @@ 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
--- a/Gui/mplayer/mplayer.c Wed Sep 05 23:33:56 2001 +0000 +++ b/Gui/mplayer/mplayer.c Thu Sep 06 09:36:48 2001 +0000 @@ -81,7 +81,7 @@ 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 );
--- a/Gui/mplayer/mw.h Wed Sep 05 23:33:56 2001 +0000 +++ b/Gui/mplayer/mw.h Thu Sep 06 09:36:48 2001 +0000 @@ -318,6 +318,8 @@ 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;
--- a/Gui/mplayer/play.c Wed Sep 05 23:33:56 2001 +0000 +++ b/Gui/mplayer/play.c Thu Sep 06 09:36:48 2001 +0000 @@ -202,6 +202,7 @@ void EventHandling( void ) { - wsHandleEvents();mplTimerHandler(0); // handle GUI timer events + wsHandleEvents(); + //mplTimerHandler(0); // handle GUI timer events if ( mplShMem->SkinChange ) ChangeSkin(); }
--- a/Gui/wm/ws.c Wed Sep 05 23:33:56 2001 +0000 +++ b/Gui/wm/ws.c Thu Sep 06 09:36:48 2001 +0000 @@ -374,15 +374,15 @@ win->SizeHint.y=win->Y; win->SizeHint.width=win->Width; win->SizeHint.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.min_width=win->Width; - win->SizeHint.min_height=win->Height; - } - if ( D & wsMinSize ) - { - win->SizeHint.flags|=PMinSize; win->SizeHint.max_width=win->Width; win->SizeHint.max_height=win->Height; } @@ -613,7 +613,7 @@ 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 @@ 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 @@ 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 @@ 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 );