annotate Gui/mplayer/sw.h @ 5976:ff3e5901b2cc

small patch that fixes the purple window when the f key is pressed - by Attila Kinali <kinali@gmx.net>
author arpi
date Sat, 04 May 2002 22:52:56 +0000
parents 60cf2bca993f
children b5fb9a927bf3
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
1693
d237c5d4b216 GUI version n-1
arpi
parents:
diff changeset
1
d237c5d4b216 GUI version n-1
arpi
parents:
diff changeset
2 // sub window
d237c5d4b216 GUI version n-1
arpi
parents:
diff changeset
3
d237c5d4b216 GUI version n-1
arpi
parents:
diff changeset
4 int mplSubRender = 1;
1852
58dd326fcc4a fix xshape, mixer, fullscreen, etc
pontscho
parents: 1841
diff changeset
5 int SubVisible = 0;
1812
d2d6a26ddb02 majd fix play&stop&pause&redraw
pontscho
parents: 1798
diff changeset
6
1693
d237c5d4b216 GUI version n-1
arpi
parents:
diff changeset
7 void mplSubDraw( wsParamDisplay )
d237c5d4b216 GUI version n-1
arpi
parents:
diff changeset
8 {
5919
60cf2bca993f some bug fix
pontscho
parents: 5651
diff changeset
9 if ( appMPlayer.subWindow.State == wsWindowClosed ) exit_player( MSGTR_Exit_quit );
60cf2bca993f some bug fix
pontscho
parents: 5651
diff changeset
10
2045
deb4aff05c44 fix other bugs
pontscho
parents: 2030
diff changeset
11 if ( appMPlayer.subWindow.State == wsWindowFocusIn ) SubVisible++;
2851
b64fa5d25142 add roleld mouse support and some small bugfix. neked jol a testedbe.
pontscho
parents: 2045
diff changeset
12
1852
58dd326fcc4a fix xshape, mixer, fullscreen, etc
pontscho
parents: 1841
diff changeset
13 if ( !appMPlayer.subWindow.Mapped ||
58dd326fcc4a fix xshape, mixer, fullscreen, etc
pontscho
parents: 1841
diff changeset
14 appMPlayer.subWindow.Visible == wsWindowNotVisible ) return;
1823
a6c67352ccac fix some bug.
pontscho
parents: 1815
diff changeset
15
4818
3473ca9ef158 new gui interface, and gtk moved into mplayer process. fork ... bleh :)
pontscho
parents: 4797
diff changeset
16 if ( guiIntfStruct.Playing ) mplSubRender=0;
1693
d237c5d4b216 GUI version n-1
arpi
parents:
diff changeset
17
d237c5d4b216 GUI version n-1
arpi
parents:
diff changeset
18 if ( mplSubRender )
d237c5d4b216 GUI version n-1
arpi
parents:
diff changeset
19 {
2029
41ed89701ece fix fucking icewm fullscreen bug.
pontscho
parents: 2025
diff changeset
20 if ( appMPlayer.sub.Bitmap.Image ) wsPutImage( &appMPlayer.subWindow );
2025
0653e90b3118 some bug fix, and sub window render speed up.. 10l kola ? :)
pontscho
parents: 1858
diff changeset
21 // XFlush( wsDisplay );
1693
d237c5d4b216 GUI version n-1
arpi
parents:
diff changeset
22 }
2851
b64fa5d25142 add roleld mouse support and some small bugfix. neked jol a testedbe.
pontscho
parents: 2045
diff changeset
23 appMPlayer.subWindow.State=0;
1693
d237c5d4b216 GUI version n-1
arpi
parents:
diff changeset
24 }
d237c5d4b216 GUI version n-1
arpi
parents:
diff changeset
25
d237c5d4b216 GUI version n-1
arpi
parents:
diff changeset
26 void mplSubMouseHandle( int Button,int X,int Y,int RX,int RY )
d237c5d4b216 GUI version n-1
arpi
parents:
diff changeset
27 {
1812
d2d6a26ddb02 majd fix play&stop&pause&redraw
pontscho
parents: 1798
diff changeset
28 static int mplSubMoved = 0;
2851
b64fa5d25142 add roleld mouse support and some small bugfix. neked jol a testedbe.
pontscho
parents: 2045
diff changeset
29 static int msButton = 0;
1812
d2d6a26ddb02 majd fix play&stop&pause&redraw
pontscho
parents: 1798
diff changeset
30
1693
d237c5d4b216 GUI version n-1
arpi
parents:
diff changeset
31 switch( Button )
d237c5d4b216 GUI version n-1
arpi
parents:
diff changeset
32 {
2902
d47cbcdce1a8 rewrite some header meg jol csinaltam menu -t koepso gombra gonosz mod ( bocs, tom, nem angol).
pontscho
parents: 2854
diff changeset
33 case wsPMMouseButton:
4818
3473ca9ef158 new gui interface, and gtk moved into mplayer process. fork ... bleh :)
pontscho
parents: 4797
diff changeset
34 gtkShow( evShowPopUpMenu,NULL );
2980
c4b6dc8bb554 fix middle menu hideing bug
pontscho
parents: 2902
diff changeset
35 break;
1693
d237c5d4b216 GUI version n-1
arpi
parents:
diff changeset
36 case wsPRMouseButton:
4818
3473ca9ef158 new gui interface, and gtk moved into mplayer process. fork ... bleh :)
pontscho
parents: 4797
diff changeset
37 gtkShow( evHidePopUpMenu,NULL );
1693
d237c5d4b216 GUI version n-1
arpi
parents:
diff changeset
38 mplShowMenu( RX,RY );
d237c5d4b216 GUI version n-1
arpi
parents:
diff changeset
39 msButton=wsPRMouseButton;
d237c5d4b216 GUI version n-1
arpi
parents:
diff changeset
40 break;
d237c5d4b216 GUI version n-1
arpi
parents:
diff changeset
41 case wsRRMouseButton:
5919
60cf2bca993f some bug fix
pontscho
parents: 5651
diff changeset
42 mplHideMenu( RX,RY,1 );
1693
d237c5d4b216 GUI version n-1
arpi
parents:
diff changeset
43 msButton=0;
d237c5d4b216 GUI version n-1
arpi
parents:
diff changeset
44 break;
2851
b64fa5d25142 add roleld mouse support and some small bugfix. neked jol a testedbe.
pontscho
parents: 2045
diff changeset
45 // ---
1693
d237c5d4b216 GUI version n-1
arpi
parents:
diff changeset
46 case wsPLMouseButton:
3477
9e7289fdc471 ize ... majd gabu ide irja. ilyen fullscreenben mouse button press - re jon elo main window.
pontscho
parents: 3075
diff changeset
47 if ( appMPlayer.subWindow.isFullScreen )
4818
3473ca9ef158 new gui interface, and gtk moved into mplayer process. fork ... bleh :)
pontscho
parents: 4797
diff changeset
48 {
3478
e518999fa7e7 fs windows switch fix
pontscho
parents: 3477
diff changeset
49 if( ++SubVisible%2 ) wsMoveTopWindow( &appMPlayer.mainWindow );
e518999fa7e7 fs windows switch fix
pontscho
parents: 3477
diff changeset
50 else wsMoveTopWindow( &appMPlayer.subWindow );
e518999fa7e7 fs windows switch fix
pontscho
parents: 3477
diff changeset
51 mplSubMoved=1;
4818
3473ca9ef158 new gui interface, and gtk moved into mplayer process. fork ... bleh :)
pontscho
parents: 4797
diff changeset
52 break;
3473ca9ef158 new gui interface, and gtk moved into mplayer process. fork ... bleh :)
pontscho
parents: 4797
diff changeset
53 }
3473ca9ef158 new gui interface, and gtk moved into mplayer process. fork ... bleh :)
pontscho
parents: 4797
diff changeset
54 gtkShow( evHidePopUpMenu,NULL );
1693
d237c5d4b216 GUI version n-1
arpi
parents:
diff changeset
55 sx=X; sy=Y;
d237c5d4b216 GUI version n-1
arpi
parents:
diff changeset
56 msButton=wsPLMouseButton;
d237c5d4b216 GUI version n-1
arpi
parents:
diff changeset
57 mplSubMoved=0;
d237c5d4b216 GUI version n-1
arpi
parents:
diff changeset
58 break;
d237c5d4b216 GUI version n-1
arpi
parents:
diff changeset
59 case wsMoveMouse:
d237c5d4b216 GUI version n-1
arpi
parents:
diff changeset
60 switch ( msButton )
d237c5d4b216 GUI version n-1
arpi
parents:
diff changeset
61 {
d237c5d4b216 GUI version n-1
arpi
parents:
diff changeset
62 case wsPLMouseButton:
d237c5d4b216 GUI version n-1
arpi
parents:
diff changeset
63 mplSubMoved=1;
2854
fd44ecf77f8d move bug meg fileload bug fixed asszem.
pontscho
parents: 2851
diff changeset
64 if ( !appMPlayer.subWindow.isFullScreen ) wsMoveWindow( &appMPlayer.subWindow,False,RX - sx,RY - sy );
1693
d237c5d4b216 GUI version n-1
arpi
parents:
diff changeset
65 break;
d237c5d4b216 GUI version n-1
arpi
parents:
diff changeset
66 case wsPRMouseButton:
d237c5d4b216 GUI version n-1
arpi
parents:
diff changeset
67 mplMenuMouseHandle( X,Y,RX,RY );
d237c5d4b216 GUI version n-1
arpi
parents:
diff changeset
68 break;
d237c5d4b216 GUI version n-1
arpi
parents:
diff changeset
69 }
d237c5d4b216 GUI version n-1
arpi
parents:
diff changeset
70 break;
d237c5d4b216 GUI version n-1
arpi
parents:
diff changeset
71 case wsRLMouseButton:
2030
68dbb349566e mwm fullscreen bug fixed (?)
pontscho
parents: 2029
diff changeset
72 if ( !mplSubMoved )
2851
b64fa5d25142 add roleld mouse support and some small bugfix. neked jol a testedbe.
pontscho
parents: 2045
diff changeset
73 {
5919
60cf2bca993f some bug fix
pontscho
parents: 5651
diff changeset
74 #if 0
2851
b64fa5d25142 add roleld mouse support and some small bugfix. neked jol a testedbe.
pontscho
parents: 2045
diff changeset
75 if( SubVisible++%2 )
b64fa5d25142 add roleld mouse support and some small bugfix. neked jol a testedbe.
pontscho
parents: 2045
diff changeset
76 {
b64fa5d25142 add roleld mouse support and some small bugfix. neked jol a testedbe.
pontscho
parents: 2045
diff changeset
77 wsMoveTopWindow( &appMPlayer.mainWindow );
b64fa5d25142 add roleld mouse support and some small bugfix. neked jol a testedbe.
pontscho
parents: 2045
diff changeset
78 fprintf( stderr,"[sw] MAIN TOP\n" );
b64fa5d25142 add roleld mouse support and some small bugfix. neked jol a testedbe.
pontscho
parents: 2045
diff changeset
79 }
b64fa5d25142 add roleld mouse support and some small bugfix. neked jol a testedbe.
pontscho
parents: 2045
diff changeset
80 else
b64fa5d25142 add roleld mouse support and some small bugfix. neked jol a testedbe.
pontscho
parents: 2045
diff changeset
81 {
b64fa5d25142 add roleld mouse support and some small bugfix. neked jol a testedbe.
pontscho
parents: 2045
diff changeset
82 wsMoveTopWindow( &appMPlayer.subWindow );
b64fa5d25142 add roleld mouse support and some small bugfix. neked jol a testedbe.
pontscho
parents: 2045
diff changeset
83 fprintf( stderr,"[sw] SUB TOP\n" );
b64fa5d25142 add roleld mouse support and some small bugfix. neked jol a testedbe.
pontscho
parents: 2045
diff changeset
84 }
5919
60cf2bca993f some bug fix
pontscho
parents: 5651
diff changeset
85 #else
60cf2bca993f some bug fix
pontscho
parents: 5651
diff changeset
86 if ( appMPlayer.subWindow.Focused == 2 )
60cf2bca993f some bug fix
pontscho
parents: 5651
diff changeset
87 {
60cf2bca993f some bug fix
pontscho
parents: 5651
diff changeset
88 wsMoveTopWindow( &appMPlayer.mainWindow );
60cf2bca993f some bug fix
pontscho
parents: 5651
diff changeset
89 fprintf( stderr,"[sw] MAIN TOP\n" );
60cf2bca993f some bug fix
pontscho
parents: 5651
diff changeset
90 }
60cf2bca993f some bug fix
pontscho
parents: 5651
diff changeset
91 else
60cf2bca993f some bug fix
pontscho
parents: 5651
diff changeset
92 {
60cf2bca993f some bug fix
pontscho
parents: 5651
diff changeset
93 wsMoveTopWindow( &appMPlayer.subWindow );
60cf2bca993f some bug fix
pontscho
parents: 5651
diff changeset
94 fprintf( stderr,"[sw] SUB TOP\n" );
60cf2bca993f some bug fix
pontscho
parents: 5651
diff changeset
95 }
60cf2bca993f some bug fix
pontscho
parents: 5651
diff changeset
96 #endif
2851
b64fa5d25142 add roleld mouse support and some small bugfix. neked jol a testedbe.
pontscho
parents: 2045
diff changeset
97 }
1693
d237c5d4b216 GUI version n-1
arpi
parents:
diff changeset
98 msButton=0;
d237c5d4b216 GUI version n-1
arpi
parents:
diff changeset
99 mplSubMoved=0;
d237c5d4b216 GUI version n-1
arpi
parents:
diff changeset
100 break;
d237c5d4b216 GUI version n-1
arpi
parents:
diff changeset
101 }
d237c5d4b216 GUI version n-1
arpi
parents:
diff changeset
102 }