diff options
| author | Farow <farow_spam@lavabit.com> | 2013-08-13 04:19:14 +0300 |
|---|---|---|
| committer | Farow <farow_spam@lavabit.com> | 2013-08-13 04:19:14 +0300 |
| commit | 4f77f046d00d81d083fa1614e7fb6099dc791a62 (patch) | |
| tree | cceece3a0b54b6faeab91c678aa6cdc4c6e71021 /src | |
| parent | 0b95c1c444fd87583ae87ea3c59e883b5bfbbd0e (diff) | |
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
Diffstat (limited to 'src')
| -rw-r--r-- | src/common/url.c | 2 | ||||
| -rw-r--r-- | src/fe-gtk/maingui.c | 2 | ||||
| -rw-r--r-- | src/fe-gtk/xtext.c | 2 |
3 files changed, 5 insertions, 1 deletions
diff --git a/src/common/url.c b/src/common/url.c index 1cdfdce7..856ba5a7 100644 --- a/src/common/url.c +++ b/src/common/url.c @@ -650,7 +650,7 @@ re_nick (void) } /* CHANNEL description --- */ -#define CHANNEL "[" CHANPRE "][^ \t\a,:]+" +#define CHANNEL "[" CHANPRE "][^ \t\a,]+" static const GRegex * re_channel (void) diff --git a/src/fe-gtk/maingui.c b/src/fe-gtk/maingui.c index 84df4b96..17dc4e75 100644 --- a/src/fe-gtk/maingui.c +++ b/src/fe-gtk/maingui.c @@ -2306,6 +2306,8 @@ mg_word_clicked (GtkWidget *xtext, char *word, GdkEventButton *even) menu_nickmenu (sess, even, word, FALSE); break; case WORD_CHANNEL: + word[end] = 0; + word += start; menu_chanmenu (sess, even, word); break; case WORD_EMAIL: diff --git a/src/fe-gtk/xtext.c b/src/fe-gtk/xtext.c index 7582f82c..8a9b596a 100644 --- a/src/fe-gtk/xtext.c +++ b/src/fe-gtk/xtext.c @@ -2139,6 +2139,7 @@ gtk_xtext_motion_notify (GtkWidget * widget, GdkEventMotion * event) { gdk_window_set_cursor (GTK_WIDGET (xtext)->window, xtext->resize_cursor); + xtext->cursor_hand = FALSE; xtext->cursor_resize = TRUE; } return FALSE; @@ -2161,6 +2162,7 @@ gtk_xtext_motion_notify (GtkWidget * widget, GdkEventMotion * event) gdk_window_set_cursor (GTK_WIDGET (xtext)->window, xtext->hand_cursor); xtext->cursor_hand = TRUE; + xtext->cursor_resize = FALSE; } /* un-render the old hilight */ |