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

Diff Legend

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