[Mplayer-cvslog] CVS: main/Gui/wm ws.c,1.9,1.10 ws.h,1.3,1.4

[Zoltan Ponekker]

Update of /cvsroot/mplayer/main/Gui/wm
In directory mplayer:/var/tmp.root/cvs-serv4305/Gui/wm

Modified Files:
	ws.c ws.h 
Log Message:
fix some bug.

Index: ws.c
===================================================================
RCS file: /cvsroot/mplayer/main/Gui/wm/ws.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- ws.c	31 Aug 2001 22:06:28 -0000	1.9
+++ ws.c	1 Sep 2001 17:53:07 -0000	1.10
@@ -439,6 +439,7 @@
 
  win->Visible=0;
  win->Focused=0;
+ win->OFocused=0;
  win->Mapped=0;
  win->Rolled=0;
  if ( D & wsShowWindow ) XMapWindow( wsDisplay,win->WindowID );
@@ -481,6 +482,7 @@
  win->KeyHandler=NULL;
  win->Visible=0;
  win->Focused=0;
+ win->OFocused=0;
  win->Mapped=0;
  win->Rolled=0;
 }
@@ -528,10 +530,16 @@
    case UnmapNotify: i=wsWindowUnmapped; wsWindowList[l]->Mapped=wsNone;     goto expose;
    case FocusIn:
         if ( wsWindowList[l]->Focused == wsFocused ) break;
-        i=wsWindowFocusIn; wsWindowList[l]->Focused=wsFocused; goto expose;
+        i=wsWindowFocusIn; 
+	wsWindowList[l]->OFocused=wsWindowList[l]->Focused; 
+	wsWindowList[l]->Focused=wsFocused; 
+	goto expose;
    case FocusOut:
         if ( wsWindowList[l]->Focused == wsNone ) break;
-        i=wsWindowFocusOut; wsWindowList[l]->Focused=wsNone;   goto expose;
+        i=wsWindowFocusOut; 
+	wsWindowList[l]->OFocused=wsWindowList[l]->Focused; 
+	wsWindowList[l]->Focused=wsNone;   
+	goto expose;
    case VisibilityNotify:
         switch( Event->xvisibility.state )
          {

Index: ws.h
===================================================================
RCS file: /cvsroot/mplayer/main/Gui/wm/ws.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ws.h	31 Aug 2001 22:06:28 -0000	1.3
+++ ws.h	1 Sep 2001 17:53:07 -0000	1.4
@@ -124,6 +124,8 @@
  int                  CapsLock;
 // --- Misc -------------------------------------------------------------------------------------
 
+ int		      OFocused;
+
  Atom                 AtomDeleteWindow;
  Atom                 AtomTakeFocus;
  Atom                 AtomRolle;