← Back to branch summary

~siretart/vlc/ubuntu

« back to all changes in this revision

Viewing changes to modules/video_output/msw/events.c

  • Committer: Reinhard Tartler
  • Date: 2008-09-26 06:45:40 UTC
  • mto: (21.2.1 vlc-0.9.3)
  • mto: This revision was merged to the branch mainline in revision 23.
  • Revision ID: siretart@tauware.de-20080926064540-0sd8zwmig33ksmy4
Tags: upstream-ubuntu-0.9.3
Import upstream version 0.9.3

Show diffs side-by-side

added added

removed removed

Lines of Context:
modules/video_output/msw/events.c
2
2
 * events.c: Windows DirectX video output events handler
3
3
 *****************************************************************************
4
4
 * Copyright (C) 2001-2004 the VideoLAN team
5
 
 * $Id: 4edb568c4921a0a9f7de83d98d64105455fa1006 $
 
5
 * $Id: 529485a9b834d186306732632962737a8ff588a1 $
6
6
 *
7
7
 * Authors: Gildas Bazin <gbazin@videolan.org>
8
8
 *
59
59
#include "vlc_keys.h"
60
60
#include "vout.h"
61
61
 
62
 
#if defined(UNDER_CE) && !defined(__PLUGIN__) /*FIXME*/
63
 
#   define SHFS_SHOWSIPBUTTON 0x0004
 
62
#ifdef UNDER_CE
 
63
#include <aygshell.h>
 
64
    //WINSHELLAPI BOOL WINAPI SHFullScreen(HWND hwndRequester, DWORD dwState);
 
65
#endif
 
66
 
 
67
/*#if defined(UNDER_CE) && !defined(__PLUGIN__) /*FIXME*/
 
68
/*#   define SHFS_SHOWSIPBUTTON 0x0004
64
69
#   define SHFS_HIDESIPBUTTON 0x0008
65
70
#   define MENU_HEIGHT 26
66
71
    BOOL SHFullScreen(HWND hwndRequester, DWORD dwState);
67
 
#endif
 
72
#endif*/
 
73
 
68
74
 
69
75
/*****************************************************************************
70
76
 * Local prototypes.
907
913
        if( !p_vout->p_sys->b_parent_focus ) GXSuspend();
908
914
#endif
909
915
#ifdef UNDER_CE
910
 
        if( hWnd == p_vout->p_sys->hfswnd )
 
916
        if( hwnd == p_vout->p_sys->hfswnd )
911
917
        {
912
918
            HWND htbar = FindWindow( _T("HHTaskbar"), NULL );
913
919
            ShowWindow( htbar, SW_SHOW );
914
920
        }
915
921
 
916
922
        if( !p_vout->p_sys->hparent ||
917
 
            hWnd == p_vout->p_sys->hfswnd )
 
923
            hwnd == p_vout->p_sys->hfswnd )
918
924
        {
919
 
            SHFullScreen( hWnd, SHFS_SHOWSIPBUTTON );
 
925
            SHFullScreen( hwnd, SHFS_SHOWSIPBUTTON );
920
926
        }
921
927
#endif
922
928
        return 0;
928
934
#endif
929
935
#ifdef UNDER_CE
930
936
        if( p_vout->p_sys->hparent &&
931
 
            hWnd != p_vout->p_sys->hfswnd && p_vout->b_fullscreen )
 
937
            hwnd != p_vout->p_sys->hfswnd && p_vout->b_fullscreen )
932
938
            p_vout->p_sys->i_changes |= VOUT_FULLSCREEN_CHANGE;
933
939
 
934
 
        if( hWnd == p_vout->p_sys->hfswnd )
 
940
        if( hwnd == p_vout->p_sys->hfswnd )
935
941
        {
936
942
            HWND htbar = FindWindow( _T("HHTaskbar"), NULL );
937
943
            ShowWindow( htbar, SW_HIDE );
938
944
        }
939
945
 
940
946
        if( !p_vout->p_sys->hparent ||
941
 
            hWnd == p_vout->p_sys->hfswnd )
 
947
            hwnd == p_vout->p_sys->hfswnd )
942
948
        {
943
 
            SHFullScreen( hWnd, SHFS_HIDESIPBUTTON );
 
949
            SHFullScreen( hwnd, SHFS_HIDESIPBUTTON );
944
950
        }
945
951
#endif
946
952
        return 0;
1195
1201
                          rect.right, rect.bottom,
1196
1202
                          SWP_NOZORDER|SWP_FRAMECHANGED );
1197
1203
 
 
1204
            //HWND topLevelParent = GetParent( p_vout->p_sys->hparent );
1198
1205
            HWND topLevelParent = GetAncestor( p_vout->p_sys->hparent, GA_ROOT );
1199
1206
            ShowWindow( topLevelParent, SW_HIDE );
1200
1207
        }
1219
1226
                          rect.right, rect.bottom,
1220
1227
                          SWP_NOZORDER|SWP_FRAMECHANGED );
1221
1228
 
 
1229
            // HWND topLevelParent = GetParent( p_vout->p_sys->hparent );
1222
1230
            HWND topLevelParent = GetAncestor( p_vout->p_sys->hparent, GA_ROOT );
1223
1231
            ShowWindow( topLevelParent, SW_SHOW );
1224
1232
            SetForegroundWindow( p_vout->p_sys->hparent );