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.153 by root, Tue Apr 24 01:13:54 2007 UTC vs.
Revision 1.219 by root, Tue Aug 21 00:59:34 2007 UTC

1#!/opt/bin/perl 1#!/opt/bin/perl
2 2
3my $startup_done = sub { }; 3my $startup_done = sub { };
4our $PANGO = "1.5.0";
4 5
5# do splash-screen thingy on win32 6# do splash-screen thingy on win32
6BEGIN { 7BEGIN {
7 if (%PAR::LibCache && $^O eq "MSWin32") { 8 if (%PAR::LibCache && $^O eq "MSWin32") {
8 while (my ($filename, $zip) = each %PAR::LibCache) { 9 while (my ($filename, $zip) = each %PAR::LibCache) {
… …
29# do things only needed for single-binary version (par) 30# do things only needed for single-binary version (par)
30BEGIN { 31BEGIN {
31 if (%PAR::LibCache) { 32 if (%PAR::LibCache) {
32 @INC = grep ref, @INC; # weed out all paths except pars loader refs 33 @INC = grep ref, @INC; # weed out all paths except pars loader refs
33 34
35 my $tmp = $ENV{PAR_TEMP};
36
34 while (my ($filename, $zip) = each %PAR::LibCache) { 37 while (my ($filename, $zip) = each %PAR::LibCache) {
35 for ($zip->memberNames) { 38 for ($zip->memberNames) {
36 next unless /^root\/(.*)/; 39 next unless /^root\/(.*)/;
37 $zip->extractMember ($_, "$ENV{PAR_TEMP}/$1") 40 $zip->extractMember ($_, "$tmp/$1")
38 unless -e "$ENV{PAR_TEMP}/$1"; 41 unless -e "$tmp/$1";
39 } 42 }
40 } 43 }
41 44
42 # TODO: pango-rc file, anybody? 45 if ($^O eq "MSWin32") {
46 # relocatable
47 } else {
48 # unix, need to patch pango rc file
49 open my $fh, "<:perlio", "$tmp/usr/lib/pango/$PANGO/module-files.d/libpango1.0-0.modules"
50 or die "$tmp/usr/lib/$PANGO/module-files.d/libpango1.0-0.modules: $!";
51 local $/;
52 my $rc = <$fh>;
53 $rc =~ s/^\//$tmp\//gm; # replace abs paths by relative ones
43 54
44 unshift @INC, $ENV{PAR_TEMP}; 55 mkdir "$tmp/pango-modules";
56 open my $fh, ">:perlio", "$tmp/pango-modules/pango.modules"
57 or die "$tmp/pango-modules/pango.modules: $!";
58 print $fh $rc;
59
60 $ENV{PANGO_RC_FILE} = "$tmp/pango.rc";
61 open my $fh, ">:perlio", $ENV{PANGO_RC_FILE}
62 or die "$ENV{PANGO_RC_FILE}: $!";
63 print $fh "[Pango]\nModuleFiles = $tmp/pango-modules\n";
64 }
65
66 unshift @INC, $tmp;
45 } 67 }
46} 68}
47 69
48# need to do it again because that pile of garbage called PAR nukes it before main 70# need to do it again because that pile of garbage called PAR nukes it before main
49unshift @INC, $ENV{PAR_TEMP} 71unshift @INC, $ENV{PAR_TEMP}
50 if %PAR::LibCache; 72 if %PAR::LibCache;
51 73
52use Time::HiRes 'time'; 74use Time::HiRes 'time';
53use Event; 75use Event;
76use List::Util qw(max min);
54 77
55use Crossfire; 78use Crossfire;
56use Crossfire::Protocol::Constants; 79use Crossfire::Protocol::Constants;
57 80
58use Compress::LZF; 81use Compress::LZF;
… …
60use CFPlus; 83use CFPlus;
61use CFPlus::OpenGL (); 84use CFPlus::OpenGL ();
62use CFPlus::Protocol; 85use CFPlus::Protocol;
63use CFPlus::DB; 86use CFPlus::DB;
64use CFPlus::UI; 87use CFPlus::UI;
88use CFPlus::UI::Canvas;
65use CFPlus::UI::Inventory; 89use CFPlus::UI::Inventory;
66use CFPlus::UI::SpellList; 90use CFPlus::UI::SpellList;
91use CFPlus::UI::MessageWindow;
67use CFPlus::Pod; 92use CFPlus::Pod;
68use CFPlus::MapWidget; 93use CFPlus::MapWidget;
69use CFPlus::Macro; 94use CFPlus::Macro;
70 95
71$SIG{QUIT} = sub { Carp::cluck "QUIT" }; 96$SIG{QUIT} = sub { Carp::cluck "QUIT" };
… …
88our $CONN; 113our $CONN;
89our $PROFILE; # current profile 114our $PROFILE; # current profile
90our $FAST; # fast, low-quality mode, possibly useful for software-rendering 115our $FAST; # fast, low-quality mode, possibly useful for software-rendering
91 116
92our $WANT_REFRESH; 117our $WANT_REFRESH;
93our $CAN_REFRESH;
94 118
95our @SDL_MODES; 119our @SDL_MODES;
96our $WIDTH; 120our $WIDTH;
97our $HEIGHT; 121our $HEIGHT;
98our $FULLSCREEN; 122our $FULLSCREEN;
… …
103 127
104our $MAP; 128our $MAP;
105our $MAPMAP; 129our $MAPMAP;
106our $MAPWIDGET; 130our $MAPWIDGET;
107our $BUTTONBAR; 131our $BUTTONBAR;
108our $LOGVIEW;
109our $CONSOLE;
110our $METASERVER; 132our $METASERVER;
111our $LOGIN_BUTTON; 133our $LOGIN_BUTTON;
112our $QUIT_DIALOG; 134our $QUIT_DIALOG;
113our $HOST_ENTRY; 135our $HOST_ENTRY;
114our $FULLSCREEN_ENABLE; 136our $FULLSCREEN_ENABLE;
… …
121our $SETUP_KEYBOARD; 143our $SETUP_KEYBOARD;
122 144
123our $PL_NOTEBOOK; 145our $PL_NOTEBOOK;
124our $PL_WINDOW; 146our $PL_WINDOW;
125 147
148our $MUSIC_PLAYING_WIDGET;
149our $LICENSE_WIDGET;
150
126our $INVENTORY_PAGE; 151our $INVENTORY_PAGE;
127our $STATS_PAGE; 152our $STATS_PAGE;
128our $SKILL_PAGE; 153our $SKILL_PAGE;
129our $SPELL_PAGE; 154our $SPELL_PAGE;
130our $SPELL_LIST; 155our $SPELL_LIST;
… …
136our $STATWIDS; 161our $STATWIDS;
137 162
138our $SDL_ACTIVE; 163our $SDL_ACTIVE;
139our %SDL_CB; 164our %SDL_CB;
140 165
141our $SDL_MIXER;
142our @SOUNDS; # event => file mapping
143our %AUDIO_CHUNKS; # audio files
144
145our $ALT_ENTER_MESSAGE; 166our $ALT_ENTER_MESSAGE;
146our $STATUSBOX; 167our $STATUSBOX;
147our $DEBUG_STATUS; 168our $DEBUG_STATUS;
148 169
149our $INV; 170our $INV;
150our $INVR; 171our $INVR;
151our $INV_RIGHT_HB; 172our $INVR_HB;
152 173
153our $PICKUP_CFG; 174#############################################################################
154
155our $IN_BUILD_MODE;
156our $BUILD_BUTTON;
157 175
158sub status { 176sub status {
159 $STATUSBOX->add (CFPlus::asxml $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]); 177 $STATUSBOX->add (CFPlus::asxml $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]);
160} 178}
161 179
… …
163 $DEBUG_STATUS->set_text ($_[0]); 181 $DEBUG_STATUS->set_text ($_[0]);
164} 182}
165 183
166sub message { 184sub message {
167 my ($para) = @_; 185 my ($para) = @_;
168 186 $MESSAGE_WINDOW->message ($para);
169 my $time = sprintf "%02d:%02d:%02d", (localtime time)[2,1,0];
170
171 $para->{markup} = "<span foreground='#ffffff'>$time</span> $para->{markup}";
172
173 $LOGVIEW->add_paragraph ($para);
174 $LOGVIEW->scroll_to_bottom;
175} 187}
188
189#############################################################################
190#TODO: maybe move into own audio module...
191
192our $SDL_MIXER;
193
194our $MUSIC_DEFAULT = "in_a_heartbeat.ogg";
195our $MUSIC_WANT; # arryref of ambient music we want to play
196our @MUSIC_HAVE; # ambient music we have on disk
197our $MUSIC_START;
198our @MUSIC_JINGLE; # which jingles to play next
199our $MUSIC_PLAYING_DATA;
200our $MUSIC_PLAYING_META;
201our $MUSIC_PLAYER;
202our $MUSIC_RESUME = 30; # resume music when played less than these many seconds before
203
204our %AUDIO_CHUNK; # audio "files"
205our %AUDIO_PLAY; # which audio faces should be played
206
207sub audio_channel_finished {
208 my ($channel) = @_;
209
210# warn "channel $channel finished\n";#d#
211}
212
213sub audio_sound_push($) {
214 my ($face) = @_;
215
216 $CFG->{effects_enable}
217 or return;
218
219 $AUDIO_PLAY{$face}
220 or return;
221
222 if (my $chunk = $AUDIO_CHUNK{$face}) {
223 for (grep $_->[0] >= Event::time, @{(delete $AUDIO_PLAY{$face}) || []}) {
224 my (undef, $dx, $dy, $vol) = @$_;
225
226 my $channel = CFPlus::Channel::find;
227 $channel->volume ($vol * $CFG->{effects_volume} * 128 / 255);
228 $channel->set_position_r ($dx, $dy, 20);
229 $chunk->play ($channel);
230 }
231 } else {
232 # sound_meta not set means data is in flight either way
233 my $meta = $CONN->{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#############################################################################
176 432
177sub destroy_query_dialog { 433sub destroy_query_dialog {
178 (delete $_[0]{query_dialog})->destroy 434 (delete $_[0]{query_dialog})->destroy
179 if $_[0]{query_dialog}; 435 if $_[0]{query_dialog};
180} 436}
… …
244 ellipsise => 0, 500 ellipsise => 0,
245 markup => "\nOr use your keyboard and the text entry below:\n"; 501 markup => "\nOr use your keyboard and the text entry below:\n";
246 502
247 unshift @dialog, my $table = new CFPlus::UI::Table; 503 unshift @dialog, my $table = new CFPlus::UI::Table;
248 504
249 $table->add (0, 0, new CFPlus::UI::Button 505 $table->add_at (0, 0, new CFPlus::UI::Button
250 text => "Next Race", 506 text => "Next Race",
251 on_activate => sub { 507 on_activate => sub {
252 $conn->send ("reply n"); 508 $conn->send ("reply n");
253 destroy_query_dialog $conn; 509 destroy_query_dialog $conn;
254 0 510 0
255 }, 511 },
256 ); 512 );
257 $table->add (2, 0, new CFPlus::UI::Button 513 $table->add_at (2, 0, new CFPlus::UI::Button
258 text => "Accept", 514 text => "Accept",
259 on_activate => sub { 515 on_activate => sub {
260 $conn->send ("reply d"); 516 $conn->send ("reply d");
261 destroy_query_dialog $conn; 517 destroy_query_dialog $conn;
262 0 518 0
… …
297 $conn->send ("reply $stat"); 553 $conn->send ("reply $stat");
298 destroy_query_dialog $conn; 554 destroy_query_dialog $conn;
299 return; 555 return;
300 } 556 }
301 557
302 $STATS_PAGE->show;
303 $MESSAGE_WINDOW->hide;
304
305 unshift @dialog, new CFPlus::UI::Label 558 unshift @dialog, new CFPlus::UI::Label
306 max_w => $::WIDTH * 0.4, 559 max_w => $::WIDTH * 0.4,
307 ellipsise => 0, 560 ellipsise => 0,
308 markup => "\nOr use your keyboard and the text entry below:\n"; 561 markup => "\nOr use your keyboard and the text entry below:\n";
309 562
310 unshift @dialog, my $table = new CFPlus::UI::Table; 563 unshift @dialog, my $table = new CFPlus::UI::Table;
311 564
312 # left: re-roll 565 # left: re-roll
313 $table->add (0, 0, new CFPlus::UI::Button 566 $table->add_at (0, 0, new CFPlus::UI::Button
314 text => "Roll Again", 567 text => "Roll Again",
315 on_activate => sub { 568 on_activate => sub {
316 $conn->send ("reply y"); 569 $conn->send ("reply y");
317 destroy_query_dialog $conn; 570 destroy_query_dialog $conn;
318 0 571 0
… …
332 [6 => "Pow", "Power ($conn->{stat}{+CS_STAT_POW})"], 585 [6 => "Pow", "Power ($conn->{stat}{+CS_STAT_POW})"],
333 [7 => "Cha", "Charisma ($conn->{stat}{+CS_STAT_CHA})"], 586 [7 => "Cha", "Charisma ($conn->{stat}{+CS_STAT_CHA})"],
334 ], 587 ],
335 ), 1 .. 2; 588 ), 1 .. 2;
336 589
337 $table->add (2, 0, new CFPlus::UI::Button 590 $table->add_at (2, 0, new CFPlus::UI::Button
338 text => "Swap Stats", 591 text => "Swap Stats",
339 on_activate => sub { 592 on_activate => sub {
340 $conn->{stat_change_with} = $sw2->{value}; 593 $conn->{stat_change_with} = $sw2->{value};
341 $conn->send ("reply $sw1->{value}"); 594 $conn->send ("reply $sw1->{value}");
342 destroy_query_dialog $conn; 595 destroy_query_dialog $conn;
343 0 596 0
344 }, 597 },
345 ); 598 );
346 $table->add (2, 1, new CFPlus::UI::HBox children => [$sw1, $sw2]); 599 $table->add_at (2, 1, new CFPlus::UI::HBox children => [$sw1, $sw2]);
347 600
348 # right: accept 601 # right: accept
349 $table->add (4, 0, new CFPlus::UI::Button 602 $table->add_at (4, 0, new CFPlus::UI::Button
350 text => "Accept", 603 text => "Accept",
351 on_activate => sub { 604 on_activate => sub {
352 $conn->send ("reply n"); 605 $conn->send ("reply n");
353 $STATS_PAGE->hide; 606 $STATS_PAGE->hide;
354 destroy_query_dialog $conn; 607 destroy_query_dialog $conn;
… …
435 maph => $mapsize, 688 maph => $mapsize,
436 689
437 client => "cfplus $CFPlus::VERSION $] $^O", 690 client => "cfplus $CFPlus::VERSION $] $^O",
438 691
439 map_widget => $MAPWIDGET, 692 map_widget => $MAPWIDGET,
440 logview => $LOGVIEW,
441 statusbox => $STATUSBOX, 693 statusbox => $STATUSBOX,
442 map => $MAP, 694 map => $MAP,
443 mapmap => $MAPMAP, 695 mapmap => $MAPMAP,
444 query => \&server_query, 696 query => \&server_query,
445 697
446 setup_req => { 698 setup_req => {
447 smoothing => $CFG->{map_smoothing}*1, 699 smoothing => $CFG->{map_smoothing}*1,
448 },
449
450 sound_play => sub {
451 my ($x, $y, $soundnum, $type) = @_;
452
453 $SDL_MIXER
454 or return;
455
456 my $chunk = $AUDIO_CHUNKS{$SOUNDS[$soundnum]}
457 or return;
458
459 $chunk->play;
460 }, 700 },
461 }; 701 };
462 702
463 if ($CONN) { 703 if ($CONN) {
464 CFPlus::lowdelay fileno $CONN->{fh}; 704 CFPlus::lowdelay fileno $CONN->{fh};
… …
474 $LOGIN_BUTTON->set_text ("Login"); 714 $LOGIN_BUTTON->set_text ("Login");
475 $SETUP_NOTEBOOK->set_current_page ($SETUP_SERVER); 715 $SETUP_NOTEBOOK->set_current_page ($SETUP_SERVER);
476 $SETUP_DIALOG->show; 716 $SETUP_DIALOG->show;
477 $PL_WINDOW->hide; 717 $PL_WINDOW->hide;
478 $SPELL_LIST->clear_spells; 718 $SPELL_LIST->clear_spells;
719 $CFPlus::UI::ROOT->emit (stop_game => ! ! $CONN);
720
721 &audio_music_set_ambient ([]);
479 722
480 return unless $CONN; 723 return unless $CONN;
481 724
482 status "connection closed"; 725 status "connection closed";
483 726
… …
493 736
494 $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]);
495 738
496 my $row = 0; 739 my $row = 0;
497 740
498 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "OpenGL Info"); 741 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "OpenGL Info");
499 $table->add (1, $row++, new CFPlus::UI::Label valign => 0, fontsize => 0.8, text => CFPlus::OpenGL::gl_vendor . ", " . CFPlus::OpenGL::gl_version, 742 $table->add_at (1, $row++, new CFPlus::UI::Label valign => 0, fontsize => 0.8, text => CFPlus::OpenGL::gl_vendor . ", " . CFPlus::OpenGL::gl_version,
500 can_events => 1, 743 can_events => 1,
501 tooltip => "<tt><span size='8192'>" . (CFPlus::OpenGL::gl_extensions) . "</span></tt>"); 744 tooltip => "<tt><span size='8192'>" . (CFPlus::OpenGL::gl_extensions) . "</span></tt>");
502 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
503 $table->add (0, $row, 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");
504 $table->add (1, $row++, my $hbox = new CFPlus::UI::HBox); 751 $table->add_at (1, $row++, my $hbox = new CFPlus::UI::HBox);
505 752
753 $hbox->add (my $mode_slider = new CFPlus::UI::Slider
506 $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],
507 $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);
508 759
509 $mode_slider->connect (changed => sub { 760 $mode_slider->connect (changed => sub {
510 my ($self, $value) = @_; 761 my ($self, $value) = @_;
511 762
512 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value; 763 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value;
513 $mode_label->set_text (sprintf "%dx%d", @{$SDL_MODES[$value]}); 764 $mode_label->set_text (sprintf '%dx%d@%d+%d', @{$SDL_MODES[$value]});
514 }); 765 });
515 $mode_slider->emit (changed => $mode_slider->{range}[0]); 766 $mode_slider->emit (changed => $mode_slider->{range}[0]);
516 767
517 $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");
518 $table->add (1, $row++, $FULLSCREEN_ENABLE = new CFPlus::UI::CheckBox 769 $table->add_at (1, $row++, $FULLSCREEN_ENABLE = new CFPlus::UI::CheckBox
519 state => $CFG->{fullscreen}, 770 state => $CFG->{fullscreen},
520 tooltip => "Bring the client into fullscreen mode.", 771 tooltip => "Bring the client into fullscreen mode.",
521 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 } 772 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 }
522 ); 773 );
523 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
524 $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");
525 $table->add (1, $row++, new CFPlus::UI::CheckBox 798 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
526 state => $CFG->{fast}, 799 state => $CFG->{fast},
527 tooltip => "Lower the visual quality considerably to speed up rendering.", 800 tooltip => "Lower the visual quality considerably to speed up rendering.",
528 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 } 801 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 }
529 ); 802 );
530 803
531 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "GUI Fontsize"); 804 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "GUI Fontsize");
532 $table->add (1, $row++, new CFPlus::UI::Slider 805 $table->add_at (1, $row++, new CFPlus::UI::Slider
533 range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1], 806 range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1],
534 tooltip => "The base font size used by most GUI elements that do not have their own setting.", 807 tooltip => "The base font size used by most GUI elements that do not have their own setting.",
535 on_changed => sub { $CFG->{gui_fontsize} = $_[1]; 0 }, 808 on_changed => sub { $CFG->{gui_fontsize} = $_[1]; 0 },
536 ); 809 );
537 810
538 $table->add (1, $row++, new CFPlus::UI::Button 811 $table->add_at (1, $row++, new CFPlus::UI::Button
539 expand => 1, align => 0, text => "Apply", 812 expand => 1, align => 0, text => "Apply",
540 tooltip => "Apply the video settings above.", 813 tooltip => "Apply the video settings above.",
541 on_activate => sub { 814 on_activate => sub {
542 video_shutdown (); 815 video_shutdown ();
543 video_init (); 816 video_init ();
544 0 817 0
545 } 818 }
546 ); 819 );
547 820
548 $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");
549 $table->add (1, $row++, new CFPlus::UI::Slider 822 $table->add_at (1, $row++, new CFPlus::UI::Slider
550 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1], 823 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1],
551 tooltip => "Enlarge or shrink the displayed map. Changes are instant.", 824 tooltip => "Enlarge or shrink the displayed map. Changes are instant.",
552 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 }
553 ); 826 );
554 827
555 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Smoothing"); 828 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Smoothing");
556 $table->add (1, $row++, new CFPlus::UI::CheckBox 829 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
557 state => $CFG->{map_smoothing}, 830 state => $CFG->{map_smoothing},
558 tooltip => "<b>Map Smoothing</b> tries to make tile borders less square. " 831 tooltip => "<b>Map Smoothing</b> tries to make tile borders less square. "
559 . "This increases load on the graphics subsystem and works only with 2.x servers. " 832 . "This increases load on the graphics subsystem and works only with TRT servers. "
560 . "Changes take effect at next connection only.", 833 . "Changes take effect at next login only.",
561 on_changed => sub { my ($self, $value) = @_; $CFG->{map_smoothing} = $value; 0 } 834 on_changed => sub { my ($self, $value) = @_; $CFG->{map_smoothing} = $value; 0 }
562 ); 835 );
563 836
564 $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");
565 $table->add (1, $row++, new CFPlus::UI::CheckBox 838 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
566 state => $CFG->{fow_enable}, 839 state => $CFG->{fow_enable},
567 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.",
568 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; 0 } 841 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; 0 }
569 ); 842 );
570 843
571 $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");
572 $table->add (1, $row++, new CFPlus::UI::Slider 845 $table->add_at (1, $row++, new CFPlus::UI::Slider
573 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256], 846 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256],
574 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.",
575 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_intensity} = $value; 0 } 848 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_intensity} = $value; 0 }
576 ); 849 );
577 850
578 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "FoW Smooth");
579 $table->add (1, $row++, new CFPlus::UI::CheckBox
580 state => $CFG->{fow_smooth},
581 tooltip => "Smooth the Fog-of-War a bit to make it more realistic. Changes are instant.",
582 on_changed => sub {
583 my ($self, $value) = @_;
584 $CFG->{fow_smooth} = $value;
585 status "Fog of War smoothing requires OpenGL 1.2 or higher" if $CFPlus::OpenGL::GL_VERSION < 1.2;
586 0
587 }
588 );
589
590 $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");
591 $table->add (1, $row++, new CFPlus::UI::Slider 852 $table->add_at (1, $row++, new CFPlus::UI::Slider
592 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1], 853 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1],
593 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.",
594 on_changed => sub { $LOGVIEW->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 }, 856 on_changed => sub { $MESSAGE_WINDOW->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 },
595 ); 857 );
596 858
597 $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");
598 $table->add (1, $row++, new CFPlus::UI::Slider 860 $table->add_at (1, $row++, new CFPlus::UI::Slider
599 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1], 861 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1],
600 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.",
601 on_changed => sub { 863 on_changed => sub {
602 $CFG->{gauge_fontsize} = $_[1]; 864 $CFG->{gauge_fontsize} = $_[1];
603 &set_gauge_window_fontsize; 865 &set_gauge_window_fontsize;
604 0 866 0
605 } 867 }
606 ); 868 );
607 869
608 $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");
609 $table->add (1, $row++, new CFPlus::UI::Slider 871 $table->add_at (1, $row++, new CFPlus::UI::Slider
610 range => [$CFG->{gauge_size}, 0.2, 0.8], 872 range => [$CFG->{gauge_size}, 0.2, 0.8],
611 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.",
612 on_changed => sub { 874 on_changed => sub {
613 $CFG->{gauge_size} = $_[1]; 875 $CFG->{gauge_size} = $_[1];
614 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size}); 876 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size});
… …
620} 882}
621 883
622sub audio_setup { 884sub audio_setup {
623 my $vbox = new CFPlus::UI::VBox; 885 my $vbox = new CFPlus::UI::VBox;
624 886
625 $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]);
626 888
627 my $row = 0; 889 my $row = 0;
628 890
629 $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");
630 $table->add (1, $row++, new CFPlus::UI::CheckBox 892 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
631 state => $CFG->{audio_enable}, 893 state => $CFG->{audio_enable},
632 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.",
633 on_changed => sub { $CFG->{audio_enable} = $_[1]; 0 } 895 on_changed => sub { $CFG->{audio_enable} = $_[1]; 0 }
634 ); 896 );
635# $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");
636# $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 {
637# $CFG->{effects_volume} = $_[1]; 899# $CFG->{effects_volume} = $_[1];
638# }); 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
639 $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");
640 $table->add (1, $row++, my $hbox = new CFPlus::UI::HBox);
641 $hbox->add (new CFPlus::UI::CheckBox 920 $table->add_at (1, $row, new CFPlus::UI::CheckBox
642 expand => 1, state => $CFG->{bgm_enable}, 921 expand => 1, state => $CFG->{bgm_enable},
643 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.",
644 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 }
645 ); 929 );
646 $hbox->add (new CFPlus::UI::Slider 930 $table->add_at (2, $row++, new CFPlus::UI::Slider
647 expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128], 931 expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128],
648 tooltip => "The volume of the background music. Changes are instant.", 932 tooltip => "The volume of the background music. Changes are instant.",
649 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 }
650 ); 934 );
651 935
652 $table->add (1, $row++, new CFPlus::UI::Button 936 $table->add_at (1, $row++, new CFPlus::UI::Button
653 expand => 1, align => 0, text => "Apply", 937 c_colspan => 2, expand => 1, align => 0, text => "Apply",
654 tooltip => "Apply the audio settings", 938 tooltip => "Apply the audio settings",
655 on_activate => sub { 939 on_activate => sub {
656 audio_shutdown (); 940 audio_shutdown ();
657 audio_init (); 941 audio_init ();
658 0 942 0
… …
716} 1000}
717 1001
718sub debug_setup { 1002sub debug_setup {
719 my $table = new CFPlus::UI::Table; 1003 my $table = new CFPlus::UI::Table;
720 1004
721 $table->add (0, 0, new CFPlus::UI::Label text => "Widget Borders"); 1005 $table->add_at (0, 0, new CFPlus::UI::Label text => "Widget Borders");
722 $table->add (1, 0, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 1; 0 }); 1006 $table->add_at (1, 0, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 1; 0 });
723 $table->add (0, 1, new CFPlus::UI::Label text => "Tooltip Widget Info"); 1007 $table->add_at (0, 1, new CFPlus::UI::Label text => "Tooltip Widget Info");
724 $table->add (1, 1, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 2; 0 }); 1008 $table->add_at (1, 1, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 2; 0 });
725 $table->add (0, 2, new CFPlus::UI::Label text => "Show FPS"); 1009 $table->add_at (0, 2, new CFPlus::UI::Label text => "Show FPS");
726 $table->add (1, 2, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 4; 0 }); 1010 $table->add_at (1, 2, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 4; 0 });
727 $table->add (0, 3, new CFPlus::UI::Label text => "Suppress Tooltips"); 1011 $table->add_at (0, 3, new CFPlus::UI::Label text => "Suppress Tooltips");
728 $table->add (1, 3, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 8; 0 }); 1012 $table->add_at (1, 3, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 8; 0 });
729 $table->add (0, 4, new CFPlus::UI::Button text => "die on click(tm)", on_activate => sub { die "violator" } ); 1013 $table->add_at (0, 4, new CFPlus::UI::Button text => "die on click(tm)", on_activate => sub { &CFPlus::debug() } );
730 1014
731 my @default_smooth = (0.05, 0.13, 0.05, 0.13, 0.30, 0.13, 0.05, 0.13, 0.05);
732
733 for my $x (0..2) {
734 for my $y (0 .. 2) {
735 $table->add ($x + 3, $y,
736 new CFPlus::UI::Entry
737 text => $default_smooth[$x * 3 + $y],
738 on_changed => sub { $MAP->{smooth_matrix}[$x * 3 + $y] = $_[1] if $MAP; 0 },
739 );
740 }
741 }
742
743 $table->add (0, 5, new CFPlus::UI::TextEdit text => "line1\0152\0153");#d# 1015 $table->add_at (0, 5, new CFPlus::UI::TextEdit text => "line1\0152\0153");#d#
1016
1017 $table->add_at (7,7, my $t = new CFPlus::UI::Table expand => 0);
1018 $t->add_at (0,0, new CFPlus::UI::Label text => "a a a a", c_rowspan => 1, c_colspan => 2);
1019 $t->add_at (2,0, new CFPlus::UI::Label text => "b\nb", c_rowspan => 2, c_colspan => 1);
1020 $t->add_at (1,2, new CFPlus::UI::Label text => "c c c c", c_rowspan => 1, c_colspan => 2);
1021 $t->add_at (0,1, new CFPlus::UI::Label text => "d\nd", c_rowspan => 2, c_colspan => 1);
1022 $t->add_at (1,1, new CFPlus::UI::Label text => "e");
1023
1024 $table->add_at (7, 6, my $c = new CFPlus::UI::Canvas);
1025
1026 $c->add_items ({
1027 type => "line_loop",
1028 color => [0, 1, 0],
1029 width => 9,
1030 coord_mode => "abs",
1031 coord => [[10, 5], [5, 50], [20, 5], [5, 60]],
1032 });
1033
1034 $c->add_items ({
1035 type => "lines",
1036 color => [1, 1, 0],
1037 width => 2,
1038 coord_mode => "rel",
1039 coord => [[0,0], [1,1], [1,0], [0,1]],
1040 });
1041
1042 $c->add_items ({
1043 type => "polygon",
1044 color => [0, 0.43, 0],
1045 width => 2,
1046 coord_mode => "rel",
1047 coord => [[0,0.2], [1,.4], [1,.6], [0,.8]],
1048 });
744 1049
745 $table 1050 $table
746} 1051}
747 1052
748sub stats_window { 1053sub stats_window {
… …
796 [2, 4, st_spd => "Spd", 10.54], 1101 [2, 4, st_spd => "Spd", 10.54],
797 [2, 5, st_wspd => "WSp", 10.54], 1102 [2, 5, st_wspd => "WSp", 10.54],
798 ) { 1103 ) {
799 my ($col, $row, $id, $label, $template) = @$_; 1104 my ($col, $row, $id, $label, $template) = @$_;
800 1105
801 $tbl->add ($col , $row, $STATWIDS->{$id} = new CFPlus::UI::Label 1106 $tbl->add_at ($col , $row, $STATWIDS->{$id} = new CFPlus::UI::Label
802 font => $FONT_FIXED, can_hover => 1, can_events => 1, valign => 0, 1107 font => $FONT_FIXED, can_hover => 1, can_events => 1, valign => 0,
803 align => +1, template => $template, tooltip => "#stat_$label"); 1108 align => +1, template => $template, tooltip => "#stat_$label");
804 $tbl->add ($col + 1, $row, $STATWIDS->{"$id\_lbl"} = new CFPlus::UI::Label 1109 $tbl->add_at ($col + 1, $row, $STATWIDS->{"$id\_lbl"} = new CFPlus::UI::Label
805 font => $FONT_FIXED, can_hover => 1, can_events => 1, fg => $color2, valign => 0, 1110 font => $FONT_FIXED, can_hover => 1, can_events => 1, fg => $color2, valign => 0,
806 align => -1, text => $label, tooltip => "#stat_$label"); 1111 align => -1, text => $label, tooltip => "#stat_$label");
807 } 1112 }
808 1113
809 $vb->add (new CFPlus::UI::FancyFrame 1114 $vb->add (new CFPlus::UI::FancyFrame
… …
850 cold => ["Cold", 1155 cold => ["Cold",
851 "<b>Cold</b> (this is your resistance against cold spells like icestorm, snowstorm, ...)"], 1156 "<b>Cold</b> (this is your resistance against cold spells like icestorm, snowstorm, ...)"],
852 ghit => ["Ghost hit", 1157 ghit => ["Ghost hit",
853 "<b>Ghost hit</b> (special attack used by ghosts and ghost-like beings)"], 1158 "<b>Ghost hit</b> (special attack used by ghosts and ghost-like beings)"],
854 ); 1159 );
1160
855 for (qw/slow holyw conf fire depl magic 1161 for (qw/slow holyw conf fire depl magic
856 drain acid pois para deat phys 1162 drain acid pois para deat phys
857 blind fear tund elec cold ghit/) 1163 blind fear tund elec cold ghit/)
858 { 1164 {
859 $tbl2->add ($col, $row, 1165 $tbl2->add_at ($col, $row,
860 $STATWIDS->{"res_$_"} = 1166 $STATWIDS->{"res_$_"} =
861 new CFPlus::UI::Label 1167 new CFPlus::UI::Label
862 font => $FONT_FIXED, 1168 font => $FONT_FIXED,
863 template => "-100%", 1169 template => "-100%",
864 align => +1, 1170 align => +1,
865 valign => 0, 1171 valign => 0,
866 can_events => 1, 1172 can_events => 1,
867 can_hover => 1, 1173 can_hover => 1,
868 tooltip => $resist_names{$_}->[1], 1174 tooltip => $resist_names{$_}->[1],
869 ); 1175 );
870 $tbl2->add ($col + 1, $row, new CFPlus::UI::Image 1176 $tbl2->add_at ($col + 1, $row, new CFPlus::UI::Image
871 font => $FONT_FIXED, 1177 font => $FONT_FIXED,
872 can_hover => 1, 1178 can_hover => 1,
873 can_events => 1, 1179 can_events => 1,
874 path => "ui/resist/resist_$_.png", 1180 path => "ui/resist/resist_$_.png",
875 tooltip => $resist_names{$_}->[1], 1181 tooltip => $resist_names{$_}->[1],
876 ); 1182 );
877 $tbl2->add ($col + 2, $row, new CFPlus::UI::Label 1183 $tbl2->add_at ($col + 2, $row, new CFPlus::UI::Label
878 text => $resist_names{$_}->[0], 1184 text => $resist_names{$_}->[0],
879 font => $FONT_FIXED, 1185 font => $FONT_FIXED,
880 can_hover => 1, 1186 can_hover => 1,
881 can_events => 1, 1187 can_events => 1,
882 tooltip => $resist_names{$_}->[1], 1188 tooltip => $resist_names{$_}->[1],
… …
915 return if $METASERVER_ATIME > time; 1221 return if $METASERVER_ATIME > time;
916 $METASERVER_ATIME = time + 60; 1222 $METASERVER_ATIME = time + 60;
917 1223
918 my $table = $METASERVER->{table}; 1224 my $table = $METASERVER->{table};
919 $table->clear; 1225 $table->clear;
920 $table->add (0, 0, my $label = new CFPlus::UI::Label max_w => $WIDTH * 0.8, text => "fetching server list..."); 1226 $table->add_at (0, 0, my $label = new CFPlus::UI::Label max_w => $WIDTH * 0.8, text => "fetching server list...");
921 1227
922 my $ok = 0; 1228 my $ok = 0;
923 1229
924 CFPlus::background { 1230 CFPlus::background {
925 my $ua = CFPlus::lwp_useragent; 1231 my $ua = CFPlus::lwp_useragent;
… …
936 "The time this server has been running without being restarted.", 1242 "The time this server has been running without being restarted.",
937 "The server software version - a '+' indicates a Crossfire+ server.", 1243 "The server software version - a '+' indicates a Crossfire+ server.",
938 "Short information about this server provided by its admins.", 1244 "Short information about this server provided by its admins.",
939 ); 1245 );
940 my @col = qw(#Users Host Uptime Version Description); 1246 my @col = qw(#Users Host Uptime Version Description);
941 $table->add ($_, 0, new CFPlus::UI::Label 1247 $table->add_at ($_, 0, new CFPlus::UI::Label
942 can_hover => 1, can_events => 1, 1248 can_hover => 1, can_events => 1,
943 align => 0, fg => [1, 1, 0], 1249 align => 0, fg => [1, 1, 0],
944 text => $col[$_], tooltip => $tip[$_]) 1250 text => $col[$_], tooltip => $tip[$_])
945 for 0 .. $#col; 1251 for 0 .. $#col;
946 1252
… …
968 1274
969 $m = [$users, $host, $uptime, $version, $desc]; 1275 $m = [$users, $host, $uptime, $version, $desc];
970 1276
971 $y++; 1277 $y++;
972 1278
973 $table->add (scalar @$m, $y, new CFPlus::UI::VBox children => [ 1279 $table->add_at (scalar @$m, $y, new CFPlus::UI::VBox children => [
974 (new CFPlus::UI::Button 1280 (new CFPlus::UI::Button
975 text => "Use", 1281 text => "Use",
976 tooltip => "Put this server into the <b>Host:Port</b> field", 1282 tooltip => "Put this server into the <b>Host:Port</b> field",
977 on_activate => sub { 1283 on_activate => sub {
978 $HOST_ENTRY->set_text ($CFG->{profile}{default}{host} = $host); 1284 $HOST_ENTRY->set_text ($CFG->{profile}{default}{host} = $host);
… …
981 }, 1287 },
982 ), 1288 ),
983 (new CFPlus::UI::Empty expand => 1), 1289 (new CFPlus::UI::Empty expand => 1),
984 ]); 1290 ]);
985 1291
986 $table->add ($_, $y, new CFPlus::UI::Label 1292 $table->add_at ($_, $y, new CFPlus::UI::Label
987 max_w => $::WIDTH * 0.4, 1293 max_w => $::WIDTH * 0.4,
988 ellipsise => 0, 1294 ellipsise => 0,
989 align => $align[$_], 1295 align => $align[$_],
990 text => $m->[$_], 1296 text => $m->[$_],
991 tooltip => $tip[$_], 1297 tooltip => $tip[$_],
… …
1032 1338
1033 $vbox->add (new CFPlus::UI::FancyFrame 1339 $vbox->add (new CFPlus::UI::FancyFrame
1034 label => "Connection Settings", 1340 label => "Connection Settings",
1035 child => (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]), 1341 child => (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]),
1036 ); 1342 );
1037 $table->add (0, 2, new CFPlus::UI::Label valign => 0, align => 1, text => "Host:Port"); 1343 $table->add_at (0, 2, new CFPlus::UI::Label valign => 0, align => 1, text => "Host:Port");
1038 1344
1039 { 1345 {
1040 $table->add (1, 2, my $vbox = new CFPlus::UI::VBox); 1346 $table->add_at (1, 2, my $vbox = new CFPlus::UI::VBox);
1041 1347
1042 $vbox->add ( 1348 $vbox->add (
1043 $HOST_ENTRY = new CFPlus::UI::Entry 1349 $HOST_ENTRY = new CFPlus::UI::Entry
1044 expand => 1, 1350 expand => 1,
1045 text => $CFG->{profile}{default}{host}, 1351 text => $CFG->{profile}{default}{host},
1046 tooltip => "The hostname or ip address of the Crossfire(+) server to connect to", 1352 tooltip => "The hostname or ip address of the Crossfire(+) server to connect to",
1047 on_changed => sub { 1353 on_changed => sub {
1048 my ($self, $value) = @_; 1354 my ($self, $value) = @_;
1049 $CFG->{profile}{default}{host} = $value; 1355 $CFG->{profile}{default}{host} = $value;
1050 0 1356 1
1051 } 1357 }
1052 ); 1358 );
1053 1359
1054 $vbox->add (new CFPlus::UI::Button 1360 $vbox->add (new CFPlus::UI::Button
1055 expand => 1, 1361 expand => 1,
1056 text => "Server List", 1362 text => "Server List",
1057 other => $METASERVER, 1363 other => $METASERVER,
1058 tooltip => "Show a list of available crossfire servers", 1364 tooltip => "Show a list of available crossfire servers",
1059 on_activate => sub { $METASERVER->toggle_visibility; 0 }, 1365 on_activate => sub { $METASERVER->toggle_visibility; 0 },
1060 on_visibility_change => sub { $METASERVER->hide unless $_[1]; 0 }, 1366 on_visibility_change => sub { $METASERVER->hide unless $_[1]; 1 },
1061 ); 1367 );
1062 } 1368 }
1063 1369
1064 $table->add (0, 4, new CFPlus::UI::Label valign => 0, align => 1, text => "Username"); 1370 $table->add_at (0, 4, new CFPlus::UI::Label valign => 0, align => 1, text => "Username");
1065 $table->add (1, 4, new CFPlus::UI::Entry 1371 $table->add_at (1, 4, new CFPlus::UI::Entry
1066 text => $CFG->{profile}{default}{user}, 1372 text => $CFG->{profile}{default}{user},
1067 tooltip => "The name of your character on the server", 1373 tooltip => "The name of your character on the server",
1068 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value } 1374 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value; 1 }
1069 ); 1375 );
1070 1376
1071 $table->add (0, 5, new CFPlus::UI::Label valign => 0, align => 1, text => "Password"); 1377 $table->add_at (0, 5, new CFPlus::UI::Label valign => 0, align => 1, text => "Password");
1072 $table->add (1, 5, new CFPlus::UI::Entry 1378 $table->add_at (1, 5, new CFPlus::UI::Entry
1073 text => $CFG->{profile}{default}{password}, 1379 text => $CFG->{profile}{default}{password},
1074 hidden => 1, 1380 hidden => 1,
1075 tooltip => "The password for your character", 1381 tooltip => "The password for your character",
1076 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{password} = $value } 1382 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{password} = $value; 1 }
1077 ); 1383 );
1078 1384
1079 $table->add (0, 7, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Size"); 1385 $table->add_at (0, 7, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Size");
1080 $table->add (1, 7, new CFPlus::UI::Slider 1386 $table->add_at (1, 7, new CFPlus::UI::Slider
1081 force_w => 100, 1387 force_w => 100,
1082 range => [$CFG->{mapsize}, 10, 100, 0, 1], 1388 range => [$CFG->{mapsize}, 10, 100, 0, 1],
1083 tooltip => "This is the size of the portion of the map update the server sends you. " 1389 tooltip => "This is the size of the portion of the map update the server sends you. "
1084 . "If you set this to a high value you will be able to see further, " 1390 . "If you set this to a high value you will be able to see further, "
1085 . "but you also increase bandwidth requirements and latency. " 1391 . "but you also increase bandwidth requirements and latency. "
1086 . "This option is only used once at log-in.", 1392 . "This option is only used once at log-in.",
1087 on_changed => sub { my ($self, $value) = @_; $CFG->{mapsize} = $self->{range}[0] = $value = int $value; 0 }, 1393 on_changed => sub { my ($self, $value) = @_; $CFG->{mapsize} = $self->{range}[0] = $value = int $value; 1 },
1088 ); 1394 );
1089 1395
1090 $table->add (0, 8, new CFPlus::UI::Label valign => 0, align => 1, text => "Face Prefetch");
1091 $table->add (1, 8, new CFPlus::UI::CheckBox
1092 state => $CFG->{face_prefetch},
1093 tooltip => "<b>Background Image Prefetch</b>\n\n"
1094 . "If enabled, the client automatically pre-fetches images from the server. "
1095 . "This might increase or create lag, but increases the chances "
1096 . "of faces being ready for display when you encounter them. "
1097 . "It also uses up server bandwidth on every connect, "
1098 . "so only set it if you really need to prefetch images. "
1099 . "This option can be set and unset any time.",
1100 on_changed => sub { $CFG->{face_prefetch} = $_[1]; 0 },
1101 );
1102
1103 $table->add (0, 9, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Rate"); 1396 $table->add_at (0, 8, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Rate");
1104 $table->add (1, 9, new CFPlus::UI::Entry 1397 $table->add_at (1, 8, new CFPlus::UI::Entry
1105 text => $CFG->{output_rate}, 1398 text => $CFG->{output_rate},
1106 tooltip => "The approximate bandwidth in bytes per second that the server should not exceed " 1399 tooltip => "The maximum bandwidth in bytes per second that the server should not exceed "
1107 . "when sending images, to ensure interactiveness. When 0 or unset, the server " 1400 . "when sending data. When 0 or unset, the server "
1108 . "default will be used, which is usually around 100kb/s.", 1401 . "default will be used, which is usually around 100kb/s. Most servers will "
1402 . "dynamically find an optimal rate, so adjust this only when necessary.",
1109 on_changed => sub { $CFG->{output_rate} = $_[1]; 0 }, 1403 on_changed => sub { $CFG->{output_rate} = $_[1]; 1 },
1110 ); 1404 );
1111 1405
1112 $table->add (0, 10, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Count"); 1406 $table->add_at (0, 9, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Count");
1113 $table->add (1, 10, new CFPlus::UI::Entry 1407 $table->add_at (1, 9, new CFPlus::UI::Entry
1114 text => $CFG->{output_count}, 1408 text => $CFG->{output_count},
1115 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.", 1409 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.",
1116 on_changed => sub { $CFG->{output_count} = $_[1]; 0 }, 1410 on_changed => sub { $CFG->{output_count} = $_[1]; 1 },
1117 ); 1411 );
1118 1412
1119 $table->add (0, 11, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Sync"); 1413 $table->add_at (0, 10, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Sync");
1120 $table->add (1, 11, new CFPlus::UI::Entry 1414 $table->add_at (1, 10, new CFPlus::UI::Entry
1121 text => $CFG->{output_sync}, 1415 text => $CFG->{output_sync},
1122 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.", 1416 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.",
1123 on_changed => sub { $CFG->{output_sync} = $_[1]; 0 }, 1417 on_changed => sub { $CFG->{output_sync} = $_[1]; 1 },
1124 ); 1418 );
1125 1419
1126 $table->add (1, 12, $LOGIN_BUTTON = new CFPlus::UI::Button 1420 $table->add_at (1, 11, $LOGIN_BUTTON = new CFPlus::UI::Button
1127 expand => 1, 1421 expand => 1,
1128 align => 0, 1422 align => 0,
1129 text => "Login", 1423 text => "Login",
1130 on_activate => sub { 1424 on_activate => sub {
1131 $CONN ? stop_game 1425 $CONN ? stop_game
1132 : start_game; 1426 : start_game;
1133 0 1427 1
1134 }, 1428 },
1135 ); 1429 );
1136 1430
1137 $vbox->add (new CFPlus::UI::FancyFrame 1431 $vbox->add (new CFPlus::UI::FancyFrame
1138 label => "Server Info", 1432 label => "Server Info",
… …
1145sub client_setup { 1439sub client_setup {
1146 my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]; 1440 my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1];
1147 1441
1148 my $row = 0; 1442 my $row = 0;
1149 1443
1150 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Chat Command");
1151 $table->add (1, $row++, my $saycmd = new CFPlus::UI::Entry
1152 text => $CFG->{say_command},
1153 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. "
1154 . "Usually you want to enter something like 'say' or 'shout' or 'gsay' here. "
1155 . "But you could also set it to <b>tell <i>playername</i></b> to only chat with that user.",
1156 on_changed => sub {
1157 my ($self, $value) = @_;
1158 $CFG->{say_command} = $value;
1159 0
1160 }
1161 );
1162
1163 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Tip of the day"); 1444 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Tip of the day");
1164 $table->add (1, $row++, new CFPlus::UI::CheckBox 1445 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
1165 state => $CFG->{show_tips}, 1446 state => $CFG->{show_tips},
1166 tooltip => "Show the <b>Tip of the day</b> window at startup?", 1447 tooltip => "Show the <b>Tip of the day</b> window at startup?",
1167 on_changed => sub { 1448 on_changed => sub {
1168 my ($self, $value) = @_; 1449 my ($self, $value) = @_;
1169 $CFG->{show_tips} = $value; 1450 $CFG->{show_tips} = $value;
1170 0 1451 0
1171 } 1452 }
1172 ); 1453 );
1173 1454
1174 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Messages Window Size"); 1455 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Messages Window Size");
1175 $table->add (1, $row++, my $saycmd = new CFPlus::UI::Entry 1456 $table->add_at (1, $row++, my $saycmd = new CFPlus::UI::Entry
1176 text => $CFG->{logview_max_par}, 1457 text => $CFG->{logview_max_par},
1177 tooltip => "This is maximum number of messages remembered in the <b>Messages</b> window. If the server " 1458 tooltip => "This is maximum number of messages remembered in the <b>Messages</b> window. If the server "
1178 . "sends more messages than this number, older messages get removed to save memory and " 1459 . "sends more messages than this number, older messages get removed to save memory and "
1179 . "computing time. A value of <b>0</b> disables this feature, but that is not recommended.", 1460 . "computing time. A value of <b>0</b> disables this feature, but that is not recommended.",
1180 on_changed => sub { 1461 on_changed => sub {
1181 my ($self, $value) = @_; 1462 my ($self, $value) = @_;
1182 $LOGVIEW->{max_par} = $CFG->{logview_max_par} = $value*1; 1463 $MESSAGE_WINDOW->set_max_para ($CFG->{logview_max_par} = $value*1);
1183 0 1464 0
1184 }, 1465 },
1185 ); 1466 );
1186 1467
1187 $table 1468 $table
1188} 1469}
1189 1470
1190sub message_window {
1191 my $window = new CFPlus::UI::Toplevel
1192 name => "message_window",
1193 title => "Messages",
1194 border_bg => [1, 1, 1, 1],
1195 x => "max",
1196 y => 0,
1197 force_w => $::WIDTH * 0.4,
1198 force_h => $::HEIGHT * 0.5,
1199 child => (my $vbox = new CFPlus::UI::VBox),
1200 has_close_button => 1;
1201
1202 $vbox->add ($LOGVIEW);
1203
1204 $vbox->add (my $input = new CFPlus::UI::Entry
1205 tooltip => "<b>Chat Box</b>. If you enter a text and press return/enter here, the current <i>communication command</i> "
1206 . "from the client setup will be prepended (e.g. <b>shout</b>, <b>chat</b>...). "
1207 . "If you prepend a slash (/), you will submit a command instead (similar to IRC). "
1208 . "A better way to submit commands (and the occasional chat command) is often the map command completer.",
1209 on_focus_in => sub {
1210 my ($input, $prev_focus) = @_;
1211
1212 delete $input->{refocus_map};
1213
1214 if ($prev_focus == $MAPWIDGET && $input->{auto_activated}) {
1215 $input->{refocus_map} = 1;
1216 }
1217 delete $input->{auto_activated};
1218
1219 0
1220 },
1221 on_activate => sub {
1222 my ($input, $text) = @_;
1223 $input->set_text ('');
1224
1225 if ($text =~ /^\/(.*)/) {
1226 $::CONN->user_send ($1);
1227 } else {
1228 my $say_cmd = $::CFG->{say_command} || 'say';
1229 $::CONN->user_send ("$say_cmd $text");
1230 }
1231 if ($input->{refocus_map}) {
1232 delete $input->{refocus_map};
1233 $MAPWIDGET->focus_in
1234 }
1235
1236 0
1237 },
1238 on_escape => sub {
1239 $MAPWIDGET->grab_focus;
1240
1241 0
1242 },
1243 );
1244
1245 $CONSOLE = {
1246 window => $window,
1247 input => $input,
1248 };
1249
1250 $window
1251}
1252
1253sub autopickup_setup { 1471sub autopickup_setup {
1472 my $r = new CFPlus::UI::ScrolledWindow (
1473 expand => 1,
1474 scroll_y => 1
1475 );
1254 my $table = new CFPlus::UI::Table; 1476 $r->add (my $table = new CFPlus::UI::Table
1477 row_expand => [0],
1478 col_expand => [0, 1, 0, 1],
1479 );
1255 1480
1256 for ( 1481 for (
1257 ["General", 0, 0, 1482 ["General", 0, 0,
1258 ["Enable autopickup" => PICKUP_NEWMODE, \$PICKUP_ENABLE], 1483 ["Enable autopickup" => PICKUP_NEWMODE, \$PICKUP_ENABLE],
1259 ["Inhibit autopickup" => PICKUP_INHIBIT], 1484 ["Inhibit autopickup" => PICKUP_INHIBIT],
… …
1294 ], 1519 ],
1295 ["Weight/Value ratio", 2, 17] 1520 ["Weight/Value ratio", 2, 17]
1296 ) 1521 )
1297 { 1522 {
1298 my ($title, $x, $y, @bits) = @$_; 1523 my ($title, $x, $y, @bits) = @$_;
1299 $table->add ($x, $y, new CFPlus::UI::Label text => $title, align => 1, fg => [1, 1, 0]); 1524 $table->add_at ($x, $y, new CFPlus::UI::Label text => $title, align => 1, fg => [1, 1, 0]);
1300 1525
1301 for (@bits) { 1526 for (@bits) {
1302 ++$y; 1527 ++$y;
1303 1528
1304 my $mask = $_->[1]; 1529 my $mask = $_->[1];
1305 $table->add ($x , $y, new CFPlus::UI::Label text => $_->[0], align => 1, expand => 1); 1530 $table->add_at ($x , $y, new CFPlus::UI::Label text => $_->[0], align => 1, expand => 1);
1306 $table->add ($x+1, $y, my $checkbox = new CFPlus::UI::CheckBox 1531 $table->add_at ($x+1, $y, my $checkbox = new CFPlus::UI::CheckBox
1307 state => $::CFG->{pickup} & $mask, 1532 state => $::CFG->{pickup} & $mask,
1308 on_changed => sub { 1533 on_changed => sub {
1309 my ($box, $value) = @_; 1534 my ($box, $value) = @_;
1310 1535
1311 if ($value) { 1536 if ($value) {
… …
1322 1547
1323 ${$_->[2]} = $checkbox if $_->[2]; 1548 ${$_->[2]} = $checkbox if $_->[2];
1324 } 1549 }
1325 } 1550 }
1326 1551
1327 $table->add (2, 18, new CFPlus::UI::ValSlider 1552 $table->add_at (2, 18, new CFPlus::UI::ValSlider
1328 range => [$::CFG->{pickup} & 0xF, 0, 16, 1, 1], 1553 range => [$::CFG->{pickup} & 0xF, 0, 16, 1, 1],
1329 template => ">= 99", 1554 template => ">= 99",
1330 to_value => sub { ">= " . 5 * $_[0] }, 1555 to_value => sub { ">= " . 5 * $_[0] },
1331 on_changed => sub { 1556 on_changed => sub {
1332 my ($slider, $value) = @_; 1557 my ($slider, $value) = @_;
… …
1335 $::CFG->{pickup} |= int $value 1560 $::CFG->{pickup} |= int $value
1336 if $value; 1561 if $value;
1337 1; 1562 1;
1338 }); 1563 });
1339 1564
1340 $table->add (3, 18, new CFPlus::UI::Button 1565 $table->add_at (3, 18, new CFPlus::UI::Button
1341 text => "set", 1566 text => "set",
1342 on_activate => sub { 1567 on_activate => sub {
1343 $::CONN->send_command ("pickup $::CFG->{pickup}") 1568 $::CONN->send_command ("pickup $::CFG->{pickup}")
1344 if defined $::CONN; 1569 if defined $::CONN;
1345 0 1570 0
1346 }); 1571 });
1347 1572
1348 $table 1573 $r
1349} 1574}
1350 1575
1351my %SORT_ORDER = ( 1576my %SORT_ORDER = (
1352 type => undef, 1577 type => undef,
1353 mtime => sub { 1578 mtime => sub {
… …
1397 $sw1->add ($INV = new CFPlus::UI::Inventory); 1622 $sw1->add ($INV = new CFPlus::UI::Inventory);
1398 $INV->set_sort_order ($SORT_ORDER{$::CFG->{inv_sort}}); 1623 $INV->set_sort_order ($SORT_ORDER{$::CFG->{inv_sort}});
1399 1624
1400 $hb->add (my $vb2 = new CFPlus::UI::VBox); 1625 $hb->add (my $vb2 = new CFPlus::UI::VBox);
1401 1626
1402 $vb2->add ($INV_RIGHT_HB = new CFPlus::UI::HBox); 1627 $vb2->add ($INVR_HB = new CFPlus::UI::HBox);
1403 1628
1404 $vb2->add (my $sw2 = new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1); 1629 $vb2->add (my $sw2 = new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1);
1405 $sw2->add ($INVR = new CFPlus::UI::Inventory); 1630 $sw2->add ($INVR = new CFPlus::UI::Inventory);
1406 1631
1407 # XXX: Call after $INVR = ... because set_opencont sets the items 1632 # XXX: Call after $INVR = ... because set_opencont sets the items
1408 CFPlus::Protocol::set_opencont ($::CONN, 0, "Floor"); 1633 CFPlus::Protocol::set_opencont ($::CONN, 0, "Floor");
1409 1634
1410 $hb 1635 $hb
1636}
1637
1638sub media_window {
1639 my $vb = new CFPlus::UI::VBox;
1640
1641 $vb->add (new CFPlus::UI::FancyFrame
1642 label => "Currently playing music",
1643 child => new CFPlus::UI::ScrolledWindow scroll_x => 1, scroll_y => 0,
1644 child => ($MUSIC_PLAYING_WIDGET = new CFPlus::UI::Label ellipsise => 0, fontsize => 0.8),
1645 );
1646
1647 $vb->add (new CFPlus::UI::FancyFrame
1648 label => "Other media used in this session",
1649 expand => 1,
1650 child => ($LICENSE_WIDGET = new CFPlus::UI::TextScroller
1651 expand => 1, fontsize => 0.8, padding_x => 4, padding_y => 4),
1652 );
1653
1654 $vb
1655}
1656
1657sub add_license {
1658 my ($meta) = @_;
1659
1660 $meta = $meta->{data}
1661 or return;
1662
1663 $meta->{license} || $meta->{author} || $meta->{source}
1664 or return;
1665
1666 $LICENSE_WIDGET->add_paragraph ({
1667 fg => [1, 1, 1, 1],
1668 markup => "<small>"
1669 . "<b>Name:</b> " . (CFPlus::asxml $meta->{name}) . "\n"
1670 . "<b>Author:</b> " . (CFPlus::asxml $meta->{author}) . "\n"
1671 . "<b>Source:</b> " . (CFPlus::asxml $meta->{source}) . "\n"
1672 . "<b>License:</b> " . (CFPlus::asxml $meta->{license}) . "\n"
1673 . "</small>",
1674 });
1675 $LICENSE_WIDGET->scroll_to_bottom;
1411} 1676}
1412 1677
1413sub toggle_player_page { 1678sub toggle_player_page {
1414 my ($widget) = @_; 1679 my ($widget) = @_;
1415 1680
… …
1432 has_close_button => 1 1697 has_close_button => 1
1433 ; 1698 ;
1434 1699
1435 my $ntb = 1700 my $ntb =
1436 $PL_NOTEBOOK = 1701 $PL_NOTEBOOK =
1437 new CFPlus::UI::Notebook expand => 1, debug => 1; 1702 new CFPlus::UI::Notebook expand => 1;
1438 1703
1439 $ntb->add ( 1704 $ntb->add_tab (
1440 "Statistics (F2)" => $STATS_PAGE = stats_window, 1705 "Statistics (F2)" => $STATS_PAGE = stats_window,
1441 "Shows statistics, where all your Stats and Resistances are shown." 1706 "Shows statistics, where all your Stats and Resistances are shown."
1442 ); 1707 );
1443 $ntb->add ( 1708 $ntb->add_tab (
1444 "Skills (F3)" => $SKILL_PAGE = skill_window, 1709 "Skills (F3)" => $SKILL_PAGE = skill_window,
1445 "Shows all your Skills." 1710 "Shows all your Skills."
1446 ); 1711 );
1447 1712
1448 my $spellsw = $SPELL_PAGE = new CFPlus::UI::ScrolledWindow (expand => 1, scroll_y => 1); 1713 my $spellsw = $SPELL_PAGE = new CFPlus::UI::ScrolledWindow (expand => 1, scroll_y => 1);
1449 $spellsw->add ($SPELL_LIST = new CFPlus::UI::SpellList); 1714 $spellsw->add ($SPELL_LIST = new CFPlus::UI::SpellList);
1450 $ntb->add ( 1715 $ntb->add_tab (
1451 "Spellbook (F4)" => $spellsw, 1716 "Spellbook (F4)" => $spellsw,
1452 "Displays all spells you have and lets you edit keyboard shortcuts for them." 1717 "Displays all spells you have and lets you edit keyboard shortcuts for them."
1453 ); 1718 );
1454 $ntb->add ( 1719 $ntb->add_tab (
1455 "Inventory (F5)" => $INVENTORY_PAGE = inventory_widget, 1720 "Inventory (F5)" => $INVENTORY_PAGE = inventory_widget,
1456 "Toggles the inventory window, where you can manage your loot (or treasures :). " 1721 "Toggles the inventory window, where you can manage your loot (or treasures :). "
1457 . "You can also hit the <b>Tab</b>-key to show/hide the Inventory." 1722 . "You can also hit the <b>Tab</b>-key to show/hide the Inventory."
1458 ); 1723 );
1724 $ntb->add_tab (Pickup => autopickup_setup,
1725 "Configure autopickup settings, i.e. which items you will pick up automatically when walking (or running) over them.");
1726
1727 $ntb->add_tab (Media => media_window,
1728 "License, Author and Source info for media sent by the server.");
1459 1729
1460 $ntb->set_current_page ($INVENTORY_PAGE); 1730 $ntb->set_current_page ($INVENTORY_PAGE);
1461 1731
1462 $plwin->add ($ntb); 1732 $plwin->add ($ntb);
1463 $plwin 1733 $plwin
… …
1617 on_activate => sub { $QUIT_DIALOG->hide; 0 }, 1887 on_activate => sub { $QUIT_DIALOG->hide; 0 },
1618 ); 1888 );
1619 $hb->add (new CFPlus::UI::Button 1889 $hb->add (new CFPlus::UI::Button
1620 text => "Quit anyway", 1890 text => "Quit anyway",
1621 expand => 1, 1891 expand => 1,
1622 on_activate => sub { exit }, 1892 on_activate => sub { Event::unloop_all },
1623 ); 1893 );
1624 } 1894 }
1625 1895
1626 $QUIT_DIALOG->show; 1896 $QUIT_DIALOG->show;
1627 $QUIT_DIALOG->grab_focus; 1897 $QUIT_DIALOG->grab_focus;
… …
1660 expand => 1, fontsize => 0.8, padding_x => 4, padding_y => 4); 1930 expand => 1, fontsize => 0.8, padding_x => 4, padding_y => 4);
1661 $viewer->add_paragraph (CFPlus::Pod::as_paragraphs CFPlus::Pod::section_of $tod[$todindex]); 1931 $viewer->add_paragraph (CFPlus::Pod::as_paragraphs CFPlus::Pod::section_of $tod[$todindex]);
1662 1932
1663 $vbox->add (my $table = new CFPlus::UI::Table col_expand => [0, 1]); 1933 $vbox->add (my $table = new CFPlus::UI::Table col_expand => [0, 1]);
1664 1934
1665 $table->add (0, 0, new CFPlus::UI::Button 1935 $table->add_at (0, 0, new CFPlus::UI::Button
1666 text => "Close", 1936 text => "Close",
1667 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>.", 1937 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>.",
1668 on_activate => $close, 1938 on_activate => $close,
1669 ); 1939 );
1670 1940
1671 $table->add (2, 0, new CFPlus::UI::Button 1941 $table->add_at (2, 0, new CFPlus::UI::Button
1672 text => "Next", 1942 text => "Next",
1673 tooltip => "Show the next <b>Tip of the day</b>.", 1943 tooltip => "Show the next <b>Tip of the day</b>.",
1674 on_activate => sub { 1944 on_activate => sub {
1675 $close->(); 1945 $close->();
1676 &show_tip_of_the_day; 1946 &show_tip_of_the_day;
… …
1685 CFPlus::SDL_Init 1955 CFPlus::SDL_Init
1686 and die "SDL::Init failed!\n"; 1956 and die "SDL::Init failed!\n";
1687} 1957}
1688 1958
1689sub video_init { 1959sub video_init {
1690 sdl_init;
1691
1692 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} >= @SDL_MODES; 1960 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} >= @SDL_MODES;
1693 1961
1694 my ($old_w, $old_h) = ($WIDTH, $HEIGHT); 1962 my ($old_w, $old_h) = ($WIDTH, $HEIGHT);
1695 1963
1696 ($WIDTH, $HEIGHT) = @{ $SDL_MODES[$CFG->{sdl_mode}] }; 1964 ($WIDTH, $HEIGHT, my ($rgb, $alpha)) = @{ $SDL_MODES[$CFG->{sdl_mode}] };
1697 $FULLSCREEN = $CFG->{fullscreen}; 1965 $FULLSCREEN = $CFG->{fullscreen};
1698 $FAST = $CFG->{fast}; 1966 $FAST = $CFG->{fast};
1699 1967
1700 CFPlus::SDL_SetVideoMode $WIDTH, $HEIGHT, $FULLSCREEN 1968 CFPlus::SDL_SetVideoMode $WIDTH, $HEIGHT, $rgb, $alpha, $FULLSCREEN
1701 or die "SDL_SetVideoMode failed: " . (CFPlus::SDL_GetError) . "\n"; 1969 or die "SDL_SetVideoMode failed: " . (CFPlus::SDL_GetError) . "\n";
1702 1970
1703 $SDL_ACTIVE = 1; 1971 $SDL_ACTIVE = 1;
1704 $LAST_REFRESH = time - 0.01; 1972 $LAST_REFRESH = time - 0.01;
1705 1973
… …
1747 2015
1748 $MAPWIDGET = new CFPlus::MapWidget; 2016 $MAPWIDGET = new CFPlus::MapWidget;
1749 $MAPWIDGET->connect (activate_console => sub { 2017 $MAPWIDGET->connect (activate_console => sub {
1750 my ($mapwidget, $preset) = @_; 2018 my ($mapwidget, $preset) = @_;
1751 2019
1752 if ($CONSOLE) { 2020 $MESSAGE_WINDOW->activate_console ($preset)
1753 $CONSOLE->{input}->{auto_activated} = 1; 2021 if $MESSAGE_WINDOW;
1754 $CONSOLE->{input}->grab_focus;
1755
1756 if ($preset && $CONSOLE->{input}->get_text eq '') {
1757 $CONSOLE->{input}->set_text ($preset);
1758 }
1759 }
1760 }); 2022 });
1761 $MAPWIDGET->show; 2023 $MAPWIDGET->show;
1762 $MAPWIDGET->grab_focus; 2024 $MAPWIDGET->grab_focus;
1763
1764 $LOGVIEW = new CFPlus::UI::TextScroller
1765 expand => 1,
1766 font => $FONT_FIXED,
1767 fontsize => $::CFG->{log_fontsize},
1768 indent => -4,
1769 can_hover => 1,
1770 can_events => 1,
1771 max_par => $CFG->{logview_max_par},
1772 tooltip => "<b>Server Log</b>. This text viewer contains all recent messages sent by the server.",
1773 ;
1774 2025
1775 $SETUP_DIALOG = new CFPlus::UI::Toplevel 2026 $SETUP_DIALOG = new CFPlus::UI::Toplevel
1776 title => "Setup", 2027 title => "Setup",
1777 name => "setup_dialog", 2028 name => "setup_dialog",
1778 x => 'center', 2029 x => 'center',
… …
1782 force_h => $::HEIGHT * 0.6, 2033 force_h => $::HEIGHT * 0.6,
1783 has_close_button => 1, 2034 has_close_button => 1,
1784 ; 2035 ;
1785 2036
1786 $METASERVER = metaserver_dialog; 2037 $METASERVER = metaserver_dialog;
2038 $MESSAGE_WINDOW = new CFPlus::UI::MessageWindow;
1787 2039
1788 $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new CFPlus::UI::Notebook expand => 1, debug => 1, 2040 $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new CFPlus::UI::Notebook expand => 1, debug => 1,
1789 filter => new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1); 2041 filter => new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1);
1790 2042
1791 $SETUP_NOTEBOOK->add (Server => $SETUP_SERVER = server_setup, 2043 $SETUP_NOTEBOOK->add_tab (Server => $SETUP_SERVER = server_setup,
1792 "Configure the server to play on, your username, password and other server-related options."); 2044 "Configure the server to play on, your username, password and other server-related options.");
1793 $SETUP_NOTEBOOK->add (Client => client_setup, 2045 $SETUP_NOTEBOOK->add_tab (Client => client_setup,
1794 "Configure various client-specific settings."); 2046 "Configure various client-specific settings.");
1795 $SETUP_NOTEBOOK->add (Pickup => autopickup_setup,
1796 "Configure autopickup settings, i.e. which items you will pick up automatically when walking (or running) over them.");
1797 $SETUP_NOTEBOOK->add (Graphics => graphics_setup, 2047 $SETUP_NOTEBOOK->add_tab (Graphics => graphics_setup,
1798 "Configure the video mode, performance, fonts and other graphical aspects of the game."); 2048 "Configure the video mode, performance, fonts and other graphical aspects of the game.");
1799 $SETUP_NOTEBOOK->add (Audio => audio_setup, 2049 $SETUP_NOTEBOOK->add_tab (Audio => audio_setup,
1800 "Configure the use of audio, sound effects and background music."); 2050 "Configure the use of audio, sound effects and background music.");
1801 $SETUP_NOTEBOOK->add (Keyboard => $SETUP_KEYBOARD = keyboard_setup, 2051 $SETUP_NOTEBOOK->add_tab (Keyboard => $SETUP_KEYBOARD = keyboard_setup,
1802 "Lets you define, edit and delete key bindings." 2052 "Lets you define, edit and delete key bindings."
1803 . "There is a shortcut for making bindings: <b>Control-Insert</b> opens the binding editor " 2053 . "There is a shortcut for making bindings: <b>Control-Insert</b> opens the binding editor "
1804 . "with nothing set and the recording started. After doing the actions you " 2054 . "with nothing set and the recording started. After doing the actions you "
1805 . "want to record press <b>Insert</b> and you will be asked to press a key-combo. " 2055 . "want to record press <b>Insert</b> and you will be asked to press a key-combo. "
1806 . "After pressing the combo the binding will be saved automatically and the " 2056 . "After pressing the combo the binding will be saved automatically and the "
1807 . "binding editor closes"); 2057 . "binding editor closes");
1808 $SETUP_NOTEBOOK->add (Debug => debug_setup, 2058 $SETUP_NOTEBOOK->add_tab (Debug => debug_setup,
1809 "Some debuggin' options. Do not ask."); 2059 "Some debuggin' options. Do not ask.");
1810 2060
1811 $BUTTONBAR = new CFPlus::UI::Buttonbar x => 0, y => 0, z => 200; # put on top 2061 $BUTTONBAR = new CFPlus::UI::Buttonbar x => 0, y => 0, z => 200; # put on top
1812 2062
1813 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Setup", other => $SETUP_DIALOG, 2063 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Setup", other => $SETUP_DIALOG,
1814 tooltip => "Toggles a dialog where you can configure all aspects of this client."); 2064 tooltip => "Toggles a dialog where you can configure all aspects of this client.");
1815 2065
1816 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW = message_window, 2066 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW,
1817 tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server."); 2067 tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server.");
1818 2068
1819 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 2069 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
1820 2070
1821 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Playerbook", other => player_window, 2071 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Playerbook", other => player_window,
… …
1841 tooltip => "Terminates the program", 2091 tooltip => "Terminates the program",
1842 on_activate => sub { 2092 on_activate => sub {
1843 if ($CONN) { 2093 if ($CONN) {
1844 open_quit_dialog; 2094 open_quit_dialog;
1845 } else { 2095 } else {
1846 exit; 2096 Event::unloop_all;
1847 } 2097 }
1848 0 2098 0
1849 }, 2099 },
1850 ); 2100 );
1851 2101
1852 $BUTTONBAR->show; 2102 $BUTTONBAR->show;
1853 $SETUP_DIALOG->show; 2103 $SETUP_DIALOG->show;
2104 $MESSAGE_WINDOW->show;
1854 } 2105 }
1855 2106
1856 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]); 2107 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);
1857}
1858
1859sub setup_build_button {
1860 my ($enabled) = @_;
1861 if ($enabled) {
1862 $BUILD_BUTTON->hide if $BUILD_BUTTON;
1863 $BUILD_BUTTON ||= new CFPlus::UI::Button
1864 text => "Build",
1865 tooltip => "Opens the ingame builder",
1866 on_activate => sub {
1867 if ($CONN) {
1868 $CONN->send_ext_req (builder_player_items => sub {
1869 open_ingame_editor ($_[0]) if exists $_[0]->{items};
1870 });
1871 }
1872 0
1873 };
1874 $BUTTONBAR->add ($BUILD_BUTTON);
1875 } else {
1876 $BUILD_BUTTON->hide if $BUILD_BUTTON;
1877 }
1878}
1879
1880sub open_ingame_editor {
1881 my ($msg) = @_;
1882
1883 my $win = new CFPlus::UI::Toplevel
1884 x => 0,
1885 y => 'center',
1886 z => 4,
1887 name => 'builder_window',
1888 force_w => int $WIDTH * 1/4,
1889 force_h => int $HEIGHT * 3/4,
1890 title => "In game builder",
1891 has_close_button => 1;
1892
1893 my $r = new CFPlus::UI::ScrolledWindow (
1894 expand => 1,
1895 scroll_y => 1
1896 );
1897 $r->add (my $vb = new CFPlus::UI::VBox);
1898 $win->add ($r);
1899
1900
1901 $vb->add (
1902 new CFPlus::UI::Button
1903 text => "Disable build mode",
1904 on_activate => sub { $::IN_BUILD_MODE = undef }
1905 );
1906 $vb->add (
1907 new CFPlus::UI::Button
1908 text => "ERASE",
1909 on_activate => sub { $::IN_BUILD_MODE = { do_erase => 1 } }
1910 );
1911
1912 for my $itemarchname (
1913 sort {
1914 $msg->{items}->{$a}->{build_arch_name}
1915 cmp $msg->{items}->{$b}->{build_arch_name}
1916 } keys %{$msg->{items}}
1917 ) {
1918 my $info = $msg->{items}->{$itemarchname};
1919 $vb->add (
1920 new CFPlus::UI::Button text => $info->{build_arch_name},
1921 on_activate => sub {
1922 $::IN_BUILD_MODE = { item => $itemarchname, info => $info };
1923
1924 if (grep { $msg->{items}->{$itemarchname}->{$_} } qw/has_connection has_name has_text/) {
1925 build_mode_query_arch_info ();
1926 }
1927 }
1928 );
1929 }
1930
1931 $win->show;
1932}
1933
1934sub build_mode_query_arch_info {
1935 my ($iteminfo) = $::IN_BUILD_MODE;
1936 my $itemarchname = $iteminfo->{item};
1937 my $info = $iteminfo->{info};
1938
1939 my $dialog = new CFPlus::UI::Toplevel
1940 x => "center",
1941 y => "center",
1942 z => 50,
1943 force_w => int $WIDTH * 1/2,
1944 title => "Enter information for placement of '$itemarchname'",
1945 has_close_button => 1;
1946
1947 $dialog->add (my $vb = new CFPlus::UI::VBox expand => 1);
1948
1949 $vb->add (my $table = new CFPlus::UI::Table expand => 1);
1950 my $row = 0;
1951 if ($info->{has_name}) {
1952 $table->add (0, $row, new CFPlus::UI::Label text => "Name:");
1953 $table->add (1, $row++, new CFPlus::UI::Entry expand => 1, on_changed => sub { $::IN_BUILD_MODE->{name} = $_[1]; 0 });
1954 }
1955 if ($info->{has_text}) {
1956 $table->add (0, $row, new CFPlus::UI::Label text => "Text:");
1957 $table->add (1, $row++, new CFPlus::UI::Entry expand => 1, on_changed => sub { $::IN_BUILD_MODE->{text} = $_[1]; 0 });
1958 }
1959 if ($info->{has_connection}) {
1960 $table->add (0, $row, new CFPlus::UI::Label text => "Connection ID:");
1961 $table->add (1, $row++,
1962 new CFPlus::UI::Entry
1963 expand => 1,
1964 on_changed => sub { $::IN_BUILD_MODE->{connection} = $_[1]; 0 },
1965 tooltip => "Enter the connection ID here. The connection ID connects actors like a lever to a gate or a magic ear to a gate"
1966 );
1967 }
1968
1969 $vb->add (my $hb = new CFPlus::UI::HBox expand => 1);
1970 $hb->add (new CFPlus::UI::Button
1971 text => "Close",
1972 expand => 1,
1973 on_activate => sub { $dialog->hide; 0 },
1974 );
1975 $dialog->show;
1976} 2108}
1977 2109
1978sub video_shutdown { 2110sub video_shutdown {
1979 CFPlus::OpenGL::shutdown; 2111 CFPlus::OpenGL::shutdown;
1980 2112
1981 undef $SDL_ACTIVE; 2113 undef $SDL_ACTIVE;
1982} 2114}
1983 2115
1984my @bgmusic = qw(game1.ogg game2.ogg game3.ogg game5.ogg game6.ogg ross1.ogg ross2.ogg ross3.ogg ross4.ogg ross5.ogg); #d#
1985my $bgmusic;#TODO#hack#d#
1986
1987sub audio_channel_finished {
1988 my ($channel) = @_;
1989
1990 #warn "channel $channel finished\n";#d#
1991}
1992
1993sub audio_music_finished {
1994 return unless $CFG->{bgm_enable};
1995
1996 # TODO: hack, do play loop and mood music
1997 $bgmusic = new_from_file CFPlus::MixMusic CFPlus::find_rcfile "music/$bgmusic[0]";
1998 $bgmusic->play (0);
1999
2000 push @bgmusic, shift @bgmusic;
2001}
2002
2003sub audio_init {
2004 if ($CFG->{audio_enable}) {
2005 if (open my $fh, "<", CFPlus::find_rcfile "sounds/config") {
2006 $SDL_MIXER = !CFPlus::Mix_OpenAudio;
2007
2008 unless ($SDL_MIXER) {
2009 status "Unable to open sound device: there will be no sound";
2010 return;
2011 }
2012
2013 CFPlus::Mix_AllocateChannels 8;
2014 CFPlus::MixMusic::volume $CFG->{bgm_volume} * 128;
2015
2016 audio_music_finished;
2017
2018 local $_;
2019 while (<$fh>) {
2020 next if /^\s*#/;
2021 next if /^\s*$/;
2022
2023 my ($file, $volume, $event) = split /\s+/, $_, 3;
2024
2025 push @SOUNDS, "$volume,$file";
2026
2027 $AUDIO_CHUNKS{"$volume,$file"} ||= do {
2028 my $chunk = new_from_file CFPlus::MixChunk CFPlus::find_rcfile "sounds/$file";
2029 $chunk->volume ($volume * 128 / 100);
2030 $chunk
2031 };
2032 }
2033 } else {
2034 status "unable to open sound config: $!";
2035 }
2036 }
2037}
2038
2039sub audio_shutdown {
2040 CFPlus::Mix_CloseAudio if $SDL_MIXER;
2041 undef $SDL_MIXER;
2042 @SOUNDS = ();
2043 %AUDIO_CHUNKS = ();
2044}
2045
2046my %animate_object; 2116my %animate_object;
2047my $animate_timer; 2117my $animate_timer;
2048 2118
2049my $fps = 9; 2119my $fps = 9;
2050 2120
2051my %demo;#d#
2052
2053sub force_refresh { 2121sub force_refresh {
2122 if ($ENV{CFPLUS_DEBUG} & 4) {
2054 $fps = $fps * 0.95 + 1 / (($NOW - $LAST_REFRESH) || 0.1) * 0.05; 2123 $fps = $fps * 0.98 + 1 / (($NOW - $LAST_REFRESH) || 0.1) * 0.02;
2055 debug sprintf "%3.2f", $fps if $ENV{CFPLUS_DEBUG} & 4; 2124 debug sprintf "%3.2f", $fps;
2125 }
2056 2126
2057 $CFPlus::UI::ROOT->draw; 2127 $CFPlus::UI::ROOT->draw;
2058 2128 CFPlus::SDL_GL_SwapBuffers;
2059 $WANT_REFRESH = 0;
2060 $CAN_REFRESH = 0;
2061 $LAST_REFRESH = $NOW; 2129 $LAST_REFRESH = $NOW;
2062 2130 $WANT_REFRESH->stop;
2063 CFPlus::SDL_GL_SwapBuffers;
2064} 2131}
2065 2132
2133$WANT_REFRESH = Event->idle (min => 0.001, max => 0.06, parked => 1, cb => \&force_refresh);
2134
2066my $refresh_watcher = Event->timer (after => 0, hard => 0, interval => 1 / $MAX_FPS, cb => sub { 2135my $input = Event->timer (after => 0, hard => 0, interval => 1 / 50, cb => sub {
2067 $NOW = time; 2136 $NOW = time;
2068 2137
2069 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_) 2138 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_)
2070 for CFPlus::SDL_PollEvent; 2139 for CFPlus::poll_events;
2071 2140
2072 if (%animate_object) { 2141 if (%animate_object) {
2073 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object; 2142 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object;
2074 $WANT_REFRESH++; 2143 $WANT_REFRESH->start;
2075 }
2076
2077 if ($WANT_REFRESH) {
2078 force_refresh;
2079 } else {
2080 $CAN_REFRESH = 1;
2081 } 2144 }
2082}); 2145});
2083 2146
2084sub animation_start { 2147sub animation_start {
2085 my ($widget) = @_; 2148 my ($widget) = @_;
… …
2088 2151
2089sub animation_stop { 2152sub animation_stop {
2090 my ($widget) = @_; 2153 my ($widget) = @_;
2091 delete $animate_object{$widget}; 2154 delete $animate_object{$widget};
2092} 2155}
2093
2094# check once/second for faces that need to be prefetched
2095# this should, of course, only run on demand, but
2096# SDL forces worse things on us....
2097
2098Event->timer (after => 1, interval => 0.25, cb => sub {
2099 $CONN->face_prefetch
2100 if $CONN;
2101});
2102 2156
2103%SDL_CB = ( 2157%SDL_CB = (
2104 CFPlus::SDL_QUIT => sub { 2158 CFPlus::SDL_QUIT => sub {
2105 exit; 2159 exit;
2106 }, 2160 },
… …
2109 CFPlus::SDL_VIDEOEXPOSE => sub { 2163 CFPlus::SDL_VIDEOEXPOSE => sub {
2110 CFPlus::UI::full_refresh; 2164 CFPlus::UI::full_refresh;
2111 }, 2165 },
2112 CFPlus::SDL_ACTIVEEVENT => sub { 2166 CFPlus::SDL_ACTIVEEVENT => sub {
2113# not useful, as APPACTIVE include sonly iconified state, not unmapped 2167# not useful, as APPACTIVE include sonly iconified state, not unmapped
2114# printf "active %x %x\n", $_[0]{gain}, $_[0]{state};#d# 2168# printf "active %x %x %x\n", $_[0]{gain}, $_[0]{state}, CFPlus::SDL_GetAppState;#d#
2169# printf "a %x\n", CFPlus::SDL_GetAppState & CFPlus::SDL_APPACTIVE;#d#
2115# printf "A\n" if $_[0]{state} & CFPlus::SDL_APPACTIVE; 2170# printf "A\n" if $_[0]{state} & CFPlus::SDL_APPACTIVE;
2116# printf "K\n" if $_[0]{state} & CFPlus::SDL_APPINPUTFOCUS; 2171# printf "K\n" if $_[0]{state} & CFPlus::SDL_APPINPUTFOCUS;
2117# printf "M\n" if $_[0]{state} & CFPlus::SDL_APPMOUSEFOCUS; 2172# printf "M\n" if $_[0]{state} & CFPlus::SDL_APPMOUSEFOCUS;
2118 }, 2173 },
2119 CFPlus::SDL_KEYDOWN => sub { 2174 CFPlus::SDL_KEYDOWN => sub {
… …
2148 CFPlus::DB::Server::run; 2203 CFPlus::DB::Server::run;
2149 2204
2150 CFPlus::UI::set_layout ($::CFG->{layout}); 2205 CFPlus::UI::set_layout ($::CFG->{layout});
2151 2206
2152 my %DEF_CFG = ( 2207 my %DEF_CFG = (
2153 sdl_mode => 0, 2208 sdl_mode => 0,
2154 width => 640,
2155 height => 480,
2156 fullscreen => 0, 2209 fullscreen => 0,
2157 fast => 0, 2210 fast => 0,
2211 force_opengl11 => undef,
2212 texture_compression => 1,
2158 map_scale => 1, 2213 map_scale => 1,
2159 fow_enable => 1, 2214 fow_enable => 1,
2160 fow_intensity => 0.45, 2215 fow_intensity => 0,
2161 fow_smooth => 0,
2162 map_smoothing => 1, 2216 map_smoothing => 1,
2163 gui_fontsize => 1, 2217 gui_fontsize => 1,
2164 log_fontsize => 0.7, 2218 log_fontsize => 0.7,
2165 gauge_fontsize => 1, 2219 gauge_fontsize => 1,
2166 gauge_size => 0.35, 2220 gauge_size => 0.35,
2167 stat_fontsize => 0.7, 2221 stat_fontsize => 0.7,
2168 mapsize => 100, 2222 mapsize => 100,
2169 say_command => 'chat',
2170 audio_enable => 1, 2223 audio_enable => 1,
2224 effects_enable => 1,
2225 effects_volume => 1,
2171 bgm_enable => 1, 2226 bgm_enable => 1,
2172 bgm_volume => 0.25, 2227 bgm_volume => 0.5,
2173 face_prefetch => 0,
2174 output_sync => 1, 2228 output_sync => 1,
2175 output_count => 1, 2229 output_count => 1,
2176 output_rate => "", 2230 output_rate => "",
2177 pickup => 0, 2231 pickup => 0,
2178 inv_sort => "mtime", 2232 inv_sort => "mtime",
2179 default => "profile", # default profile 2233 default => "profile", # default profile
2180 show_tips => 1, 2234 show_tips => 1,
2181 logview_max_par => 1000, 2235 logview_max_par => 1000,
2182 ); 2236 );
2183 2237
2184 while (my ($k, $v) = each %DEF_CFG) { 2238 while (my ($k, $v) = each %DEF_CFG) {
2185 $CFG->{$k} = $v unless exists $CFG->{$k}; 2239 $CFG->{$k} = $v unless exists $CFG->{$k};
2186 } 2240 }
… …
2200 } 2254 }
2201 } 2255 }
2202 2256
2203 sdl_init; 2257 sdl_init;
2204 2258
2205 @SDL_MODES = reverse 2259 @SDL_MODES = CFPlus::SDL_ListModes 8, 8;
2206 grep $_->[0] >= 640 && $_->[1] >= 480, 2260 @SDL_MODES = CFPlus::SDL_ListModes 5, 0 unless @SDL_MODES;
2207 CFPlus::SDL_ListModes;
2208
2209 @SDL_MODES or CFPlus::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)"; 2261 @SDL_MODES or CFPlus::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)";
2262
2263 @SDL_MODES = sort { $a->[0] * $a->[1] <=> $b->[0] * $b->[1] } @SDL_MODES;
2210 2264
2211 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES; 2265 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES;
2212 2266
2213 { 2267 {
2214 my @fonts = map CFPlus::find_rcfile "fonts/$_", qw( 2268 my @fonts = map CFPlus::find_rcfile "fonts/$_", qw(
… …
2252} 2306}
2253 2307
2254show_tip_of_the_day if $CFG->{show_tips}; 2308show_tip_of_the_day if $CFG->{show_tips};
2255 2309
2256Event::loop; 2310Event::loop;
2311
2312#video_shutdown;
2313#audio_shutdown;
2257#CFPlus::SDL_Quit; 2314CFPlus::SDL_Quit;
2258#CFPlus::_exit 0;
2259
2260END {
2261 CFPlus::SDL_Quit;
2262 CFPlus::DB::Server::stop; 2315CFPlus::DB::Server::stop;
2263}
2264 2316
2265=head1 NAME 2317=head1 NAME
2266 2318
2267cfplus - A Crossfire+ and Crossfire game client 2319cfplus - A Crossfire TRT and Crossfire game client
2268 2320
2269=head1 SYNOPSIS 2321=head1 SYNOPSIS
2270 2322
2271Just run it - no commandline arguments are supported. 2323Just run it - no commandline arguments are supported.
2272 2324
2273=head1 USAGE 2325=head1 USAGE
2274 2326
2275cfplus utilises OpenGL for all UI elements and the game. It is supposed to be used 2327cfplus utilises OpenGL for all UI elements and the game. It is supposed to
2276fullscreen and interactively. 2328be used in fullscreen mode and interactively.
2277 2329
2278=head1 DEBUGGING 2330=head1 DEBUGGING
2279 2331
2280 2332
2281CFPLUS_DEBUG - environment variable 2333CFPLUS_DEBUG - environment variable

Diff Legend

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