Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
openanolis
dragonwell8_jdk
提交
6a4cda21
D
dragonwell8_jdk
项目概览
openanolis
/
dragonwell8_jdk
通知
3
Star
2
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
D
dragonwell8_jdk
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
6a4cda21
编写于
3月 21, 2013
作者:
A
alexsch
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
8007146: [macosx] Setting a display mode crashes JDK under VNC
Reviewed-by: serb
上级
13136f66
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
111 addition
and
8 deletion
+111
-8
src/macosx/native/sun/awt/CGraphicsDevice.m
src/macosx/native/sun/awt/CGraphicsDevice.m
+47
-8
test/java/awt/GraphicsDevice/CheckDisplayModes.java
test/java/awt/GraphicsDevice/CheckDisplayModes.java
+64
-0
未找到文件。
src/macosx/native/sun/awt/CGraphicsDevice.m
浏览文件 @
6a4cda21
...
...
@@ -49,6 +49,42 @@ static int getBPPFromModeString(CFStringRef mode)
return
0
;
}
static
BOOL
isValidDisplayMode
(
CGDisplayModeRef
mode
){
return
(
1
<
CGDisplayModeGetWidth
(
mode
)
&&
1
<
CGDisplayModeGetHeight
(
mode
));
}
static
CFMutableArrayRef
getAllValidDisplayModes
(
jint
displayID
){
CFArrayRef
allModes
=
CGDisplayCopyAllDisplayModes
(
displayID
,
NULL
);
CFIndex
numModes
=
CFArrayGetCount
(
allModes
);
CFMutableArrayRef
validModes
=
CFArrayCreateMutable
(
kCFAllocatorDefault
,
numModes
+
1
,
NULL
);
CFIndex
n
;
for
(
n
=
0
;
n
<
numModes
;
n
++
)
{
CGDisplayModeRef
cRef
=
(
CGDisplayModeRef
)
CFArrayGetValueAtIndex
(
allModes
,
n
);
if
(
cRef
!=
NULL
&&
isValidDisplayMode
(
cRef
))
{
CFArrayAppendValue
(
validModes
,
cRef
);
}
}
CGDisplayModeRef
currentMode
=
CGDisplayCopyDisplayMode
(
displayID
);
BOOL
containsCurrentMode
=
NO
;
numModes
=
CFArrayGetCount
(
validModes
);
for
(
n
=
0
;
n
<
numModes
;
n
++
)
{
if
(
CFArrayGetValueAtIndex
(
validModes
,
n
)
==
currentMode
){
containsCurrentMode
=
YES
;
break
;
}
}
if
(
!
containsCurrentMode
)
{
CFArrayAppendValue
(
validModes
,
currentMode
);
}
return
validModes
;
}
/*
* Find the best possible match in the list of display modes that we can switch to based on
* the provided parameters.
...
...
@@ -198,28 +234,30 @@ Java_sun_awt_CGraphicsDevice_nativeSetDisplayMode
(
JNIEnv
*
env
,
jclass
class
,
jint
displayID
,
jint
w
,
jint
h
,
jint
bpp
,
jint
refrate
)
{
JNF_COCOA_ENTER
(
env
);
CFArrayRef
allModes
=
CGDisplayCopyAllDisplayModes
(
displayID
,
NULL
);
CFArrayRef
allModes
=
getAllValidDisplayModes
(
displayID
);
CGDisplayModeRef
closestMatch
=
getBestModeForParameters
(
allModes
,
(
int
)
w
,
(
int
)
h
,
(
int
)
bpp
,
(
int
)
refrate
);
__block
CGError
retCode
=
kCGErrorSuccess
;
if
(
closestMatch
!=
NULL
)
{
[
JNFRunLoop
performOnMainThreadWaiting
:
YES
withBlock
:
^
(){
CGDisplayConfigRef
config
;
CGError
retCode
=
CGBeginDisplayConfiguration
(
&
config
);
retCode
=
CGBeginDisplayConfiguration
(
&
config
);
if
(
retCode
==
kCGErrorSuccess
)
{
CGConfigureDisplayWithDisplayMode
(
config
,
displayID
,
closestMatch
,
NULL
);
CGCompleteDisplayConfiguration
(
config
,
kCGConfigureForAppOnly
);
if
(
config
!=
NULL
)
{
CFRelease
(
config
);
}
retCode
=
CGCompleteDisplayConfiguration
(
config
,
kCGConfigureForAppOnly
);
}
}];
}
else
{
[
JNFException
raise
:
env
as
:
kIllegalArgumentException
reason
:
"Invalid display mode"
];
}
if
(
retCode
!=
kCGErrorSuccess
){
[
JNFException
raise
:
env
as
:
kIllegalArgumentException
reason
:
"Unable to set display mode!"
];
}
CFRelease
(
allModes
);
JNF_COCOA_EXIT
(
env
);
}
/*
* Class: sun_awt_CGraphicsDevice
* Method: nativeGetDisplayMode
...
...
@@ -247,7 +285,8 @@ Java_sun_awt_CGraphicsDevice_nativeGetDisplayModes
{
jobjectArray
jreturnArray
=
NULL
;
JNF_COCOA_ENTER
(
env
);
CFArrayRef
allModes
=
CGDisplayCopyAllDisplayModes
(
displayID
,
NULL
);
CFArrayRef
allModes
=
getAllValidDisplayModes
(
displayID
);
CFIndex
numModes
=
CFArrayGetCount
(
allModes
);
static
JNF_CLASS_CACHE
(
jc_DisplayMode
,
"java/awt/DisplayMode"
);
...
...
test/java/awt/GraphicsDevice/CheckDisplayModes.java
0 → 100644
浏览文件 @
6a4cda21
/*
* Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License version 2 only, as
* published by the Free Software Foundation.
*
* This code is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
* version 2 for more details (a copy is included in the LICENSE file that
* accompanied this code).
*
* You should have received a copy of the GNU General Public License version
* 2 along with this work; if not, write to the Free Software Foundation,
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
*
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
* or visit www.oracle.com if you need additional information or have any
* questions.
*/
/*
* @test
* @bug 8007146
* @summary [macosx] Setting a display mode crashes JDK under VNC
* @author Alexander Scherbatiy
* @run main CheckDisplayModes
*/
import
java.awt.DisplayMode
;
import
java.awt.GraphicsDevice
;
import
java.awt.GraphicsEnvironment
;
public
class
CheckDisplayModes
{
public
static
void
main
(
String
[]
args
)
{
GraphicsEnvironment
ge
=
GraphicsEnvironment
.
getLocalGraphicsEnvironment
();
GraphicsDevice
graphicDevice
=
ge
.
getDefaultScreenDevice
();
DisplayMode
defaultDisplayMode
=
graphicDevice
.
getDisplayMode
();
checkDisplayMode
(
defaultDisplayMode
);
graphicDevice
.
setDisplayMode
(
defaultDisplayMode
);
DisplayMode
[]
displayModes
=
graphicDevice
.
getDisplayModes
();
boolean
isDefaultDisplayModeIncluded
=
false
;
for
(
DisplayMode
displayMode
:
displayModes
)
{
checkDisplayMode
(
displayMode
);
graphicDevice
.
setDisplayMode
(
displayMode
);
if
(
defaultDisplayMode
.
equals
(
displayMode
))
{
isDefaultDisplayModeIncluded
=
true
;
}
}
if
(!
isDefaultDisplayModeIncluded
)
{
throw
new
RuntimeException
(
"Default display mode is not included"
);
}
}
static
void
checkDisplayMode
(
DisplayMode
displayMode
)
{
if
(
displayMode
==
null
||
displayMode
.
getWidth
()
<=
1
||
displayMode
.
getHeight
()
<=
1
)
{
throw
new
RuntimeException
(
"invalid display mode"
);
}
}
}
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录