From da6135b983a530787ac61b8ff01a6aab54918fcb Mon Sep 17 00:00:00 2001
From: pontscho <pontscho@b3059339-0415-0410-9bf9-f77b7e298cf2>
Date: Tue, 16 Apr 2002 17:41:29 +0000
Subject: fix playlist bug with gui and rewrite mousecursor show/hide code

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@5652 b3059339-0415-0410-9bf9-f77b7e298cf2
---
 Gui/mplayer/mplayer.c | 4 ----
 Gui/mplayer/mw.h      | 5 -----
 Gui/mplayer/sw.h      | 5 -----
 3 files changed, 14 deletions(-)

(limited to 'Gui/mplayer')

diff --git a/Gui/mplayer/mplayer.c b/Gui/mplayer/mplayer.c
index 0cecbc3b4f..64ef18bca9 100644
--- a/Gui/mplayer/mplayer.c
+++ b/Gui/mplayer/mplayer.c
@@ -21,10 +21,8 @@
 #include "../../libmpdemux/stream.h"
 #include "../../mp_msg.h"
 
-#define mplMouseTimerConst  10
 #define mplRedrawTimerConst 5
 
-int mplMouseTimer  = mplMouseTimerConst;
 int mplRedrawTimer = mplRedrawTimerConst;
 int mplTimer = 0;
 
@@ -40,9 +38,7 @@ void mplEventHandling( int msg,float param );
 void mplTimerHandler( void )
 {
  mplTimer++;
- mplMouseTimer--;
  mplRedrawTimer--;
- if ( mplMouseTimer == 0 ) mplEventHandling( evHideMouseCursor,0 );
  if ( mplRedrawTimer == 0 ) mplEventHandling( evRedraw,0 );
 }
 
diff --git a/Gui/mplayer/mw.h b/Gui/mplayer/mw.h
index c57e812e50..9f334dd2a2 100644
--- a/Gui/mplayer/mw.h
+++ b/Gui/mplayer/mw.h
@@ -387,9 +387,6 @@ NoPause:
         break;
 
 // --- timer events
-   case evHideMouseCursor:
-        wsVisibleMouse( &appMPlayer.subWindow,wsHideMouseCursor );
-        break;
    case evRedraw:
         mplMainRender=1;
         wsPostRedisplay( &appMPlayer.mainWindow );
@@ -419,8 +416,6 @@ void mplMainMouseHandle( int Button,int X,int Y,int RX,int RY )
  static int     SelectedItem = -1;
         int     currentselected = -1;
 
- wsVisibleMouse( &appMPlayer.subWindow,wsShowMouseCursor );
-
  for ( i=0;i < appMPlayer.NumberOfItems + 1;i++ )
   if ( ( appMPlayer.Items[i].pressed != btnDisabled )&&
        ( wgIsRect( X,Y,appMPlayer.Items[i].x,appMPlayer.Items[i].y,appMPlayer.Items[i].x+appMPlayer.Items[i].width,appMPlayer.Items[i].y+appMPlayer.Items[i].height ) ) )
diff --git a/Gui/mplayer/sw.h b/Gui/mplayer/sw.h
index fd73bce199..95848a9cb7 100644
--- a/Gui/mplayer/sw.h
+++ b/Gui/mplayer/sw.h
@@ -26,10 +26,6 @@ void mplSubMouseHandle( int Button,int X,int Y,int RX,int RY )
  static int mplSubMoved = 0;
  static int msButton = 0;
 
- mplMouseTimer=mplMouseTimerConst;
- wsVisibleMouse( &appMPlayer.subWindow,wsShowMouseCursor );
-
-
  switch( Button )
   {
    case wsPMMouseButton:
@@ -67,7 +63,6 @@ void mplSubMouseHandle( int Button,int X,int Y,int RX,int RY )
                    break;
             case wsPRMouseButton:
                    mplMenuMouseHandle( X,Y,RX,RY );
-                   mplMouseTimer=mplMouseTimerConst;
                    break;
            }
           break;
-- 
cgit v1.2.3