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.138 by root, Sat Dec 9 21:26:46 2006 UTC vs.
Revision 1.224 by root, Thu Aug 30 07:57:59 2007 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines