Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Redmine
Redmine
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Metrics
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
videolan
vlc
Commits
84b3a5e6
Commit
84b3a5e6
authored
Sep 04, 2008
by
Geoffroy Couprie
Committed by
Rémi Denis-Courmont
Sep 08, 2008
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
WinCE: wingdi plugin update
Signed-off-by:
Rémi Denis-Courmont
<
rdenis@simphalempin.com
>
parent
ecd28675
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
65 additions
and
24 deletions
+65
-24
modules/video_output/msw/events.c
modules/video_output/msw/events.c
+20
-12
modules/video_output/msw/vout.h
modules/video_output/msw/vout.h
+39
-6
modules/video_output/msw/wingdi.c
modules/video_output/msw/wingdi.c
+6
-6
No files found.
modules/video_output/msw/events.c
View file @
84b3a5e6
...
...
@@ -59,12 +59,18 @@
#include "vlc_keys.h"
#include "vout.h"
#if defined(UNDER_CE) && !defined(__PLUGIN__)
/*FIXME*/
# define SHFS_SHOWSIPBUTTON 0x0004
#ifdef UNDER_CE
#include <aygshell.h>
//WINSHELLAPI BOOL WINAPI SHFullScreen(HWND hwndRequester, DWORD dwState);
#endif
/*#if defined(UNDER_CE) && !defined(__PLUGIN__) /*FIXME*/
/*# define SHFS_SHOWSIPBUTTON 0x0004
# define SHFS_HIDESIPBUTTON 0x0008
# define MENU_HEIGHT 26
BOOL SHFullScreen(HWND hwndRequester, DWORD dwState);
#endif
#endif*/
/*****************************************************************************
* Local prototypes.
...
...
@@ -909,16 +915,16 @@ static long FAR PASCAL DirectXEventProc( HWND hwnd, UINT message,
if
(
!
p_vout
->
p_sys
->
b_parent_focus
)
GXSuspend
();
#endif
#ifdef UNDER_CE
if
(
h
W
nd
==
p_vout
->
p_sys
->
hfswnd
)
if
(
h
w
nd
==
p_vout
->
p_sys
->
hfswnd
)
{
HWND
htbar
=
FindWindow
(
_T
(
"HHTaskbar"
),
NULL
);
ShowWindow
(
htbar
,
SW_SHOW
);
}
if
(
!
p_vout
->
p_sys
->
hparent
||
h
W
nd
==
p_vout
->
p_sys
->
hfswnd
)
h
w
nd
==
p_vout
->
p_sys
->
hfswnd
)
{
SHFullScreen
(
h
W
nd
,
SHFS_SHOWSIPBUTTON
);
SHFullScreen
(
h
w
nd
,
SHFS_SHOWSIPBUTTON
);
}
#endif
return
0
;
...
...
@@ -930,19 +936,19 @@ static long FAR PASCAL DirectXEventProc( HWND hwnd, UINT message,
#endif
#ifdef UNDER_CE
if
(
p_vout
->
p_sys
->
hparent
&&
h
W
nd
!=
p_vout
->
p_sys
->
hfswnd
&&
p_vout
->
b_fullscreen
)
h
w
nd
!=
p_vout
->
p_sys
->
hfswnd
&&
p_vout
->
b_fullscreen
)
p_vout
->
p_sys
->
i_changes
|=
VOUT_FULLSCREEN_CHANGE
;
if
(
h
W
nd
==
p_vout
->
p_sys
->
hfswnd
)
if
(
h
w
nd
==
p_vout
->
p_sys
->
hfswnd
)
{
HWND
htbar
=
FindWindow
(
_T
(
"HHTaskbar"
),
NULL
);
ShowWindow
(
htbar
,
SW_HIDE
);
}
if
(
!
p_vout
->
p_sys
->
hparent
||
h
W
nd
==
p_vout
->
p_sys
->
hfswnd
)
h
w
nd
==
p_vout
->
p_sys
->
hfswnd
)
{
SHFullScreen
(
h
W
nd
,
SHFS_HIDESIPBUTTON
);
SHFullScreen
(
h
w
nd
,
SHFS_HIDESIPBUTTON
);
}
#endif
return
0
;
...
...
@@ -1197,7 +1203,8 @@ void Win32ToggleFullscreen( vout_thread_t *p_vout )
rect
.
right
,
rect
.
bottom
,
SWP_NOZORDER
|
SWP_FRAMECHANGED
);
HWND
topLevelParent
=
GetAncestor
(
p_vout
->
p_sys
->
hparent
,
GA_ROOT
);
HWND
topLevelParent
=
GetParent
(
p_vout
->
p_sys
->
hparent
);
//HWND topLevelParent = GetAncestor( p_vout->p_sys->hparent, GA_ROOT );
ShowWindow
(
topLevelParent
,
SW_HIDE
);
}
...
...
@@ -1221,7 +1228,8 @@ void Win32ToggleFullscreen( vout_thread_t *p_vout )
rect
.
right
,
rect
.
bottom
,
SWP_NOZORDER
|
SWP_FRAMECHANGED
);
HWND
topLevelParent
=
GetAncestor
(
p_vout
->
p_sys
->
hparent
,
GA_ROOT
);
HWND
topLevelParent
=
GetParent
(
p_vout
->
p_sys
->
hparent
);
//HWND topLevelParent = GetAncestor( p_vout->p_sys->hparent, GA_ROOT );
ShowWindow
(
topLevelParent
,
SW_SHOW
);
SetForegroundWindow
(
p_vout
->
p_sys
->
hparent
);
ShowWindow
(
hwnd
,
SW_HIDE
);
...
...
modules/video_output/msw/vout.h
View file @
84b3a5e6
...
...
@@ -33,6 +33,39 @@ typedef struct event_thread_t
}
event_thread_t
;
#ifdef MODULE_NAME_IS_wingapi
typedef
struct
GXDisplayProperties
{
DWORD
cxWidth
;
DWORD
cyHeight
;
long
cbxPitch
;
long
cbyPitch
;
long
cBPP
;
DWORD
ffFormat
;
}
GXDisplayProperties
;
typedef
struct
GXScreenRect
{
DWORD
dwTop
;
DWORD
dwLeft
;
DWORD
dwWidth
;
DWORD
dwHeight
;
}
GXScreenRect
;
# define GX_FULLSCREEN 0x01
# define GX_NORMALKEYS 0x02
# define GX_LANDSCAPEKEYS 0x03
# ifndef kfLandscape
# define kfLandscape 0x8
# define kfPalette 0x10
# define kfDirect 0x20
# define kfDirect555 0x40
# define kfDirect565 0x80
# define kfDirect888 0x100
# define kfDirect444 0x200
# define kfDirectInverted 0x400
# endif
#endif
/*****************************************************************************
* vout_sys_t: video output method descriptor
*****************************************************************************
...
...
@@ -219,18 +252,18 @@ void Win32ToggleFullscreen ( vout_thread_t *p_vout );
# define GCL_HBRBACKGROUND (-10)
#endif
#define FindWindowEx(a,b,c,d) 0
//
#define FindWindowEx(a,b,c,d) 0
#define GetWindowPlacement(a,b)
#define SetWindowPlacement(a,b)
typedef
struct
_WINDOWPLACEMENT
{
/*
typedef struct _WINDOWPLACEMENT {
UINT length;
UINT flags;
UINT showCmd;
POINT ptMinPosition;
POINT ptMaxPosition;
RECT rcNormalPosition;
}
WINDOWPLACEMENT
;
} WINDOWPLACEMENT;
*/
#ifndef WM_NCMOUSEMOVE
# define WM_NCMOUSEMOVE 160
...
...
@@ -257,8 +290,8 @@ typedef struct _WINDOWPLACEMENT {
#define WS_EX_APPWINDOW 0x40000
#endif
#define SetWindowLongPtr SetWindowLong
#define GetWindowLongPtr GetWindowLong
#define GWLP_USERDATA GWL_USERDATA
//
#define SetWindowLongPtr SetWindowLong
//
#define GetWindowLongPtr GetWindowLong
//
#define GWLP_USERDATA GWL_USERDATA
#endif //UNDER_CE
modules/video_output/msw/wingdi.c
View file @
84b3a5e6
...
...
@@ -38,9 +38,7 @@
#include <commctrl.h>
#include "vout.h"
#ifdef MODULE_NAME_IS_wingapi
/*#ifdef MODULE_NAME_IS_wingapi
typedef struct GXDisplayProperties {
DWORD cxWidth;
DWORD cyHeight;
...
...
@@ -73,6 +71,8 @@
# endif
#endif /* MODULE_NAME_IS_wingapi */
#include "vout.h"
#define MAX_DIRECTBUFFERS 10
#ifdef UNDER_CE
...
...
@@ -85,9 +85,9 @@
#ifndef WS_EX_APPWINDOW
#define WS_EX_APPWINDOW 0x40000
#endif
#define SetWindowLongPtr SetWindowLong
#define GetWindowLongPtr GetWindowLong
#define GWLP_USERDATA GWL_USERDATA
//
#define SetWindowLongPtr SetWindowLong
//
#define GetWindowLongPtr GetWindowLong
//
#define GWLP_USERDATA GWL_USERDATA
#define AdjustWindowRect(a,b,c)
#endif //UNDER_CE
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment