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.135 by elmex, Tue Dec 5 16:53:29 2006 UTC vs.
Revision 1.224 by root, Thu Aug 30 07:57:59 2007 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines