Don't select tab while closing with middle-click
Also fix unused warning and ignore shift right click
This commit is contained in:
parent
91ea5b6907
commit
aae6633c28
|
@ -57,12 +57,10 @@ static gboolean
|
||||||
cv_tree_click_cb (GtkTreeView *tree, GdkEventButton *event, chanview *cv)
|
cv_tree_click_cb (GtkTreeView *tree, GdkEventButton *event, chanview *cv)
|
||||||
{
|
{
|
||||||
chan *ch;
|
chan *ch;
|
||||||
GtkTreeSelection *sel;
|
|
||||||
GtkTreePath *path;
|
GtkTreePath *path;
|
||||||
GtkTreeIter iter;
|
GtkTreeIter iter;
|
||||||
int ret = FALSE;
|
int ret = FALSE;
|
||||||
|
|
||||||
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 (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))
|
||||||
|
|
|
@ -1606,10 +1606,11 @@ 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)
|
||||||
{
|
{
|
||||||
/* middle-click or shift-click to close a tab */
|
/* middle-click or shift-click to close a tab */
|
||||||
if ((event->button == 2 || event->state & STATE_SHIFT) && event->type == GDK_BUTTON_PRESS)
|
if ((event->button == 2 || (event->button == 1 && 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 TRUE;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (event->button != 3)
|
if (event->button != 3)
|
||||||
|
|
Loading…
Reference in New Issue