Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
S
skiko
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
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
liuqiang
skiko
Commits
4bc1824a
Commit
4bc1824a
authored
Sep 09, 2020
by
Roman Sedaikin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Added function getWindowHandle() for JCEF support.
parent
5c7a7ff6
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
94 additions
and
7 deletions
+94
-7
drawlayer.cc
skiko/src/jvmMain/cpp/linux/drawlayer.cc
+38
-0
drawlayer.cc
skiko/src/jvmMain/cpp/windows/drawlayer.cc
+40
-0
Drawable.kt
skiko/src/jvmMain/kotlin/org/jetbrains/skiko/Drawable.kt
+8
-7
HardwareLayer.kt
...o/src/jvmMain/kotlin/org/jetbrains/skiko/HardwareLayer.kt
+2
-0
drawlayer.m
skiko/src/jvmMain/objectiveC/macos/drawlayer.m
+6
-0
No files found.
skiko/src/jvmMain/cpp/linux/drawlayer.cc
View file @
4bc1824a
...
...
@@ -195,4 +195,42 @@ extern "C"
{
return
1.0
f
;
}
JNIEXPORT
jlong
JNICALL
Java_org_jetbrains_skiko_HardwareLayer_getWindowHandle
(
JNIEnv
*
env
,
jobject
canvas
)
{
JAWT
awt
;
JAWT_DrawingSurface
*
ds
=
NULL
;
JAWT_DrawingSurfaceInfo
*
dsi
=
NULL
;
jboolean
result
=
JNI_FALSE
;
jint
lock
=
0
;
JAWT_X11DrawingSurfaceInfo
*
dsi_x11
;
awt
.
version
=
(
jint
)
JAWT_VERSION_9
;
result
=
Skiko_GetAWT
(
env
,
&
awt
);
if
(
result
==
JNI_FALSE
)
{
fprintf
(
stderr
,
"JAWT_GetAWT failed! Result is JNI_FALSE
\n
"
);
return
;
}
if
(
jvm
==
NULL
)
{
env
->
GetJavaVM
(
&
jvm
);
}
ds
=
awt
.
GetDrawingSurface
(
env
,
canvas
);
lock
=
ds
->
Lock
(
ds
);
dsi
=
ds
->
GetDrawingSurfaceInfo
(
ds
);
dsi_x11
=
(
JAWT_X11DrawingSurfaceInfo
*
)
dsi
->
platformInfo
;
Window
window
=
dsi_x11
->
drawable
;
ds
->
FreeDrawingSurfaceInfo
(
dsi
);
ds
->
Unlock
(
ds
);
awt
.
FreeDrawingSurface
(
ds
);
return
(
jlong
)
window
;
}
}
// extern "C"
\ No newline at end of file
skiko/src/jvmMain/cpp/windows/drawlayer.cc
View file @
4bc1824a
...
...
@@ -194,4 +194,44 @@ extern "C"
}
return
1.0
f
;
}
JNIEXPORT
jlong
JNICALL
Java_org_jetbrains_skiko_HardwareLayer_getWindowHandle
(
JNIEnv
*
env
,
jobject
window
)
{
JAWT
awt
;
JAWT_DrawingSurface
*
ds
=
NULL
;
JAWT_DrawingSurfaceInfo
*
dsi
=
NULL
;
PIXELFORMATDESCRIPTOR
pixFormatDscr
;
HGLRC
context
=
NULL
;
jboolean
result
=
JNI_FALSE
;
jint
lock
=
0
;
JAWT_Win32DrawingSurfaceInfo
*
dsi_win
;
awt
.
version
=
(
jint
)
JAWT_VERSION_9
;
result
=
Skiko_GetAWT
(
env
,
&
awt
);
if
(
result
==
JNI_FALSE
)
{
fprintf
(
stderr
,
"JAWT_GetAWT failed! Result is JNI_FALSE
\n
"
);
return
-
1
;
}
if
(
jvm
==
NULL
)
{
env
->
GetJavaVM
(
&
jvm
);
}
ds
=
awt
.
GetDrawingSurface
(
env
,
window
);
lock
=
ds
->
Lock
(
ds
);
dsi
=
ds
->
GetDrawingSurfaceInfo
(
ds
);
dsi_win
=
(
JAWT_Win32DrawingSurfaceInfo
*
)
dsi
->
platformInfo
;
HWND
hwnd
=
dsi_win
->
hwnd
;
ds
->
FreeDrawingSurfaceInfo
(
dsi
);
ds
->
Unlock
(
ds
);
awt
.
FreeDrawingSurface
(
ds
);
return
(
jlong
)
hwnd
;
}
}
// extern "C"
\ No newline at end of file
skiko/src/jvmMain/kotlin/org/jetbrains/skiko/Drawable.kt
100644 → 100755
View file @
4bc1824a
package
org.jetbrains.skiko
interface
Drawable
{
fun
redrawLayer
()
fun
updateLayer
()
fun
disposeLayer
()
val
contentScale
:
Float
package
org.jetbrains.skiko
interface
Drawable
{
fun
redrawLayer
()
fun
updateLayer
()
fun
disposeLayer
()
val
windowHandle
:
Int
val
contentScale
:
Float
}
\ No newline at end of file
skiko/src/jvmMain/kotlin/org/jetbrains/skiko/HardwareLayer.kt
100644 → 100755
View file @
4bc1824a
...
...
@@ -15,6 +15,8 @@ open class HardwareLayer : Canvas(), Drawable {
external
override
fun
redrawLayer
()
external
override
fun
updateLayer
()
external
override
fun
disposeLayer
()
override
val
windowHandle
:
Int
external
get
override
val
contentScale
:
Float
external
get
}
\ No newline at end of file
skiko/src/jvmMain/objectiveC/macos/drawlayer.m
View file @
4bc1824a
...
...
@@ -3,6 +3,8 @@
#define GL_SILENCE_DEPRECATION
#define kNullWindowHandle NULL
#import <Cocoa/Cocoa.h>
#import <QuartzCore/QuartzCore.h>
#import <OpenGL/gl3.h>
...
...
@@ -228,3 +230,7 @@ JNIEXPORT jfloat JNICALL Java_org_jetbrains_skiko_HardwareLayer_getContentScale(
}
return
1
.
0
f
;
}
JNIEXPORT
jlong
JNICALL
Java_org_jetbrains_skiko_HardwareLayer_getWindowHandle
(
JNIEnv
*
env
,
jobject
window
)
{
return
(
jlong
)
kNullWindowHandle
;
}
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