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

Diff Legend

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