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.134 by elmex, Mon Dec 4 15:17:14 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",
… …
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 399
383 $PROFILE = $CFG->{profile}{default};
384
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
389 $MAP = new CFPlus::Map; 404 $MAP = new CFPlus::Map;
… …
683 on_changed => sub { $MAP->{smooth_matrix}[$x * 3 + $y] = $_[1] if $MAP; 0 }, 698 on_changed => sub { $MAP->{smooth_matrix}[$x * 3 + $y] = $_[1] if $MAP; 0 },
684 ); 699 );
685 } 700 }
686 } 701 }
687 702
703 $table->add (0, 5, new CFPlus::UI::TextEdit text => "line1\0152\0153");#d#
688 704
689 $table 705 $table
690} 706}
691 707
692sub stats_window { 708sub stats_window {
… …
1381 1397
1382 $plwin->add ($ntb); 1398 $plwin->add ($ntb);
1383 $plwin 1399 $plwin
1384} 1400}
1385 1401
1386sub update_bindings {
1387 $BIND_UPD_CB->() if $BIND_UPD_CB;
1388}
1389
1390sub keyboard_setup { 1402sub keyboard_setup {
1391 my $binding_list = new CFPlus::UI::VBox; 1403 CFPlus::Macro::keyboard_setup
1392
1393 my $refresh;
1394 $refresh = $BIND_UPD_CB = sub {
1395 $binding_list->clear ();
1396
1397 return unless $PROFILE;
1398
1399 for my $mod (keys %{$PROFILE->{bindings}}) {
1400 for my $sym (keys %{$PROFILE->{bindings}{$mod}}) {
1401 my $cmds = $PROFILE->{bindings}{$mod}{$sym};
1402 next unless ref $cmds eq 'ARRAY' and @$cmds > 0;
1403
1404 my $lbl = join "; ", @$cmds;
1405 my $nam = CFPlus::BindingEditor::keycombo_to_name ($mod, $sym);
1406 $binding_list->add (my $hb = new CFPlus::UI::HBox);
1407 $hb->add (new CFPlus::UI::Button
1408 text => "delete",
1409 tooltip => "Deletes the binding",
1410 on_activate => sub {
1411 $binding_list->remove ($hb);
1412 delete $PROFILE->{bindings}{$mod}{$sym};
1413 0
1414 });
1415
1416 $hb->add (new CFPlus::UI::Button
1417 text => "edit",
1418 tooltip => "Edits the binding",
1419 on_activate => sub {
1420 $::BIND_EDITOR->set_binding (
1421 $mod, $sym, $PROFILE->{bindings}{$mod}{$sym},
1422 sub {
1423 my ($nmod, $nsym, $ncmds) = @_;
1424 $::BIND_EDITOR->cfg_unbind ($mod, $sym);
1425 $::BIND_EDITOR->cfg_bind ($nmod, $nsym, $ncmds);
1426 $refresh->();
1427 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1428 $SETUP_DIALOG->show;
1429 },
1430 sub {
1431 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1432 $SETUP_DIALOG->show;
1433 });
1434 $::BIND_EDITOR->show;
1435 $SETUP_DIALOG->hide;
1436 0
1437 });
1438
1439 $hb->add (new CFPlus::UI::Label text => "(Key: $nam)");
1440 $hb->add (new CFPlus::UI::Label text => $lbl, expand => 1);
1441 }
1442 }
1443 };
1444
1445 my $vb = new CFPlus::UI::VBox;
1446 $vb->add (new CFPlus::UI::FancyFrame
1447 label => "Options",
1448 child => (my $hb = new CFPlus::UI::HBox),
1449 );
1450 $hb->add (new CFPlus::UI::Label text => "only shift-up stops fire");
1451 $hb->add (new CFPlus::UI::CheckBox
1452 expand => 1,
1453 state => $CFG->{shift_fire_stop},
1454 tooltip => "If this checkbox is enabled you will stop fire only if you stop pressing shift",
1455 on_changed => sub {
1456 my ($cbox, $value) = @_;
1457 $CFG->{shift_fire_stop} = $value;
1458 0
1459 });
1460
1461 $vb->add (new CFPlus::UI::FancyFrame
1462 label => "Bindings",
1463 child => $binding_list);
1464 $vb->add (my $hb = new CFPlus::UI::HBox);
1465
1466 $hb->add (new CFPlus::UI::Button
1467 text => "record new",
1468 expand => 1,
1469 tooltip => "This button opens the binding editor with an empty binding.",
1470 on_activate => sub {
1471 $::BIND_EDITOR->set_binding (undef, undef, [],
1472 sub {
1473 my ($mod, $sym, $cmds) = @_;
1474 $::BIND_EDITOR->cfg_bind ($mod, $sym, $cmds);
1475 $refresh->();
1476 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1477 $SETUP_DIALOG->show;
1478 },
1479 sub {
1480 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1481 $SETUP_DIALOG->show;
1482 },
1483 );
1484 $SETUP_DIALOG->hide;
1485 $::BIND_EDITOR->show;
1486 0
1487 },
1488 );
1489
1490 $hb->add (new CFPlus::UI::Button
1491 text => "close",
1492 tooltip => "Closes the binding window",
1493 expand => 1,
1494 on_activate => sub {
1495 $SETUP_DIALOG->hide;
1496 0
1497 }
1498 );
1499
1500 $refresh->();
1501
1502 $vb
1503} 1404}
1504 1405
1505sub help_window { 1406sub help_window {
1506 my $win = new CFPlus::UI::Toplevel 1407 my $win = new CFPlus::UI::Toplevel
1507 x => 'center', 1408 x => 'center',
… …
1692 1593
1693 $vbox->add (my $viewer = new CFPlus::UI::TextScroller 1594 $vbox->add (my $viewer = new CFPlus::UI::TextScroller
1694 expand => 1, fontsize => 0.8, padding_x => 4, padding_y => 4); 1595 expand => 1, fontsize => 0.8, padding_x => 4, padding_y => 4);
1695 $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]);
1696 1597
1697 $vbox->add (my $table = new CFPlus::UI::Table); 1598 $vbox->add (my $table = new CFPlus::UI::Table col_expand => [0, 1]);
1698 1599
1699 $table->add (0, 0, new CFPlus::UI::Button 1600 $table->add (0, 0, new CFPlus::UI::Button
1700 text => "Close", 1601 text => "Close",
1701 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>.",
1702 on_activate => $close, 1603 on_activate => $close,
1703 ); 1604 );
1704 1605
1705 $table->add (2, 0, new CFPlus::UI::Button 1606 $table->add (2, 0, new CFPlus::UI::Button
1706 text => "Next", 1607 text => "Next",
1707 tooltip => "Show the next <b>Tip of the day</b>.", 1608 tooltip => "Show the next <b>Tip of the day</b>.",
1708 on_activate => sub { 1609 on_activate => sub {
1709 $close->(); 1610 $close->();
1710 &show_tip_of_the_day; 1611 &show_tip_of_the_day;
1711 }, 1612 },
… …
1753 padding => 0, 1654 padding => 0,
1754 z => 100, 1655 z => 100,
1755 force_x => "max", 1656 force_x => "max",
1756 force_y => 0; 1657 force_y => 0;
1757 $DEBUG_STATUS->show; 1658 $DEBUG_STATUS->show;
1758
1759 $BIND_EDITOR = new CFPlus::BindingEditor (x => "max", y => 0);
1760 1659
1761 $STATUSBOX = new CFPlus::UI::Statusbox; 1660 $STATUSBOX = new CFPlus::UI::Statusbox;
1762 $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]);
1763 1662
1764 (new CFPlus::UI::Frame 1663 (new CFPlus::UI::Frame
… …
1889} 1788}
1890 1789
1891sub setup_build_button { 1790sub setup_build_button {
1892 my ($enabled) = @_; 1791 my ($enabled) = @_;
1893 if ($enabled) { 1792 if ($enabled) {
1793 $BUILD_BUTTON->hide if $BUILD_BUTTON;
1894 $BUILD_BUTTON ||= new CFPlus::UI::Button 1794 $BUILD_BUTTON ||= new CFPlus::UI::Button
1895 text => "Build", 1795 text => "Build",
1896 tooltip => "Opens the ingame builder", 1796 tooltip => "Opens the ingame builder",
1897 on_activate => sub { 1797 on_activate => sub {
1898 if ($CONN) { 1798 if ($CONN) {
… …
1927 ); 1827 );
1928 $r->add (my $vb = new CFPlus::UI::VBox); 1828 $r->add (my $vb = new CFPlus::UI::VBox);
1929 $win->add ($r); 1829 $win->add ($r);
1930 1830
1931 1831
1932 $vb->add (my $chk = new CFPlus::UI::Button text => "Disable build mode", on_activate => sub { $::IN_BUILD_MODE = undef }); 1832 $vb->add (
1933 $vb->add (my $chk = new CFPlus::UI::Button text => "ERASE", on_activate => sub { $::IN_BUILD_MODE = { do_erase => 1 } }); 1833 new CFPlus::UI::Button
1834 text => "Disable build mode",
1835 on_activate => sub { $::IN_BUILD_MODE = undef }
1836 );
1837 $vb->add (
1838 new CFPlus::UI::Button
1839 text => "ERASE",
1840 on_activate => sub { $::IN_BUILD_MODE = { do_erase => 1 } }
1841 );
1934 1842
1935 for my $itemarchname (keys %{$msg->{items}}) { 1843 for my $itemarchname (
1844 sort {
1845 $msg->{items}->{$a}->{build_arch_name}
1846 cmp $msg->{items}->{$b}->{build_arch_name}
1847 } keys %{$msg->{items}}
1848 ) {
1849 my $info = $msg->{items}->{$itemarchname};
1936 $vb->add ( 1850 $vb->add (
1937 new CFPlus::UI::Button text => "$itemarchname", 1851 new CFPlus::UI::Button text => $info->{build_arch_name},
1938 on_activate => sub { 1852 on_activate => sub {
1939 $::IN_BUILD_MODE = $itemarchname; 1853 $::IN_BUILD_MODE = { item => $itemarchname, info => $info };
1854
1855 if (grep { $msg->{items}->{$itemarchname}->{$_} } qw/has_connection has_name has_text/) {
1856 build_mode_query_arch_info ();
1857 }
1940 } 1858 }
1941 ); 1859 );
1942 } 1860 }
1943 1861
1944 $win->show; 1862 $win->show;
1863}
1864
1865sub build_mode_query_arch_info {
1866 my ($iteminfo) = $::IN_BUILD_MODE;
1867 my $itemarchname = $iteminfo->{item};
1868 my $info = $iteminfo->{info};
1869
1870 my $dialog = new CFPlus::UI::Toplevel
1871 x => "center",
1872 y => "center",
1873 z => 50,
1874 force_w => int $WIDTH * 1/2,
1875 title => "Enter information for placement of '$itemarchname'",
1876 has_close_button => 1;
1877
1878 $dialog->add (my $vb = new CFPlus::UI::VBox expand => 1);
1879
1880 $vb->add (my $table = new CFPlus::UI::Table expand => 1);
1881 my $row = 0;
1882 if ($info->{has_name}) {
1883 $table->add (0, $row, new CFPlus::UI::Label text => "Name:");
1884 $table->add (1, $row++, new CFPlus::UI::Entry expand => 1, on_changed => sub { $::IN_BUILD_MODE->{name} = $_[1]; 0 });
1885 }
1886 if ($info->{has_text}) {
1887 $table->add (0, $row, new CFPlus::UI::Label text => "Text:");
1888 $table->add (1, $row++, new CFPlus::UI::Entry expand => 1, on_changed => sub { $::IN_BUILD_MODE->{text} = $_[1]; 0 });
1889 }
1890 if ($info->{has_connection}) {
1891 $table->add (0, $row, new CFPlus::UI::Label text => "Connection ID:");
1892 $table->add (1, $row++,
1893 new CFPlus::UI::Entry
1894 expand => 1,
1895 on_changed => sub { $::IN_BUILD_MODE->{connection} = $_[1]; 0 },
1896 tooltip => "Enter the connection ID here. The connection ID connects actors like a lever to a gate or a magic ear to a gate"
1897 );
1898 }
1899
1900 $vb->add (my $hb = new CFPlus::UI::HBox expand => 1);
1901 $hb->add (new CFPlus::UI::Button
1902 text => "Close",
1903 expand => 1,
1904 on_activate => sub { $dialog->hide; 0 },
1905 );
1906 $dialog->show;
1945} 1907}
1946 1908
1947sub video_shutdown { 1909sub video_shutdown {
1948 CFPlus::OpenGL::shutdown; 1910 CFPlus::OpenGL::shutdown;
1949 1911
… …
2077 }, 2039 },
2078 CFPlus::SDL_VIDEOEXPOSE => sub { 2040 CFPlus::SDL_VIDEOEXPOSE => sub {
2079 CFPlus::UI::full_refresh; 2041 CFPlus::UI::full_refresh;
2080 }, 2042 },
2081 CFPlus::SDL_ACTIVEEVENT => sub { 2043 CFPlus::SDL_ACTIVEEVENT => sub {
2082# 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;
2083 }, 2049 },
2084 CFPlus::SDL_KEYDOWN => sub { 2050 CFPlus::SDL_KEYDOWN => sub {
2085 if ($_[0]{mod} & CFPlus::KMOD_ALT && $_[0]{sym} == 13) { 2051 if ($_[0]{mod} & CFPlus::KMOD_ALT && $_[0]{sym} == 13) {
2086 # alt-enter 2052 # alt-enter
2087 $FULLSCREEN_ENABLE->toggle; 2053 $FULLSCREEN_ENABLE->toggle;
… …
2144 while (my ($k, $v) = each %DEF_CFG) { 2110 while (my ($k, $v) = each %DEF_CFG) {
2145 $CFG->{$k} = $v unless exists $CFG->{$k}; 2111 $CFG->{$k} = $v unless exists $CFG->{$k};
2146 } 2112 }
2147 2113
2148 $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 }
2149 2128
2150 sdl_init; 2129 sdl_init;
2151 2130
2152 @SDL_MODES = reverse 2131 @SDL_MODES = reverse
2153 grep $_->[0] >= 640 && $_->[1] >= 480, 2132 grep $_->[0] >= 640 && $_->[1] >= 480,

Diff Legend

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