ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

gtk: VirtualConsole restruction 

Move all vte-related items into VirtualVteConsole substruct.

Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
This commit is contained in:
Gerd Hoffmann 2014-04-30 13:53:16 +02:00
parent 832189c9b1
commit 271a25c0b6
1 changed files with 73 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

119
ui/gtk.c
View File

@ -105,15 +105,23 @@ static const int modifier_keycode[] = {
0x2a, 0x36, 0x1d, 0x9d, 0x38, 0xb8, 0xdb, 0xdd, 0x2a, 0x36, 0x1d, 0x9d, 0x38, 0xb8, 0xdb, 0xdd,
}; };
typedef struct VirtualConsole
{
GtkWidget *menu_item;
#if defined(CONFIG_VTE) #if defined(CONFIG_VTE)
typedef struct VirtualVteConsole {
GtkWidget *box; GtkWidget *box;
GtkWidget *scrollbar; GtkWidget *scrollbar;
GtkWidget *terminal; GtkWidget *terminal;
CharDriverState *chr; CharDriverState *chr;
} VirtualVteConsole;
#endif #endif
typedef struct VirtualConsole {
GtkWidget *menu_item;
GtkWidget *tab_item;
union {
#if defined(CONFIG_VTE)
VirtualVteConsole vte;
#endif
};
} VirtualConsole; } VirtualConsole;
typedef struct GtkDisplayState typedef struct GtkDisplayState
@ -178,6 +186,36 @@ static GtkDisplayState *global_state;
/** Utility Functions **/ /** Utility Functions **/
static VirtualConsole *gd_vc_find_by_menu(GtkDisplayState *s)
{
VirtualConsole *vc;
gint i;
for (i = 0; i < s->nb_vcs; i++) {
vc = &s->vc[i];
if (gtk_check_menu_item_get_active
(GTK_CHECK_MENU_ITEM(vc->menu_item))) {
return vc;
}
}
return NULL;
}
static VirtualConsole *gd_vc_find_by_page(GtkDisplayState *s, gint page)
{
VirtualConsole *vc;
gint i, p;
for (i = 0; i < s->nb_vcs; i++) {
vc = &s->vc[i];
p = gtk_notebook_page_num(GTK_NOTEBOOK(s->notebook), vc->tab_item);
if (p == page) {
return vc;
}
}
return NULL;
}
static bool gd_is_grab_active(GtkDisplayState *s) static bool gd_is_grab_active(GtkDisplayState *s)
{ {
return gtk_check_menu_item_get_active(GTK_CHECK_MENU_ITEM(s->grab_item)); return gtk_check_menu_item_get_active(GTK_CHECK_MENU_ITEM(s->grab_item));
@ -817,17 +855,12 @@ static void gd_menu_switch_vc(GtkMenuItem *item, void *opaque)
gtk_notebook_set_current_page(GTK_NOTEBOOK(s->notebook), page); gtk_notebook_set_current_page(GTK_NOTEBOOK(s->notebook), page);
} else { } else {
gtk_release_modifiers(s); gtk_release_modifiers(s);
#if defined(CONFIG_VTE) VirtualConsole *vc = gd_vc_find_by_menu(s);
gint i; if (vc) {
for (i = 0; i < s->nb_vcs; i++) { page = gtk_notebook_page_num(GTK_NOTEBOOK(s->notebook),
if (gtk_check_menu_item_get_active(GTK_CHECK_MENU_ITEM(s->vc[i].menu_item))) { vc->tab_item);
page = gtk_notebook_page_num(GTK_NOTEBOOK(s->notebook), gtk_notebook_set_current_page(GTK_NOTEBOOK(s->notebook), page);
s->vc[i].box);
gtk_notebook_set_current_page(GTK_NOTEBOOK(s->notebook), page);
return;
}
} }
#endif
} }
} }
@ -1091,20 +1124,12 @@ static void gd_change_page(GtkNotebook *nb, gpointer arg1, guint arg2,
if (on_vga) { if (on_vga) {
gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(s->vga_item), TRUE); gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(s->vga_item), TRUE);
} else { } else {
#if defined(CONFIG_VTE)
VirtualConsole *vc; VirtualConsole *vc;
gint page, i; vc = gd_vc_find_by_page(s, arg2);
for (i = 0; i < s->nb_vcs; i++) { if (vc) {
vc = &s->vc[i]; gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(vc->menu_item),
page = gtk_notebook_page_num(GTK_NOTEBOOK(s->notebook), vc->box); TRUE);
if (page == arg2) {
gtk_check_menu_item_set_active
(GTK_CHECK_MENU_ITEM(vc->menu_item), TRUE);
}
} }
#else
g_assert_not_reached();
#endif
} }
gtk_widget_set_sensitive(s->grab_item, on_vga); gtk_widget_set_sensitive(s->grab_item, on_vga);
@ -1153,9 +1178,9 @@ static void gd_vc_adjustment_changed(GtkAdjustment *adjustment, void *opaque)
if (gtk_adjustment_get_upper(adjustment) > if (gtk_adjustment_get_upper(adjustment) >
gtk_adjustment_get_page_size(adjustment)) { gtk_adjustment_get_page_size(adjustment)) {
gtk_widget_show(vc->scrollbar); gtk_widget_show(vc->vte.scrollbar);
} else { } else {
gtk_widget_hide(vc->scrollbar); gtk_widget_hide(vc->vte.scrollbar);
} }
} }
@ -1163,7 +1188,7 @@ static int gd_vc_chr_write(CharDriverState *chr, const uint8_t *buf, int len)
{ {
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->vte.terminal), (const char *)buf, len);
return len; return len;
} }
@ -1189,7 +1214,7 @@ static gboolean gd_vc_in(VteTerminal *terminal, gchar *text, guint size,
{ {
VirtualConsole *vc = user_data; VirtualConsole *vc = user_data;
qemu_chr_be_write(vc->chr, (uint8_t *)text, (unsigned int)size); qemu_chr_be_write(vc->vte.chr, (uint8_t *)text, (unsigned int)size);
return TRUE; return TRUE;
} }
@ -1206,10 +1231,10 @@ static GSList *gd_vc_init(GtkDisplayState *s, VirtualConsole *vc, int index, GSL
snprintf(buffer, sizeof(buffer), "vc%d", index); snprintf(buffer, sizeof(buffer), "vc%d", index);
snprintf(path, sizeof(path), "<QEMU>/View/VC%d", index); snprintf(path, sizeof(path), "<QEMU>/View/VC%d", index);
vc->chr = vcs[index]; vc->vte.chr = vcs[index];
if (vc->chr->label) { if (vc->vte.chr->label) {
label = vc->chr->label; label = vc->vte.chr->label;
} else { } else {
label = buffer; label = buffer;
} }
@ -1219,16 +1244,17 @@ static GSList *gd_vc_init(GtkDisplayState *s, VirtualConsole *vc, int index, GSL
gtk_menu_item_set_accel_path(GTK_MENU_ITEM(vc->menu_item), path); gtk_menu_item_set_accel_path(GTK_MENU_ITEM(vc->menu_item), path);
gtk_accel_map_add_entry(path, GDK_KEY_2 + index, HOTKEY_MODIFIERS); gtk_accel_map_add_entry(path, GDK_KEY_2 + index, HOTKEY_MODIFIERS);
vc->terminal = vte_terminal_new(); vc->vte.terminal = vte_terminal_new();
g_signal_connect(vc->terminal, "commit", G_CALLBACK(gd_vc_in), vc); g_signal_connect(vc->vte.terminal, "commit", G_CALLBACK(gd_vc_in), vc);
vte_terminal_set_scrollback_lines(VTE_TERMINAL(vc->terminal), -1); vte_terminal_set_scrollback_lines(VTE_TERMINAL(vc->vte.terminal), -1);
vte_terminal_set_size(VTE_TERMINAL(vc->terminal), 80, 25); vte_terminal_set_size(VTE_TERMINAL(vc->vte.terminal), 80, 25);
#if VTE_CHECK_VERSION(0, 28, 0) && GTK_CHECK_VERSION(3, 0, 0) #if VTE_CHECK_VERSION(0, 28, 0) && GTK_CHECK_VERSION(3, 0, 0)
vadjustment = gtk_scrollable_get_vadjustment(GTK_SCROLLABLE(vc->terminal)); vadjustment = gtk_scrollable_get_vadjustment
(GTK_SCROLLABLE(vc->vte.terminal));
#else #else
vadjustment = vte_terminal_get_adjustment(VTE_TERMINAL(vc->terminal)); vadjustment = vte_terminal_get_adjustment(VTE_TERMINAL(vc->vte.terminal));
#endif #endif
#if GTK_CHECK_VERSION(3, 0, 0) #if GTK_CHECK_VERSION(3, 0, 0)
@ -1239,26 +1265,27 @@ static GSList *gd_vc_init(GtkDisplayState *s, VirtualConsole *vc, int index, GSL
scrollbar = gtk_vscrollbar_new(vadjustment); scrollbar = gtk_vscrollbar_new(vadjustment);
#endif #endif
gtk_box_pack_start(GTK_BOX(box), vc->terminal, TRUE, TRUE, 0); gtk_box_pack_start(GTK_BOX(box), vc->vte.terminal, TRUE, TRUE, 0);
gtk_box_pack_start(GTK_BOX(box), scrollbar, FALSE, FALSE, 0); gtk_box_pack_start(GTK_BOX(box), scrollbar, FALSE, FALSE, 0);
vc->chr->opaque = vc; vc->vte.chr->opaque = vc;
vc->box = box; vc->vte.box = box;
vc->scrollbar = scrollbar; vc->vte.scrollbar = scrollbar;
g_signal_connect(vadjustment, "changed", g_signal_connect(vadjustment, "changed",
G_CALLBACK(gd_vc_adjustment_changed), vc); G_CALLBACK(gd_vc_adjustment_changed), vc);
gtk_notebook_append_page(GTK_NOTEBOOK(s->notebook), box, vc->tab_item = box;
gtk_notebook_append_page(GTK_NOTEBOOK(s->notebook), vc->tab_item,
gtk_label_new(label)); gtk_label_new(label));
g_signal_connect(vc->menu_item, "activate", g_signal_connect(vc->menu_item, "activate",
G_CALLBACK(gd_menu_switch_vc), s); G_CALLBACK(gd_menu_switch_vc), s);
gtk_menu_shell_append(GTK_MENU_SHELL(view_menu), vc->menu_item); gtk_menu_shell_append(GTK_MENU_SHELL(view_menu), vc->menu_item);
qemu_chr_be_generic_open(vc->chr); qemu_chr_be_generic_open(vc->vte.chr);
if (vc->chr->init) { if (vc->vte.chr->init) {
vc->chr->init(vc->chr); vc->vte.chr->init(vc->vte.chr);
} }
return group; return group;