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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines