Channel url and cursor fix
- Allow colons in channel urls - Only add the channel part in the context menu - Fix cursor not changing between separator and url
This commit is contained in:
parent
0b95c1c444
commit
4f77f046d0
|
@ -650,7 +650,7 @@ re_nick (void)
|
||||||
}
|
}
|
||||||
|
|
||||||
/* CHANNEL description --- */
|
/* CHANNEL description --- */
|
||||||
#define CHANNEL "[" CHANPRE "][^ \t\a,:]+"
|
#define CHANNEL "[" CHANPRE "][^ \t\a,]+"
|
||||||
|
|
||||||
static const GRegex *
|
static const GRegex *
|
||||||
re_channel (void)
|
re_channel (void)
|
||||||
|
|
|
@ -2306,6 +2306,8 @@ mg_word_clicked (GtkWidget *xtext, char *word, GdkEventButton *even)
|
||||||
menu_nickmenu (sess, even, word, FALSE);
|
menu_nickmenu (sess, even, word, FALSE);
|
||||||
break;
|
break;
|
||||||
case WORD_CHANNEL:
|
case WORD_CHANNEL:
|
||||||
|
word[end] = 0;
|
||||||
|
word += start;
|
||||||
menu_chanmenu (sess, even, word);
|
menu_chanmenu (sess, even, word);
|
||||||
break;
|
break;
|
||||||
case WORD_EMAIL:
|
case WORD_EMAIL:
|
||||||
|
|
|
@ -2139,6 +2139,7 @@ gtk_xtext_motion_notify (GtkWidget * widget, GdkEventMotion * event)
|
||||||
{
|
{
|
||||||
gdk_window_set_cursor (GTK_WIDGET (xtext)->window,
|
gdk_window_set_cursor (GTK_WIDGET (xtext)->window,
|
||||||
xtext->resize_cursor);
|
xtext->resize_cursor);
|
||||||
|
xtext->cursor_hand = FALSE;
|
||||||
xtext->cursor_resize = TRUE;
|
xtext->cursor_resize = TRUE;
|
||||||
}
|
}
|
||||||
return FALSE;
|
return FALSE;
|
||||||
|
@ -2161,6 +2162,7 @@ gtk_xtext_motion_notify (GtkWidget * widget, GdkEventMotion * event)
|
||||||
gdk_window_set_cursor (GTK_WIDGET (xtext)->window,
|
gdk_window_set_cursor (GTK_WIDGET (xtext)->window,
|
||||||
xtext->hand_cursor);
|
xtext->hand_cursor);
|
||||||
xtext->cursor_hand = TRUE;
|
xtext->cursor_hand = TRUE;
|
||||||
|
xtext->cursor_resize = FALSE;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* un-render the old hilight */
|
/* un-render the old hilight */
|
||||||
|
|
Loading…
Reference in New Issue