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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines