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.142 by root, Mon Mar 12 22:23:09 2007 UTC vs.
Revision 1.208 by root, Fri Aug 10 04:02:14 2007 UTC

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

Diff Legend

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