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.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;
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 $INVR_HB;
151 173
152our $PICKUP_CFG; 174#############################################################################
153
154our $IN_BUILD_MODE;
155our $BUILD_BUTTON;
156 175
157sub status { 176sub status {
158 $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]);
159} 178}
160 179
… …
162 $DEBUG_STATUS->set_text ($_[0]); 181 $DEBUG_STATUS->set_text ($_[0]);
163} 182}
164 183
165sub message { 184sub message {
166 my ($para) = @_; 185 my ($para) = @_;
167 186 $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} 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#############################################################################
175 429
176sub destroy_query_dialog { 430sub destroy_query_dialog {
177 (delete $_[0]{query_dialog})->destroy 431 (delete $_[0]{query_dialog})->destroy
178 if $_[0]{query_dialog}; 432 if $_[0]{query_dialog};
179} 433}
… …
206 title => "Server Query", 460 title => "Server Query",
207 child => my $vbox = new CFPlus::UI::VBox, 461 child => my $vbox = new CFPlus::UI::VBox,
208 ; 462 ;
209 463
210 my @dialog = my $label = new CFPlus::UI::Label 464 my @dialog = my $label = new CFPlus::UI::Label
211 max_w => $::WIDTH * 0.4, 465 max_w => $::WIDTH * 0.8,
212 ellipsise => 0, 466 ellipsise => 0,
213 text => $prompt; 467 text => $prompt;
214 468
215 if ($flags & CS_QUERY_YESNO) { 469 if ($flags & CS_QUERY_YESNO) {
216 push @dialog, my $hbox = new CFPlus::UI::HBox; 470 push @dialog, my $hbox = new CFPlus::UI::HBox;
… …
233 ); 487 );
234 488
235 $dialog->grab_focus; 489 $dialog->grab_focus;
236 490
237 } elsif ($flags & CS_QUERY_SINGLECHAR) { 491 } 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) { 492 if ($prompt =~ /Now choose a character|Press any key for the next race/i) {
241 $MESSAGE_WINDOW->show; 493 $dialog->{tooltip} = "#charcreation_focus";
242 494
243 unshift @dialog, new CFPlus::UI::Label 495 unshift @dialog, new CFPlus::UI::Label
244 max_w => $::WIDTH * 0.4, 496 max_w => $::WIDTH * 0.8,
245 ellipsise => 0, 497 ellipsise => 0,
246 markup => "\nOr use your keyboard and the text entry below:\n"; 498 markup => "\nOr use your keyboard and the text entry below:\n";
247 499
248 unshift @dialog, my $table = new CFPlus::UI::Table; 500 unshift @dialog, my $table = new CFPlus::UI::Table;
249 501
250 $table->add (0, 0, new CFPlus::UI::Button 502 $table->add_at (0, 0, new CFPlus::UI::Button
251 text => "Next Race", 503 text => "Next Race",
252 on_activate => sub { 504 on_activate => sub {
253 $conn->send ("reply n"); 505 $conn->send ("reply n");
254 destroy_query_dialog $conn; 506 destroy_query_dialog $conn;
255 0 507 0
256 }, 508 },
257 ); 509 );
258 $table->add (2, 0, new CFPlus::UI::Button 510 $table->add_at (2, 0, new CFPlus::UI::Button
259 text => "Accept", 511 text => "Accept",
260 on_activate => sub { 512 on_activate => sub {
261 $conn->send ("reply d"); 513 $conn->send ("reply d");
262 destroy_query_dialog $conn; 514 destroy_query_dialog $conn;
263 0 515 0
264 }, 516 },
265 ); 517 );
266 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
267 unshift @dialog, new CFPlus::UI::Label 542 unshift @dialog, new CFPlus::UI::Label
268 max_w => $::WIDTH * 0.4, 543 max_w => $::WIDTH * 0.4,
269 ellipsise => 0, 544 ellipsise => 0,
270 markup => (CFPlus::Pod::section_label ui => "chargen_race"), 545 markup => (CFPlus::Pod::section_label ui => "chargen_race"),
271 ; 546 ;
… …
275 $conn->send ("reply $stat"); 550 $conn->send ("reply $stat");
276 destroy_query_dialog $conn; 551 destroy_query_dialog $conn;
277 return; 552 return;
278 } 553 }
279 554
280 $STATS_PAGE->show;
281 $MESSAGE_WINDOW->hide;
282
283 unshift @dialog, new CFPlus::UI::Label 555 unshift @dialog, new CFPlus::UI::Label
284 max_w => $::WIDTH * 0.4, 556 max_w => $::WIDTH * 0.4,
285 ellipsise => 0, 557 ellipsise => 0,
286 markup => "\nOr use your keyboard and the text entry below:\n"; 558 markup => "\nOr use your keyboard and the text entry below:\n";
287 559
288 unshift @dialog, my $table = new CFPlus::UI::Table; 560 unshift @dialog, my $table = new CFPlus::UI::Table;
289 561
290 # left: re-roll 562 # left: re-roll
291 $table->add (0, 0, new CFPlus::UI::Button 563 $table->add_at (0, 0, new CFPlus::UI::Button
292 text => "Roll Again", 564 text => "Roll Again",
293 on_activate => sub { 565 on_activate => sub {
294 $conn->send ("reply y"); 566 $conn->send ("reply y");
295 destroy_query_dialog $conn; 567 destroy_query_dialog $conn;
296 0 568 0
… …
310 [6 => "Pow", "Power ($conn->{stat}{+CS_STAT_POW})"], 582 [6 => "Pow", "Power ($conn->{stat}{+CS_STAT_POW})"],
311 [7 => "Cha", "Charisma ($conn->{stat}{+CS_STAT_CHA})"], 583 [7 => "Cha", "Charisma ($conn->{stat}{+CS_STAT_CHA})"],
312 ], 584 ],
313 ), 1 .. 2; 585 ), 1 .. 2;
314 586
315 $table->add (2, 0, new CFPlus::UI::Button 587 $table->add_at (2, 0, new CFPlus::UI::Button
316 text => "Swap Stats", 588 text => "Swap Stats",
317 on_activate => sub { 589 on_activate => sub {
318 $conn->{stat_change_with} = $sw2->{value}; 590 $conn->{stat_change_with} = $sw2->{value};
319 $conn->send ("reply $sw1->{value}"); 591 $conn->send ("reply $sw1->{value}");
320 destroy_query_dialog $conn; 592 destroy_query_dialog $conn;
321 0 593 0
322 }, 594 },
323 ); 595 );
324 $table->add (2, 1, new CFPlus::UI::HBox children => [$sw1, $sw2]); 596 $table->add_at (2, 1, new CFPlus::UI::HBox children => [$sw1, $sw2]);
325 597
326 # right: accept 598 # right: accept
327 $table->add (4, 0, new CFPlus::UI::Button 599 $table->add_at (4, 0, new CFPlus::UI::Button
328 text => "Accept", 600 text => "Accept",
329 on_activate => sub { 601 on_activate => sub {
330 $conn->send ("reply n"); 602 $conn->send ("reply n");
331 $STATS_PAGE->hide; 603 $STATS_PAGE->hide;
332 destroy_query_dialog $conn; 604 destroy_query_dialog $conn;
… …
413 maph => $mapsize, 685 maph => $mapsize,
414 686
415 client => "cfplus $CFPlus::VERSION $] $^O", 687 client => "cfplus $CFPlus::VERSION $] $^O",
416 688
417 map_widget => $MAPWIDGET, 689 map_widget => $MAPWIDGET,
418 logview => $LOGVIEW,
419 statusbox => $STATUSBOX, 690 statusbox => $STATUSBOX,
420 map => $MAP, 691 map => $MAP,
421 mapmap => $MAPMAP, 692 mapmap => $MAPMAP,
422 query => \&server_query, 693 query => \&server_query,
423 694
424 sound_play => sub { 695 setup_req => {
425 my ($x, $y, $soundnum, $type) = @_; 696 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 }, 697 },
435 }; 698 };
436 699
437 if ($CONN) { 700 if ($CONN) {
438 CFPlus::lowdelay fileno $CONN->{fh}; 701 CFPlus::lowdelay fileno $CONN->{fh};
… …
448 $LOGIN_BUTTON->set_text ("Login"); 711 $LOGIN_BUTTON->set_text ("Login");
449 $SETUP_NOTEBOOK->set_current_page ($SETUP_SERVER); 712 $SETUP_NOTEBOOK->set_current_page ($SETUP_SERVER);
450 $SETUP_DIALOG->show; 713 $SETUP_DIALOG->show;
451 $PL_WINDOW->hide; 714 $PL_WINDOW->hide;
452 $SPELL_LIST->clear_spells; 715 $SPELL_LIST->clear_spells;
716 $CFPlus::UI::ROOT->emit (stop_game => ! ! $CONN);
717
718 &audio_music_set_ambient ([]);
453 719
454 return unless $CONN; 720 return unless $CONN;
455 721
456 status "connection closed"; 722 status "connection closed";
457 723
… …
465sub graphics_setup { 731sub graphics_setup {
466 my $vbox = new CFPlus::UI::VBox; 732 my $vbox = new CFPlus::UI::VBox;
467 733
468 $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]);
469 735
736 my $row = 0;
737
738 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "OpenGL Info");
739 $table->add_at (1, $row++, new CFPlus::UI::Label valign => 0, fontsize => 0.8, text => CFPlus::OpenGL::gl_vendor . ", " . CFPlus::OpenGL::gl_version,
740 can_events => 1,
741 tooltip => "<tt><span size='8192'>" . (CFPlus::OpenGL::gl_extensions) . "</span></tt>");
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
470 $table->add (0, 0, 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");
471 $table->add (1, 0, my $hbox = new CFPlus::UI::HBox); 748 $table->add_at (1, $row++, my $hbox = new CFPlus::UI::HBox);
472 749
750 $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]); 751 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"); 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);
475 756
476 $mode_slider->connect (changed => sub { 757 $mode_slider->connect (changed => sub {
477 my ($self, $value) = @_; 758 my ($self, $value) = @_;
478 759
479 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value; 760 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value;
480 $mode_label->set_text (sprintf "%dx%d", @{$SDL_MODES[$value]}); 761 $mode_label->set_text (sprintf '%dx%d@%d+%d', @{$SDL_MODES[$value]});
481 }); 762 });
482 $mode_slider->emit (changed => $mode_slider->{range}[0]); 763 $mode_slider->emit (changed => $mode_slider->{range}[0]);
483 764
484 my $row = 1;
485
486 $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");
487 $table->add (1, $row++, $FULLSCREEN_ENABLE = new CFPlus::UI::CheckBox 766 $table->add_at (1, $row++, $FULLSCREEN_ENABLE = new CFPlus::UI::CheckBox
488 state => $CFG->{fullscreen}, 767 state => $CFG->{fullscreen},
489 tooltip => "Bring the client into fullscreen mode.", 768 tooltip => "Bring the client into fullscreen mode.",
490 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 } 769 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 }
491 ); 770 );
492 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
493 $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");
494 $table->add (1, $row++, new CFPlus::UI::CheckBox 795 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
495 state => $CFG->{fast}, 796 state => $CFG->{fast},
496 tooltip => "Lower the visual quality considerably to speed up rendering.", 797 tooltip => "Lower the visual quality considerably to speed up rendering.",
497 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 } 798 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 }
498 ); 799 );
499 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
500 $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");
501 $table->add (1, $row++, new CFPlus::UI::Slider 819 $table->add_at (1, $row++, new CFPlus::UI::Slider
502 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1], 820 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1],
503 tooltip => "Enlarge or shrink the displayed map. Changes are instant.", 821 tooltip => "Enlarge or shrink the displayed map. Changes are instant.",
504 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 }
505 ); 823 );
506 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
507 $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");
508 $table->add (1, $row++, new CFPlus::UI::CheckBox 835 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
509 state => $CFG->{fow_enable}, 836 state => $CFG->{fow_enable},
510 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.",
511 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; 0 } 838 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; 0 }
512 ); 839 );
513 840
514 $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");
515 $table->add (1, $row++, new CFPlus::UI::Slider 842 $table->add_at (1, $row++, new CFPlus::UI::Slider
516 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256], 843 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.", 844 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 } 845 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_intensity} = $value; 0 }
519 ); 846 );
520 847
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"); 848 $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 849 $table->add_at (1, $row++, new CFPlus::UI::Slider
542 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1], 850 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.", 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.",
544 on_changed => sub { $LOGVIEW->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 }, 853 on_changed => sub { $MESSAGE_WINDOW->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 },
545 ); 854 );
546 855
547 $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");
548 $table->add (1, $row++, new CFPlus::UI::Slider 857 $table->add_at (1, $row++, new CFPlus::UI::Slider
549 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1], 858 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.", 859 tooltip => "Adjusts the fontsize of the gauges at the bottom right. Changes are instant.",
551 on_changed => sub { 860 on_changed => sub {
552 $CFG->{gauge_fontsize} = $_[1]; 861 $CFG->{gauge_fontsize} = $_[1];
553 &set_gauge_window_fontsize; 862 &set_gauge_window_fontsize;
554 0 863 0
555 } 864 }
556 ); 865 );
557 866
558 $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");
559 $table->add (1, $row++, new CFPlus::UI::Slider 868 $table->add_at (1, $row++, new CFPlus::UI::Slider
560 range => [$CFG->{gauge_size}, 0.2, 0.8], 869 range => [$CFG->{gauge_size}, 0.2, 0.8],
561 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.",
562 on_changed => sub { 871 on_changed => sub {
563 $CFG->{gauge_size} = $_[1]; 872 $CFG->{gauge_size} = $_[1];
564 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size}); 873 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size});
565 0 874 0
566 } 875 }
567 ); 876 );
568 877
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 878 $vbox
580} 879}
581 880
582sub audio_setup { 881sub audio_setup {
583 my $vbox = new CFPlus::UI::VBox; 882 my $vbox = new CFPlus::UI::VBox;
584 883
585 $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]);
586 885
587 my $row = 0; 886 my $row = 0;
588 887
589 $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");
590 $table->add (1, $row++, new CFPlus::UI::CheckBox 889 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
591 state => $CFG->{audio_enable}, 890 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.", 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.",
593 on_changed => sub { $CFG->{audio_enable} = $_[1]; 0 } 892 on_changed => sub { $CFG->{audio_enable} = $_[1]; 0 }
594 ); 893 );
595# $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");
596# $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 {
597# $CFG->{effects_volume} = $_[1]; 896# $CFG->{effects_volume} = $_[1];
598# }); 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
599 $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");
600 $table->add (1, $row++, my $hbox = new CFPlus::UI::HBox);
601 $hbox->add (new CFPlus::UI::CheckBox 917 $table->add_at (1, $row, new CFPlus::UI::CheckBox
602 expand => 1, state => $CFG->{bgm_enable}, 918 expand => 1, state => $CFG->{bgm_enable},
603 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.",
604 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 }
605 ); 925 );
606 $hbox->add (new CFPlus::UI::Slider 926 $table->add_at (2, $row++, new CFPlus::UI::Slider
607 expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128], 927 expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128],
608 tooltip => "The volume of the background music. Changes are instant.", 928 tooltip => "The volume of the background music. Changes are instant.",
609 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 }
610 ); 930 );
611 931
612 $table->add (1, $row++, new CFPlus::UI::Button 932 $table->add_at (1, $row++, new CFPlus::UI::Button
613 expand => 1, align => 0, text => "Apply", 933 c_colspan => 2, expand => 1, align => 0, text => "Apply",
614 tooltip => "Apply the audio settings", 934 tooltip => "Apply the audio settings",
615 on_activate => sub { 935 on_activate => sub {
616 audio_shutdown (); 936 audio_shutdown ();
617 audio_init (); 937 audio_init ();
618 0 938 0
… …
676} 996}
677 997
678sub debug_setup { 998sub debug_setup {
679 my $table = new CFPlus::UI::Table; 999 my $table = new CFPlus::UI::Table;
680 1000
681 $table->add (0, 0, new CFPlus::UI::Label text => "Widget Borders"); 1001 $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 }); 1002 $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"); 1003 $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 }); 1004 $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"); 1005 $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 }); 1006 $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"); 1007 $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 }); 1008 $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" } ); 1009 $table->add_at (0, 4, new CFPlus::UI::Button text => "die on click(tm)", on_activate => sub { &CFPlus::debug() } );
690 1010
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# 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 });
704 1045
705 $table 1046 $table
706} 1047}
707 1048
708sub stats_window { 1049sub stats_window {
… …
756 [2, 4, st_spd => "Spd", 10.54], 1097 [2, 4, st_spd => "Spd", 10.54],
757 [2, 5, st_wspd => "WSp", 10.54], 1098 [2, 5, st_wspd => "WSp", 10.54],
758 ) { 1099 ) {
759 my ($col, $row, $id, $label, $template) = @$_; 1100 my ($col, $row, $id, $label, $template) = @$_;
760 1101
761 $tbl->add ($col , $row, $STATWIDS->{$id} = new CFPlus::UI::Label 1102 $tbl->add_at ($col , $row, $STATWIDS->{$id} = new CFPlus::UI::Label
762 font => $FONT_FIXED, can_hover => 1, can_events => 1, valign => 0, 1103 font => $FONT_FIXED, can_hover => 1, can_events => 1, valign => 0,
763 align => +1, template => $template, tooltip => "#stat_$label"); 1104 align => +1, template => $template, tooltip => "#stat_$label");
764 $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
765 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,
766 align => -1, text => $label, tooltip => "#stat_$label"); 1107 align => -1, text => $label, tooltip => "#stat_$label");
767 } 1108 }
768 1109
769 $vb->add (new CFPlus::UI::FancyFrame 1110 $vb->add (new CFPlus::UI::FancyFrame
… …
810 cold => ["Cold", 1151 cold => ["Cold",
811 "<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, ...)"],
812 ghit => ["Ghost hit", 1153 ghit => ["Ghost hit",
813 "<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)"],
814 ); 1155 );
1156
815 for (qw/slow holyw conf fire depl magic 1157 for (qw/slow holyw conf fire depl magic
816 drain acid pois para deat phys 1158 drain acid pois para deat phys
817 blind fear tund elec cold ghit/) 1159 blind fear tund elec cold ghit/)
818 { 1160 {
819 $tbl2->add ($col, $row, 1161 $tbl2->add_at ($col, $row,
820 $STATWIDS->{"res_$_"} = 1162 $STATWIDS->{"res_$_"} =
821 new CFPlus::UI::Label 1163 new CFPlus::UI::Label
822 font => $FONT_FIXED, 1164 font => $FONT_FIXED,
823 template => "-100%", 1165 template => "-100%",
824 align => +1, 1166 align => +1,
825 valign => 0, 1167 valign => 0,
826 can_events => 1, 1168 can_events => 1,
827 can_hover => 1, 1169 can_hover => 1,
828 tooltip => $resist_names{$_}->[1], 1170 tooltip => $resist_names{$_}->[1],
829 ); 1171 );
830 $tbl2->add ($col + 1, $row, new CFPlus::UI::Image 1172 $tbl2->add_at ($col + 1, $row, new CFPlus::UI::Image
831 font => $FONT_FIXED, 1173 font => $FONT_FIXED,
832 can_hover => 1, 1174 can_hover => 1,
833 can_events => 1, 1175 can_events => 1,
834 path => "ui/resist/resist_$_.png", 1176 path => "ui/resist/resist_$_.png",
835 tooltip => $resist_names{$_}->[1], 1177 tooltip => $resist_names{$_}->[1],
836 ); 1178 );
837 $tbl2->add ($col + 2, $row, new CFPlus::UI::Label 1179 $tbl2->add_at ($col + 2, $row, new CFPlus::UI::Label
838 text => $resist_names{$_}->[0], 1180 text => $resist_names{$_}->[0],
839 font => $FONT_FIXED, 1181 font => $FONT_FIXED,
840 can_hover => 1, 1182 can_hover => 1,
841 can_events => 1, 1183 can_events => 1,
842 tooltip => $resist_names{$_}->[1], 1184 tooltip => $resist_names{$_}->[1],
… …
875 return if $METASERVER_ATIME > time; 1217 return if $METASERVER_ATIME > time;
876 $METASERVER_ATIME = time + 60; 1218 $METASERVER_ATIME = time + 60;
877 1219
878 my $table = $METASERVER->{table}; 1220 my $table = $METASERVER->{table};
879 $table->clear; 1221 $table->clear;
880 $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...");
881 1223
882 my $ok = 0; 1224 my $ok = 0;
883 1225
884 CFPlus::background { 1226 CFPlus::background {
885 my $ua = CFPlus::lwp_useragent; 1227 my $ua = CFPlus::lwp_useragent;
… …
896 "The time this server has been running without being restarted.", 1238 "The time this server has been running without being restarted.",
897 "The server software version - a '+' indicates a Crossfire+ server.", 1239 "The server software version - a '+' indicates a Crossfire+ server.",
898 "Short information about this server provided by its admins.", 1240 "Short information about this server provided by its admins.",
899 ); 1241 );
900 my @col = qw(#Users Host Uptime Version Description); 1242 my @col = qw(#Users Host Uptime Version Description);
901 $table->add ($_, 0, new CFPlus::UI::Label 1243 $table->add_at ($_, 0, new CFPlus::UI::Label
902 can_hover => 1, can_events => 1, 1244 can_hover => 1, can_events => 1,
903 align => 0, fg => [1, 1, 0], 1245 align => 0, fg => [1, 1, 0],
904 text => $col[$_], tooltip => $tip[$_]) 1246 text => $col[$_], tooltip => $tip[$_])
905 for 0 .. $#col; 1247 for 0 .. $#col;
906 1248
… …
928 1270
929 $m = [$users, $host, $uptime, $version, $desc]; 1271 $m = [$users, $host, $uptime, $version, $desc];
930 1272
931 $y++; 1273 $y++;
932 1274
933 $table->add (scalar @$m, $y, new CFPlus::UI::VBox children => [ 1275 $table->add_at (scalar @$m, $y, new CFPlus::UI::VBox children => [
934 (new CFPlus::UI::Button 1276 (new CFPlus::UI::Button
935 text => "Use", 1277 text => "Use",
936 tooltip => "Put this server into the <b>Host:Port</b> field", 1278 tooltip => "Put this server into the <b>Host:Port</b> field",
937 on_activate => sub { 1279 on_activate => sub {
938 $HOST_ENTRY->set_text ($CFG->{profile}{default}{host} = $host); 1280 $HOST_ENTRY->set_text ($CFG->{profile}{default}{host} = $host);
… …
941 }, 1283 },
942 ), 1284 ),
943 (new CFPlus::UI::Empty expand => 1), 1285 (new CFPlus::UI::Empty expand => 1),
944 ]); 1286 ]);
945 1287
946 $table->add ($_, $y, new CFPlus::UI::Label 1288 $table->add_at ($_, $y, new CFPlus::UI::Label
947 max_w => $::WIDTH * 0.4, 1289 max_w => $::WIDTH * 0.4,
948 ellipsise => 0, 1290 ellipsise => 0,
949 align => $align[$_], 1291 align => $align[$_],
950 text => $m->[$_], 1292 text => $m->[$_],
951 tooltip => $tip[$_], 1293 tooltip => $tip[$_],
… …
992 1334
993 $vbox->add (new CFPlus::UI::FancyFrame 1335 $vbox->add (new CFPlus::UI::FancyFrame
994 label => "Connection Settings", 1336 label => "Connection Settings",
995 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]),
996 ); 1338 );
997 $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");
998 1340
999 { 1341 {
1000 $table->add (1, 2, my $vbox = new CFPlus::UI::VBox); 1342 $table->add_at (1, 2, my $vbox = new CFPlus::UI::VBox);
1001 1343
1002 $vbox->add ( 1344 $vbox->add (
1003 $HOST_ENTRY = new CFPlus::UI::Entry 1345 $HOST_ENTRY = new CFPlus::UI::Entry
1004 expand => 1, 1346 expand => 1,
1005 text => $CFG->{profile}{default}{host}, 1347 text => $CFG->{profile}{default}{host},
1006 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",
1007 on_changed => sub { 1349 on_changed => sub {
1008 my ($self, $value) = @_; 1350 my ($self, $value) = @_;
1009 $CFG->{profile}{default}{host} = $value; 1351 $CFG->{profile}{default}{host} = $value;
1010 0 1352 1
1011 } 1353 }
1012 ); 1354 );
1013 1355
1014 $vbox->add (new CFPlus::UI::Button 1356 $vbox->add (new CFPlus::UI::Button
1015 expand => 1, 1357 expand => 1,
1016 text => "Server List", 1358 text => "Server List",
1017 other => $METASERVER, 1359 other => $METASERVER,
1018 tooltip => "Show a list of available crossfire servers", 1360 tooltip => "Show a list of available crossfire servers",
1019 on_activate => sub { $METASERVER->toggle_visibility; 0 }, 1361 on_activate => sub { $METASERVER->toggle_visibility; 0 },
1020 on_visibility_change => sub { $METASERVER->hide unless $_[1]; 0 }, 1362 on_visibility_change => sub { $METASERVER->hide unless $_[1]; 1 },
1021 ); 1363 );
1022 } 1364 }
1023 1365
1024 $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");
1025 $table->add (1, 4, new CFPlus::UI::Entry 1367 $table->add_at (1, 4, new CFPlus::UI::Entry
1026 text => $CFG->{profile}{default}{user}, 1368 text => $CFG->{profile}{default}{user},
1027 tooltip => "The name of your character on the server", 1369 tooltip => "The name of your character on the server",
1028 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value } 1370 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value; 1 }
1029 ); 1371 );
1030 1372
1031 $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");
1032 $table->add (1, 5, new CFPlus::UI::Entry 1374 $table->add_at (1, 5, new CFPlus::UI::Entry
1033 text => $CFG->{profile}{default}{password}, 1375 text => $CFG->{profile}{default}{password},
1034 hidden => 1, 1376 hidden => 1,
1035 tooltip => "The password for your character", 1377 tooltip => "The password for your character",
1036 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{password} = $value } 1378 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{password} = $value; 1 }
1037 ); 1379 );
1038 1380
1039 $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");
1040 $table->add (1, 7, new CFPlus::UI::Slider 1382 $table->add_at (1, 7, new CFPlus::UI::Slider
1041 force_w => 100, 1383 force_w => 100,
1042 range => [$CFG->{mapsize}, 10, 100, 0, 1], 1384 range => [$CFG->{mapsize}, 10, 100, 0, 1],
1043 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. "
1044 . "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, "
1045 . "but you also increase bandwidth requirements and latency. " 1387 . "but you also increase bandwidth requirements and latency. "
1046 . "This option is only used once at log-in.", 1388 . "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 }, 1389 on_changed => sub { my ($self, $value) = @_; $CFG->{mapsize} = $self->{range}[0] = $value = int $value; 1 },
1048 ); 1390 );
1049 1391
1050 $table->add (0, 8, new CFPlus::UI::Label valign => 0, align => 1, text => "Face Prefetch"); 1392 $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 1393 $table->add_at (1, 8, new CFPlus::UI::Entry
1052 state => $CFG->{face_prefetch}, 1394 text => $CFG->{output_rate},
1053 tooltip => "<b>Background Image Prefetch</b>\n\n" 1395 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. " 1396 . "when sending data. When 0 or unset, the server "
1055 . "This might increase or create lag, but increases the chances " 1397 . "default will be used, which is usually around 100kb/s. Most servers will "
1056 . "of faces being ready for display when you encounter them. " 1398 . "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 }, 1399 on_changed => sub { $CFG->{output_rate} = $_[1]; 1 },
1061 ); 1400 );
1062 1401
1063 $table->add (0, 9, 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");
1064 $table->add (1, 9, new CFPlus::UI::Entry 1403 $table->add_at (1, 9, new CFPlus::UI::Entry
1065 text => $CFG->{output_count}, 1404 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.", 1405 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 }, 1406 on_changed => sub { $CFG->{output_count} = $_[1]; 1 },
1068 ); 1407 );
1069 1408
1070 $table->add (0, 10, 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");
1071 $table->add (1, 10, new CFPlus::UI::Entry 1410 $table->add_at (1, 10, new CFPlus::UI::Entry
1072 text => $CFG->{output_sync}, 1411 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.", 1412 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 }, 1413 on_changed => sub { $CFG->{output_sync} = $_[1]; 1 },
1075 ); 1414 );
1076 1415
1077 $table->add (1, 11, $LOGIN_BUTTON = new CFPlus::UI::Button 1416 $table->add_at (1, 11, $LOGIN_BUTTON = new CFPlus::UI::Button
1078 expand => 1, 1417 expand => 1,
1079 align => 0, 1418 align => 0,
1080 text => "Login", 1419 text => "Login",
1081 on_activate => sub { 1420 on_activate => sub {
1082 $CONN ? stop_game 1421 $CONN ? stop_game
1083 : start_game; 1422 : start_game;
1084 0 1423 1
1085 }, 1424 },
1086 ); 1425 );
1087 1426
1088 $table->add (0, 12, new CFPlus::UI::Label valign => 0, align => 1, text => "Chat Command"); 1427 $vbox->add (new CFPlus::UI::FancyFrame
1089 $table->add (1, 12, my $saycmd = new CFPlus::UI::Entry 1428 label => "Server Info",
1090 text => $CFG->{say_command}, 1429 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 ); 1430 );
1100 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
1101 $table->add (0, 13, 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");
1102 $table->add (1, 13, my $saycmd = new CFPlus::UI::CheckBox 1441 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
1103 state => $CFG->{show_tips}, 1442 state => $CFG->{show_tips},
1104 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?",
1105 on_changed => sub { 1444 on_changed => sub {
1106 my ($self, $value) = @_; 1445 my ($self, $value) = @_;
1107 $CFG->{show_tips} = $value; 1446 $CFG->{show_tips} = $value;
1108 0 1447 0
1109 } 1448 }
1110 ); 1449 );
1111 1450
1112 $vbox->add (new CFPlus::UI::FancyFrame 1451 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Messages Window Size");
1113 label => "Server Info", 1452 $table->add_at (1, $row++, my $saycmd = new CFPlus::UI::Entry
1114 child => ($SERVER_INFO = new CFPlus::UI::Label ellipsise => 0), 1453 text => $CFG->{logview_max_par},
1115 ); 1454 tooltip => "This is maximum number of messages remembered in the <b>Messages</b> window. If the server "
1116 1455 . "sends more messages than this number, older messages get removed to save memory and "
1117 $vbox 1456 . "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 { 1457 on_changed => sub {
1140 my ($input, $prev_focus) = @_; 1458 my ($self, $value) = @_;
1141 1459 $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 1460 0
1150 }, 1461 },
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 }; 1462 );
1179 1463
1180 $window 1464 $table
1181} 1465}
1182 1466
1183sub autopickup_setup { 1467sub autopickup_setup {
1468 my $r = new CFPlus::UI::ScrolledWindow (
1469 expand => 1,
1470 scroll_y => 1
1471 );
1184 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 );
1185 1476
1186 for ( 1477 for (
1187 ["General", 0, 0, 1478 ["General", 0, 0,
1188 ["Enable autopickup" => PICKUP_NEWMODE, \$PICKUP_ENABLE], 1479 ["Enable autopickup" => PICKUP_NEWMODE, \$PICKUP_ENABLE],
1189 ["Inhibit autopickup" => PICKUP_INHIBIT], 1480 ["Inhibit autopickup" => PICKUP_INHIBIT],
… …
1224 ], 1515 ],
1225 ["Weight/Value ratio", 2, 17] 1516 ["Weight/Value ratio", 2, 17]
1226 ) 1517 )
1227 { 1518 {
1228 my ($title, $x, $y, @bits) = @$_; 1519 my ($title, $x, $y, @bits) = @$_;
1229 $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]);
1230 1521
1231 for (@bits) { 1522 for (@bits) {
1232 ++$y; 1523 ++$y;
1233 1524
1234 my $mask = $_->[1]; 1525 my $mask = $_->[1];
1235 $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);
1236 $table->add ($x+1, $y, my $checkbox = new CFPlus::UI::CheckBox 1527 $table->add_at ($x+1, $y, my $checkbox = new CFPlus::UI::CheckBox
1237 state => $::CFG->{pickup} & $mask, 1528 state => $::CFG->{pickup} & $mask,
1238 on_changed => sub { 1529 on_changed => sub {
1239 my ($box, $value) = @_; 1530 my ($box, $value) = @_;
1240 1531
1241 if ($value) { 1532 if ($value) {
… …
1252 1543
1253 ${$_->[2]} = $checkbox if $_->[2]; 1544 ${$_->[2]} = $checkbox if $_->[2];
1254 } 1545 }
1255 } 1546 }
1256 1547
1257 $table->add (2, 18, new CFPlus::UI::ValSlider 1548 $table->add_at (2, 18, new CFPlus::UI::ValSlider
1258 range => [$::CFG->{pickup} & 0xF, 0, 16, 1, 1], 1549 range => [$::CFG->{pickup} & 0xF, 0, 16, 1, 1],
1259 template => ">= 99", 1550 template => ">= 99",
1260 to_value => sub { ">= " . 5 * $_[0] }, 1551 to_value => sub { ">= " . 5 * $_[0] },
1261 on_changed => sub { 1552 on_changed => sub {
1262 my ($slider, $value) = @_; 1553 my ($slider, $value) = @_;
… …
1265 $::CFG->{pickup} |= int $value 1556 $::CFG->{pickup} |= int $value
1266 if $value; 1557 if $value;
1267 1; 1558 1;
1268 }); 1559 });
1269 1560
1270 $table->add (3, 18, new CFPlus::UI::Button 1561 $table->add_at (3, 18, new CFPlus::UI::Button
1271 text => "set", 1562 text => "set",
1272 on_activate => sub { 1563 on_activate => sub {
1273 $::CONN->send_command ("pickup $::CFG->{pickup}") 1564 $::CONN->send_command ("pickup $::CFG->{pickup}")
1274 if defined $::CONN; 1565 if defined $::CONN;
1275 0 1566 0
1276 }); 1567 });
1277 1568
1278 $table 1569 $r
1279} 1570}
1280 1571
1281my %SORT_ORDER = ( 1572my %SORT_ORDER = (
1282 type => undef, 1573 type => undef,
1283 mtime => sub { 1574 mtime => sub {
… …
1327 $sw1->add ($INV = new CFPlus::UI::Inventory); 1618 $sw1->add ($INV = new CFPlus::UI::Inventory);
1328 $INV->set_sort_order ($SORT_ORDER{$::CFG->{inv_sort}}); 1619 $INV->set_sort_order ($SORT_ORDER{$::CFG->{inv_sort}});
1329 1620
1330 $hb->add (my $vb2 = new CFPlus::UI::VBox); 1621 $hb->add (my $vb2 = new CFPlus::UI::VBox);
1331 1622
1332 $vb2->add ($INV_RIGHT_HB = new CFPlus::UI::HBox); 1623 $vb2->add ($INVR_HB = new CFPlus::UI::HBox);
1333 1624
1334 $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);
1335 $sw2->add ($INVR = new CFPlus::UI::Inventory); 1626 $sw2->add ($INVR = new CFPlus::UI::Inventory);
1336 1627
1337 # XXX: Call after $INVR = ... because set_opencont sets the items 1628 # XXX: Call after $INVR = ... because set_opencont sets the items
1338 CFPlus::Protocol::set_opencont ($::CONN, 0, "Floor"); 1629 CFPlus::Protocol::set_opencont ($::CONN, 0, "Floor");
1339 1630
1340 $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;
1341} 1672}
1342 1673
1343sub toggle_player_page { 1674sub toggle_player_page {
1344 my ($widget) = @_; 1675 my ($widget) = @_;
1345 1676
… …
1362 has_close_button => 1 1693 has_close_button => 1
1363 ; 1694 ;
1364 1695
1365 my $ntb = 1696 my $ntb =
1366 $PL_NOTEBOOK = 1697 $PL_NOTEBOOK =
1367 new CFPlus::UI::Notebook expand => 1, debug => 1; 1698 new CFPlus::UI::Notebook expand => 1;
1368 1699
1369 $ntb->add ( 1700 $ntb->add_tab (
1370 "Statistics (F2)" => $STATS_PAGE = stats_window, 1701 "Statistics (F2)" => $STATS_PAGE = stats_window,
1371 "Shows statistics, where all your Stats and Resistances are shown." 1702 "Shows statistics, where all your Stats and Resistances are shown."
1372 ); 1703 );
1373 $ntb->add ( 1704 $ntb->add_tab (
1374 "Skills (F3)" => $SKILL_PAGE = skill_window, 1705 "Skills (F3)" => $SKILL_PAGE = skill_window,
1375 "Shows all your Skills." 1706 "Shows all your Skills."
1376 ); 1707 );
1377 1708
1378 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);
1379 $spellsw->add ($SPELL_LIST = new CFPlus::UI::SpellList); 1710 $spellsw->add ($SPELL_LIST = new CFPlus::UI::SpellList);
1380 $ntb->add ( 1711 $ntb->add_tab (
1381 "Spellbook (F4)" => $spellsw, 1712 "Spellbook (F4)" => $spellsw,
1382 "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."
1383 ); 1714 );
1384 $ntb->add ( 1715 $ntb->add_tab (
1385 "Inventory (F5)" => $INVENTORY_PAGE = inventory_widget, 1716 "Inventory (F5)" => $INVENTORY_PAGE = inventory_widget,
1386 "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 :). "
1387 . "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."
1388 ); 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.");
1389 1725
1390 $ntb->set_current_page ($INVENTORY_PAGE); 1726 $ntb->set_current_page ($INVENTORY_PAGE);
1391 1727
1392 $plwin->add ($ntb); 1728 $plwin->add ($ntb);
1393 $plwin 1729 $plwin
… …
1547 on_activate => sub { $QUIT_DIALOG->hide; 0 }, 1883 on_activate => sub { $QUIT_DIALOG->hide; 0 },
1548 ); 1884 );
1549 $hb->add (new CFPlus::UI::Button 1885 $hb->add (new CFPlus::UI::Button
1550 text => "Quit anyway", 1886 text => "Quit anyway",
1551 expand => 1, 1887 expand => 1,
1552 on_activate => sub { exit }, 1888 on_activate => sub { Event::unloop_all },
1553 ); 1889 );
1554 } 1890 }
1555 1891
1556 $QUIT_DIALOG->show; 1892 $QUIT_DIALOG->show;
1557 $QUIT_DIALOG->grab_focus; 1893 $QUIT_DIALOG->grab_focus;
… …
1559 1895
1560sub show_tip_of_the_day { 1896sub show_tip_of_the_day {
1561 # find all tips 1897 # find all tips
1562 my @tod = CFPlus::Pod::find tip_of_the_day => "*"; 1898 my @tod = CFPlus::Pod::find tip_of_the_day => "*";
1563 1899
1564 my $todindex = $CFPlus::DB_STATE->get ("tip_of_the_day"); 1900 CFPlus::DB::get state => "tip_of_the_day", sub {
1901 my ($todindex) = @_;
1565 $todindex = 0 if $todindex >= @tod; 1902 $todindex = 0 if $todindex >= @tod;
1566 $CFPlus::DB_STATE->put (tip_of_the_day => $todindex + 1); 1903 CFPlus::DB::put state => tip_of_the_day => $todindex + 1, sub { };
1567 1904
1568 # create dialog 1905 # create dialog
1569 my $dialog; 1906 my $dialog;
1570 1907
1571 my $close = sub { 1908 my $close = sub {
1572 $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;
1573 }; 1947 };
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} 1948}
1611 1949
1612sub sdl_init { 1950sub sdl_init {
1613 CFPlus::SDL_Init 1951 CFPlus::SDL_Init
1614 and die "SDL::Init failed!\n"; 1952 and die "SDL::Init failed!\n";
1615} 1953}
1616 1954
1617sub video_init { 1955sub video_init {
1618 sdl_init;
1619
1620 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} >= @SDL_MODES; 1956 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} >= @SDL_MODES;
1621 1957
1622 my ($old_w, $old_h) = ($WIDTH, $HEIGHT); 1958 my ($old_w, $old_h) = ($WIDTH, $HEIGHT);
1623 1959
1624 ($WIDTH, $HEIGHT) = @{ $SDL_MODES[$CFG->{sdl_mode}] }; 1960 ($WIDTH, $HEIGHT, my ($rgb, $alpha)) = @{ $SDL_MODES[$CFG->{sdl_mode}] };
1625 $FULLSCREEN = $CFG->{fullscreen}; 1961 $FULLSCREEN = $CFG->{fullscreen};
1626 $FAST = $CFG->{fast}; 1962 $FAST = $CFG->{fast};
1627 1963
1628 CFPlus::SDL_SetVideoMode $WIDTH, $HEIGHT, $FULLSCREEN 1964 CFPlus::SDL_SetVideoMode $WIDTH, $HEIGHT, $rgb, $alpha, $FULLSCREEN
1629 or die "SDL_SetVideoMode failed: " . (CFPlus::SDL_GetError) . "\n"; 1965 or die "SDL_SetVideoMode failed: " . (CFPlus::SDL_GetError) . "\n";
1630 1966
1631 $SDL_ACTIVE = 1; 1967 $SDL_ACTIVE = 1;
1632 $LAST_REFRESH = time - 0.01; 1968 $LAST_REFRESH = time - 0.01;
1633 1969
… …
1675 2011
1676 $MAPWIDGET = new CFPlus::MapWidget; 2012 $MAPWIDGET = new CFPlus::MapWidget;
1677 $MAPWIDGET->connect (activate_console => sub { 2013 $MAPWIDGET->connect (activate_console => sub {
1678 my ($mapwidget, $preset) = @_; 2014 my ($mapwidget, $preset) = @_;
1679 2015
1680 if ($CONSOLE) { 2016 $MESSAGE_WINDOW->activate_console ($preset)
1681 $CONSOLE->{input}->{auto_activated} = 1; 2017 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 }); 2018 });
1689 $MAPWIDGET->show; 2019 $MAPWIDGET->show;
1690 $MAPWIDGET->grab_focus; 2020 $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 2021
1702 $SETUP_DIALOG = new CFPlus::UI::Toplevel 2022 $SETUP_DIALOG = new CFPlus::UI::Toplevel
1703 title => "Setup", 2023 title => "Setup",
1704 name => "setup_dialog", 2024 name => "setup_dialog",
1705 x => 'center', 2025 x => 'center',
… …
1709 force_h => $::HEIGHT * 0.6, 2029 force_h => $::HEIGHT * 0.6,
1710 has_close_button => 1, 2030 has_close_button => 1,
1711 ; 2031 ;
1712 2032
1713 $METASERVER = metaserver_dialog; 2033 $METASERVER = metaserver_dialog;
2034 $MESSAGE_WINDOW = new CFPlus::UI::MessageWindow;
1714 2035
1715 $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,
1716 filter => new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1); 2037 filter => new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1);
1717 2038
1718 $SETUP_NOTEBOOK->add (Server => $SETUP_SERVER = server_setup, 2039 $SETUP_NOTEBOOK->add_tab (Server => $SETUP_SERVER = server_setup,
1719 "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.");
1720 $SETUP_NOTEBOOK->add (Pickup => autopickup_setup, 2041 $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."); 2042 "Configure various client-specific settings.");
1722 $SETUP_NOTEBOOK->add (Graphics => graphics_setup, 2043 $SETUP_NOTEBOOK->add_tab (Graphics => graphics_setup,
1723 "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.");
1724 $SETUP_NOTEBOOK->add (Audio => audio_setup, 2045 $SETUP_NOTEBOOK->add_tab (Audio => audio_setup,
1725 "Configure the use of audio, sound effects and background music."); 2046 "Configure the use of audio, sound effects and background music.");
1726 $SETUP_NOTEBOOK->add (Keyboard => $SETUP_KEYBOARD = keyboard_setup, 2047 $SETUP_NOTEBOOK->add_tab (Keyboard => $SETUP_KEYBOARD = keyboard_setup,
1727 "Lets you define, edit and delete key bindings." 2048 "Lets you define, edit and delete key bindings."
1728 . "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 "
1729 . "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 "
1730 . "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. "
1731 . "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 "
1732 . "binding editor closes"); 2053 . "binding editor closes");
1733 $SETUP_NOTEBOOK->add (Debug => debug_setup, 2054 $SETUP_NOTEBOOK->add_tab (Debug => debug_setup,
1734 "Some debuggin' options. Do not ask."); 2055 "Some debuggin' options. Do not ask.");
1735 2056
1736 $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
1737 2058
1738 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Setup", other => $SETUP_DIALOG, 2059 $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."); 2060 tooltip => "Toggles a dialog where you can configure all aspects of this client.");
1740 2061
1741 $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,
1742 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.");
1743 2064
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 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
1745 2066
1746 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Playerbook", other => player_window, 2067 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Playerbook", other => player_window,
… …
1766 tooltip => "Terminates the program", 2087 tooltip => "Terminates the program",
1767 on_activate => sub { 2088 on_activate => sub {
1768 if ($CONN) { 2089 if ($CONN) {
1769 open_quit_dialog; 2090 open_quit_dialog;
1770 } else { 2091 } else {
1771 exit; 2092 Event::unloop_all;
1772 } 2093 }
1773 0 2094 0
1774 }, 2095 },
1775 ); 2096 );
1776 2097
1777 $BUTTONBAR->show; 2098 $BUTTONBAR->show;
1778 $SETUP_DIALOG->show; 2099 $SETUP_DIALOG->show;
2100 $MESSAGE_WINDOW->show;
1779 } 2101 }
1780 2102
1781 $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]);
1782}
1783
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} 2104}
1902 2105
1903sub video_shutdown { 2106sub video_shutdown {
1904 CFPlus::OpenGL::shutdown; 2107 CFPlus::OpenGL::shutdown;
1905 2108
1906 undef $SDL_ACTIVE; 2109 undef $SDL_ACTIVE;
1907} 2110}
1908 2111
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; 2112my %animate_object;
1972my $animate_timer; 2113my $animate_timer;
1973 2114
1974my $fps = 9; 2115my $fps = 9;
1975 2116
1976my %demo;#d#
1977
1978sub force_refresh { 2117sub force_refresh {
2118 if ($ENV{CFPLUS_DEBUG} & 4) {
1979 $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;
1980 debug sprintf "%3.2f", $fps if $ENV{CFPLUS_DEBUG} & 4; 2120 debug sprintf "%3.2f", $fps;
2121 }
1981 2122
1982 $CFPlus::UI::ROOT->draw; 2123 $CFPlus::UI::ROOT->draw;
1983 2124 CFPlus::SDL_GL_SwapBuffers;
1984 $WANT_REFRESH = 0;
1985 $CAN_REFRESH = 0;
1986 $LAST_REFRESH = $NOW; 2125 $LAST_REFRESH = $NOW;
1987 2126 $WANT_REFRESH->stop;
1988 CFPlus::SDL_GL_SwapBuffers;
1989} 2127}
1990 2128
2129$WANT_REFRESH = Event->idle (min => 0.001, max => 0.06, parked => 1, cb => \&force_refresh);
2130
1991my $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 {
1992 $NOW = time; 2132 $NOW = time;
1993 2133
1994 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_) 2134 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_)
1995 for CFPlus::SDL_PollEvent; 2135 for CFPlus::poll_events;
1996 2136
1997 if (%animate_object) { 2137 if (%animate_object) {
1998 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object; 2138 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object;
1999 $WANT_REFRESH++; 2139 $WANT_REFRESH->start;
2000 }
2001
2002 if ($WANT_REFRESH) {
2003 force_refresh;
2004 } else {
2005 $CAN_REFRESH = 1;
2006 } 2140 }
2007}); 2141});
2008 2142
2009sub animation_start { 2143sub animation_start {
2010 my ($widget) = @_; 2144 my ($widget) = @_;
… …
2014sub animation_stop { 2148sub animation_stop {
2015 my ($widget) = @_; 2149 my ($widget) = @_;
2016 delete $animate_object{$widget}; 2150 delete $animate_object{$widget};
2017} 2151}
2018 2152
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 = ( 2153%SDL_CB = (
2029 CFPlus::SDL_QUIT => sub { 2154 CFPlus::SDL_QUIT => sub {
2030 Event::unloop -1; 2155 exit;
2031 }, 2156 },
2032 CFPlus::SDL_VIDEORESIZE => sub { 2157 CFPlus::SDL_VIDEORESIZE => sub {
2033 }, 2158 },
2034 CFPlus::SDL_VIDEOEXPOSE => sub { 2159 CFPlus::SDL_VIDEOEXPOSE => sub {
2035 CFPlus::UI::full_refresh; 2160 CFPlus::UI::full_refresh;
2036 }, 2161 },
2037 CFPlus::SDL_ACTIVEEVENT => sub { 2162 CFPlus::SDL_ACTIVEEVENT => sub {
2038# not useful, as APPACTIVE include sonly iconified state, not unmapped 2163# not useful, as APPACTIVE include sonly iconified state, not unmapped
2039# 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#
2040# printf "A\n" if $_[0]{state} & CFPlus::SDL_APPACTIVE; 2166# printf "A\n" if $_[0]{state} & CFPlus::SDL_APPACTIVE;
2041# printf "K\n" if $_[0]{state} & CFPlus::SDL_APPINPUTFOCUS; 2167# printf "K\n" if $_[0]{state} & CFPlus::SDL_APPINPUTFOCUS;
2042# printf "M\n" if $_[0]{state} & CFPlus::SDL_APPMOUSEFOCUS; 2168# printf "M\n" if $_[0]{state} & CFPlus::SDL_APPMOUSEFOCUS;
2043 }, 2169 },
2044 CFPlus::SDL_KEYDOWN => sub { 2170 CFPlus::SDL_KEYDOWN => sub {
… …
2068 2194
2069$SIG{INT} = $SIG{TERM} = sub { exit }; 2195$SIG{INT} = $SIG{TERM} = sub { exit };
2070 2196
2071{ 2197{
2072 CFPlus::read_cfg "$Crossfire::VARDIR/cfplusrc"; 2198 CFPlus::read_cfg "$Crossfire::VARDIR/cfplusrc";
2199 CFPlus::DB::Server::run;
2200
2073 CFPlus::UI::set_layout ($::CFG->{layout}); 2201 CFPlus::UI::set_layout ($::CFG->{layout});
2074 2202
2075 my %DEF_CFG = ( 2203 my %DEF_CFG = (
2076 sdl_mode => 0, 2204 sdl_mode => 0,
2077 width => 640,
2078 height => 480,
2079 fullscreen => 0, 2205 fullscreen => 0,
2080 fast => 0, 2206 fast => 0,
2207 force_opengl11 => undef,
2208 texture_compression => 1,
2081 map_scale => 1, 2209 map_scale => 1,
2082 fow_enable => 1, 2210 fow_enable => 1,
2083 fow_intensity => 0.45, 2211 fow_intensity => 0,
2084 fow_smooth => 0, 2212 map_smoothing => 1,
2085 gui_fontsize => 1, 2213 gui_fontsize => 1,
2086 log_fontsize => 0.7, 2214 log_fontsize => 0.7,
2087 gauge_fontsize => 1, 2215 gauge_fontsize => 1,
2088 gauge_size => 0.35, 2216 gauge_size => 0.35,
2089 stat_fontsize => 0.7, 2217 stat_fontsize => 0.7,
2090 mapsize => 100, 2218 mapsize => 100,
2091 say_command => 'chat',
2092 audio_enable => 1, 2219 audio_enable => 1,
2220 effects_enable => 1,
2221 effects_volume => 1,
2093 bgm_enable => 1, 2222 bgm_enable => 1,
2094 bgm_volume => 0.25, 2223 bgm_volume => 0.5,
2095 face_prefetch => 0,
2096 output_sync => 1, 2224 output_sync => 1,
2097 output_count => 1, 2225 output_count => 1,
2226 output_rate => "",
2098 pickup => 0, 2227 pickup => 0,
2099 inv_sort => "mtime", 2228 inv_sort => "mtime",
2100 default => "profile", # default profile 2229 default => "profile", # default profile
2101 show_tips => 1, 2230 show_tips => 1,
2231 logview_max_par => 1000,
2102 ); 2232 );
2103 2233
2104 while (my ($k, $v) = each %DEF_CFG) { 2234 while (my ($k, $v) = each %DEF_CFG) {
2105 $CFG->{$k} = $v unless exists $CFG->{$k}; 2235 $CFG->{$k} = $v unless exists $CFG->{$k};
2106 } 2236 }
… …
2120 } 2250 }
2121 } 2251 }
2122 2252
2123 sdl_init; 2253 sdl_init;
2124 2254
2125 @SDL_MODES = reverse 2255 @SDL_MODES = CFPlus::SDL_ListModes 8, 8;
2126 grep $_->[0] >= 640 && $_->[1] >= 480, 2256 @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)"; 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;
2130 2260
2131 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES; 2261 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES;
2132 2262
2133 { 2263 {
2134 my @fonts = map CFPlus::find_rcfile "fonts/$_", qw( 2264 my @fonts = map CFPlus::find_rcfile "fonts/$_", qw(
… …
2172} 2302}
2173 2303
2174show_tip_of_the_day if $CFG->{show_tips}; 2304show_tip_of_the_day if $CFG->{show_tips};
2175 2305
2176Event::loop; 2306Event::loop;
2307
2308#video_shutdown;
2309#audio_shutdown;
2177#CFPlus::SDL_Quit; 2310CFPlus::SDL_Quit;
2178#CFPlus::_exit 0; 2311CFPlus::DB::Server::stop;
2179
2180END { CFPlus::SDL_Quit }
2181 2312
2182=head1 NAME 2313=head1 NAME
2183 2314
2184cfplus - A Crossfire+ and Crossfire game client 2315cfplus - A Crossfire TRT and Crossfire game client
2185 2316
2186=head1 SYNOPSIS 2317=head1 SYNOPSIS
2187 2318
2188Just run it - no commandline arguments are supported. 2319Just run it - no commandline arguments are supported.
2189 2320
2190=head1 USAGE 2321=head1 USAGE
2191 2322
2192cfplus 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
2193fullscreen and interactively. 2324be used in fullscreen mode and interactively.
2194 2325
2195=head1 DEBUGGING 2326=head1 DEBUGGING
2196 2327
2197 2328
2198CFPLUS_DEBUG - environment variable 2329CFPLUS_DEBUG - environment variable

Diff Legend

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