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.118 by root, Tue Aug 22 06:37:30 2006 UTC vs.
Revision 1.147 by root, Fri Apr 6 07:45:35 2007 UTC

1#!/opt/bin/perl 1#!/opt/bin/perl
2
3my $startup_done = sub { };
4
5# do splash-screen thingy on win32
6BEGIN {
7 if (%PAR::LibCache && $^O eq "MSWin32") {
8 while (my ($filename, $zip) = each %PAR::LibCache) {
9 $zip->extractMember ("SPLASH.bmp", "$ENV{PAR_TEMP}/SPLASH.bmp");
10 }
11
12 require Win32::GUI::SplashScreen;
13
14 Win32::GUI::SplashScreen::Show (
15 -file => "$ENV{PAR_TEMP}/SPLASH.bmp",
16 );
17
18 $startup_done = sub {
19 Win32::GUI::SplashScreen::Done (1);
20 };
21 }
22}
2 23
3use strict; 24use strict;
4use utf8; 25use utf8;
26
27use Carp 'verbose';
5 28
6# do things only needed for single-binary version (par) 29# do things only needed for single-binary version (par)
7BEGIN { 30BEGIN {
8 if (%PAR::LibCache) { 31 if (%PAR::LibCache) {
9 @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
10 33
11 while (my ($filename, $zip) = each %PAR::LibCache) { 34 while (my ($filename, $zip) = each %PAR::LibCache) {
12 for ($zip->memberNames) { 35 for ($zip->memberNames) {
13 next unless /^\/root\/(.*)/; 36 next unless /^root\/(.*)/;
14 $zip->extractMember ($_, "$ENV{PAR_TEMP}/$1") 37 $zip->extractMember ($_, "$ENV{PAR_TEMP}/$1")
15 unless -e "$ENV{PAR_TEMP}/$1"; 38 unless -e "$ENV{PAR_TEMP}/$1";
16 } 39 }
17 } 40 }
18 41
… …
35use Compress::LZF; 58use Compress::LZF;
36 59
37use CFPlus; 60use CFPlus;
38use CFPlus::OpenGL (); 61use CFPlus::OpenGL ();
39use CFPlus::Protocol; 62use CFPlus::Protocol;
63use CFPlus::DB;
40use CFPlus::UI; 64use CFPlus::UI;
65use CFPlus::UI::Inventory;
66use CFPlus::UI::SpellList;
41use CFPlus::Pod; 67use CFPlus::Pod;
42use CFPlus::BindingEditor;
43use CFPlus::MapWidget; 68use CFPlus::MapWidget;
69use CFPlus::Macro;
44 70
45$SIG{QUIT} = sub { Carp::cluck "QUIT" }; 71$SIG{QUIT} = sub { Carp::cluck "QUIT" };
46$SIG{PIPE} = 'IGNORE'; 72$SIG{PIPE} = 'IGNORE';
47 73
48$Event::Eval = 0; 74$Event::Eval = 1;
49$Event::DIED = sub { 75$Event::DIED = sub {
50 # TODO: display dialog box or so 76 CFPlus::fatal Carp::longmess $_[1]
51 Carp::cluck $_[1];#d#TODO: remove when stable
52 CFPlus::error $_[1];
53}; 77};
54
55$SIG{__DIE__} = sub {
56 return if CFPlus::in_destruct;
57 Carp::cluck $_[0];
58 CFPlus::error $_[0];
59 return;#d#
60 #return unless defined $^S && !$^S;
61 $Event::DIED->(undef, $_[0]);
62};
63
64our $VERSION = '0.9';
65 78
66my $MAX_FPS = 60; 79my $MAX_FPS = 60;
67my $MIN_FPS = 5; # unused as of yet 80my $MIN_FPS = 5; # unused as of yet
68 81
69our $META_SERVER = "crossfire.real-time.com:13326"; 82our $META_SERVER = "http://metaserver.schmorp.de/current.json";
70 83
71our $LAST_REFRESH; 84our $LAST_REFRESH;
72our $NOW; 85our $NOW;
73 86
74our $CFG; 87our $CFG;
75our $CONN; 88our $CONN;
89our $PROFILE; # current profile
76our $FAST; # fast, low-quality mode, possibly useful for software-rendering 90our $FAST; # fast, low-quality mode, possibly useful for software-rendering
77 91
78our $WANT_REFRESH; 92our $WANT_REFRESH;
79our $CAN_REFRESH; 93our $CAN_REFRESH;
80 94
… …
111 125
112our $INVENTORY_PAGE; 126our $INVENTORY_PAGE;
113our $STATS_PAGE; 127our $STATS_PAGE;
114our $SKILL_PAGE; 128our $SKILL_PAGE;
115our $SPELL_PAGE; 129our $SPELL_PAGE;
130our $SPELL_LIST;
116 131
117our $HELP_WINDOW; 132our $HELP_WINDOW;
118our $MESSAGE_WINDOW; 133our $MESSAGE_WINDOW;
119our $FLOORBOX; 134our $FLOORBOX;
120our $GAUGES; 135our $GAUGES;
… …
133 148
134our $INV; 149our $INV;
135our $INVR; 150our $INVR;
136our $INV_RIGHT_HB; 151our $INV_RIGHT_HB;
137 152
138our $BIND_EDITOR;
139our $BIND_UPD_CB;
140
141our $PICKUP_CFG; 153our $PICKUP_CFG;
154
155our $IN_BUILD_MODE;
156our $BUILD_BUTTON;
142 157
143sub status { 158sub status {
144 $STATUSBOX->add (CFPlus::asxml $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]); 159 $STATUSBOX->add (CFPlus::asxml $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]);
145} 160}
146 161
147sub debug { 162sub debug {
148 $DEBUG_STATUS->set_text ($_[0]); 163 $DEBUG_STATUS->set_text ($_[0]);
164}
165
166sub message {
167 my ($para) = @_;
168
169 my $time = sprintf "%02d:%02d:%02d", (localtime time)[2,1,0];
170
171 $para->{markup} = "<span foreground='#ffffff'>$time</span> $para->{markup}";
172
173 $LOGVIEW->add_paragraph ($para);
174 $LOGVIEW->scroll_to_bottom;
149} 175}
150 176
151sub destroy_query_dialog { 177sub destroy_query_dialog {
152 (delete $_[0]{query_dialog})->destroy 178 (delete $_[0]{query_dialog})->destroy
153 if $_[0]{query_dialog}; 179 if $_[0]{query_dialog};
154} 180}
155 181
182# FIXME: a very ugly hack to wait for stat update look below! #d#
183our $QUERY_TIMER; #d#
184
156# server query dialog 185# server query dialog
157sub server_query { 186sub server_query {
158 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 }
159 203
160 $conn->{query_dialog} = my $dialog = new CFPlus::UI::Toplevel 204 $conn->{query_dialog} = my $dialog = new CFPlus::UI::Toplevel
161 x => "center", 205 x => "center",
162 y => "center", 206 y => "center",
163 title => "Server Query", 207 title => "Server Query",
… …
354 $LOGIN_BUTTON->set_text ("Logout"); 398 $LOGIN_BUTTON->set_text ("Logout");
355 $SETUP_DIALOG->hide; 399 $SETUP_DIALOG->hide;
356 400
357 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;
358 402
359 my ($host, $port) = split /:/, $CFG->{profile}{default}{host}; 403 my ($host, $port) = split /:/, $PROFILE->{host};
360 404
361 $MAP = new CFPlus::Map $mapsize, $mapsize; 405 $MAP = new CFPlus::Map;
362 406
363 $CONN = eval { 407 $CONN = eval {
364 new CFPlus::Protocol 408 new CFPlus::Protocol
365 host => $host, 409 host => $host,
366 port => $port || 13327, 410 port => $port || 13327,
367 user => $CFG->{profile}{default}{user}, 411 user => $PROFILE->{user},
368 pass => $CFG->{profile}{default}{password}, 412 pass => $PROFILE->{password},
369 mapw => $mapsize, 413 mapw => $mapsize,
370 maph => $mapsize, 414 maph => $mapsize,
371 415
372 client => "cfplus $VERSION $] $^O", 416 client => "cfplus $CFPlus::VERSION $] $^O",
373 417
374 map_widget => $MAPWIDGET, 418 map_widget => $MAPWIDGET,
375 logview => $LOGVIEW, 419 logview => $LOGVIEW,
376 statusbox => $STATUSBOX, 420 statusbox => $STATUSBOX,
377 map => $MAP, 421 map => $MAP,
… …
404sub stop_game { 448sub stop_game {
405 $LOGIN_BUTTON->set_text ("Login"); 449 $LOGIN_BUTTON->set_text ("Login");
406 $SETUP_NOTEBOOK->set_current_page ($SETUP_SERVER); 450 $SETUP_NOTEBOOK->set_current_page ($SETUP_SERVER);
407 $SETUP_DIALOG->show; 451 $SETUP_DIALOG->show;
408 $PL_WINDOW->hide; 452 $PL_WINDOW->hide;
409 $SPELL_PAGE->clear_spells; 453 $SPELL_LIST->clear_spells;
410 454
411 return unless $CONN; 455 return unless $CONN;
412 456
413 status "connection closed"; 457 status "connection closed";
414 458
… …
422sub graphics_setup { 466sub graphics_setup {
423 my $vbox = new CFPlus::UI::VBox; 467 my $vbox = new CFPlus::UI::VBox;
424 468
425 $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]);
426 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
427 $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");
428 $table->add (1, 0, my $hbox = new CFPlus::UI::HBox); 479 $table->add (1, $row++, my $hbox = new CFPlus::UI::HBox);
429 480
430 $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]);
431 $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");
432 483
433 $mode_slider->connect (changed => sub { 484 $mode_slider->connect (changed => sub {
… …
435 486
436 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value; 487 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value;
437 $mode_label->set_text (sprintf "%dx%d", @{$SDL_MODES[$value]}); 488 $mode_label->set_text (sprintf "%dx%d", @{$SDL_MODES[$value]});
438 }); 489 });
439 $mode_slider->emit (changed => $mode_slider->{range}[0]); 490 $mode_slider->emit (changed => $mode_slider->{range}[0]);
440
441 my $row = 1;
442 491
443 $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");
444 $table->add (1, $row++, $FULLSCREEN_ENABLE = new CFPlus::UI::CheckBox 493 $table->add (1, $row++, $FULLSCREEN_ENABLE = new CFPlus::UI::CheckBox
445 state => $CFG->{fullscreen}, 494 state => $CFG->{fullscreen},
446 tooltip => "Bring the client into fullscreen mode.", 495 tooltip => "Bring the client into fullscreen mode.",
… …
641 $table->add (1, 1, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 2; 0 }); 690 $table->add (1, 1, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 2; 0 });
642 $table->add (0, 2, new CFPlus::UI::Label text => "Show FPS"); 691 $table->add (0, 2, new CFPlus::UI::Label text => "Show FPS");
643 $table->add (1, 2, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 4; 0 }); 692 $table->add (1, 2, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 4; 0 });
644 $table->add (0, 3, new CFPlus::UI::Label text => "Suppress Tooltips"); 693 $table->add (0, 3, new CFPlus::UI::Label text => "Suppress Tooltips");
645 $table->add (1, 3, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 8; 0 }); 694 $table->add (1, 3, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 8; 0 });
695 $table->add (0, 4, new CFPlus::UI::Button text => "die on click(tm)", on_activate => sub { die "violator" } );
646 696
647 my @default_smooth = (0.05, 0.13, 0.05, 0.13, 0.30, 0.13, 0.05, 0.13, 0.05); 697 my @default_smooth = (0.05, 0.13, 0.05, 0.13, 0.30, 0.13, 0.05, 0.13, 0.05);
648 698
649 for my $x (0..2) { 699 for my $x (0..2) {
650 for my $y (0 .. 2) { 700 for my $y (0 .. 2) {
… …
654 on_changed => sub { $MAP->{smooth_matrix}[$x * 3 + $y] = $_[1] if $MAP; 0 }, 704 on_changed => sub { $MAP->{smooth_matrix}[$x * 3 + $y] = $_[1] if $MAP; 0 },
655 ); 705 );
656 } 706 }
657 } 707 }
658 708
709 $table->add (0, 5, new CFPlus::UI::TextEdit text => "line1\0152\0153");#d#
659 710
660 $table 711 $table
661} 712}
662 713
663sub stats_window { 714sub stats_window {
… …
832 883
833 my $table = $METASERVER->{table}; 884 my $table = $METASERVER->{table};
834 $table->clear; 885 $table->clear;
835 $table->add (0, 0, my $label = new CFPlus::UI::Label max_w => $WIDTH * 0.8, text => "fetching server list..."); 886 $table->add (0, 0, my $label = new CFPlus::UI::Label max_w => $WIDTH * 0.8, text => "fetching server list...");
836 887
837 my $buf; 888 my $ok = 0;
838 889
839 my $fh = new IO::Socket::INET PeerHost => $META_SERVER, Blocking => 0; 890 CFPlus::background {
891 my $ua = CFPlus::lwp_useragent;
840 892
841 unless ($fh) { 893 CFPlus::background_msg CFPlus::from_json +(CFPlus::lwp_check $ua->get ($META_SERVER))->decoded_content;
842 $label->set_text ("unable to contact metaserver: $!"); 894 } sub {
843 return; 895 my ($msg) = @_;
844 } 896 if ($msg) {
845
846 Event->io (fd => $fh, poll => 'r', cb => sub {
847 my $res = sysread $fh, $buf, 8192, length $buf;
848
849 if (!defined $res) {
850 $_[0]->w->cancel;
851 $label->set_text ("error while retrieving server list: $!");
852 } elsif ($res == 0) {
853 $_[0]->w->cancel;
854 status "server list retrieved";
855
856 utf8::decode $buf if utf8::valid $buf;
857
858 $table->clear; 897 $table->clear;
859 898
860 my @tip = ( 899 my @tip = (
861 "The current number of users logged in on the server.", 900 "The current number of users logged in on the server.",
862 "The hostname of the server.", 901 "The hostname of the server.",
… …
872 for 0 .. $#col; 911 for 0 .. $#col;
873 912
874 my @align = qw(1 0 1 1 -1); 913 my @align = qw(1 0 1 1 -1);
875 914
876 my $y = 0; 915 my $y = 0;
877 for my $m (sort { $b->[3] <=> $a->[3] } map [split /\|/], split /\015?\012/, $buf) { 916 for my $m (@{ $msg->{servers} }) {
878 my ($ip, $last, $host, $users, $version, $desc, $ibytes, $obytes, $uptime) = @$m; 917 my ($ip, $last, $host, $users, $version, $desc, $ibytes, $obytes, $uptime, $highlight) =
918 @$m{qw(ip age hostname users version description ibytes obytes uptime highlight)};
879 919
880 for ($desc) { 920 for ($desc) {
881 s/<br>/\n/gi; 921 s/<br>/\n/gi;
882 s/<li>/\n· /gi; 922 s/<li>/\n· /gi;
883 s/<.*?>//sgi; 923 s/<.*?>//sgi;
884 s/&/&amp;/g; 924 s/&amp;/&/g;
885 s/</&lt;/g; 925 s/&lt;/</g;
886 s/>/&gt;/g; 926 s/&gt;/>/g;
887 } 927 }
888 928
889 $uptime = sprintf "%dd %02d:%02d:%02d", 929 $uptime = sprintf "%dd %02d:%02d:%02d",
890 (int $m->[8] / 86400), 930 (int $uptime / 86400),
891 (int $m->[8] / 3600) % 24, 931 (int $uptime / 3600) % 24,
892 (int $m->[8] / 60) % 60, 932 (int $uptime / 60) % 60,
893 $m->[8] % 60; 933 $uptime % 60;
894 934
895 $m = [$users, $host, $uptime, $version, $desc]; 935 $m = [$users, $host, $uptime, $version, $desc];
896 936
897 $y++; 937 $y++;
898 938
… …
908 ), 948 ),
909 (new CFPlus::UI::Empty expand => 1), 949 (new CFPlus::UI::Empty expand => 1),
910 ]); 950 ]);
911 951
912 $table->add ($_, $y, new CFPlus::UI::Label 952 $table->add ($_, $y, new CFPlus::UI::Label
953 max_w => $::WIDTH * 0.4,
913 ellipsise => 0, 954 ellipsise => 0,
914 align => $align[$_], 955 align => $align[$_],
915 text => $m->[$_], 956 text => $m->[$_],
916 tooltip => $tip[$_], 957 tooltip => $tip[$_],
958 fg => ($highlight ? [1, 1, 1] : [.7, .7, .7]),
917 can_hover => 1, 959 can_hover => 1,
918 can_events => 1, 960 can_events => 1,
919 fontsize => 0.8) 961 fontsize => 0.8)
920 for 0 .. $#$m; 962 for 0 .. $#$m;
921 } 963 }
964 } else {
965 $ok or $label->set_text ("error while contacting metaserver");
922 } 966 }
923 }); 967 };
968
924} 969}
925 970
926sub metaserver_dialog { 971sub metaserver_dialog {
927 my $vbox = new CFPlus::UI::VBox; 972 my $vbox = new CFPlus::UI::VBox;
928 my $table = new CFPlus::UI::Table; 973 my $table = new CFPlus::UI::Table;
… …
932 title => "Server List", 977 title => "Server List",
933 name => 'metaserver_dialog', 978 name => 'metaserver_dialog',
934 x => 'center', 979 x => 'center',
935 y => 'center', 980 y => 'center',
936 z => 3, 981 z => 3,
982 force_w => $::WIDTH * 0.9,
937 force_h => $::HEIGHT * 0.4, 983 force_h => $::HEIGHT * 0.7,
938 child => $vbox, 984 child => $vbox,
939 has_close_button => 1, 985 has_close_button => 1,
940 table => $table, 986 table => $table,
941 on_visibility_change => sub { 987 on_visibility_change => sub {
942 update_metaserver ($_[0]) if $_[1]; 988 update_metaserver ($_[0]) if $_[1];
… …
1018 . "so only set it if you really need to prefetch images. " 1064 . "so only set it if you really need to prefetch images. "
1019 . "This option can be set and unset any time.", 1065 . "This option can be set and unset any time.",
1020 on_changed => sub { $CFG->{face_prefetch} = $_[1]; 0 }, 1066 on_changed => sub { $CFG->{face_prefetch} = $_[1]; 0 },
1021 ); 1067 );
1022 1068
1023 $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");
1024 $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
1025 text => $CFG->{output_count}, 1080 text => $CFG->{output_count},
1026 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.",
1027 on_changed => sub { $CFG->{output_count} = $_[1]; 0 }, 1082 on_changed => sub { $CFG->{output_count} = $_[1]; 0 },
1028 ); 1083 );
1029 1084
1030 $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");
1031 $table->add (1, 10, new CFPlus::UI::Entry 1086 $table->add (1, 11, new CFPlus::UI::Entry
1032 text => $CFG->{output_sync}, 1087 text => $CFG->{output_sync},
1033 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.",
1034 on_changed => sub { $CFG->{output_sync} = $_[1]; 0 }, 1089 on_changed => sub { $CFG->{output_sync} = $_[1]; 0 },
1035 ); 1090 );
1036 1091
1037 $table->add (1, 11, $LOGIN_BUTTON = new CFPlus::UI::Button 1092 $table->add (1, 12, $LOGIN_BUTTON = new CFPlus::UI::Button
1038 expand => 1, 1093 expand => 1,
1039 align => 0, 1094 align => 0,
1040 text => "Login", 1095 text => "Login",
1041 on_activate => sub { 1096 on_activate => sub {
1042 $CONN ? stop_game 1097 $CONN ? stop_game
1043 : start_game; 1098 : start_game;
1044 0 1099 0
1045 }, 1100 },
1046 ); 1101 );
1047 1102
1048 $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");
1049 $table->add (1, 12, my $saycmd = new CFPlus::UI::Entry 1104 $table->add (1, 13, my $saycmd = new CFPlus::UI::Entry
1050 text => $CFG->{say_command}, 1105 text => $CFG->{say_command},
1051 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. "
1052 . "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. "
1053 . "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.",
1054 on_changed => sub { 1109 on_changed => sub {
1055 my ($self, $value) = @_; 1110 my ($self, $value) = @_;
1056 $CFG->{say_command} = $value; 1111 $CFG->{say_command} = $value;
1112 0
1113 }
1114 );
1115
1116 $table->add (0, 14, new CFPlus::UI::Label valign => 0, align => 1, text => "Tip of the day");
1117 $table->add (1, 14, my $saycmd = new CFPlus::UI::CheckBox
1118 state => $CFG->{show_tips},
1119 tooltip => "Show the <b>Tip of the day</b> window at startup?",
1120 on_changed => sub {
1121 my ($self, $value) = @_;
1122 $CFG->{show_tips} = $value;
1057 0 1123 0
1058 } 1124 }
1059 ); 1125 );
1060 1126
1061 $vbox->add (new CFPlus::UI::FancyFrame 1127 $vbox->add (new CFPlus::UI::FancyFrame
… …
1125 window => $window, 1191 window => $window,
1126 input => $input, 1192 input => $input,
1127 }; 1193 };
1128 1194
1129 $window 1195 $window
1130}
1131
1132sub open_string_query {
1133 my ($title, $cb, $txt, $tooltip) = @_;
1134 my $dialog = new CFPlus::UI::Toplevel
1135 x => "center",
1136 y => "center",
1137 z => 50,
1138 force_w => $WIDTH * 4/5,
1139 title => $title;
1140
1141 $dialog->add (
1142 my $e = new CFPlus::UI::Entry
1143 on_activate => sub { $cb->(@_); $dialog->hide; 0 },
1144 on_key_down => sub { $_[1]->{sym} == 27 and $dialog->hide; 0 },
1145 tooltip => $tooltip
1146 );
1147
1148 $e->grab_focus;
1149 $e->set_text ($txt) if $txt;
1150 $dialog->show;
1151}
1152
1153sub open_quit_dialog {
1154 unless ($QUIT_DIALOG) {
1155 $QUIT_DIALOG = new CFPlus::UI::Toplevel
1156 x => "center",
1157 y => "center",
1158 z => 50,
1159 title => "Really Quit?",
1160 on_key_down => sub {
1161 my ($dialog, $ev) = @_;
1162 $ev->{sym} == 27 and $dialog->hide;
1163 }
1164 ;
1165
1166 $QUIT_DIALOG->add (my $vb = new CFPlus::UI::VBox expand => 1);
1167
1168 $vb->add (new CFPlus::UI::Label
1169 text => "You should find a savebed and apply it first!",
1170 max_w => $WIDTH * 0.25,
1171 ellipsize => 0,
1172 );
1173 $vb->add (my $hb = new CFPlus::UI::HBox expand => 1);
1174 $hb->add (new CFPlus::UI::Button
1175 text => "Ok",
1176 expand => 1,
1177 on_activate => sub { $QUIT_DIALOG->hide; 0 },
1178 );
1179 $hb->add (new CFPlus::UI::Button
1180 text => "Quit anyway",
1181 expand => 1,
1182 on_activate => sub { exit },
1183 );
1184 }
1185
1186 $QUIT_DIALOG->show;
1187 $QUIT_DIALOG->grab_focus;
1188} 1196}
1189 1197
1190sub autopickup_setup { 1198sub autopickup_setup {
1191 my $table = new CFPlus::UI::Table; 1199 my $table = new CFPlus::UI::Table;
1192 1200
… …
1210 ["Boots" => PICKUP_BOOTS], 1218 ["Boots" => PICKUP_BOOTS],
1211 ["Gloves" => PICKUP_GLOVES], 1219 ["Gloves" => PICKUP_GLOVES],
1212 ["Cloaks" => PICKUP_CLOAK], 1220 ["Cloaks" => PICKUP_CLOAK],
1213 ], 1221 ],
1214 1222
1215 ["Readables", 2, 2, 1223 ["Readables", 2, 0,
1216 ["Spellbooks" => PICKUP_SPELLBOOK], 1224 ["Spellbooks" => PICKUP_SPELLBOOK],
1217 ["Skillscrolls" => PICKUP_SKILLSCROLL], 1225 ["Skillscrolls" => PICKUP_SKILLSCROLL],
1218 ["Normal Books/Scrolls" => PICKUP_READABLES], 1226 ["Normal Books/Scrolls" => PICKUP_READABLES],
1219 ], 1227 ],
1220 ["Misc", 2, 7, 1228 ["Misc", 2, 5,
1221 ["Food" => PICKUP_FOOD], 1229 ["Food" => PICKUP_FOOD],
1222 ["Drinks" => PICKUP_DRINK], 1230 ["Drinks" => PICKUP_DRINK],
1223 ["Valuables (Money, Gems)" => PICKUP_VALUABLES], 1231 ["Valuables (Money, Gems)" => PICKUP_VALUABLES],
1224 ["Keys" => PICKUP_KEY], 1232 ["Keys" => PICKUP_KEY],
1225 ["Magical Items" => PICKUP_MAGICAL], 1233 ["Magical Items" => PICKUP_MAGICAL],
1226 ["Potions" => PICKUP_POTION], 1234 ["Potions" => PICKUP_POTION],
1227 ["Magic Devices" => PICKUP_MAGIC_DEVICE], 1235 ["Magic Devices" => PICKUP_MAGIC_DEVICE],
1228 ["Ignore cursed" => PICKUP_NOT_CURSED], 1236 ["Ignore cursed" => PICKUP_NOT_CURSED],
1229 ["Jewelery" => PICKUP_JEWELS], 1237 ["Jewelery" => PICKUP_JEWELS],
1238 ["Flesh" => PICKUP_FLESH],
1230 ], 1239 ],
1231 ["Weight/Value ratio", 2, 17] 1240 ["Weight/Value ratio", 2, 17]
1232 ) 1241 )
1233 { 1242 {
1234 my ($title, $x, $y, @bits) = @$_; 1243 my ($title, $x, $y, @bits) = @$_;
… …
1284 $table 1293 $table
1285} 1294}
1286 1295
1287my %SORT_ORDER = ( 1296my %SORT_ORDER = (
1288 type => undef, 1297 type => undef,
1289 mtime => sub { sort { 1298 mtime => sub {
1299 my $NOW = time;
1300 sort {
1301 my $atime = $a->{mtime} - $NOW; $atime = $atime < 5 * 60 ? int $atime / 60 : 6;
1302 my $btime = $b->{mtime} - $NOW; $btime = $btime < 5 * 60 ? int $btime / 60 : 6;
1303
1290 ($a->{flags} & F_LOCKED) <=> ($b->{flags} & F_LOCKED) 1304 ($a->{flags} & F_LOCKED) <=> ($b->{flags} & F_LOCKED)
1291 or $b->{mtime} <=> $a->{mtime} 1305 or $btime <=> $atime
1292 or $a->{type} <=> $b->{type} 1306 or $a->{type} <=> $b->{type}
1307 } @_
1293 } @_ }, 1308 },
1294 weight => sub { sort { 1309 weight => sub { sort {
1295 $a->{weight} * ($a->{nrof} || 1) <=> $b->{weight} * ($b->{nrof} || 1) 1310 $a->{weight} * ($a->{nrof} || 1) <=> $b->{weight} * ($b->{nrof} || 1)
1296 or $a->{type} <=> $b->{type} 1311 or $a->{type} <=> $b->{type}
1297 } @_ }, 1312 } @_ },
1298); 1313);
… …
1323 #TODO# update to weigh/maxweight 1338 #TODO# update to weigh/maxweight
1324 $hb1->add ($STATWIDS->{i_weight} = new CFPlus::UI::Label align => -1); 1339 $hb1->add ($STATWIDS->{i_weight} = new CFPlus::UI::Label align => -1);
1325 1340
1326 $vb1->add (my $sw1 = new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1); 1341 $vb1->add (my $sw1 = new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1);
1327 $sw1->add ($INV = new CFPlus::UI::Inventory); 1342 $sw1->add ($INV = new CFPlus::UI::Inventory);
1343 $INV->set_sort_order ($SORT_ORDER{$::CFG->{inv_sort}});
1328 1344
1329 $hb->add (my $vb2 = new CFPlus::UI::VBox); 1345 $hb->add (my $vb2 = new CFPlus::UI::VBox);
1330 1346
1331 $vb2->add ($INV_RIGHT_HB = new CFPlus::UI::HBox); 1347 $vb2->add ($INV_RIGHT_HB = new CFPlus::UI::HBox);
1332 1348
… …
1372 $ntb->add ( 1388 $ntb->add (
1373 "Skills (F3)" => $SKILL_PAGE = skill_window, 1389 "Skills (F3)" => $SKILL_PAGE = skill_window,
1374 "Shows all your Skills." 1390 "Shows all your Skills."
1375 ); 1391 );
1376 1392
1377 my $spellsw = new CFPlus::UI::ScrolledWindow (expand => 1, scroll_y => 1); 1393 my $spellsw = $SPELL_PAGE = new CFPlus::UI::ScrolledWindow (expand => 1, scroll_y => 1);
1378 $spellsw->add ($SPELL_PAGE = new CFPlus::UI::SpellList); 1394 $spellsw->add ($SPELL_LIST = new CFPlus::UI::SpellList);
1379 $ntb->add ( 1395 $ntb->add (
1380 "Spellbook (F4)" => $spellsw, 1396 "Spellbook (F4)" => $spellsw,
1381 "Displays all spells you have and lets you edit keyboard shortcuts for them." 1397 "Displays all spells you have and lets you edit keyboard shortcuts for them."
1382 ); 1398 );
1383 $ntb->add ( 1399 $ntb->add (
… …
1390 1406
1391 $plwin->add ($ntb); 1407 $plwin->add ($ntb);
1392 $plwin 1408 $plwin
1393} 1409}
1394 1410
1395sub update_bindings {
1396 $BIND_UPD_CB->() if $BIND_UPD_CB;
1397}
1398
1399sub keyboard_setup { 1411sub keyboard_setup {
1400 my $binding_list = new CFPlus::UI::VBox; 1412 CFPlus::Macro::keyboard_setup
1401
1402 my $refresh;
1403 $refresh = $BIND_UPD_CB = sub {
1404 $binding_list->clear ();
1405
1406 for my $mod (keys %{$::CFG->{profile}{default}{bindings}}) {
1407 for my $sym (keys %{$::CFG->{profile}{default}{bindings}{$mod}}) {
1408 my $cmds = $::CFG->{profile}{default}{bindings}{$mod}{$sym};
1409 next unless ref $cmds eq 'ARRAY' and @$cmds > 0;
1410
1411 my $lbl = join "; ", @$cmds;
1412 my $nam = CFPlus::BindingEditor::keycombo_to_name ($mod, $sym);
1413 $binding_list->add (my $hb = new CFPlus::UI::HBox);
1414 $hb->add (new CFPlus::UI::Button
1415 text => "delete",
1416 tooltip => "Deletes the binding",
1417 on_activate => sub {
1418 $binding_list->remove ($hb);
1419 delete $::CFG->{profile}{default}{bindings}{$mod}{$sym};
1420 0
1421 });
1422
1423 $hb->add (new CFPlus::UI::Button
1424 text => "edit",
1425 tooltip => "Edits the binding",
1426 on_activate => sub {
1427 $::BIND_EDITOR->set_binding (
1428 $mod, $sym, $::CFG->{profile}{default}{bindings}{$mod}{$sym},
1429 sub {
1430 my ($nmod, $nsym, $ncmds) = @_;
1431 $::BIND_EDITOR->cfg_unbind ($mod, $sym);
1432 $::BIND_EDITOR->cfg_bind ($nmod, $nsym, $ncmds);
1433 $refresh->();
1434 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1435 $SETUP_DIALOG->show;
1436 },
1437 sub {
1438 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1439 $SETUP_DIALOG->show;
1440 });
1441 $::BIND_EDITOR->show;
1442 $SETUP_DIALOG->hide;
1443 0
1444 });
1445
1446 $hb->add (new CFPlus::UI::Label text => "(Key: $nam)");
1447 $hb->add (new CFPlus::UI::Label text => $lbl, expand => 1);
1448 }
1449 }
1450 };
1451
1452 my $vb = new CFPlus::UI::VBox;
1453 $vb->add (new CFPlus::UI::FancyFrame
1454 label => "Options",
1455 child => (my $hb = new CFPlus::UI::HBox),
1456 );
1457 $hb->add (new CFPlus::UI::Label text => "only shift-up stops fire");
1458 $hb->add (new CFPlus::UI::CheckBox
1459 expand => 1,
1460 state => $CFG->{shift_fire_stop},
1461 tooltip => "If this checkbox is enabled you will stop fire only if you stop pressing shift",
1462 on_changed => sub {
1463 my ($cbox, $value) = @_;
1464 $CFG->{shift_fire_stop} = $value;
1465 0
1466 });
1467
1468 $vb->add (new CFPlus::UI::FancyFrame
1469 label => "Bindings",
1470 child => $binding_list);
1471 $vb->add (my $hb = new CFPlus::UI::HBox);
1472
1473 $hb->add (new CFPlus::UI::Button
1474 text => "record new",
1475 expand => 1,
1476 tooltip => "This button opens the binding editor with an empty binding.",
1477 on_activate => sub {
1478 $::BIND_EDITOR->set_binding (undef, undef, [],
1479 sub {
1480 my ($mod, $sym, $cmds) = @_;
1481 $::BIND_EDITOR->cfg_bind ($mod, $sym, $cmds);
1482 $refresh->();
1483 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1484 $SETUP_DIALOG->show;
1485 },
1486 sub {
1487 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1488 $SETUP_DIALOG->show;
1489 },
1490 );
1491 $SETUP_DIALOG->hide;
1492 $::BIND_EDITOR->show;
1493 0
1494 },
1495 );
1496
1497 $hb->add (new CFPlus::UI::Button
1498 text => "close",
1499 tooltip => "Closes the binding window",
1500 expand => 1,
1501 on_activate => sub {
1502 $SETUP_DIALOG->hide;
1503 0
1504 }
1505 );
1506
1507 $refresh->();
1508
1509 $vb
1510} 1413}
1511 1414
1512sub help_window { 1415sub help_window {
1513 my $win = new CFPlus::UI::Toplevel 1416 my $win = new CFPlus::UI::Toplevel
1514 x => 'center', 1417 x => 'center',
1515 y => 'center', 1418 y => 'center',
1516 z => 2, 1419 z => 4,
1517 name => 'doc_browser', 1420 name => 'doc_browser',
1518 force_w => int $WIDTH * 7/8, 1421 force_w => int $WIDTH * 7/8,
1519 force_h => int $HEIGHT * 7/8, 1422 force_h => int $HEIGHT * 7/8,
1520 title => "Help Browser", 1423 title => "Help Browser",
1521 has_close_button => 1; 1424 has_close_button => 1;
… …
1609 }; 1512 };
1610 1513
1611 $win 1514 $win
1612} 1515}
1613 1516
1517sub open_string_query {
1518 my ($title, $cb, $txt, $tooltip) = @_;
1519 my $dialog = new CFPlus::UI::Toplevel
1520 x => "center",
1521 y => "center",
1522 z => 50,
1523 force_w => $WIDTH * 4/5,
1524 title => $title;
1525
1526 $dialog->add (
1527 my $e = new CFPlus::UI::Entry
1528 on_activate => sub { $cb->(@_); $dialog->hide; 0 },
1529 on_key_down => sub { $_[1]->{sym} == 27 and $dialog->hide; 0 },
1530 tooltip => $tooltip
1531 );
1532
1533 $e->grab_focus;
1534 $e->set_text ($txt) if $txt;
1535 $dialog->show;
1536}
1537
1538sub open_quit_dialog {
1539 unless ($QUIT_DIALOG) {
1540 $QUIT_DIALOG = new CFPlus::UI::Toplevel
1541 x => "center",
1542 y => "center",
1543 z => 50,
1544 title => "Really Quit?",
1545 on_key_down => sub {
1546 my ($dialog, $ev) = @_;
1547 $ev->{sym} == 27 and $dialog->hide;
1548 }
1549 ;
1550
1551 $QUIT_DIALOG->add (my $vb = new CFPlus::UI::VBox expand => 1);
1552
1553 $vb->add (new CFPlus::UI::Label
1554 text => "You should find a savebed and apply it first!",
1555 max_w => $WIDTH * 0.25,
1556 ellipsize => 0,
1557 );
1558 $vb->add (my $hb = new CFPlus::UI::HBox expand => 1);
1559 $hb->add (new CFPlus::UI::Button
1560 text => "Ok",
1561 expand => 1,
1562 on_activate => sub { $QUIT_DIALOG->hide; 0 },
1563 );
1564 $hb->add (new CFPlus::UI::Button
1565 text => "Quit anyway",
1566 expand => 1,
1567 on_activate => sub { exit },
1568 );
1569 }
1570
1571 $QUIT_DIALOG->show;
1572 $QUIT_DIALOG->grab_focus;
1573}
1574
1575sub show_tip_of_the_day {
1576 # find all tips
1577 my @tod = CFPlus::Pod::find tip_of_the_day => "*";
1578
1579 my $todindex = $CFPlus::DB_STATE->get ("tip_of_the_day");
1580 $todindex = 0 if $todindex >= @tod;
1581 $CFPlus::DB_STATE->put (tip_of_the_day => $todindex + 1);
1582
1583 # create dialog
1584 my $dialog;
1585
1586 my $close = sub {
1587 $dialog->destroy;
1588 };
1589
1590 $dialog = new CFPlus::UI::Toplevel
1591 x => "center",
1592 y => "center",
1593 z => 3,
1594 name => 'tip_of_the_day',
1595 force_w => int $WIDTH * 4/9,
1596 force_h => int $WIDTH * 2/9,
1597 title => "Tip of the day #" . (1 + $todindex),
1598 child => my $vbox = new CFPlus::UI::VBox,
1599 has_close_button => 1,
1600 on_delete => $close,
1601 ;
1602
1603 $vbox->add (my $viewer = new CFPlus::UI::TextScroller
1604 expand => 1, fontsize => 0.8, padding_x => 4, padding_y => 4);
1605 $viewer->add_paragraph (CFPlus::Pod::as_paragraphs CFPlus::Pod::section_of $tod[$todindex]);
1606
1607 $vbox->add (my $table = new CFPlus::UI::Table col_expand => [0, 1]);
1608
1609 $table->add (0, 0, new CFPlus::UI::Button
1610 text => "Close",
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>.",
1612 on_activate => $close,
1613 );
1614
1615 $table->add (2, 0, new CFPlus::UI::Button
1616 text => "Next",
1617 tooltip => "Show the next <b>Tip of the day</b>.",
1618 on_activate => sub {
1619 $close->();
1620 &show_tip_of_the_day;
1621 },
1622 );
1623
1624 $dialog->show;
1625}
1626
1614sub sdl_init { 1627sub sdl_init {
1615 CFPlus::SDL_Init 1628 CFPlus::SDL_Init
1616 and die "SDL::Init failed!\n"; 1629 and die "SDL::Init failed!\n";
1617} 1630}
1618 1631
… …
1650 padding => 0, 1663 padding => 0,
1651 z => 100, 1664 z => 100,
1652 force_x => "max", 1665 force_x => "max",
1653 force_y => 0; 1666 force_y => 0;
1654 $DEBUG_STATUS->show; 1667 $DEBUG_STATUS->show;
1655
1656 $BIND_EDITOR = new CFPlus::BindingEditor (x => "max", y => 0);
1657 1668
1658 $STATUSBOX = new CFPlus::UI::Statusbox; 1669 $STATUSBOX = new CFPlus::UI::Statusbox;
1659 $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]);
1660 1671
1661 (new CFPlus::UI::Frame 1672 (new CFPlus::UI::Frame
… …
1762 ); 1773 );
1763 1774
1764 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Help!", other => $HELP_WINDOW = help_window, 1775 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Help!", other => $HELP_WINDOW = help_window,
1765 tooltip => "View Documentation"); 1776 tooltip => "View Documentation");
1766 1777
1778
1767 $BUTTONBAR->add (new CFPlus::UI::Button 1779 $BUTTONBAR->add (new CFPlus::UI::Button
1768 text => "Quit", 1780 text => "Quit",
1769 tooltip => "Terminates the program", 1781 tooltip => "Terminates the program",
1770 on_activate => sub { 1782 on_activate => sub {
1771 if ($CONN) { 1783 if ($CONN) {
… …
1782 } 1794 }
1783 1795
1784 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]); 1796 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);
1785} 1797}
1786 1798
1799sub setup_build_button {
1800 my ($enabled) = @_;
1801 if ($enabled) {
1802 $BUILD_BUTTON->hide if $BUILD_BUTTON;
1803 $BUILD_BUTTON ||= new CFPlus::UI::Button
1804 text => "Build",
1805 tooltip => "Opens the ingame builder",
1806 on_activate => sub {
1807 if ($CONN) {
1808 $CONN->send_ext_req (builder_player_items => sub {
1809 open_ingame_editor ($_[0]) if exists $_[0]->{items};
1810 });
1811 }
1812 0
1813 };
1814 $BUTTONBAR->add ($BUILD_BUTTON);
1815 } else {
1816 $BUILD_BUTTON->hide if $BUILD_BUTTON;
1817 }
1818}
1819
1820sub open_ingame_editor {
1821 my ($msg) = @_;
1822
1823 my $win = new CFPlus::UI::Toplevel
1824 x => 0,
1825 y => 'center',
1826 z => 4,
1827 name => 'builder_window',
1828 force_w => int $WIDTH * 1/4,
1829 force_h => int $HEIGHT * 3/4,
1830 title => "In game builder",
1831 has_close_button => 1;
1832
1833 my $r = new CFPlus::UI::ScrolledWindow (
1834 expand => 1,
1835 scroll_y => 1
1836 );
1837 $r->add (my $vb = new CFPlus::UI::VBox);
1838 $win->add ($r);
1839
1840
1841 $vb->add (
1842 new CFPlus::UI::Button
1843 text => "Disable build mode",
1844 on_activate => sub { $::IN_BUILD_MODE = undef }
1845 );
1846 $vb->add (
1847 new CFPlus::UI::Button
1848 text => "ERASE",
1849 on_activate => sub { $::IN_BUILD_MODE = { do_erase => 1 } }
1850 );
1851
1852 for my $itemarchname (
1853 sort {
1854 $msg->{items}->{$a}->{build_arch_name}
1855 cmp $msg->{items}->{$b}->{build_arch_name}
1856 } keys %{$msg->{items}}
1857 ) {
1858 my $info = $msg->{items}->{$itemarchname};
1859 $vb->add (
1860 new CFPlus::UI::Button text => $info->{build_arch_name},
1861 on_activate => sub {
1862 $::IN_BUILD_MODE = { item => $itemarchname, info => $info };
1863
1864 if (grep { $msg->{items}->{$itemarchname}->{$_} } qw/has_connection has_name has_text/) {
1865 build_mode_query_arch_info ();
1866 }
1867 }
1868 );
1869 }
1870
1871 $win->show;
1872}
1873
1874sub build_mode_query_arch_info {
1875 my ($iteminfo) = $::IN_BUILD_MODE;
1876 my $itemarchname = $iteminfo->{item};
1877 my $info = $iteminfo->{info};
1878
1879 my $dialog = new CFPlus::UI::Toplevel
1880 x => "center",
1881 y => "center",
1882 z => 50,
1883 force_w => int $WIDTH * 1/2,
1884 title => "Enter information for placement of '$itemarchname'",
1885 has_close_button => 1;
1886
1887 $dialog->add (my $vb = new CFPlus::UI::VBox expand => 1);
1888
1889 $vb->add (my $table = new CFPlus::UI::Table expand => 1);
1890 my $row = 0;
1891 if ($info->{has_name}) {
1892 $table->add (0, $row, new CFPlus::UI::Label text => "Name:");
1893 $table->add (1, $row++, new CFPlus::UI::Entry expand => 1, on_changed => sub { $::IN_BUILD_MODE->{name} = $_[1]; 0 });
1894 }
1895 if ($info->{has_text}) {
1896 $table->add (0, $row, new CFPlus::UI::Label text => "Text:");
1897 $table->add (1, $row++, new CFPlus::UI::Entry expand => 1, on_changed => sub { $::IN_BUILD_MODE->{text} = $_[1]; 0 });
1898 }
1899 if ($info->{has_connection}) {
1900 $table->add (0, $row, new CFPlus::UI::Label text => "Connection ID:");
1901 $table->add (1, $row++,
1902 new CFPlus::UI::Entry
1903 expand => 1,
1904 on_changed => sub { $::IN_BUILD_MODE->{connection} = $_[1]; 0 },
1905 tooltip => "Enter the connection ID here. The connection ID connects actors like a lever to a gate or a magic ear to a gate"
1906 );
1907 }
1908
1909 $vb->add (my $hb = new CFPlus::UI::HBox expand => 1);
1910 $hb->add (new CFPlus::UI::Button
1911 text => "Close",
1912 expand => 1,
1913 on_activate => sub { $dialog->hide; 0 },
1914 );
1915 $dialog->show;
1916}
1917
1787sub video_shutdown { 1918sub video_shutdown {
1788 CFPlus::OpenGL::shutdown; 1919 CFPlus::OpenGL::shutdown;
1789 1920
1790 undef $SDL_ACTIVE; 1921 undef $SDL_ACTIVE;
1791} 1922}
… …
1822 CFPlus::Mix_AllocateChannels 8; 1953 CFPlus::Mix_AllocateChannels 8;
1823 CFPlus::MixMusic::volume $CFG->{bgm_volume} * 128; 1954 CFPlus::MixMusic::volume $CFG->{bgm_volume} * 128;
1824 1955
1825 audio_music_finished; 1956 audio_music_finished;
1826 1957
1958 local $_;
1827 while (<$fh>) { 1959 while (<$fh>) {
1828 next if /^\s*#/; 1960 next if /^\s*#/;
1829 next if /^\s*$/; 1961 next if /^\s*$/;
1830 1962
1831 my ($file, $volume, $event) = split /\s+/, $_, 3; 1963 my ($file, $volume, $event) = split /\s+/, $_, 3;
… …
1916 }, 2048 },
1917 CFPlus::SDL_VIDEOEXPOSE => sub { 2049 CFPlus::SDL_VIDEOEXPOSE => sub {
1918 CFPlus::UI::full_refresh; 2050 CFPlus::UI::full_refresh;
1919 }, 2051 },
1920 CFPlus::SDL_ACTIVEEVENT => sub { 2052 CFPlus::SDL_ACTIVEEVENT => sub {
1921# 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;
1922 }, 2058 },
1923 CFPlus::SDL_KEYDOWN => sub { 2059 CFPlus::SDL_KEYDOWN => sub {
1924 if ($_[0]{mod} & CFPlus::KMOD_ALT && $_[0]{sym} == 13) { 2060 if ($_[0]{mod} & CFPlus::KMOD_ALT && $_[0]{sym} == 13) {
1925 # alt-enter 2061 # alt-enter
1926 $FULLSCREEN_ENABLE->toggle; 2062 $FULLSCREEN_ENABLE->toggle;
… …
1947 2083
1948$SIG{INT} = $SIG{TERM} = sub { exit }; 2084$SIG{INT} = $SIG{TERM} = sub { exit };
1949 2085
1950{ 2086{
1951 CFPlus::read_cfg "$Crossfire::VARDIR/cfplusrc"; 2087 CFPlus::read_cfg "$Crossfire::VARDIR/cfplusrc";
2088 CFPlus::DB::Server::run;
2089
1952 CFPlus::UI::set_layout ($::CFG->{layout}); 2090 CFPlus::UI::set_layout ($::CFG->{layout});
1953 2091
1954 my %DEF_CFG = ( 2092 my %DEF_CFG = (
1955 sdl_mode => 0, 2093 sdl_mode => 0,
1956 width => 640, 2094 width => 640,
… …
1965 log_fontsize => 0.7, 2103 log_fontsize => 0.7,
1966 gauge_fontsize => 1, 2104 gauge_fontsize => 1,
1967 gauge_size => 0.35, 2105 gauge_size => 0.35,
1968 stat_fontsize => 0.7, 2106 stat_fontsize => 0.7,
1969 mapsize => 100, 2107 mapsize => 100,
1970 say_command => 'say', 2108 say_command => 'chat',
1971 audio_enable => 1, 2109 audio_enable => 1,
1972 bgm_enable => 1, 2110 bgm_enable => 1,
1973 bgm_volume => 0.25, 2111 bgm_volume => 0.25,
1974 face_prefetch => 0, 2112 face_prefetch => 0,
1975 output_sync => 1, 2113 output_sync => 1,
1976 output_count => 1, 2114 output_count => 1,
2115 output_rate => "",
1977 pickup => 0, 2116 pickup => 0,
1978 inv_sort => "mtime", 2117 inv_sort => "mtime",
1979 default => "profile", # default profile 2118 default => "profile", # default profile
2119 show_tips => 1,
1980 ); 2120 );
1981 2121
1982 while (my ($k, $v) = each %DEF_CFG) { 2122 while (my ($k, $v) = each %DEF_CFG) {
1983 $CFG->{$k} = $v unless exists $CFG->{$k}; 2123 $CFG->{$k} = $v unless exists $CFG->{$k};
1984 } 2124 }
1985 2125
1986 $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 }
1987 2140
1988 sdl_init; 2141 sdl_init;
1989 2142
1990 @SDL_MODES = reverse 2143 @SDL_MODES = reverse
1991 grep $_->[0] >= 640 && $_->[1] >= 480, 2144 grep $_->[0] >= 640 && $_->[1] >= 480,
… …
2028# } 2181# }
2029# my $t2 = Time::HiRes::time; 2182# my $t2 = Time::HiRes::time;
2030# warn $t2-$t1; 2183# warn $t2-$t1;
2031# } 2184# }
2032 2185
2186 $startup_done->();
2187
2033 video_init; 2188 video_init;
2034 audio_init; 2189 audio_init;
2035} 2190}
2191
2192show_tip_of_the_day if $CFG->{show_tips};
2036 2193
2037Event::loop; 2194Event::loop;
2038#CFPlus::SDL_Quit; 2195#CFPlus::SDL_Quit;
2039#CFPlus::_exit 0; 2196#CFPlus::_exit 0;
2040 2197

Diff Legend

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