Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add terminal reset menu item #53

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Add terminal reset menu item #53

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions data/menu.ui
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
<menuitem name="Edit_Copy" action="Edit_Copy"/>
<menuitem name="Edit_Paste" action="Edit_Paste"/>
<menuitem name="Edit_Clear" action="Edit_Clear"/>
<menuitem name="Edit_Reset" action="Edit_Reset"/>
<separator/>
<menuitem name="Edit_ZoomIn" action="Edit_ZoomIn"/>
<menuitem name="Edit_ZoomOut" action="Edit_ZoomOut"/>
Expand Down
51 changes: 31 additions & 20 deletions src/lxterminal.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,7 @@ static void terminal_copy_url_activate_event(GtkAction * action, LXTerminal * te
static void terminal_copy_activate_event(GtkAction * action, LXTerminal * terminal);
static void terminal_paste_activate_event(GtkAction * action, LXTerminal * terminal);
static void terminal_clear_activate_event(GtkAction * action, LXTerminal * terminal);
static void terminal_reset_activate_event(GtkAction * action, LXTerminal * terminal);
static void terminal_name_tab_response_event(GtkWidget * dialog, gint response, Term * term);
static void terminal_name_tab_activate_event(GtkAction * action, LXTerminal * terminal);
static void terminal_previous_tab_activate_event(GtkAction * action, LXTerminal * terminal);
Expand Down Expand Up @@ -130,18 +131,19 @@ static GtkActionEntry menu_items[] =
/* 9 */ { "Edit_Copy", "edit-copy", N_("Cop_y"), COPY_ACCEL_DEF, "Copy", G_CALLBACK(terminal_copy_activate_event) },
/* 10 */ { "Edit_Paste", "edit-paste", N_("_Paste"), PASTE_ACCEL_DEF, "Paste", G_CALLBACK(terminal_paste_activate_event) },
/* 11 */ { "Edit_Clear", NULL, N_("Clear scr_ollback"), NULL, "Clear scrollback", G_CALLBACK(terminal_clear_activate_event) },
/* 12 */ { "Edit_Sep1", NULL, "Sep" },
/* 13 */ { "Edit_ZoomIn", "zoom-in", N_("Zoom _In"), ZOOM_IN_ACCEL_DEF, "Zoom In", G_CALLBACK(terminal_zoom_in_activate_event) },
/* 14 */ { "Edit_ZoomOut", "zoom-out", N_("Zoom O_ut"), ZOOM_OUT_ACCEL_DEF, "Zoom Out", G_CALLBACK(terminal_zoom_out_activate_event) },
/* 15 */ { "Edit_ZoomReset", "zoom-fit-best", N_("Zoom _Reset"), ZOOM_RESET_ACCEL_DEF, "Zoom Reset", G_CALLBACK(terminal_zoom_reset_activate_event) },
/* 16 */ { "Edit_Sep2", NULL, "Sep" },
/* 17 */ { "Edit_Preferences", "system-run", N_("Preference_s"), NULL, "Preferences", G_CALLBACK(terminal_preferences_dialog) },
/* 18 */ { "Tabs_NameTab", "dialog-information", N_("Na_me Tab"), NAME_TAB_ACCEL_DEF, "Name Tab", G_CALLBACK(terminal_name_tab_activate_event) },
/* 19 */ { "Tabs_PreviousTab", "go-previous", N_("Pre_vious Tab"), PREVIOUS_TAB_ACCEL_DEF, "Previous Tab", G_CALLBACK(terminal_previous_tab_activate_event) },
/* 20 */ { "Tabs_NextTab", "go-next", N_("Ne_xt Tab"), NEXT_TAB_ACCEL_DEF, "Next Tab", G_CALLBACK(terminal_next_tab_activate_event) },
/* 21 */ { "Tabs_MoveTabLeft", NULL, N_("Move Tab _Left"), MOVE_TAB_LEFT_ACCEL_DEF, "Move Tab Left", G_CALLBACK(terminal_move_tab_left_activate_event) },
/* 22 */ { "Tabs_MoveTabRight", NULL, N_("Move Tab _Right"), MOVE_TAB_RIGHT_ACCEL_DEF, "Move Tab Right", G_CALLBACK(terminal_move_tab_right_activate_event) },
/* 23 */ { "Help_About", "help-about", N_("_About"), NULL, "About", G_CALLBACK(terminal_about_activate_event) },
/* 12 */ { "Edit_Reset", NULL, N_("Reset _terminal"), NULL, "Reset terminal", G_CALLBACK(terminal_reset_activate_event) },
/* 13 */ { "Edit_Sep1", NULL, "Sep" },
/* 14 */ { "Edit_ZoomIn", "zoom-in", N_("Zoom _In"), ZOOM_IN_ACCEL_DEF, "Zoom In", G_CALLBACK(terminal_zoom_in_activate_event) },
/* 15 */ { "Edit_ZoomOut", "zoom-out", N_("Zoom O_ut"), ZOOM_OUT_ACCEL_DEF, "Zoom Out", G_CALLBACK(terminal_zoom_out_activate_event) },
/* 16 */ { "Edit_ZoomReset", "zoom-fit-best", N_("Zoom _Reset"), ZOOM_RESET_ACCEL_DEF, "Zoom Reset", G_CALLBACK(terminal_zoom_reset_activate_event) },
/* 17 */ { "Edit_Sep2", NULL, "Sep" },
/* 18 */ { "Edit_Preferences", "system-run", N_("Preference_s"), NULL, "Preferences", G_CALLBACK(terminal_preferences_dialog) },
/* 19 */ { "Tabs_NameTab", "dialog-information", N_("Na_me Tab"), NAME_TAB_ACCEL_DEF, "Name Tab", G_CALLBACK(terminal_name_tab_activate_event) },
/* 20 */ { "Tabs_PreviousTab", "go-previous", N_("Pre_vious Tab"), PREVIOUS_TAB_ACCEL_DEF, "Previous Tab", G_CALLBACK(terminal_previous_tab_activate_event) },
/* 21 */ { "Tabs_NextTab", "go-next", N_("Ne_xt Tab"), NEXT_TAB_ACCEL_DEF, "Next Tab", G_CALLBACK(terminal_next_tab_activate_event) },
/* 22 */ { "Tabs_MoveTabLeft", NULL, N_("Move Tab _Left"), MOVE_TAB_LEFT_ACCEL_DEF, "Move Tab Left", G_CALLBACK(terminal_move_tab_left_activate_event) },
/* 23 */ { "Tabs_MoveTabRight", NULL, N_("Move Tab _Right"), MOVE_TAB_RIGHT_ACCEL_DEF, "Move Tab Right", G_CALLBACK(terminal_move_tab_right_activate_event) },
/* 24 */ { "Help_About", "help-about", N_("_About"), NULL, "About", G_CALLBACK(terminal_about_activate_event) },
};
#define MENUBAR_MENUITEM_COUNT G_N_ELEMENTS(menu_items)

