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.133 by root, Sun Dec 3 01:03:49 2006 UTC vs.
Revision 1.142 by root, Mon Mar 12 22:23:09 2007 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;
153
154our $IN_BUILD_MODE;
155our $BUILD_BUTTON;
154 156
155sub status { 157sub status {
156 $STATUSBOX->add (CFPlus::asxml $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]); 158 $STATUSBOX->add (CFPlus::asxml $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]);
157} 159}
158 160
… …
174sub destroy_query_dialog { 176sub destroy_query_dialog {
175 (delete $_[0]{query_dialog})->destroy 177 (delete $_[0]{query_dialog})->destroy
176 if $_[0]{query_dialog}; 178 if $_[0]{query_dialog};
177} 179}
178 180
181# FIXME: a very ugly hack to wait for stat update look below! #d#
182our $QUERY_TIMER; #d#
183
179# server query dialog 184# server query dialog
180sub server_query { 185sub server_query {
181 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 }
182 202
183 $conn->{query_dialog} = my $dialog = new CFPlus::UI::Toplevel 203 $conn->{query_dialog} = my $dialog = new CFPlus::UI::Toplevel
184 x => "center", 204 x => "center",
185 y => "center", 205 y => "center",
186 title => "Server Query", 206 title => "Server Query",
… …
375 status "logging in..."; 395 status "logging in...";
376 396
377 $LOGIN_BUTTON->set_text ("Logout"); 397 $LOGIN_BUTTON->set_text ("Logout");
378 $SETUP_DIALOG->hide; 398 $SETUP_DIALOG->hide;
379 399
380 $PROFILE = $CFG->{profile}{default};
381
382 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;
383 401
384 my ($host, $port) = split /:/, $PROFILE->{host}; 402 my ($host, $port) = split /:/, $PROFILE->{host};
385 403
386 $MAP = new CFPlus::Map; 404 $MAP = new CFPlus::Map;
… …
680 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 },
681 ); 699 );
682 } 700 }
683 } 701 }
684 702
703 $table->add (0, 5, new CFPlus::UI::TextEdit text => "line1\0152\0153");#d#
685 704
686 $table 705 $table
687} 706}
688 707
689sub stats_window { 708sub stats_window {
… …
886 for 0 .. $#col; 905 for 0 .. $#col;
887 906
888 my @align = qw(1 0 1 1 -1); 907 my @align = qw(1 0 1 1 -1);
889 908
890 my $y = 0; 909 my $y = 0;
891 for my $m (
892 sort {
893 $b->{version} <=> $a->{version}
894 or $b->{users} <=> $a->{users}
895 }
896 @{ $msg->{servers} } 910 for my $m (@{ $msg->{servers} }) {
897 ) {
898 my ($ip, $last, $host, $users, $version, $desc, $ibytes, $obytes, $uptime) = 911 my ($ip, $last, $host, $users, $version, $desc, $ibytes, $obytes, $uptime, $highlight) =
899 @$m{qw(ip age hostname users version description ibytes obytes uptime)}; 912 @$m{qw(ip age hostname users version description ibytes obytes uptime highlight)};
900 913
901 for ($desc) { 914 for ($desc) {
902 s/<br>/\n/gi; 915 s/<br>/\n/gi;
903 s/<li>/\n· /gi; 916 s/<li>/\n· /gi;
904 s/<.*?>//sgi; 917 s/<.*?>//sgi;
… …
934 max_w => $::WIDTH * 0.4, 947 max_w => $::WIDTH * 0.4,
935 ellipsise => 0, 948 ellipsise => 0,
936 align => $align[$_], 949 align => $align[$_],
937 text => $m->[$_], 950 text => $m->[$_],
938 tooltip => $tip[$_], 951 tooltip => $tip[$_],
939 fg => ($m->[3] =~ /\+$/ ? [1, 1, 1] : [.7, .7, .7]), 952 fg => ($highlight ? [1, 1, 1] : [.7, .7, .7]),
940 can_hover => 1, 953 can_hover => 1,
941 can_events => 1, 954 can_events => 1,
942 fontsize => 0.8) 955 fontsize => 0.8)
943 for 0 .. $#$m; 956 for 0 .. $#$m;
944 } 957 }
… …
1378 1391
1379 $plwin->add ($ntb); 1392 $plwin->add ($ntb);
1380 $plwin 1393 $plwin
1381} 1394}
1382 1395
1383sub update_bindings {
1384 $BIND_UPD_CB->() if $BIND_UPD_CB;
1385}
1386
1387sub keyboard_setup { 1396sub keyboard_setup {
1388 my $binding_list = new CFPlus::UI::VBox; 1397 CFPlus::Macro::keyboard_setup
1389
1390 my $refresh;
1391 $refresh = $BIND_UPD_CB = sub {
1392 $binding_list->clear ();
1393
1394 return unless $PROFILE;
1395
1396 for my $mod (keys %{$PROFILE->{bindings}}) {
1397 for my $sym (keys %{$PROFILE->{bindings}{$mod}}) {
1398 my $cmds = $PROFILE->{bindings}{$mod}{$sym};
1399 next unless ref $cmds eq 'ARRAY' and @$cmds > 0;
1400
1401 my $lbl = join "; ", @$cmds;
1402 my $nam = CFPlus::BindingEditor::keycombo_to_name ($mod, $sym);
1403 $binding_list->add (my $hb = new CFPlus::UI::HBox);
1404 $hb->add (new CFPlus::UI::Button
1405 text => "delete",
1406 tooltip => "Deletes the binding",
1407 on_activate => sub {
1408 $binding_list->remove ($hb);
1409 delete $PROFILE->{bindings}{$mod}{$sym};
1410 0
1411 });
1412
1413 $hb->add (new CFPlus::UI::Button
1414 text => "edit",
1415 tooltip => "Edits the binding",
1416 on_activate => sub {
1417 $::BIND_EDITOR->set_binding (
1418 $mod, $sym, $PROFILE->{bindings}{$mod}{$sym},
1419 sub {
1420 my ($nmod, $nsym, $ncmds) = @_;
1421 $::BIND_EDITOR->cfg_unbind ($mod, $sym);
1422 $::BIND_EDITOR->cfg_bind ($nmod, $nsym, $ncmds);
1423 $refresh->();
1424 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1425 $SETUP_DIALOG->show;
1426 },
1427 sub {
1428 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1429 $SETUP_DIALOG->show;
1430 });
1431 $::BIND_EDITOR->show;
1432 $SETUP_DIALOG->hide;
1433 0
1434 });
1435
1436 $hb->add (new CFPlus::UI::Label text => "(Key: $nam)");
1437 $hb->add (new CFPlus::UI::Label text => $lbl, expand => 1);
1438 }
1439 }
1440 };
1441
1442 my $vb = new CFPlus::UI::VBox;
1443 $vb->add (new CFPlus::UI::FancyFrame
1444 label => "Options",
1445 child => (my $hb = new CFPlus::UI::HBox),
1446 );
1447 $hb->add (new CFPlus::UI::Label text => "only shift-up stops fire");
1448 $hb->add (new CFPlus::UI::CheckBox
1449 expand => 1,
1450 state => $CFG->{shift_fire_stop},
1451 tooltip => "If this checkbox is enabled you will stop fire only if you stop pressing shift",
1452 on_changed => sub {
1453 my ($cbox, $value) = @_;
1454 $CFG->{shift_fire_stop} = $value;
1455 0
1456 });
1457
1458 $vb->add (new CFPlus::UI::FancyFrame
1459 label => "Bindings",
1460 child => $binding_list);
1461 $vb->add (my $hb = new CFPlus::UI::HBox);
1462
1463 $hb->add (new CFPlus::UI::Button
1464 text => "record new",
1465 expand => 1,
1466 tooltip => "This button opens the binding editor with an empty binding.",
1467 on_activate => sub {
1468 $::BIND_EDITOR->set_binding (undef, undef, [],
1469 sub {
1470 my ($mod, $sym, $cmds) = @_;
1471 $::BIND_EDITOR->cfg_bind ($mod, $sym, $cmds);
1472 $refresh->();
1473 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1474 $SETUP_DIALOG->show;
1475 },
1476 sub {
1477 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1478 $SETUP_DIALOG->show;
1479 },
1480 );
1481 $SETUP_DIALOG->hide;
1482 $::BIND_EDITOR->show;
1483 0
1484 },
1485 );
1486
1487 $hb->add (new CFPlus::UI::Button
1488 text => "close",
1489 tooltip => "Closes the binding window",
1490 expand => 1,
1491 on_activate => sub {
1492 $SETUP_DIALOG->hide;
1493 0
1494 }
1495 );
1496
1497 $refresh->();
1498
1499 $vb
1500} 1398}
1501 1399
1502sub help_window { 1400sub help_window {
1503 my $win = new CFPlus::UI::Toplevel 1401 my $win = new CFPlus::UI::Toplevel
1504 x => 'center', 1402 x => 'center',
… …
1689 1587
1690 $vbox->add (my $viewer = new CFPlus::UI::TextScroller 1588 $vbox->add (my $viewer = new CFPlus::UI::TextScroller
1691 expand => 1, fontsize => 0.8, padding_x => 4, padding_y => 4); 1589 expand => 1, fontsize => 0.8, padding_x => 4, padding_y => 4);
1692 $viewer->add_paragraph (CFPlus::Pod::as_paragraphs CFPlus::Pod::section_of $tod[$todindex]); 1590 $viewer->add_paragraph (CFPlus::Pod::as_paragraphs CFPlus::Pod::section_of $tod[$todindex]);
1693 1591
1694 $vbox->add (my $table = new CFPlus::UI::Table); 1592 $vbox->add (my $table = new CFPlus::UI::Table col_expand => [0, 1]);
1695 1593
1696 $table->add (0, 0, new CFPlus::UI::Button 1594 $table->add (0, 0, new CFPlus::UI::Button
1697 text => "Close", 1595 text => "Close",
1698 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>.", 1596 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>.",
1699 on_activate => $close, 1597 on_activate => $close,
1700 ); 1598 );
1701 1599
1702 $table->add (2, 0, new CFPlus::UI::Button 1600 $table->add (2, 0, new CFPlus::UI::Button
1703 text => "Next", 1601 text => "Next",
1704 tooltip => "Show the next <b>Tip of the day</b>.", 1602 tooltip => "Show the next <b>Tip of the day</b>.",
1705 on_activate => sub { 1603 on_activate => sub {
1706 $close->(); 1604 $close->();
1707 &show_tip_of_the_day; 1605 &show_tip_of_the_day;
1708 }, 1606 },
… …
1750 padding => 0, 1648 padding => 0,
1751 z => 100, 1649 z => 100,
1752 force_x => "max", 1650 force_x => "max",
1753 force_y => 0; 1651 force_y => 0;
1754 $DEBUG_STATUS->show; 1652 $DEBUG_STATUS->show;
1755
1756 $BIND_EDITOR = new CFPlus::BindingEditor (x => "max", y => 0);
1757 1653
1758 $STATUSBOX = new CFPlus::UI::Statusbox; 1654 $STATUSBOX = new CFPlus::UI::Statusbox;
1759 $STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", timeout => 864000, pri => -100, color => [1, 1, 1, 0.8]); 1655 $STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", timeout => 864000, pri => -100, color => [1, 1, 1, 0.8]);
1760 1656
1761 (new CFPlus::UI::Frame 1657 (new CFPlus::UI::Frame
… …
1862 ); 1758 );
1863 1759
1864 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Help!", other => $HELP_WINDOW = help_window, 1760 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Help!", other => $HELP_WINDOW = help_window,
1865 tooltip => "View Documentation"); 1761 tooltip => "View Documentation");
1866 1762
1763
1867 $BUTTONBAR->add (new CFPlus::UI::Button 1764 $BUTTONBAR->add (new CFPlus::UI::Button
1868 text => "Quit", 1765 text => "Quit",
1869 tooltip => "Terminates the program", 1766 tooltip => "Terminates the program",
1870 on_activate => sub { 1767 on_activate => sub {
1871 if ($CONN) { 1768 if ($CONN) {
… …
1882 } 1779 }
1883 1780
1884 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]); 1781 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);
1885} 1782}
1886 1783
1784sub setup_build_button {
1785 my ($enabled) = @_;
1786 if ($enabled) {
1787 $BUILD_BUTTON->hide if $BUILD_BUTTON;
1788 $BUILD_BUTTON ||= new CFPlus::UI::Button
1789 text => "Build",
1790 tooltip => "Opens the ingame builder",
1791 on_activate => sub {
1792 if ($CONN) {
1793 $CONN->send_ext_req (builder_player_items => sub {
1794 open_ingame_editor ($_[0]) if exists $_[0]->{items};
1795 });
1796 }
1797 0
1798 };
1799 $BUTTONBAR->add ($BUILD_BUTTON);
1800 } else {
1801 $BUILD_BUTTON->hide if $BUILD_BUTTON;
1802 }
1803}
1804
1805sub open_ingame_editor {
1806 my ($msg) = @_;
1807
1808 my $win = new CFPlus::UI::Toplevel
1809 x => 0,
1810 y => 'center',
1811 z => 4,
1812 name => 'builder_window',
1813 force_w => int $WIDTH * 1/4,
1814 force_h => int $HEIGHT * 3/4,
1815 title => "In game builder",
1816 has_close_button => 1;
1817
1818 my $r = new CFPlus::UI::ScrolledWindow (
1819 expand => 1,
1820 scroll_y => 1
1821 );
1822 $r->add (my $vb = new CFPlus::UI::VBox);
1823 $win->add ($r);
1824
1825
1826 $vb->add (
1827 new CFPlus::UI::Button
1828 text => "Disable build mode",
1829 on_activate => sub { $::IN_BUILD_MODE = undef }
1830 );
1831 $vb->add (
1832 new CFPlus::UI::Button
1833 text => "ERASE",
1834 on_activate => sub { $::IN_BUILD_MODE = { do_erase => 1 } }
1835 );
1836
1837 for my $itemarchname (
1838 sort {
1839 $msg->{items}->{$a}->{build_arch_name}
1840 cmp $msg->{items}->{$b}->{build_arch_name}
1841 } keys %{$msg->{items}}
1842 ) {
1843 my $info = $msg->{items}->{$itemarchname};
1844 $vb->add (
1845 new CFPlus::UI::Button text => $info->{build_arch_name},
1846 on_activate => sub {
1847 $::IN_BUILD_MODE = { item => $itemarchname, info => $info };
1848
1849 if (grep { $msg->{items}->{$itemarchname}->{$_} } qw/has_connection has_name has_text/) {
1850 build_mode_query_arch_info ();
1851 }
1852 }
1853 );
1854 }
1855
1856 $win->show;
1857}
1858
1859sub build_mode_query_arch_info {
1860 my ($iteminfo) = $::IN_BUILD_MODE;
1861 my $itemarchname = $iteminfo->{item};
1862 my $info = $iteminfo->{info};
1863
1864 my $dialog = new CFPlus::UI::Toplevel
1865 x => "center",
1866 y => "center",
1867 z => 50,
1868 force_w => int $WIDTH * 1/2,
1869 title => "Enter information for placement of '$itemarchname'",
1870 has_close_button => 1;
1871
1872 $dialog->add (my $vb = new CFPlus::UI::VBox expand => 1);
1873
1874 $vb->add (my $table = new CFPlus::UI::Table expand => 1);
1875 my $row = 0;
1876 if ($info->{has_name}) {
1877 $table->add (0, $row, new CFPlus::UI::Label text => "Name:");
1878 $table->add (1, $row++, new CFPlus::UI::Entry expand => 1, on_changed => sub { $::IN_BUILD_MODE->{name} = $_[1]; 0 });
1879 }
1880 if ($info->{has_text}) {
1881 $table->add (0, $row, new CFPlus::UI::Label text => "Text:");
1882 $table->add (1, $row++, new CFPlus::UI::Entry expand => 1, on_changed => sub { $::IN_BUILD_MODE->{text} = $_[1]; 0 });
1883 }
1884 if ($info->{has_connection}) {
1885 $table->add (0, $row, new CFPlus::UI::Label text => "Connection ID:");
1886 $table->add (1, $row++,
1887 new CFPlus::UI::Entry
1888 expand => 1,
1889 on_changed => sub { $::IN_BUILD_MODE->{connection} = $_[1]; 0 },
1890 tooltip => "Enter the connection ID here. The connection ID connects actors like a lever to a gate or a magic ear to a gate"
1891 );
1892 }
1893
1894 $vb->add (my $hb = new CFPlus::UI::HBox expand => 1);
1895 $hb->add (new CFPlus::UI::Button
1896 text => "Close",
1897 expand => 1,
1898 on_activate => sub { $dialog->hide; 0 },
1899 );
1900 $dialog->show;
1901}
1902
1887sub video_shutdown { 1903sub video_shutdown {
1888 CFPlus::OpenGL::shutdown; 1904 CFPlus::OpenGL::shutdown;
1889 1905
1890 undef $SDL_ACTIVE; 1906 undef $SDL_ACTIVE;
1891} 1907}
… …
2017 }, 2033 },
2018 CFPlus::SDL_VIDEOEXPOSE => sub { 2034 CFPlus::SDL_VIDEOEXPOSE => sub {
2019 CFPlus::UI::full_refresh; 2035 CFPlus::UI::full_refresh;
2020 }, 2036 },
2021 CFPlus::SDL_ACTIVEEVENT => sub { 2037 CFPlus::SDL_ACTIVEEVENT => sub {
2022# printf "active %x %x\n", $SDL_EV->active_gain, $SDL_EV->active_state;#d# 2038# not useful, as APPACTIVE include sonly iconified state, not unmapped
2039# printf "active %x %x\n", $_[0]{gain}, $_[0]{state};#d#
2040# printf "A\n" if $_[0]{state} & CFPlus::SDL_APPACTIVE;
2041# printf "K\n" if $_[0]{state} & CFPlus::SDL_APPINPUTFOCUS;
2042# printf "M\n" if $_[0]{state} & CFPlus::SDL_APPMOUSEFOCUS;
2023 }, 2043 },
2024 CFPlus::SDL_KEYDOWN => sub { 2044 CFPlus::SDL_KEYDOWN => sub {
2025 if ($_[0]{mod} & CFPlus::KMOD_ALT && $_[0]{sym} == 13) { 2045 if ($_[0]{mod} & CFPlus::KMOD_ALT && $_[0]{sym} == 13) {
2026 # alt-enter 2046 # alt-enter
2027 $FULLSCREEN_ENABLE->toggle; 2047 $FULLSCREEN_ENABLE->toggle;
… …
2084 while (my ($k, $v) = each %DEF_CFG) { 2104 while (my ($k, $v) = each %DEF_CFG) {
2085 $CFG->{$k} = $v unless exists $CFG->{$k}; 2105 $CFG->{$k} = $v unless exists $CFG->{$k};
2086 } 2106 }
2087 2107
2088 $CFG->{profile}{default}{host} ||= "crossfire.schmorp.de"; 2108 $CFG->{profile}{default}{host} ||= "crossfire.schmorp.de";
2109 $PROFILE = $CFG->{profile}{default};
2110
2111 # convert old bindings (only default profile matters)
2112 if (my $bindings = delete $PROFILE->{bindings}) {
2113 while (my ($mod, $syms) = each %$bindings) {
2114 while (my ($sym, $cmds) = each %$syms) {
2115 push @{ $PROFILE->{macro} }, {
2116 accelkey => [$mod*1, $sym*1],
2117 action => $cmds,
2118 };
2119 }
2120 }
2121 }
2089 2122
2090 sdl_init; 2123 sdl_init;
2091 2124
2092 @SDL_MODES = reverse 2125 @SDL_MODES = reverse
2093 grep $_->[0] >= 640 && $_->[1] >= 480, 2126 grep $_->[0] >= 640 && $_->[1] >= 480,

Diff Legend

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