ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/bin/cfplus
(Generate patch)

Comparing deliantra/Deliantra-Client/bin/cfplus (file contents):
Revision 1.136 by root, Fri Dec 8 14:59:54 2006 UTC vs.
Revision 1.137 by root, Sat Dec 9 02:21:25 2006 UTC

… …
59 59
60use CFPlus; 60use CFPlus;
61use CFPlus::OpenGL (); 61use CFPlus::OpenGL ();
62use CFPlus::Protocol; 62use CFPlus::Protocol;
63use CFPlus::UI; 63use CFPlus::UI;
64use CFPlus::UI::Inventory;
65use CFPlus::UI::SpellList;
64use CFPlus::Pod; 66use CFPlus::Pod;
65use CFPlus::BindingEditor;
66use CFPlus::MapWidget; 67use CFPlus::MapWidget;
68use CFPlus::Macro;
67 69
68$SIG{QUIT} = sub { Carp::cluck "QUIT" }; 70$SIG{QUIT} = sub { Carp::cluck "QUIT" };
69$SIG{PIPE} = 'IGNORE'; 71$SIG{PIPE} = 'IGNORE';
70 72
71$Event::Eval = 0; 73$Event::Eval = 0;
… …
144our $DEBUG_STATUS; 146our $DEBUG_STATUS;
145 147
146our $INV; 148our $INV;
147our $INVR; 149our $INVR;
148our $INV_RIGHT_HB; 150our $INV_RIGHT_HB;
149
150our $BIND_EDITOR;
151our $BIND_UPD_CB;
152 151
153our $PICKUP_CFG; 152our $PICKUP_CFG;
154 153
155our $IN_BUILD_MODE; 154our $IN_BUILD_MODE;
156our $BUILD_BUTTON; 155our $BUILD_BUTTON;
… …
377sub start_game { 376sub start_game {
378 status "logging in..."; 377 status "logging in...";
379 378
380 $LOGIN_BUTTON->set_text ("Logout"); 379 $LOGIN_BUTTON->set_text ("Logout");
381 $SETUP_DIALOG->hide; 380 $SETUP_DIALOG->hide;
382
383 $PROFILE = $CFG->{profile}{default};
384 381
385 my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32; 382 my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32;
386 383
387 my ($host, $port) = split /:/, $PROFILE->{host}; 384 my ($host, $port) = split /:/, $PROFILE->{host};
388 385
… …
1382 1379
1383 $plwin->add ($ntb); 1380 $plwin->add ($ntb);
1384 $plwin 1381 $plwin
1385} 1382}
1386 1383
1387sub update_bindings {
1388 $BIND_UPD_CB->() if $BIND_UPD_CB;
1389}
1390
1391sub keyboard_setup { 1384sub keyboard_setup {
1392 my $binding_list = new CFPlus::UI::VBox; 1385 CFPlus::Macro::keyboard_setup
1393
1394 my $refresh;
1395 $refresh = $BIND_UPD_CB = sub {
1396 $binding_list->clear ();
1397
1398 return unless $PROFILE;
1399
1400 for my $mod (keys %{$PROFILE->{bindings}}) {
1401 for my $sym (keys %{$PROFILE->{bindings}{$mod}}) {
1402 my $cmds = $PROFILE->{bindings}{$mod}{$sym};
1403 next unless ref $cmds eq 'ARRAY' and @$cmds > 0;
1404
1405 my $lbl = join "; ", @$cmds;
1406 my $nam = CFPlus::BindingEditor::keycombo_to_name ($mod, $sym);
1407 $binding_list->add (my $hb = new CFPlus::UI::HBox);
1408 $hb->add (new CFPlus::UI::Button
1409 text => "delete",
1410 tooltip => "Deletes the binding",
1411 on_activate => sub {
1412 $binding_list->remove ($hb);
1413 delete $PROFILE->{bindings}{$mod}{$sym};
1414 0
1415 });
1416
1417 $hb->add (new CFPlus::UI::Button
1418 text => "edit",
1419 tooltip => "Edits the binding",
1420 on_activate => sub {
1421 $::BIND_EDITOR->set_binding (
1422 $mod, $sym, $PROFILE->{bindings}{$mod}{$sym},
1423 sub {
1424 my ($nmod, $nsym, $ncmds) = @_;
1425 $::BIND_EDITOR->cfg_unbind ($mod, $sym);
1426 $::BIND_EDITOR->cfg_bind ($nmod, $nsym, $ncmds);
1427 $refresh->();
1428 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1429 $SETUP_DIALOG->show;
1430 },
1431 sub {
1432 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1433 $SETUP_DIALOG->show;
1434 });
1435 $::BIND_EDITOR->show;
1436 $SETUP_DIALOG->hide;
1437 0
1438 });
1439
1440 $hb->add (new CFPlus::UI::Label text => "(Key: $nam)");
1441 $hb->add (new CFPlus::UI::Label text => $lbl, expand => 1);
1442 }
1443 }
1444 };
1445
1446 my $vb = new CFPlus::UI::VBox;
1447 $vb->add (new CFPlus::UI::FancyFrame
1448 label => "Options",
1449 child => (my $hb = new CFPlus::UI::HBox),
1450 );
1451 $hb->add (new CFPlus::UI::Label text => "only shift-up stops fire");
1452 $hb->add (new CFPlus::UI::CheckBox
1453 expand => 1,
1454 state => $CFG->{shift_fire_stop},
1455 tooltip => "If this checkbox is enabled you will stop fire only if you stop pressing shift",
1456 on_changed => sub {
1457 my ($cbox, $value) = @_;
1458 $CFG->{shift_fire_stop} = $value;
1459 0
1460 });
1461
1462 $vb->add (new CFPlus::UI::FancyFrame
1463 label => "Bindings",
1464 child => $binding_list);
1465 $vb->add (my $hb = new CFPlus::UI::HBox);
1466
1467 $hb->add (new CFPlus::UI::Button
1468 text => "record new",
1469 expand => 1,
1470 tooltip => "This button opens the binding editor with an empty binding.",
1471 on_activate => sub {
1472 $::BIND_EDITOR->set_binding (undef, undef, [],
1473 sub {
1474 my ($mod, $sym, $cmds) = @_;
1475 $::BIND_EDITOR->cfg_bind ($mod, $sym, $cmds);
1476 $refresh->();
1477 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1478 $SETUP_DIALOG->show;
1479 },
1480 sub {
1481 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1482 $SETUP_DIALOG->show;
1483 },
1484 );
1485 $SETUP_DIALOG->hide;
1486 $::BIND_EDITOR->show;
1487 0
1488 },
1489 );
1490
1491 $hb->add (new CFPlus::UI::Button
1492 text => "close",
1493 tooltip => "Closes the binding window",
1494 expand => 1,
1495 on_activate => sub {
1496 $SETUP_DIALOG->hide;
1497 0
1498 }
1499 );
1500
1501 $refresh->();
1502
1503 $vb
1504} 1386}
1505 1387
1506sub help_window { 1388sub help_window {
1507 my $win = new CFPlus::UI::Toplevel 1389 my $win = new CFPlus::UI::Toplevel
1508 x => 'center', 1390 x => 'center',
… …
1693 1575
1694 $vbox->add (my $viewer = new CFPlus::UI::TextScroller 1576 $vbox->add (my $viewer = new CFPlus::UI::TextScroller
1695 expand => 1, fontsize => 0.8, padding_x => 4, padding_y => 4); 1577 expand => 1, fontsize => 0.8, padding_x => 4, padding_y => 4);
1696 $viewer->add_paragraph (CFPlus::Pod::as_paragraphs CFPlus::Pod::section_of $tod[$todindex]); 1578 $viewer->add_paragraph (CFPlus::Pod::as_paragraphs CFPlus::Pod::section_of $tod[$todindex]);
1697 1579
1698 $vbox->add (my $table = new CFPlus::UI::Table); 1580 $vbox->add (my $table = new CFPlus::UI::Table col_expand => [0, 1]);
1699 1581
1700 $table->add (0, 0, new CFPlus::UI::Button 1582 $table->add (0, 0, new CFPlus::UI::Button
1701 text => "Close", 1583 text => "Close",
1702 tooltip => "Close the tip of the day window. To never see it again, disable the tip of the day in the <b>Server Setup</b>.", 1584 tooltip => "Close the tip of the day window. To never see it again, disable the tip of the day in the <b>Server Setup</b>.",
1703 on_activate => $close, 1585 on_activate => $close,
1704 ); 1586 );
1705 1587
1706 $table->add (2, 0, new CFPlus::UI::Button 1588 $table->add (2, 0, new CFPlus::UI::Button
1707 text => "Next", 1589 text => "Next",
1708 tooltip => "Show the next <b>Tip of the day</b>.", 1590 tooltip => "Show the next <b>Tip of the day</b>.",
1709 on_activate => sub { 1591 on_activate => sub {
1710 $close->(); 1592 $close->();
1711 &show_tip_of_the_day; 1593 &show_tip_of_the_day;
1712 }, 1594 },
… …
1754 padding => 0, 1636 padding => 0,
1755 z => 100, 1637 z => 100,
1756 force_x => "max", 1638 force_x => "max",
1757 force_y => 0; 1639 force_y => 0;
1758 $DEBUG_STATUS->show; 1640 $DEBUG_STATUS->show;
1759
1760 $BIND_EDITOR = new CFPlus::BindingEditor (x => "max", y => 0);
1761 1641
1762 $STATUSBOX = new CFPlus::UI::Statusbox; 1642 $STATUSBOX = new CFPlus::UI::Statusbox;
1763 $STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", timeout => 864000, pri => -100, color => [1, 1, 1, 0.8]); 1643 $STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", timeout => 864000, pri => -100, color => [1, 1, 1, 0.8]);
1764 1644
1765 (new CFPlus::UI::Frame 1645 (new CFPlus::UI::Frame
… …
2140 }, 2020 },
2141 CFPlus::SDL_VIDEOEXPOSE => sub { 2021 CFPlus::SDL_VIDEOEXPOSE => sub {
2142 CFPlus::UI::full_refresh; 2022 CFPlus::UI::full_refresh;
2143 }, 2023 },
2144 CFPlus::SDL_ACTIVEEVENT => sub { 2024 CFPlus::SDL_ACTIVEEVENT => sub {
2145# printf "active %x %x\n", $SDL_EV->active_gain, $SDL_EV->active_state;#d# 2025# not useful, as APPACTIVE include sonly iconified state, not unmapped
2026# printf "active %x %x\n", $_[0]{gain}, $_[0]{state};#d#
2027# printf "A\n" if $_[0]{state} & CFPlus::SDL_APPACTIVE;
2028# printf "K\n" if $_[0]{state} & CFPlus::SDL_APPINPUTFOCUS;
2029# printf "M\n" if $_[0]{state} & CFPlus::SDL_APPMOUSEFOCUS;
2146 }, 2030 },
2147 CFPlus::SDL_KEYDOWN => sub { 2031 CFPlus::SDL_KEYDOWN => sub {
2148 if ($_[0]{mod} & CFPlus::KMOD_ALT && $_[0]{sym} == 13) { 2032 if ($_[0]{mod} & CFPlus::KMOD_ALT && $_[0]{sym} == 13) {
2149 # alt-enter 2033 # alt-enter
2150 $FULLSCREEN_ENABLE->toggle; 2034 $FULLSCREEN_ENABLE->toggle;
… …
2207 while (my ($k, $v) = each %DEF_CFG) { 2091 while (my ($k, $v) = each %DEF_CFG) {
2208 $CFG->{$k} = $v unless exists $CFG->{$k}; 2092 $CFG->{$k} = $v unless exists $CFG->{$k};
2209 } 2093 }
2210 2094
2211 $CFG->{profile}{default}{host} ||= "crossfire.schmorp.de"; 2095 $CFG->{profile}{default}{host} ||= "crossfire.schmorp.de";
2096 $PROFILE = $CFG->{profile}{default};
2097
2098 # convert old bindings (only default profile matters)
2099 if (my $bindings = delete $PROFILE->{bindings}) {
2100 while (my ($mod, $syms) = each %$bindings) {
2101 while (my ($sym, $cmds) = each %$syms) {
2102 push @{ $PROFILE->{macro} }, {
2103 accelkey => [$mod*1, $sym*1],
2104 action => $cmds,
2105 };
2106 }
2107 }
2108 }
2212 2109
2213 sdl_init; 2110 sdl_init;
2214 2111
2215 @SDL_MODES = reverse 2112 @SDL_MODES = reverse
2216 grep $_->[0] >= 640 && $_->[1] >= 480, 2113 grep $_->[0] >= 640 && $_->[1] >= 480,
… …
2261 audio_init; 2158 audio_init;
2262} 2159}
2263 2160
2264show_tip_of_the_day if $CFG->{show_tips}; 2161show_tip_of_the_day if $CFG->{show_tips};
2265 2162
2163#CFPlus::Macro::quick_macro ["test"];#d#
2266Event::loop; 2164Event::loop;
2267#CFPlus::SDL_Quit; 2165#CFPlus::SDL_Quit;
2268#CFPlus::_exit 0; 2166#CFPlus::_exit 0;
2269 2167
2270END { CFPlus::SDL_Quit } 2168END { CFPlus::SDL_Quit }

Diff Legend

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