Bind middle-click to close tab

Closes #832
This commit is contained in:
TingPing 2014-01-02 18:03:32 -05:00
parent 2bd1c3f99d
commit 537fb85696
2 changed files with 2 additions and 10 deletions

View File

@ -62,17 +62,9 @@ cv_tree_click_cb (GtkTreeView *tree, GdkEventButton *event, chanview *cv)
GtkTreeIter iter; GtkTreeIter iter;
int ret = FALSE; int ret = FALSE;
if (event->button != 3 && event->state == 0)
return FALSE;
sel = gtk_tree_view_get_selection (tree); sel = gtk_tree_view_get_selection (tree);
if (gtk_tree_view_get_path_at_pos (tree, event->x, event->y, &path, 0, 0, 0)) if (gtk_tree_view_get_path_at_pos (tree, event->x, event->y, &path, 0, 0, 0))
{ {
if (event->button == 2)
{
gtk_tree_selection_unselect_all (sel);
gtk_tree_selection_select_path (sel, path);
}
if (gtk_tree_model_get_iter (GTK_TREE_MODEL (cv->store), &iter, path)) if (gtk_tree_model_get_iter (GTK_TREE_MODEL (cv->store), &iter, path))
{ {
gtk_tree_model_get (GTK_TREE_MODEL (cv->store), &iter, COL_CHAN, &ch, -1); gtk_tree_model_get (GTK_TREE_MODEL (cv->store), &iter, COL_CHAN, &ch, -1);

View File

@ -1605,8 +1605,8 @@ mg_create_tabmenu (session *sess, GdkEventButton *event, chan *ch)
static gboolean static gboolean
mg_tab_contextmenu_cb (chanview *cv, chan *ch, int tag, gpointer ud, GdkEventButton *event) mg_tab_contextmenu_cb (chanview *cv, chan *ch, int tag, gpointer ud, GdkEventButton *event)
{ {
/* shift-click to close a tab */ /* middle-click or shift-click to close a tab */
if ((event->state & STATE_SHIFT) && event->type == GDK_BUTTON_PRESS) if ((event->button == 2 || event->state & STATE_SHIFT) && event->type == GDK_BUTTON_PRESS)
{ {
mg_xbutton_cb (cv, ch, tag, ud); mg_xbutton_cb (cv, ch, tag, ud);
return FALSE; return FALSE;