ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/DC/Macro.pm
(Generate patch)

Comparing deliantra/Deliantra-Client/DC/Macro.pm (file contents):
Revision 1.13 by elmex, Sun Sep 9 17:47:00 2007 UTC vs.
Revision 1.19 by root, Sat Aug 30 08:04:01 2008 UTC

1package CFPlus::Macro; 1package DC::Macro;
2 2
3use strict; 3use strict;
4 4
5use List::Util (); 5use List::Util ();
6use CFPlus::UI; 6use DC::UI;
7 7
8our $REFRESH_MACRO_LIST; 8our $REFRESH_MACRO_LIST;
9 9
10our %DEFAULT_KEYMAP = ( 10our %DEFAULT_KEYMAP = (
11 (map +("($_)" => "!completer $_"), "a" .. "z"), 11 (map +("($_)" => "!completer $_"), "a" .. "z"),
12 "(!)" => "!completer shout ", 12 "(!)" => "!completer shout ",
13 "(\")" => "!completer say ", 13 "(\")" => "!completer say ",
14 "(')" => "!completer", 14 "(')" => "!completer",
15 15
16 "LShift-tab" => "!toggle-messagewindow", 16# "LShift-tab" => "!toggle-messagewindow",
17 "RShift-tab" => "!toggle-messagewindow", 17# "RShift-tab" => "!toggle-messagewindow",
18 "tab" => "!toggle-playerbook", 18 "tab" => "!toggle-playerbook",
19 "f1" => "!toggle-help", 19 "f1" => "!toggle-help",
20 "f2" => "!toggle-stats", 20 "f2" => "!toggle-stats",
21 "f3" => "!toggle-skills", 21 "f3" => "!toggle-skills",
22 "f4" => "!toggle-spells", 22 "f4" => "!toggle-spells",
23 "f5" => "!toggle-inventory", 23 "f5" => "!toggle-inventory",
24 "f9" => "!toggle-setup", 24 "f9" => "!toggle-setup",
25
25 (map +("LAlt-$_" => "!switch-tab $_"), 0..9), 26 (map +("LRAM-$_" => "!switch-tab $_"), 0..9),
26 (map +("RAlt-$_" => "!switch-tab $_"), 0..9),
27 "LAlt-x" => "!close-current-tab", 27 "LRAM-x" => "!close-current-tab",
28
28 "return" => "!activate-chat", 29 "return" => "!activate-chat",
29 "." => "!repeat-command", 30 "." => "!repeat-command",
30 31
31 "," => "take", 32 "," => "take",
32 "space" => "apply", 33 "space" => "apply",
33 "enter" => "examine", 34 "enter" => "examine",
34 "[+]" => "rotateshoottype +", 35 "[+]" => "rotateshoottype +",
35 "[-]" => "rotateshoottype -", 36 "[-]" => "rotateshoottype -",
37
38 "LRAM-e" => "examine",
36 "LAlt-s" => "ready_skill find traps", 39 "LRAM-s" => "ready_skill find traps",
37 "LAlt-d" => "ready_skill disarm traps", 40 "LRAM-d" => "ready_skill disarm traps",
38 "LAlt-p" => "ready_skill praying", 41 "LRAM-p" => "ready_skill praying",
39); 42);
40 43
41# allowed modifiers 44# allowed modifiers
42our %MODIFIER = ( 45our %MODIFIER = (
43 "LShift" => CFPlus::KMOD_LSHIFT, 46 "LShift" => DC::KMOD_LSHIFT,
44 "RShift" => CFPlus::KMOD_RSHIFT, 47 "RShift" => DC::KMOD_RSHIFT,
45# "Shift" => CFPlus::KMOD_LSHIFT | CFPlus::KMOD_RSHIFT, 48# "Shift" => DC::KMOD_LSHIFT | DC::KMOD_RSHIFT,
46 "LCtrl" => CFPlus::KMOD_LCTRL, 49 "LCtrl" => DC::KMOD_LCTRL,
47 "RCtrl" => CFPlus::KMOD_RCTRL, 50 "RCtrl" => DC::KMOD_RCTRL,
48# "Ctrl" => CFPlus::KMOD_LCTRL | CFPlus::KMOD_RCTRL, 51# "Ctrl" => DC::KMOD_LCTRL | DC::KMOD_RCTRL,
49 "LAlt" => CFPlus::KMOD_LALT, 52 "LAlt" => DC::KMOD_LALT,
50 "RAlt" => CFPlus::KMOD_RALT, 53 "RAlt" => DC::KMOD_RALT,
51# "Alt" => CFPlus::KMOD_LALT | CFPlus::KMOD_RALT, 54# "Alt" => DC::KMOD_LALT | DC::KMOD_RALT,
52 "LMeta" => CFPlus::KMOD_LMETA, 55 "LMeta" => DC::KMOD_LMETA,
53 "RMeta" => CFPlus::KMOD_RMETA, 56 "RMeta" => DC::KMOD_RMETA,
54# "Meta" => CFPlus::KMOD_LMETA | CFPlus::KMOD_RMETA, 57# "Meta" => DC::KMOD_LMETA | DC::KMOD_RMETA,
58 "LRAM" => DC::KMOD_LRAM, # left/right/alt/meta
55); 59);
56 60
57# allowed modifiers 61# allowed modifiers
58our $MODIFIER_MASK |= $_ for values %MODIFIER; 62our $MODIFIER_MASK |= $_ for values %MODIFIER;
59 63
60# can bind to these without any modifier 64# can bind to these without any modifier
61our @DIRECT_CHARS = qw(0 1 2 3 4 5 6 7 8 9); 65our @DIRECT_CHARS = qw(0 1 2 3 4 5 6 7 8 9);
62 66
63our @DIRECT_KEYS = ( 67our @DIRECT_KEYS = (
64 CFPlus::SDLK_F1, 68 DC::SDLK_F1,
65 CFPlus::SDLK_F2, 69 DC::SDLK_F2,
66 CFPlus::SDLK_F3, 70 DC::SDLK_F3,
67 CFPlus::SDLK_F4, 71 DC::SDLK_F4,
68 CFPlus::SDLK_F5, 72 DC::SDLK_F5,
69 CFPlus::SDLK_F6, 73 DC::SDLK_F6,
70 CFPlus::SDLK_F7, 74 DC::SDLK_F7,
71 CFPlus::SDLK_F8, 75 DC::SDLK_F8,
72 CFPlus::SDLK_F9, 76 DC::SDLK_F9,
73 CFPlus::SDLK_F10, 77 DC::SDLK_F10,
74 CFPlus::SDLK_F11, 78 DC::SDLK_F11,
75 CFPlus::SDLK_F12, 79 DC::SDLK_F12,
76 CFPlus::SDLK_F13, 80 DC::SDLK_F13,
77 CFPlus::SDLK_F14, 81 DC::SDLK_F14,
78 CFPlus::SDLK_F15, 82 DC::SDLK_F15,
79); 83);
80 84
81our %MACRO_FUNCTION = ( 85our %MACRO_FUNCTION = (
82 "toggle-messagewindow" => sub { $::MESSAGE_WINDOW->toggle_visibility }, 86 "toggle-messagewindow" => sub { $::MESSAGE_WINDOW->toggle_visibility },
83 "toggle-playerbook" => sub { $::PL_WINDOW->toggle_visibility }, 87 "toggle-playerbook" => sub { $::PL_WINDOW->toggle_visibility },
… …
106 110
107our $DEFAULT_KEYMAP; 111our $DEFAULT_KEYMAP;
108 112
109sub init { 113sub init {
110 $DEFAULT_KEYMAP ||= do { 114 $DEFAULT_KEYMAP ||= do {
111 my %sym = map +(CFPlus::SDL_GetKeyName $_, $_), CFPlus::SDLK_FIRST .. CFPlus::SDLK_LAST; 115 my %sym = map +(DC::SDL_GetKeyName $_, $_), DC::SDLK_FIRST .. DC::SDLK_LAST;
112 my $map; 116 my $map;
113 117
114 while (my ($k, $v) = each %DEFAULT_KEYMAP) { 118 while (my ($k, $v) = each %DEFAULT_KEYMAP) {
115 if ($k =~ /^\((.)\)$/) { 119 if ($k =~ /^\((.)\)$/) {
116 $map->{U}{ord $1} = $v; 120 $map->{U}{ord $1} = $v;
… …
119 my $sym = $sym{pop @mod} 123 my $sym = $sym{pop @mod}
120 or warn "unknown keysym $k\n"; 124 or warn "unknown keysym $k\n";
121 125
122 my $mod = 0; $mod |= $MODIFIER{$_} for @mod; 126 my $mod = 0; $mod |= $MODIFIER{$_} for @mod;
123 127
124 $map->{K}[CFPlus::popcount $mod]{$mod}{$sym} = $v; 128 $map->{K}[DC::popcount $mod]{$mod}{$sym} = $v;
125 } 129 }
126 } 130 }
127 131
128 %DEFAULT_KEYMAP = (); 132 %DEFAULT_KEYMAP = ();
129 $map 133 $map
… …
131} 135}
132 136
133sub accelkey_to_string($) { 137sub accelkey_to_string($) {
134 join "-", 138 join "-",
135 (grep $_[0][0] & $MODIFIER{$_}, keys %MODIFIER), 139 (grep $_[0][0] & $MODIFIER{$_}, keys %MODIFIER),
136 CFPlus::SDL_GetKeyName $_[0][1] 140 DC::SDL_GetKeyName $_[0][1]
137} 141}
138 142
139sub trigger_to_string($) { 143sub trigger_to_string($) {
140 my ($macro) = @_; 144 my ($macro) = @_;
141 145
… …
168 $window->disconnect_all ("focus_out"); 172 $window->disconnect_all ("focus_out");
169 $window->destroy; 173 $window->destroy;
170 &$end_cb; 174 &$end_cb;
171 }; 175 };
172 176
173 $window = new CFPlus::UI::Toplevel 177 $window = new DC::UI::Toplevel
174 title => "Edit Macro Trigger", 178 title => "Edit Macro Trigger",
175 x => "center", 179 x => "center",
176 y => "center", 180 y => "center",
177 z => 1000, 181 z => 1000,
178 can_events => 1, 182 can_events => 1,
… …
186 $done->(0); 190 $done->(0);
187 1 191 1
188 }, 192 },
189 ; 193 ;
190 194
191 $window->add (my $vb = new CFPlus::UI::VBox); 195 $window->add (my $vb = new DC::UI::VBox);
192 196
193 $vb->add (new CFPlus::UI::Label 197 $vb->add (new DC::UI::Label
194 text => "To bind the macro to a key,\n" 198 text => "To bind the macro to a key,\n"
195 . "press a modifier (Ctrl, Alt\n" 199 . "press a modifier (Ctrl, Alt\n"
196 . "and/or Shift) and a key, or\n" 200 . "and/or Shift) and a key, or\n"
197 . "0-9 and F1-F15 without any modifier\n\n" 201 . "0-9 and F1-F15 without any modifier\n\n"
198 . "To cancel press Escape or close this.\n\n" 202 . "To cancel press Escape or close this.\n\n"
199 . "Accelerator key combo:", 203 . "Accelerator key combo:",
200 ellipsise => 0, 204 ellipsise => 0,
201 ); 205 );
202 206
203 $vb->add (my $entry = new CFPlus::UI::Label 207 $vb->add (my $entry = new DC::UI::Label
204 fg => [0, 0, 0, 1], 208 fg => [0, 0, 0, 1],
205 bg => [1, 1, 0, 1], 209 bg => [1, 1, 0, 1],
206 ); 210 );
207 211
208 my $key_cb = sub { 212 my $key_cb = sub {
… …
221 map "$_-", 225 map "$_-",
222 grep $mod & $MODIFIER{$_}, 226 grep $mod & $MODIFIER{$_},
223 keys %MODIFIER 227 keys %MODIFIER
224 ); 228 );
225 229
226 return if $sym >= CFPlus::SDLK_MODIFIER_MIN 230 return if $sym >= DC::SDLK_MODIFIER_MIN
227 && $sym <= CFPlus::SDLK_MODIFIER_MAX; 231 && $sym <= DC::SDLK_MODIFIER_MAX;
228 232
229 if ($mod 233 if ($mod
230 || ((grep $_ eq chr $ev->{unicode}, @DIRECT_CHARS) 234 || ((grep $_ eq chr $ev->{unicode}, @DIRECT_CHARS)
231 || (grep $_ == $sym, @DIRECT_KEYS))) 235 || (grep $_ == $sym, @DIRECT_KEYS)))
232 { 236 {
233 $macro->{accelkey} = [$mod, $sym]; 237 $macro->{accelkey} = [$mod, $sym];
234 $done->(1); 238 $done->(1);
235 } else { 239 } else {
236 $entry->set_text ("cannot bind " . (CFPlus::SDL_GetKeyName $sym) . " without modifier."); 240 $entry->set_text ("cannot bind " . (DC::SDL_GetKeyName $sym) . " without modifier.");
237 } 241 }
238 1 242 1
239 }; 243 };
240 244
241 $window->connect (key_up => $key_cb); 245 $window->connect (key_up => $key_cb);
… …
306 } 310 }
307 } 311 }
308} 312}
309 313
310sub keyboard_setup { 314sub keyboard_setup {
311 my $kbd_setup = new CFPlus::UI::VBox; 315 my $kbd_setup = new DC::UI::VBox;
312 316
313 $kbd_setup->add (my $list = new CFPlus::UI::VBox); 317 $kbd_setup->add (my $list = new DC::UI::VBox);
314 318
315 $list->add (new CFPlus::UI::FancyFrame 319 $list->add (new DC::UI::FancyFrame
316 label => "Options", 320 label => "Options",
317 child => (my $hb = new CFPlus::UI::HBox), 321 child => (my $hb = new DC::UI::HBox),
318 ); 322 );
319 $hb->add (new CFPlus::UI::Label text => "only shift-up stops fire"); 323 $hb->add (new DC::UI::Label text => "only shift-up stops fire");
320 $hb->add (new CFPlus::UI::CheckBox 324 $hb->add (new DC::UI::CheckBox
321 expand => 1, 325 expand => 1,
322 state => $::CFG->{shift_fire_stop}, 326 state => $::CFG->{shift_fire_stop},
323 tooltip => "If this checkbox is enabled you will stop fire only if you stop pressing shift.", 327 tooltip => "If this checkbox is enabled you will stop fire only if you stop pressing shift.",
324 on_changed => sub { 328 on_changed => sub {
325 my ($cbox, $value) = @_; 329 my ($cbox, $value) = @_;
326 $::CFG->{shift_fire_stop} = $value; 330 $::CFG->{shift_fire_stop} = $value;
327 0 331 0
328 }, 332 },
329 ); 333 );
330 334
331 $list->add (new CFPlus::UI::FancyFrame 335 $list->add (new DC::UI::FancyFrame
332 label => "Macros", 336 label => "Macros",
333 child => (my $macros = new CFPlus::UI::VBox), 337 child => (my $macros = new DC::UI::VBox),
334 ); 338 );
335 339
336 my $refresh; 340 my $refresh;
337 341
338 my $tooltip_common = "\n\n<small>Left click - edit macro\nMiddle click - invoke macro\nRight click - further options</small>"; 342 my $tooltip_common = "\n\n<small>Left click - edit macro\nMiddle click - invoke macro\nRight click - further options</small>";
… …
341 345
342 my $edit_macro = sub { 346 my $edit_macro = sub {
343 my ($macro) = @_; 347 my ($macro) = @_;
344 348
345 $kbd_setup->clear; 349 $kbd_setup->clear;
346 $kbd_setup->add (new CFPlus::UI::Button 350 $kbd_setup->add (new DC::UI::Button
347 text => "Return", 351 text => "Return",
348 tooltip => "Return to the macro list.", 352 tooltip => "Return to the macro list.",
349 on_activate => sub { 353 on_activate => sub {
350 $kbd_setup->clear; 354 $kbd_setup->clear;
351 $kbd_setup->add ($list); 355 $kbd_setup->add ($list);
352 $refresh->(); 356 $refresh->();
353 1 357 1
354 }, 358 },
355 ); 359 );
356 $kbd_setup->add (new CFPlus::UI::FancyFrame 360 $kbd_setup->add (new DC::UI::FancyFrame
357 label => "Edit Macro", 361 label => "Edit Macro",
358 child => (my $editor = new CFPlus::UI::Table col_expand => [0, 1]), 362 child => (my $editor = new DC::UI::Table col_expand => [0, 1]),
359 ); 363 );
360 364
361 $editor->add_at (0, 1, new CFPlus::UI::Label 365 $editor->add_at (0, 1, new DC::UI::Label
362 text => "Trigger", 366 text => "Trigger",
363 tooltip => $tooltip_trigger, 367 tooltip => $tooltip_trigger,
364 can_hover => 1, 368 can_hover => 1,
365 can_events => 1, 369 can_events => 1,
366 ); 370 );
367 $editor->add_at (0, 2, new CFPlus::UI::Label 371 $editor->add_at (0, 2, new DC::UI::Label
368 text => "Actions", 372 text => "Actions",
369 tooltip => $tooltip_commands, 373 tooltip => $tooltip_commands,
370 can_hover => 1, 374 can_hover => 1,
371 can_events => 1, 375 can_events => 1,
372 ); 376 );
373 377
374 $editor->add_at (1, 2, my $textedit = new CFPlus::UI::TextEdit 378 $editor->add_at (1, 2, my $textedit = new DC::UI::TextEdit
375 text => macro_to_text $macro, 379 text => macro_to_text $macro,
376 tooltip => $tooltip_commands, 380 tooltip => $tooltip_commands,
377 on_changed => sub { 381 on_changed => sub {
378 $macro->{action} = macro_from_text $macro, $_[1]; 382 $macro->{action} = macro_from_text $macro, $_[1];
379 }, 383 },
380 ); 384 );
381 385
382 $editor->add_at (1, 1, my $accel = new CFPlus::UI::Button 386 $editor->add_at (1, 1, my $accel = new DC::UI::Button
383 text => trigger_to_string $macro, 387 text => trigger_to_string $macro,
384 tooltip => "To change the trigger for a macro, activate this button.", 388 tooltip => "To change the trigger for a macro, activate this button.",
385 on_activate => sub { 389 on_activate => sub {
386 my ($accel) = @_; 390 my ($accel) = @_;
387 trigger_edit $macro, sub { 391 trigger_edit $macro, sub {
… …
390 1 394 1
391 }, 395 },
392 ); 396 );
393 397
394 my $recording; 398 my $recording;
395 $editor->add_at (1, 3, new CFPlus::UI::Button 399 $editor->add_at (1, 3, new DC::UI::Button
396 text => "Start Recording", 400 text => "Start Recording",
397 tooltip => "Start/Stop command recording: when recording, " 401 tooltip => "Start/Stop command recording: when recording, "
398 . "actions and commands you invoke are appended to this macro. " 402 . "actions and commands you invoke are appended to this macro. "
399 . "You can only record when you are logged in.", 403 . "You can only record when you are logged in.",
400 on_destroy => sub { 404 on_destroy => sub {
… …
416 } 420 }
417 }, 421 },
418 ); 422 );
419 }; 423 };
420 424
421 $macros->add (new CFPlus::UI::Button 425 $macros->add (new DC::UI::Button
422 text => "New Macro", 426 text => "New Macro",
423 tooltip => "Creates a new, empty, macro you can edit.", 427 tooltip => "Creates a new, empty, macro you can edit.",
424 on_activate => sub { 428 on_activate => sub {
425 my $macro = { }; 429 my $macro = { };
426 push @{ $::PROFILE->{macro} }, $macro; 430 push @{ $::PROFILE->{macro} }, $macro;
427 $edit_macro->($macro); 431 $edit_macro->($macro);
428 }, 432 },
429 ); 433 );
430 434
431 $macros->add (my $macrolist = new CFPlus::UI::Table col_expand => [0, 1]); 435 $macros->add (my $macrolist = new DC::UI::Table col_expand => [0, 1]);
432 436
433 $REFRESH_MACRO_LIST = $refresh = sub { 437 $REFRESH_MACRO_LIST = $refresh = sub {
434 $macrolist->clear; 438 $macrolist->clear;
435 439
436 $macrolist->add_at (0, 1, new CFPlus::UI::Label 440 $macrolist->add_at (0, 1, new DC::UI::Label
437 text => "Trigger", 441 text => "Trigger",
442 tooltip => $tooltip_trigger . $tooltip_common,
443 );
444 $macrolist->add_at (1, 1, new DC::UI::Label
445 text => "Actions",
438 align => 0, 446 align => 0,
439 tooltip => $tooltip_trigger . $tooltip_common,
440 );
441 $macrolist->add_at (1, 1, new CFPlus::UI::Label
442 text => "Commands",
443 tooltip => $tooltip_commands . $tooltip_common, 447 tooltip => $tooltip_commands . $tooltip_common,
444 ); 448 );
445 449
446 for my $idx (0 .. $#{$::PROFILE->{macro} || []}) { 450 for my $idx (0 .. $#{$::PROFILE->{macro} || []}) {
447 my $macro = $::PROFILE->{macro}[$idx]; 451 my $macro = $::PROFILE->{macro}[$idx];
… …
453 if ($ev->{button} == 1) { 457 if ($ev->{button} == 1) {
454 $edit_macro->($macro), 458 $edit_macro->($macro),
455 } elsif ($ev->{button} == 2) { 459 } elsif ($ev->{button} == 2) {
456 $::CONN->macro_send ($macro) if $::CONN; 460 $::CONN->macro_send ($macro) if $::CONN;
457 } elsif ($ev->{button} == 3) { 461 } elsif ($ev->{button} == 3) {
458 (new CFPlus::UI::Menu 462 (new DC::UI::Menu
459 items => [ 463 items => [
460 ["Edit" => sub { $edit_macro->($macro) }], 464 ["Edit" => sub { $edit_macro->($macro) }],
461 ["Invoke" => sub { $::CONN->macro_send ($macro) if $::CONN }], 465 ["Invoke" => sub { $::CONN->macro_send ($macro) if $::CONN }],
462 ["Delete" => sub { 466 ["Delete" => sub {
463 # might want to use grep instead 467 # might want to use grep instead
… …
471 } 475 }
472 476
473 1 477 1
474 }; 478 };
475 479
476 $macrolist->add_at (0, $y, new CFPlus::UI::Label 480 $macrolist->add_at (0, $y, new DC::UI::Label
477 text => trigger_to_string $macro, 481 text => trigger_to_string $macro,
478 tooltip => $tooltip_trigger . $tooltip_common, 482 tooltip => $tooltip_trigger . $tooltip_common,
479 align => 0, 483 fg => [1, 0.8, 0.8],
480 can_hover => 1, 484 can_hover => 1,
481 can_events => 1, 485 can_events => 1,
482 on_button_down => $macro_cb, 486 on_button_down => $macro_cb,
483 ); 487 );
484 488
485 $macrolist->add_at (1, $y, new CFPlus::UI::Label 489 $macrolist->add_at (1, $y, new DC::UI::Label
486 text => (join "; ", @{ $macro->{action} || [] }), 490 text => (join "; ", @{ $macro->{action} || [] }),
487 tooltip => $tooltip_commands . $tooltip_common, 491 tooltip => $tooltip_commands . $tooltip_common,
492 fg => [0.9, 0.9, 0.9],
493 align => 0,
488 expand => 1, 494 expand => 1,
489 ellipsise => 3, 495 ellipsise => 3,
490 can_hover => 1, 496 can_hover => 1,
491 can_events => 1, 497 can_events => 1,
492 on_button_down => $macro_cb, 498 on_button_down => $macro_cb,

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines