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.12 by root, Sun Sep 2 09:48:41 2007 UTC vs.
Revision 1.22 by root, Sat Apr 3 02:58:24 2010 UTC

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

Diff Legend

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