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.114 by root, Mon Aug 14 01:21:02 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.1';
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,
415
416 client => "cfplus $CFPlus::VERSION $] $^O",
371 417
372 map_widget => $MAPWIDGET, 418 map_widget => $MAPWIDGET,
373 logview => $LOGVIEW, 419 logview => $LOGVIEW,
374 statusbox => $STATUSBOX, 420 statusbox => $STATUSBOX,
375 map => $MAP, 421 map => $MAP,
… …
402sub stop_game { 448sub stop_game {
403 $LOGIN_BUTTON->set_text ("Login"); 449 $LOGIN_BUTTON->set_text ("Login");
404 $SETUP_NOTEBOOK->set_current_page ($SETUP_SERVER); 450 $SETUP_NOTEBOOK->set_current_page ($SETUP_SERVER);
405 $SETUP_DIALOG->show; 451 $SETUP_DIALOG->show;
406 $PL_WINDOW->hide; 452 $PL_WINDOW->hide;
407 $SPELL_PAGE->clear_spells; 453 $SPELL_LIST->clear_spells;
408 454
409 return unless $CONN; 455 return unless $CONN;
410 456
411 status "connection closed"; 457 status "connection closed";
412 458
… …
420sub graphics_setup { 466sub graphics_setup {
421 my $vbox = new CFPlus::UI::VBox; 467 my $vbox = new CFPlus::UI::VBox;
422 468
423 $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]);
424 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
425 $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");
426 $table->add (1, 0, my $hbox = new CFPlus::UI::HBox); 479 $table->add (1, $row++, my $hbox = new CFPlus::UI::HBox);
427 480
428 $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]);
429 $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");
430 483
431 $mode_slider->connect (changed => sub { 484 $mode_slider->connect (changed => sub {
… …
433 486
434 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value; 487 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value;
435 $mode_label->set_text (sprintf "%dx%d", @{$SDL_MODES[$value]}); 488 $mode_label->set_text (sprintf "%dx%d", @{$SDL_MODES[$value]});
436 }); 489 });
437 $mode_slider->emit (changed => $mode_slider->{range}[0]); 490 $mode_slider->emit (changed => $mode_slider->{range}[0]);
438
439 my $row = 1;
440 491
441 $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");
442 $table->add (1, $row++, $FULLSCREEN_ENABLE = new CFPlus::UI::CheckBox 493 $table->add (1, $row++, $FULLSCREEN_ENABLE = new CFPlus::UI::CheckBox
443 state => $CFG->{fullscreen}, 494 state => $CFG->{fullscreen},
444 tooltip => "Bring the client into fullscreen mode.", 495 tooltip => "Bring the client into fullscreen mode.",
… …
639 $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 });
640 $table->add (0, 2, new CFPlus::UI::Label text => "Show FPS"); 691 $table->add (0, 2, new CFPlus::UI::Label text => "Show FPS");
641 $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 });
642 $table->add (0, 3, new CFPlus::UI::Label text => "Suppress Tooltips"); 693 $table->add (0, 3, new CFPlus::UI::Label text => "Suppress Tooltips");
643 $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" } );
644 696
645 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);
646 698
647 for my $x (0..2) { 699 for my $x (0..2) {
648 for my $y (0 .. 2) { 700 for my $y (0 .. 2) {
… …
652 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 },
653 ); 705 );
654 } 706 }
655 } 707 }
656 708
709 $table->add (0, 5, new CFPlus::UI::TextEdit text => "line1\0152\0153");#d#
657 710
658 $table 711 $table
659} 712}
660 713
661sub stats_window { 714sub stats_window {
… …
830 883
831 my $table = $METASERVER->{table}; 884 my $table = $METASERVER->{table};
832 $table->clear; 885 $table->clear;
833 $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...");
834 887
835 my $buf; 888 my $ok = 0;
836 889
837 my $fh = new IO::Socket::INET PeerHost => $META_SERVER, Blocking => 0; 890 CFPlus::background {
891 my $ua = CFPlus::lwp_useragent;
838 892
839 unless ($fh) { 893 CFPlus::background_msg CFPlus::from_json +(CFPlus::lwp_check $ua->get ($META_SERVER))->decoded_content;
840 $label->set_text ("unable to contact metaserver: $!"); 894 } sub {
841 return; 895 my ($msg) = @_;
842 } 896 if ($msg) {
843
844 Event->io (fd => $fh, poll => 'r', cb => sub {
845 my $res = sysread $fh, $buf, 8192, length $buf;
846
847 if (!defined $res) {
848 $_[0]->w->cancel;
849 $label->set_text ("error while retrieving server list: $!");
850 } elsif ($res == 0) {
851 $_[0]->w->cancel;
852 status "server list retrieved";
853
854 utf8::decode $buf if utf8::valid $buf;
855
856 $table->clear; 897 $table->clear;
857 898
858 my @tip = ( 899 my @tip = (
859 "The current number of users logged in on the server.", 900 "The current number of users logged in on the server.",
860 "The hostname of the server.", 901 "The hostname of the server.",
… …
870 for 0 .. $#col; 911 for 0 .. $#col;
871 912
872 my @align = qw(1 0 1 1 -1); 913 my @align = qw(1 0 1 1 -1);
873 914
874 my $y = 0; 915 my $y = 0;
875 for my $m (sort { $b->[3] <=> $a->[3] } map [split /\|/], split /\015?\012/, $buf) { 916 for my $m (@{ $msg->{servers} }) {
876 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)};
877 919
878 for ($desc) { 920 for ($desc) {
879 s/<br>/\n/gi; 921 s/<br>/\n/gi;
880 s/<li>/\n· /gi; 922 s/<li>/\n· /gi;
881 s/<.*?>//sgi; 923 s/<.*?>//sgi;
882 s/&/&amp;/g; 924 s/&amp;/&/g;
883 s/</&lt;/g; 925 s/&lt;/</g;
884 s/>/&gt;/g; 926 s/&gt;/>/g;
885 } 927 }
886 928
887 $uptime = sprintf "%dd %02d:%02d:%02d", 929 $uptime = sprintf "%dd %02d:%02d:%02d",
888 (int $m->[8] / 86400), 930 (int $uptime / 86400),
889 (int $m->[8] / 3600) % 24, 931 (int $uptime / 3600) % 24,
890 (int $m->[8] / 60) % 60, 932 (int $uptime / 60) % 60,
891 $m->[8] % 60; 933 $uptime % 60;
892 934
893 $m = [$users, $host, $uptime, $version, $desc]; 935 $m = [$users, $host, $uptime, $version, $desc];
894 936
895 $y++; 937 $y++;
896 938
… …
906 ), 948 ),
907 (new CFPlus::UI::Empty expand => 1), 949 (new CFPlus::UI::Empty expand => 1),
908 ]); 950 ]);
909 951
910 $table->add ($_, $y, new CFPlus::UI::Label 952 $table->add ($_, $y, new CFPlus::UI::Label
953 max_w => $::WIDTH * 0.4,
911 ellipsise => 0, 954 ellipsise => 0,
912 align => $align[$_], 955 align => $align[$_],
913 text => $m->[$_], 956 text => $m->[$_],
914 tooltip => $tip[$_], 957 tooltip => $tip[$_],
958 fg => ($highlight ? [1, 1, 1] : [.7, .7, .7]),
915 can_hover => 1, 959 can_hover => 1,
916 can_events => 1, 960 can_events => 1,
917 fontsize => 0.8) 961 fontsize => 0.8)
918 for 0 .. $#$m; 962 for 0 .. $#$m;
919 } 963 }
964 } else {
965 $ok or $label->set_text ("error while contacting metaserver");
920 } 966 }
921 }); 967 };
968
922} 969}
923 970
924sub metaserver_dialog { 971sub metaserver_dialog {
925 my $vbox = new CFPlus::UI::VBox; 972 my $vbox = new CFPlus::UI::VBox;
926 my $table = new CFPlus::UI::Table; 973 my $table = new CFPlus::UI::Table;
… …
930 title => "Server List", 977 title => "Server List",
931 name => 'metaserver_dialog', 978 name => 'metaserver_dialog',
932 x => 'center', 979 x => 'center',
933 y => 'center', 980 y => 'center',
934 z => 3, 981 z => 3,
982 force_w => $::WIDTH * 0.9,
935 force_h => $::HEIGHT * 0.4, 983 force_h => $::HEIGHT * 0.7,
936 child => $vbox, 984 child => $vbox,
937 has_close_button => 1, 985 has_close_button => 1,
938 table => $table, 986 table => $table,
939 on_visibility_change => sub { 987 on_visibility_change => sub {
940 update_metaserver ($_[0]) if $_[1]; 988 update_metaserver ($_[0]) if $_[1];
… …
1016 . "so only set it if you really need to prefetch images. " 1064 . "so only set it if you really need to prefetch images. "
1017 . "This option can be set and unset any time.", 1065 . "This option can be set and unset any time.",
1018 on_changed => sub { $CFG->{face_prefetch} = $_[1]; 0 }, 1066 on_changed => sub { $CFG->{face_prefetch} = $_[1]; 0 },
1019 ); 1067 );
1020 1068
1021 $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");
1022 $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
1023 text => $CFG->{output_count}, 1080 text => $CFG->{output_count},
1024 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.",
1025 on_changed => sub { $CFG->{output_count} = $_[1]; 0 }, 1082 on_changed => sub { $CFG->{output_count} = $_[1]; 0 },
1026 ); 1083 );
1027 1084
1028 $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");
1029 $table->add (1, 10, new CFPlus::UI::Entry 1086 $table->add (1, 11, new CFPlus::UI::Entry
1030 text => $CFG->{output_sync}, 1087 text => $CFG->{output_sync},
1031 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.",
1032 on_changed => sub { $CFG->{output_sync} = $_[1]; 0 }, 1089 on_changed => sub { $CFG->{output_sync} = $_[1]; 0 },
1033 ); 1090 );
1034 1091
1035 $table->add (1, 11, $LOGIN_BUTTON = new CFPlus::UI::Button 1092 $table->add (1, 12, $LOGIN_BUTTON = new CFPlus::UI::Button
1036 expand => 1, 1093 expand => 1,
1037 align => 0, 1094 align => 0,
1038 text => "Login", 1095 text => "Login",
1039 on_activate => sub { 1096 on_activate => sub {
1040 $CONN ? stop_game 1097 $CONN ? stop_game
1041 : start_game; 1098 : start_game;
1042 0 1099 0
1043 }, 1100 },
1044 ); 1101 );
1045 1102
1046 $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");
1047 $table->add (1, 12, my $saycmd = new CFPlus::UI::Entry 1104 $table->add (1, 13, my $saycmd = new CFPlus::UI::Entry
1048 text => $CFG->{say_command}, 1105 text => $CFG->{say_command},
1049 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. "
1050 . "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. "
1051 . "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.",
1052 on_changed => sub { 1109 on_changed => sub {
1053 my ($self, $value) = @_; 1110 my ($self, $value) = @_;
1054 $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;
1055 0 1123 0
1056 } 1124 }
1057 ); 1125 );
1058 1126
1059 $vbox->add (new CFPlus::UI::FancyFrame 1127 $vbox->add (new CFPlus::UI::FancyFrame
… …
1123 window => $window, 1191 window => $window,
1124 input => $input, 1192 input => $input,
1125 }; 1193 };
1126 1194
1127 $window 1195 $window
1128}
1129
1130sub open_string_query {
1131 my $cb = $_[1];
1132 my $dialog = new CFPlus::UI::Toplevel
1133 x => "center",
1134 y => "center",
1135 z => 50,
1136 force_w => $WIDTH * 4/5,
1137 title => $_[0];
1138
1139 $dialog->add (
1140 my $e = new CFPlus::UI::Entry
1141 on_activate => sub { $cb->(@_); $dialog->hide; 0 },
1142 on_key_down => sub { $_[1]->{sym} == 27 and $dialog->hide; 0 },
1143 );
1144
1145 $e->grab_focus;
1146 $dialog->show;
1147}
1148
1149sub open_quit_dialog {
1150 unless ($QUIT_DIALOG) {
1151 $QUIT_DIALOG = new CFPlus::UI::Toplevel
1152 x => "center",
1153 y => "center",
1154 z => 50,
1155 title => "Really Quit?",
1156 on_key_down => sub {
1157 my ($dialog, $ev) = @_;
1158 $ev->{sym} == 27 and $dialog->hide;
1159 }
1160 ;
1161
1162 $QUIT_DIALOG->add (my $vb = new CFPlus::UI::VBox expand => 1);
1163
1164 $vb->add (new CFPlus::UI::Label
1165 text => "You should find a savebed and apply it first!",
1166 max_w => $WIDTH * 0.25,
1167 ellipsize => 0,
1168 );
1169 $vb->add (my $hb = new CFPlus::UI::HBox expand => 1);
1170 $hb->add (new CFPlus::UI::Button
1171 text => "Ok",
1172 expand => 1,
1173 on_activate => sub { $QUIT_DIALOG->hide; 0 },
1174 );
1175 $hb->add (new CFPlus::UI::Button
1176 text => "Quit anyway",
1177 expand => 1,
1178 on_activate => sub { exit },
1179 );
1180 }
1181
1182 $QUIT_DIALOG->show;
1183 $QUIT_DIALOG->grab_focus;
1184} 1196}
1185 1197
1186sub autopickup_setup { 1198sub autopickup_setup {
1187 my $table = new CFPlus::UI::Table; 1199 my $table = new CFPlus::UI::Table;
1188 1200
… …
1206 ["Boots" => PICKUP_BOOTS], 1218 ["Boots" => PICKUP_BOOTS],
1207 ["Gloves" => PICKUP_GLOVES], 1219 ["Gloves" => PICKUP_GLOVES],
1208 ["Cloaks" => PICKUP_CLOAK], 1220 ["Cloaks" => PICKUP_CLOAK],
1209 ], 1221 ],
1210 1222
1211 ["Readables", 2, 2, 1223 ["Readables", 2, 0,
1212 ["Spellbooks" => PICKUP_SPELLBOOK], 1224 ["Spellbooks" => PICKUP_SPELLBOOK],
1213 ["Skillscrolls" => PICKUP_SKILLSCROLL], 1225 ["Skillscrolls" => PICKUP_SKILLSCROLL],
1214 ["Normal Books/Scrolls" => PICKUP_READABLES], 1226 ["Normal Books/Scrolls" => PICKUP_READABLES],
1215 ], 1227 ],
1216 ["Misc", 2, 7, 1228 ["Misc", 2, 5,
1217 ["Food" => PICKUP_FOOD], 1229 ["Food" => PICKUP_FOOD],
1218 ["Drinks" => PICKUP_DRINK], 1230 ["Drinks" => PICKUP_DRINK],
1219 ["Valuables (Money, Gems)" => PICKUP_VALUABLES], 1231 ["Valuables (Money, Gems)" => PICKUP_VALUABLES],
1220 ["Keys" => PICKUP_KEY], 1232 ["Keys" => PICKUP_KEY],
1221 ["Magical Items" => PICKUP_MAGICAL], 1233 ["Magical Items" => PICKUP_MAGICAL],
1222 ["Potions" => PICKUP_POTION], 1234 ["Potions" => PICKUP_POTION],
1223 ["Magic Devices" => PICKUP_MAGIC_DEVICE], 1235 ["Magic Devices" => PICKUP_MAGIC_DEVICE],
1224 ["Ignore cursed" => PICKUP_NOT_CURSED], 1236 ["Ignore cursed" => PICKUP_NOT_CURSED],
1225 ["Jewelery" => PICKUP_JEWELS], 1237 ["Jewelery" => PICKUP_JEWELS],
1238 ["Flesh" => PICKUP_FLESH],
1226 ], 1239 ],
1227 ["Weight/Value ratio", 2, 17] 1240 ["Weight/Value ratio", 2, 17]
1228 ) 1241 )
1229 { 1242 {
1230 my ($title, $x, $y, @bits) = @$_; 1243 my ($title, $x, $y, @bits) = @$_;
… …
1280 $table 1293 $table
1281} 1294}
1282 1295
1283my %SORT_ORDER = ( 1296my %SORT_ORDER = (
1284 type => undef, 1297 type => undef,
1285 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
1286 ($a->{flags} & F_LOCKED) <=> ($b->{flags} & F_LOCKED) 1304 ($a->{flags} & F_LOCKED) <=> ($b->{flags} & F_LOCKED)
1287 or $b->{mtime} <=> $a->{mtime} 1305 or $btime <=> $atime
1288 or $a->{type} <=> $b->{type} 1306 or $a->{type} <=> $b->{type}
1307 } @_
1289 } @_ }, 1308 },
1290 weight => sub { sort { 1309 weight => sub { sort {
1291 $a->{weight} * ($a->{nrof} || 1) <=> $b->{weight} * ($b->{nrof} || 1) 1310 $a->{weight} * ($a->{nrof} || 1) <=> $b->{weight} * ($b->{nrof} || 1)
1292 or $a->{type} <=> $b->{type} 1311 or $a->{type} <=> $b->{type}
1293 } @_ }, 1312 } @_ },
1294); 1313);
… …
1319 #TODO# update to weigh/maxweight 1338 #TODO# update to weigh/maxweight
1320 $hb1->add ($STATWIDS->{i_weight} = new CFPlus::UI::Label align => -1); 1339 $hb1->add ($STATWIDS->{i_weight} = new CFPlus::UI::Label align => -1);
1321 1340
1322 $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);
1323 $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}});
1324 1344
1325 $hb->add (my $vb2 = new CFPlus::UI::VBox); 1345 $hb->add (my $vb2 = new CFPlus::UI::VBox);
1326 1346
1327 $vb2->add ($INV_RIGHT_HB = new CFPlus::UI::HBox); 1347 $vb2->add ($INV_RIGHT_HB = new CFPlus::UI::HBox);
1328 1348
… …
1368 $ntb->add ( 1388 $ntb->add (
1369 "Skills (F3)" => $SKILL_PAGE = skill_window, 1389 "Skills (F3)" => $SKILL_PAGE = skill_window,
1370 "Shows all your Skills." 1390 "Shows all your Skills."
1371 ); 1391 );
1372 1392
1373 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);
1374 $spellsw->add ($SPELL_PAGE = new CFPlus::UI::SpellList); 1394 $spellsw->add ($SPELL_LIST = new CFPlus::UI::SpellList);
1375 $ntb->add ( 1395 $ntb->add (
1376 "Spellbook (F4)" => $spellsw, 1396 "Spellbook (F4)" => $spellsw,
1377 "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."
1378 ); 1398 );
1379 $ntb->add ( 1399 $ntb->add (
… …
1386 1406
1387 $plwin->add ($ntb); 1407 $plwin->add ($ntb);
1388 $plwin 1408 $plwin
1389} 1409}
1390 1410
1391sub update_bindings {
1392 $BIND_UPD_CB->() if $BIND_UPD_CB;
1393}
1394
1395sub keyboard_setup { 1411sub keyboard_setup {
1396 my $binding_list = new CFPlus::UI::VBox; 1412 CFPlus::Macro::keyboard_setup
1397
1398 my $refresh;
1399 $refresh = $BIND_UPD_CB = sub {
1400 $binding_list->clear ();
1401
1402 for my $mod (keys %{$::CFG->{profile}{default}{bindings}}) {
1403 for my $sym (keys %{$::CFG->{profile}{default}{bindings}{$mod}}) {
1404 my $cmds = $::CFG->{profile}{default}{bindings}{$mod}{$sym};
1405 next unless ref $cmds eq 'ARRAY' and @$cmds > 0;
1406
1407 my $lbl = join "; ", @$cmds;
1408 my $nam = CFPlus::BindingEditor::keycombo_to_name ($mod, $sym);
1409 $binding_list->add (my $hb = new CFPlus::UI::HBox);
1410 $hb->add (new CFPlus::UI::Button
1411 text => "delete",
1412 tooltip => "Deletes the binding",
1413 on_activate => sub {
1414 $binding_list->remove ($hb);
1415 delete $::CFG->{profile}{default}{bindings}{$mod}{$sym};
1416 0
1417 });
1418
1419 $hb->add (new CFPlus::UI::Button
1420 text => "edit",
1421 tooltip => "Edits the binding",
1422 on_activate => sub {
1423 $::BIND_EDITOR->set_binding (
1424 $mod, $sym, $::CFG->{profile}{default}{bindings}{$mod}{$sym},
1425 sub {
1426 my ($nmod, $nsym, $ncmds) = @_;
1427 $::BIND_EDITOR->cfg_unbind ($mod, $sym);
1428 $::BIND_EDITOR->cfg_bind ($nmod, $nsym, $ncmds);
1429 $refresh->();
1430 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1431 $SETUP_DIALOG->show;
1432 },
1433 sub {
1434 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1435 $SETUP_DIALOG->show;
1436 });
1437 $::BIND_EDITOR->show;
1438 $SETUP_DIALOG->hide;
1439 0
1440 });
1441
1442 $hb->add (new CFPlus::UI::Label text => "(Key: $nam)");
1443 $hb->add (new CFPlus::UI::Label text => $lbl, expand => 1);
1444 }
1445 }
1446 };
1447
1448 my $vb = new CFPlus::UI::VBox;
1449 $vb->add (new CFPlus::UI::FancyFrame
1450 label => "Options",
1451 child => (my $hb = new CFPlus::UI::HBox),
1452 );
1453 $hb->add (new CFPlus::UI::Label text => "only shift-up stops fire");
1454 $hb->add (new CFPlus::UI::CheckBox
1455 expand => 1,
1456 state => $CFG->{shift_fire_stop},
1457 tooltip => "If this checkbox is enabled you will stop fire only if you stop pressing shift",
1458 on_changed => sub {
1459 my ($cbox, $value) = @_;
1460 $CFG->{shift_fire_stop} = $value;
1461 0
1462 });
1463
1464 $vb->add (new CFPlus::UI::FancyFrame
1465 label => "Bindings",
1466 child => $binding_list);
1467 $vb->add (my $hb = new CFPlus::UI::HBox);
1468
1469 $hb->add (new CFPlus::UI::Button
1470 text => "record new",
1471 expand => 1,
1472 tooltip => "This button opens the binding editor with an empty binding.",
1473 on_activate => sub {
1474 $::BIND_EDITOR->set_binding (undef, undef, [],
1475 sub {
1476 my ($mod, $sym, $cmds) = @_;
1477 $::BIND_EDITOR->cfg_bind ($mod, $sym, $cmds);
1478 $refresh->();
1479 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1480 $SETUP_DIALOG->show;
1481 },
1482 sub {
1483 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1484 $SETUP_DIALOG->show;
1485 },
1486 );
1487 $SETUP_DIALOG->hide;
1488 $::BIND_EDITOR->show;
1489 0
1490 },
1491 );
1492
1493 $hb->add (new CFPlus::UI::Button
1494 text => "close",
1495 tooltip => "Closes the binding window",
1496 expand => 1,
1497 on_activate => sub {
1498 $SETUP_DIALOG->hide;
1499 0
1500 }
1501 );
1502
1503 $refresh->();
1504
1505 $vb
1506} 1413}
1507 1414
1508sub help_window { 1415sub help_window {
1509 my $win = new CFPlus::UI::Toplevel 1416 my $win = new CFPlus::UI::Toplevel
1510 x => 'center', 1417 x => 'center',
1511 y => 'center', 1418 y => 'center',
1512 z => 2, 1419 z => 4,
1513 name => 'doc_browser', 1420 name => 'doc_browser',
1514 force_w => int $WIDTH * 7/8, 1421 force_w => int $WIDTH * 7/8,
1515 force_h => int $HEIGHT * 7/8, 1422 force_h => int $HEIGHT * 7/8,
1516 title => "Help Browser", 1423 title => "Help Browser",
1517 has_close_button => 1; 1424 has_close_button => 1;
… …
1528 my @history; 1435 my @history;
1529 my @future; 1436 my @future;
1530 my $curnode; 1437 my $curnode;
1531 1438
1532 my $load_node; $load_node = sub { 1439 my $load_node; $load_node = sub {
1533 my ($node) = @_; 1440 my ($node, $para) = @_;
1534 1441
1535 $buttons->clear; 1442 $buttons->clear;
1443
1444 $buttons->add (new CFPlus::UI::Button
1445 text => "⇤",
1446 tooltip => "back to the starting page",
1447 on_activate => sub {
1448 unshift @future, [$curnode, $viewer->current_paragraph] if $curnode;
1449 unshift @future, @history;
1450 @history = ();
1451 $load_node->(@{shift @future});
1452 },
1453 );
1536 1454
1537 if (@history) { 1455 if (@history) {
1538 $buttons->add (new CFPlus::UI::Button 1456 $buttons->add (new CFPlus::UI::Button
1539 text => "⋘", 1457 text => "⋘",
1540 tooltip => "back to <i>" . (CFPlus::asxml CFPlus::Pod::full_path $history[-1]) . "</i>", 1458 tooltip => "back to <i>" . (CFPlus::asxml CFPlus::Pod::full_path $history[-1][0]) . "</i>",
1541 on_activate => sub { 1459 on_activate => sub {
1542 unshift @future, $curnode if $curnode; 1460 unshift @future, [$curnode, $viewer->current_paragraph] if $curnode;
1543 $load_node->(pop @history); 1461 $load_node->(@{pop @history});
1544 }, 1462 },
1545 ); 1463 );
1546 } 1464 }
1547 1465
1548 if (@future) { 1466 if (@future) {
1549 $buttons->add (new CFPlus::UI::Button 1467 $buttons->add (new CFPlus::UI::Button
1550 text => "⋙", 1468 text => "⋙",
1551 tooltip => "forward to <i>" . (CFPlus::asxml CFPlus::Pod::full_path $future[0]) . "</i>", 1469 tooltip => "forward to <i>" . (CFPlus::asxml CFPlus::Pod::full_path $future[0][0]) . "</i>",
1552 on_activate => sub { 1470 on_activate => sub {
1553 push @history, $curnode; 1471 push @history, [$curnode, $viewer->current_paragraph];
1554 $load_node->(shift @future); 1472 $load_node->(@{shift @future});
1555 }, 1473 },
1556 ); 1474 );
1557 } 1475 }
1558 1476
1559 $buttons->add (new CFPlus::UI::Label text => " "); 1477 $buttons->add (new CFPlus::UI::Label text => " ");
… …
1564 for my $node (@path) { 1482 for my $node (@path) {
1565 $buttons->add (new CFPlus::UI::Button 1483 $buttons->add (new CFPlus::UI::Button
1566 text => $node->{kw}[0], 1484 text => $node->{kw}[0],
1567 tooltip => "go to <i>" . (CFPlus::asxml CFPlus::Pod::full_path $node) . "</i>", 1485 tooltip => "go to <i>" . (CFPlus::asxml CFPlus::Pod::full_path $node) . "</i>",
1568 on_activate => sub { 1486 on_activate => sub {
1569 push @history, $curnode if $curnode; @future = (); 1487 push @history, [$curnode, $viewer->current_paragraph] if $curnode; @future = ();
1570 $load_node->($node); 1488 $load_node->($node);
1571 }, 1489 },
1572 ); 1490 );
1573 $buttons->add (new CFPlus::UI::Label text => "/"); 1491 $buttons->add (new CFPlus::UI::Label text => "/");
1574 } 1492 }
… …
1577 1495
1578 $curnode = $node; 1496 $curnode = $node;
1579 1497
1580 $viewer->clear; 1498 $viewer->clear;
1581 $viewer->add_paragraph (CFPlus::Pod::as_paragraphs CFPlus::Pod::section_of $curnode); 1499 $viewer->add_paragraph (CFPlus::Pod::as_paragraphs CFPlus::Pod::section_of $curnode);
1582 $viewer->set_offset (0); 1500 $viewer->scroll_to ($para);
1583 }; 1501 };
1584 1502
1585 $load_node->(CFPlus::Pod::find pod => "mainpage"); 1503 $load_node->(CFPlus::Pod::find pod => "mainpage");
1586 1504
1587 $CFPlus::Pod::goto_document = sub { 1505 $CFPlus::Pod::goto_document = sub {
1588 my (@path) = @_; 1506 my (@path) = @_;
1589 1507
1590 push @history, $curnode if $curnode; @future = (); 1508 push @history, [$curnode, $viewer->current_paragraph] if $curnode; @future = ();
1591 1509
1592 $load_node->(CFPlus::Pod::find @path); 1510 $load_node->((CFPlus::Pod::find @path)[0]);
1593 $win->show; 1511 $win->show;
1594 }; 1512 };
1595 1513
1596 $win 1514 $win
1515}
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;
1597} 1625}
1598 1626
1599sub sdl_init { 1627sub sdl_init {
1600 CFPlus::SDL_Init 1628 CFPlus::SDL_Init
1601 and die "SDL::Init failed!\n"; 1629 and die "SDL::Init failed!\n";
… …
1635 padding => 0, 1663 padding => 0,
1636 z => 100, 1664 z => 100,
1637 force_x => "max", 1665 force_x => "max",
1638 force_y => 0; 1666 force_y => 0;
1639 $DEBUG_STATUS->show; 1667 $DEBUG_STATUS->show;
1640
1641 $BIND_EDITOR = new CFPlus::BindingEditor (x => "max", y => 0);
1642 1668
1643 $STATUSBOX = new CFPlus::UI::Statusbox; 1669 $STATUSBOX = new CFPlus::UI::Statusbox;
1644 $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]);
1645 1671
1646 (new CFPlus::UI::Frame 1672 (new CFPlus::UI::Frame
… …
1747 ); 1773 );
1748 1774
1749 $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,
1750 tooltip => "View Documentation"); 1776 tooltip => "View Documentation");
1751 1777
1778
1752 $BUTTONBAR->add (new CFPlus::UI::Button 1779 $BUTTONBAR->add (new CFPlus::UI::Button
1753 text => "Quit", 1780 text => "Quit",
1754 tooltip => "Terminates the program", 1781 tooltip => "Terminates the program",
1755 on_activate => sub { 1782 on_activate => sub {
1756 if ($CONN) { 1783 if ($CONN) {
… …
1767 } 1794 }
1768 1795
1769 $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]);
1770} 1797}
1771 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
1772sub video_shutdown { 1918sub video_shutdown {
1773 CFPlus::OpenGL::shutdown; 1919 CFPlus::OpenGL::shutdown;
1774 1920
1775 undef $SDL_ACTIVE; 1921 undef $SDL_ACTIVE;
1776} 1922}
… …
1807 CFPlus::Mix_AllocateChannels 8; 1953 CFPlus::Mix_AllocateChannels 8;
1808 CFPlus::MixMusic::volume $CFG->{bgm_volume} * 128; 1954 CFPlus::MixMusic::volume $CFG->{bgm_volume} * 128;
1809 1955
1810 audio_music_finished; 1956 audio_music_finished;
1811 1957
1958 local $_;
1812 while (<$fh>) { 1959 while (<$fh>) {
1813 next if /^\s*#/; 1960 next if /^\s*#/;
1814 next if /^\s*$/; 1961 next if /^\s*$/;
1815 1962
1816 my ($file, $volume, $event) = split /\s+/, $_, 3; 1963 my ($file, $volume, $event) = split /\s+/, $_, 3;
… …
1901 }, 2048 },
1902 CFPlus::SDL_VIDEOEXPOSE => sub { 2049 CFPlus::SDL_VIDEOEXPOSE => sub {
1903 CFPlus::UI::full_refresh; 2050 CFPlus::UI::full_refresh;
1904 }, 2051 },
1905 CFPlus::SDL_ACTIVEEVENT => sub { 2052 CFPlus::SDL_ACTIVEEVENT => sub {
1906# 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;
1907 }, 2058 },
1908 CFPlus::SDL_KEYDOWN => sub { 2059 CFPlus::SDL_KEYDOWN => sub {
1909 if ($_[0]{mod} & CFPlus::KMOD_ALT && $_[0]{sym} == 13) { 2060 if ($_[0]{mod} & CFPlus::KMOD_ALT && $_[0]{sym} == 13) {
1910 # alt-enter 2061 # alt-enter
1911 $FULLSCREEN_ENABLE->toggle; 2062 $FULLSCREEN_ENABLE->toggle;
… …
1932 2083
1933$SIG{INT} = $SIG{TERM} = sub { exit }; 2084$SIG{INT} = $SIG{TERM} = sub { exit };
1934 2085
1935{ 2086{
1936 CFPlus::read_cfg "$Crossfire::VARDIR/cfplusrc"; 2087 CFPlus::read_cfg "$Crossfire::VARDIR/cfplusrc";
2088 CFPlus::DB::Server::run;
2089
1937 CFPlus::UI::set_layout ($::CFG->{layout}); 2090 CFPlus::UI::set_layout ($::CFG->{layout});
1938 2091
1939 my %DEF_CFG = ( 2092 my %DEF_CFG = (
1940 sdl_mode => 0, 2093 sdl_mode => 0,
1941 width => 640, 2094 width => 640,
… …
1950 log_fontsize => 0.7, 2103 log_fontsize => 0.7,
1951 gauge_fontsize => 1, 2104 gauge_fontsize => 1,
1952 gauge_size => 0.35, 2105 gauge_size => 0.35,
1953 stat_fontsize => 0.7, 2106 stat_fontsize => 0.7,
1954 mapsize => 100, 2107 mapsize => 100,
1955 say_command => 'say', 2108 say_command => 'chat',
1956 audio_enable => 1, 2109 audio_enable => 1,
1957 bgm_enable => 1, 2110 bgm_enable => 1,
1958 bgm_volume => 0.25, 2111 bgm_volume => 0.25,
1959 face_prefetch => 0, 2112 face_prefetch => 0,
1960 output_sync => 1, 2113 output_sync => 1,
1961 output_count => 1, 2114 output_count => 1,
2115 output_rate => "",
1962 pickup => 0, 2116 pickup => 0,
1963 inv_sort => "mtime", 2117 inv_sort => "mtime",
1964 default => "profile", # default profile 2118 default => "profile", # default profile
2119 show_tips => 1,
1965 ); 2120 );
1966 2121
1967 while (my ($k, $v) = each %DEF_CFG) { 2122 while (my ($k, $v) = each %DEF_CFG) {
1968 $CFG->{$k} = $v unless exists $CFG->{$k}; 2123 $CFG->{$k} = $v unless exists $CFG->{$k};
1969 } 2124 }
1970 2125
1971 $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 }
1972 2140
1973 sdl_init; 2141 sdl_init;
1974 2142
1975 @SDL_MODES = reverse 2143 @SDL_MODES = reverse
1976 grep $_->[0] >= 640 && $_->[1] >= 480, 2144 grep $_->[0] >= 640 && $_->[1] >= 480,
… …
2013# } 2181# }
2014# my $t2 = Time::HiRes::time; 2182# my $t2 = Time::HiRes::time;
2015# warn $t2-$t1; 2183# warn $t2-$t1;
2016# } 2184# }
2017 2185
2186 $startup_done->();
2187
2018 video_init; 2188 video_init;
2019 audio_init; 2189 audio_init;
2020} 2190}
2191
2192show_tip_of_the_day if $CFG->{show_tips};
2021 2193
2022Event::loop; 2194Event::loop;
2023#CFPlus::SDL_Quit; 2195#CFPlus::SDL_Quit;
2024#CFPlus::_exit 0; 2196#CFPlus::_exit 0;
2025 2197

Diff Legend

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