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.141 by elmex, Sat Dec 16 17:33:26 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 = 1;
72$Event::DIED = sub { 74$Event::DIED = sub {
73 CFPlus::fatal Carp::longmess $_[1] 75 CFPlus::fatal Carp::longmess $_[1]
74}; 76};
75 77
76my $MAX_FPS = 60; 78my $MAX_FPS = 60;
… …
145 147
146our $INV; 148our $INV;
147our $INVR; 149our $INVR;
148our $INV_RIGHT_HB; 150our $INV_RIGHT_HB;
149 151
150our $BIND_EDITOR;
151our $BIND_UPD_CB;
152
153our $PICKUP_CFG; 152our $PICKUP_CFG;
154 153
155our $IN_BUILD_MODE; 154our $IN_BUILD_MODE;
156our $BUILD_BUTTON; 155our $BUILD_BUTTON;
157 156
… …
177sub destroy_query_dialog { 176sub destroy_query_dialog {
178 (delete $_[0]{query_dialog})->destroy 177 (delete $_[0]{query_dialog})->destroy
179 if $_[0]{query_dialog}; 178 if $_[0]{query_dialog};
180} 179}
181 180
181# FIXME: a very ugly hack to wait for stat update look below! #d#
182our $QUERY_TIMER; #d#
183
182# server query dialog 184# server query dialog
183sub server_query { 185sub server_query {
184 my ($conn, $flags, $prompt) = @_; 186 my ($conn, $flags, $prompt) = @_;
187
188 # FIXME: a very ugly hack to wait for stat update #d#
189 if ($prompt =~ /roll new stats/ and not $conn->{stat_change_with}) {
190 unless ($QUERY_TIMER) {
191 $QUERY_TIMER =
192 Event->timer (
193 after => 1,
194 cb => sub {
195 server_query ($conn, $flags, $prompt, 1);
196 $QUERY_TIMER = undef
197 }
198 );
199 return;
200 }
201 }
185 202
186 $conn->{query_dialog} = my $dialog = new CFPlus::UI::Toplevel 203 $conn->{query_dialog} = my $dialog = new CFPlus::UI::Toplevel
187 x => "center", 204 x => "center",
188 y => "center", 205 y => "center",
189 title => "Server Query", 206 title => "Server Query",
… …
377sub start_game { 394sub start_game {
378 status "logging in..."; 395 status "logging in...";
379 396
380 $LOGIN_BUTTON->set_text ("Logout"); 397 $LOGIN_BUTTON->set_text ("Logout");
381 $SETUP_DIALOG->hide; 398 $SETUP_DIALOG->hide;
382
383 $PROFILE = $CFG->{profile}{default};
384 399
385 my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32; 400 my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32;
386 401
387 my ($host, $port) = split /:/, $PROFILE->{host}; 402 my ($host, $port) = split /:/, $PROFILE->{host};
388 403
… …
1382 1397
1383 $plwin->add ($ntb); 1398 $plwin->add ($ntb);
1384 $plwin 1399 $plwin
1385} 1400}
1386 1401
1387sub update_bindings {
1388 $BIND_UPD_CB->() if $BIND_UPD_CB;
1389}
1390
1391sub keyboard_setup { 1402sub keyboard_setup {
1392 my $binding_list = new CFPlus::UI::VBox; 1403 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} 1404}
1505 1405
1506sub help_window { 1406sub help_window {
1507 my $win = new CFPlus::UI::Toplevel 1407 my $win = new CFPlus::UI::Toplevel
1508 x => 'center', 1408 x => 'center',
… …
1693 1593
1694 $vbox->add (my $viewer = new CFPlus::UI::TextScroller 1594 $vbox->add (my $viewer = new CFPlus::UI::TextScroller
1695 expand => 1, fontsize => 0.8, padding_x => 4, padding_y => 4); 1595 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]); 1596 $viewer->add_paragraph (CFPlus::Pod::as_paragraphs CFPlus::Pod::section_of $tod[$todindex]);
1697 1597
1698 $vbox->add (my $table = new CFPlus::UI::Table); 1598 $vbox->add (my $table = new CFPlus::UI::Table col_expand => [0, 1]);
1699 1599
1700 $table->add (0, 0, new CFPlus::UI::Button 1600 $table->add (0, 0, new CFPlus::UI::Button
1701 text => "Close", 1601 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>.", 1602 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, 1603 on_activate => $close,
1704 ); 1604 );
1705 1605
1706 $table->add (2, 0, new CFPlus::UI::Button 1606 $table->add (2, 0, new CFPlus::UI::Button
1707 text => "Next", 1607 text => "Next",
1708 tooltip => "Show the next <b>Tip of the day</b>.", 1608 tooltip => "Show the next <b>Tip of the day</b>.",
1709 on_activate => sub { 1609 on_activate => sub {
1710 $close->(); 1610 $close->();
1711 &show_tip_of_the_day; 1611 &show_tip_of_the_day;
1712 }, 1612 },
… …
1754 padding => 0, 1654 padding => 0,
1755 z => 100, 1655 z => 100,
1756 force_x => "max", 1656 force_x => "max",
1757 force_y => 0; 1657 force_y => 0;
1758 $DEBUG_STATUS->show; 1658 $DEBUG_STATUS->show;
1759
1760 $BIND_EDITOR = new CFPlus::BindingEditor (x => "max", y => 0);
1761 1659
1762 $STATUSBOX = new CFPlus::UI::Statusbox; 1660 $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]); 1661 $STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", timeout => 864000, pri => -100, color => [1, 1, 1, 0.8]);
1764 1662
1765 (new CFPlus::UI::Frame 1663 (new CFPlus::UI::Frame
… …
1890} 1788}
1891 1789
1892sub setup_build_button { 1790sub setup_build_button {
1893 my ($enabled) = @_; 1791 my ($enabled) = @_;
1894 if ($enabled) { 1792 if ($enabled) {
1793 $BUILD_BUTTON->hide if $BUILD_BUTTON;
1895 $BUILD_BUTTON ||= new CFPlus::UI::Button 1794 $BUILD_BUTTON ||= new CFPlus::UI::Button
1896 text => "Build", 1795 text => "Build",
1897 tooltip => "Opens the ingame builder", 1796 tooltip => "Opens the ingame builder",
1898 on_activate => sub { 1797 on_activate => sub {
1899 if ($CONN) { 1798 if ($CONN) {
… …
2140 }, 2039 },
2141 CFPlus::SDL_VIDEOEXPOSE => sub { 2040 CFPlus::SDL_VIDEOEXPOSE => sub {
2142 CFPlus::UI::full_refresh; 2041 CFPlus::UI::full_refresh;
2143 }, 2042 },
2144 CFPlus::SDL_ACTIVEEVENT => sub { 2043 CFPlus::SDL_ACTIVEEVENT => sub {
2145# printf "active %x %x\n", $SDL_EV->active_gain, $SDL_EV->active_state;#d# 2044# not useful, as APPACTIVE include sonly iconified state, not unmapped
2045# printf "active %x %x\n", $_[0]{gain}, $_[0]{state};#d#
2046# printf "A\n" if $_[0]{state} & CFPlus::SDL_APPACTIVE;
2047# printf "K\n" if $_[0]{state} & CFPlus::SDL_APPINPUTFOCUS;
2048# printf "M\n" if $_[0]{state} & CFPlus::SDL_APPMOUSEFOCUS;
2146 }, 2049 },
2147 CFPlus::SDL_KEYDOWN => sub { 2050 CFPlus::SDL_KEYDOWN => sub {
2148 if ($_[0]{mod} & CFPlus::KMOD_ALT && $_[0]{sym} == 13) { 2051 if ($_[0]{mod} & CFPlus::KMOD_ALT && $_[0]{sym} == 13) {
2149 # alt-enter 2052 # alt-enter
2150 $FULLSCREEN_ENABLE->toggle; 2053 $FULLSCREEN_ENABLE->toggle;
… …
2207 while (my ($k, $v) = each %DEF_CFG) { 2110 while (my ($k, $v) = each %DEF_CFG) {
2208 $CFG->{$k} = $v unless exists $CFG->{$k}; 2111 $CFG->{$k} = $v unless exists $CFG->{$k};
2209 } 2112 }
2210 2113
2211 $CFG->{profile}{default}{host} ||= "crossfire.schmorp.de"; 2114 $CFG->{profile}{default}{host} ||= "crossfire.schmorp.de";
2115 $PROFILE = $CFG->{profile}{default};
2116
2117 # convert old bindings (only default profile matters)
2118 if (my $bindings = delete $PROFILE->{bindings}) {
2119 while (my ($mod, $syms) = each %$bindings) {
2120 while (my ($sym, $cmds) = each %$syms) {
2121 push @{ $PROFILE->{macro} }, {
2122 accelkey => [$mod*1, $sym*1],
2123 action => $cmds,
2124 };
2125 }
2126 }
2127 }
2212 2128
2213 sdl_init; 2129 sdl_init;
2214 2130
2215 @SDL_MODES = reverse 2131 @SDL_MODES = reverse
2216 grep $_->[0] >= 640 && $_->[1] >= 480, 2132 grep $_->[0] >= 640 && $_->[1] >= 480,

Diff Legend

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