Expand All @@ -157,6 +159,7 @@ static GtkActionEntry vte_menu_items[] =
{ "Copy", "edit-copy", N_("Cop_y"), NULL, "Copy", G_CALLBACK(terminal_copy_activate_event) },
{ "Paste", "edit-paste", N_("_Paste"), NULL, "Paste", G_CALLBACK(terminal_paste_activate_event) },
{ "Clear", NULL, N_("Cl_ear scrollback"), NULL, "Clear scrollback", G_CALLBACK(terminal_clear_activate_event) },
{ "Reset", NULL, N_("Reset _terminal"), NULL, "Reset terminal", G_CALLBACK(terminal_reset_activate_event) },
{ "Sep2", NULL, "Sep" },
{ "Preferences", "system-run", N_("Preference_s"), NULL, "Preferences", G_CALLBACK(terminal_preferences_dialog) },
{ "Sep3", NULL, "Sep" },
Expand Down Expand Up @@ -526,6 +529,14 @@ static void terminal_clear_activate_event(GtkAction * action, LXTerminal * termi
vte_terminal_set_scrollback_lines(VTE_TERMINAL(term->vte), get_setting()->scrollback);
}

/* Handler for "reset terminal" signal on Edit/Paste menu item.
* Reset terminal state. */
static void terminal_reset_activate_event(GtkAction * action, LXTerminal * terminal)
{
Term * term = g_ptr_array_index(terminal->terms, gtk_notebook_get_current_page(GTK_NOTEBOOK(terminal->notebook)));
vte_terminal_reset(VTE_TERMINAL(term->vte), TRUE, TRUE);
}

/* Handler for "response" signal on Name Tab dialog. */
static void terminal_name_tab_response_event(GtkWidget * dialog, gint response, Term * term)
{
Expand Down Expand Up @@ -1716,14 +1727,14 @@ void terminal_initialize_menu_shortcuts(Setting * setting)
menu_items[8].accelerator = setting->close_window_accel;
menu_items[9].accelerator = setting->copy_accel;
menu_items[10].accelerator = setting->paste_accel;
menu_items[13].accelerator = setting->zoom_in_accel;
menu_items[14].accelerator = setting->zoom_out_accel;
menu_items[15].accelerator = setting->zoom_reset_accel;
menu_items[18].accelerator = setting->name_tab_accel;
menu_items[19].accelerator = setting->previous_tab_accel;
menu_items[20].accelerator = setting->next_tab_accel;
menu_items[21].accelerator = setting->move_tab_left_accel;
menu_items[22].accelerator = setting->move_tab_right_accel;
menu_items[14].accelerator = setting->zoom_in_accel;
menu_items[15].accelerator = setting->zoom_out_accel;
menu_items[16].accelerator = setting->zoom_reset_accel;
menu_items[19].accelerator = setting->name_tab_accel;
menu_items[20].accelerator = setting->previous_tab_accel;
menu_items[21].accelerator = setting->next_tab_accel;
menu_items[22].accelerator = setting->move_tab_left_accel;
menu_items[23].accelerator = setting->move_tab_right_accel;
}

/* Main entry point. */
Expand Down