Mercurial > mplayer.hg
comparison Gui/wm/ws.c @ 1823:a6c67352ccac
fix some bug.
author | pontscho |
---|---|
date | Sat, 01 Sep 2001 17:53:07 +0000 |
parents | 9c674dc76ff3 |
children | 4984bd55518e |
comparison
equal
deleted
inserted
replaced
1822:85dda3b18445 | 1823:a6c67352ccac |
---|---|
437 GCForeground | GCBackground, | 437 GCForeground | GCBackground, |
438 &win->wGCV ); | 438 &win->wGCV ); |
439 | 439 |
440 win->Visible=0; | 440 win->Visible=0; |
441 win->Focused=0; | 441 win->Focused=0; |
442 win->OFocused=0; | |
442 win->Mapped=0; | 443 win->Mapped=0; |
443 win->Rolled=0; | 444 win->Rolled=0; |
444 if ( D & wsShowWindow ) XMapWindow( wsDisplay,win->WindowID ); | 445 if ( D & wsShowWindow ) XMapWindow( wsDisplay,win->WindowID ); |
445 | 446 |
446 wsCreateImage( win ); | 447 wsCreateImage( win ); |
479 win->Idle=NULL; | 480 win->Idle=NULL; |
480 win->MouseHandler=NULL; | 481 win->MouseHandler=NULL; |
481 win->KeyHandler=NULL; | 482 win->KeyHandler=NULL; |
482 win->Visible=0; | 483 win->Visible=0; |
483 win->Focused=0; | 484 win->Focused=0; |
485 win->OFocused=0; | |
484 win->Mapped=0; | 486 win->Mapped=0; |
485 win->Rolled=0; | 487 win->Rolled=0; |
486 } | 488 } |
487 | 489 |
488 // ---------------------------------------------------------------------------------------------- | 490 // ---------------------------------------------------------------------------------------------- |
526 | 528 |
527 case MapNotify: i=wsWindowMapped; wsWindowList[l]->Mapped=wsMapped; goto expose; | 529 case MapNotify: i=wsWindowMapped; wsWindowList[l]->Mapped=wsMapped; goto expose; |
528 case UnmapNotify: i=wsWindowUnmapped; wsWindowList[l]->Mapped=wsNone; goto expose; | 530 case UnmapNotify: i=wsWindowUnmapped; wsWindowList[l]->Mapped=wsNone; goto expose; |
529 case FocusIn: | 531 case FocusIn: |
530 if ( wsWindowList[l]->Focused == wsFocused ) break; | 532 if ( wsWindowList[l]->Focused == wsFocused ) break; |
531 i=wsWindowFocusIn; wsWindowList[l]->Focused=wsFocused; goto expose; | 533 i=wsWindowFocusIn; |
534 wsWindowList[l]->OFocused=wsWindowList[l]->Focused; | |
535 wsWindowList[l]->Focused=wsFocused; | |
536 goto expose; | |
532 case FocusOut: | 537 case FocusOut: |
533 if ( wsWindowList[l]->Focused == wsNone ) break; | 538 if ( wsWindowList[l]->Focused == wsNone ) break; |
534 i=wsWindowFocusOut; wsWindowList[l]->Focused=wsNone; goto expose; | 539 i=wsWindowFocusOut; |
540 wsWindowList[l]->OFocused=wsWindowList[l]->Focused; | |
541 wsWindowList[l]->Focused=wsNone; | |
542 goto expose; | |
535 case VisibilityNotify: | 543 case VisibilityNotify: |
536 switch( Event->xvisibility.state ) | 544 switch( Event->xvisibility.state ) |
537 { | 545 { |
538 case VisibilityUnobscured: i=wsWindowVisible; wsWindowList[l]->Visible=wsVisible; goto expose; | 546 case VisibilityUnobscured: i=wsWindowVisible; wsWindowList[l]->Visible=wsVisible; goto expose; |
539 case VisibilityFullyObscured: i=wsWindowNotVisible; wsWindowList[l]->Visible=wsNotVisible; goto expose; | 547 case VisibilityFullyObscured: i=wsWindowNotVisible; wsWindowList[l]->Visible=wsNotVisible; goto expose; |