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.44 by elmex, Fri Jun 2 16:32:12 2006 UTC vs.
Revision 1.63 by root, Wed Jun 7 05:54:09 2006 UTC

… …
25# need to do it again because that pile of garbage called PAR nukes it before main 25# need to do it again because that pile of garbage called PAR nukes it before main
26unshift @INC, $ENV{PAR_TEMP} 26unshift @INC, $ENV{PAR_TEMP}
27 if %PAR::LibCache; 27 if %PAR::LibCache;
28 28
29use Time::HiRes 'time'; 29use Time::HiRes 'time';
30use Pod::POM;
31use Event; 30use Event;
32 31
33use Crossfire; 32use Crossfire;
34use Crossfire::Protocol::Constants; 33use Crossfire::Protocol::Constants;
35 34
… …
39use CFClient::OpenGL (); 38use CFClient::OpenGL ();
40use CFClient::Protocol; 39use CFClient::Protocol;
41use CFClient::UI; 40use CFClient::UI;
42use CFClient::MapWidget; 41use CFClient::MapWidget;
43 42
43$SIG{QUIT} = sub { Carp::cluck "QUIT" };
44
44$Event::DIED = sub { 45$Event::DIED = sub {
45 # TODO: display dialog box or so 46 # TODO: display dialog box or so
47 Carp::confess $_[1];#d#TODO: remove when stable
46 CFClient::error $_[1]; 48 CFClient::error $_[1];
47}; 49};
48 50
49#$SIG{__WARN__} = sub { Carp::cluck $_[0] };#d# 51#$SIG{__WARN__} = sub { Carp::cluck $_[0] };#d#
50 52
… …
82our $CONSOLE; 84our $CONSOLE;
83our $METASERVER; 85our $METASERVER;
84our $LOGIN_BUTTON; 86our $LOGIN_BUTTON;
85our $QUIT_DIALOG; 87our $QUIT_DIALOG;
86our $HOST_ENTRY; 88our $HOST_ENTRY;
87our $SERVER_SETUP;
88 89
90our $SETUP_DIALOG;
91our $SETUP_NOTEBOOK;
92our $SETUP_SERVER;
93our $SETUP_KEYBOARD;
94our $SETUP_SPELLS;
95
96our $STATS_WINDOW;
97our $MESSAGE_WINDOW;
89our $FLOORBOX; 98our $FLOORBOX;
90our $GAUGES; 99our $GAUGES;
91our $STATWIDS; 100our $STATWIDS;
92 101
93our $SDL_ACTIVE; 102our $SDL_ACTIVE;
… …
104our $INV_WINDOW; 113our $INV_WINDOW;
105our $INV; 114our $INV;
106our $INVR; 115our $INVR;
107our $INV_RIGHT_HB; 116our $INV_RIGHT_HB;
108 117
109our $BIND_WINDOW;
110our $BIND_EDITOR; 118our $BIND_EDITOR;
111 119
112our $SPELL_LIST;
113our $PICKUP_CFG; 120our $PICKUP_CFG;
114 121
115sub status { 122sub status {
116 $STATUSBOX->add (CFClient::UI::Label::escape $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]); 123 $STATUSBOX->add (CFClient::UI::Label::escape $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]);
117} 124}
118 125
119sub debug { 126sub debug {
120 $DEBUG_STATUS->set_text ($_[0]); 127 $DEBUG_STATUS->set_text ($_[0]);
121} 128}
122 129
130sub destroy_query_dialog {
131 (delete $_[0]{query_dialog})->destroy
132 if $_[0]{query_dialog};
133}
134
135# server query dialog
136sub server_query {
137 my ($conn, $flags, $prompt) = @_;
138
139 $conn->{query_dialog} = my $dialog = new CFClient::UI::FancyFrame
140 x => "center",
141 y => "center",
142 title => "Server Query",
143 child => my $vbox = new CFClient::UI::VBox,
144 ;
145
146 my @dialog = my $label = new CFClient::UI::Label
147 max_w => $::WIDTH * 0.4,
148 ellipsise => 0,
149 text => $prompt;
150
151 if ($flags & CS_QUERY_YESNO) {
152 push @dialog, my $hbox = new CFClient::UI::HBox;
153
154 $hbox->add (new CFClient::UI::Button
155 text => "No",
156 on_activate => sub {
157 $conn->send ("reply n");
158 $dialog->destroy;
159 }
160 );
161 $hbox->add (new CFClient::UI::Button
162 text => "Yes",
163 on_activate => sub {
164 $conn->send ("reply y");
165 destroy_query_dialog $conn;
166 },
167 );
168
169 $dialog->focus_in;
170
171 } elsif ($flags & CS_QUERY_SINGLECHAR) {
172 $dialog->{tooltip} = "Press a key (click on the entry to make sure it has keyboard focus)";
173
174 if ($prompt =~ /Now choose a character|Press any key for the next race/i) {
175 $MESSAGE_WINDOW->show;
176
177 unshift @dialog, new CFClient::UI::Label
178 max_w => $::WIDTH * 0.4,
179 ellipsise => 0,
180 markup => "\nOr use your keyboard:\n";
181
182 unshift @dialog, my $table = new CFClient::UI::Table;
183
184 $table->add (0, 0, new CFClient::UI::Button
185 text => "Next Race",
186 on_activate => sub {
187 $conn->send ("reply n");
188 destroy_query_dialog $conn;
189 },
190 );
191 $table->add (2, 0, new CFClient::UI::Button
192 text => "Accept",
193 on_activate => sub {
194 $conn->send ("reply d");
195 destroy_query_dialog $conn;
196 },
197 );
198
199 unshift @dialog, new CFClient::UI::Label
200 max_w => $::WIDTH * 0.4,
201 ellipsise => 0,
202 markup =>
203 "<big><b>Character Creation: Race</b></big>\n\n"
204 . "Look at the <b>Messages</b> window to see a description of this race "
205 . "(<small>or hover with your mouse over the bottommost entry in the status area in the lower left area of the screen</small>) "
206 . "and the center of the screen to see how this race looks like "
207 . "(<small>this is below this dialog window, you may need to click on the display area to make it visible</small>).\n\n"
208 . "You can look at another race, or accept this race (you will come back to this race eventually, "
209 . "so you can take your time making this important choice."
210 ;
211
212 } elsif ($prompt =~ /roll new stats/) {
213 if (my $stat = delete $conn->{stat_change_with}) {
214 $conn->send ("reply $stat");
215 destroy_query_dialog $conn;
216 return;
217 }
218
219 $STATS_WINDOW->show;
220 $MESSAGE_WINDOW->hide;
221
222 unshift @dialog, new CFClient::UI::Label
223 max_w => $::WIDTH * 0.4,
224 ellipsise => 0,
225 markup => "\nOr use your keyboard:\n";
226
227 unshift @dialog, my $table = new CFClient::UI::Table;
228
229 # left: re-roll
230 $table->add (0, 0, new CFClient::UI::Button
231 text => "Roll Again",
232 on_activate => sub {
233 $conn->send ("reply y");
234 destroy_query_dialog $conn;
235 },
236 );
237
238 # center: swap stats
239 my ($sw1, $sw2) = map +(new CFClient::UI::Combobox
240 value => $_,
241 options => [
242 [Str => 1, "Strength ($conn->{stat}{+CS_STAT_STR})"],
243 [Dex => 2, "Dexterity ($conn->{stat}{+CS_STAT_DEX})"],
244 [Con => 3, "Constitution ($conn->{stat}{+CS_STAT_CON})"],
245 [Int => 4, "Intelligence ($conn->{stat}{+CS_STAT_INT})"],
246 [Wis => 5, "Wisdom ($conn->{stat}{+CS_STAT_WIS})"],
247 [Pow => 6, "Power ($conn->{stat}{+CS_STAT_POW})"],
248 [Cha => 7, "Charisma ($conn->{stat}{+CS_STAT_CHA})"],
249 ],
250 ), 1 .. 2;
251
252 $table->add (2, 0, new CFClient::UI::Button
253 text => "Swap Stats",
254 on_activate => sub {
255 $conn->{stat_change_with} = $sw2->{value};
256 $conn->send ("reply $sw1->{value}");
257 destroy_query_dialog $conn;
258 },
259 );
260 $table->add (2, 1, new CFClient::UI::HBox children => [$sw1, $sw2]);
261
262 # right: accept
263 $table->add (4, 0, new CFClient::UI::Button
264 text => "Accept",
265 on_activate => sub {
266 $conn->send ("reply n");
267 $STATS_WINDOW->hide;
268 destroy_query_dialog $conn;
269 },
270 );
271
272 unshift @dialog, new CFClient::UI::Label
273 max_w => $::WIDTH * 0.4,
274 ellipsise => 0,
275 markup =>
276 "<big><b>Character Creation: Stats</b></big>\n\n"
277 . "Look at the <b>Stats</b> window to see your basic stats "
278 . "(first column: 1 strength, 2 dexterity, 3 constitution, 4 intelligence, 5 wisdom, 6 power and 7 charisma).\n\n"
279 . "You can create another set of stats, swap two stat values with each other or accept the stats as they are now and continue. "
280 . "Race selection will influence those values later on."
281 ;
282 }
283
284 push @dialog, my $entry = new CFClient::UI::Entry
285 on_changed => sub {
286 $conn->send ("reply $_[1]");
287 destroy_query_dialog $conn;
288 },
289 ;
290
291 $entry->focus_in;
292
293 } else {
294 $dialog->{tooltip} = "Enter the reply and press return (click on the entry to make sure it has keyboard focus)";
295
296 push @dialog, my $entry = new CFClient::UI::Entry
297 $flags & CS_QUERY_HIDEINPUT ? (hidden => "*") : (),
298 on_activate => sub {
299 $conn->send ("reply $_[1]");
300 destroy_query_dialog $conn;
301 },
302 ;
303
304 $entry->focus_in;
305 }
306
307 $vbox->add (@dialog);
308 $dialog->show;
309}
310
123sub start_game { 311sub start_game {
124 status "logging in..."; 312 status "logging in...";
125 313
126 $LOGIN_BUTTON->set_text ("Logout"); 314 $LOGIN_BUTTON->set_text ("Logout");
127 $SERVER_SETUP->hide; 315 $SETUP_DIALOG->hide;
128 316
129 my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32; 317 my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32;
130 318
131 my ($host, $port) = split /:/, $CFG->{host}; 319 my ($host, $port) = split /:/, $CFG->{host};
132 320
… …
144 map_widget => $MAPWIDGET, 332 map_widget => $MAPWIDGET,
145 logview => $LOGVIEW, 333 logview => $LOGVIEW,
146 statusbox => $STATUSBOX, 334 statusbox => $STATUSBOX,
147 map => $MAP, 335 map => $MAP,
148 mapmap => $MAPMAP, 336 mapmap => $MAPMAP,
337 query => \&server_query,
149 338
150 sound_play => sub { 339 sound_play => sub {
151 my ($x, $y, $soundnum, $type) = @_; 340 my ($x, $y, $soundnum, $type) = @_;
152 341
153 $SDL_MIXER 342 $SDL_MIXER
… …
170 } 359 }
171} 360}
172 361
173sub stop_game { 362sub stop_game {
174 $LOGIN_BUTTON->set_text ("Login"); 363 $LOGIN_BUTTON->set_text ("Login");
175 $SERVER_SETUP->show; 364 $SETUP_NOTEBOOK->set_current_page ($SETUP_SERVER);
365 $SETUP_DIALOG->show;
176 $INV_WINDOW->hide; 366 $INV_WINDOW->hide;
177 $LOGVIEW->hide;
178 367
179 return unless $CONN; 368 return unless $CONN;
180 369
181 status "connection closed"; 370 status "connection closed";
182 371
372 destroy_query_dialog $CONN;
183 $CONN->destroy; 373 $CONN->destroy;
184 $CONN = 0; # false, does not autovivify 374 $CONN = 0; # false, does not autovivify
185} 375}
186 376
187sub client_setup { 377sub graphics_setup {
188 my $dialog = new CFClient::UI::FancyFrame
189 x => 1,
190 y => $HEIGHT * (1/8),
191 name => "client_setup",
192 title => "Client Setup",
193 child => (my $vbox = new CFClient::UI::VBox); 378 my $vbox = new CFClient::UI::VBox;
194 379
195 $vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]); 380 $vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]);
196 381
197 $table->add (0, 0, new CFClient::UI::Label valign => 0, align => 1, text => "Video Mode"); 382 $table->add (0, 0, new CFClient::UI::Label valign => 0, align => 1, text => "Video Mode");
198 $table->add (1, 0, my $hbox = new CFClient::UI::HBox); 383 $table->add (1, 0, my $hbox = new CFClient::UI::HBox);
… …
322 on_activate => sub { 507 on_activate => sub {
323 video_shutdown (); 508 video_shutdown ();
324 video_init (); 509 video_init ();
325 } 510 }
326 ); 511 );
512
513 $vbox
514}
515
516sub audio_setup {
517 my $vbox = new CFClient::UI::VBox;
518
519 $vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]);
520
521 my $row = 0;
327 522
328 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Audio Enable"); 523 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Audio Enable");
329 $table->add (1, $row++, new CFClient::UI::CheckBox 524 $table->add (1, $row++, new CFClient::UI::CheckBox
330 state => $CFG->{audio_enable}, 525 state => $CFG->{audio_enable},
331 tooltip => "<b>Master Audio Enable.</b> If enabled, sound effects and music will be played. If disabled, no audio will be used and the soundcard will not be opened.", 526 tooltip => "<b>Master Audio Enable.</b> If enabled, sound effects and music will be played. If disabled, no audio will be used and the soundcard will not be opened.",
… …
362 audio_shutdown (); 557 audio_shutdown ();
363 audio_init (); 558 audio_init ();
364 } 559 }
365 ); 560 );
366 561
367 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Chat Command"); 562 $vbox
368 $table->add (1, $row++, my $saycmd = new CFClient::UI::Entry
369 text => $CFG->{say_command},
370 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. "
371 . "Usually you want to enter something like 'say' or 'shout' or 'gsay' here. "
372 . "But you could also set it to <b>tell <i>playername</i></b> to only chat with that user.",
373 on_changed => sub {
374 my ($self, $value) = @_;
375 $CFG->{say_command} = $value;
376 }
377 );
378
379 $dialog
380} 563}
381 564
382sub set_stats_window_fontsize { 565sub set_stats_window_fontsize {
383 for (values %{$STATWIDS}) { 566 for (values %{$STATWIDS}) {
384 $_->set_fontsize ($::CFG->{stat_fontsize}); 567 $_->set_fontsize ($::CFG->{stat_fontsize});
… …
443 626
444 $win 627 $win
445} 628}
446 629
447 630
448sub make_stats_window { 631sub stats_window {
449 my $tgw = new CFClient::UI::FancyFrame 632 my $tgw = new CFClient::UI::FancyFrame
450 y => $HEIGHT * (2/8), 633 y => $HEIGHT * (2/8),
451 x => "max", 634 x => "max",
452 title => "Stats", 635 title => "Stats",
453 name => "stats_window"; 636 name => "stats_window";
… …
557 update_stats_window ({}); 740 update_stats_window ({});
558 741
559 $tgw 742 $tgw
560} 743}
561 744
562sub formsep { 745sub formsep($) {
563 reverse join ",", grep length, split /(...)/, reverse $_[0] * 1 746 scalar reverse join ",", unpack "(A3)*", reverse $_[0] * 1
564} 747}
565 748
566sub update_stats_window { 749sub update_stats_window {
567 my ($stats) = @_; 750 my ($stats) = @_;
568 751
… …
663 846
664 utf8::decode $buf if utf8::valid $buf; 847 utf8::decode $buf if utf8::valid $buf;
665 848
666 $table->clear; 849 $table->clear;
667 850
851 my @tip = (
852 "The current number of users logged in on the server.",
853 "The hostname of the server.",
854 "The time this server has been running without being restarted.",
855 "The server software version - a '+' indicates a Crossfire+ server.",
856 "Short information about this server provided by its admins.",
857 );
668 my @col = qw(Use #Users Host Uptime Version Description); 858 my @col = qw(#Users Host Uptime Version Description);
669 $table->add ($_, 0, new CFClient::UI::Label align => 0, fg => [1, 1, 0], text => $col[$_]) 859 $table->add ($_, 0, new CFClient::UI::Label
860 can_hover => 1, can_events => 1,
861 align => 0, fg => [1, 1, 0],
862 text => $col[$_], tooltip => $tip[$_])
670 for 0 .. $#col; 863 for 0 .. $#col;
671 864
672 my @align = qw(1 0 1 1 -1); 865 my @align = qw(1 0 1 1 -1);
673 866
674 my $y = 0; 867 my $y = 0;
675 for my $m (sort { $b->[3] <=> $a->[3] } map [split /\|/], split /\015?\012/, $buf) { 868 for my $m (sort { $b->[3] <=> $a->[3] } map [split /\|/], split /\015?\012/, $buf) {
… …
692 885
693 $m = [$users, $host, $uptime, $version, $desc]; 886 $m = [$users, $host, $uptime, $version, $desc];
694 887
695 $y++; 888 $y++;
696 889
697 $table->add (0, $y, new CFClient::UI::VBox children => [ 890 $table->add (scalar @$m, $y, new CFClient::UI::VBox children => [
698 (new CFClient::UI::Button text => "Use", on_activate => sub { 891 (new CFClient::UI::Button
892 text => "Use",
893 tooltip => "Put this server into the <b>Host:Port</b> field",
894 on_activate => sub {
699 $HOST_ENTRY->set_text ($CFG->{host} = $host); 895 $HOST_ENTRY->set_text ($CFG->{host} = $host);
700 $METASERVER->toggle_visibility; 896 $METASERVER->hide;
897 },
701 }), 898 ),
702 (new CFClient::UI::Empty expand => 1), 899 (new CFClient::UI::Empty expand => 1),
703 ]); 900 ]);
704 901
705 $table->add ($_ + 1, $y, new CFClient::UI::Label 902 $table->add ($_, $y, new CFClient::UI::Label
706 ellipsise => 0, align => $align[$_], text => $m->[$_], fontsize => 0.8) 903 ellipsise => 0,
904 align => $align[$_],
905 text => $m->[$_],
906 tooltip => $tip[$_],
907 can_hover => 1,
908 can_events => 1,
909 fontsize => 0.8)
707 for 0 .. $#$m; 910 for 0 .. $#$m;
708 } 911 }
709 } 912 }
710 }); 913 });
711} 914}
712 915
713sub metaserver_dialog { 916sub metaserver_dialog {
714 my $dialog = new CFClient::UI::FancyFrame 917 my $dialog = new CFClient::UI::FancyFrame
715 title => "Server List", 918 title => "Server List",
716 name => 'metaserver_dialog', 919 name => 'metaserver_dialog',
717 x => 'center', 920 x => 'center',
718 y => 'center', 921 y => 'center',
922 z => 3,
923 force_h => $::HEIGHT * 0.4,
719 child => (my $vbox = new CFClient::UI::VBox), 924 child => (my $vbox = new CFClient::UI::VBox),
720 on_visibility_change => sub { 925 on_visibility_change => sub {
721 update_metaserver if $_[1]; 926 update_metaserver if $_[1];
722 }, 927 },
723 ; 928 ;
724 929
725 $vbox->add ($dialog->{table} = new CFClient::UI::Table); 930 $dialog->{table} = new CFClient::UI::Table;
931
932 $vbox->add (new CFClient::UI::ScrolledWindow expand => 1, child => $dialog->{table});
726 933
727 $dialog 934 $dialog
728} 935}
729 936
730sub server_setup { 937sub server_setup {
731 my $dialog = $SERVER_SETUP = new CFClient::UI::FancyFrame
732 x => "center",
733 y => "center",
734 name => "server_setup",
735 title => "Server Setup",
736 child => (my $vbox = new CFClient::UI::VBox), 938 my $vbox = new CFClient::UI::VBox;
737 ;
738 939
739 $vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]); 940 $vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]);
740 $table->add (0, 2, new CFClient::UI::Label valign => 0, align => 1, text => "Host:Port"); 941 $table->add (0, 2, new CFClient::UI::Label valign => 0, align => 1, text => "Host:Port");
741 942
742 { 943 {
… …
759 expand => 1, 960 expand => 1,
760 text => "Server List", 961 text => "Server List",
761 other => $METASERVER, 962 other => $METASERVER,
762 tooltip => "Show a list of available crossfire servers", 963 tooltip => "Show a list of available crossfire servers",
763 on_activate => sub { $METASERVER->toggle_visibility }, 964 on_activate => sub { $METASERVER->toggle_visibility },
965 on_visibility_change => sub { $METASERVER->hide unless $_[1] },
764 ); 966 );
765 } 967 }
766 968
767 $table->add (0, 4, new CFClient::UI::Label valign => 0, align => 1, text => "Username"); 969 $table->add (0, 4, new CFClient::UI::Label valign => 0, align => 1, text => "Username");
768 $table->add (1, 4, new CFClient::UI::Entry 970 $table->add (1, 4, new CFClient::UI::Entry
… …
835 $CONN ? stop_game 1037 $CONN ? stop_game
836 : start_game; 1038 : start_game;
837 }, 1039 },
838 ); 1040 );
839 1041
840 $dialog 1042 $table->add (0, 12, new CFClient::UI::Label valign => 0, align => 1, text => "Chat Command");
1043 $table->add (1, 12, my $saycmd = new CFClient::UI::Entry
1044 text => $CFG->{say_command},
1045 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. "
1046 . "Usually you want to enter something like 'say' or 'shout' or 'gsay' here. "
1047 . "But you could also set it to <b>tell <i>playername</i></b> to only chat with that user.",
1048 on_changed => sub {
1049 my ($self, $value) = @_;
1050 $CFG->{say_command} = $value;
1051 }
1052 );
1053
1054 $vbox
841} 1055}
842 1056
843sub message_window { 1057sub message_window {
844 my $window = new CFClient::UI::FancyFrame 1058 my $window = new CFClient::UI::FancyFrame
845 name => "message_window", 1059 name => "message_window",
846 title => "Messages", 1060 title => "Messages",
847 border_bg => [1, 1, 1, 1], 1061 border_bg => [1, 1, 1, 1],
848 bg => [0, 0, 0, 0.75], 1062 bg => [0, 0, 0, 0.75],
849 x => "max", 1063 x => "max",
850 y => 0, 1064 y => 0,
851 force_w => $::WIDTH / 3, 1065 force_w => $::WIDTH * 0.4,
852 force_h => $::HEIGHT / 5, 1066 force_h => $::HEIGHT * 0.5,
853 child => (my $vbox = new CFClient::UI::VBox); 1067 child => (my $vbox = new CFClient::UI::VBox);
854 1068
855 $vbox->add ($LOGVIEW); 1069 $vbox->add ($LOGVIEW);
856 1070
857 $vbox->add (my $input = new CFClient::UI::Entry 1071 $vbox->add (my $input = new CFClient::UI::Entry
… …
871 }, 1085 },
872 on_activate => sub { 1086 on_activate => sub {
873 my ($input, $text) = @_; 1087 my ($input, $text) = @_;
874 $input->set_text (''); 1088 $input->set_text ('');
875 1089
876 if ($text =~ /^\/bind\s+(.*)$/) {
877 CFClient::Binder::open_binding_dialog (sub {
878 my ($mod, $sym) = @_;
879 $::CFG->{bindings}->{$mod}->{$sym} = [$1];
880 });
881 } elsif ($text =~ /^\/(.*)/) { 1090 if ($text =~ /^\/(.*)/) {
882 $::CONN->user_send ($1); 1091 $::CONN->user_send ($1);
883 } else { 1092 } else {
884 my $say_cmd = $::CFG->{say_command} || 'say'; 1093 my $say_cmd = $::CFG->{say_command} || 'say';
885 $::CONN->user_send ("$say_cmd $text"); 1094 $::CONN->user_send ("$say_cmd $text");
886 } 1095 }
… …
905sub open_quit_dialog { 1114sub open_quit_dialog {
906 unless ($QUIT_DIALOG) { 1115 unless ($QUIT_DIALOG) {
907 $QUIT_DIALOG = new CFClient::UI::FancyFrame 1116 $QUIT_DIALOG = new CFClient::UI::FancyFrame
908 x => "center", 1117 x => "center",
909 y => "center", 1118 y => "center",
1119 z => 50,
910 title => "Really Quit?", 1120 title => "Really Quit?",
911 ; 1121 ;
912 1122
913 $QUIT_DIALOG->add (my $vb = new CFClient::UI::VBox expand => 1); 1123 $QUIT_DIALOG->add (my $vb = new CFClient::UI::VBox expand => 1);
914 1124
… …
931 } 1141 }
932 1142
933 $QUIT_DIALOG->show; 1143 $QUIT_DIALOG->show;
934} 1144}
935 1145
936sub make_pickup_cfg_window { 1146sub autopickup_setup {
937 $PICKUP_CFG = new CFClient::UI::FancyFrame
938 title => "Autopickup configuration",
939 x => "center",
940 y => "center",
941 force_w => $WIDTH * 3/10,
942 force_h => $HEIGHT * 9/10;
943
944 my $tbl = new CFClient::UI::Table; 1147 my $table = new CFClient::UI::Table;
945 my $tblrow = 0;
946
947 $PICKUP_CFG->add (my $sw = new CFClient::UI::ScrolledWindow scrolled => $tbl, expand => 1);
948 1148
949 for ( 1149 for (
950 ["Enable (new) autopickup" => CFClient::Pickup::PU_NEWMODE], 1150 ["General", 0, 0,
1151 ["Enable autopickup" => PICKUP_NEWMODE],
951 ["Inhibit autopickup" => CFClient::Pickup::PU_INHIBIT], 1152 ["Inhibit autopickup" => PICKUP_INHIBIT],
952 ["Stop before pickup" => CFClient::Pickup::PU_STOP], 1153 ["Stop before pickup" => PICKUP_STOP],
953 ["Debug autopickup" => CFClient::Pickup::PU_DEBUG], 1154 ["Debug autopickup" => PICKUP_DEBUG],
1155 ],
954 ["Weapons"], 1156 ["Weapons", 0, 6,
955 ["All weapons" => CFClient::Pickup::PU_ALLWEAPON], 1157 ["All weapons" => PICKUP_ALLWEAPON],
956 ["Missile weapons" => CFClient::Pickup::PU_MISSILEWEAPON], 1158 ["Missile weapons" => PICKUP_MISSILEWEAPON],
957 ["Bows" => CFClient::Pickup::PU_BOW], 1159 ["Bows" => PICKUP_BOW],
958 ["Arrows" => CFClient::Pickup::PU_ARROW], 1160 ["Arrows" => PICKUP_ARROW],
1161 ],
959 ["Armour"], 1162 ["Armour", 0, 12,
960 ["Helmets" => CFClient::Pickup::PU_HELMET], 1163 ["Helmets" => PICKUP_HELMET],
961 ["Shields" => CFClient::Pickup::PU_SHIELD], 1164 ["Shields" => PICKUP_SHIELD],
962 ["Body Armour" => CFClient::Pickup::PU_ARMOUR], 1165 ["Body Armour" => PICKUP_ARMOUR],
963 ["Boots" => CFClient::Pickup::PU_BOOTS], 1166 ["Boots" => PICKUP_BOOTS],
964 ["Gloves" => CFClient::Pickup::PU_GLOVES], 1167 ["Gloves" => PICKUP_GLOVES],
965 ["Cloaks" => CFClient::Pickup::PU_CLOAK], 1168 ["Cloaks" => PICKUP_CLOAK],
1169 ],
1170
966 ["Readables"], 1171 ["Readables", 2, 2,
967 ["Spellbooks" => CFClient::Pickup::PU_SPELLBOOK], 1172 ["Spellbooks" => PICKUP_SPELLBOOK],
968 ["Skillscrolls" => CFClient::Pickup::PU_SKILLSCROLL], 1173 ["Skillscrolls" => PICKUP_SKILLSCROLL],
969 ["Normal Books/Scrolls" => CFClient::Pickup::PU_READABLES], 1174 ["Normal Books/Scrolls" => PICKUP_READABLES],
1175 ],
970 ["Misc"], 1176 ["Misc", 2, 7,
971 ["Food" => CFClient::Pickup::PU_FOOD], 1177 ["Food" => PICKUP_FOOD],
972 ["Drinks" => CFClient::Pickup::PU_DRINK], 1178 ["Drinks" => PICKUP_DRINK],
973 ["Valuables (Money, Gems)" => CFClient::Pickup::PU_VALUABLES], 1179 ["Valuables (Money, Gems)" => PICKUP_VALUABLES],
974 ["Keys" => CFClient::Pickup::PU_KEY], 1180 ["Keys" => PICKUP_KEY],
975 ["Magical Items" => CFClient::Pickup::PU_MAGICAL], 1181 ["Magical Items" => PICKUP_MAGICAL],
976 ["Potions" => CFClient::Pickup::PU_POTION], 1182 ["Potions" => PICKUP_POTION],
977 ["Magic Devices" => CFClient::Pickup::PU_MAGIC_DEVICE], 1183 ["Magic Devices" => PICKUP_MAGIC_DEVICE],
978 ["Ignore cursed" => CFClient::Pickup::PU_NOT_CURSED], 1184 ["Ignore cursed" => PICKUP_NOT_CURSED],
979 ["Jewelery" => CFClient::Pickup::PU_JEWELS], 1185 ["Jewelery" => PICKUP_JEWELS],
1186 ],
980 ) 1187 )
981 { 1188 {
982 unless (defined $_->[1]) { 1189 my ($title, $x, $y, @bits) = @$_;
983 $tbl->add (0, $tblrow++, new CFClient::UI::Label text => $_->[0], align => 0); 1190 $table->add ($x, $y, new CFClient::UI::Label text => $title, align => 1, fg => [1, 1, 0]);
984 } else { 1191
1192 for (@bits) {
1193 ++$y;
1194
985 my $mask = $_->[1]; 1195 my $mask = $_->[1];
986 $tbl->add (0, $tblrow, new CFClient::UI::Label text => $_->[0], align => -1); 1196 $table->add ($x , $y, new CFClient::UI::Label text => $_->[0], align => 1, expand => 1);
987 $tbl->add (1, $tblrow++, new CFClient::UI::CheckBox 1197 $table->add ($x+1, $y, new CFClient::UI::CheckBox
988 state => $CFG->{pickup} & $mask, 1198 state => $CFG->{pickup} & $mask,
989 on_changed => sub { 1199 on_changed => sub {
990 my ($box, $value) = @_; 1200 my ($box, $value) = @_;
1201
991 if ($value) { 1202 if ($value) {
992 $CFG->{pickup} |= $mask; 1203 $::CFG->{pickup} |= $mask;
993 } else { 1204 } else {
994 $CFG->{pickup} = $CFG->{pickup} & ~$mask; 1205 $::CFG->{pickup} &= ~$mask;
995 } 1206 }
1207
996 $::CONN->send (sprintf "command pickup %u", $CFG->{pickup}); 1208 $::CONN->send_command ("pickup $::CFG->{pickup}")
1209 if defined $::CONN;
997 }); 1210 });
998 } 1211 }
999 } 1212 }
1000 1213
1001 $PICKUP_CFG 1214 $table
1002} 1215}
1003 1216
1004sub make_inventory_window { 1217sub inventory_window {
1005 my $invwin = $INV_WINDOW = new CFClient::UI::FancyFrame 1218 my $invwin = $INV_WINDOW = new CFClient::UI::FancyFrame
1006 x => "center", 1219 x => "center",
1007 y => "center", 1220 y => "center",
1008 force_w => $WIDTH * 9/10, 1221 force_w => $WIDTH * 9/10,
1009 force_h => $HEIGHT * 9/10, 1222 force_h => $HEIGHT * 9/10,
… …
1026 CFClient::Protocol::set_opencont ($::CONN, 0, "Floor"); 1239 CFClient::Protocol::set_opencont ($::CONN, 0, "Floor");
1027 1240
1028 $invwin 1241 $invwin
1029} 1242}
1030 1243
1031sub make_spell_list { 1244sub spell_setup {
1032 $SPELL_LIST = new CFClient::UI::SpellList 1245 new CFClient::UI::SpellList
1033 force_w => $WIDTH * (9/10),
1034 force_h => $HEIGHT * (9/10);
1035 $SPELL_LIST
1036} 1246}
1037 1247
1038sub make_binding_window { 1248sub keyboard_setup {
1039 my $binding_list = new CFClient::UI::VBox; 1249 my $binding_list = new CFClient::UI::VBox;
1040 1250
1041 my $refresh; 1251 my $refresh;
1042 $refresh = sub { 1252 $refresh = sub {
1043 $binding_list->clear (); 1253 $binding_list->clear ();
… …
1067 sub { 1277 sub {
1068 my ($nmod, $nsym, $ncmds) = @_; 1278 my ($nmod, $nsym, $ncmds) = @_;
1069 delete $::CFG->{bindings}->{$mod}->{$sym}; 1279 delete $::CFG->{bindings}->{$mod}->{$sym};
1070 $::CFG->{bindings}->{$nmod}->{$nsym} = $ncmds; 1280 $::CFG->{bindings}->{$nmod}->{$nsym} = $ncmds;
1071 $refresh->(); 1281 $refresh->();
1282 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1072 $::BIND_WINDOW->show; 1283 $SETUP_DIALOG->show;
1073 }, 1284 },
1074 sub { 1285 sub {
1286 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1075 $::BIND_WINDOW->show; 1287 $SETUP_DIALOG->show;
1076 }); 1288 });
1077 $::BIND_EDITOR->show; 1289 $::BIND_EDITOR->show;
1078 $::BIND_WINDOW->hide; 1290 $SETUP_DIALOG->hide;
1079 }); 1291 });
1080 1292
1081 $hb->add (new CFClient::UI::Label text => "(Key: $nam)"); 1293 $hb->add (new CFClient::UI::Label text => "(Key: $nam)");
1082 $hb->add (new CFClient::UI::Label text => $lbl, expand => 1); 1294 $hb->add (new CFClient::UI::Label text => $lbl, expand => 1);
1083 } 1295 }
1084 } 1296 }
1085 }; 1297 };
1086 1298
1087 $BIND_WINDOW = new CFClient::UI::FancyFrame
1088 title => "Bindings",
1089 x => "center",
1090 y => "center",
1091 def_w => int $WIDTH * 9/10,
1092 def_h => int $HEIGHT * 9/10,
1093 on_visibility_change => sub {
1094 my ($self, $visible) = @_;
1095 $refresh->() if $visible;
1096 };
1097
1098 $BIND_WINDOW->add (my $vb = new CFClient::UI::VBox); 1299 my $vb = new CFClient::UI::VBox;
1099 $vb->add ($binding_list); 1300 $vb->add ($binding_list);
1100 $vb->add (my $hb = new CFClient::UI::HBox); 1301 $vb->add (my $hb = new CFClient::UI::HBox);
1302
1101 $hb->add (new CFClient::UI::Button 1303 $hb->add (new CFClient::UI::Button
1102 text => "record new", 1304 text => "record new",
1103 expand => 1, 1305 expand => 1,
1104 tooltip => "This button opens the binding editor with an empty binding.", 1306 tooltip => "This button opens the binding editor with an empty binding.",
1105 on_activate => sub { 1307 on_activate => sub {
1106 $::BIND_EDITOR->set_binding (undef, undef, [], 1308 $::BIND_EDITOR->set_binding (undef, undef, [],
1107 sub { 1309 sub {
1108 my ($mod, $sym, $cmds) = @_; 1310 my ($mod, $sym, $cmds) = @_;
1109 $::CFG->{bindings}->{$mod}->{$sym} = $cmds; 1311 $::CFG->{bindings}->{$mod}->{$sym} = $cmds;
1110 $refresh->(); 1312 $refresh->();
1111 $::BIND_WINDOW->show; 1313 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1314 $SETUP_DIALOG->show;
1112 }, 1315 },
1113 sub { 1316 sub {
1114 $::BIND_WINDOW->show; 1317 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1318 $SETUP_DIALOG->show;
1115 }); 1319 },
1116 $::BIND_WINDOW->hide; 1320 );
1321 $SETUP_DIALOG->hide;
1117 $::BIND_EDITOR->show; 1322 $::BIND_EDITOR->show;
1118 }, 1323 },
1119 ); 1324 );
1325
1120 $hb->add (new CFClient::UI::Button 1326 $hb->add (new CFClient::UI::Button
1121 text => "close", 1327 text => "close",
1122 tooltip => "Closes the binding window", 1328 tooltip => "Closes the binding window",
1123 expand => 1, 1329 expand => 1,
1124 on_activate => sub { 1330 on_activate => sub {
1125 $::BIND_WINDOW->hide; 1331 $SETUP_DIALOG->hide;
1126 } 1332 }
1127 ); 1333 );
1128 1334
1129 $refresh->(); 1335 $refresh->();
1130 $BIND_WINDOW 1336
1337 $vb
1131} 1338}
1132 1339
1133sub make_help_window { 1340sub make_help_window {
1134 my $win = new CFClient::UI::FancyFrame 1341 my $win = new CFClient::UI::FancyFrame
1135 x => 'center', 1342 x => 'center',
1136 y => 'center', 1343 y => 'center',
1344 z => 2,
1137 name => 'doc_browser', 1345 name => 'doc_browser',
1138 force_w => int $WIDTH * 7/8, 1346 force_w => int $WIDTH * 7/8,
1139 force_h => int $HEIGHT * 7/8, 1347 force_h => int $HEIGHT * 7/8,
1140 title => "Documentation"; 1348 title => "Documentation";
1141 1349
… …
1153 my ($pod, $label) = @$_; 1361 my ($pod, $label) = @$_;
1154 1362
1155 $buttons->add (new CFClient::UI::Button 1363 $buttons->add (new CFClient::UI::Button
1156 text => $label, 1364 text => $label,
1157 on_activate => sub { 1365 on_activate => sub {
1158 my $parser = new Pod::POM; 1366 my $pom = CFClient::load_pod CFClient::find_rcfile "pod/$pod.pod",
1159 my $pom = $parser->parse_file (CFClient::find_rcfile "pod/$pod.pod"); 1367 doc_viewer => 1, sub { CFClient::pod_to_pango_list $_[0] };
1160 1368
1161 $viewer->clear; 1369 $viewer->clear;
1162 1370
1163 $viewer->add_paragraph ([1, 1, 1, 1], $_->[1], $_->[0]) 1371 $viewer->add_paragraph ([1, 1, 1, 1], $_->[1], $_->[0])
1164 for @{ CFClient::pod_to_pango_list $pom }; 1372 for @$pom;
1165 1373
1166 $viewer->set_offset (0); 1374 $viewer->set_offset (0);
1167 }, 1375 },
1168 ); 1376 );
1169 } 1377 }
… …
1216 $DEBUG_STATUS->show; 1424 $DEBUG_STATUS->show;
1217 1425
1218 $BIND_EDITOR = new CFClient::UI::BindEditor (x => "max", y => 0); 1426 $BIND_EDITOR = new CFClient::UI::BindEditor (x => "max", y => 0);
1219 1427
1220 $STATUSBOX = new CFClient::UI::Statusbox; 1428 $STATUSBOX = new CFClient::UI::Statusbox;
1221 $STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", pri => -100, color => [1, 1, 1, 0.8]); 1429 $STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", timeout => 864000, pri => -100, color => [1, 1, 1, 0.8]);
1222 1430
1223 (new CFClient::UI::Frame 1431 (new CFClient::UI::Frame
1224 bg => [0, 0, 0, 0.4], 1432 bg => [0, 0, 0, 0.4],
1225 force_x => 0, 1433 force_x => 0,
1226 force_y => "max", 1434 force_y => "max",
1227 child => $STATUSBOX, 1435 child => $STATUSBOX,
1228 )->show; 1436 )->show;
1229 1437
1230 CFClient::UI::FancyFrame->new ( 1438 CFClient::UI::FancyFrame->new (
1231 title => "Mini Map", 1439 title => "Map",
1232 name => "mapmap", 1440 name => "mapmap",
1233 x => 0, 1441 x => 0,
1234 y => $FONTSIZE + 8, 1442 y => $FONTSIZE + 8,
1235 border_bg => [1, 1, 1, 192/255], 1443 border_bg => [1, 1, 1, 192/255],
1236 bg => [1, 1, 1, 0], 1444 bg => [1, 1, 1, 0],
… …
1257 1465
1258 $LOGVIEW = new CFClient::UI::TextView 1466 $LOGVIEW = new CFClient::UI::TextView
1259 expand => 1, 1467 expand => 1,
1260 font => $FONT_FIXED, 1468 font => $FONT_FIXED,
1261 fontsize => $::CFG->{log_fontsize}, 1469 fontsize => $::CFG->{log_fontsize},
1470 indent => -4,
1262 can_hover => 1, 1471 can_hover => 1,
1263 can_events => 1, 1472 can_events => 1,
1264 tooltip => "<b>Server Log</b>. This text viewer contains all the messages sent by the server.", 1473 tooltip => "<b>Server Log</b>. This text viewer contains all the messages sent by the server.",
1265 ; 1474 ;
1266 1475
1476 $SETUP_DIALOG = new CFClient::UI::FancyFrame
1477 title => "Setup",
1478 name => "setup_dialog",
1479 x => 'center',
1480 y => 'center',
1481 z => 2,
1482 force_w => $::WIDTH * 0.6,
1483 force_h => $::HEIGHT * 0.6,
1484 ;
1485
1486 $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new CFClient::UI::Notebook expand => 1, debug => 1,
1487 filter => new CFClient::UI::ScrolledWindow expand => 1, scroll_y => 1);
1488
1489 $SETUP_NOTEBOOK->add (Server => $SETUP_SERVER = server_setup,
1490 "Configure the server to play on, your username, password and other server-related options.");
1491 $SETUP_NOTEBOOK->add (Pickup => autopickup_setup,
1492 "Configure autopickup settings, i.e. which items you will pick up automatically when walking (or running) over them.");
1493 $SETUP_NOTEBOOK->add (Graphics => graphics_setup,
1494 "Configure the video mode, performance, fonts and other graphical aspects of the game.");
1495 $SETUP_NOTEBOOK->add (Audio => audio_setup,
1496 "Configure the use of audio, sound effects and background music.");
1497 $SETUP_NOTEBOOK->add (Keyboard => $SETUP_KEYBOARD = keyboard_setup,
1498 "Lets you define, edit and delete bindings."
1499 . "There is a shortcut for making bindings: <b>Left Control + Insert</b> opens the binding editor "
1500 . "with nothing set and the recording started. After doing the actions you "
1501 . "want to record press <b>Insert</b> and you will be asked to press a key-combo. "
1502 . "After pressing the combo the binding will be saved automatically and the "
1503 . "binding editor closes");
1504 $SETUP_NOTEBOOK->add (Spells => $SETUP_SPELLS = spell_setup,
1505 "Displays all spells you have and lets you edit keyboard shortcuts for them.");
1506
1267 $BUTTONBAR = new CFClient::UI::HBox x => 0, y => 0; 1507 $BUTTONBAR = new CFClient::UI::Buttonbar x => 0, y => 0, z => 200; # put on top
1268 1508
1269 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Client Setup", other => client_setup, 1509 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Setup", other => $SETUP_DIALOG,
1270 tooltip => "Toggles a dialog where you can configure various aspects of the client, such as graphics mode, performance, and audio options."); 1510 tooltip => "Toggles a dialog where you can configure all aspects of this client.");
1271 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Server Setup", other => server_setup, 1511
1272 tooltip => "Toggles a dialog where you can configure the server to play on, your username, password and other server-related options.");
1273 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Message Window", other => message_window, 1512 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW = message_window,
1274 tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server."); 1513 tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server.");
1275 1514
1276 make_gauge_window->show; # XXX: this has to be set before make_stats_window as make_stats_window calls update_stats_window which updated the gauges also X-D 1515 make_gauge_window->show; # XXX: this has to be set before make_stats_window as make_stats_window calls update_stats_window which updated the gauges also X-D
1277 1516
1278 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Stats Window", other => make_stats_window, 1517 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Stats Window", other => $STATS_WINDOW = stats_window,
1279 tooltip => "Toggles the statistics window, where all your Stats and Resistances are being displayed at all times."); 1518 tooltip => "Toggles the statistics window, where all your Stats and Resistances are being displayed at all times.");
1280 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Inventory", other => make_inventory_window, 1519 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Inventory", other => inventory_window,
1281 tooltip => "Toggles the inventory window, where you can manage your loot (or treaures :)." 1520 tooltip => "Toggles the inventory window, where you can manage your loot (or treasures :). "
1282 ."You can also hit the Tab-key to show/hide the Inventory."); 1521 . "You can also hit the <b>Tab</b>-key to show/hide the Inventory.");
1283 1522
1284 $BUTTONBAR->add (new CFClient::UI::Button 1523 $BUTTONBAR->add (new CFClient::UI::Button
1285 text => "Save Config", 1524 text => "Save Config",
1286 tooltip => "Saves the options chosen in the client setting, server settings and the window layout to be restored on later runs.", 1525 tooltip => "Saves the options chosen in the client setting, server settings and the window layout to be restored on later runs.",
1287 on_activate => sub { 1526 on_activate => sub {
… …
1291 }, 1530 },
1292 ); 1531 );
1293 1532
1294 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Help!", other => make_help_window, 1533 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Help!", other => make_help_window,
1295 tooltip => "View Documentation"); 1534 tooltip => "View Documentation");
1296
1297 $BUTTONBAR->add (new CFClient::UI::Flopper
1298 text => "Bindings",
1299 other => make_binding_window,
1300 tooltip =>
1301 "Lets you define, edit and delete bindings."
1302 ."There is a shortcut for making bindings: LCTRL+Insert opens the binding editor "
1303 ."with nothing set and the recording started. After doing the actions you "
1304 ."want to record press Insert and you will be asked to press a key-combo."
1305 ."After pressing the combo the binding will be saved automatically and the "
1306 ."binding editor closes");
1307
1308 $BUTTONBAR->add (new CFClient::UI::Flopper
1309 text => "Spells",
1310 other => make_spell_list,
1311 tooltip => "The spell list");
1312
1313 $BUTTONBAR->add (new CFClient::UI::Flopper
1314 text => "Pickup",
1315 other => make_pickup_cfg_window,
1316 tooltip => "The pickup dialog");
1317
1318 1535
1319 $BUTTONBAR->add (new CFClient::UI::Button 1536 $BUTTONBAR->add (new CFClient::UI::Button
1320 text => "Quit", 1537 text => "Quit",
1321 tooltip => "Terminates the program", 1538 tooltip => "Terminates the program",
1322 on_activate => sub { 1539 on_activate => sub {
… …
1327 } 1544 }
1328 }, 1545 },
1329 ); 1546 );
1330 1547
1331 $BUTTONBAR->show; 1548 $BUTTONBAR->show;
1332 $SERVER_SETUP->show; 1549 $SETUP_DIALOG->show;
1333
1334 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);
1335 } 1550 }
1551
1552 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);
1336} 1553}
1337 1554
1338sub video_shutdown { 1555sub video_shutdown {
1339 undef $SDL_ACTIVE; 1556 undef $SDL_ACTIVE;
1340} 1557}
… …
1472}; 1689};
1473 1690
1474 CFClient::SDL_GL_SwapBuffers; 1691 CFClient::SDL_GL_SwapBuffers;
1475} 1692}
1476 1693
1477my $refresh_watcher = Event->timer (after => 0, hard => 1, interval => 1 / $MAX_FPS, cb => sub { 1694my $refresh_watcher = Event->timer (after => 0, hard => 0, interval => 1 / $MAX_FPS, cb => sub {
1478 $NOW = time; 1695 $NOW = time;
1479 1696
1480 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_) 1697 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_)
1481 for CFClient::SDL_PollEvent; 1698 for CFClient::SDL_PollEvent;
1482 1699
… …
1549############################################################################# 1766#############################################################################
1550 1767
1551$SIG{INT} = $SIG{TERM} = sub { exit }; 1768$SIG{INT} = $SIG{TERM} = sub { exit };
1552 1769
1553{ 1770{
1554 local $SIG{__DIE__} = sub { CFClient::fatal $_[0] if defined $^S && !$^S }; 1771 local $SIG{__DIE__} = sub {
1772 return unless defined $^S && !$^S;
1773 Carp::confess $_[1];#d#TODO: remove when stable
1774 CFClient::fatal $_[0];
1775 };
1555 1776
1556 CFClient::read_cfg "$Crossfire::VARDIR/cfplusrc"; 1777 CFClient::read_cfg "$Crossfire::VARDIR/cfplusrc";
1557 CFClient::UI::set_layout ($::CFG->{layout}); 1778 CFClient::UI::set_layout ($::CFG->{layout});
1558 1779
1559 my %DEF_CFG = ( 1780 my %DEF_CFG = (
… …
1565 map_scale => 1, 1786 map_scale => 1,
1566 fow_enable => 1, 1787 fow_enable => 1,
1567 fow_intensity => 0.45, 1788 fow_intensity => 0.45,
1568 fow_smooth => 0, 1789 fow_smooth => 0,
1569 gui_fontsize => 1, 1790 gui_fontsize => 1,
1570 log_fontsize => 1, 1791 log_fontsize => 0.7,
1571 gauge_fontsize=> 1, 1792 gauge_fontsize=> 1,
1572 gauge_size => 0.35, 1793 gauge_size => 0.35,
1573 stat_fontsize => 1, 1794 stat_fontsize => 0.7,
1574 mapsize => 100, 1795 mapsize => 100,
1575 host => "crossfire.schmorp.de", 1796 host => "crossfire.schmorp.de",
1576 say_command => 'say', 1797 say_command => 'say',
1577 audio_enable => 1, 1798 audio_enable => 1,
1578 bgm_enable => 1, 1799 bgm_enable => 1,
1579 bgm_volume => 0.25, 1800 bgm_volume => 0.25,
1580 face_prefetch => 0, 1801 face_prefetch => 0,
1581 output_sync => 1, 1802 output_sync => 1,
1582 output_count => 1, 1803 output_count => 1,
1804 pickup => 0,
1583 ); 1805 );
1584 1806
1585 while (my ($k, $v) = each %DEF_CFG) { 1807 while (my ($k, $v) = each %DEF_CFG) {
1586 $CFG->{$k} = $v unless exists $CFG->{$k}; 1808 $CFG->{$k} = $v unless exists $CFG->{$k};
1587 } 1809 }

Diff Legend

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