HybridDog/geany
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Added the GTK IM menu items to the VTE popup menu.

Browse Source 
git-svn-id: https://geany.svn.sourceforge.net/svnroot/geany/trunk@710 ea778897-0a13-0410-b9d1-a72fbfd435f5
This commit is contained in:
Enrico Tröger 2006-08-13 08:45:59 +00:00
parent 6b1d4c2b2d
commit c308b37049
3 changed files with 26 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@ -3,6 +3,7 @@
* src/document.c: * src/document.c:
Use wrappers for converting between utf8 and locale encoding. Use wrappers for converting between utf8 and locale encoding.
Fixed small memory leak. Fixed small memory leak.
* src/vte.c: Added the GTK IM menu items to the VTE popup menu.
2006-08-12 Enrico Tröger <enrico.troeger@uvena.de> 2006-08-12 Enrico Tröger <enrico.troeger@uvena.de>

24
src/vte.c
View File

@ -41,6 +41,7 @@ extern gchar **environ;
static pid_t pid; static pid_t pid;
static GModule *module = NULL; static GModule *module = NULL;
static struct vte_funcs *vf; static struct vte_funcs *vf;
static gboolean popup_menu_created = FALSE;
#define VTE_TERMINAL(obj) (GTK_CHECK_CAST((obj), VTE_TYPE_TERMINAL, VteTerminal)) #define VTE_TERMINAL(obj) (GTK_CHECK_CAST((obj), VTE_TYPE_TERMINAL, VteTerminal))
@ -135,7 +136,6 @@ void vte_init(void)
vte = vf->vte_terminal_new(); vte = vf->vte_terminal_new();
vc->vte = vte; vc->vte = vte;
vc->menu = vte_create_popup_menu();
scrollbar = gtk_vscrollbar_new(GTK_ADJUSTMENT(VTE_TERMINAL(vte)->adjustment)); scrollbar = gtk_vscrollbar_new(GTK_ADJUSTMENT(VTE_TERMINAL(vte)->adjustment));
GTK_WIDGET_UNSET_FLAGS(scrollbar, GTK_CAN_FOCUS); GTK_WIDGET_UNSET_FLAGS(scrollbar, GTK_CAN_FOCUS);
@ -181,7 +181,7 @@ void vte_close(void)
* this prevents a segfault on X close window if the message window is hidden * this prevents a segfault on X close window if the message window is hidden
* (patch from Nick Treleaven, thanks) */ * (patch from Nick Treleaven, thanks) */
gtk_widget_destroy(vc->vte); gtk_widget_destroy(vc->vte);
gtk_widget_destroy(vc->menu); if (popup_menu_created) gtk_widget_destroy(vc->menu);
g_free(vc->font); g_free(vc->font);
g_free(vc->emulation); g_free(vc->emulation);
g_free(vc->color_back); g_free(vc->color_back);
@ -243,6 +243,13 @@ static gboolean vte_button_pressed(GtkWidget *widget, GdkEventButton *event, gpo
{ {
if (event->button == 3) if (event->button == 3)
{ {
if (! popup_menu_created)
{
vc->menu = vte_create_popup_menu();
vf->vte_terminal_im_append_menuitems(VTE_TERMINAL(vc->vte), GTK_MENU_SHELL(vc->im_submenu));
popup_menu_created = TRUE;
}
gtk_menu_popup(GTK_MENU(vc->menu), NULL, NULL, NULL, NULL, event->button, event->time); gtk_menu_popup(GTK_MENU(vc->menu), NULL, NULL, NULL, NULL, event->button, event->time);
} }
@ -283,6 +290,7 @@ static void vte_register_symbols(GModule *mod)
g_module_symbol(mod, "vte_terminal_set_color_foreground", (void*)&vf->vte_terminal_set_color_foreground); g_module_symbol(mod, "vte_terminal_set_color_foreground", (void*)&vf->vte_terminal_set_color_foreground);
g_module_symbol(mod, "vte_terminal_set_color_background", (void*)&vf->vte_terminal_set_color_background); g_module_symbol(mod, "vte_terminal_set_color_background", (void*)&vf->vte_terminal_set_color_background);
g_module_symbol(mod, "vte_terminal_feed_child", (void*)&vf->vte_terminal_feed_child); g_module_symbol(mod, "vte_terminal_feed_child", (void*)&vf->vte_terminal_feed_child);
g_module_symbol(mod, "vte_terminal_im_append_menuitems", (void*)&vf->vte_terminal_im_append_menuitems);
} }
@ -378,6 +386,18 @@ static GtkWidget *vte_create_popup_menu(void)
gtk_container_add(GTK_CONTAINER(menu), item); gtk_container_add(GTK_CONTAINER(menu), item);
g_signal_connect((gpointer)item, "activate", G_CALLBACK(vte_popup_menu_clicked), GINT_TO_POINTER(2)); g_signal_connect((gpointer)item, "activate", G_CALLBACK(vte_popup_menu_clicked), GINT_TO_POINTER(2));
item = gtk_separator_menu_item_new();
gtk_widget_show(item);
gtk_container_add(GTK_CONTAINER(menu), item);
vc->im_submenu = gtk_menu_new();
item = gtk_image_menu_item_new_with_mnemonic(_("_Input Methods"));
gtk_widget_show(item);
gtk_container_add(GTK_CONTAINER(menu), item);
gtk_menu_item_set_submenu(GTK_MENU_ITEM(item), vc->im_submenu);
return menu; return menu;
} }

4
src/vte.h
View File

@ -66,8 +66,9 @@ struct _VteTerminal
struct vte_conf struct vte_conf
{ {
GtkWidget *vte; // small hack, to have always a reference to the widget GtkWidget *vte;
GtkWidget *menu; GtkWidget *menu;
GtkWidget *im_submenu;
gboolean scroll_on_key; gboolean scroll_on_key;
gboolean scroll_on_out; gboolean scroll_on_out;
gboolean follow_path; gboolean follow_path;
@ -106,6 +107,7 @@ struct vte_funcs
void (*vte_terminal_set_color_foreground) (VteTerminal *terminal, const GdkColor *foreground); void (*vte_terminal_set_color_foreground) (VteTerminal *terminal, const GdkColor *foreground);
void (*vte_terminal_set_color_background) (VteTerminal *terminal, const GdkColor *background); void (*vte_terminal_set_color_background) (VteTerminal *terminal, const GdkColor *background);
void (*vte_terminal_feed_child) (VteTerminal *terminal, const char *data, glong length); void (*vte_terminal_feed_child) (VteTerminal *terminal, const char *data, glong length);
void (*vte_terminal_im_append_menuitems) (VteTerminal *terminal, GtkMenuShell *menushell);
}; };