Attachment #32625 for bug #52952

View | Details | Raw Unified | Return to bug 52952
Collapse All | Expand All




  terminal_widget_get_cell_size (term, &char_width, &char_height);
  
  g_free (screen->priv->matched_string);
  screen->priv->matched_string =
    terminal_widget_check_match (term,
                                 event->x / char_width,
                                 event->y / char_height);
  dingus_button = ((event->button == 1) || (event->button == 2));

  if (dingus_button &&

    }

  if (dingus_button &&
      (event->state & GDK_CONTROL_MASK))
      (screen->priv->matched_string != NULL))
    {
      gtk_widget_grab_focus (widget);
      
      screen->priv->matched_string =
        terminal_widget_check_match (term,
                                     event->x / char_width,
                                     event->y / char_height);
      if (screen->priv->matched_string != NULL)
      {
        open_url (screen, screen->priv->matched_string);
        g_free (screen->priv->matched_string);
        screen->priv->matched_string = NULL;
        return TRUE; /* don't do anything else such as select with the click */
      }
    }
      
  if ((event->button == 3) &&
      !(event->state & (GDK_SHIFT_MASK | GDK_CONTROL_MASK | GDK_MOD1_MASK)))
    {
      screen->priv->matched_string =
        terminal_widget_check_match (term,
                                     event->x / char_width,
                                     event->y / char_height);
      terminal_screen_do_popup (screen, event);
      return TRUE;
    }

Return to bug 52952

Lines 1599-1608 Link Here

(-)tmp/gnome-terminal-2.6.1/src/terminal-screen.c (-10 / +16 lines)
1599	terminal_widget_get_cell_size (term, &char_width, &char_height);	1599	terminal_widget_get_cell_size (term, &char_width, &char_height);
1600		1600
1601	g_free (screen->priv->matched_string);	1601	g_free (screen->priv->matched_string);
1602	screen->priv->matched_string =
1603	terminal_widget_check_match (term,
1604	event->x / char_width,
1605	event->y / char_height);
1606	dingus_button = ((event->button == 1) \|\| (event->button == 2));	1602	dingus_button = ((event->button == 1) \|\| (event->button == 2));
1607		1603
1608	if (dingus_button &&	1604	if (dingus_button &&
Lines 1624-1643 Link Here
1624	}	1620	}
1625		1621
1626	if (dingus_button &&	1622	if (dingus_button &&
1627	(event->state & GDK_CONTROL_MASK) &&	1623	(event->state & GDK_CONTROL_MASK))
1628	(screen->priv->matched_string != NULL))
1629	{	1624	{
1630	gtk_widget_grab_focus (widget);	1625	gtk_widget_grab_focus (widget);
1631		1626
1632	open_url (screen, screen->priv->matched_string);	1627	screen->priv->matched_string =
1633	g_free (screen->priv->matched_string);	1628	terminal_widget_check_match (term,
1634	screen->priv->matched_string = NULL;	1629	event->x / char_width,
1635	return TRUE; /* don't do anything else such as select with the click */	1630	event->y / char_height);
		1631	if (screen->priv->matched_string != NULL)
		1632	{
		1633	open_url (screen, screen->priv->matched_string);
		1634	g_free (screen->priv->matched_string);
		1635	screen->priv->matched_string = NULL;
		1636	return TRUE; /* don't do anything else such as select with the click */
		1637	}
1636	}	1638	}
1637		1639
1638	if ((event->button == 3) &&	1640	if ((event->button == 3) &&
1639	!(event->state & (GDK_SHIFT_MASK \| GDK_CONTROL_MASK \| GDK_MOD1_MASK)))	1641	!(event->state & (GDK_SHIFT_MASK \| GDK_CONTROL_MASK \| GDK_MOD1_MASK)))
1640	{	1642	{
		1643	screen->priv->matched_string =
		1644	terminal_widget_check_match (term,
		1645	event->x / char_width,
		1646	event->y / char_height);
1641	terminal_screen_do_popup (screen, event);	1647	terminal_screen_do_popup (screen, event);
1642	return TRUE;	1648	return TRUE;
1643	}	1649	}