SoniEx2
/
c.sexchat
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #718 from Farow/pull 

Channel url improvements
This commit is contained in:
TingPing 2013-08-15 21:36:35 -07:00
parent 8fbcddd2cd 73d63ca3da
commit a3ab5edc59
3 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/common/url.c
View File

@ -627,7 +627,7 @@ re_email (void)
/* Rationale is that do_an_re() above will anyway look up what */ /* Rationale is that do_an_re() above will anyway look up what */
/* we find, and that WORD_NICK is the last item in the array */ /* we find, and that WORD_NICK is the last item in the array */
/* that do_an_re() runs through. */ /* that do_an_re() runs through. */
#define NICK0 "[" NICKPRE "]?[" NICKLET NICKDIG NICKSPE "]" #define NICK0 "^[" NICKPRE "]?[" NICKLET NICKDIG NICKSPE "]"
#endif #endif
#define NICK1 "[" NICKHYP NICKLET NICKDIG NICKSPE "]*" #define NICK1 "[" NICKHYP NICKLET NICKDIG NICKSPE "]*"
#define NICK NICK0 NICK1 #define NICK NICK0 NICK1
@ -650,7 +650,7 @@ re_nick (void)
} }
/* CHANNEL description --- */ /* CHANNEL description --- */
#define CHANNEL "[" CHANPRE "][^ \t\a,:]+" #define CHANNEL "[" CHANPRE "][^ \t\a,]+(?:,[" CHANPRE "][^ \t\a,]+)*"
static const GRegex * static const GRegex *
re_channel (void) re_channel (void)

2
src/fe-gtk/maingui.c
View File

@ -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:

2
src/fe-gtk/xtext.c
View File

@ -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 */