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.147 by root, Fri Apr 6 07:45:35 2007 UTC

… …
58use Compress::LZF; 58use Compress::LZF;
59 59
60use CFPlus; 60use CFPlus;
61use CFPlus::OpenGL (); 61use CFPlus::OpenGL ();
62use CFPlus::Protocol; 62use CFPlus::Protocol;
63use CFPlus::DB;
63use CFPlus::UI; 64use CFPlus::UI;
65use CFPlus::UI::Inventory;
66use CFPlus::UI::SpellList;
64use CFPlus::Pod; 67use CFPlus::Pod;
65use CFPlus::BindingEditor;
66use CFPlus::MapWidget; 68use CFPlus::MapWidget;
69use CFPlus::Macro;
67 70
68$SIG{QUIT} = sub { Carp::cluck "QUIT" }; 71$SIG{QUIT} = sub { Carp::cluck "QUIT" };
69$SIG{PIPE} = 'IGNORE'; 72$SIG{PIPE} = 'IGNORE';
70 73
71$Event::Eval = 0; 74$Event::Eval = 1;
72$Event::DIED = sub { 75$Event::DIED = sub {
73 CFPlus::fatal Carp::longmess $_[1] 76 CFPlus::fatal Carp::longmess $_[1]
74}; 77};
75 78
76my $MAX_FPS = 60; 79my $MAX_FPS = 60;
… …
145 148
146our $INV; 149our $INV;
147our $INVR; 150our $INVR;
148our $INV_RIGHT_HB; 151our $INV_RIGHT_HB;
149 152
150our $BIND_EDITOR;
151our $BIND_UPD_CB;
152
153our $PICKUP_CFG; 153our $PICKUP_CFG;
154 154
155our $IN_BUILD_MODE; 155our $IN_BUILD_MODE;
156our $BUILD_BUTTON; 156our $BUILD_BUTTON;
157 157
… …
177sub destroy_query_dialog { 177sub destroy_query_dialog {
178 (delete $_[0]{query_dialog})->destroy 178 (delete $_[0]{query_dialog})->destroy
179 if $_[0]{query_dialog}; 179 if $_[0]{query_dialog};
180} 180}
181 181
182# FIXME: a very ugly hack to wait for stat update look below! #d#
183our $QUERY_TIMER; #d#
184
182# server query dialog 185# server query dialog
183sub server_query { 186sub server_query {
184 my ($conn, $flags, $prompt) = @_; 187 my ($conn, $flags, $prompt) = @_;
188
189 # FIXME: a very ugly hack to wait for stat update #d#
190 if ($prompt =~ /roll new stats/ and not $conn->{stat_change_with}) {
191 unless ($QUERY_TIMER) {
192 $QUERY_TIMER =
193 Event->timer (
194 after => 1,
195 cb => sub {
196 server_query ($conn, $flags, $prompt, 1);
197 $QUERY_TIMER = undef
198 }
199 );
200 return;
201 }
202 }
185 203
186 $conn->{query_dialog} = my $dialog = new CFPlus::UI::Toplevel 204 $conn->{query_dialog} = my $dialog = new CFPlus::UI::Toplevel
187 x => "center", 205 x => "center",
188 y => "center", 206 y => "center",
189 title => "Server Query", 207 title => "Server Query",
… …
378 status "logging in..."; 396 status "logging in...";
379 397
380 $LOGIN_BUTTON->set_text ("Logout"); 398 $LOGIN_BUTTON->set_text ("Logout");
381 $SETUP_DIALOG->hide; 399 $SETUP_DIALOG->hide;
382 400
383 $PROFILE = $CFG->{profile}{default};
384
385 my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32; 401 my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32;
386 402
387 my ($host, $port) = split /:/, $PROFILE->{host}; 403 my ($host, $port) = split /:/, $PROFILE->{host};
388 404
389 $MAP = new CFPlus::Map; 405 $MAP = new CFPlus::Map;
… …
450sub graphics_setup { 466sub graphics_setup {
451 my $vbox = new CFPlus::UI::VBox; 467 my $vbox = new CFPlus::UI::VBox;
452 468
453 $vbox->add (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]); 469 $vbox->add (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]);
454 470
471 my $row = 0;
472
473 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "OpenGL Info");
474 $table->add (1, $row++, new CFPlus::UI::Label valign => 0, fontsize => 0.8, text => CFPlus::OpenGL::gl_vendor . ", " . CFPlus::OpenGL::gl_version,
475 can_events => 1,
476 tooltip => "<tt><span size='8192'>" . (CFPlus::OpenGL::gl_extensions) . "</span></tt>");
477
455 $table->add (0, 0, new CFPlus::UI::Label valign => 0, align => 1, text => "Video Mode"); 478 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Video Mode");
456 $table->add (1, 0, my $hbox = new CFPlus::UI::HBox); 479 $table->add (1, $row++, my $hbox = new CFPlus::UI::HBox);
457 480
458 $hbox->add (my $mode_slider = new CFPlus::UI::Slider force_w => $WIDTH * 0.1, expand => 1, range => [$CFG->{sdl_mode}, 0, $#SDL_MODES, 0, 1]); 481 $hbox->add (my $mode_slider = new CFPlus::UI::Slider force_w => $WIDTH * 0.1, expand => 1, range => [$CFG->{sdl_mode}, 0, $#SDL_MODES, 0, 1]);
459 $hbox->add (my $mode_label = new CFPlus::UI::Label align => 0, valign => 0, height => 0.8, template => "9999x9999"); 482 $hbox->add (my $mode_label = new CFPlus::UI::Label align => 0, valign => 0, height => 0.8, template => "9999x9999");
460 483
461 $mode_slider->connect (changed => sub { 484 $mode_slider->connect (changed => sub {
… …
463 486
464 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value; 487 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value;
465 $mode_label->set_text (sprintf "%dx%d", @{$SDL_MODES[$value]}); 488 $mode_label->set_text (sprintf "%dx%d", @{$SDL_MODES[$value]});
466 }); 489 });
467 $mode_slider->emit (changed => $mode_slider->{range}[0]); 490 $mode_slider->emit (changed => $mode_slider->{range}[0]);
468
469 my $row = 1;
470 491
471 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fullscreen"); 492 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fullscreen");
472 $table->add (1, $row++, $FULLSCREEN_ENABLE = new CFPlus::UI::CheckBox 493 $table->add (1, $row++, $FULLSCREEN_ENABLE = new CFPlus::UI::CheckBox
473 state => $CFG->{fullscreen}, 494 state => $CFG->{fullscreen},
474 tooltip => "Bring the client into fullscreen mode.", 495 tooltip => "Bring the client into fullscreen mode.",
… …
890 for 0 .. $#col; 911 for 0 .. $#col;
891 912
892 my @align = qw(1 0 1 1 -1); 913 my @align = qw(1 0 1 1 -1);
893 914
894 my $y = 0; 915 my $y = 0;
895 for my $m (
896 sort {
897 $b->{version} <=> $a->{version}
898 or $b->{users} <=> $a->{users}
899 }
900 @{ $msg->{servers} } 916 for my $m (@{ $msg->{servers} }) {
901 ) {
902 my ($ip, $last, $host, $users, $version, $desc, $ibytes, $obytes, $uptime) = 917 my ($ip, $last, $host, $users, $version, $desc, $ibytes, $obytes, $uptime, $highlight) =
903 @$m{qw(ip age hostname users version description ibytes obytes uptime)}; 918 @$m{qw(ip age hostname users version description ibytes obytes uptime highlight)};
904 919
905 for ($desc) { 920 for ($desc) {
906 s/<br>/\n/gi; 921 s/<br>/\n/gi;
907 s/<li>/\n· /gi; 922 s/<li>/\n· /gi;
908 s/<.*?>//sgi; 923 s/<.*?>//sgi;
… …
938 max_w => $::WIDTH * 0.4, 953 max_w => $::WIDTH * 0.4,
939 ellipsise => 0, 954 ellipsise => 0,
940 align => $align[$_], 955 align => $align[$_],
941 text => $m->[$_], 956 text => $m->[$_],
942 tooltip => $tip[$_], 957 tooltip => $tip[$_],
943 fg => ($m->[3] =~ /\+$/ ? [1, 1, 1] : [.7, .7, .7]), 958 fg => ($highlight ? [1, 1, 1] : [.7, .7, .7]),
944 can_hover => 1, 959 can_hover => 1,
945 can_events => 1, 960 can_events => 1,
946 fontsize => 0.8) 961 fontsize => 0.8)
947 for 0 .. $#$m; 962 for 0 .. $#$m;
948 } 963 }
… …
1049 . "so only set it if you really need to prefetch images. " 1064 . "so only set it if you really need to prefetch images. "
1050 . "This option can be set and unset any time.", 1065 . "This option can be set and unset any time.",
1051 on_changed => sub { $CFG->{face_prefetch} = $_[1]; 0 }, 1066 on_changed => sub { $CFG->{face_prefetch} = $_[1]; 0 },
1052 ); 1067 );
1053 1068
1054 $table->add (0, 9, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Count"); 1069 $table->add (0, 9, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Rate");
1055 $table->add (1, 9, new CFPlus::UI::Entry 1070 $table->add (1, 9, new CFPlus::UI::Entry
1071 text => $CFG->{output_rate},
1072 tooltip => "The approximate bandwidth in bytes per second that the server should not exceed "
1073 . "when sending images, to ensure interactiveness. When 0 or unset, the server "
1074 . "default will be used, which is usually around 100kb/s.",
1075 on_changed => sub { $CFG->{output_rate} = $_[1]; 0 },
1076 );
1077
1078 $table->add (0, 10, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Count");
1079 $table->add (1, 10, new CFPlus::UI::Entry
1056 text => $CFG->{output_count}, 1080 text => $CFG->{output_count},
1057 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.", 1081 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.",
1058 on_changed => sub { $CFG->{output_count} = $_[1]; 0 }, 1082 on_changed => sub { $CFG->{output_count} = $_[1]; 0 },
1059 ); 1083 );
1060 1084
1061 $table->add (0, 10, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Sync"); 1085 $table->add (0, 11, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Sync");
1062 $table->add (1, 10, new CFPlus::UI::Entry 1086 $table->add (1, 11, new CFPlus::UI::Entry
1063 text => $CFG->{output_sync}, 1087 text => $CFG->{output_sync},
1064 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.", 1088 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.",
1065 on_changed => sub { $CFG->{output_sync} = $_[1]; 0 }, 1089 on_changed => sub { $CFG->{output_sync} = $_[1]; 0 },
1066 ); 1090 );
1067 1091
1068 $table->add (1, 11, $LOGIN_BUTTON = new CFPlus::UI::Button 1092 $table->add (1, 12, $LOGIN_BUTTON = new CFPlus::UI::Button
1069 expand => 1, 1093 expand => 1,
1070 align => 0, 1094 align => 0,
1071 text => "Login", 1095 text => "Login",
1072 on_activate => sub { 1096 on_activate => sub {
1073 $CONN ? stop_game 1097 $CONN ? stop_game
1074 : start_game; 1098 : start_game;
1075 0 1099 0
1076 }, 1100 },
1077 ); 1101 );
1078 1102
1079 $table->add (0, 12, new CFPlus::UI::Label valign => 0, align => 1, text => "Chat Command"); 1103 $table->add (0, 13, new CFPlus::UI::Label valign => 0, align => 1, text => "Chat Command");
1080 $table->add (1, 12, my $saycmd = new CFPlus::UI::Entry 1104 $table->add (1, 13, my $saycmd = new CFPlus::UI::Entry
1081 text => $CFG->{say_command}, 1105 text => $CFG->{say_command},
1082 tooltip => "This is the command that will be used if you write a line in the message window entry or press <b>\"</b> in the map window. " 1106 tooltip => "This is the command that will be used if you write a line in the message window entry or press <b>\"</b> in the map window. "
1083 . "Usually you want to enter something like 'say' or 'shout' or 'gsay' here. " 1107 . "Usually you want to enter something like 'say' or 'shout' or 'gsay' here. "
1084 . "But you could also set it to <b>tell <i>playername</i></b> to only chat with that user.", 1108 . "But you could also set it to <b>tell <i>playername</i></b> to only chat with that user.",
1085 on_changed => sub { 1109 on_changed => sub {
… …
1087 $CFG->{say_command} = $value; 1111 $CFG->{say_command} = $value;
1088 0 1112 0
1089 } 1113 }
1090 ); 1114 );
1091 1115
1092 $table->add (0, 13, new CFPlus::UI::Label valign => 0, align => 1, text => "Tip of the day"); 1116 $table->add (0, 14, new CFPlus::UI::Label valign => 0, align => 1, text => "Tip of the day");
1093 $table->add (1, 13, my $saycmd = new CFPlus::UI::CheckBox 1117 $table->add (1, 14, my $saycmd = new CFPlus::UI::CheckBox
1094 state => $CFG->{show_tips}, 1118 state => $CFG->{show_tips},
1095 tooltip => "Show the <b>Tip of the day</b> window at startup?", 1119 tooltip => "Show the <b>Tip of the day</b> window at startup?",
1096 on_changed => sub { 1120 on_changed => sub {
1097 my ($self, $value) = @_; 1121 my ($self, $value) = @_;
1098 $CFG->{show_tips} = $value; 1122 $CFG->{show_tips} = $value;
… …
1382 1406
1383 $plwin->add ($ntb); 1407 $plwin->add ($ntb);
1384 $plwin 1408 $plwin
1385} 1409}
1386 1410
1387sub update_bindings {
1388 $BIND_UPD_CB->() if $BIND_UPD_CB;
1389}
1390
1391sub keyboard_setup { 1411sub keyboard_setup {
1392 my $binding_list = new CFPlus::UI::VBox; 1412 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} 1413}
1505 1414
1506sub help_window { 1415sub help_window {
1507 my $win = new CFPlus::UI::Toplevel 1416 my $win = new CFPlus::UI::Toplevel
1508 x => 'center', 1417 x => 'center',
… …
1693 1602
1694 $vbox->add (my $viewer = new CFPlus::UI::TextScroller 1603 $vbox->add (my $viewer = new CFPlus::UI::TextScroller
1695 expand => 1, fontsize => 0.8, padding_x => 4, padding_y => 4); 1604 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]); 1605 $viewer->add_paragraph (CFPlus::Pod::as_paragraphs CFPlus::Pod::section_of $tod[$todindex]);
1697 1606
1698 $vbox->add (my $table = new CFPlus::UI::Table); 1607 $vbox->add (my $table = new CFPlus::UI::Table col_expand => [0, 1]);
1699 1608
1700 $table->add (0, 0, new CFPlus::UI::Button 1609 $table->add (0, 0, new CFPlus::UI::Button
1701 text => "Close", 1610 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>.", 1611 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, 1612 on_activate => $close,
1704 ); 1613 );
1705 1614
1706 $table->add (2, 0, new CFPlus::UI::Button 1615 $table->add (2, 0, new CFPlus::UI::Button
1707 text => "Next", 1616 text => "Next",
1708 tooltip => "Show the next <b>Tip of the day</b>.", 1617 tooltip => "Show the next <b>Tip of the day</b>.",
1709 on_activate => sub { 1618 on_activate => sub {
1710 $close->(); 1619 $close->();
1711 &show_tip_of_the_day; 1620 &show_tip_of_the_day;
1712 }, 1621 },
… …
1754 padding => 0, 1663 padding => 0,
1755 z => 100, 1664 z => 100,
1756 force_x => "max", 1665 force_x => "max",
1757 force_y => 0; 1666 force_y => 0;
1758 $DEBUG_STATUS->show; 1667 $DEBUG_STATUS->show;
1759
1760 $BIND_EDITOR = new CFPlus::BindingEditor (x => "max", y => 0);
1761 1668
1762 $STATUSBOX = new CFPlus::UI::Statusbox; 1669 $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]); 1670 $STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", timeout => 864000, pri => -100, color => [1, 1, 1, 0.8]);
1764 1671
1765 (new CFPlus::UI::Frame 1672 (new CFPlus::UI::Frame
… …
1890} 1797}
1891 1798
1892sub setup_build_button { 1799sub setup_build_button {
1893 my ($enabled) = @_; 1800 my ($enabled) = @_;
1894 if ($enabled) { 1801 if ($enabled) {
1802 $BUILD_BUTTON->hide if $BUILD_BUTTON;
1895 $BUILD_BUTTON ||= new CFPlus::UI::Button 1803 $BUILD_BUTTON ||= new CFPlus::UI::Button
1896 text => "Build", 1804 text => "Build",
1897 tooltip => "Opens the ingame builder", 1805 tooltip => "Opens the ingame builder",
1898 on_activate => sub { 1806 on_activate => sub {
1899 if ($CONN) { 1807 if ($CONN) {
… …
2140 }, 2048 },
2141 CFPlus::SDL_VIDEOEXPOSE => sub { 2049 CFPlus::SDL_VIDEOEXPOSE => sub {
2142 CFPlus::UI::full_refresh; 2050 CFPlus::UI::full_refresh;
2143 }, 2051 },
2144 CFPlus::SDL_ACTIVEEVENT => sub { 2052 CFPlus::SDL_ACTIVEEVENT => sub {
2145# printf "active %x %x\n", $SDL_EV->active_gain, $SDL_EV->active_state;#d# 2053# not useful, as APPACTIVE include sonly iconified state, not unmapped
2054# printf "active %x %x\n", $_[0]{gain}, $_[0]{state};#d#
2055# printf "A\n" if $_[0]{state} & CFPlus::SDL_APPACTIVE;
2056# printf "K\n" if $_[0]{state} & CFPlus::SDL_APPINPUTFOCUS;
2057# printf "M\n" if $_[0]{state} & CFPlus::SDL_APPMOUSEFOCUS;
2146 }, 2058 },
2147 CFPlus::SDL_KEYDOWN => sub { 2059 CFPlus::SDL_KEYDOWN => sub {
2148 if ($_[0]{mod} & CFPlus::KMOD_ALT && $_[0]{sym} == 13) { 2060 if ($_[0]{mod} & CFPlus::KMOD_ALT && $_[0]{sym} == 13) {
2149 # alt-enter 2061 # alt-enter
2150 $FULLSCREEN_ENABLE->toggle; 2062 $FULLSCREEN_ENABLE->toggle;
… …
2171 2083
2172$SIG{INT} = $SIG{TERM} = sub { exit }; 2084$SIG{INT} = $SIG{TERM} = sub { exit };
2173 2085
2174{ 2086{
2175 CFPlus::read_cfg "$Crossfire::VARDIR/cfplusrc"; 2087 CFPlus::read_cfg "$Crossfire::VARDIR/cfplusrc";
2088 CFPlus::DB::Server::run;
2089
2176 CFPlus::UI::set_layout ($::CFG->{layout}); 2090 CFPlus::UI::set_layout ($::CFG->{layout});
2177 2091
2178 my %DEF_CFG = ( 2092 my %DEF_CFG = (
2179 sdl_mode => 0, 2093 sdl_mode => 0,
2180 width => 640, 2094 width => 640,
… …
2196 bgm_enable => 1, 2110 bgm_enable => 1,
2197 bgm_volume => 0.25, 2111 bgm_volume => 0.25,
2198 face_prefetch => 0, 2112 face_prefetch => 0,
2199 output_sync => 1, 2113 output_sync => 1,
2200 output_count => 1, 2114 output_count => 1,
2115 output_rate => "",
2201 pickup => 0, 2116 pickup => 0,
2202 inv_sort => "mtime", 2117 inv_sort => "mtime",
2203 default => "profile", # default profile 2118 default => "profile", # default profile
2204 show_tips => 1, 2119 show_tips => 1,
2205 ); 2120 );
… …
2207 while (my ($k, $v) = each %DEF_CFG) { 2122 while (my ($k, $v) = each %DEF_CFG) {
2208 $CFG->{$k} = $v unless exists $CFG->{$k}; 2123 $CFG->{$k} = $v unless exists $CFG->{$k};
2209 } 2124 }
2210 2125
2211 $CFG->{profile}{default}{host} ||= "crossfire.schmorp.de"; 2126 $CFG->{profile}{default}{host} ||= "crossfire.schmorp.de";
2127 $PROFILE = $CFG->{profile}{default};
2128
2129 # convert old bindings (only default profile matters)
2130 if (my $bindings = delete $PROFILE->{bindings}) {
2131 while (my ($mod, $syms) = each %$bindings) {
2132 while (my ($sym, $cmds) = each %$syms) {
2133 push @{ $PROFILE->{macro} }, {
2134 accelkey => [$mod*1, $sym*1],
2135 action => $cmds,
2136 };
2137 }
2138 }
2139 }
2212 2140
2213 sdl_init; 2141 sdl_init;
2214 2142
2215 @SDL_MODES = reverse 2143 @SDL_MODES = reverse
2216 grep $_->[0] >= 640 && $_->[1] >= 480, 2144 grep $_->[0] >= 640 && $_->[1] >= 480,

Diff Legend

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