ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/bin/cfplus
(Generate patch)

Comparing deliantra/Deliantra-Client/bin/cfplus (file contents):
Revision 1.136 by root, Fri Dec 8 14:59:54 2006 UTC vs.
Revision 1.226 by root, Sat Sep 1 07:22:21 2007 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines