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.146 by root, Wed Apr 4 02:43:30 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
… …
448sub graphics_setup { 465sub graphics_setup {
449 my $vbox = new CFPlus::UI::VBox; 466 my $vbox = new CFPlus::UI::VBox;
450 467
451 $vbox->add (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]); 468 $vbox->add (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]);
452 469
470 my $row = 0;
471
472 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "OpenGL Info");
473 $table->add (1, $row++, new CFPlus::UI::Label valign => 0, fontsize => 0.8, text => CFPlus::OpenGL::gl_vendor . ", " . CFPlus::OpenGL::gl_version,
474 can_events => 1,
475 tooltip => "<tt><span size='8192'>" . (CFPlus::OpenGL::gl_extensions) . "</span></tt>");
476
453 $table->add (0, 0, new CFPlus::UI::Label valign => 0, align => 1, text => "Video Mode"); 477 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Video Mode");
454 $table->add (1, 0, my $hbox = new CFPlus::UI::HBox); 478 $table->add (1, $row++, my $hbox = new CFPlus::UI::HBox);
455 479
456 $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]); 480 $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]);
457 $hbox->add (my $mode_label = new CFPlus::UI::Label align => 0, valign => 0, height => 0.8, template => "9999x9999"); 481 $hbox->add (my $mode_label = new CFPlus::UI::Label align => 0, valign => 0, height => 0.8, template => "9999x9999");
458 482
459 $mode_slider->connect (changed => sub { 483 $mode_slider->connect (changed => sub {
… …
461 485
462 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value; 486 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value;
463 $mode_label->set_text (sprintf "%dx%d", @{$SDL_MODES[$value]}); 487 $mode_label->set_text (sprintf "%dx%d", @{$SDL_MODES[$value]});
464 }); 488 });
465 $mode_slider->emit (changed => $mode_slider->{range}[0]); 489 $mode_slider->emit (changed => $mode_slider->{range}[0]);
466
467 my $row = 1;
468 490
469 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fullscreen"); 491 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fullscreen");
470 $table->add (1, $row++, $FULLSCREEN_ENABLE = new CFPlus::UI::CheckBox 492 $table->add (1, $row++, $FULLSCREEN_ENABLE = new CFPlus::UI::CheckBox
471 state => $CFG->{fullscreen}, 493 state => $CFG->{fullscreen},
472 tooltip => "Bring the client into fullscreen mode.", 494 tooltip => "Bring the client into fullscreen mode.",
… …
667 $table->add (1, 1, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 2; 0 }); 689 $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"); 690 $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 }); 691 $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"); 692 $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 }); 693 $table->add (1, 3, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 8; 0 });
694 $table->add (0, 4, new CFPlus::UI::Button text => "die on click(tm)", on_activate => sub { die "violator" } );
672 695
673 my @default_smooth = (0.05, 0.13, 0.05, 0.13, 0.30, 0.13, 0.05, 0.13, 0.05); 696 my @default_smooth = (0.05, 0.13, 0.05, 0.13, 0.30, 0.13, 0.05, 0.13, 0.05);
674 697
675 for my $x (0..2) { 698 for my $x (0..2) {
676 for my $y (0 .. 2) { 699 for my $y (0 .. 2) {
… …
680 on_changed => sub { $MAP->{smooth_matrix}[$x * 3 + $y] = $_[1] if $MAP; 0 }, 703 on_changed => sub { $MAP->{smooth_matrix}[$x * 3 + $y] = $_[1] if $MAP; 0 },
681 ); 704 );
682 } 705 }
683 } 706 }
684 707
708 $table->add (0, 5, new CFPlus::UI::TextEdit text => "line1\0152\0153");#d#
685 709
686 $table 710 $table
687} 711}
688 712
689sub stats_window { 713sub stats_window {
… …
886 for 0 .. $#col; 910 for 0 .. $#col;
887 911
888 my @align = qw(1 0 1 1 -1); 912 my @align = qw(1 0 1 1 -1);
889 913
890 my $y = 0; 914 my $y = 0;
891 for my $m (
892 sort {
893 $b->{version} <=> $a->{version}
894 or $b->{users} <=> $a->{users}
895 }
896 @{ $msg->{servers} } 915 for my $m (@{ $msg->{servers} }) {
897 ) {
898 my ($ip, $last, $host, $users, $version, $desc, $ibytes, $obytes, $uptime) = 916 my ($ip, $last, $host, $users, $version, $desc, $ibytes, $obytes, $uptime, $highlight) =
899 @$m{qw(ip age hostname users version description ibytes obytes uptime)}; 917 @$m{qw(ip age hostname users version description ibytes obytes uptime highlight)};
900 918
901 for ($desc) { 919 for ($desc) {
902 s/<br>/\n/gi; 920 s/<br>/\n/gi;
903 s/<li>/\n· /gi; 921 s/<li>/\n· /gi;
904 s/<.*?>//sgi; 922 s/<.*?>//sgi;
… …
934 max_w => $::WIDTH * 0.4, 952 max_w => $::WIDTH * 0.4,
935 ellipsise => 0, 953 ellipsise => 0,
936 align => $align[$_], 954 align => $align[$_],
937 text => $m->[$_], 955 text => $m->[$_],
938 tooltip => $tip[$_], 956 tooltip => $tip[$_],
939 fg => ($m->[3] =~ /\+$/ ? [1, 1, 1] : [.7, .7, .7]), 957 fg => ($highlight ? [1, 1, 1] : [.7, .7, .7]),
940 can_hover => 1, 958 can_hover => 1,
941 can_events => 1, 959 can_events => 1,
942 fontsize => 0.8) 960 fontsize => 0.8)
943 for 0 .. $#$m; 961 for 0 .. $#$m;
944 } 962 }
… …
1045 . "so only set it if you really need to prefetch images. " 1063 . "so only set it if you really need to prefetch images. "
1046 . "This option can be set and unset any time.", 1064 . "This option can be set and unset any time.",
1047 on_changed => sub { $CFG->{face_prefetch} = $_[1]; 0 }, 1065 on_changed => sub { $CFG->{face_prefetch} = $_[1]; 0 },
1048 ); 1066 );
1049 1067
1050 $table->add (0, 9, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Count"); 1068 $table->add (0, 9, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Rate");
1051 $table->add (1, 9, new CFPlus::UI::Entry 1069 $table->add (1, 9, new CFPlus::UI::Entry
1070 text => $CFG->{output_rate},
1071 tooltip => "The approximate bandwidth in bytes per second that the server should not exceed "
1072 . "when sending images, to ensure interactiveness. When 0 or unset, the server "
1073 . "default will be used, which is usually around 100kb/s.",
1074 on_changed => sub { $CFG->{output_rate} = $_[1]; 0 },
1075 );
1076
1077 $table->add (0, 10, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Count");
1078 $table->add (1, 10, new CFPlus::UI::Entry
1052 text => $CFG->{output_count}, 1079 text => $CFG->{output_count},
1053 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.", 1080 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.",
1054 on_changed => sub { $CFG->{output_count} = $_[1]; 0 }, 1081 on_changed => sub { $CFG->{output_count} = $_[1]; 0 },
1055 ); 1082 );
1056 1083
1057 $table->add (0, 10, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Sync"); 1084 $table->add (0, 11, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Sync");
1058 $table->add (1, 10, new CFPlus::UI::Entry 1085 $table->add (1, 11, new CFPlus::UI::Entry
1059 text => $CFG->{output_sync}, 1086 text => $CFG->{output_sync},
1060 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.", 1087 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.",
1061 on_changed => sub { $CFG->{output_sync} = $_[1]; 0 }, 1088 on_changed => sub { $CFG->{output_sync} = $_[1]; 0 },
1062 ); 1089 );
1063 1090
1064 $table->add (1, 11, $LOGIN_BUTTON = new CFPlus::UI::Button 1091 $table->add (1, 12, $LOGIN_BUTTON = new CFPlus::UI::Button
1065 expand => 1, 1092 expand => 1,
1066 align => 0, 1093 align => 0,
1067 text => "Login", 1094 text => "Login",
1068 on_activate => sub { 1095 on_activate => sub {
1069 $CONN ? stop_game 1096 $CONN ? stop_game
1070 : start_game; 1097 : start_game;
1071 0 1098 0
1072 }, 1099 },
1073 ); 1100 );
1074 1101
1075 $table->add (0, 12, new CFPlus::UI::Label valign => 0, align => 1, text => "Chat Command"); 1102 $table->add (0, 13, new CFPlus::UI::Label valign => 0, align => 1, text => "Chat Command");
1076 $table->add (1, 12, my $saycmd = new CFPlus::UI::Entry 1103 $table->add (1, 13, my $saycmd = new CFPlus::UI::Entry
1077 text => $CFG->{say_command}, 1104 text => $CFG->{say_command},
1078 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. " 1105 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. "
1079 . "Usually you want to enter something like 'say' or 'shout' or 'gsay' here. " 1106 . "Usually you want to enter something like 'say' or 'shout' or 'gsay' here. "
1080 . "But you could also set it to <b>tell <i>playername</i></b> to only chat with that user.", 1107 . "But you could also set it to <b>tell <i>playername</i></b> to only chat with that user.",
1081 on_changed => sub { 1108 on_changed => sub {
… …
1083 $CFG->{say_command} = $value; 1110 $CFG->{say_command} = $value;
1084 0 1111 0
1085 } 1112 }
1086 ); 1113 );
1087 1114
1088 $table->add (0, 13, new CFPlus::UI::Label valign => 0, align => 1, text => "Tip of the day"); 1115 $table->add (0, 14, new CFPlus::UI::Label valign => 0, align => 1, text => "Tip of the day");
1089 $table->add (1, 13, my $saycmd = new CFPlus::UI::CheckBox 1116 $table->add (1, 14, my $saycmd = new CFPlus::UI::CheckBox
1090 state => $CFG->{show_tips}, 1117 state => $CFG->{show_tips},
1091 tooltip => "Show the <b>Tip of the day</b> window at startup?", 1118 tooltip => "Show the <b>Tip of the day</b> window at startup?",
1092 on_changed => sub { 1119 on_changed => sub {
1093 my ($self, $value) = @_; 1120 my ($self, $value) = @_;
1094 $CFG->{show_tips} = $value; 1121 $CFG->{show_tips} = $value;
… …
1190 ["Boots" => PICKUP_BOOTS], 1217 ["Boots" => PICKUP_BOOTS],
1191 ["Gloves" => PICKUP_GLOVES], 1218 ["Gloves" => PICKUP_GLOVES],
1192 ["Cloaks" => PICKUP_CLOAK], 1219 ["Cloaks" => PICKUP_CLOAK],
1193 ], 1220 ],
1194 1221
1195 ["Readables", 2, 2, 1222 ["Readables", 2, 0,
1196 ["Spellbooks" => PICKUP_SPELLBOOK], 1223 ["Spellbooks" => PICKUP_SPELLBOOK],
1197 ["Skillscrolls" => PICKUP_SKILLSCROLL], 1224 ["Skillscrolls" => PICKUP_SKILLSCROLL],
1198 ["Normal Books/Scrolls" => PICKUP_READABLES], 1225 ["Normal Books/Scrolls" => PICKUP_READABLES],
1199 ], 1226 ],
1200 ["Misc", 2, 7, 1227 ["Misc", 2, 5,
1201 ["Food" => PICKUP_FOOD], 1228 ["Food" => PICKUP_FOOD],
1202 ["Drinks" => PICKUP_DRINK], 1229 ["Drinks" => PICKUP_DRINK],
1203 ["Valuables (Money, Gems)" => PICKUP_VALUABLES], 1230 ["Valuables (Money, Gems)" => PICKUP_VALUABLES],
1204 ["Keys" => PICKUP_KEY], 1231 ["Keys" => PICKUP_KEY],
1205 ["Magical Items" => PICKUP_MAGICAL], 1232 ["Magical Items" => PICKUP_MAGICAL],
1206 ["Potions" => PICKUP_POTION], 1233 ["Potions" => PICKUP_POTION],
1207 ["Magic Devices" => PICKUP_MAGIC_DEVICE], 1234 ["Magic Devices" => PICKUP_MAGIC_DEVICE],
1208 ["Ignore cursed" => PICKUP_NOT_CURSED], 1235 ["Ignore cursed" => PICKUP_NOT_CURSED],
1209 ["Jewelery" => PICKUP_JEWELS], 1236 ["Jewelery" => PICKUP_JEWELS],
1237 ["Flesh" => PICKUP_FLESH],
1210 ], 1238 ],
1211 ["Weight/Value ratio", 2, 17] 1239 ["Weight/Value ratio", 2, 17]
1212 ) 1240 )
1213 { 1241 {
1214 my ($title, $x, $y, @bits) = @$_; 1242 my ($title, $x, $y, @bits) = @$_;
… …
1377 1405
1378 $plwin->add ($ntb); 1406 $plwin->add ($ntb);
1379 $plwin 1407 $plwin
1380} 1408}
1381 1409
1382sub update_bindings {
1383 $BIND_UPD_CB->() if $BIND_UPD_CB;
1384}
1385
1386sub keyboard_setup { 1410sub keyboard_setup {
1387 my $binding_list = new CFPlus::UI::VBox; 1411 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} 1412}
1500 1413
1501sub help_window { 1414sub help_window {
1502 my $win = new CFPlus::UI::Toplevel 1415 my $win = new CFPlus::UI::Toplevel
1503 x => 'center', 1416 x => 'center',
… …
1688 1601
1689 $vbox->add (my $viewer = new CFPlus::UI::TextScroller 1602 $vbox->add (my $viewer = new CFPlus::UI::TextScroller
1690 expand => 1, fontsize => 0.8, padding_x => 4, padding_y => 4); 1603 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]); 1604 $viewer->add_paragraph (CFPlus::Pod::as_paragraphs CFPlus::Pod::section_of $tod[$todindex]);
1692 1605
1693 $vbox->add (my $table = new CFPlus::UI::Table); 1606 $vbox->add (my $table = new CFPlus::UI::Table col_expand => [0, 1]);
1694 1607
1695 $table->add (0, 0, new CFPlus::UI::Button 1608 $table->add (0, 0, new CFPlus::UI::Button
1696 text => "Close", 1609 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>.", 1610 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, 1611 on_activate => $close,
1699 ); 1612 );
1700 1613
1701 $table->add (2, 0, new CFPlus::UI::Button 1614 $table->add (2, 0, new CFPlus::UI::Button
1702 text => "Next", 1615 text => "Next",
1703 tooltip => "Show the next <b>Tip of the day</b>.", 1616 tooltip => "Show the next <b>Tip of the day</b>.",
1704 on_activate => sub { 1617 on_activate => sub {
1705 $close->(); 1618 $close->();
1706 &show_tip_of_the_day; 1619 &show_tip_of_the_day;
1707 }, 1620 },
… …
1749 padding => 0, 1662 padding => 0,
1750 z => 100, 1663 z => 100,
1751 force_x => "max", 1664 force_x => "max",
1752 force_y => 0; 1665 force_y => 0;
1753 $DEBUG_STATUS->show; 1666 $DEBUG_STATUS->show;
1754
1755 $BIND_EDITOR = new CFPlus::BindingEditor (x => "max", y => 0);
1756 1667
1757 $STATUSBOX = new CFPlus::UI::Statusbox; 1668 $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]); 1669 $STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", timeout => 864000, pri => -100, color => [1, 1, 1, 0.8]);
1759 1670
1760 (new CFPlus::UI::Frame 1671 (new CFPlus::UI::Frame
… …
1861 ); 1772 );
1862 1773
1863 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Help!", other => $HELP_WINDOW = help_window, 1774 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Help!", other => $HELP_WINDOW = help_window,
1864 tooltip => "View Documentation"); 1775 tooltip => "View Documentation");
1865 1776
1777
1866 $BUTTONBAR->add (new CFPlus::UI::Button 1778 $BUTTONBAR->add (new CFPlus::UI::Button
1867 text => "Quit", 1779 text => "Quit",
1868 tooltip => "Terminates the program", 1780 tooltip => "Terminates the program",
1869 on_activate => sub { 1781 on_activate => sub {
1870 if ($CONN) { 1782 if ($CONN) {
… …
1881 } 1793 }
1882 1794
1883 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]); 1795 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);
1884} 1796}
1885 1797
1798sub setup_build_button {
1799 my ($enabled) = @_;
1800 if ($enabled) {
1801 $BUILD_BUTTON->hide if $BUILD_BUTTON;
1802 $BUILD_BUTTON ||= new CFPlus::UI::Button
1803 text => "Build",
1804 tooltip => "Opens the ingame builder",
1805 on_activate => sub {
1806 if ($CONN) {
1807 $CONN->send_ext_req (builder_player_items => sub {
1808 open_ingame_editor ($_[0]) if exists $_[0]->{items};
1809 });
1810 }
1811 0
1812 };
1813 $BUTTONBAR->add ($BUILD_BUTTON);
1814 } else {
1815 $BUILD_BUTTON->hide if $BUILD_BUTTON;
1816 }
1817}
1818
1819sub open_ingame_editor {
1820 my ($msg) = @_;
1821
1822 my $win = new CFPlus::UI::Toplevel
1823 x => 0,
1824 y => 'center',
1825 z => 4,
1826 name => 'builder_window',
1827 force_w => int $WIDTH * 1/4,
1828 force_h => int $HEIGHT * 3/4,
1829 title => "In game builder",
1830 has_close_button => 1;
1831
1832 my $r = new CFPlus::UI::ScrolledWindow (
1833 expand => 1,
1834 scroll_y => 1
1835 );
1836 $r->add (my $vb = new CFPlus::UI::VBox);
1837 $win->add ($r);
1838
1839
1840 $vb->add (
1841 new CFPlus::UI::Button
1842 text => "Disable build mode",
1843 on_activate => sub { $::IN_BUILD_MODE = undef }
1844 );
1845 $vb->add (
1846 new CFPlus::UI::Button
1847 text => "ERASE",
1848 on_activate => sub { $::IN_BUILD_MODE = { do_erase => 1 } }
1849 );
1850
1851 for my $itemarchname (
1852 sort {
1853 $msg->{items}->{$a}->{build_arch_name}
1854 cmp $msg->{items}->{$b}->{build_arch_name}
1855 } keys %{$msg->{items}}
1856 ) {
1857 my $info = $msg->{items}->{$itemarchname};
1858 $vb->add (
1859 new CFPlus::UI::Button text => $info->{build_arch_name},
1860 on_activate => sub {
1861 $::IN_BUILD_MODE = { item => $itemarchname, info => $info };
1862
1863 if (grep { $msg->{items}->{$itemarchname}->{$_} } qw/has_connection has_name has_text/) {
1864 build_mode_query_arch_info ();
1865 }
1866 }
1867 );
1868 }
1869
1870 $win->show;
1871}
1872
1873sub build_mode_query_arch_info {
1874 my ($iteminfo) = $::IN_BUILD_MODE;
1875 my $itemarchname = $iteminfo->{item};
1876 my $info = $iteminfo->{info};
1877
1878 my $dialog = new CFPlus::UI::Toplevel
1879 x => "center",
1880 y => "center",
1881 z => 50,
1882 force_w => int $WIDTH * 1/2,
1883 title => "Enter information for placement of '$itemarchname'",
1884 has_close_button => 1;
1885
1886 $dialog->add (my $vb = new CFPlus::UI::VBox expand => 1);
1887
1888 $vb->add (my $table = new CFPlus::UI::Table expand => 1);
1889 my $row = 0;
1890 if ($info->{has_name}) {
1891 $table->add (0, $row, new CFPlus::UI::Label text => "Name:");
1892 $table->add (1, $row++, new CFPlus::UI::Entry expand => 1, on_changed => sub { $::IN_BUILD_MODE->{name} = $_[1]; 0 });
1893 }
1894 if ($info->{has_text}) {
1895 $table->add (0, $row, new CFPlus::UI::Label text => "Text:");
1896 $table->add (1, $row++, new CFPlus::UI::Entry expand => 1, on_changed => sub { $::IN_BUILD_MODE->{text} = $_[1]; 0 });
1897 }
1898 if ($info->{has_connection}) {
1899 $table->add (0, $row, new CFPlus::UI::Label text => "Connection ID:");
1900 $table->add (1, $row++,
1901 new CFPlus::UI::Entry
1902 expand => 1,
1903 on_changed => sub { $::IN_BUILD_MODE->{connection} = $_[1]; 0 },
1904 tooltip => "Enter the connection ID here. The connection ID connects actors like a lever to a gate or a magic ear to a gate"
1905 );
1906 }
1907
1908 $vb->add (my $hb = new CFPlus::UI::HBox expand => 1);
1909 $hb->add (new CFPlus::UI::Button
1910 text => "Close",
1911 expand => 1,
1912 on_activate => sub { $dialog->hide; 0 },
1913 );
1914 $dialog->show;
1915}
1916
1886sub video_shutdown { 1917sub video_shutdown {
1887 CFPlus::OpenGL::shutdown; 1918 CFPlus::OpenGL::shutdown;
1888 1919
1889 undef $SDL_ACTIVE; 1920 undef $SDL_ACTIVE;
1890} 1921}
… …
2016 }, 2047 },
2017 CFPlus::SDL_VIDEOEXPOSE => sub { 2048 CFPlus::SDL_VIDEOEXPOSE => sub {
2018 CFPlus::UI::full_refresh; 2049 CFPlus::UI::full_refresh;
2019 }, 2050 },
2020 CFPlus::SDL_ACTIVEEVENT => sub { 2051 CFPlus::SDL_ACTIVEEVENT => sub {
2021# printf "active %x %x\n", $SDL_EV->active_gain, $SDL_EV->active_state;#d# 2052# not useful, as APPACTIVE include sonly iconified state, not unmapped
2053# printf "active %x %x\n", $_[0]{gain}, $_[0]{state};#d#
2054# printf "A\n" if $_[0]{state} & CFPlus::SDL_APPACTIVE;
2055# printf "K\n" if $_[0]{state} & CFPlus::SDL_APPINPUTFOCUS;
2056# printf "M\n" if $_[0]{state} & CFPlus::SDL_APPMOUSEFOCUS;
2022 }, 2057 },
2023 CFPlus::SDL_KEYDOWN => sub { 2058 CFPlus::SDL_KEYDOWN => sub {
2024 if ($_[0]{mod} & CFPlus::KMOD_ALT && $_[0]{sym} == 13) { 2059 if ($_[0]{mod} & CFPlus::KMOD_ALT && $_[0]{sym} == 13) {
2025 # alt-enter 2060 # alt-enter
2026 $FULLSCREEN_ENABLE->toggle; 2061 $FULLSCREEN_ENABLE->toggle;
… …
2072 bgm_enable => 1, 2107 bgm_enable => 1,
2073 bgm_volume => 0.25, 2108 bgm_volume => 0.25,
2074 face_prefetch => 0, 2109 face_prefetch => 0,
2075 output_sync => 1, 2110 output_sync => 1,
2076 output_count => 1, 2111 output_count => 1,
2112 output_rate => "",
2077 pickup => 0, 2113 pickup => 0,
2078 inv_sort => "mtime", 2114 inv_sort => "mtime",
2079 default => "profile", # default profile 2115 default => "profile", # default profile
2080 show_tips => 1, 2116 show_tips => 1,
2081 ); 2117 );
… …
2083 while (my ($k, $v) = each %DEF_CFG) { 2119 while (my ($k, $v) = each %DEF_CFG) {
2084 $CFG->{$k} = $v unless exists $CFG->{$k}; 2120 $CFG->{$k} = $v unless exists $CFG->{$k};
2085 } 2121 }
2086 2122
2087 $CFG->{profile}{default}{host} ||= "crossfire.schmorp.de"; 2123 $CFG->{profile}{default}{host} ||= "crossfire.schmorp.de";
2124 $PROFILE = $CFG->{profile}{default};
2125
2126 # convert old bindings (only default profile matters)
2127 if (my $bindings = delete $PROFILE->{bindings}) {
2128 while (my ($mod, $syms) = each %$bindings) {
2129 while (my ($sym, $cmds) = each %$syms) {
2130 push @{ $PROFILE->{macro} }, {
2131 accelkey => [$mod*1, $sym*1],
2132 action => $cmds,
2133 };
2134 }
2135 }
2136 }
2088 2137
2089 sdl_init; 2138 sdl_init;
2090 2139
2091 @SDL_MODES = reverse 2140 @SDL_MODES = reverse
2092 grep $_->[0] >= 640 && $_->[1] >= 480, 2141 grep $_->[0] >= 640 && $_->[1] >= 480,

Diff Legend

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