Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
L
libSDL
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
PocketInsanity
libSDL
Commits
b3840496
Commit
b3840496
authored
Aug 15, 2010
by
Eli Gottlieb
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Changed flags and positioning (for the fake-hiding) as Andreas recommended.
parent
6d464375
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
17 additions
and
11 deletions
+17
-11
SDL_shape.c
src/video/SDL_shape.c
+7
-5
SDL_sysvideo.h
src/video/SDL_sysvideo.h
+2
-2
SDL_win32shape.c
src/video/win32/SDL_win32shape.c
+4
-2
SDL_x11shape.c
src/video/x11/SDL_x11shape.c
+4
-2
No files found.
src/video/SDL_shape.c
View file @
b3840496
...
...
@@ -32,11 +32,12 @@
SDL_Window
*
SDL_CreateShapedWindow
(
const
char
*
title
,
unsigned
int
x
,
unsigned
int
y
,
unsigned
int
w
,
unsigned
int
h
,
Uint32
flags
)
{
SDL_Window
*
result
=
SDL_CreateWindow
(
title
,
x
,
y
,
w
,
h
,
flags
|
SDL_WINDOW_BORDERLESS
&
!
SDL_WINDOW_FULLSCREEN
&
!
SDL_WINDOW_
SHOWN
);
SDL_Window
*
result
=
SDL_CreateWindow
(
title
,
x
,
y
,
w
,
h
,
flags
|
SDL_WINDOW_BORDERLESS
&
!
SDL_WINDOW_FULLSCREEN
&
!
SDL_WINDOW_
RESIZABLE
);
if
(
result
!=
NULL
)
{
result
->
shaper
=
result
->
display
->
device
->
shape_driver
.
CreateShaper
(
result
);
if
(
result
->
shaper
!=
NULL
)
{
result
->
shaper
->
usershownflag
=
flags
&
SDL_WINDOW_SHOWN
;
result
->
shaper
->
userx
=
x
;
result
->
shaper
->
usery
=
y
;
result
->
shaper
->
mode
.
mode
=
ShapeModeDefault
;
result
->
shaper
->
mode
.
parameters
.
binarizationCutoff
=
1
;
result
->
shaper
->
hasshape
=
SDL_FALSE
;
...
...
@@ -239,9 +240,10 @@ SDL_SetWindowShape(SDL_Window *window,SDL_Surface *shape,SDL_WindowShapeMode *sh
window
->
shaper
->
mode
=
*
shape_mode
;
result
=
window
->
display
->
device
->
shape_driver
.
SetWindowShape
(
window
->
shaper
,
shape
,
shape_mode
);
window
->
shaper
->
hasshape
=
SDL_TRUE
;
if
((
window
->
shaper
->
usershownflag
&
SDL_WINDOW_SHOWN
)
==
SDL_WINDOW_SHOWN
)
{
SDL_ShowWindow
(
window
);
window
->
shaper
->
usershownflag
&=
!
SDL_WINDOW_SHOWN
;
if
(
window
->
shaper
->
userx
==
0
&&
window
->
shaper
->
usery
==
0
)
{
SDL_SetWindowPosition
(
window
,
window
->
shaper
->
userx
,
window
->
shaper
->
usery
);
window
->
shaper
->
userx
=
0
;
window
->
shaper
->
usery
=
0
;
}
return
result
;
}
...
...
src/video/SDL_sysvideo.h
View file @
b3840496
...
...
@@ -141,8 +141,8 @@ struct SDL_WindowShaper
/* The window associated with the shaper */
SDL_Window
*
window
;
/* The user's specified
SDL_WINDOW_SHOWN flag, for use once the user gives the window
a shape. */
Uint32
user
shownflag
;
/* The user's specified
coordinates for the window, for once we give it
a shape. */
Uint32
user
x
,
usery
;
/* The parameters for shape calculation. */
SDL_WindowShapeMode
mode
;
...
...
src/video/win32/SDL_win32shape.c
View file @
b3840496
...
...
@@ -32,7 +32,7 @@ Win32_CreateShaper(SDL_Window * window) {
result
->
window
=
window
;
result
->
mode
.
mode
=
ShapeModeDefault
;
result
->
mode
.
parameters
.
binarizationCutoff
=
1
;
result
->
user
shownflag
=
0
;
result
->
user
x
=
result
->
usery
=
0
;
result
->
driverdata
=
(
SDL_ShapeData
*
)
SDL_malloc
(
sizeof
(
SDL_ShapeData
));
((
SDL_ShapeData
*
)
result
->
driverdata
)
->
mask_tree
=
NULL
;
//Put some driver-data here.
...
...
@@ -101,7 +101,9 @@ Win32_ResizeWindowShape(SDL_Window *window) {
if
(
data
->
mask_tree
!=
NULL
)
SDL_FreeShapeTree
(
&
data
->
mask_tree
);
window
->
shaper
->
usershownflag
|=
window
->
flags
&
SDL_WINDOW_SHOWN
;
window
->
shaper
->
userx
=
window
->
x
;
window
->
shaper
->
usery
=
window
->
y
;
SDL_SetWindowPosition
(
window
,
-
1000
,
-
1000
);
return
0
;
}
src/video/x11/SDL_x11shape.c
View file @
b3840496
...
...
@@ -40,7 +40,7 @@ X11_CreateShaper(SDL_Window* window) {
result
->
window
=
window
;
result
->
mode
.
mode
=
ShapeModeDefault
;
result
->
mode
.
parameters
.
binarizationCutoff
=
1
;
result
->
user
shownflag
=
0
;
result
->
user
x
=
result
->
usery
=
0
;
SDL_ShapeData
*
data
=
SDL_malloc
(
sizeof
(
SDL_ShapeData
));
result
->
driverdata
=
data
;
data
->
bitmapsize
=
0
;
...
...
@@ -75,7 +75,9 @@ X11_ResizeWindowShape(SDL_Window* window) {
}
memset
(
data
->
bitmap
,
0
,
data
->
bitmapsize
);
window
->
shaper
->
usershownflag
|=
window
->
flags
&
SDL_WINDOW_SHOWN
;
window
->
shaper
->
userx
=
window
->
x
;
window
->
shaper
->
usery
=
window
->
y
;
SDL_SetWindowPosition
(
window
,
-
1000
,
-
1000
);
return
0
;
}
...
...
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