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.131 by root, Sun Nov 19 20:31:29 2006 UTC vs.
Revision 1.142 by root, Mon Mar 12 22:23:09 2007 UTC

… …
21 } 21 }
22} 22}
23 23
24use strict; 24use strict;
25use utf8; 25use utf8;
26
27use Carp 'verbose';
26 28
27# do things only needed for single-binary version (par) 29# do things only needed for single-binary version (par)
28BEGIN { 30BEGIN {
29 if (%PAR::LibCache) { 31 if (%PAR::LibCache) {
30 @INC = grep ref, @INC; # weed out all paths except pars loader refs 32 @INC = grep ref, @INC; # weed out all paths except pars loader refs
… …
57 59
58use CFPlus; 60use CFPlus;
59use CFPlus::OpenGL (); 61use CFPlus::OpenGL ();
60use CFPlus::Protocol; 62use CFPlus::Protocol;
61use CFPlus::UI; 63use CFPlus::UI;
64use CFPlus::UI::Inventory;
65use CFPlus::UI::SpellList;
62use CFPlus::Pod; 66use CFPlus::Pod;
63use CFPlus::BindingEditor;
64use CFPlus::MapWidget; 67use CFPlus::MapWidget;
68use CFPlus::Macro;
65 69
66$SIG{QUIT} = sub { Carp::cluck "QUIT" }; 70$SIG{QUIT} = sub { Carp::cluck "QUIT" };
67$SIG{PIPE} = 'IGNORE'; 71$SIG{PIPE} = 'IGNORE';
68 72
69$Event::Eval = 0; 73$Event::Eval = 1;
70$Event::DIED = sub { 74$Event::DIED = sub {
71 # TODO: display dialog box or so 75 CFPlus::fatal Carp::longmess $_[1]
72 Carp::cluck $_[1];#d#TODO: remove when stable
73 return;#d#
74 CFPlus::fatal ($_[1]);
75}; 76};
76 77
77my $MAX_FPS = 60; 78my $MAX_FPS = 60;
78my $MIN_FPS = 5; # unused as of yet 79my $MIN_FPS = 5; # unused as of yet
79 80
… …
146 147
147our $INV; 148our $INV;
148our $INVR; 149our $INVR;
149our $INV_RIGHT_HB; 150our $INV_RIGHT_HB;
150 151
151our $BIND_EDITOR;
152our $BIND_UPD_CB;
153
154our $PICKUP_CFG; 152our $PICKUP_CFG;
153
154our $IN_BUILD_MODE;
155our $BUILD_BUTTON;
155 156
156sub status { 157sub status {
157 $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]);
158} 159}
159 160
… …
175sub destroy_query_dialog { 176sub destroy_query_dialog {
176 (delete $_[0]{query_dialog})->destroy 177 (delete $_[0]{query_dialog})->destroy
177 if $_[0]{query_dialog}; 178 if $_[0]{query_dialog};
178} 179}
179 180
181# FIXME: a very ugly hack to wait for stat update look below! #d#
182our $QUERY_TIMER; #d#
183
180# server query dialog 184# server query dialog
181sub server_query { 185sub server_query {
182 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 }
183 202
184 $conn->{query_dialog} = my $dialog = new CFPlus::UI::Toplevel 203 $conn->{query_dialog} = my $dialog = new CFPlus::UI::Toplevel
185 x => "center", 204 x => "center",
186 y => "center", 205 y => "center",
187 title => "Server Query", 206 title => "Server Query",
… …
376 status "logging in..."; 395 status "logging in...";
377 396
378 $LOGIN_BUTTON->set_text ("Logout"); 397 $LOGIN_BUTTON->set_text ("Logout");
379 $SETUP_DIALOG->hide; 398 $SETUP_DIALOG->hide;
380 399
381 $PROFILE = $CFG->{profile}{default};
382
383 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;
384 401
385 my ($host, $port) = split /:/, $PROFILE->{host}; 402 my ($host, $port) = split /:/, $PROFILE->{host};
386 403
387 $MAP = new CFPlus::Map; 404 $MAP = new CFPlus::Map;
… …
430sub stop_game { 447sub stop_game {
431 $LOGIN_BUTTON->set_text ("Login"); 448 $LOGIN_BUTTON->set_text ("Login");
432 $SETUP_NOTEBOOK->set_current_page ($SETUP_SERVER); 449 $SETUP_NOTEBOOK->set_current_page ($SETUP_SERVER);
433 $SETUP_DIALOG->show; 450 $SETUP_DIALOG->show;
434 $PL_WINDOW->hide; 451 $PL_WINDOW->hide;
435 $SPELL_PAGE->clear_spells; 452 $SPELL_LIST->clear_spells;
436 453
437 return unless $CONN; 454 return unless $CONN;
438 455
439 status "connection closed"; 456 status "connection closed";
440 457
… …
667 $table->add (1, 1, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 2; 0 }); 684 $table->add (1, 1, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 2; 0 });
668 $table->add (0, 2, new CFPlus::UI::Label text => "Show FPS"); 685 $table->add (0, 2, new CFPlus::UI::Label text => "Show FPS");
669 $table->add (1, 2, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 4; 0 }); 686 $table->add (1, 2, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 4; 0 });
670 $table->add (0, 3, new CFPlus::UI::Label text => "Suppress Tooltips"); 687 $table->add (0, 3, new CFPlus::UI::Label text => "Suppress Tooltips");
671 $table->add (1, 3, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 8; 0 }); 688 $table->add (1, 3, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 8; 0 });
689 $table->add (0, 4, new CFPlus::UI::Button text => "die on click(tm)", on_activate => sub { die "violator" } );
672 690
673 my @default_smooth = (0.05, 0.13, 0.05, 0.13, 0.30, 0.13, 0.05, 0.13, 0.05); 691 my @default_smooth = (0.05, 0.13, 0.05, 0.13, 0.30, 0.13, 0.05, 0.13, 0.05);
674 692
675 for my $x (0..2) { 693 for my $x (0..2) {
676 for my $y (0 .. 2) { 694 for my $y (0 .. 2) {
… …
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 }
… …
1190 ["Boots" => PICKUP_BOOTS], 1203 ["Boots" => PICKUP_BOOTS],
1191 ["Gloves" => PICKUP_GLOVES], 1204 ["Gloves" => PICKUP_GLOVES],
1192 ["Cloaks" => PICKUP_CLOAK], 1205 ["Cloaks" => PICKUP_CLOAK],
1193 ], 1206 ],
1194 1207
1195 ["Readables", 2, 2, 1208 ["Readables", 2, 0,
1196 ["Spellbooks" => PICKUP_SPELLBOOK], 1209 ["Spellbooks" => PICKUP_SPELLBOOK],
1197 ["Skillscrolls" => PICKUP_SKILLSCROLL], 1210 ["Skillscrolls" => PICKUP_SKILLSCROLL],
1198 ["Normal Books/Scrolls" => PICKUP_READABLES], 1211 ["Normal Books/Scrolls" => PICKUP_READABLES],
1199 ], 1212 ],
1200 ["Misc", 2, 7, 1213 ["Misc", 2, 5,
1201 ["Food" => PICKUP_FOOD], 1214 ["Food" => PICKUP_FOOD],
1202 ["Drinks" => PICKUP_DRINK], 1215 ["Drinks" => PICKUP_DRINK],
1203 ["Valuables (Money, Gems)" => PICKUP_VALUABLES], 1216 ["Valuables (Money, Gems)" => PICKUP_VALUABLES],
1204 ["Keys" => PICKUP_KEY], 1217 ["Keys" => PICKUP_KEY],
1205 ["Magical Items" => PICKUP_MAGICAL], 1218 ["Magical Items" => PICKUP_MAGICAL],
1206 ["Potions" => PICKUP_POTION], 1219 ["Potions" => PICKUP_POTION],
1207 ["Magic Devices" => PICKUP_MAGIC_DEVICE], 1220 ["Magic Devices" => PICKUP_MAGIC_DEVICE],
1208 ["Ignore cursed" => PICKUP_NOT_CURSED], 1221 ["Ignore cursed" => PICKUP_NOT_CURSED],
1209 ["Jewelery" => PICKUP_JEWELS], 1222 ["Jewelery" => PICKUP_JEWELS],
1223 ["Flesh" => PICKUP_FLESH],
1210 ], 1224 ],
1211 ["Weight/Value ratio", 2, 17] 1225 ["Weight/Value ratio", 2, 17]
1212 ) 1226 )
1213 { 1227 {
1214 my ($title, $x, $y, @bits) = @$_; 1228 my ($title, $x, $y, @bits) = @$_;
… …
1377 1391
1378 $plwin->add ($ntb); 1392 $plwin->add ($ntb);
1379 $plwin 1393 $plwin
1380} 1394}
1381 1395
1382sub update_bindings {
1383 $BIND_UPD_CB->() if $BIND_UPD_CB;
1384}
1385
1386sub keyboard_setup { 1396sub keyboard_setup {
1387 my $binding_list = new CFPlus::UI::VBox; 1397 CFPlus::Macro::keyboard_setup
1388
1389 my $refresh;
1390 $refresh = $BIND_UPD_CB = sub {
1391 $binding_list->clear ();
1392
1393 return unless $PROFILE;
1394
1395 for my $mod (keys %{$PROFILE->{bindings}}) {
1396 for my $sym (keys %{$PROFILE->{bindings}{$mod}}) {
1397 my $cmds = $PROFILE->{bindings}{$mod}{$sym};
1398 next unless ref $cmds eq 'ARRAY' and @$cmds > 0;
1399
1400 my $lbl = join "; ", @$cmds;
1401 my $nam = CFPlus::BindingEditor::keycombo_to_name ($mod, $sym);
1402 $binding_list->add (my $hb = new CFPlus::UI::HBox);
1403 $hb->add (new CFPlus::UI::Button
1404 text => "delete",
1405 tooltip => "Deletes the binding",
1406 on_activate => sub {
1407 $binding_list->remove ($hb);
1408 delete $PROFILE->{bindings}{$mod}{$sym};
1409 0
1410 });
1411
1412 $hb->add (new CFPlus::UI::Button
1413 text => "edit",
1414 tooltip => "Edits the binding",
1415 on_activate => sub {
1416 $::BIND_EDITOR->set_binding (
1417 $mod, $sym, $PROFILE->{bindings}{$mod}{$sym},
1418 sub {
1419 my ($nmod, $nsym, $ncmds) = @_;
1420 $::BIND_EDITOR->cfg_unbind ($mod, $sym);
1421 $::BIND_EDITOR->cfg_bind ($nmod, $nsym, $ncmds);
1422 $refresh->();
1423 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1424 $SETUP_DIALOG->show;
1425 },
1426 sub {
1427 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1428 $SETUP_DIALOG->show;
1429 });
1430 $::BIND_EDITOR->show;
1431 $SETUP_DIALOG->hide;
1432 0
1433 });
1434
1435 $hb->add (new CFPlus::UI::Label text => "(Key: $nam)");
1436 $hb->add (new CFPlus::UI::Label text => $lbl, expand => 1);
1437 }
1438 }
1439 };
1440
1441 my $vb = new CFPlus::UI::VBox;
1442 $vb->add (new CFPlus::UI::FancyFrame
1443 label => "Options",
1444 child => (my $hb = new CFPlus::UI::HBox),
1445 );
1446 $hb->add (new CFPlus::UI::Label text => "only shift-up stops fire");
1447 $hb->add (new CFPlus::UI::CheckBox
1448 expand => 1,
1449 state => $CFG->{shift_fire_stop},
1450 tooltip => "If this checkbox is enabled you will stop fire only if you stop pressing shift",
1451 on_changed => sub {
1452 my ($cbox, $value) = @_;
1453 $CFG->{shift_fire_stop} = $value;
1454 0
1455 });
1456
1457 $vb->add (new CFPlus::UI::FancyFrame
1458 label => "Bindings",
1459 child => $binding_list);
1460 $vb->add (my $hb = new CFPlus::UI::HBox);
1461
1462 $hb->add (new CFPlus::UI::Button
1463 text => "record new",
1464 expand => 1,
1465 tooltip => "This button opens the binding editor with an empty binding.",
1466 on_activate => sub {
1467 $::BIND_EDITOR->set_binding (undef, undef, [],
1468 sub {
1469 my ($mod, $sym, $cmds) = @_;
1470 $::BIND_EDITOR->cfg_bind ($mod, $sym, $cmds);
1471 $refresh->();
1472 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1473 $SETUP_DIALOG->show;
1474 },
1475 sub {
1476 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1477 $SETUP_DIALOG->show;
1478 },
1479 );
1480 $SETUP_DIALOG->hide;
1481 $::BIND_EDITOR->show;
1482 0
1483 },
1484 );
1485
1486 $hb->add (new CFPlus::UI::Button
1487 text => "close",
1488 tooltip => "Closes the binding window",
1489 expand => 1,
1490 on_activate => sub {
1491 $SETUP_DIALOG->hide;
1492 0
1493 }
1494 );
1495
1496 $refresh->();
1497
1498 $vb
1499} 1398}
1500 1399
1501sub help_window { 1400sub help_window {
1502 my $win = new CFPlus::UI::Toplevel 1401 my $win = new CFPlus::UI::Toplevel
1503 x => 'center', 1402 x => 'center',
… …
1688 1587
1689 $vbox->add (my $viewer = new CFPlus::UI::TextScroller 1588 $vbox->add (my $viewer = new CFPlus::UI::TextScroller
1690 expand => 1, fontsize => 0.8, padding_x => 4, padding_y => 4); 1589 expand => 1, fontsize => 0.8, padding_x => 4, padding_y => 4);
1691 $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]);
1692 1591
1693 $vbox->add (my $table = new CFPlus::UI::Table); 1592 $vbox->add (my $table = new CFPlus::UI::Table col_expand => [0, 1]);
1694 1593
1695 $table->add (0, 0, new CFPlus::UI::Button 1594 $table->add (0, 0, new CFPlus::UI::Button
1696 text => "Close", 1595 text => "Close",
1697 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>.",
1698 on_activate => $close, 1597 on_activate => $close,
1699 ); 1598 );
1700 1599
1701 $table->add (2, 0, new CFPlus::UI::Button 1600 $table->add (2, 0, new CFPlus::UI::Button
1702 text => "Next", 1601 text => "Next",
1703 tooltip => "Show the next <b>Tip of the day</b>.", 1602 tooltip => "Show the next <b>Tip of the day</b>.",
1704 on_activate => sub { 1603 on_activate => sub {
1705 $close->(); 1604 $close->();
1706 &show_tip_of_the_day; 1605 &show_tip_of_the_day;
1707 }, 1606 },
… …
1749 padding => 0, 1648 padding => 0,
1750 z => 100, 1649 z => 100,
1751 force_x => "max", 1650 force_x => "max",
1752 force_y => 0; 1651 force_y => 0;
1753 $DEBUG_STATUS->show; 1652 $DEBUG_STATUS->show;
1754
1755 $BIND_EDITOR = new CFPlus::BindingEditor (x => "max", y => 0);
1756 1653
1757 $STATUSBOX = new CFPlus::UI::Statusbox; 1654 $STATUSBOX = new CFPlus::UI::Statusbox;
1758 $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]);
1759 1656
1760 (new CFPlus::UI::Frame 1657 (new CFPlus::UI::Frame
… …
1861 ); 1758 );
1862 1759
1863 $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,
1864 tooltip => "View Documentation"); 1761 tooltip => "View Documentation");
1865 1762
1763
1866 $BUTTONBAR->add (new CFPlus::UI::Button 1764 $BUTTONBAR->add (new CFPlus::UI::Button
1867 text => "Quit", 1765 text => "Quit",
1868 tooltip => "Terminates the program", 1766 tooltip => "Terminates the program",
1869 on_activate => sub { 1767 on_activate => sub {
1870 if ($CONN) { 1768 if ($CONN) {
… …
1881 } 1779 }
1882 1780
1883 $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]);
1884} 1782}
1885 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
1886sub video_shutdown { 1903sub video_shutdown {
1887 CFPlus::OpenGL::shutdown; 1904 CFPlus::OpenGL::shutdown;
1888 1905
1889 undef $SDL_ACTIVE; 1906 undef $SDL_ACTIVE;
1890} 1907}
… …
2016 }, 2033 },
2017 CFPlus::SDL_VIDEOEXPOSE => sub { 2034 CFPlus::SDL_VIDEOEXPOSE => sub {
2018 CFPlus::UI::full_refresh; 2035 CFPlus::UI::full_refresh;
2019 }, 2036 },
2020 CFPlus::SDL_ACTIVEEVENT => sub { 2037 CFPlus::SDL_ACTIVEEVENT => sub {
2021# 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;
2022 }, 2043 },
2023 CFPlus::SDL_KEYDOWN => sub { 2044 CFPlus::SDL_KEYDOWN => sub {
2024 if ($_[0]{mod} & CFPlus::KMOD_ALT && $_[0]{sym} == 13) { 2045 if ($_[0]{mod} & CFPlus::KMOD_ALT && $_[0]{sym} == 13) {
2025 # alt-enter 2046 # alt-enter
2026 $FULLSCREEN_ENABLE->toggle; 2047 $FULLSCREEN_ENABLE->toggle;
… …
2083 while (my ($k, $v) = each %DEF_CFG) { 2104 while (my ($k, $v) = each %DEF_CFG) {
2084 $CFG->{$k} = $v unless exists $CFG->{$k}; 2105 $CFG->{$k} = $v unless exists $CFG->{$k};
2085 } 2106 }
2086 2107
2087 $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 }
2088 2122
2089 sdl_init; 2123 sdl_init;
2090 2124
2091 @SDL_MODES = reverse 2125 @SDL_MODES = reverse
2092 grep $_->[0] >= 640 && $_->[1] >= 480, 2126 grep $_->[0] >= 640 && $_->[1] >= 480,

Diff Legend

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