From abe9a34def367e20b153ddf70f83fa7a12075ead Mon Sep 17 00:00:00 2001
From: pancake <pancake@nopcode.org>
Date: Tue, 13 Jan 2015 00:08:52 +0100
Subject: [PATCH] Add contextual menu to change colors in disasm, Add rlogo on
 topbar

---
 shlr/www/p/index.html               |   5 +++--
 shlr/www/p/lib/js/main.js           |  25 ++++++++++++++++++-------
 shlr/www/p/lib/js/settings_panel.js |   1 +
 shlr/www/p/rlogo-inv.png            | Bin 0 -> 1536 bytes
 4 files changed, 22 insertions(+), 9 deletions(-)
 create mode 100644 shlr/www/p/rlogo-inv.png
diff --git a/shlr/www/p/index.html b/shlr/www/p/index.html
index 5052c9d93c..96673d8afd 100644
--- a/shlr/www/p/index.html
+++ b/shlr/www/p/index.html
@@ -39,8 +39,9 @@
 <body>
 
 <!-- NORTH -->
-<div id="radareApp_mp_toolbar" class="ui-layout-north ui-widget-content" style="display: none;background-color:rgb(20,20,20);color: white;text-align: center;font-family: monospace;">
-	radare2
+<div id="radareApp_mp_toolbar" class="ui-layout-north ui-widget-content" style="display: none;background-color:rgb(20,20,20);color: white;text-align: left;font-family: monospace;">
+<img src="rlogo-inv.png" border="0">
+	
 </div>
 
 <!-- SOUTH -->
