Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
openeuler
qemu
提交
ee5f31e4
Q
qemu
项目概览
openeuler
/
qemu
通知
10
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
Q
qemu
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
ee5f31e4
编写于
4月 29, 2014
作者:
G
Gerd Hoffmann
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
gtk: cleanup CONFIG_VTE ifdef a bit.
Signed-off-by:
N
Gerd Hoffmann
<
kraxel@redhat.com
>
上级
6fe83074
变更
1
显示空白变更内容
内联
并排
Showing
1 changed file
with
26 addition
and
19 deletion
+26
-19
ui/gtk.c
ui/gtk.c
+26
-19
未找到文件。
ui/gtk.c
浏览文件 @
ee5f31e4
...
@@ -108,8 +108,8 @@ static const int modifier_keycode[] = {
...
@@ -108,8 +108,8 @@ static const int modifier_keycode[] = {
typedef
struct
VirtualConsole
typedef
struct
VirtualConsole
{
{
GtkWidget
*
menu_item
;
GtkWidget
*
menu_item
;
GtkWidget
*
terminal
;
#if defined(CONFIG_VTE)
#if defined(CONFIG_VTE)
GtkWidget
*
terminal
;
CharDriverState
*
chr
;
CharDriverState
*
chr
;
#endif
#endif
}
VirtualConsole
;
}
VirtualConsole
;
...
@@ -1124,13 +1124,12 @@ static gboolean gd_focus_out_event(GtkWidget *widget,
...
@@ -1124,13 +1124,12 @@ static gboolean gd_focus_out_event(GtkWidget *widget,
/** Virtual Console Callbacks **/
/** Virtual Console Callbacks **/
#if defined(CONFIG_VTE)
static
int
gd_vc_chr_write
(
CharDriverState
*
chr
,
const
uint8_t
*
buf
,
int
len
)
static
int
gd_vc_chr_write
(
CharDriverState
*
chr
,
const
uint8_t
*
buf
,
int
len
)
{
{
#if defined(CONFIG_VTE)
VirtualConsole
*
vc
=
chr
->
opaque
;
VirtualConsole
*
vc
=
chr
->
opaque
;
vte_terminal_feed
(
VTE_TERMINAL
(
vc
->
terminal
),
(
const
char
*
)
buf
,
len
);
vte_terminal_feed
(
VTE_TERMINAL
(
vc
->
terminal
),
(
const
char
*
)
buf
,
len
);
#endif
return
len
;
return
len
;
}
}
...
@@ -1151,12 +1150,6 @@ static CharDriverState *gd_vc_handler(ChardevVC *unused)
...
@@ -1151,12 +1150,6 @@ static CharDriverState *gd_vc_handler(ChardevVC *unused)
return
chr
;
return
chr
;
}
}
void
early_gtk_display_init
(
void
)
{
register_vc_handler
(
gd_vc_handler
);
}
#if defined(CONFIG_VTE)
static
gboolean
gd_vc_in
(
VteTerminal
*
terminal
,
gchar
*
text
,
guint
size
,
static
gboolean
gd_vc_in
(
VteTerminal
*
terminal
,
gchar
*
text
,
guint
size
,
gpointer
user_data
)
gpointer
user_data
)
{
{
...
@@ -1165,12 +1158,10 @@ static gboolean gd_vc_in(VteTerminal *terminal, gchar *text, guint size,
...
@@ -1165,12 +1158,10 @@ static gboolean gd_vc_in(VteTerminal *terminal, gchar *text, guint size,
qemu_chr_be_write
(
vc
->
chr
,
(
uint8_t
*
)
text
,
(
unsigned
int
)
size
);
qemu_chr_be_write
(
vc
->
chr
,
(
uint8_t
*
)
text
,
(
unsigned
int
)
size
);
return
TRUE
;
return
TRUE
;
}
}
#endif
static
GSList
*
gd_vc_init
(
GtkDisplayState
*
s
,
VirtualConsole
*
vc
,
int
index
,
GSList
*
group
,
static
GSList
*
gd_vc_init
(
GtkDisplayState
*
s
,
VirtualConsole
*
vc
,
int
index
,
GSList
*
group
,
GtkWidget
*
view_menu
)
GtkWidget
*
view_menu
)
{
{
#if defined(CONFIG_VTE)
const
char
*
label
;
const
char
*
label
;
char
buffer
[
32
];
char
buffer
[
32
];
char
path
[
32
];
char
path
[
32
];
...
@@ -1212,10 +1203,23 @@ static GSList *gd_vc_init(GtkDisplayState *s, VirtualConsole *vc, int index, GSL
...
@@ -1212,10 +1203,23 @@ static GSList *gd_vc_init(GtkDisplayState *s, VirtualConsole *vc, int index, GSL
vc
->
chr
->
init
(
vc
->
chr
);
vc
->
chr
->
init
(
vc
->
chr
);
}
}
#endif
/* CONFIG_VTE */
return
group
;
return
group
;
}
}
static
void
gd_vcs_init
(
GtkDisplayState
*
s
,
GSList
*
group
,
GtkWidget
*
view_menu
)
{
int
i
;
for
(
i
=
0
;
i
<
nb_vcs
;
i
++
)
{
VirtualConsole
*
vc
=
&
s
->
vc
[
i
];
group
=
gd_vc_init
(
s
,
vc
,
i
,
group
,
view_menu
);
s
->
nb_vcs
++
;
}
}
#endif
/* CONFIG_VTE */
/** Window Creation **/
/** Window Creation **/
static
void
gd_connect_signals
(
GtkDisplayState
*
s
)
static
void
gd_connect_signals
(
GtkDisplayState
*
s
)
...
@@ -1316,7 +1320,6 @@ static GtkWidget *gd_create_menu_view(GtkDisplayState *s, GtkAccelGroup *accel_g
...
@@ -1316,7 +1320,6 @@ static GtkWidget *gd_create_menu_view(GtkDisplayState *s, GtkAccelGroup *accel_g
GSList
*
group
=
NULL
;
GSList
*
group
=
NULL
;
GtkWidget
*
view_menu
;
GtkWidget
*
view_menu
;
GtkWidget
*
separator
;
GtkWidget
*
separator
;
int
i
;
view_menu
=
gtk_menu_new
();
view_menu
=
gtk_menu_new
();
gtk_menu_set_accel_group
(
GTK_MENU
(
view_menu
),
accel_group
);
gtk_menu_set_accel_group
(
GTK_MENU
(
view_menu
),
accel_group
);
...
@@ -1378,12 +1381,9 @@ static GtkWidget *gd_create_menu_view(GtkDisplayState *s, GtkAccelGroup *accel_g
...
@@ -1378,12 +1381,9 @@ static GtkWidget *gd_create_menu_view(GtkDisplayState *s, GtkAccelGroup *accel_g
gtk_accel_map_add_entry
(
"<QEMU>/View/VGA"
,
GDK_KEY_1
,
HOTKEY_MODIFIERS
);
gtk_accel_map_add_entry
(
"<QEMU>/View/VGA"
,
GDK_KEY_1
,
HOTKEY_MODIFIERS
);
gtk_menu_shell_append
(
GTK_MENU_SHELL
(
view_menu
),
s
->
vga_item
);
gtk_menu_shell_append
(
GTK_MENU_SHELL
(
view_menu
),
s
->
vga_item
);
for
(
i
=
0
;
i
<
nb_vcs
;
i
++
)
{
#if defined(CONFIG_VTE)
VirtualConsole
*
vc
=
&
s
->
vc
[
i
];
gd_vcs_init
(
s
,
group
,
view_menu
);
#endif
group
=
gd_vc_init
(
s
,
vc
,
i
,
group
,
view_menu
);
s
->
nb_vcs
++
;
}
separator
=
gtk_separator_menu_item_new
();
separator
=
gtk_separator_menu_item_new
();
gtk_menu_shell_append
(
GTK_MENU_SHELL
(
view_menu
),
separator
);
gtk_menu_shell_append
(
GTK_MENU_SHELL
(
view_menu
),
separator
);
...
@@ -1512,3 +1512,10 @@ void gtk_display_init(DisplayState *ds, bool full_screen, bool grab_on_hover)
...
@@ -1512,3 +1512,10 @@ void gtk_display_init(DisplayState *ds, bool full_screen, bool grab_on_hover)
global_state
=
s
;
global_state
=
s
;
}
}
void
early_gtk_display_init
(
void
)
{
#if defined(CONFIG_VTE)
register_vc_handler
(
gd_vc_handler
);
#endif
}
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录