From c660c1316a11eedb0b1232dbe55e14cb8b7d3cae Mon Sep 17 00:00:00 2001
From: Mischa POSLAWSKY <perl@shiar.org>
Date: Mon, 27 Sep 2010 23:35:45 +0200
Subject: [PATCH] emoji: alternate url option for extended icons

---
 emoji-gmail.inc.pl | 23 ++++++++++++-----------
 emoji-yahoo.inc.pl |  6 +++---
 emoji.plp          |  3 ++-
 3 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/emoji-gmail.inc.pl b/emoji-gmail.inc.pl
index e82e91f..7d7c8a8 100644
--- a/emoji-gmail.inc.pl
+++ b/emoji-gmail.inc.pl
@@ -1,6 +1,7 @@
 {
 	name => 'Gmail',
 	icon => 'http://mail.google.com/mail/help/images/screenshots/chat/%s.gif',
+	iconext => 'http://usefulshortcuts.com/imgs/gtalk-hidden/%s.gif',
 	source => 'http://mail.google.com/support/bin/answer.py?answer=34056',
 },
 
@@ -9,7 +10,7 @@
 heart	=> ['<3',	'',	0x02665,	"heart/love"],
 monkey	=> [':(|)',	'',	0x1F435,	"it's a monkey!"],
 rockout	=> ['\m/',	'fuzzy',	0x0270A,	"rock out."],
-shocked	=> [':-o',	'',	0,	"shocked"],
+shocked	=> [':-o',	'',	0x1F602,	"shocked"],
 grin	=> [':D',	'',	0x1F610,	"grin"],
 frown	=> [':(',	'',	0x02639,	"frown"],
 angry	=> ['x-(',	'',	0x1F61A,	"angry"],
@@ -31,24 +32,24 @@ tongue	=> [':P',	'',	0x1F60A,	"tongue"],
 'undocumented',
 
 cowbell	=> ["+/'\\",	'',	0x023F4,	"cowbell"],
-crab	=> ['V.v.V',	'',	0,	"crab"],
-devil	=> ['}:-)',	'',	0x1F627,	"devil"],
+crab	=> ['V.v.V',	'ext',	0,	"crab"],
+devil	=> ['}:-)',	'ext',	0x1F627,	"devil"],
 frown	=> ['=(',	'',	0,	"equal sad"],
 slant	=> ['=/',	'',	0,	"equal slant"],
 tongue	=> ['=P',	'',	0,	"equal tongue"],
 frown	=> [':-(',	'',	0,	"nose sad"],
 smile	=> [':)',	'',	0x0263A,	"smile"],
-wince	=> ['>.<',	'',	0,	"wince"],
+wince	=> ['>.<',	'ext',	0,	"wince"],
 tongue	=> [':-P',	'',	0,	"nose tongue"],
-pig	=> [':(:)',	'',	0x1F416,	"pig"],
-brokenheart	=> ['</3',	'',	0,	"broken heart"],
-kissx	=> [':-x',	'todo',	0,	"kiss"], # U+1F60D, U+1F48A, U+1F48E
-kissstar	=> [':*',	'',	0x1F60D,	"kiss"],
-mustache	=> [':{',	'',	0,	"mustache"],
+pig	=> [':(:)',	'ext',	0x1F416,	"pig"],
+brokenheart	=> ['</3',	'ext',	0x1F493,	"broken heart"],
+kissx	=> [':-x',	'ext todo',	0,	"kiss"], # U+1F60D, U+1F48A, U+1F48E
+kissstar	=> [':*',	'ext',	0x1F60D,	"kiss"],
+mustache	=> [':{',	'ext',	0,	"mustache"],
 
 # http://www.gtricks.com/google-talk-tricks/google-talk-hidden-emoticons/
 
-robot	=> ['[:|]',	'',	0],
-poo	=> ['~@~',	'',	0x1F4A9],
+robot	=> ['[:|]',	'ext',	0],
+poo	=> ['~@~',	'ext',	0x1F4A9],
 
 # vi:ts=15
diff --git a/emoji-yahoo.inc.pl b/emoji-yahoo.inc.pl
index c483e44..8c37a9c 100644
--- a/emoji-yahoo.inc.pl
+++ b/emoji-yahoo.inc.pl
@@ -2,7 +2,7 @@
 	name => 'Yahoo! Messenger',
 #	icon => 'http://l.yimg.com/us.yimg.com/i/mesg/emoticons6/%s.gif',
 	icon => 'http://l.yimg.com/us.yimg.com/i/mesg/emoticons7/%s.gif',
-#	icon-web => 'http://l.yimg.com/a/i/us/msg/emoticons/%s.gif',
+	iconext => 'http://l.yimg.com/a/i/us/msg/emoticons/%s.gif',
 	source => 'http://messenger.yahoo.com/features/emoticons/',
 },
 
@@ -74,7 +74,7 @@
 112	=> [':-q',	'',	0x1F44F,	"thumbs down"],
 113	=> [':-bd',	'',	0x1F447,	"thumbs up"],
 114	=> ['^#(^',	'',	0,	"it wasn't me"],
-pirate_2	=> [':ar!',	'web',	0,	"pirate"],
+pirate_2	=> [':ar!',	'ext',	0,	"pirate"],
 
 # http://messenger.yahoo.com/features/hiddenemoticons/
 
@@ -121,7 +121,7 @@ pirate_2	=> [':ar!',	'web',	0,	"pirate"],
 74	=> ['o-+',	'hidden v6',	0,	"april"],
 75	=> ['(%)',	'hidden v6',	0x0262F,	"yin yang"],
 115	=> [':bz',	'hidden',	0x1F41D,	"bee"],
-transformer	=> ['[..]',	'hidden web',	0,	"transformer"],
+transformer	=> ['[..]',	'hidden ext',	0,	"transformer"],
 
 # http://www.wackyb.co.nz/Archive_Yahoo_Messenger_Smiley_History/
 
diff --git a/emoji.plp b/emoji.plp
index 68c1ec2..00e7506 100644
--- a/emoji.plp
+++ b/emoji.plp
@@ -37,7 +37,8 @@ for my $system (qw'gmail msn yahoo') {
 		}
 		my ($input, $flags, $char, $desc) = @{ $info[++$i] };
 		printf('<tr><th><img src="%s" alt="%s"><td><kbd>%s</kbd><td>%s%s'."\n",
-			sprintf($meta->{icon} // '%s', $name), EscapeHTML($name),
+			sprintf($meta->{ $flags =~ /\bext\b/ ? 'iconext' : 'icon' } // '%s', $name),
+			EscapeHTML($name),
 			EscapeHTML($input),
 			$desc // $name,
 			$char ? '<td>'.chr($char) : '',
-- 
2.30.0