diff --git a/shlr/www/p/lib/js/main.js b/shlr/www/p/lib/js/main.js
index 03d26d29c5..cc4d3852c4 100644
--- a/shlr/www/p/lib/js/main.js
+++ b/shlr/www/p/lib/js/main.js
@@ -119,7 +119,8 @@ $(document).ready( function() {
           {title: "rename<kbd>n</kbd>", cmd: "rename"},
           {title: "add comment<kbd>;</kbd>", cmd: "comment"},
           {title: "code<kbd>c</kbd>", cmd: "define"},
-          {title: "undefine<kbd>u</kbd>", cmd: "undefine"}
+          {title: "undefine<kbd>u</kbd>", cmd: "undefine"},
+          {title: "random colors<kbd>R</kbd>", cmd: "randomcolors"}
       ],
       preventSelect: true,
       preventContextMenuForPopup: true,
@@ -170,7 +171,8 @@ $(document).ready( function() {
             {title: "rename<kbd>n</kbd>", cmd: "rename"},
             {title: "add comment<kbd>;</kbd>", cmd: "comment"},
             {title: "code<kbd>c</kbd>", cmd: "define"},
-            {title: "undefine<kbd>u</kbd>", cmd: "undefine"}
+            {title: "undefine<kbd>u</kbd>", cmd: "undefine"},
+            {title: "random colors<kbd>R</kbd>", cmd: "randomcolors"}
         ];
         if (xreffrom_submenu !== null || xrefto_submenu !== null) {
           if (xrefto_submenu !== null) menu[menu.length] = xrefto_submenu;
@@ -214,11 +216,14 @@ $(document).ready( function() {
           address = ui.cmd.substring(ui.cmd.indexOf("jumpto_") + 7);
           do_jumpto(address);
         }
-        if (ui.cmd  == "goto") do_goto();
-        if (ui.cmd  == "comment") do_comment(target);
-        if (ui.cmd  == "rename") do_rename(target, event);
-        if (ui.cmd  == "define") do_define(target);
-        if (ui.cmd  == "undefine") do_undefine(target);
+        switch (ui.cmd) {
+	case "goto": do_goto(); break;
+        case "comment": do_comment(target); break;
+        case "rename": do_rename(target, event); break;
+        case "define": do_define(target); break;
+        case "undefine": do_undefine(target); break;
+        case "randomcolors": do_randomcolors(target); break;
+        }
       }
   });
 
@@ -393,6 +398,12 @@ function do_jumpto(address) {
   scroll_to_address(r2ui._dis.tmp_address);
 }
 
+function do_randomcolors(element, inEvent) {
+  r2.cmd ('ecr', function() {
+    r2ui.load_colors ();                                                     
+  });
+}
+
 function do_rename(element, inEvent) {
   var address = get_address_from_class(element);
   if ($(element).hasClass("addr") && $(element).hasClass("flag")) {
diff --git a/shlr/www/p/lib/js/settings_panel.js b/shlr/www/p/lib/js/settings_panel.js
index eba904f837..1fb8266a7f 100644
--- a/shlr/www/p/lib/js/settings_panel.js
+++ b/shlr/www/p/lib/js/settings_panel.js
@@ -7,6 +7,7 @@ SettingsPanel.prototype.render = function() {
 	var settings = '<div><h3>Settings:</h3><br/>';
 	settings += '<div>Test: <input id="test" type="checkbox" /></div>';
 	settings += '</div><br/>';
+	settings += '<div><input value="Randomize colors" type="button" onclick="r2.cmd(\'ecr\');"></div>';
 	var html = settings + colors;
 	$('#settings_tab').html(html);
 	$('#settings_tab').css('color', "rgb(127,127,127);");
diff --git a/shlr/www/p/rlogo-inv.png b/shlr/www/p/rlogo-inv.png
new file mode 100644
index 0000000000000000000000000000000000000000..eadf3e2d46bc0d307f4a38e1a0d6a9388f611799
GIT binary patch
literal 1536
zcmV+b2LJhqP)<h;3K|Lk000e1NJLTq002V(000;W0ssI2F5%Y@00006VoOIv0RI60
z0RN!9r;`8x010qNS#tmY3ljhU3ljkVnw%H_000McNliru-vJC43LZg&@=gE%1&v8W
zK~z}7?O1C}6jv0!cU}w2E@79HT}0Xv7nD?sRK+HMyeulg-Q}TDYo$hLtx$=!)<-D{
z6f~`XKO3uv*4kFFCe|hd#6?T{LtK!Gran-bE?O(H%k1oHW@m1HOeGs(A2FdZjbHAs
z$+_p=@0{<Pb29)u$Fm0bf8YS2KPC`D0H#Mr=j7zfNl1`T)Ue59Fc^A`Myu6IlH|J^
z-b>HOFq_SGyTeM;R)(=LRvTlp+3h^f^8#<Y)MGN40=bGzCd)4@#Br>p`LG}efowqt
zQ4|#u6SH;uw%wmr5x&e3T2oy7LB%GuT1}E9gwXAFuPI(TaP{i`rlzj*hFS6POO`IR
z*=z_QgpeR0gaknlc%E-Paq{8Azi;2T>5Yka6#zhFWTaNF)9Q3d3zH6fc_2Uz2%)s}
zbX}f4Gb<}LHn#q=I%1;hainKtY~A*;OeSMlmStJ-BT16V@bLP*d+TdIvsf$)!`N&#
zF~8$}IF38j+G@Of`3Z*;&)QW}y(}k3sZ<gK;db*J$N6P~5Q>{Q^YeZCG@2Q~QYiqy
z;dCN|2v3VA_GD&dDHIBq%jNlzB+0>Bx7QUH8-Bhxbm#6wc_M@WLP!vJp7%yWE|(`I
zC4JG@@Ipj{)9C~N_*E2ykRXT%m8xR%=91D9v)L?WMm!S$;8k5Xjw{2J6GO`L{PY*6
zV;J`Jk)yk+ciZg_&xH7eI#Rv(jqLn_{N$7rm&+y6@C%Y8=O!lV^7LArUaeM*j*d>W
z@ydkfdGn|lP8J)7-604<pV7#=SOgG;VS(I6sZ{Fo^468CkBW-IFpOasZ`ykT^XAWA
zUs{r$kr5IS!t*>$)03L{s`!f+x>gpgB1zIS^%#zKcmDzacsMe`ax6)bepMlt%d?kc
zZ`fFtFgL-<FudFCTTA18>7|&LOG`^vtXvfo9AvZEd{>b#CY|Rx4<7hx%SRs)1mSQv
z2!fEwWS!^E9XoOa0Kl;<LddtY)M~X>r_<_nvtONqW4Og)fe?Dzf&hRJiX>B0)Aaee
z%*Bf%R1q$xi(weQ8YX;qiT#a@9UUE|B_*#dnE&9f2j3n)-rm+`u~<B9CZ53yf|X$^
ztEzIf%f-ILyLmTq`@Ri?fTn4UMzgP}afU`C75kFiF+TgIYR0Qns?G}rijqvM6V~PG
zxzzK@oY``@oFIrv8{;HpO;PP_ZE<mN%5bGr8Zw?AzX(%=El8Y)fhhpQu-cj$eQxfa
zy1IdZs~Cm_1qJ!tMN#CP!8>Uwsb%kPY(06>Vm3>IgK-=W@X)DY0)Qec%w!sFX+FGW
z)#@!371ss^LPA1(cR7TBL?Xd){9@OI${jmb<QFs_YIeKbfka`dn0Ug<SWo|OT9>>0
zlkGc9f11Pr=R@eC4mpk+92~6NxwAl@_v4u}EXxuE;X4ph&P0UM>1;l9NUzmaRaRc^
z=?M)D4GInpq<DVo@848b{#H@Z(UumPrWH!1x9b0on1~pC^yv7pZ{B%(tzN79V`wNe
zG!zCfRXL99>+P$pu3477WPd}0)Qd`|gbDK5*%^lUwYxic;p=<r_uL;I76d^YGRPmF
z`}gkER@bDbr1Tn%;<NSN{Gg{}@;J9H*5#oN<goxk$o2T`>;p{=4XcaZ+*4O~ZQvS?
z<3SRM-=P2@yz%>u!o2)V<>jYZTj{YesZ=WVH~c9=UQk$&o|&1PoV+M4O)8aA6h%=I
zk3~r&5{~0$#mCb${b*#whpVx%u`7LjKb<{$>*g&@Y^=#-I^Wspw|*dmLwAR|42F*O
zc8I~m#Kh)<2cKp#ZY(d0j*b=tWTk23MM^TcoFvH;-+kX}GzRE4OreOHHtqWL>jAzj
m$C0`ywf{>0^FJBS9{vGNagiQ@PciBM0000<MNUMnLSTa9o88I)

literal 0
HcmV?d00001

