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

Diff Legend

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