Merge branch 'feature/better_regex' into develop

Conflicts: taterm.vala
t-8ch · Feb 19, 2012 · 2d4add3 · 2d4add3
2 parents f40d62c + 079c321
commit 2d4add3
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/taterm.vala b/taterm.vala
@@ -73,7 +73,10 @@ class taterm : Gtk.Application
 	class Terminal : Vte.Terminal
 	{
 
-		static string regex_string = "[^ \n\r\t]*://.*[^ \n\r\t]";
+		/* TODO: split regex string */
+					/*    scheme             user      host  port     path  query   part*/
+		static string regex_string = "[a-z][a-z+.-]+:[//]?.+(:?.*@)?.*(:\\d{1-5})?(/.*)*(\\?.*)?(#\\w*)?";
+		/* TODO                    don't match '/' here   ^   */
 		string match_uri = null;
 		GLib.Regex uri_regex;