--- deliantra/Deliantra-Client/DC/Macro.pm	2007/10/14 20:08:26	1.14
+++ deliantra/Deliantra-Client/DC/Macro.pm	2008/08/30 08:04:01	1.19
@@ -1,9 +1,9 @@
-package CFPlus::Macro;
+package DC::Macro;
 
 use strict;
 
 use List::Util ();
-use CFPlus::UI;
+use DC::UI;
 
 our $REFRESH_MACRO_LIST;
 
@@ -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,26 +34,28 @@
    "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
 our %MODIFIER = (
-   "LShift" => CFPlus::KMOD_LSHIFT,
-   "RShift" => CFPlus::KMOD_RSHIFT,
-#   "Shift"  => CFPlus::KMOD_LSHIFT | CFPlus::KMOD_RSHIFT,
-   "LCtrl"  => CFPlus::KMOD_LCTRL,
-   "RCtrl"  => CFPlus::KMOD_RCTRL,
-#   "Ctrl"   => CFPlus::KMOD_LCTRL | CFPlus::KMOD_RCTRL,
-   "LAlt"   => CFPlus::KMOD_LALT,
-   "RAlt"   => CFPlus::KMOD_RALT,
-#   "Alt"    => CFPlus::KMOD_LALT | CFPlus::KMOD_RALT,
-   "LMeta"  => CFPlus::KMOD_LMETA,
-   "RMeta"  => CFPlus::KMOD_RMETA,
-#   "Meta"   => CFPlus::KMOD_LMETA | CFPlus::KMOD_RMETA,
+   "LShift" => DC::KMOD_LSHIFT,
+   "RShift" => DC::KMOD_RSHIFT,
+#   "Shift"  => DC::KMOD_LSHIFT | DC::KMOD_RSHIFT,
+   "LCtrl"  => DC::KMOD_LCTRL,
+   "RCtrl"  => DC::KMOD_RCTRL,
+#   "Ctrl"   => DC::KMOD_LCTRL | DC::KMOD_RCTRL,
+   "LAlt"   => DC::KMOD_LALT,
+   "RAlt"   => DC::KMOD_RALT,
+#   "Alt"    => DC::KMOD_LALT | DC::KMOD_RALT,
+   "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
@@ -62,21 +65,21 @@
 our @DIRECT_CHARS = qw(0 1 2 3 4 5 6 7 8 9);
 
 our @DIRECT_KEYS = (
-   CFPlus::SDLK_F1,
-   CFPlus::SDLK_F2,
-   CFPlus::SDLK_F3,
-   CFPlus::SDLK_F4,
-   CFPlus::SDLK_F5,
-   CFPlus::SDLK_F6,
-   CFPlus::SDLK_F7,
-   CFPlus::SDLK_F8,
-   CFPlus::SDLK_F9,
-   CFPlus::SDLK_F10,
-   CFPlus::SDLK_F11,
-   CFPlus::SDLK_F12,
-   CFPlus::SDLK_F13,
-   CFPlus::SDLK_F14,
-   CFPlus::SDLK_F15,
+   DC::SDLK_F1,
+   DC::SDLK_F2,
+   DC::SDLK_F3,
+   DC::SDLK_F4,
+   DC::SDLK_F5,
+   DC::SDLK_F6,
+   DC::SDLK_F7,
+   DC::SDLK_F8,
+   DC::SDLK_F9,
+   DC::SDLK_F10,
+   DC::SDLK_F11,
+   DC::SDLK_F12,
+   DC::SDLK_F13,
+   DC::SDLK_F14,
+   DC::SDLK_F15,
 );
 
 our %MACRO_FUNCTION = (
@@ -109,7 +112,7 @@
 
 sub init {
    $DEFAULT_KEYMAP ||= do {
-      my %sym = map +(CFPlus::SDL_GetKeyName $_, $_), CFPlus::SDLK_FIRST .. CFPlus::SDLK_LAST;
+      my %sym = map +(DC::SDL_GetKeyName $_, $_), DC::SDLK_FIRST .. DC::SDLK_LAST;
       my $map;
 
       while (my ($k, $v) = each %DEFAULT_KEYMAP) {
@@ -122,7 +125,7 @@
 
             my $mod = 0; $mod |= $MODIFIER{$_} for @mod;
 
-            $map->{K}[CFPlus::popcount $mod]{$mod}{$sym} = $v;
+            $map->{K}[DC::popcount $mod]{$mod}{$sym} = $v;
          }
       }
 
@@ -134,7 +137,7 @@
 sub accelkey_to_string($) {
    join "-",
       (grep $_[0][0] & $MODIFIER{$_}, keys %MODIFIER),
-      CFPlus::SDL_GetKeyName $_[0][1]
+      DC::SDL_GetKeyName $_[0][1]
 }
 
 sub trigger_to_string($) {
@@ -171,7 +174,7 @@
       &$end_cb;
    };
 
-   $window = new CFPlus::UI::Toplevel
+   $window = new DC::UI::Toplevel
       title => "Edit Macro Trigger",
       x     => "center",
       y     => "center",
@@ -189,9 +192,9 @@
       },
    ;
 
-   $window->add (my $vb = new CFPlus::UI::VBox);
+   $window->add (my $vb = new DC::UI::VBox);
 
-   $vb->add (new CFPlus::UI::Label
+   $vb->add (new DC::UI::Label
       text => "To bind the macro to a key,\n"
             . "press a modifier (Ctrl, Alt\n"
             . "and/or Shift) and a key, or\n"
@@ -201,7 +204,7 @@
       ellipsise  => 0,
    );
 
-   $vb->add (my $entry = new CFPlus::UI::Label
+   $vb->add (my $entry = new DC::UI::Label
       fg => [0, 0, 0, 1],
       bg => [1, 1, 0, 1],
    );
@@ -224,8 +227,8 @@
                   keys %MODIFIER
       );
 
-      return if $sym >= CFPlus::SDLK_MODIFIER_MIN
-             && $sym <= CFPlus::SDLK_MODIFIER_MAX;
+      return if $sym >= DC::SDLK_MODIFIER_MIN
+             && $sym <= DC::SDLK_MODIFIER_MAX;
 
       if ($mod
           || ((grep $_ eq chr $ev->{unicode}, @DIRECT_CHARS)
@@ -234,7 +237,7 @@
          $macro->{accelkey} = [$mod, $sym];
          $done->(1);
       } else {
-         $entry->set_text ("cannot bind " . (CFPlus::SDL_GetKeyName $sym) . " without modifier.");
+         $entry->set_text ("cannot bind " . (DC::SDL_GetKeyName $sym) . " without modifier.");
       }
       1
    };
@@ -309,16 +312,16 @@
 }
 
 sub keyboard_setup {
-   my $kbd_setup = new CFPlus::UI::VBox;
+   my $kbd_setup = new DC::UI::VBox;
 
-   $kbd_setup->add (my $list = new CFPlus::UI::VBox);
+   $kbd_setup->add (my $list = new DC::UI::VBox);
 
-   $list->add (new CFPlus::UI::FancyFrame
+   $list->add (new DC::UI::FancyFrame
       label => "Options",
-      child => (my $hb = new CFPlus::UI::HBox),
+      child => (my $hb = new DC::UI::HBox),
    );
-   $hb->add (new CFPlus::UI::Label text => "only shift-up stops fire");
-   $hb->add (new CFPlus::UI::CheckBox
+   $hb->add (new DC::UI::Label text => "only shift-up stops fire");
+   $hb->add (new DC::UI::CheckBox
       expand     => 1,
       state      => $::CFG->{shift_fire_stop},
       tooltip    => "If this checkbox is enabled you will stop fire only if you stop pressing shift.",
@@ -329,9 +332,9 @@
       },
    );
 
-   $list->add (new CFPlus::UI::FancyFrame
+   $list->add (new DC::UI::FancyFrame
       label => "Macros",
-      child => (my $macros = new CFPlus::UI::VBox),
+      child => (my $macros = new DC::UI::VBox),
    );
 
    my $refresh;
@@ -344,7 +347,7 @@
       my ($macro) = @_;
 
       $kbd_setup->clear;
-      $kbd_setup->add (new CFPlus::UI::Button
+      $kbd_setup->add (new DC::UI::Button
          text    => "Return",
          tooltip => "Return to the macro list.",
          on_activate => sub {
@@ -354,25 +357,25 @@
             1
          },
       );
-      $kbd_setup->add (new CFPlus::UI::FancyFrame
+      $kbd_setup->add (new DC::UI::FancyFrame
          label => "Edit Macro",
-         child => (my $editor = new CFPlus::UI::Table col_expand => [0, 1]),
+         child => (my $editor = new DC::UI::Table col_expand => [0, 1]),
       );
 
-      $editor->add_at (0, 1, new CFPlus::UI::Label
+      $editor->add_at (0, 1, new DC::UI::Label
          text    => "Trigger",
          tooltip => $tooltip_trigger,
          can_hover  => 1,
          can_events => 1,
       );
-      $editor->add_at (0, 2, new CFPlus::UI::Label
+      $editor->add_at (0, 2, new DC::UI::Label
          text    => "Actions",
          tooltip => $tooltip_commands,
          can_hover  => 1,
          can_events => 1,
       );
 
-      $editor->add_at (1, 2, my $textedit = new CFPlus::UI::TextEdit
+      $editor->add_at (1, 2, my $textedit = new DC::UI::TextEdit
          text    => macro_to_text $macro,
          tooltip => $tooltip_commands,
          on_changed => sub {
@@ -380,7 +383,7 @@
          },
       );
 
-      $editor->add_at (1, 1, my $accel = new CFPlus::UI::Button
+      $editor->add_at (1, 1, my $accel = new DC::UI::Button
          text    => trigger_to_string $macro,
          tooltip => "To change the trigger for a macro, activate this button.",
          on_activate => sub {
@@ -393,7 +396,7 @@
       );
 
       my $recording;
-      $editor->add_at (1, 3, new CFPlus::UI::Button
+      $editor->add_at (1, 3, new DC::UI::Button
          text    => "Start Recording",
          tooltip => "Start/Stop command recording: when recording, "
                   . "actions and commands you invoke are appended to this macro. "
@@ -419,7 +422,7 @@
       );
    };
 
-   $macros->add (new CFPlus::UI::Button
+   $macros->add (new DC::UI::Button
       text    => "New Macro",
       tooltip => "Creates a new, empty, macro you can edit.",
       on_activate => sub {
@@ -429,18 +432,18 @@
       },
    );
 
-   $macros->add (my $macrolist = new CFPlus::UI::Table col_expand => [0, 1]);
+   $macros->add (my $macrolist = new DC::UI::Table col_expand => [0, 1]);
 
    $REFRESH_MACRO_LIST = $refresh = sub {
       $macrolist->clear;
 
-      $macrolist->add_at (0, 1, new CFPlus::UI::Label
+      $macrolist->add_at (0, 1, new DC::UI::Label
          text    => "Trigger",
-         align   => 0,
          tooltip => $tooltip_trigger . $tooltip_common,
       );
-      $macrolist->add_at (1, 1, new CFPlus::UI::Label
-         text    => "Commands",
+      $macrolist->add_at (1, 1, new DC::UI::Label
+         text    => "Actions",
+         align   => 0,
          tooltip => $tooltip_commands . $tooltip_common,
       );
 
@@ -456,7 +459,7 @@
             } elsif ($ev->{button} == 2) {
                $::CONN->macro_send ($macro) if $::CONN;
             } elsif ($ev->{button} == 3) {
-               (new CFPlus::UI::Menu
+               (new DC::UI::Menu
                   items => [
                      ["Edit"   => sub { $edit_macro->($macro) }],
                      ["Invoke" => sub { $::CONN->macro_send ($macro) if $::CONN }],
@@ -474,18 +477,20 @@
             1
          };
 
-         $macrolist->add_at (0, $y, new CFPlus::UI::Label
+         $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,
          );
 
-         $macrolist->add_at (1, $y, new CFPlus::UI::Label
+         $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,