Mercurial > mplayer.hg

comparison gui/wm/ws.c @ 35498:c505a4aa9582

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Rename wsNone wsNo and use it instead of a numeric constant.
author ib
date Tue, 04 Dec 2012 19:10:44 +0000
parents ff7cf8f1bd19
children af72f85b6f44
comparison
equal deleted inserted replaced
35497:ff7cf8f1bd19 35498:c505a4aa9582
571 571
572 win->wGC = XCreateGC(wsDisplay, win->WindowID, 572 win->wGC = XCreateGC(wsDisplay, win->WindowID,
573 GCForeground | GCBackground, 573 GCForeground | GCBackground,
574 &win->wGCV); 574 &win->wGCV);
575 575
576 win->Visible = 0; 576 win->Visible = wsNo;
577 win->Focused = 0; 577 win->Focused = wsNo;
578 win->Mapped = 0; 578 win->Mapped = wsNo;
579 win->Rolled = 0; 579 win->Rolled = wsNo;
580 580
581 if (D & wsShowWindow) 581 if (D & wsShowWindow)
582 XMapWindow(wsDisplay, win->WindowID); 582 XMapWindow(wsDisplay, win->WindowID);
583 583
584 wsCreateImage(win, win->Width, win->Height); 584 wsCreateImage(win, win->Width, win->Height);
632 win->ReDraw = NULL; 632 win->ReDraw = NULL;
633 win->ReSize = NULL; 633 win->ReSize = NULL;
634 win->Idle = NULL; 634 win->Idle = NULL;
635 win->MouseHandler = NULL; 635 win->MouseHandler = NULL;
636 win->KeyHandler = NULL; 636 win->KeyHandler = NULL;
637 win->Visible = 0; 637 win->Visible = wsNo;
638 win->Focused = 0; 638 win->Focused = wsNo;
639 win->Mapped = 0; 639 win->Mapped = wsNo;
640 win->Rolled = 0; 640 win->Rolled = wsNo;
641 #endif 641 #endif
642 } 642 }
643 643
644 /** 644 /**
645 * @brief Handle automatic hiding of the cursor. 645 * @brief Handle automatic hiding of the cursor.
700 wsWindowList[l]->Mapped = wsMapped; 700 wsWindowList[l]->Mapped = wsMapped;
701 goto expose; 701 goto expose;
702 702
703 case UnmapNotify: 703 case UnmapNotify:
704 i = wsWindowUnmapped; 704 i = wsWindowUnmapped;
705 wsWindowList[l]->Mapped = wsNone; 705 wsWindowList[l]->Mapped = wsNo;
706 goto expose; 706 goto expose;
707 707
708 case FocusIn: 708 case FocusIn:
709 709
710 if (wsWindowList[l]->Focused == wsFocused) 710 if (wsWindowList[l]->Focused == wsFocused)
714 wsWindowList[l]->Focused = wsFocused; 714 wsWindowList[l]->Focused = wsFocused;
715 goto expose; 715 goto expose;
716 716
717 case FocusOut: 717 case FocusOut:
718 718
719 if (wsWindowList[l]->Focused == wsNone) 719 if (wsWindowList[l]->Focused == wsNo)
720 break; 720 break;
721 721
722 i = wsWindowFocusOut; 722 i = wsWindowFocusOut;
723 wsWindowList[l]->Focused = wsNone; 723 wsWindowList[l]->Focused = wsNo;
724 goto expose; 724 goto expose;
725 725
726 case VisibilityNotify: 726 case VisibilityNotify:
727 727
728 switch (Event->xvisibility.state) { 728 switch (Event->xvisibility.state) {
769 769
770 if (wsWindowList[l]->ReSize) 770 if (wsWindowList[l]->ReSize)
771 wsWindowList[l]->ReSize(wsWindowList[l]->X, wsWindowList[l]->Y, wsWindowList[l]->Width, wsWindowList[l]->Height); 771 wsWindowList[l]->ReSize(wsWindowList[l]->X, wsWindowList[l]->Y, wsWindowList[l]->Width, wsWindowList[l]->Height);
772 } 772 }
773 773
774 wsWindowList[l]->Rolled = wsNone; 774 wsWindowList[l]->Rolled = wsNo;
775 775
776 if (Event->xconfigure.y < 0) { 776 if (Event->xconfigure.y < 0) {
777 i = wsWindowRolled; 777 i = wsWindowRolled;
778 wsWindowList[l]->Rolled = wsRolled; 778 wsWindowList[l]->Rolled = wsRolled;
779 goto expose; 779 goto expose;