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.127 by root, Sat Nov 18 22:36:00 2006 UTC vs.
Revision 1.215 by root, Fri Aug 17 21:18:01 2007 UTC

1#!/opt/bin/perl 1#!/opt/bin/perl
2 2
3my $startup_done = sub { }; 3my $startup_done = sub { };
4our $PANGO = "1.5.0";
4 5
5# do splash-screen thingy on win32 6# do splash-screen thingy on win32
6BEGIN { 7BEGIN {
7 if (%PAR::LibCache && $^O eq "MSWin32") { 8 if (%PAR::LibCache && $^O eq "MSWin32") {
8 while (my ($filename, $zip) = each %PAR::LibCache) { 9 while (my ($filename, $zip) = each %PAR::LibCache) {
22} 23}
23 24
24use strict; 25use strict;
25use utf8; 26use utf8;
26 27
28use Carp 'verbose';
29
27# do things only needed for single-binary version (par) 30# do things only needed for single-binary version (par)
28BEGIN { 31BEGIN {
29 if (%PAR::LibCache) { 32 if (%PAR::LibCache) {
30 @INC = grep ref, @INC; # weed out all paths except pars loader refs 33 @INC = grep ref, @INC; # weed out all paths except pars loader refs
31 34
35 my $tmp = $ENV{PAR_TEMP};
36
32 while (my ($filename, $zip) = each %PAR::LibCache) { 37 while (my ($filename, $zip) = each %PAR::LibCache) {
33 for ($zip->memberNames) { 38 for ($zip->memberNames) {
34 next unless /^root\/(.*)/; 39 next unless /^root\/(.*)/;
35 $zip->extractMember ($_, "$ENV{PAR_TEMP}/$1") 40 $zip->extractMember ($_, "$tmp/$1")
36 unless -e "$ENV{PAR_TEMP}/$1"; 41 unless -e "$tmp/$1";
37 } 42 }
38 } 43 }
39 44
40 # TODO: pango-rc file, anybody? 45 if ($^O eq "MSWin32") {
46 # relocatable
47 } else {
48 # unix, need to patch pango rc file
49 open my $fh, "<:perlio", "$tmp/usr/lib/pango/$PANGO/module-files.d/libpango1.0-0.modules"
50 or die "$tmp/usr/lib/$PANGO/module-files.d/libpango1.0-0.modules: $!";
51 local $/;
52 my $rc = <$fh>;
53 $rc =~ s/^\//$tmp\//gm; # replace abs paths by relative ones
41 54
42 unshift @INC, $ENV{PAR_TEMP}; 55 mkdir "$tmp/pango-modules";
56 open my $fh, ">:perlio", "$tmp/pango-modules/pango.modules"
57 or die "$tmp/pango-modules/pango.modules: $!";
58 print $fh $rc;
59
60 $ENV{PANGO_RC_FILE} = "$tmp/pango.rc";
61 open my $fh, ">:perlio", $ENV{PANGO_RC_FILE}
62 or die "$ENV{PANGO_RC_FILE}: $!";
63 print $fh "[Pango]\nModuleFiles = $tmp/pango-modules\n";
64 }
65
66 unshift @INC, $tmp;
43 } 67 }
44} 68}
45 69
46# need to do it again because that pile of garbage called PAR nukes it before main 70# need to do it again because that pile of garbage called PAR nukes it before main
47unshift @INC, $ENV{PAR_TEMP} 71unshift @INC, $ENV{PAR_TEMP}
48 if %PAR::LibCache; 72 if %PAR::LibCache;
49 73
50use Time::HiRes 'time'; 74use Time::HiRes 'time';
51use Event; 75use Event;
76use List::Util qw(max min);
52 77
53use Crossfire; 78use Crossfire;
54use Crossfire::Protocol::Constants; 79use Crossfire::Protocol::Constants;
55 80
56use Compress::LZF; 81use Compress::LZF;
57 82
58use CFPlus; 83use CFPlus;
59use CFPlus::OpenGL (); 84use CFPlus::OpenGL ();
60use CFPlus::Protocol; 85use CFPlus::Protocol;
86use CFPlus::DB;
61use CFPlus::UI; 87use CFPlus::UI;
88use CFPlus::UI::Canvas;
89use CFPlus::UI::Inventory;
90use CFPlus::UI::SpellList;
91use CFPlus::UI::MessageWindow;
62use CFPlus::Pod; 92use CFPlus::Pod;
63use CFPlus::BindingEditor;
64use CFPlus::MapWidget; 93use CFPlus::MapWidget;
94use CFPlus::Macro;
65 95
66$SIG{QUIT} = sub { Carp::cluck "QUIT" }; 96$SIG{QUIT} = sub { Carp::cluck "QUIT" };
67$SIG{PIPE} = 'IGNORE'; 97$SIG{PIPE} = 'IGNORE';
68 98
69$Event::Eval = 0; 99$Event::Eval = 1;
70$Event::DIED = sub { 100$Event::DIED = sub {
71 # TODO: display dialog box or so 101 CFPlus::fatal Carp::longmess $_[1]
72 Carp::cluck $_[1];#d#TODO: remove when stable
73 return;#d#
74 CFPlus::fatal ($_[1]);
75}; 102};
76 103
77my $MAX_FPS = 60; 104my $MAX_FPS = 60;
78my $MIN_FPS = 5; # unused as of yet 105my $MIN_FPS = 5; # unused as of yet
79 106
86our $CONN; 113our $CONN;
87our $PROFILE; # current profile 114our $PROFILE; # current profile
88our $FAST; # fast, low-quality mode, possibly useful for software-rendering 115our $FAST; # fast, low-quality mode, possibly useful for software-rendering
89 116
90our $WANT_REFRESH; 117our $WANT_REFRESH;
91our $CAN_REFRESH;
92 118
93our @SDL_MODES; 119our @SDL_MODES;
94our $WIDTH; 120our $WIDTH;
95our $HEIGHT; 121our $HEIGHT;
96our $FULLSCREEN; 122our $FULLSCREEN;
101 127
102our $MAP; 128our $MAP;
103our $MAPMAP; 129our $MAPMAP;
104our $MAPWIDGET; 130our $MAPWIDGET;
105our $BUTTONBAR; 131our $BUTTONBAR;
106our $LOGVIEW;
107our $CONSOLE;
108our $METASERVER; 132our $METASERVER;
109our $LOGIN_BUTTON; 133our $LOGIN_BUTTON;
110our $QUIT_DIALOG; 134our $QUIT_DIALOG;
111our $HOST_ENTRY; 135our $HOST_ENTRY;
112our $FULLSCREEN_ENABLE; 136our $FULLSCREEN_ENABLE;
119our $SETUP_KEYBOARD; 143our $SETUP_KEYBOARD;
120 144
121our $PL_NOTEBOOK; 145our $PL_NOTEBOOK;
122our $PL_WINDOW; 146our $PL_WINDOW;
123 147
148our $MUSIC_PLAYING_WIDGET;
149our $LICENSE_WIDGET;
150
124our $INVENTORY_PAGE; 151our $INVENTORY_PAGE;
125our $STATS_PAGE; 152our $STATS_PAGE;
126our $SKILL_PAGE; 153our $SKILL_PAGE;
127our $SPELL_PAGE; 154our $SPELL_PAGE;
155our $SPELL_LIST;
128 156
129our $HELP_WINDOW; 157our $HELP_WINDOW;
130our $MESSAGE_WINDOW; 158our $MESSAGE_WINDOW;
131our $FLOORBOX; 159our $FLOORBOX;
132our $GAUGES; 160our $GAUGES;
133our $STATWIDS; 161our $STATWIDS;
134 162
135our $SDL_ACTIVE; 163our $SDL_ACTIVE;
136our %SDL_CB; 164our %SDL_CB;
137 165
138our $SDL_MIXER;
139our @SOUNDS; # event => file mapping
140our %AUDIO_CHUNKS; # audio files
141
142our $ALT_ENTER_MESSAGE; 166our $ALT_ENTER_MESSAGE;
143our $STATUSBOX; 167our $STATUSBOX;
144our $DEBUG_STATUS; 168our $DEBUG_STATUS;
145 169
146our $INV; 170our $INV;
147our $INVR; 171our $INVR;
148our $INV_RIGHT_HB; 172our $INVR_HB;
149 173
150our $BIND_EDITOR; 174#############################################################################
151our $BIND_UPD_CB;
152
153our $PICKUP_CFG;
154 175
155sub status { 176sub status {
156 $STATUSBOX->add (CFPlus::asxml $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]); 177 $STATUSBOX->add (CFPlus::asxml $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]);
157} 178}
158 179
160 $DEBUG_STATUS->set_text ($_[0]); 181 $DEBUG_STATUS->set_text ($_[0]);
161} 182}
162 183
163sub message { 184sub message {
164 my ($para) = @_; 185 my ($para) = @_;
165 186 $MESSAGE_WINDOW->message ($para);
166 my $time = sprintf "%02d:%02d:%02d", (localtime time)[2,1,0];
167
168 $para->{markup} = "<span foreground='#ffffff'>$time</span> $para->{markup}";
169
170 $LOGVIEW->add_paragraph ($para);
171 $LOGVIEW->scroll_to_bottom;
172} 187}
188
189#############################################################################
190#TODO: maybe move into own audio module...
191
192our $SDL_MIXER;
193
194our $MUSIC_DEFAULT = "in_a_heartbeat.ogg";
195our $MUSIC_WANT; # arryref of ambient music we want to play
196our @MUSIC_HAVE; # ambient music we have on disk
197our $MUSIC_START;
198our @MUSIC_JINGLE; # which jingles to play next
199our $MUSIC_PLAYING_DATA;
200our $MUSIC_PLAYING_META;
201our $MUSIC_PLAYER;
202our $MUSIC_RESUME = 30; # resume music when played less than these many seconds before
203
204our %AUDIO_CHUNK; # audio "files"
205our %AUDIO_PLAY; # which audio faces should be played
206
207sub audio_channel_finished {
208 my ($channel) = @_;
209
210# warn "channel $channel finished\n";#d#
211}
212
213sub audio_sound_push($) {
214 my ($face) = @_;
215
216 $CFG->{effects_enable}
217 or return;
218
219 $AUDIO_PLAY{$face}
220 or return;
221
222 if (my $chunk = $AUDIO_CHUNK{$face}) {
223 for (grep $_->[0] >= Event::time, @{(delete $AUDIO_PLAY{$face}) || []}) {
224 my (undef, $dx, $dy, $vol) = @$_;
225
226 my $channel = CFPlus::Channel::find;
227 $channel->volume ($vol * $CFG->{effects_volume} * 128 / 255);
228 $channel->set_position_r ($dx, $dy, 20);
229 $chunk->play ($channel);
230 }
231 } else {
232 # sound_meta not set means data is in flight either way
233 my $meta = $CONN->{sound_meta}{$face}
234 or return;
235
236 # if its a jingle, play it as ambient music
237 if ($meta->{meta}{jingle}) {
238 if (delete $AUDIO_PLAY{$face}) { # take the jingle out of the sound queue
239 push @MUSIC_JINGLE, $meta; # push it oto the music/jingle queue
240 &audio_music_push ($face);
241 }
242 } else {
243 # fetch from database
244 CFPlus::DB::get res_data => $meta->{name}, sub {
245 my $rwops = new CFPlus::RW $_[0];
246 my $chunk = new CFPlus::MixChunk $rwops
247 or Carp::confess "sound face " . (JSON::XS::to_json $meta) . " unloadable: " . CFPlus::Mix_GetError;
248 $chunk->volume (($meta->{meta}{volume} || 1) * 128);
249 $AUDIO_CHUNK{$face} = $chunk;
250
251 audio_sound_push ($face);
252 };
253 }
254 }
255}
256
257sub audio_sound_play {
258 my ($face, $dx, $dy, $vol) = @_;
259
260 $SDL_MIXER
261 or return;
262 $CFG->{effects_enable}
263 or return;
264
265 my $queue = $AUDIO_PLAY{$face} ||= [];
266 push @$queue, [Event::time + 0.6, $dx, $dy, $vol]; # do not play sound for outdated events
267 audio_sound_push $face
268 unless @$queue > 1;
269}
270
271sub audio_music_set_meta {
272 my ($meta) = @_;
273
274 $MUSIC_PLAYING_META = $meta;
275 $MUSIC_PLAYING_WIDGET->set_markup (
276 "<b>Name</b>: " . (CFPlus::asxml $meta->{meta}{name}) . "\n"
277 . "<b>Author</b>: " . (CFPlus::asxml $meta->{meta}{author}) . "\n"
278 . "<b>Source</b>: " . (CFPlus::asxml $meta->{meta}{source}) . "\n"
279 . "<b>License</b>: " . (CFPlus::asxml $meta->{meta}{license})
280 );
281}
282
283sub audio_music_update_volume {
284 return unless $MUSIC_PLAYING_META;
285 my $volume = $MUSIC_PLAYING_META->{meta}{volume} || 1;
286 my $base = $MUSIC_PLAYING_META->{meta}{jingle} ? 1 : $CFG->{bgm_volume};
287 CFPlus::MixMusic::volume $base * $volume * 128;
288}
289
290sub audio_music_start {
291 my $meta = $MUSIC_PLAYING_META;
292
293 CFPlus::DB::get res_data => $meta->{name}, sub {
294 return unless $SDL_MIXER;
295
296 # music might have changed...
297 $meta eq $MUSIC_PLAYING_META
298 or return &audio_music_start ();
299
300 audio_music_update_volume;
301
302 $MUSIC_PLAYING_DATA = \$_[0];
303
304 my $rwops = $meta->{path}
305 ? new_from_file CFPlus::RW $meta->{path}
306 : new CFPlus::RW $$MUSIC_PLAYING_DATA;
307
308 $MUSIC_PLAYER = new CFPlus::MixMusic $rwops
309 or Carp::confess "music face $meta->{face} unloadable: " . CFPlus::Mix_GetError;
310
311 my $NOW = time;
312
313 if ($MUSIC_PLAYING_META->{stop_time} > $NOW - $MUSIC_RESUME) {
314 my $pos = $MUSIC_PLAYING_META->{stop_pos};
315 $MUSIC_PLAYER->fade_in_pos (0, 1000, $pos);
316 $MUSIC_START = time - $pos;
317 } else {
318 $MUSIC_PLAYER->play (0);
319 $MUSIC_START = time;
320 }
321
322 delete $meta->{stop_time};
323 delete $meta->{stop_pos};
324 }
325}
326
327sub audio_music_push {
328 return unless $SDL_MIXER;
329
330 my $fade_out;
331
332 if (@MUSIC_JINGLE) {
333 @MUSIC_HAVE = $MUSIC_JINGLE[0];
334 $fade_out = 333;
335 } else {
336 return unless $CFG->{bgm_enable};
337
338 my @have =
339 grep $_,
340 map $CONN->{music_meta}{$_},
341 @$MUSIC_WANT;
342
343 @MUSIC_HAVE = @have
344 if @have;
345
346 # default MUSIC_HAVE == MUSIC_DEFAULT
347 @MUSIC_HAVE = { path => CFPlus::find_rcfile "music/$MUSIC_DEFAULT" } unless @MUSIC_HAVE;
348 $fade_out = 1000;
349 }
350
351 # if the currently playing song is acceptable, let it continue
352 return if grep $MUSIC_PLAYING_META == $_, @MUSIC_HAVE;
353
354 my $NOW = time;
355
356 if ($MUSIC_PLAYING_META) {
357 $MUSIC_PLAYING_META->{stop_time} = $NOW;
358 $MUSIC_PLAYING_META->{stop_pos} = $NOW - $MUSIC_START;
359 CFPlus::MixMusic::fade_out $fade_out;
360 } else {
361 # sort by stop time, oldest first
362 @MUSIC_HAVE = sort { $a->{stop_time} <=> $b->{stop_time} } @MUSIC_HAVE;
363
364 # if the most recently-played piece played very recently,
365 # resume it, else choose the oldest piece for rotation.
366 audio_music_set_meta
367 $MUSIC_HAVE[-1]{stop_time} > $NOW - $MUSIC_RESUME
368 ? $MUSIC_HAVE[-1]
369 : $MUSIC_HAVE[0];
370
371 audio_music_start;
372 }
373}
374
375sub audio_music_set_ambient {
376 my ($songs) = @_;
377
378 $MUSIC_WANT = $songs;
379 audio_music_push;
380}
381
382sub audio_music_finished {
383 # we compress multiple jingles of the same type
384 shift @MUSIC_JINGLE
385 while @MUSIC_JINGLE && $MUSIC_PLAYING_META == $MUSIC_JINGLE[0];
386
387 $MUSIC_PLAYING_WIDGET->clear;
388
389 undef $MUSIC_PLAYER;
390 undef $MUSIC_PLAYING_META;
391 undef $MUSIC_PLAYING_DATA;
392
393 audio_music_push;
394}
395
396sub audio_init {
397 if ($CFG->{audio_enable}) {
398 $ENV{MIX_EFFECTSMAXSPEED} = 1;
399 $SDL_MIXER = !CFPlus::Mix_OpenAudio;
400
401 unless ($SDL_MIXER) {
402 status "Unable to open sound device: there will be no sound";
403 return;
404 }
405
406 CFPlus::Mix_AllocateChannels 16;
407
408 audio_music_finished;
409 } else {
410 undef $SDL_MIXER;
411 }
412}
413
414sub audio_shutdown {
415 undef $MUSIC_PLAYER;
416 undef $MUSIC_PLAYING_META;
417 undef $MUSIC_PLAYING_DATA;
418
419 $MUSIC_WANT = [];
420 @MUSIC_JINGLE = ();
421 %AUDIO_PLAY = ();
422 %AUDIO_CHUNK = ();
423
424 CFPlus::Mix_CloseAudio if $SDL_MIXER;
425 undef $SDL_MIXER;
426}
427
428#############################################################################
173 429
174sub destroy_query_dialog { 430sub destroy_query_dialog {
175 (delete $_[0]{query_dialog})->destroy 431 (delete $_[0]{query_dialog})->destroy
176 if $_[0]{query_dialog}; 432 if $_[0]{query_dialog};
177} 433}
178 434
435# FIXME: a very ugly hack to wait for stat update look below! #d#
436our $QUERY_TIMER; #d#
437
179# server query dialog 438# server query dialog
180sub server_query { 439sub server_query {
181 my ($conn, $flags, $prompt) = @_; 440 my ($conn, $flags, $prompt) = @_;
441
442 # FIXME: a very ugly hack to wait for stat update #d#
443 if ($prompt =~ /roll new stats/ and not $conn->{stat_change_with}) {
444 unless ($QUERY_TIMER) {
445 $QUERY_TIMER =
446 Event->timer (
447 after => 1,
448 cb => sub {
449 server_query ($conn, $flags, $prompt, 1);
450 $QUERY_TIMER = undef
451 }
452 );
453 return;
454 }
455 }
182 456
183 $conn->{query_dialog} = my $dialog = new CFPlus::UI::Toplevel 457 $conn->{query_dialog} = my $dialog = new CFPlus::UI::Toplevel
184 x => "center", 458 x => "center",
185 y => "center", 459 y => "center",
186 title => "Server Query", 460 title => "Server Query",
187 child => my $vbox = new CFPlus::UI::VBox, 461 child => my $vbox = new CFPlus::UI::VBox,
188 ; 462 ;
189 463
190 my @dialog = my $label = new CFPlus::UI::Label 464 my @dialog = my $label = new CFPlus::UI::Label
191 max_w => $::WIDTH * 0.4, 465 max_w => $::WIDTH * 0.8,
192 ellipsise => 0, 466 ellipsise => 0,
193 text => $prompt; 467 text => $prompt;
194 468
195 if ($flags & CS_QUERY_YESNO) { 469 if ($flags & CS_QUERY_YESNO) {
196 push @dialog, my $hbox = new CFPlus::UI::HBox; 470 push @dialog, my $hbox = new CFPlus::UI::HBox;
213 ); 487 );
214 488
215 $dialog->grab_focus; 489 $dialog->grab_focus;
216 490
217 } elsif ($flags & CS_QUERY_SINGLECHAR) { 491 } elsif ($flags & CS_QUERY_SINGLECHAR) {
218 $dialog->{tooltip} = "#charcreation_focus";
219
220 if ($prompt =~ /Now choose a character|Press any key for the next race/i) { 492 if ($prompt =~ /Now choose a character|Press any key for the next race/i) {
221 $MESSAGE_WINDOW->show; 493 $dialog->{tooltip} = "#charcreation_focus";
222 494
223 unshift @dialog, new CFPlus::UI::Label 495 unshift @dialog, new CFPlus::UI::Label
224 max_w => $::WIDTH * 0.4, 496 max_w => $::WIDTH * 0.8,
225 ellipsise => 0, 497 ellipsise => 0,
226 markup => "\nOr use your keyboard and the text entry below:\n"; 498 markup => "\nOr use your keyboard and the text entry below:\n";
227 499
228 unshift @dialog, my $table = new CFPlus::UI::Table; 500 unshift @dialog, my $table = new CFPlus::UI::Table;
229 501
230 $table->add (0, 0, new CFPlus::UI::Button 502 $table->add_at (0, 0, new CFPlus::UI::Button
231 text => "Next Race", 503 text => "Next Race",
232 on_activate => sub { 504 on_activate => sub {
233 $conn->send ("reply n"); 505 $conn->send ("reply n");
234 destroy_query_dialog $conn; 506 destroy_query_dialog $conn;
235 0 507 0
236 }, 508 },
237 ); 509 );
238 $table->add (2, 0, new CFPlus::UI::Button 510 $table->add_at (2, 0, new CFPlus::UI::Button
239 text => "Accept", 511 text => "Accept",
240 on_activate => sub { 512 on_activate => sub {
241 $conn->send ("reply d"); 513 $conn->send ("reply d");
242 destroy_query_dialog $conn; 514 destroy_query_dialog $conn;
243 0 515 0
244 }, 516 },
245 ); 517 );
246 518
519 if ($conn->{chargen_race_description}) {
520 unshift @dialog, new CFPlus::UI::Label
521 max_w => $::WIDTH * 0.8,
522 ellipsise => 0,
523 markup => "<span foreground='#ccccff'>$conn->{chargen_race_description}</span>",
524 ;
525 }
526
527 unshift @dialog, new CFPlus::UI::Face
528 face => $conn->{player}{face},
529 bg => [.2, .2, .2, 1],
530 min_w => 64,
531 min_h => 64,
532 ;
533
534 if ($conn->{chargen_race_title}) {
535 unshift @dialog, new CFPlus::UI::Label
536 allign => 1,
537 ellipsise => 0,
538 markup => "<span foreground='#ccccff' size='large'>Race: $conn->{chargen_race_title}</span>",
539 ;
540 }
541
247 unshift @dialog, new CFPlus::UI::Label 542 unshift @dialog, new CFPlus::UI::Label
248 max_w => $::WIDTH * 0.4, 543 max_w => $::WIDTH * 0.4,
249 ellipsise => 0, 544 ellipsise => 0,
250 markup => (CFPlus::Pod::section_label ui => "chargen_race"), 545 markup => (CFPlus::Pod::section_label ui => "chargen_race"),
251 ; 546 ;
255 $conn->send ("reply $stat"); 550 $conn->send ("reply $stat");
256 destroy_query_dialog $conn; 551 destroy_query_dialog $conn;
257 return; 552 return;
258 } 553 }
259 554
260 $STATS_PAGE->show;
261 $MESSAGE_WINDOW->hide;
262
263 unshift @dialog, new CFPlus::UI::Label 555 unshift @dialog, new CFPlus::UI::Label
264 max_w => $::WIDTH * 0.4, 556 max_w => $::WIDTH * 0.4,
265 ellipsise => 0, 557 ellipsise => 0,
266 markup => "\nOr use your keyboard and the text entry below:\n"; 558 markup => "\nOr use your keyboard and the text entry below:\n";
267 559
268 unshift @dialog, my $table = new CFPlus::UI::Table; 560 unshift @dialog, my $table = new CFPlus::UI::Table;
269 561
270 # left: re-roll 562 # left: re-roll
271 $table->add (0, 0, new CFPlus::UI::Button 563 $table->add_at (0, 0, new CFPlus::UI::Button
272 text => "Roll Again", 564 text => "Roll Again",
273 on_activate => sub { 565 on_activate => sub {
274 $conn->send ("reply y"); 566 $conn->send ("reply y");
275 destroy_query_dialog $conn; 567 destroy_query_dialog $conn;
276 0 568 0
290 [6 => "Pow", "Power ($conn->{stat}{+CS_STAT_POW})"], 582 [6 => "Pow", "Power ($conn->{stat}{+CS_STAT_POW})"],
291 [7 => "Cha", "Charisma ($conn->{stat}{+CS_STAT_CHA})"], 583 [7 => "Cha", "Charisma ($conn->{stat}{+CS_STAT_CHA})"],
292 ], 584 ],
293 ), 1 .. 2; 585 ), 1 .. 2;
294 586
295 $table->add (2, 0, new CFPlus::UI::Button 587 $table->add_at (2, 0, new CFPlus::UI::Button
296 text => "Swap Stats", 588 text => "Swap Stats",
297 on_activate => sub { 589 on_activate => sub {
298 $conn->{stat_change_with} = $sw2->{value}; 590 $conn->{stat_change_with} = $sw2->{value};
299 $conn->send ("reply $sw1->{value}"); 591 $conn->send ("reply $sw1->{value}");
300 destroy_query_dialog $conn; 592 destroy_query_dialog $conn;
301 0 593 0
302 }, 594 },
303 ); 595 );
304 $table->add (2, 1, new CFPlus::UI::HBox children => [$sw1, $sw2]); 596 $table->add_at (2, 1, new CFPlus::UI::HBox children => [$sw1, $sw2]);
305 597
306 # right: accept 598 # right: accept
307 $table->add (4, 0, new CFPlus::UI::Button 599 $table->add_at (4, 0, new CFPlus::UI::Button
308 text => "Accept", 600 text => "Accept",
309 on_activate => sub { 601 on_activate => sub {
310 $conn->send ("reply n"); 602 $conn->send ("reply n");
311 $STATS_PAGE->hide; 603 $STATS_PAGE->hide;
312 destroy_query_dialog $conn; 604 destroy_query_dialog $conn;
375 status "logging in..."; 667 status "logging in...";
376 668
377 $LOGIN_BUTTON->set_text ("Logout"); 669 $LOGIN_BUTTON->set_text ("Logout");
378 $SETUP_DIALOG->hide; 670 $SETUP_DIALOG->hide;
379 671
380 $PROFILE = $CFG->{profile}{default};
381
382 my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32; 672 my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32;
383 673
384 my ($host, $port) = split /:/, $PROFILE->{host}; 674 my ($host, $port) = split /:/, $PROFILE->{host};
385 675
386 $MAP = new CFPlus::Map; 676 $MAP = new CFPlus::Map;
395 maph => $mapsize, 685 maph => $mapsize,
396 686
397 client => "cfplus $CFPlus::VERSION $] $^O", 687 client => "cfplus $CFPlus::VERSION $] $^O",
398 688
399 map_widget => $MAPWIDGET, 689 map_widget => $MAPWIDGET,
400 logview => $LOGVIEW,
401 statusbox => $STATUSBOX, 690 statusbox => $STATUSBOX,
402 map => $MAP, 691 map => $MAP,
403 mapmap => $MAPMAP, 692 mapmap => $MAPMAP,
404 query => \&server_query, 693 query => \&server_query,
405 694
406 sound_play => sub { 695 setup_req => {
407 my ($x, $y, $soundnum, $type) = @_; 696 smoothing => $CFG->{map_smoothing}*1,
408
409 $SDL_MIXER
410 or return;
411
412 my $chunk = $AUDIO_CHUNKS{$SOUNDS[$soundnum]}
413 or return;
414
415 $chunk->play;
416 }, 697 },
417 }; 698 };
418 699
419 if ($CONN) { 700 if ($CONN) {
420 CFPlus::lowdelay fileno $CONN->{fh}; 701 CFPlus::lowdelay fileno $CONN->{fh};
429sub stop_game { 710sub stop_game {
430 $LOGIN_BUTTON->set_text ("Login"); 711 $LOGIN_BUTTON->set_text ("Login");
431 $SETUP_NOTEBOOK->set_current_page ($SETUP_SERVER); 712 $SETUP_NOTEBOOK->set_current_page ($SETUP_SERVER);
432 $SETUP_DIALOG->show; 713 $SETUP_DIALOG->show;
433 $PL_WINDOW->hide; 714 $PL_WINDOW->hide;
434 $SPELL_PAGE->clear_spells; 715 $SPELL_LIST->clear_spells;
716 $CFPlus::UI::ROOT->emit (stop_game => ! ! $CONN);
717
718 &audio_music_set_ambient ([]);
435 719
436 return unless $CONN; 720 return unless $CONN;
437 721
438 status "connection closed"; 722 status "connection closed";
439 723
447sub graphics_setup { 731sub graphics_setup {
448 my $vbox = new CFPlus::UI::VBox; 732 my $vbox = new CFPlus::UI::VBox;
449 733
450 $vbox->add (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]); 734 $vbox->add (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]);
451 735
736 my $row = 0;
737
738 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "OpenGL Info");
739 $table->add_at (1, $row++, new CFPlus::UI::Label valign => 0, fontsize => 0.8, text => CFPlus::OpenGL::gl_vendor . ", " . CFPlus::OpenGL::gl_version,
740 can_events => 1,
741 tooltip => "<tt><span size='8192'>" . (CFPlus::OpenGL::gl_extensions) . "</span></tt>");
742
743 my $vidmode_tooltip =
744 "<b>Video Mode.</b> The video mode to use for fullscreen (and the window size for windowed operation). "
745 . "The format is <i>width</i> x <i>height</i> \@ <i>depth-per-channel</i> + <i>alpha-channel</i>.";
746
452 $table->add (0, 0, new CFPlus::UI::Label valign => 0, align => 1, text => "Video Mode"); 747 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Video Mode");
453 $table->add (1, 0, my $hbox = new CFPlus::UI::HBox); 748 $table->add_at (1, $row++, my $hbox = new CFPlus::UI::HBox);
454 749
750 $hbox->add (my $mode_slider = new CFPlus::UI::Slider
455 $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]); 751 force_w => $WIDTH * 0.1, expand => 1, range => [$CFG->{sdl_mode}, 0, $#SDL_MODES, 0, 1],
456 $hbox->add (my $mode_label = new CFPlus::UI::Label align => 0, valign => 0, height => 0.8, template => "9999x9999"); 752 tooltip => $vidmode_tooltip);
753 $hbox->add (my $mode_label = new CFPlus::UI::Label
754 align => 0, valign => 0, height => 0.8, template => "9999x9999@9+9",
755 can_events => 1, tooltip => $vidmode_tooltip);
457 756
458 $mode_slider->connect (changed => sub { 757 $mode_slider->connect (changed => sub {
459 my ($self, $value) = @_; 758 my ($self, $value) = @_;
460 759
461 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value; 760 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value;
462 $mode_label->set_text (sprintf "%dx%d", @{$SDL_MODES[$value]}); 761 $mode_label->set_text (sprintf '%dx%d@%d+%d', @{$SDL_MODES[$value]});
463 }); 762 });
464 $mode_slider->emit (changed => $mode_slider->{range}[0]); 763 $mode_slider->emit (changed => $mode_slider->{range}[0]);
465 764
466 my $row = 1;
467
468 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fullscreen"); 765 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fullscreen");
469 $table->add (1, $row++, $FULLSCREEN_ENABLE = new CFPlus::UI::CheckBox 766 $table->add_at (1, $row++, $FULLSCREEN_ENABLE = new CFPlus::UI::CheckBox
470 state => $CFG->{fullscreen}, 767 state => $CFG->{fullscreen},
471 tooltip => "Bring the client into fullscreen mode.", 768 tooltip => "Bring the client into fullscreen mode.",
472 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 } 769 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 }
473 ); 770 );
474 771
772 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Force OpenGL 1.1");
773 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
774 state => $CFG->{opengl11},
775 tooltip => "Limit CFPlus to use OpenGL 1.1 features only. This will normally result in "
776 . "higher memory usage and slower performance. It will, however, help tremendously on "
777 . "cards that claim to support a feature but fall back to software rendering. "
778 . "Nvidia Geforce FX cards are known to claim features the hardware doesn't support, "
779 . "but cards and drivers from other vendors (ATI) are often just as bad. <b>If you "
780 . "experience extremely low framerates and your card should do better, try this option.</b>",
781 on_changed => sub { my ($self, $value) = @_; $CFG->{opengl11} = $value; 0 }
782 );
783
475 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fast & Ugly"); 784 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fast & Ugly");
476 $table->add (1, $row++, new CFPlus::UI::CheckBox 785 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
477 state => $CFG->{fast}, 786 state => $CFG->{fast},
478 tooltip => "Lower the visual quality considerably to speed up rendering.", 787 tooltip => "Lower the visual quality considerably to speed up rendering.",
479 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 } 788 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 }
480 ); 789 );
481 790
791 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "GUI Fontsize");
792 $table->add_at (1, $row++, new CFPlus::UI::Slider
793 range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1],
794 tooltip => "The base font size used by most GUI elements that do not have their own setting.",
795 on_changed => sub { $CFG->{gui_fontsize} = $_[1]; 0 },
796 );
797
798 $table->add_at (1, $row++, new CFPlus::UI::Button
799 expand => 1, align => 0, text => "Apply",
800 tooltip => "Apply the video settings above.",
801 on_activate => sub {
802 video_shutdown ();
803 video_init ();
804 0
805 }
806 );
807
482 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Scale"); 808 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Scale");
483 $table->add (1, $row++, new CFPlus::UI::Slider 809 $table->add_at (1, $row++, new CFPlus::UI::Slider
484 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1], 810 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1],
485 tooltip => "Enlarge or shrink the displayed map. Changes are instant.", 811 tooltip => "Enlarge or shrink the displayed map. Changes are instant.",
486 on_changed => sub { my ($self, $value) = @_; $CFG->{map_scale} = 2 ** $value; 0 } 812 on_changed => sub { my ($self, $value) = @_; $CFG->{map_scale} = 2 ** $value; 0 }
487 ); 813 );
488 814
815 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Smoothing");
816 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
817 state => $CFG->{map_smoothing},
818 tooltip => "<b>Map Smoothing</b> tries to make tile borders less square. "
819 . "This increases load on the graphics subsystem and works only with TRT servers. "
820 . "Changes take effect at next login only.",
821 on_changed => sub { my ($self, $value) = @_; $CFG->{map_smoothing} = $value; 0 }
822 );
823
489 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fog of War"); 824 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fog of War");
490 $table->add (1, $row++, new CFPlus::UI::CheckBox 825 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
491 state => $CFG->{fow_enable}, 826 state => $CFG->{fow_enable},
492 tooltip => "<b>Fog-of-War</b> marks areas that cannot be seen by the player. Changes are instant.", 827 tooltip => "<b>Fog-of-War</b> marks areas that cannot be seen by the player. Changes are instant.",
493 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; 0 } 828 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; 0 }
494 ); 829 );
495 830
496 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "FoW Intensity"); 831 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "FoW Intensity");
497 $table->add (1, $row++, new CFPlus::UI::Slider 832 $table->add_at (1, $row++, new CFPlus::UI::Slider
498 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256], 833 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256],
499 tooltip => "<b>Fog of War Lightness.</b> The higher the intensity, the lighter the Fog-of-War color. Changes are instant.", 834 tooltip => "<b>Fog of War Lightness.</b> The higher the intensity, the lighter the Fog-of-War color. Changes are instant.",
500 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_intensity} = $value; 0 } 835 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_intensity} = $value; 0 }
501 ); 836 );
502 837
503 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "FoW Smooth");
504 $table->add (1, $row++, new CFPlus::UI::CheckBox
505 state => $CFG->{fow_smooth},
506 tooltip => "Smooth the Fog-of-War a bit to make it more realistic. Changes are instant.",
507 on_changed => sub {
508 my ($self, $value) = @_;
509 $CFG->{fow_smooth} = $value;
510 status "Fog of War smoothing requires OpenGL 1.2 or higher" if $CFPlus::OpenGL::GL_VERSION < 1.2;
511 0
512 }
513 );
514
515 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "GUI Fontsize");
516 $table->add (1, $row++, new CFPlus::UI::Slider
517 range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1],
518 tooltip => "The base font size used by most GUI elements that do not have their own setting.",
519 on_changed => sub { $CFG->{gui_fontsize} = $_[1]; 0 },
520 );
521
522 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Message Fontsize"); 838 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Message Fontsize");
523 $table->add (1, $row++, new CFPlus::UI::Slider 839 $table->add_at (1, $row++, new CFPlus::UI::Slider
524 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1], 840 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1],
525 tooltip => "The font size used by the <b>message/server log</b> window only. Changes are instant.", 841 tooltip => "The font size used by the <b>message/server log</b> window only. Changes are instant, "
842 . "but you still need to press apply to correctly re-layout the widget.",
526 on_changed => sub { $LOGVIEW->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 }, 843 on_changed => sub { $MESSAGE_WINDOW->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 },
527 ); 844 );
528 845
529 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Gauge fontsize"); 846 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Gauge fontsize");
530 $table->add (1, $row++, new CFPlus::UI::Slider 847 $table->add_at (1, $row++, new CFPlus::UI::Slider
531 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1], 848 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1],
532 tooltip => "Adjusts the fontsize of the gauges at the bottom right. Changes are instant.", 849 tooltip => "Adjusts the fontsize of the gauges at the bottom right. Changes are instant.",
533 on_changed => sub { 850 on_changed => sub {
534 $CFG->{gauge_fontsize} = $_[1]; 851 $CFG->{gauge_fontsize} = $_[1];
535 &set_gauge_window_fontsize; 852 &set_gauge_window_fontsize;
536 0 853 0
537 } 854 }
538 ); 855 );
539 856
540 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Gauge size"); 857 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Gauge size");
541 $table->add (1, $row++, new CFPlus::UI::Slider 858 $table->add_at (1, $row++, new CFPlus::UI::Slider
542 range => [$CFG->{gauge_size}, 0.2, 0.8], 859 range => [$CFG->{gauge_size}, 0.2, 0.8],
543 tooltip => "Adjust the size of the stats gauges at the bottom right. Changes are instant.", 860 tooltip => "Adjust the size of the stats gauges at the bottom right. Changes are instant.",
544 on_changed => sub { 861 on_changed => sub {
545 $CFG->{gauge_size} = $_[1]; 862 $CFG->{gauge_size} = $_[1];
546 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size}); 863 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size});
547 0 864 0
548 } 865 }
549 ); 866 );
550 867
551 $table->add (1, $row++, new CFPlus::UI::Button
552 expand => 1, align => 0, text => "Apply",
553 tooltip => "Apply the video settings",
554 on_activate => sub {
555 video_shutdown ();
556 video_init ();
557 0
558 }
559 );
560
561 $vbox 868 $vbox
562} 869}
563 870
564sub audio_setup { 871sub audio_setup {
565 my $vbox = new CFPlus::UI::VBox; 872 my $vbox = new CFPlus::UI::VBox;
566 873
567 $vbox->add (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]); 874 $vbox->add (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 0, 1]);
568 875
569 my $row = 0; 876 my $row = 0;
570 877
571 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Audio Enable"); 878 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Audio Enable");
572 $table->add (1, $row++, new CFPlus::UI::CheckBox 879 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
573 state => $CFG->{audio_enable}, 880 state => $CFG->{audio_enable},
574 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.", 881 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.",
575 on_changed => sub { $CFG->{audio_enable} = $_[1]; 0 } 882 on_changed => sub { $CFG->{audio_enable} = $_[1]; 0 }
576 ); 883 );
577# $table->add (0, 9, new CFPlus::UI::Label valign => 0, align => 1, text => "Effects Volume"); 884# $table->add_at (0, 9, new CFPlus::UI::Label valign => 0, align => 1, text => "Effects Volume");
578# $table->add (1, 8, new CFPlus::UI::Slider range => [$CFG->{effects_volume}, 0, 128, 1], on_changed => sub { 885# $table->add_at (1, 8, new CFPlus::UI::Slider range => [$CFG->{effects_volume}, 0, 128, 1], on_changed => sub {
579# $CFG->{effects_volume} = $_[1]; 886# $CFG->{effects_volume} = $_[1];
580# }); 887# });
888
889 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Sound Effects");
890 $table->add_at (1, $row, new CFPlus::UI::CheckBox
891 expand => 1, state => $CFG->{effects_enable},
892 tooltip => "If enabled, sound effects are enabled. If disabled, no sound effects will be played.",
893 on_changed => sub {
894 $CFG->{effects_enable} = $_[1];
895 $CONN->update_fx_want if $CONN;
896 0
897 }
898 );
899 $table->add_at (2, $row++, new CFPlus::UI::Slider
900 expand => 1, range => [$CFG->{effects_volume}, 0, 1, 0, 1/128],
901 tooltip => "The relative volume of sound effects. Best audio quality is achieved if this "
902 . "is set highest (rightmost) and you use your operating system volume setting. Changes are instant.",
903 on_changed => sub { $CFG->{effects_volume} = $_[1]; 0 }
904 );
905
581 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Background Music"); 906 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Background Music");
582 $table->add (1, $row++, my $hbox = new CFPlus::UI::HBox);
583 $hbox->add (new CFPlus::UI::CheckBox 907 $table->add_at (1, $row, new CFPlus::UI::CheckBox
584 expand => 1, state => $CFG->{bgm_enable}, 908 expand => 1, state => $CFG->{bgm_enable},
585 tooltip => "If enabled, playing of background music is enabled. If disabled, no background music will be played.", 909 tooltip => "If enabled, playing of background music is enabled. If disabled, no background music will be played.",
586 on_changed => sub { $CFG->{bgm_enable} = $_[1]; 0 } 910 on_changed => sub {
911 $CFG->{bgm_enable} = $_[1];
912 $CONN->update_fx_want if $CONN;
913 0
914 }
587 ); 915 );
588 $hbox->add (new CFPlus::UI::Slider 916 $table->add_at (2, $row++, new CFPlus::UI::Slider
589 expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128], 917 expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128],
590 tooltip => "The volume of the background music. Changes are instant.", 918 tooltip => "The volume of the background music. Changes are instant.",
591 on_changed => sub { $CFG->{bgm_volume} = $_[1]; CFPlus::MixMusic::volume $_[1] * 128; 0 } 919 on_changed => sub { $CFG->{bgm_volume} = $_[1]; audio_music_update_volume; 0 }
592 ); 920 );
593 921
594 $table->add (1, $row++, new CFPlus::UI::Button 922 $table->add_at (1, $row++, new CFPlus::UI::Button
595 expand => 1, align => 0, text => "Apply", 923 c_colspan => 2, expand => 1, align => 0, text => "Apply",
596 tooltip => "Apply the audio settings", 924 tooltip => "Apply the audio settings",
597 on_activate => sub { 925 on_activate => sub {
598 audio_shutdown (); 926 audio_shutdown ();
599 audio_init (); 927 audio_init ();
600 0 928 0
658} 986}
659 987
660sub debug_setup { 988sub debug_setup {
661 my $table = new CFPlus::UI::Table; 989 my $table = new CFPlus::UI::Table;
662 990
663 $table->add (0, 0, new CFPlus::UI::Label text => "Widget Borders"); 991 $table->add_at (0, 0, new CFPlus::UI::Label text => "Widget Borders");
664 $table->add (1, 0, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 1; 0 }); 992 $table->add_at (1, 0, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 1; 0 });
665 $table->add (0, 1, new CFPlus::UI::Label text => "Tooltip Widget Info"); 993 $table->add_at (0, 1, new CFPlus::UI::Label text => "Tooltip Widget Info");
666 $table->add (1, 1, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 2; 0 }); 994 $table->add_at (1, 1, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 2; 0 });
667 $table->add (0, 2, new CFPlus::UI::Label text => "Show FPS"); 995 $table->add_at (0, 2, new CFPlus::UI::Label text => "Show FPS");
668 $table->add (1, 2, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 4; 0 }); 996 $table->add_at (1, 2, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 4; 0 });
669 $table->add (0, 3, new CFPlus::UI::Label text => "Suppress Tooltips"); 997 $table->add_at (0, 3, new CFPlus::UI::Label text => "Suppress Tooltips");
670 $table->add (1, 3, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 8; 0 }); 998 $table->add_at (1, 3, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 8; 0 });
999 $table->add_at (0, 4, new CFPlus::UI::Button text => "die on click(tm)", on_activate => sub { &CFPlus::debug() } );
671 1000
672 my @default_smooth = (0.05, 0.13, 0.05, 0.13, 0.30, 0.13, 0.05, 0.13, 0.05); 1001 $table->add_at (0, 5, new CFPlus::UI::TextEdit text => "line1\0152\0153");#d#
673 1002
674 for my $x (0..2) { 1003 $table->add_at (7,7, my $t = new CFPlus::UI::Table expand => 0);
675 for my $y (0 .. 2) { 1004 $t->add_at (0,0, new CFPlus::UI::Label text => "a a a a", c_rowspan => 1, c_colspan => 2);
676 $table->add ($x + 3, $y, 1005 $t->add_at (2,0, new CFPlus::UI::Label text => "b\nb", c_rowspan => 2, c_colspan => 1);
677 new CFPlus::UI::Entry 1006 $t->add_at (1,2, new CFPlus::UI::Label text => "c c c c", c_rowspan => 1, c_colspan => 2);
678 text => $default_smooth[$x * 3 + $y], 1007 $t->add_at (0,1, new CFPlus::UI::Label text => "d\nd", c_rowspan => 2, c_colspan => 1);
679 on_changed => sub { $MAP->{smooth_matrix}[$x * 3 + $y] = $_[1] if $MAP; 0 }, 1008 $t->add_at (1,1, new CFPlus::UI::Label text => "e");
680 ); 1009
681 } 1010 $table->add_at (7, 6, my $c = new CFPlus::UI::Canvas);
1011
1012 $c->add_items ({
1013 type => "line_loop",
1014 color => [0, 1, 0],
1015 width => 9,
1016 coord_mode => "abs",
1017 coord => [[10, 5], [5, 50], [20, 5], [5, 60]],
682 } 1018 });
683 1019
1020 $c->add_items ({
1021 type => "lines",
1022 color => [1, 1, 0],
1023 width => 2,
1024 coord_mode => "rel",
1025 coord => [[0,0], [1,1], [1,0], [0,1]],
1026 });
1027
1028 $c->add_items ({
1029 type => "polygon",
1030 color => [0, 0.43, 0],
1031 width => 2,
1032 coord_mode => "rel",
1033 coord => [[0,0.2], [1,.4], [1,.6], [0,.8]],
1034 });
684 1035
685 $table 1036 $table
686} 1037}
687 1038
688sub stats_window { 1039sub stats_window {
736 [2, 4, st_spd => "Spd", 10.54], 1087 [2, 4, st_spd => "Spd", 10.54],
737 [2, 5, st_wspd => "WSp", 10.54], 1088 [2, 5, st_wspd => "WSp", 10.54],
738 ) { 1089 ) {
739 my ($col, $row, $id, $label, $template) = @$_; 1090 my ($col, $row, $id, $label, $template) = @$_;
740 1091
741 $tbl->add ($col , $row, $STATWIDS->{$id} = new CFPlus::UI::Label 1092 $tbl->add_at ($col , $row, $STATWIDS->{$id} = new CFPlus::UI::Label
742 font => $FONT_FIXED, can_hover => 1, can_events => 1, valign => 0, 1093 font => $FONT_FIXED, can_hover => 1, can_events => 1, valign => 0,
743 align => +1, template => $template, tooltip => "#stat_$label"); 1094 align => +1, template => $template, tooltip => "#stat_$label");
744 $tbl->add ($col + 1, $row, $STATWIDS->{"$id\_lbl"} = new CFPlus::UI::Label 1095 $tbl->add_at ($col + 1, $row, $STATWIDS->{"$id\_lbl"} = new CFPlus::UI::Label
745 font => $FONT_FIXED, can_hover => 1, can_events => 1, fg => $color2, valign => 0, 1096 font => $FONT_FIXED, can_hover => 1, can_events => 1, fg => $color2, valign => 0,
746 align => -1, text => $label, tooltip => "#stat_$label"); 1097 align => -1, text => $label, tooltip => "#stat_$label");
747 } 1098 }
748 1099
749 $vb->add (new CFPlus::UI::FancyFrame 1100 $vb->add (new CFPlus::UI::FancyFrame
790 cold => ["Cold", 1141 cold => ["Cold",
791 "<b>Cold</b> (this is your resistance against cold spells like icestorm, snowstorm, ...)"], 1142 "<b>Cold</b> (this is your resistance against cold spells like icestorm, snowstorm, ...)"],
792 ghit => ["Ghost hit", 1143 ghit => ["Ghost hit",
793 "<b>Ghost hit</b> (special attack used by ghosts and ghost-like beings)"], 1144 "<b>Ghost hit</b> (special attack used by ghosts and ghost-like beings)"],
794 ); 1145 );
1146
795 for (qw/slow holyw conf fire depl magic 1147 for (qw/slow holyw conf fire depl magic
796 drain acid pois para deat phys 1148 drain acid pois para deat phys
797 blind fear tund elec cold ghit/) 1149 blind fear tund elec cold ghit/)
798 { 1150 {
799 $tbl2->add ($col, $row, 1151 $tbl2->add_at ($col, $row,
800 $STATWIDS->{"res_$_"} = 1152 $STATWIDS->{"res_$_"} =
801 new CFPlus::UI::Label 1153 new CFPlus::UI::Label
802 font => $FONT_FIXED, 1154 font => $FONT_FIXED,
803 template => "-100%", 1155 template => "-100%",
804 align => +1, 1156 align => +1,
805 valign => 0, 1157 valign => 0,
806 can_events => 1, 1158 can_events => 1,
807 can_hover => 1, 1159 can_hover => 1,
808 tooltip => $resist_names{$_}->[1], 1160 tooltip => $resist_names{$_}->[1],
809 ); 1161 );
810 $tbl2->add ($col + 1, $row, new CFPlus::UI::Image 1162 $tbl2->add_at ($col + 1, $row, new CFPlus::UI::Image
811 font => $FONT_FIXED, 1163 font => $FONT_FIXED,
812 can_hover => 1, 1164 can_hover => 1,
813 can_events => 1, 1165 can_events => 1,
814 path => "ui/resist/resist_$_.png", 1166 path => "ui/resist/resist_$_.png",
815 tooltip => $resist_names{$_}->[1], 1167 tooltip => $resist_names{$_}->[1],
816 ); 1168 );
817 $tbl2->add ($col + 2, $row, new CFPlus::UI::Label 1169 $tbl2->add_at ($col + 2, $row, new CFPlus::UI::Label
818 text => $resist_names{$_}->[0], 1170 text => $resist_names{$_}->[0],
819 font => $FONT_FIXED, 1171 font => $FONT_FIXED,
820 can_hover => 1, 1172 can_hover => 1,
821 can_events => 1, 1173 can_events => 1,
822 tooltip => $resist_names{$_}->[1], 1174 tooltip => $resist_names{$_}->[1],
855 return if $METASERVER_ATIME > time; 1207 return if $METASERVER_ATIME > time;
856 $METASERVER_ATIME = time + 60; 1208 $METASERVER_ATIME = time + 60;
857 1209
858 my $table = $METASERVER->{table}; 1210 my $table = $METASERVER->{table};
859 $table->clear; 1211 $table->clear;
860 $table->add (0, 0, my $label = new CFPlus::UI::Label max_w => $WIDTH * 0.8, text => "fetching server list..."); 1212 $table->add_at (0, 0, my $label = new CFPlus::UI::Label max_w => $WIDTH * 0.8, text => "fetching server list...");
861 1213
862 my $ok = 0; 1214 my $ok = 0;
863 1215
864 CFPlus::background { 1216 CFPlus::background {
865 my $ua = CFPlus::lwp_useragent; 1217 my $ua = CFPlus::lwp_useragent;
876 "The time this server has been running without being restarted.", 1228 "The time this server has been running without being restarted.",
877 "The server software version - a '+' indicates a Crossfire+ server.", 1229 "The server software version - a '+' indicates a Crossfire+ server.",
878 "Short information about this server provided by its admins.", 1230 "Short information about this server provided by its admins.",
879 ); 1231 );
880 my @col = qw(#Users Host Uptime Version Description); 1232 my @col = qw(#Users Host Uptime Version Description);
881 $table->add ($_, 0, new CFPlus::UI::Label 1233 $table->add_at ($_, 0, new CFPlus::UI::Label
882 can_hover => 1, can_events => 1, 1234 can_hover => 1, can_events => 1,
883 align => 0, fg => [1, 1, 0], 1235 align => 0, fg => [1, 1, 0],
884 text => $col[$_], tooltip => $tip[$_]) 1236 text => $col[$_], tooltip => $tip[$_])
885 for 0 .. $#col; 1237 for 0 .. $#col;
886 1238
887 my @align = qw(1 0 1 1 -1); 1239 my @align = qw(1 0 1 1 -1);
888 1240
889 my $y = 0; 1241 my $y = 0;
890 for my $m (
891 sort {
892 $b->{version} <=> $a->{version}
893 or $b->{users} <=> $a->{users}
894 }
895 @{ $msg->{servers} } 1242 for my $m (@{ $msg->{servers} }) {
896 ) {
897 my ($ip, $last, $host, $users, $version, $desc, $ibytes, $obytes, $uptime) = 1243 my ($ip, $last, $host, $users, $version, $desc, $ibytes, $obytes, $uptime, $highlight) =
898 @$m{qw(ip age hostname users version description ibytes obytes uptime)}; 1244 @$m{qw(ip age hostname users version description ibytes obytes uptime highlight)};
899 1245
900 for ($desc) { 1246 for ($desc) {
901 s/<br>/\n/gi; 1247 s/<br>/\n/gi;
902 s/<li>/\n· /gi; 1248 s/<li>/\n· /gi;
903 s/<.*?>//sgi; 1249 s/<.*?>//sgi;
914 1260
915 $m = [$users, $host, $uptime, $version, $desc]; 1261 $m = [$users, $host, $uptime, $version, $desc];
916 1262
917 $y++; 1263 $y++;
918 1264
919 $table->add (scalar @$m, $y, new CFPlus::UI::VBox children => [ 1265 $table->add_at (scalar @$m, $y, new CFPlus::UI::VBox children => [
920 (new CFPlus::UI::Button 1266 (new CFPlus::UI::Button
921 text => "Use", 1267 text => "Use",
922 tooltip => "Put this server into the <b>Host:Port</b> field", 1268 tooltip => "Put this server into the <b>Host:Port</b> field",
923 on_activate => sub { 1269 on_activate => sub {
924 $HOST_ENTRY->set_text ($CFG->{profile}{default}{host} = $host); 1270 $HOST_ENTRY->set_text ($CFG->{profile}{default}{host} = $host);
927 }, 1273 },
928 ), 1274 ),
929 (new CFPlus::UI::Empty expand => 1), 1275 (new CFPlus::UI::Empty expand => 1),
930 ]); 1276 ]);
931 1277
932 $table->add ($_, $y, new CFPlus::UI::Label 1278 $table->add_at ($_, $y, new CFPlus::UI::Label
933 max_w => $::WIDTH * 0.4, 1279 max_w => $::WIDTH * 0.4,
934 ellipsise => 0, 1280 ellipsise => 0,
935 align => $align[$_], 1281 align => $align[$_],
936 text => $m->[$_], 1282 text => $m->[$_],
937 tooltip => $tip[$_], 1283 tooltip => $tip[$_],
938 fg => ($m->[3] =~ /\+$/ ? [1, 1, 1] : [.7, .7, .7]), 1284 fg => ($highlight ? [1, 1, 1] : [.7, .7, .7]),
939 can_hover => 1, 1285 can_hover => 1,
940 can_events => 1, 1286 can_events => 1,
941 fontsize => 0.8) 1287 fontsize => 0.8)
942 for 0 .. $#$m; 1288 for 0 .. $#$m;
943 } 1289 }
978 1324
979 $vbox->add (new CFPlus::UI::FancyFrame 1325 $vbox->add (new CFPlus::UI::FancyFrame
980 label => "Connection Settings", 1326 label => "Connection Settings",
981 child => (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]), 1327 child => (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]),
982 ); 1328 );
983 $table->add (0, 2, new CFPlus::UI::Label valign => 0, align => 1, text => "Host:Port"); 1329 $table->add_at (0, 2, new CFPlus::UI::Label valign => 0, align => 1, text => "Host:Port");
984 1330
985 { 1331 {
986 $table->add (1, 2, my $vbox = new CFPlus::UI::VBox); 1332 $table->add_at (1, 2, my $vbox = new CFPlus::UI::VBox);
987 1333
988 $vbox->add ( 1334 $vbox->add (
989 $HOST_ENTRY = new CFPlus::UI::Entry 1335 $HOST_ENTRY = new CFPlus::UI::Entry
990 expand => 1, 1336 expand => 1,
991 text => $CFG->{profile}{default}{host}, 1337 text => $CFG->{profile}{default}{host},
992 tooltip => "The hostname or ip address of the Crossfire(+) server to connect to", 1338 tooltip => "The hostname or ip address of the Crossfire(+) server to connect to",
993 on_changed => sub { 1339 on_changed => sub {
994 my ($self, $value) = @_; 1340 my ($self, $value) = @_;
995 $CFG->{profile}{default}{host} = $value; 1341 $CFG->{profile}{default}{host} = $value;
996 0 1342 1
997 } 1343 }
998 ); 1344 );
999 1345
1000 $vbox->add (new CFPlus::UI::Button 1346 $vbox->add (new CFPlus::UI::Button
1001 expand => 1, 1347 expand => 1,
1002 text => "Server List", 1348 text => "Server List",
1003 other => $METASERVER, 1349 other => $METASERVER,
1004 tooltip => "Show a list of available crossfire servers", 1350 tooltip => "Show a list of available crossfire servers",
1005 on_activate => sub { $METASERVER->toggle_visibility; 0 }, 1351 on_activate => sub { $METASERVER->toggle_visibility; 0 },
1006 on_visibility_change => sub { $METASERVER->hide unless $_[1]; 0 }, 1352 on_visibility_change => sub { $METASERVER->hide unless $_[1]; 1 },
1007 ); 1353 );
1008 } 1354 }
1009 1355
1010 $table->add (0, 4, new CFPlus::UI::Label valign => 0, align => 1, text => "Username"); 1356 $table->add_at (0, 4, new CFPlus::UI::Label valign => 0, align => 1, text => "Username");
1011 $table->add (1, 4, new CFPlus::UI::Entry 1357 $table->add_at (1, 4, new CFPlus::UI::Entry
1012 text => $CFG->{profile}{default}{user}, 1358 text => $CFG->{profile}{default}{user},
1013 tooltip => "The name of your character on the server", 1359 tooltip => "The name of your character on the server",
1014 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value } 1360 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value; 1 }
1015 ); 1361 );
1016 1362
1017 $table->add (0, 5, new CFPlus::UI::Label valign => 0, align => 1, text => "Password"); 1363 $table->add_at (0, 5, new CFPlus::UI::Label valign => 0, align => 1, text => "Password");
1018 $table->add (1, 5, new CFPlus::UI::Entry 1364 $table->add_at (1, 5, new CFPlus::UI::Entry
1019 text => $CFG->{profile}{default}{password}, 1365 text => $CFG->{profile}{default}{password},
1020 hidden => 1, 1366 hidden => 1,
1021 tooltip => "The password for your character", 1367 tooltip => "The password for your character",
1022 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{password} = $value } 1368 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{password} = $value; 1 }
1023 ); 1369 );
1024 1370
1025 $table->add (0, 7, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Size"); 1371 $table->add_at (0, 7, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Size");
1026 $table->add (1, 7, new CFPlus::UI::Slider 1372 $table->add_at (1, 7, new CFPlus::UI::Slider
1027 force_w => 100, 1373 force_w => 100,
1028 range => [$CFG->{mapsize}, 10, 100, 0, 1], 1374 range => [$CFG->{mapsize}, 10, 100, 0, 1],
1029 tooltip => "This is the size of the portion of the map update the server sends you. " 1375 tooltip => "This is the size of the portion of the map update the server sends you. "
1030 . "If you set this to a high value you will be able to see further, " 1376 . "If you set this to a high value you will be able to see further, "
1031 . "but you also increase bandwidth requirements and latency. " 1377 . "but you also increase bandwidth requirements and latency. "
1032 . "This option is only used once at log-in.", 1378 . "This option is only used once at log-in.",
1033 on_changed => sub { my ($self, $value) = @_; $CFG->{mapsize} = $self->{range}[0] = $value = int $value; 0 }, 1379 on_changed => sub { my ($self, $value) = @_; $CFG->{mapsize} = $self->{range}[0] = $value = int $value; 1 },
1034 ); 1380 );
1035 1381
1036 $table->add (0, 8, new CFPlus::UI::Label valign => 0, align => 1, text => "Face Prefetch"); 1382 $table->add_at (0, 8, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Rate");
1037 $table->add (1, 8, new CFPlus::UI::CheckBox 1383 $table->add_at (1, 8, new CFPlus::UI::Entry
1038 state => $CFG->{face_prefetch}, 1384 text => $CFG->{output_rate},
1039 tooltip => "<b>Background Image Prefetch</b>\n\n" 1385 tooltip => "The maximum bandwidth in bytes per second that the server should not exceed "
1040 . "If enabled, the client automatically pre-fetches images from the server. " 1386 . "when sending data. When 0 or unset, the server "
1041 . "This might increase or create lag, but increases the chances " 1387 . "default will be used, which is usually around 100kb/s. Most servers will "
1042 . "of faces being ready for display when you encounter them. " 1388 . "dynamically find an optimal rate, so adjust this only when necessary.",
1043 . "It also uses up server bandwidth on every connect, "
1044 . "so only set it if you really need to prefetch images. "
1045 . "This option can be set and unset any time.",
1046 on_changed => sub { $CFG->{face_prefetch} = $_[1]; 0 }, 1389 on_changed => sub { $CFG->{output_rate} = $_[1]; 1 },
1047 ); 1390 );
1048 1391
1049 $table->add (0, 9, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Count"); 1392 $table->add_at (0, 9, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Count");
1050 $table->add (1, 9, new CFPlus::UI::Entry 1393 $table->add_at (1, 9, new CFPlus::UI::Entry
1051 text => $CFG->{output_count}, 1394 text => $CFG->{output_count},
1052 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.", 1395 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.",
1053 on_changed => sub { $CFG->{output_count} = $_[1]; 0 }, 1396 on_changed => sub { $CFG->{output_count} = $_[1]; 1 },
1054 ); 1397 );
1055 1398
1056 $table->add (0, 10, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Sync"); 1399 $table->add_at (0, 10, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Sync");
1057 $table->add (1, 10, new CFPlus::UI::Entry 1400 $table->add_at (1, 10, new CFPlus::UI::Entry
1058 text => $CFG->{output_sync}, 1401 text => $CFG->{output_sync},
1059 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.", 1402 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.",
1060 on_changed => sub { $CFG->{output_sync} = $_[1]; 0 }, 1403 on_changed => sub { $CFG->{output_sync} = $_[1]; 1 },
1061 ); 1404 );
1062 1405
1063 $table->add (1, 11, $LOGIN_BUTTON = new CFPlus::UI::Button 1406 $table->add_at (1, 11, $LOGIN_BUTTON = new CFPlus::UI::Button
1064 expand => 1, 1407 expand => 1,
1065 align => 0, 1408 align => 0,
1066 text => "Login", 1409 text => "Login",
1067 on_activate => sub { 1410 on_activate => sub {
1068 $CONN ? stop_game 1411 $CONN ? stop_game
1069 : start_game; 1412 : start_game;
1070 0 1413 1
1071 }, 1414 },
1072 ); 1415 );
1073 1416
1074 $table->add (0, 12, new CFPlus::UI::Label valign => 0, align => 1, text => "Chat Command"); 1417 $vbox->add (new CFPlus::UI::FancyFrame
1075 $table->add (1, 12, my $saycmd = new CFPlus::UI::Entry 1418 label => "Server Info",
1076 text => $CFG->{say_command}, 1419 child => ($SERVER_INFO = new CFPlus::UI::Label ellipsise => 0),
1077 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. "
1078 . "Usually you want to enter something like 'say' or 'shout' or 'gsay' here. "
1079 . "But you could also set it to <b>tell <i>playername</i></b> to only chat with that user.",
1080 on_changed => sub {
1081 my ($self, $value) = @_;
1082 $CFG->{say_command} = $value;
1083 0
1084 }
1085 ); 1420 );
1086 1421
1422 $vbox
1423}
1424
1425sub client_setup {
1426 my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1];
1427
1428 my $row = 0;
1429
1087 $table->add (0, 13, new CFPlus::UI::Label valign => 0, align => 1, text => "Tip of the day"); 1430 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Tip of the day");
1088 $table->add (1, 13, my $saycmd = new CFPlus::UI::CheckBox 1431 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
1089 state => $CFG->{show_tips}, 1432 state => $CFG->{show_tips},
1090 tooltip => "Show the <b>Tip of the day</b> window at startup?", 1433 tooltip => "Show the <b>Tip of the day</b> window at startup?",
1091 on_changed => sub { 1434 on_changed => sub {
1092 my ($self, $value) = @_; 1435 my ($self, $value) = @_;
1093 $CFG->{show_tips} = $value; 1436 $CFG->{show_tips} = $value;
1094 0 1437 0
1095 } 1438 }
1096 ); 1439 );
1097 1440
1098 $vbox->add (new CFPlus::UI::FancyFrame 1441 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Messages Window Size");
1099 label => "Server Info", 1442 $table->add_at (1, $row++, my $saycmd = new CFPlus::UI::Entry
1100 child => ($SERVER_INFO = new CFPlus::UI::Label ellipsise => 0), 1443 text => $CFG->{logview_max_par},
1101 ); 1444 tooltip => "This is maximum number of messages remembered in the <b>Messages</b> window. If the server "
1102 1445 . "sends more messages than this number, older messages get removed to save memory and "
1103 $vbox 1446 . "computing time. A value of <b>0</b> disables this feature, but that is not recommended.",
1104}
1105
1106sub message_window {
1107 my $window = new CFPlus::UI::Toplevel
1108 name => "message_window",
1109 title => "Messages",
1110 border_bg => [1, 1, 1, 1],
1111 x => "max",
1112 y => 0,
1113 force_w => $::WIDTH * 0.4,
1114 force_h => $::HEIGHT * 0.5,
1115 child => (my $vbox = new CFPlus::UI::VBox),
1116 has_close_button => 1;
1117
1118 $vbox->add ($LOGVIEW);
1119
1120 $vbox->add (my $input = new CFPlus::UI::Entry
1121 tooltip => "<b>Chat Box</b>. If you enter a text and press return/enter here, the current <i>communication command</i> "
1122 . "from the client setup will be prepended (e.g. <b>shout</b>, <b>chat</b>...). "
1123 . "If you prepend a slash (/), you will submit a command instead (similar to IRC). "
1124 . "A better way to submit commands (and the occasional chat command) is often the map command completer.",
1125 on_focus_in => sub { 1447 on_changed => sub {
1126 my ($input, $prev_focus) = @_; 1448 my ($self, $value) = @_;
1127 1449 $MESSAGE_WINDOW->set_max_para ($CFG->{logview_max_par} = $value*1);
1128 delete $input->{refocus_map};
1129
1130 if ($prev_focus == $MAPWIDGET && $input->{auto_activated}) {
1131 $input->{refocus_map} = 1;
1132 }
1133 delete $input->{auto_activated};
1134
1135 0 1450 0
1136 }, 1451 },
1137 on_activate => sub {
1138 my ($input, $text) = @_;
1139 $input->set_text ('');
1140
1141 if ($text =~ /^\/(.*)/) {
1142 $::CONN->user_send ($1);
1143 } else {
1144 my $say_cmd = $::CFG->{say_command} || 'say';
1145 $::CONN->user_send ("$say_cmd $text");
1146 }
1147 if ($input->{refocus_map}) {
1148 delete $input->{refocus_map};
1149 $MAPWIDGET->focus_in
1150 }
1151
1152 0
1153 },
1154 on_escape => sub {
1155 $MAPWIDGET->grab_focus;
1156
1157 0
1158 },
1159 );
1160
1161 $CONSOLE = {
1162 window => $window,
1163 input => $input,
1164 }; 1452 );
1165 1453
1166 $window 1454 $table
1167} 1455}
1168 1456
1169sub autopickup_setup { 1457sub autopickup_setup {
1458 my $r = new CFPlus::UI::ScrolledWindow (
1459 expand => 1,
1460 scroll_y => 1
1461 );
1170 my $table = new CFPlus::UI::Table; 1462 $r->add (my $table = new CFPlus::UI::Table
1463 row_expand => [0],
1464 col_expand => [0, 1, 0, 1],
1465 );
1171 1466
1172 for ( 1467 for (
1173 ["General", 0, 0, 1468 ["General", 0, 0,
1174 ["Enable autopickup" => PICKUP_NEWMODE, \$PICKUP_ENABLE], 1469 ["Enable autopickup" => PICKUP_NEWMODE, \$PICKUP_ENABLE],
1175 ["Inhibit autopickup" => PICKUP_INHIBIT], 1470 ["Inhibit autopickup" => PICKUP_INHIBIT],
1189 ["Boots" => PICKUP_BOOTS], 1484 ["Boots" => PICKUP_BOOTS],
1190 ["Gloves" => PICKUP_GLOVES], 1485 ["Gloves" => PICKUP_GLOVES],
1191 ["Cloaks" => PICKUP_CLOAK], 1486 ["Cloaks" => PICKUP_CLOAK],
1192 ], 1487 ],
1193 1488
1194 ["Readables", 2, 2, 1489 ["Readables", 2, 0,
1195 ["Spellbooks" => PICKUP_SPELLBOOK], 1490 ["Spellbooks" => PICKUP_SPELLBOOK],
1196 ["Skillscrolls" => PICKUP_SKILLSCROLL], 1491 ["Skillscrolls" => PICKUP_SKILLSCROLL],
1197 ["Normal Books/Scrolls" => PICKUP_READABLES], 1492 ["Normal Books/Scrolls" => PICKUP_READABLES],
1198 ], 1493 ],
1199 ["Misc", 2, 7, 1494 ["Misc", 2, 5,
1200 ["Food" => PICKUP_FOOD], 1495 ["Food" => PICKUP_FOOD],
1201 ["Drinks" => PICKUP_DRINK], 1496 ["Drinks" => PICKUP_DRINK],
1202 ["Valuables (Money, Gems)" => PICKUP_VALUABLES], 1497 ["Valuables (Money, Gems)" => PICKUP_VALUABLES],
1203 ["Keys" => PICKUP_KEY], 1498 ["Keys" => PICKUP_KEY],
1204 ["Magical Items" => PICKUP_MAGICAL], 1499 ["Magical Items" => PICKUP_MAGICAL],
1205 ["Potions" => PICKUP_POTION], 1500 ["Potions" => PICKUP_POTION],
1206 ["Magic Devices" => PICKUP_MAGIC_DEVICE], 1501 ["Magic Devices" => PICKUP_MAGIC_DEVICE],
1207 ["Ignore cursed" => PICKUP_NOT_CURSED], 1502 ["Ignore cursed" => PICKUP_NOT_CURSED],
1208 ["Jewelery" => PICKUP_JEWELS], 1503 ["Jewelery" => PICKUP_JEWELS],
1504 ["Flesh" => PICKUP_FLESH],
1209 ], 1505 ],
1210 ["Weight/Value ratio", 2, 17] 1506 ["Weight/Value ratio", 2, 17]
1211 ) 1507 )
1212 { 1508 {
1213 my ($title, $x, $y, @bits) = @$_; 1509 my ($title, $x, $y, @bits) = @$_;
1214 $table->add ($x, $y, new CFPlus::UI::Label text => $title, align => 1, fg => [1, 1, 0]); 1510 $table->add_at ($x, $y, new CFPlus::UI::Label text => $title, align => 1, fg => [1, 1, 0]);
1215 1511
1216 for (@bits) { 1512 for (@bits) {
1217 ++$y; 1513 ++$y;
1218 1514
1219 my $mask = $_->[1]; 1515 my $mask = $_->[1];
1220 $table->add ($x , $y, new CFPlus::UI::Label text => $_->[0], align => 1, expand => 1); 1516 $table->add_at ($x , $y, new CFPlus::UI::Label text => $_->[0], align => 1, expand => 1);
1221 $table->add ($x+1, $y, my $checkbox = new CFPlus::UI::CheckBox 1517 $table->add_at ($x+1, $y, my $checkbox = new CFPlus::UI::CheckBox
1222 state => $::CFG->{pickup} & $mask, 1518 state => $::CFG->{pickup} & $mask,
1223 on_changed => sub { 1519 on_changed => sub {
1224 my ($box, $value) = @_; 1520 my ($box, $value) = @_;
1225 1521
1226 if ($value) { 1522 if ($value) {
1237 1533
1238 ${$_->[2]} = $checkbox if $_->[2]; 1534 ${$_->[2]} = $checkbox if $_->[2];
1239 } 1535 }
1240 } 1536 }
1241 1537
1242 $table->add (2, 18, new CFPlus::UI::ValSlider 1538 $table->add_at (2, 18, new CFPlus::UI::ValSlider
1243 range => [$::CFG->{pickup} & 0xF, 0, 16, 1, 1], 1539 range => [$::CFG->{pickup} & 0xF, 0, 16, 1, 1],
1244 template => ">= 99", 1540 template => ">= 99",
1245 to_value => sub { ">= " . 5 * $_[0] }, 1541 to_value => sub { ">= " . 5 * $_[0] },
1246 on_changed => sub { 1542 on_changed => sub {
1247 my ($slider, $value) = @_; 1543 my ($slider, $value) = @_;
1250 $::CFG->{pickup} |= int $value 1546 $::CFG->{pickup} |= int $value
1251 if $value; 1547 if $value;
1252 1; 1548 1;
1253 }); 1549 });
1254 1550
1255 $table->add (3, 18, new CFPlus::UI::Button 1551 $table->add_at (3, 18, new CFPlus::UI::Button
1256 text => "set", 1552 text => "set",
1257 on_activate => sub { 1553 on_activate => sub {
1258 $::CONN->send_command ("pickup $::CFG->{pickup}") 1554 $::CONN->send_command ("pickup $::CFG->{pickup}")
1259 if defined $::CONN; 1555 if defined $::CONN;
1260 0 1556 0
1261 }); 1557 });
1262 1558
1263 $table 1559 $r
1264} 1560}
1265 1561
1266my %SORT_ORDER = ( 1562my %SORT_ORDER = (
1267 type => undef, 1563 type => undef,
1268 mtime => sub { sort { 1564 mtime => sub {
1565 my $NOW = time;
1566 sort {
1567 my $atime = $a->{mtime} - $NOW; $atime = $atime < 5 * 60 ? int $atime / 60 : 6;
1568 my $btime = $b->{mtime} - $NOW; $btime = $btime < 5 * 60 ? int $btime / 60 : 6;
1569
1269 ($a->{flags} & F_LOCKED) <=> ($b->{flags} & F_LOCKED) 1570 ($a->{flags} & F_LOCKED) <=> ($b->{flags} & F_LOCKED)
1270 or $b->{mtime} <=> $a->{mtime} 1571 or $btime <=> $atime
1271 or $a->{type} <=> $b->{type} 1572 or $a->{type} <=> $b->{type}
1573 } @_
1272 } @_ }, 1574 },
1273 weight => sub { sort { 1575 weight => sub { sort {
1274 $a->{weight} * ($a->{nrof} || 1) <=> $b->{weight} * ($b->{nrof} || 1) 1576 $a->{weight} * ($a->{nrof} || 1) <=> $b->{weight} * ($b->{nrof} || 1)
1275 or $a->{type} <=> $b->{type} 1577 or $a->{type} <=> $b->{type}
1276 } @_ }, 1578 } @_ },
1277); 1579);
1306 $sw1->add ($INV = new CFPlus::UI::Inventory); 1608 $sw1->add ($INV = new CFPlus::UI::Inventory);
1307 $INV->set_sort_order ($SORT_ORDER{$::CFG->{inv_sort}}); 1609 $INV->set_sort_order ($SORT_ORDER{$::CFG->{inv_sort}});
1308 1610
1309 $hb->add (my $vb2 = new CFPlus::UI::VBox); 1611 $hb->add (my $vb2 = new CFPlus::UI::VBox);
1310 1612
1311 $vb2->add ($INV_RIGHT_HB = new CFPlus::UI::HBox); 1613 $vb2->add ($INVR_HB = new CFPlus::UI::HBox);
1312 1614
1313 $vb2->add (my $sw2 = new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1); 1615 $vb2->add (my $sw2 = new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1);
1314 $sw2->add ($INVR = new CFPlus::UI::Inventory); 1616 $sw2->add ($INVR = new CFPlus::UI::Inventory);
1315 1617
1316 # XXX: Call after $INVR = ... because set_opencont sets the items 1618 # XXX: Call after $INVR = ... because set_opencont sets the items
1317 CFPlus::Protocol::set_opencont ($::CONN, 0, "Floor"); 1619 CFPlus::Protocol::set_opencont ($::CONN, 0, "Floor");
1318 1620
1319 $hb 1621 $hb
1622}
1623
1624sub media_window {
1625 my $vb = new CFPlus::UI::VBox;
1626
1627 $vb->add (new CFPlus::UI::FancyFrame
1628 label => "Currently playing music",
1629 child => new CFPlus::UI::ScrolledWindow scroll_x => 1, scroll_y => 0,
1630 child => ($MUSIC_PLAYING_WIDGET = new CFPlus::UI::Label ellipsise => 0, fontsize => 0.8),
1631 );
1632
1633 $vb->add (new CFPlus::UI::FancyFrame
1634 label => "Other media used in this session",
1635 expand => 1,
1636 child => ($LICENSE_WIDGET = new CFPlus::UI::TextScroller
1637 expand => 1, fontsize => 0.8, padding_x => 4, padding_y => 4),
1638 );
1639
1640 $vb
1641}
1642
1643sub add_license {
1644 my ($meta) = @_;
1645
1646 $meta = $meta->{meta}
1647 or return;
1648
1649 $meta->{license} || $meta->{author} || $meta->{source}
1650 or return;
1651
1652 $LICENSE_WIDGET->add_paragraph ({
1653 fg => [1, 1, 1, 1],
1654 markup => "<small>"
1655 . "<b>Name:</b> " . (CFPlus::asxml $meta->{name}) . "\n"
1656 . "<b>Author:</b> " . (CFPlus::asxml $meta->{author}) . "\n"
1657 . "<b>Source:</b> " . (CFPlus::asxml $meta->{source}) . "\n"
1658 . "<b>License:</b> " . (CFPlus::asxml $meta->{license}) . "\n"
1659 . "</small>",
1660 });
1661 $LICENSE_WIDGET->scroll_to_bottom;
1320} 1662}
1321 1663
1322sub toggle_player_page { 1664sub toggle_player_page {
1323 my ($widget) = @_; 1665 my ($widget) = @_;
1324 1666
1341 has_close_button => 1 1683 has_close_button => 1
1342 ; 1684 ;
1343 1685
1344 my $ntb = 1686 my $ntb =
1345 $PL_NOTEBOOK = 1687 $PL_NOTEBOOK =
1346 new CFPlus::UI::Notebook expand => 1, debug => 1; 1688 new CFPlus::UI::Notebook expand => 1;
1347 1689
1348 $ntb->add ( 1690 $ntb->add_tab (
1349 "Statistics (F2)" => $STATS_PAGE = stats_window, 1691 "Statistics (F2)" => $STATS_PAGE = stats_window,
1350 "Shows statistics, where all your Stats and Resistances are shown." 1692 "Shows statistics, where all your Stats and Resistances are shown."
1351 ); 1693 );
1352 $ntb->add ( 1694 $ntb->add_tab (
1353 "Skills (F3)" => $SKILL_PAGE = skill_window, 1695 "Skills (F3)" => $SKILL_PAGE = skill_window,
1354 "Shows all your Skills." 1696 "Shows all your Skills."
1355 ); 1697 );
1356 1698
1357 my $spellsw = new CFPlus::UI::ScrolledWindow (expand => 1, scroll_y => 1); 1699 my $spellsw = $SPELL_PAGE = new CFPlus::UI::ScrolledWindow (expand => 1, scroll_y => 1);
1358 $spellsw->add ($SPELL_PAGE = new CFPlus::UI::SpellList); 1700 $spellsw->add ($SPELL_LIST = new CFPlus::UI::SpellList);
1359 $ntb->add ( 1701 $ntb->add_tab (
1360 "Spellbook (F4)" => $spellsw, 1702 "Spellbook (F4)" => $spellsw,
1361 "Displays all spells you have and lets you edit keyboard shortcuts for them." 1703 "Displays all spells you have and lets you edit keyboard shortcuts for them."
1362 ); 1704 );
1363 $ntb->add ( 1705 $ntb->add_tab (
1364 "Inventory (F5)" => $INVENTORY_PAGE = inventory_widget, 1706 "Inventory (F5)" => $INVENTORY_PAGE = inventory_widget,
1365 "Toggles the inventory window, where you can manage your loot (or treasures :). " 1707 "Toggles the inventory window, where you can manage your loot (or treasures :). "
1366 . "You can also hit the <b>Tab</b>-key to show/hide the Inventory." 1708 . "You can also hit the <b>Tab</b>-key to show/hide the Inventory."
1367 ); 1709 );
1710 $ntb->add_tab (Pickup => autopickup_setup,
1711 "Configure autopickup settings, i.e. which items you will pick up automatically when walking (or running) over them.");
1712
1713 $ntb->add_tab (Media => media_window,
1714 "License, Author and Source info for media sent by the server.");
1368 1715
1369 $ntb->set_current_page ($INVENTORY_PAGE); 1716 $ntb->set_current_page ($INVENTORY_PAGE);
1370 1717
1371 $plwin->add ($ntb); 1718 $plwin->add ($ntb);
1372 $plwin 1719 $plwin
1373} 1720}
1374 1721
1375sub update_bindings {
1376 $BIND_UPD_CB->() if $BIND_UPD_CB;
1377}
1378
1379sub keyboard_setup { 1722sub keyboard_setup {
1380 my $binding_list = new CFPlus::UI::VBox; 1723 CFPlus::Macro::keyboard_setup
1381
1382 my $refresh;
1383 $refresh = $BIND_UPD_CB = sub {
1384 $binding_list->clear ();
1385
1386 return unless $PROFILE;
1387
1388 for my $mod (keys %{$PROFILE->{bindings}}) {
1389 for my $sym (keys %{$PROFILE->{bindings}{$mod}}) {
1390 my $cmds = $PROFILE->{bindings}{$mod}{$sym};
1391 next unless ref $cmds eq 'ARRAY' and @$cmds > 0;
1392
1393 my $lbl = join "; ", @$cmds;
1394 my $nam = CFPlus::BindingEditor::keycombo_to_name ($mod, $sym);
1395 $binding_list->add (my $hb = new CFPlus::UI::HBox);
1396 $hb->add (new CFPlus::UI::Button
1397 text => "delete",
1398 tooltip => "Deletes the binding",
1399 on_activate => sub {
1400 $binding_list->remove ($hb);
1401 delete $PROFILE->{bindings}{$mod}{$sym};
1402 0
1403 });
1404
1405 $hb->add (new CFPlus::UI::Button
1406 text => "edit",
1407 tooltip => "Edits the binding",
1408 on_activate => sub {
1409 $::BIND_EDITOR->set_binding (
1410 $mod, $sym, $PROFILE->{bindings}{$mod}{$sym},
1411 sub {
1412 my ($nmod, $nsym, $ncmds) = @_;
1413 $::BIND_EDITOR->cfg_unbind ($mod, $sym);
1414 $::BIND_EDITOR->cfg_bind ($nmod, $nsym, $ncmds);
1415 $refresh->();
1416 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1417 $SETUP_DIALOG->show;
1418 },
1419 sub {
1420 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1421 $SETUP_DIALOG->show;
1422 });
1423 $::BIND_EDITOR->show;
1424 $SETUP_DIALOG->hide;
1425 0
1426 });
1427
1428 $hb->add (new CFPlus::UI::Label text => "(Key: $nam)");
1429 $hb->add (new CFPlus::UI::Label text => $lbl, expand => 1);
1430 }
1431 }
1432 };
1433
1434 my $vb = new CFPlus::UI::VBox;
1435 $vb->add (new CFPlus::UI::FancyFrame
1436 label => "Options",
1437 child => (my $hb = new CFPlus::UI::HBox),
1438 );
1439 $hb->add (new CFPlus::UI::Label text => "only shift-up stops fire");
1440 $hb->add (new CFPlus::UI::CheckBox
1441 expand => 1,
1442 state => $CFG->{shift_fire_stop},
1443 tooltip => "If this checkbox is enabled you will stop fire only if you stop pressing shift",
1444 on_changed => sub {
1445 my ($cbox, $value) = @_;
1446 $CFG->{shift_fire_stop} = $value;
1447 0
1448 });
1449
1450 $vb->add (new CFPlus::UI::FancyFrame
1451 label => "Bindings",
1452 child => $binding_list);
1453 $vb->add (my $hb = new CFPlus::UI::HBox);
1454
1455 $hb->add (new CFPlus::UI::Button
1456 text => "record new",
1457 expand => 1,
1458 tooltip => "This button opens the binding editor with an empty binding.",
1459 on_activate => sub {
1460 $::BIND_EDITOR->set_binding (undef, undef, [],
1461 sub {
1462 my ($mod, $sym, $cmds) = @_;
1463 $::BIND_EDITOR->cfg_bind ($mod, $sym, $cmds);
1464 $refresh->();
1465 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1466 $SETUP_DIALOG->show;
1467 },
1468 sub {
1469 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1470 $SETUP_DIALOG->show;
1471 },
1472 );
1473 $SETUP_DIALOG->hide;
1474 $::BIND_EDITOR->show;
1475 0
1476 },
1477 );
1478
1479 $hb->add (new CFPlus::UI::Button
1480 text => "close",
1481 tooltip => "Closes the binding window",
1482 expand => 1,
1483 on_activate => sub {
1484 $SETUP_DIALOG->hide;
1485 0
1486 }
1487 );
1488
1489 $refresh->();
1490
1491 $vb
1492} 1724}
1493 1725
1494sub help_window { 1726sub help_window {
1495 my $win = new CFPlus::UI::Toplevel 1727 my $win = new CFPlus::UI::Toplevel
1496 x => 'center', 1728 x => 'center',
1641 on_activate => sub { $QUIT_DIALOG->hide; 0 }, 1873 on_activate => sub { $QUIT_DIALOG->hide; 0 },
1642 ); 1874 );
1643 $hb->add (new CFPlus::UI::Button 1875 $hb->add (new CFPlus::UI::Button
1644 text => "Quit anyway", 1876 text => "Quit anyway",
1645 expand => 1, 1877 expand => 1,
1646 on_activate => sub { exit }, 1878 on_activate => sub { Event::unloop_all },
1647 ); 1879 );
1648 } 1880 }
1649 1881
1650 $QUIT_DIALOG->show; 1882 $QUIT_DIALOG->show;
1651 $QUIT_DIALOG->grab_focus; 1883 $QUIT_DIALOG->grab_focus;
1653 1885
1654sub show_tip_of_the_day { 1886sub show_tip_of_the_day {
1655 # find all tips 1887 # find all tips
1656 my @tod = CFPlus::Pod::find tip_of_the_day => "*"; 1888 my @tod = CFPlus::Pod::find tip_of_the_day => "*";
1657 1889
1658 my $todindex = $CFPlus::DB_STATE->get ("tip_of_the_day"); 1890 CFPlus::DB::get state => "tip_of_the_day", sub {
1891 my ($todindex) = @_;
1659 $todindex = 0 if $todindex >= @tod; 1892 $todindex = 0 if $todindex >= @tod;
1660 $CFPlus::DB_STATE->put (tip_of_the_day => $todindex + 1); 1893 CFPlus::DB::put state => tip_of_the_day => $todindex + 1, sub { };
1661 1894
1662 # create dialog 1895 # create dialog
1663 my $dialog; 1896 my $dialog;
1664 1897
1665 my $close = sub { 1898 my $close = sub {
1666 $dialog->destroy; 1899 $dialog->destroy;
1900 };
1901
1902 $dialog = new CFPlus::UI::Toplevel
1903 x => "center",
1904 y => "center",
1905 z => 3,
1906 name => 'tip_of_the_day',
1907 force_w => int $WIDTH * 4/9,
1908 force_h => int $WIDTH * 2/9,
1909 title => "Tip of the day #" . (1 + $todindex),
1910 child => my $vbox = new CFPlus::UI::VBox,
1911 has_close_button => 1,
1912 on_delete => $close,
1913 ;
1914
1915 $vbox->add (my $viewer = new CFPlus::UI::TextScroller
1916 expand => 1, fontsize => 0.8, padding_x => 4, padding_y => 4);
1917 $viewer->add_paragraph (CFPlus::Pod::as_paragraphs CFPlus::Pod::section_of $tod[$todindex]);
1918
1919 $vbox->add (my $table = new CFPlus::UI::Table col_expand => [0, 1]);
1920
1921 $table->add_at (0, 0, new CFPlus::UI::Button
1922 text => "Close",
1923 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>.",
1924 on_activate => $close,
1925 );
1926
1927 $table->add_at (2, 0, new CFPlus::UI::Button
1928 text => "Next",
1929 tooltip => "Show the next <b>Tip of the day</b>.",
1930 on_activate => sub {
1931 $close->();
1932 &show_tip_of_the_day;
1933 },
1934 );
1935
1936 $dialog->show;
1667 }; 1937 };
1668
1669 $dialog = new CFPlus::UI::Toplevel
1670 x => "center",
1671 y => "center",
1672 z => 3,
1673 name => 'tip_of_the_day',
1674 force_w => int $WIDTH * 4/9,
1675 force_h => int $WIDTH * 2/9,
1676 title => "Tip of the day #" . (1 + $todindex),
1677 child => my $vbox = new CFPlus::UI::VBox,
1678 has_close_button => 1,
1679 on_delete => $close,
1680 ;
1681
1682 $vbox->add (my $viewer = new CFPlus::UI::TextScroller
1683 expand => 1, fontsize => 0.8, padding_x => 4, padding_y => 4);
1684 $viewer->add_paragraph (CFPlus::Pod::as_paragraphs CFPlus::Pod::section_of $tod[$todindex]);
1685
1686 $vbox->add (my $table = new CFPlus::UI::Table);
1687
1688 $table->add (0, 0, new CFPlus::UI::Button
1689 text => "Close",
1690 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>.",
1691 on_activate => $close,
1692 );
1693
1694 $table->add (2, 0, new CFPlus::UI::Button
1695 text => "Next",
1696 tooltip => "Show the next <b>Tip of the day</b>.",
1697 on_activate => sub {
1698 $close->();
1699 &show_tip_of_the_day;
1700 },
1701 );
1702
1703 $dialog->show;
1704} 1938}
1705 1939
1706sub sdl_init { 1940sub sdl_init {
1707 CFPlus::SDL_Init 1941 CFPlus::SDL_Init
1708 and die "SDL::Init failed!\n"; 1942 and die "SDL::Init failed!\n";
1709} 1943}
1710 1944
1711sub video_init { 1945sub video_init {
1712 sdl_init;
1713
1714 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} >= @SDL_MODES; 1946 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} >= @SDL_MODES;
1715 1947
1716 my ($old_w, $old_h) = ($WIDTH, $HEIGHT); 1948 my ($old_w, $old_h) = ($WIDTH, $HEIGHT);
1717 1949
1718 ($WIDTH, $HEIGHT) = @{ $SDL_MODES[$CFG->{sdl_mode}] }; 1950 ($WIDTH, $HEIGHT, my ($rgb, $alpha)) = @{ $SDL_MODES[$CFG->{sdl_mode}] };
1719 $FULLSCREEN = $CFG->{fullscreen}; 1951 $FULLSCREEN = $CFG->{fullscreen};
1720 $FAST = $CFG->{fast}; 1952 $FAST = $CFG->{fast};
1721 1953
1722 CFPlus::SDL_SetVideoMode $WIDTH, $HEIGHT, $FULLSCREEN 1954 CFPlus::SDL_SetVideoMode $WIDTH, $HEIGHT, $rgb, $alpha, $FULLSCREEN
1723 or die "SDL_SetVideoMode failed: " . (CFPlus::SDL_GetError) . "\n"; 1955 or die "SDL_SetVideoMode failed: " . (CFPlus::SDL_GetError) . "\n";
1724 1956
1725 $SDL_ACTIVE = 1; 1957 $SDL_ACTIVE = 1;
1726 $LAST_REFRESH = time - 0.01; 1958 $LAST_REFRESH = time - 0.01;
1727 1959
1742 padding => 0, 1974 padding => 0,
1743 z => 100, 1975 z => 100,
1744 force_x => "max", 1976 force_x => "max",
1745 force_y => 0; 1977 force_y => 0;
1746 $DEBUG_STATUS->show; 1978 $DEBUG_STATUS->show;
1747
1748 $BIND_EDITOR = new CFPlus::BindingEditor (x => "max", y => 0);
1749 1979
1750 $STATUSBOX = new CFPlus::UI::Statusbox; 1980 $STATUSBOX = new CFPlus::UI::Statusbox;
1751 $STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", timeout => 864000, pri => -100, color => [1, 1, 1, 0.8]); 1981 $STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", timeout => 864000, pri => -100, color => [1, 1, 1, 0.8]);
1752 1982
1753 (new CFPlus::UI::Frame 1983 (new CFPlus::UI::Frame
1771 2001
1772 $MAPWIDGET = new CFPlus::MapWidget; 2002 $MAPWIDGET = new CFPlus::MapWidget;
1773 $MAPWIDGET->connect (activate_console => sub { 2003 $MAPWIDGET->connect (activate_console => sub {
1774 my ($mapwidget, $preset) = @_; 2004 my ($mapwidget, $preset) = @_;
1775 2005
1776 if ($CONSOLE) { 2006 $MESSAGE_WINDOW->activate_console ($preset)
1777 $CONSOLE->{input}->{auto_activated} = 1; 2007 if $MESSAGE_WINDOW;
1778 $CONSOLE->{input}->grab_focus;
1779
1780 if ($preset && $CONSOLE->{input}->get_text eq '') {
1781 $CONSOLE->{input}->set_text ($preset);
1782 }
1783 }
1784 }); 2008 });
1785 $MAPWIDGET->show; 2009 $MAPWIDGET->show;
1786 $MAPWIDGET->grab_focus; 2010 $MAPWIDGET->grab_focus;
1787
1788 $LOGVIEW = new CFPlus::UI::TextScroller
1789 expand => 1,
1790 font => $FONT_FIXED,
1791 fontsize => $::CFG->{log_fontsize},
1792 indent => -4,
1793 can_hover => 1,
1794 can_events => 1,
1795 tooltip => "<b>Server Log</b>. This text viewer contains all the messages sent by the server.",
1796 ;
1797 2011
1798 $SETUP_DIALOG = new CFPlus::UI::Toplevel 2012 $SETUP_DIALOG = new CFPlus::UI::Toplevel
1799 title => "Setup", 2013 title => "Setup",
1800 name => "setup_dialog", 2014 name => "setup_dialog",
1801 x => 'center', 2015 x => 'center',
1805 force_h => $::HEIGHT * 0.6, 2019 force_h => $::HEIGHT * 0.6,
1806 has_close_button => 1, 2020 has_close_button => 1,
1807 ; 2021 ;
1808 2022
1809 $METASERVER = metaserver_dialog; 2023 $METASERVER = metaserver_dialog;
2024 $MESSAGE_WINDOW = new CFPlus::UI::MessageWindow;
1810 2025
1811 $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new CFPlus::UI::Notebook expand => 1, debug => 1, 2026 $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new CFPlus::UI::Notebook expand => 1, debug => 1,
1812 filter => new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1); 2027 filter => new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1);
1813 2028
1814 $SETUP_NOTEBOOK->add (Server => $SETUP_SERVER = server_setup, 2029 $SETUP_NOTEBOOK->add_tab (Server => $SETUP_SERVER = server_setup,
1815 "Configure the server to play on, your username, password and other server-related options."); 2030 "Configure the server to play on, your username, password and other server-related options.");
1816 $SETUP_NOTEBOOK->add (Pickup => autopickup_setup, 2031 $SETUP_NOTEBOOK->add_tab (Client => client_setup,
1817 "Configure autopickup settings, i.e. which items you will pick up automatically when walking (or running) over them."); 2032 "Configure various client-specific settings.");
1818 $SETUP_NOTEBOOK->add (Graphics => graphics_setup, 2033 $SETUP_NOTEBOOK->add_tab (Graphics => graphics_setup,
1819 "Configure the video mode, performance, fonts and other graphical aspects of the game."); 2034 "Configure the video mode, performance, fonts and other graphical aspects of the game.");
1820 $SETUP_NOTEBOOK->add (Audio => audio_setup, 2035 $SETUP_NOTEBOOK->add_tab (Audio => audio_setup,
1821 "Configure the use of audio, sound effects and background music."); 2036 "Configure the use of audio, sound effects and background music.");
1822 $SETUP_NOTEBOOK->add (Keyboard => $SETUP_KEYBOARD = keyboard_setup, 2037 $SETUP_NOTEBOOK->add_tab (Keyboard => $SETUP_KEYBOARD = keyboard_setup,
1823 "Lets you define, edit and delete key bindings." 2038 "Lets you define, edit and delete key bindings."
1824 . "There is a shortcut for making bindings: <b>Control-Insert</b> opens the binding editor " 2039 . "There is a shortcut for making bindings: <b>Control-Insert</b> opens the binding editor "
1825 . "with nothing set and the recording started. After doing the actions you " 2040 . "with nothing set and the recording started. After doing the actions you "
1826 . "want to record press <b>Insert</b> and you will be asked to press a key-combo. " 2041 . "want to record press <b>Insert</b> and you will be asked to press a key-combo. "
1827 . "After pressing the combo the binding will be saved automatically and the " 2042 . "After pressing the combo the binding will be saved automatically and the "
1828 . "binding editor closes"); 2043 . "binding editor closes");
1829 $SETUP_NOTEBOOK->add (Debug => debug_setup, 2044 $SETUP_NOTEBOOK->add_tab (Debug => debug_setup,
1830 "Some debuggin' options. Do not ask."); 2045 "Some debuggin' options. Do not ask.");
1831 2046
1832 $BUTTONBAR = new CFPlus::UI::Buttonbar x => 0, y => 0, z => 200; # put on top 2047 $BUTTONBAR = new CFPlus::UI::Buttonbar x => 0, y => 0, z => 200; # put on top
1833 2048
1834 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Setup", other => $SETUP_DIALOG, 2049 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Setup", other => $SETUP_DIALOG,
1835 tooltip => "Toggles a dialog where you can configure all aspects of this client."); 2050 tooltip => "Toggles a dialog where you can configure all aspects of this client.");
1836 2051
1837 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW = message_window, 2052 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW,
1838 tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server."); 2053 tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server.");
1839 2054
1840 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 2055 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
1841 2056
1842 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Playerbook", other => player_window, 2057 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Playerbook", other => player_window,
1854 ); 2069 );
1855 2070
1856 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Help!", other => $HELP_WINDOW = help_window, 2071 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Help!", other => $HELP_WINDOW = help_window,
1857 tooltip => "View Documentation"); 2072 tooltip => "View Documentation");
1858 2073
2074
1859 $BUTTONBAR->add (new CFPlus::UI::Button 2075 $BUTTONBAR->add (new CFPlus::UI::Button
1860 text => "Quit", 2076 text => "Quit",
1861 tooltip => "Terminates the program", 2077 tooltip => "Terminates the program",
1862 on_activate => sub { 2078 on_activate => sub {
1863 if ($CONN) { 2079 if ($CONN) {
1864 open_quit_dialog; 2080 open_quit_dialog;
1865 } else { 2081 } else {
1866 exit; 2082 Event::unloop_all;
1867 } 2083 }
1868 0 2084 0
1869 }, 2085 },
1870 ); 2086 );
1871 2087
1872 $BUTTONBAR->show; 2088 $BUTTONBAR->show;
1873 $SETUP_DIALOG->show; 2089 $SETUP_DIALOG->show;
2090 $MESSAGE_WINDOW->show;
1874 } 2091 }
1875 2092
1876 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]); 2093 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);
1877} 2094}
1878 2095
1880 CFPlus::OpenGL::shutdown; 2097 CFPlus::OpenGL::shutdown;
1881 2098
1882 undef $SDL_ACTIVE; 2099 undef $SDL_ACTIVE;
1883} 2100}
1884 2101
1885my @bgmusic = qw(game1.ogg game2.ogg game3.ogg game5.ogg game6.ogg ross1.ogg ross2.ogg ross3.ogg ross4.ogg ross5.ogg); #d#
1886my $bgmusic;#TODO#hack#d#
1887
1888sub audio_channel_finished {
1889 my ($channel) = @_;
1890
1891 #warn "channel $channel finished\n";#d#
1892}
1893
1894sub audio_music_finished {
1895 return unless $CFG->{bgm_enable};
1896
1897 # TODO: hack, do play loop and mood music
1898 $bgmusic = new_from_file CFPlus::MixMusic CFPlus::find_rcfile "music/$bgmusic[0]";
1899 $bgmusic->play (0);
1900
1901 push @bgmusic, shift @bgmusic;
1902}
1903
1904sub audio_init {
1905 if ($CFG->{audio_enable}) {
1906 if (open my $fh, "<", CFPlus::find_rcfile "sounds/config") {
1907 $SDL_MIXER = !CFPlus::Mix_OpenAudio;
1908
1909 unless ($SDL_MIXER) {
1910 status "Unable to open sound device: there will be no sound";
1911 return;
1912 }
1913
1914 CFPlus::Mix_AllocateChannels 8;
1915 CFPlus::MixMusic::volume $CFG->{bgm_volume} * 128;
1916
1917 audio_music_finished;
1918
1919 while (<$fh>) {
1920 next if /^\s*#/;
1921 next if /^\s*$/;
1922
1923 my ($file, $volume, $event) = split /\s+/, $_, 3;
1924
1925 push @SOUNDS, "$volume,$file";
1926
1927 $AUDIO_CHUNKS{"$volume,$file"} ||= do {
1928 my $chunk = new_from_file CFPlus::MixChunk CFPlus::find_rcfile "sounds/$file";
1929 $chunk->volume ($volume * 128 / 100);
1930 $chunk
1931 };
1932 }
1933 } else {
1934 status "unable to open sound config: $!";
1935 }
1936 }
1937}
1938
1939sub audio_shutdown {
1940 CFPlus::Mix_CloseAudio if $SDL_MIXER;
1941 undef $SDL_MIXER;
1942 @SOUNDS = ();
1943 %AUDIO_CHUNKS = ();
1944}
1945
1946my %animate_object; 2102my %animate_object;
1947my $animate_timer; 2103my $animate_timer;
1948 2104
1949my $fps = 9; 2105my $fps = 9;
1950 2106
1951my %demo;#d#
1952
1953sub force_refresh { 2107sub force_refresh {
2108 if ($ENV{CFPLUS_DEBUG} & 4) {
1954 $fps = $fps * 0.95 + 1 / (($NOW - $LAST_REFRESH) || 0.1) * 0.05; 2109 $fps = $fps * 0.98 + 1 / (($NOW - $LAST_REFRESH) || 0.1) * 0.02;
1955 debug sprintf "%3.2f", $fps if $ENV{CFPLUS_DEBUG} & 4; 2110 debug sprintf "%3.2f", $fps;
2111 }
1956 2112
1957 $CFPlus::UI::ROOT->draw; 2113 $CFPlus::UI::ROOT->draw;
1958 2114 CFPlus::SDL_GL_SwapBuffers;
1959 $WANT_REFRESH = 0;
1960 $CAN_REFRESH = 0;
1961 $LAST_REFRESH = $NOW; 2115 $LAST_REFRESH = $NOW;
1962 2116 $WANT_REFRESH->stop;
1963 CFPlus::SDL_GL_SwapBuffers;
1964} 2117}
1965 2118
2119$WANT_REFRESH = Event->idle (min => 0.001, max => 0.06, parked => 1, cb => \&force_refresh);
2120
1966my $refresh_watcher = Event->timer (after => 0, hard => 0, interval => 1 / $MAX_FPS, cb => sub { 2121my $input = Event->timer (after => 0, hard => 0, interval => 1 / 50, cb => sub {
1967 $NOW = time; 2122 $NOW = time;
1968 2123
1969 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_) 2124 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_)
1970 for CFPlus::SDL_PollEvent; 2125 for CFPlus::poll_events;
1971 2126
1972 if (%animate_object) { 2127 if (%animate_object) {
1973 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object; 2128 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object;
1974 $WANT_REFRESH++; 2129 $WANT_REFRESH->start;
1975 }
1976
1977 if ($WANT_REFRESH) {
1978 force_refresh;
1979 } else {
1980 $CAN_REFRESH = 1;
1981 } 2130 }
1982}); 2131});
1983 2132
1984sub animation_start { 2133sub animation_start {
1985 my ($widget) = @_; 2134 my ($widget) = @_;
1989sub animation_stop { 2138sub animation_stop {
1990 my ($widget) = @_; 2139 my ($widget) = @_;
1991 delete $animate_object{$widget}; 2140 delete $animate_object{$widget};
1992} 2141}
1993 2142
1994# check once/second for faces that need to be prefetched
1995# this should, of course, only run on demand, but
1996# SDL forces worse things on us....
1997
1998Event->timer (after => 1, interval => 0.25, cb => sub {
1999 $CONN->face_prefetch
2000 if $CONN;
2001});
2002
2003%SDL_CB = ( 2143%SDL_CB = (
2004 CFPlus::SDL_QUIT => sub { 2144 CFPlus::SDL_QUIT => sub {
2005 Event::unloop -1; 2145 exit;
2006 }, 2146 },
2007 CFPlus::SDL_VIDEORESIZE => sub { 2147 CFPlus::SDL_VIDEORESIZE => sub {
2008 }, 2148 },
2009 CFPlus::SDL_VIDEOEXPOSE => sub { 2149 CFPlus::SDL_VIDEOEXPOSE => sub {
2010 CFPlus::UI::full_refresh; 2150 CFPlus::UI::full_refresh;
2011 }, 2151 },
2012 CFPlus::SDL_ACTIVEEVENT => sub { 2152 CFPlus::SDL_ACTIVEEVENT => sub {
2013# printf "active %x %x\n", $SDL_EV->active_gain, $SDL_EV->active_state;#d# 2153# not useful, as APPACTIVE include sonly iconified state, not unmapped
2154# printf "active %x %x %x\n", $_[0]{gain}, $_[0]{state}, CFPlus::SDL_GetAppState;#d#
2155# printf "a %x\n", CFPlus::SDL_GetAppState & CFPlus::SDL_APPACTIVE;#d#
2156# printf "A\n" if $_[0]{state} & CFPlus::SDL_APPACTIVE;
2157# printf "K\n" if $_[0]{state} & CFPlus::SDL_APPINPUTFOCUS;
2158# printf "M\n" if $_[0]{state} & CFPlus::SDL_APPMOUSEFOCUS;
2014 }, 2159 },
2015 CFPlus::SDL_KEYDOWN => sub { 2160 CFPlus::SDL_KEYDOWN => sub {
2016 if ($_[0]{mod} & CFPlus::KMOD_ALT && $_[0]{sym} == 13) { 2161 if ($_[0]{mod} & CFPlus::KMOD_ALT && $_[0]{sym} == 13) {
2017 # alt-enter 2162 # alt-enter
2018 $FULLSCREEN_ENABLE->toggle; 2163 $FULLSCREEN_ENABLE->toggle;
2039 2184
2040$SIG{INT} = $SIG{TERM} = sub { exit }; 2185$SIG{INT} = $SIG{TERM} = sub { exit };
2041 2186
2042{ 2187{
2043 CFPlus::read_cfg "$Crossfire::VARDIR/cfplusrc"; 2188 CFPlus::read_cfg "$Crossfire::VARDIR/cfplusrc";
2189 CFPlus::DB::Server::run;
2190
2044 CFPlus::UI::set_layout ($::CFG->{layout}); 2191 CFPlus::UI::set_layout ($::CFG->{layout});
2045 2192
2046 my %DEF_CFG = ( 2193 my %DEF_CFG = (
2047 sdl_mode => 0, 2194 sdl_mode => 0,
2048 width => 640,
2049 height => 480,
2050 fullscreen => 0, 2195 fullscreen => 0,
2051 fast => 0, 2196 fast => 0,
2197 opengl11 => 0,
2052 map_scale => 1, 2198 map_scale => 1,
2053 fow_enable => 1, 2199 fow_enable => 1,
2054 fow_intensity => 0.45, 2200 fow_intensity => 0,
2055 fow_smooth => 0, 2201 map_smoothing => 1,
2056 gui_fontsize => 1, 2202 gui_fontsize => 1,
2057 log_fontsize => 0.7, 2203 log_fontsize => 0.7,
2058 gauge_fontsize => 1, 2204 gauge_fontsize => 1,
2059 gauge_size => 0.35, 2205 gauge_size => 0.35,
2060 stat_fontsize => 0.7, 2206 stat_fontsize => 0.7,
2061 mapsize => 100, 2207 mapsize => 100,
2062 say_command => 'chat',
2063 audio_enable => 1, 2208 audio_enable => 1,
2209 effects_enable => 1,
2210 effects_volume => 1,
2064 bgm_enable => 1, 2211 bgm_enable => 1,
2065 bgm_volume => 0.25, 2212 bgm_volume => 0.5,
2066 face_prefetch => 0,
2067 output_sync => 1, 2213 output_sync => 1,
2068 output_count => 1, 2214 output_count => 1,
2215 output_rate => "",
2069 pickup => 0, 2216 pickup => 0,
2070 inv_sort => "mtime", 2217 inv_sort => "mtime",
2071 default => "profile", # default profile 2218 default => "profile", # default profile
2072 show_tips => 1, 2219 show_tips => 1,
2220 logview_max_par => 1000,
2073 ); 2221 );
2074 2222
2075 while (my ($k, $v) = each %DEF_CFG) { 2223 while (my ($k, $v) = each %DEF_CFG) {
2076 $CFG->{$k} = $v unless exists $CFG->{$k}; 2224 $CFG->{$k} = $v unless exists $CFG->{$k};
2077 } 2225 }
2078 2226
2079 $CFG->{profile}{default}{host} ||= "crossfire.schmorp.de"; 2227 $CFG->{profile}{default}{host} ||= "crossfire.schmorp.de";
2228 $PROFILE = $CFG->{profile}{default};
2229
2230 # convert old bindings (only default profile matters)
2231 if (my $bindings = delete $PROFILE->{bindings}) {
2232 while (my ($mod, $syms) = each %$bindings) {
2233 while (my ($sym, $cmds) = each %$syms) {
2234 push @{ $PROFILE->{macro} }, {
2235 accelkey => [$mod*1, $sym*1],
2236 action => $cmds,
2237 };
2238 }
2239 }
2240 }
2080 2241
2081 sdl_init; 2242 sdl_init;
2082 2243
2083 @SDL_MODES = reverse 2244 @SDL_MODES = CFPlus::SDL_ListModes 8, 8;
2084 grep $_->[0] >= 640 && $_->[1] >= 480, 2245 @SDL_MODES = CFPlus::SDL_ListModes 5, 0 unless @SDL_MODES;
2085 CFPlus::SDL_ListModes;
2086
2087 @SDL_MODES or CFPlus::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)"; 2246 @SDL_MODES or CFPlus::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)";
2247
2248 @SDL_MODES = sort { $a->[0] * $a->[1] <=> $b->[0] * $b->[1] } @SDL_MODES;
2088 2249
2089 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES; 2250 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES;
2090 2251
2091 { 2252 {
2092 my @fonts = map CFPlus::find_rcfile "fonts/$_", qw( 2253 my @fonts = map CFPlus::find_rcfile "fonts/$_", qw(
2130} 2291}
2131 2292
2132show_tip_of_the_day if $CFG->{show_tips}; 2293show_tip_of_the_day if $CFG->{show_tips};
2133 2294
2134Event::loop; 2295Event::loop;
2296
2297#video_shutdown;
2298#audio_shutdown;
2135#CFPlus::SDL_Quit; 2299CFPlus::SDL_Quit;
2136#CFPlus::_exit 0; 2300CFPlus::DB::Server::stop;
2137
2138END { CFPlus::SDL_Quit }
2139 2301
2140=head1 NAME 2302=head1 NAME
2141 2303
2142cfplus - A Crossfire+ and Crossfire game client 2304cfplus - A Crossfire TRT and Crossfire game client
2143 2305
2144=head1 SYNOPSIS 2306=head1 SYNOPSIS
2145 2307
2146Just run it - no commandline arguments are supported. 2308Just run it - no commandline arguments are supported.
2147 2309
2148=head1 USAGE 2310=head1 USAGE
2149 2311
2150cfplus utilises OpenGL for all UI elements and the game. It is supposed to be used 2312cfplus utilises OpenGL for all UI elements and the game. It is supposed to
2151fullscreen and interactively. 2313be used in fullscreen mode and interactively.
2152 2314
2153=head1 DEBUGGING 2315=head1 DEBUGGING
2154 2316
2155 2317
2156CFPLUS_DEBUG - environment variable 2318CFPLUS_DEBUG - environment variable

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines