--- deliantra/Deliantra-Client/DC/Macro.pm	2007/12/26 21:03:21	1.16
+++ deliantra/Deliantra-Client/DC/Macro.pm	2008/08/30 08:04:01	1.19
@@ -13,8 +13,8 @@
    "(\")"      => "!completer say ",
    "(')"       => "!completer",
 
-   "LShift-tab" => "!toggle-messagewindow",
-   "RShift-tab" => "!toggle-messagewindow",
+#   "LShift-tab" => "!toggle-messagewindow",
+#   "RShift-tab" => "!toggle-messagewindow",
    "tab"        => "!toggle-playerbook",
    "f1"         => "!toggle-help",
    "f2"         => "!toggle-stats",
@@ -22,9 +22,10 @@
    "f4"         => "!toggle-spells",
    "f5"         => "!toggle-inventory",
    "f9"         => "!toggle-setup",
-   (map +("LAlt-$_" => "!switch-tab $_"), 0..9),
-   (map +("RAlt-$_" => "!switch-tab $_"), 0..9),
-   "LAlt-x"     => "!close-current-tab",
+
+   (map +("LRAM-$_"  => "!switch-tab $_"), 0..9),
+   "LRAM-x"     => "!close-current-tab",
+
    "return"     => "!activate-chat",
    "."          => "!repeat-command",
 
@@ -33,10 +34,11 @@
    "enter"	=> "examine",
    "[+]"        => "rotateshoottype +",
    "[-]"        => "rotateshoottype -",
-   "LAlt-e"	=> "examine",
-   "LAlt-s"	=> "ready_skill find traps",
-   "LAlt-d"	=> "ready_skill disarm traps",
-   "LAlt-p"	=> "ready_skill praying",
+
+   "LRAM-e"	=> "examine",
+   "LRAM-s"	=> "ready_skill find traps",
+   "LRAM-d"	=> "ready_skill disarm traps",
+   "LRAM-p"	=> "ready_skill praying",
 );
 
 # allowed modifiers
@@ -53,6 +55,7 @@
    "LMeta"  => DC::KMOD_LMETA,
    "RMeta"  => DC::KMOD_RMETA,
 #   "Meta"   => DC::KMOD_LMETA | DC::KMOD_RMETA,
+   "LRAM"   => DC::KMOD_LRAM, # left/right/alt/meta
 );
 
 # allowed modifiers
@@ -436,11 +439,11 @@
 
       $macrolist->add_at (0, 1, new DC::UI::Label
          text    => "Trigger",
-         align   => 0,
          tooltip => $tooltip_trigger . $tooltip_common,
       );
       $macrolist->add_at (1, 1, new DC::UI::Label
-         text    => "Commands",
+         text    => "Actions",
+         align   => 0,
          tooltip => $tooltip_commands . $tooltip_common,
       );
 
@@ -477,7 +480,7 @@
          $macrolist->add_at (0, $y, new DC::UI::Label
             text       => trigger_to_string $macro,
             tooltip    => $tooltip_trigger . $tooltip_common,
-            align      => 0,
+            fg         => [1, 0.8, 0.8],
             can_hover  => 1,
             can_events => 1,
             on_button_down => $macro_cb,
@@ -486,6 +489,8 @@
          $macrolist->add_at (1, $y, new DC::UI::Label
             text       => (join "; ", @{ $macro->{action} || [] }),
             tooltip    => $tooltip_commands . $tooltip_common,
+            fg         => [0.9, 0.9, 0.9],
+            align      => 0,
             expand     => 1,
             ellipsise  => 3,
             can_hover  => 1,