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.215 by root, Fri Aug 17 21:18:01 2007 UTC

1#!/opt/bin/perl 1#!/opt/bin/perl
2 2
3my $startup_done = sub { }; 3my $startup_done = sub { };
4our $PANGO = "1.5.0";
4 5
5# do splash-screen thingy on win32 6# do splash-screen thingy on win32
6BEGIN { 7BEGIN {
7 if (%PAR::LibCache && $^O eq "MSWin32") { 8 if (%PAR::LibCache && $^O eq "MSWin32") {
8 while (my ($filename, $zip) = each %PAR::LibCache) { 9 while (my ($filename, $zip) = each %PAR::LibCache) {
… …
29# do things only needed for single-binary version (par) 30# do things only needed for single-binary version (par)
30BEGIN { 31BEGIN {
31 if (%PAR::LibCache) { 32 if (%PAR::LibCache) {
32 @INC = grep ref, @INC; # weed out all paths except pars loader refs 33 @INC = grep ref, @INC; # weed out all paths except pars loader refs
33 34
35 my $tmp = $ENV{PAR_TEMP};
36
34 while (my ($filename, $zip) = each %PAR::LibCache) { 37 while (my ($filename, $zip) = each %PAR::LibCache) {
35 for ($zip->memberNames) { 38 for ($zip->memberNames) {
36 next unless /^root\/(.*)/; 39 next unless /^root\/(.*)/;
37 $zip->extractMember ($_, "$ENV{PAR_TEMP}/$1") 40 $zip->extractMember ($_, "$tmp/$1")
38 unless -e "$ENV{PAR_TEMP}/$1"; 41 unless -e "$tmp/$1";
39 } 42 }
40 } 43 }
41 44
42 # TODO: pango-rc file, anybody? 45 if ($^O eq "MSWin32") {
46 # relocatable
47 } else {
48 # unix, need to patch pango rc file
49 open my $fh, "<:perlio", "$tmp/usr/lib/pango/$PANGO/module-files.d/libpango1.0-0.modules"
50 or die "$tmp/usr/lib/$PANGO/module-files.d/libpango1.0-0.modules: $!";
51 local $/;
52 my $rc = <$fh>;
53 $rc =~ s/^\//$tmp\//gm; # replace abs paths by relative ones
43 54
44 unshift @INC, $ENV{PAR_TEMP}; 55 mkdir "$tmp/pango-modules";
56 open my $fh, ">:perlio", "$tmp/pango-modules/pango.modules"
57 or die "$tmp/pango-modules/pango.modules: $!";
58 print $fh $rc;
59
60 $ENV{PANGO_RC_FILE} = "$tmp/pango.rc";
61 open my $fh, ">:perlio", $ENV{PANGO_RC_FILE}
62 or die "$ENV{PANGO_RC_FILE}: $!";
63 print $fh "[Pango]\nModuleFiles = $tmp/pango-modules\n";
64 }
65
66 unshift @INC, $tmp;
45 } 67 }
46} 68}
47 69
48# need to do it again because that pile of garbage called PAR nukes it before main 70# need to do it again because that pile of garbage called PAR nukes it before main
49unshift @INC, $ENV{PAR_TEMP} 71unshift @INC, $ENV{PAR_TEMP}
50 if %PAR::LibCache; 72 if %PAR::LibCache;
51 73
52use Time::HiRes 'time'; 74use Time::HiRes 'time';
53use Event; 75use Event;
76use List::Util qw(max min);
54 77
55use Crossfire; 78use Crossfire;
56use Crossfire::Protocol::Constants; 79use Crossfire::Protocol::Constants;
57 80
58use Compress::LZF; 81use Compress::LZF;
… …
60use CFPlus; 83use CFPlus;
61use CFPlus::OpenGL (); 84use CFPlus::OpenGL ();
62use CFPlus::Protocol; 85use CFPlus::Protocol;
63use CFPlus::DB; 86use CFPlus::DB;
64use CFPlus::UI; 87use CFPlus::UI;
88use CFPlus::UI::Canvas;
65use CFPlus::UI::Inventory; 89use CFPlus::UI::Inventory;
66use CFPlus::UI::SpellList; 90use CFPlus::UI::SpellList;
91use CFPlus::UI::MessageWindow;
67use CFPlus::Pod; 92use CFPlus::Pod;
68use CFPlus::MapWidget; 93use CFPlus::MapWidget;
69use CFPlus::Macro; 94use CFPlus::Macro;
70 95
71$SIG{QUIT} = sub { Carp::cluck "QUIT" }; 96$SIG{QUIT} = sub { Carp::cluck "QUIT" };
… …
88our $CONN; 113our $CONN;
89our $PROFILE; # current profile 114our $PROFILE; # current profile
90our $FAST; # fast, low-quality mode, possibly useful for software-rendering 115our $FAST; # fast, low-quality mode, possibly useful for software-rendering
91 116
92our $WANT_REFRESH; 117our $WANT_REFRESH;
93our $CAN_REFRESH;
94 118
95our @SDL_MODES; 119our @SDL_MODES;
96our $WIDTH; 120our $WIDTH;
97our $HEIGHT; 121our $HEIGHT;
98our $FULLSCREEN; 122our $FULLSCREEN;
… …
103 127
104our $MAP; 128our $MAP;
105our $MAPMAP; 129our $MAPMAP;
106our $MAPWIDGET; 130our $MAPWIDGET;
107our $BUTTONBAR; 131our $BUTTONBAR;
108our $LOGVIEW;
109our $CONSOLE;
110our $METASERVER; 132our $METASERVER;
111our $LOGIN_BUTTON; 133our $LOGIN_BUTTON;
112our $QUIT_DIALOG; 134our $QUIT_DIALOG;
113our $HOST_ENTRY; 135our $HOST_ENTRY;
114our $FULLSCREEN_ENABLE; 136our $FULLSCREEN_ENABLE;
… …
121our $SETUP_KEYBOARD; 143our $SETUP_KEYBOARD;
122 144
123our $PL_NOTEBOOK; 145our $PL_NOTEBOOK;
124our $PL_WINDOW; 146our $PL_WINDOW;
125 147
148our $MUSIC_PLAYING_WIDGET;
149our $LICENSE_WIDGET;
150
126our $INVENTORY_PAGE; 151our $INVENTORY_PAGE;
127our $STATS_PAGE; 152our $STATS_PAGE;
128our $SKILL_PAGE; 153our $SKILL_PAGE;
129our $SPELL_PAGE; 154our $SPELL_PAGE;
130our $SPELL_LIST; 155our $SPELL_LIST;
… …
136our $STATWIDS; 161our $STATWIDS;
137 162
138our $SDL_ACTIVE; 163our $SDL_ACTIVE;
139our %SDL_CB; 164our %SDL_CB;
140 165
141our $SDL_MIXER;
142our @SOUNDS; # event => file mapping
143our %AUDIO_CHUNKS; # audio files
144
145our $ALT_ENTER_MESSAGE; 166our $ALT_ENTER_MESSAGE;
146our $STATUSBOX; 167our $STATUSBOX;
147our $DEBUG_STATUS; 168our $DEBUG_STATUS;
148 169
149our $INV; 170our $INV;
150our $INVR; 171our $INVR;
151our $INV_RIGHT_HB; 172our $INVR_HB;
152 173
153our $PICKUP_CFG; 174#############################################################################
154
155our $IN_BUILD_MODE;
156our $BUILD_BUTTON;
157 175
158sub status { 176sub status {
159 $STATUSBOX->add (CFPlus::asxml $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]); 177 $STATUSBOX->add (CFPlus::asxml $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]);
160} 178}
161 179
… …
163 $DEBUG_STATUS->set_text ($_[0]); 181 $DEBUG_STATUS->set_text ($_[0]);
164} 182}
165 183
166sub message { 184sub message {
167 my ($para) = @_; 185 my ($para) = @_;
168 186 $MESSAGE_WINDOW->message ($para);
169 my $time = sprintf "%02d:%02d:%02d", (localtime time)[2,1,0];
170
171 $para->{markup} = "<span foreground='#ffffff'>$time</span> $para->{markup}";
172
173 $LOGVIEW->add_paragraph ($para);
174 $LOGVIEW->scroll_to_bottom;
175} 187}
188
189#############################################################################
190#TODO: maybe move into own audio module...
191
192our $SDL_MIXER;
193
194our $MUSIC_DEFAULT = "in_a_heartbeat.ogg";
195our $MUSIC_WANT; # arryref of ambient music we want to play
196our @MUSIC_HAVE; # ambient music we have on disk
197our $MUSIC_START;
198our @MUSIC_JINGLE; # which jingles to play next
199our $MUSIC_PLAYING_DATA;
200our $MUSIC_PLAYING_META;
201our $MUSIC_PLAYER;
202our $MUSIC_RESUME = 30; # resume music when played less than these many seconds before
203
204our %AUDIO_CHUNK; # audio "files"
205our %AUDIO_PLAY; # which audio faces should be played
206
207sub audio_channel_finished {
208 my ($channel) = @_;
209
210# warn "channel $channel finished\n";#d#
211}
212
213sub audio_sound_push($) {
214 my ($face) = @_;
215
216 $CFG->{effects_enable}
217 or return;
218
219 $AUDIO_PLAY{$face}
220 or return;
221
222 if (my $chunk = $AUDIO_CHUNK{$face}) {
223 for (grep $_->[0] >= Event::time, @{(delete $AUDIO_PLAY{$face}) || []}) {
224 my (undef, $dx, $dy, $vol) = @$_;
225
226 my $channel = CFPlus::Channel::find;
227 $channel->volume ($vol * $CFG->{effects_volume} * 128 / 255);
228 $channel->set_position_r ($dx, $dy, 20);
229 $chunk->play ($channel);
230 }
231 } else {
232 # sound_meta not set means data is in flight either way
233 my $meta = $CONN->{sound_meta}{$face}
234 or return;
235
236 # if its a jingle, play it as ambient music
237 if ($meta->{meta}{jingle}) {
238 if (delete $AUDIO_PLAY{$face}) { # take the jingle out of the sound queue
239 push @MUSIC_JINGLE, $meta; # push it oto the music/jingle queue
240 &audio_music_push ($face);
241 }
242 } else {
243 # fetch from database
244 CFPlus::DB::get res_data => $meta->{name}, sub {
245 my $rwops = new CFPlus::RW $_[0];
246 my $chunk = new CFPlus::MixChunk $rwops
247 or Carp::confess "sound face " . (JSON::XS::to_json $meta) . " unloadable: " . CFPlus::Mix_GetError;
248 $chunk->volume (($meta->{meta}{volume} || 1) * 128);
249 $AUDIO_CHUNK{$face} = $chunk;
250
251 audio_sound_push ($face);
252 };
253 }
254 }
255}
256
257sub audio_sound_play {
258 my ($face, $dx, $dy, $vol) = @_;
259
260 $SDL_MIXER
261 or return;
262 $CFG->{effects_enable}
263 or return;
264
265 my $queue = $AUDIO_PLAY{$face} ||= [];
266 push @$queue, [Event::time + 0.6, $dx, $dy, $vol]; # do not play sound for outdated events
267 audio_sound_push $face
268 unless @$queue > 1;
269}
270
271sub audio_music_set_meta {
272 my ($meta) = @_;
273
274 $MUSIC_PLAYING_META = $meta;
275 $MUSIC_PLAYING_WIDGET->set_markup (
276 "<b>Name</b>: " . (CFPlus::asxml $meta->{meta}{name}) . "\n"
277 . "<b>Author</b>: " . (CFPlus::asxml $meta->{meta}{author}) . "\n"
278 . "<b>Source</b>: " . (CFPlus::asxml $meta->{meta}{source}) . "\n"
279 . "<b>License</b>: " . (CFPlus::asxml $meta->{meta}{license})
280 );
281}
282
283sub audio_music_update_volume {
284 return unless $MUSIC_PLAYING_META;
285 my $volume = $MUSIC_PLAYING_META->{meta}{volume} || 1;
286 my $base = $MUSIC_PLAYING_META->{meta}{jingle} ? 1 : $CFG->{bgm_volume};
287 CFPlus::MixMusic::volume $base * $volume * 128;
288}
289
290sub audio_music_start {
291 my $meta = $MUSIC_PLAYING_META;
292
293 CFPlus::DB::get res_data => $meta->{name}, sub {
294 return unless $SDL_MIXER;
295
296 # music might have changed...
297 $meta eq $MUSIC_PLAYING_META
298 or return &audio_music_start ();
299
300 audio_music_update_volume;
301
302 $MUSIC_PLAYING_DATA = \$_[0];
303
304 my $rwops = $meta->{path}
305 ? new_from_file CFPlus::RW $meta->{path}
306 : new CFPlus::RW $$MUSIC_PLAYING_DATA;
307
308 $MUSIC_PLAYER = new CFPlus::MixMusic $rwops
309 or Carp::confess "music face $meta->{face} unloadable: " . CFPlus::Mix_GetError;
310
311 my $NOW = time;
312
313 if ($MUSIC_PLAYING_META->{stop_time} > $NOW - $MUSIC_RESUME) {
314 my $pos = $MUSIC_PLAYING_META->{stop_pos};
315 $MUSIC_PLAYER->fade_in_pos (0, 1000, $pos);
316 $MUSIC_START = time - $pos;
317 } else {
318 $MUSIC_PLAYER->play (0);
319 $MUSIC_START = time;
320 }
321
322 delete $meta->{stop_time};
323 delete $meta->{stop_pos};
324 }
325}
326
327sub audio_music_push {
328 return unless $SDL_MIXER;
329
330 my $fade_out;
331
332 if (@MUSIC_JINGLE) {
333 @MUSIC_HAVE = $MUSIC_JINGLE[0];
334 $fade_out = 333;
335 } else {
336 return unless $CFG->{bgm_enable};
337
338 my @have =
339 grep $_,
340 map $CONN->{music_meta}{$_},
341 @$MUSIC_WANT;
342
343 @MUSIC_HAVE = @have
344 if @have;
345
346 # default MUSIC_HAVE == MUSIC_DEFAULT
347 @MUSIC_HAVE = { path => CFPlus::find_rcfile "music/$MUSIC_DEFAULT" } unless @MUSIC_HAVE;
348 $fade_out = 1000;
349 }
350
351 # if the currently playing song is acceptable, let it continue
352 return if grep $MUSIC_PLAYING_META == $_, @MUSIC_HAVE;
353
354 my $NOW = time;
355
356 if ($MUSIC_PLAYING_META) {
357 $MUSIC_PLAYING_META->{stop_time} = $NOW;
358 $MUSIC_PLAYING_META->{stop_pos} = $NOW - $MUSIC_START;
359 CFPlus::MixMusic::fade_out $fade_out;
360 } else {
361 # sort by stop time, oldest first
362 @MUSIC_HAVE = sort { $a->{stop_time} <=> $b->{stop_time} } @MUSIC_HAVE;
363
364 # if the most recently-played piece played very recently,
365 # resume it, else choose the oldest piece for rotation.
366 audio_music_set_meta
367 $MUSIC_HAVE[-1]{stop_time} > $NOW - $MUSIC_RESUME
368 ? $MUSIC_HAVE[-1]
369 : $MUSIC_HAVE[0];
370
371 audio_music_start;
372 }
373}
374
375sub audio_music_set_ambient {
376 my ($songs) = @_;
377
378 $MUSIC_WANT = $songs;
379 audio_music_push;
380}
381
382sub audio_music_finished {
383 # we compress multiple jingles of the same type
384 shift @MUSIC_JINGLE
385 while @MUSIC_JINGLE && $MUSIC_PLAYING_META == $MUSIC_JINGLE[0];
386
387 $MUSIC_PLAYING_WIDGET->clear;
388
389 undef $MUSIC_PLAYER;
390 undef $MUSIC_PLAYING_META;
391 undef $MUSIC_PLAYING_DATA;
392
393 audio_music_push;
394}
395
396sub audio_init {
397 if ($CFG->{audio_enable}) {
398 $ENV{MIX_EFFECTSMAXSPEED} = 1;
399 $SDL_MIXER = !CFPlus::Mix_OpenAudio;
400
401 unless ($SDL_MIXER) {
402 status "Unable to open sound device: there will be no sound";
403 return;
404 }
405
406 CFPlus::Mix_AllocateChannels 16;
407
408 audio_music_finished;
409 } else {
410 undef $SDL_MIXER;
411 }
412}
413
414sub audio_shutdown {
415 undef $MUSIC_PLAYER;
416 undef $MUSIC_PLAYING_META;
417 undef $MUSIC_PLAYING_DATA;
418
419 $MUSIC_WANT = [];
420 @MUSIC_JINGLE = ();
421 %AUDIO_PLAY = ();
422 %AUDIO_CHUNK = ();
423
424 CFPlus::Mix_CloseAudio if $SDL_MIXER;
425 undef $SDL_MIXER;
426}
427
428#############################################################################
176 429
177sub destroy_query_dialog { 430sub destroy_query_dialog {
178 (delete $_[0]{query_dialog})->destroy 431 (delete $_[0]{query_dialog})->destroy
179 if $_[0]{query_dialog}; 432 if $_[0]{query_dialog};
180} 433}
… …
244 ellipsise => 0, 497 ellipsise => 0,
245 markup => "\nOr use your keyboard and the text entry below:\n"; 498 markup => "\nOr use your keyboard and the text entry below:\n";
246 499
247 unshift @dialog, my $table = new CFPlus::UI::Table; 500 unshift @dialog, my $table = new CFPlus::UI::Table;
248 501
249 $table->add (0, 0, new CFPlus::UI::Button 502 $table->add_at (0, 0, new CFPlus::UI::Button
250 text => "Next Race", 503 text => "Next Race",
251 on_activate => sub { 504 on_activate => sub {
252 $conn->send ("reply n"); 505 $conn->send ("reply n");
253 destroy_query_dialog $conn; 506 destroy_query_dialog $conn;
254 0 507 0
255 }, 508 },
256 ); 509 );
257 $table->add (2, 0, new CFPlus::UI::Button 510 $table->add_at (2, 0, new CFPlus::UI::Button
258 text => "Accept", 511 text => "Accept",
259 on_activate => sub { 512 on_activate => sub {
260 $conn->send ("reply d"); 513 $conn->send ("reply d");
261 destroy_query_dialog $conn; 514 destroy_query_dialog $conn;
262 0 515 0
… …
297 $conn->send ("reply $stat"); 550 $conn->send ("reply $stat");
298 destroy_query_dialog $conn; 551 destroy_query_dialog $conn;
299 return; 552 return;
300 } 553 }
301 554
302 $STATS_PAGE->show;
303 $MESSAGE_WINDOW->hide;
304
305 unshift @dialog, new CFPlus::UI::Label 555 unshift @dialog, new CFPlus::UI::Label
306 max_w => $::WIDTH * 0.4, 556 max_w => $::WIDTH * 0.4,
307 ellipsise => 0, 557 ellipsise => 0,
308 markup => "\nOr use your keyboard and the text entry below:\n"; 558 markup => "\nOr use your keyboard and the text entry below:\n";
309 559
310 unshift @dialog, my $table = new CFPlus::UI::Table; 560 unshift @dialog, my $table = new CFPlus::UI::Table;
311 561
312 # left: re-roll 562 # left: re-roll
313 $table->add (0, 0, new CFPlus::UI::Button 563 $table->add_at (0, 0, new CFPlus::UI::Button
314 text => "Roll Again", 564 text => "Roll Again",
315 on_activate => sub { 565 on_activate => sub {
316 $conn->send ("reply y"); 566 $conn->send ("reply y");
317 destroy_query_dialog $conn; 567 destroy_query_dialog $conn;
318 0 568 0
… …
332 [6 => "Pow", "Power ($conn->{stat}{+CS_STAT_POW})"], 582 [6 => "Pow", "Power ($conn->{stat}{+CS_STAT_POW})"],
333 [7 => "Cha", "Charisma ($conn->{stat}{+CS_STAT_CHA})"], 583 [7 => "Cha", "Charisma ($conn->{stat}{+CS_STAT_CHA})"],
334 ], 584 ],
335 ), 1 .. 2; 585 ), 1 .. 2;
336 586
337 $table->add (2, 0, new CFPlus::UI::Button 587 $table->add_at (2, 0, new CFPlus::UI::Button
338 text => "Swap Stats", 588 text => "Swap Stats",
339 on_activate => sub { 589 on_activate => sub {
340 $conn->{stat_change_with} = $sw2->{value}; 590 $conn->{stat_change_with} = $sw2->{value};
341 $conn->send ("reply $sw1->{value}"); 591 $conn->send ("reply $sw1->{value}");
342 destroy_query_dialog $conn; 592 destroy_query_dialog $conn;
343 0 593 0
344 }, 594 },
345 ); 595 );
346 $table->add (2, 1, new CFPlus::UI::HBox children => [$sw1, $sw2]); 596 $table->add_at (2, 1, new CFPlus::UI::HBox children => [$sw1, $sw2]);
347 597
348 # right: accept 598 # right: accept
349 $table->add (4, 0, new CFPlus::UI::Button 599 $table->add_at (4, 0, new CFPlus::UI::Button
350 text => "Accept", 600 text => "Accept",
351 on_activate => sub { 601 on_activate => sub {
352 $conn->send ("reply n"); 602 $conn->send ("reply n");
353 $STATS_PAGE->hide; 603 $STATS_PAGE->hide;
354 destroy_query_dialog $conn; 604 destroy_query_dialog $conn;
… …
435 maph => $mapsize, 685 maph => $mapsize,
436 686
437 client => "cfplus $CFPlus::VERSION $] $^O", 687 client => "cfplus $CFPlus::VERSION $] $^O",
438 688
439 map_widget => $MAPWIDGET, 689 map_widget => $MAPWIDGET,
440 logview => $LOGVIEW,
441 statusbox => $STATUSBOX, 690 statusbox => $STATUSBOX,
442 map => $MAP, 691 map => $MAP,
443 mapmap => $MAPMAP, 692 mapmap => $MAPMAP,
444 query => \&server_query, 693 query => \&server_query,
445 694
446 setup_req => { 695 setup_req => {
447 smoothing => $CFG->{map_smoothing}*1, 696 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 }, 697 },
461 }; 698 };
462 699
463 if ($CONN) { 700 if ($CONN) {
464 CFPlus::lowdelay fileno $CONN->{fh}; 701 CFPlus::lowdelay fileno $CONN->{fh};
… …
474 $LOGIN_BUTTON->set_text ("Login"); 711 $LOGIN_BUTTON->set_text ("Login");
475 $SETUP_NOTEBOOK->set_current_page ($SETUP_SERVER); 712 $SETUP_NOTEBOOK->set_current_page ($SETUP_SERVER);
476 $SETUP_DIALOG->show; 713 $SETUP_DIALOG->show;
477 $PL_WINDOW->hide; 714 $PL_WINDOW->hide;
478 $SPELL_LIST->clear_spells; 715 $SPELL_LIST->clear_spells;
716 $CFPlus::UI::ROOT->emit (stop_game => ! ! $CONN);
717
718 &audio_music_set_ambient ([]);
479 719
480 return unless $CONN; 720 return unless $CONN;
481 721
482 status "connection closed"; 722 status "connection closed";
483 723
… …
493 733
494 $vbox->add (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]); 734 $vbox->add (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]);
495 735
496 my $row = 0; 736 my $row = 0;
497 737
498 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "OpenGL Info"); 738 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "OpenGL Info");
499 $table->add (1, $row++, new CFPlus::UI::Label valign => 0, fontsize => 0.8, text => CFPlus::OpenGL::gl_vendor . ", " . CFPlus::OpenGL::gl_version, 739 $table->add_at (1, $row++, new CFPlus::UI::Label valign => 0, fontsize => 0.8, text => CFPlus::OpenGL::gl_vendor . ", " . CFPlus::OpenGL::gl_version,
500 can_events => 1, 740 can_events => 1,
501 tooltip => "<tt><span size='8192'>" . (CFPlus::OpenGL::gl_extensions) . "</span></tt>"); 741 tooltip => "<tt><span size='8192'>" . (CFPlus::OpenGL::gl_extensions) . "</span></tt>");
502 742
743 my $vidmode_tooltip =
744 "<b>Video Mode.</b> The video mode to use for fullscreen (and the window size for windowed operation). "
745 . "The format is <i>width</i> x <i>height</i> \@ <i>depth-per-channel</i> + <i>alpha-channel</i>.";
746
503 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Video Mode"); 747 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Video Mode");
504 $table->add (1, $row++, my $hbox = new CFPlus::UI::HBox); 748 $table->add_at (1, $row++, my $hbox = new CFPlus::UI::HBox);
505 749
750 $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]); 751 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"); 752 tooltip => $vidmode_tooltip);
753 $hbox->add (my $mode_label = new CFPlus::UI::Label
754 align => 0, valign => 0, height => 0.8, template => "9999x9999@9+9",
755 can_events => 1, tooltip => $vidmode_tooltip);
508 756
509 $mode_slider->connect (changed => sub { 757 $mode_slider->connect (changed => sub {
510 my ($self, $value) = @_; 758 my ($self, $value) = @_;
511 759
512 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value; 760 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value;
513 $mode_label->set_text (sprintf "%dx%d", @{$SDL_MODES[$value]}); 761 $mode_label->set_text (sprintf '%dx%d@%d+%d', @{$SDL_MODES[$value]});
514 }); 762 });
515 $mode_slider->emit (changed => $mode_slider->{range}[0]); 763 $mode_slider->emit (changed => $mode_slider->{range}[0]);
516 764
517 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fullscreen"); 765 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fullscreen");
518 $table->add (1, $row++, $FULLSCREEN_ENABLE = new CFPlus::UI::CheckBox 766 $table->add_at (1, $row++, $FULLSCREEN_ENABLE = new CFPlus::UI::CheckBox
519 state => $CFG->{fullscreen}, 767 state => $CFG->{fullscreen},
520 tooltip => "Bring the client into fullscreen mode.", 768 tooltip => "Bring the client into fullscreen mode.",
521 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 } 769 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 }
522 ); 770 );
523 771
772 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Force OpenGL 1.1");
773 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
774 state => $CFG->{opengl11},
775 tooltip => "Limit CFPlus to use OpenGL 1.1 features only. This will normally result in "
776 . "higher memory usage and slower performance. It will, however, help tremendously on "
777 . "cards that claim to support a feature but fall back to software rendering. "
778 . "Nvidia Geforce FX cards are known to claim features the hardware doesn't support, "
779 . "but cards and drivers from other vendors (ATI) are often just as bad. <b>If you "
780 . "experience extremely low framerates and your card should do better, try this option.</b>",
781 on_changed => sub { my ($self, $value) = @_; $CFG->{opengl11} = $value; 0 }
782 );
783
524 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fast & Ugly"); 784 $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 785 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
526 state => $CFG->{fast}, 786 state => $CFG->{fast},
527 tooltip => "Lower the visual quality considerably to speed up rendering.", 787 tooltip => "Lower the visual quality considerably to speed up rendering.",
528 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 } 788 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 }
529 ); 789 );
530 790
531 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "GUI Fontsize"); 791 $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 792 $table->add_at (1, $row++, new CFPlus::UI::Slider
533 range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1], 793 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.", 794 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 }, 795 on_changed => sub { $CFG->{gui_fontsize} = $_[1]; 0 },
536 ); 796 );
537 797
538 $table->add (1, $row++, new CFPlus::UI::Button 798 $table->add_at (1, $row++, new CFPlus::UI::Button
539 expand => 1, align => 0, text => "Apply", 799 expand => 1, align => 0, text => "Apply",
540 tooltip => "Apply the video settings above.", 800 tooltip => "Apply the video settings above.",
541 on_activate => sub { 801 on_activate => sub {
542 video_shutdown (); 802 video_shutdown ();
543 video_init (); 803 video_init ();
544 0 804 0
545 } 805 }
546 ); 806 );
547 807
548 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Scale"); 808 $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 809 $table->add_at (1, $row++, new CFPlus::UI::Slider
550 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1], 810 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1],
551 tooltip => "Enlarge or shrink the displayed map. Changes are instant.", 811 tooltip => "Enlarge or shrink the displayed map. Changes are instant.",
552 on_changed => sub { my ($self, $value) = @_; $CFG->{map_scale} = 2 ** $value; 0 } 812 on_changed => sub { my ($self, $value) = @_; $CFG->{map_scale} = 2 ** $value; 0 }
553 ); 813 );
554 814
555 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Smoothing"); 815 $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 816 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
557 state => $CFG->{map_smoothing}, 817 state => $CFG->{map_smoothing},
558 tooltip => "<b>Map Smoothing</b> tries to make tile borders less square. " 818 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. " 819 . "This increases load on the graphics subsystem and works only with TRT servers. "
560 . "Changes take effect at next connection only.", 820 . "Changes take effect at next login only.",
561 on_changed => sub { my ($self, $value) = @_; $CFG->{map_smoothing} = $value; 0 } 821 on_changed => sub { my ($self, $value) = @_; $CFG->{map_smoothing} = $value; 0 }
562 ); 822 );
563 823
564 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fog of War"); 824 $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 825 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
566 state => $CFG->{fow_enable}, 826 state => $CFG->{fow_enable},
567 tooltip => "<b>Fog-of-War</b> marks areas that cannot be seen by the player. Changes are instant.", 827 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 } 828 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; 0 }
569 ); 829 );
570 830
571 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "FoW Intensity"); 831 $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 832 $table->add_at (1, $row++, new CFPlus::UI::Slider
573 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256], 833 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.", 834 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 } 835 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_intensity} = $value; 0 }
576 ); 836 );
577 837
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"); 838 $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 839 $table->add_at (1, $row++, new CFPlus::UI::Slider
592 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1], 840 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.", 841 tooltip => "The font size used by the <b>message/server log</b> window only. Changes are instant, "
842 . "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 }, 843 on_changed => sub { $MESSAGE_WINDOW->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 },
595 ); 844 );
596 845
597 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Gauge fontsize"); 846 $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 847 $table->add_at (1, $row++, new CFPlus::UI::Slider
599 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1], 848 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.", 849 tooltip => "Adjusts the fontsize of the gauges at the bottom right. Changes are instant.",
601 on_changed => sub { 850 on_changed => sub {
602 $CFG->{gauge_fontsize} = $_[1]; 851 $CFG->{gauge_fontsize} = $_[1];
603 &set_gauge_window_fontsize; 852 &set_gauge_window_fontsize;
604 0 853 0
605 } 854 }
606 ); 855 );
607 856
608 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Gauge size"); 857 $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 858 $table->add_at (1, $row++, new CFPlus::UI::Slider
610 range => [$CFG->{gauge_size}, 0.2, 0.8], 859 range => [$CFG->{gauge_size}, 0.2, 0.8],
611 tooltip => "Adjust the size of the stats gauges at the bottom right. Changes are instant.", 860 tooltip => "Adjust the size of the stats gauges at the bottom right. Changes are instant.",
612 on_changed => sub { 861 on_changed => sub {
613 $CFG->{gauge_size} = $_[1]; 862 $CFG->{gauge_size} = $_[1];
614 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size}); 863 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size});
… …
620} 869}
621 870
622sub audio_setup { 871sub audio_setup {
623 my $vbox = new CFPlus::UI::VBox; 872 my $vbox = new CFPlus::UI::VBox;
624 873
625 $vbox->add (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]); 874 $vbox->add (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 0, 1]);
626 875
627 my $row = 0; 876 my $row = 0;
628 877
629 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Audio Enable"); 878 $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 879 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
631 state => $CFG->{audio_enable}, 880 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.", 881 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 } 882 on_changed => sub { $CFG->{audio_enable} = $_[1]; 0 }
634 ); 883 );
635# $table->add (0, 9, new CFPlus::UI::Label valign => 0, align => 1, text => "Effects Volume"); 884# $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 { 885# $table->add_at (1, 8, new CFPlus::UI::Slider range => [$CFG->{effects_volume}, 0, 128, 1], on_changed => sub {
637# $CFG->{effects_volume} = $_[1]; 886# $CFG->{effects_volume} = $_[1];
638# }); 887# });
888
889 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Sound Effects");
890 $table->add_at (1, $row, new CFPlus::UI::CheckBox
891 expand => 1, state => $CFG->{effects_enable},
892 tooltip => "If enabled, sound effects are enabled. If disabled, no sound effects will be played.",
893 on_changed => sub {
894 $CFG->{effects_enable} = $_[1];
895 $CONN->update_fx_want if $CONN;
896 0
897 }
898 );
899 $table->add_at (2, $row++, new CFPlus::UI::Slider
900 expand => 1, range => [$CFG->{effects_volume}, 0, 1, 0, 1/128],
901 tooltip => "The relative volume of sound effects. Best audio quality is achieved if this "
902 . "is set highest (rightmost) and you use your operating system volume setting. Changes are instant.",
903 on_changed => sub { $CFG->{effects_volume} = $_[1]; 0 }
904 );
905
639 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Background Music"); 906 $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 907 $table->add_at (1, $row, new CFPlus::UI::CheckBox
642 expand => 1, state => $CFG->{bgm_enable}, 908 expand => 1, state => $CFG->{bgm_enable},
643 tooltip => "If enabled, playing of background music is enabled. If disabled, no background music will be played.", 909 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 } 910 on_changed => sub {
911 $CFG->{bgm_enable} = $_[1];
912 $CONN->update_fx_want if $CONN;
913 0
914 }
645 ); 915 );
646 $hbox->add (new CFPlus::UI::Slider 916 $table->add_at (2, $row++, new CFPlus::UI::Slider
647 expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128], 917 expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128],
648 tooltip => "The volume of the background music. Changes are instant.", 918 tooltip => "The volume of the background music. Changes are instant.",
649 on_changed => sub { $CFG->{bgm_volume} = $_[1]; CFPlus::MixMusic::volume $_[1] * 128; 0 } 919 on_changed => sub { $CFG->{bgm_volume} = $_[1]; audio_music_update_volume; 0 }
650 ); 920 );
651 921
652 $table->add (1, $row++, new CFPlus::UI::Button 922 $table->add_at (1, $row++, new CFPlus::UI::Button
653 expand => 1, align => 0, text => "Apply", 923 c_colspan => 2, expand => 1, align => 0, text => "Apply",
654 tooltip => "Apply the audio settings", 924 tooltip => "Apply the audio settings",
655 on_activate => sub { 925 on_activate => sub {
656 audio_shutdown (); 926 audio_shutdown ();
657 audio_init (); 927 audio_init ();
658 0 928 0
… …
716} 986}
717 987
718sub debug_setup { 988sub debug_setup {
719 my $table = new CFPlus::UI::Table; 989 my $table = new CFPlus::UI::Table;
720 990
721 $table->add (0, 0, new CFPlus::UI::Label text => "Widget Borders"); 991 $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 }); 992 $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"); 993 $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 }); 994 $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"); 995 $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 }); 996 $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"); 997 $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 }); 998 $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" } ); 999 $table->add_at (0, 4, new CFPlus::UI::Button text => "die on click(tm)", on_activate => sub { &CFPlus::debug() } );
730 1000
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# 1001 $table->add_at (0, 5, new CFPlus::UI::TextEdit text => "line1\0152\0153");#d#
1002
1003 $table->add_at (7,7, my $t = new CFPlus::UI::Table expand => 0);
1004 $t->add_at (0,0, new CFPlus::UI::Label text => "a a a a", c_rowspan => 1, c_colspan => 2);
1005 $t->add_at (2,0, new CFPlus::UI::Label text => "b\nb", c_rowspan => 2, c_colspan => 1);
1006 $t->add_at (1,2, new CFPlus::UI::Label text => "c c c c", c_rowspan => 1, c_colspan => 2);
1007 $t->add_at (0,1, new CFPlus::UI::Label text => "d\nd", c_rowspan => 2, c_colspan => 1);
1008 $t->add_at (1,1, new CFPlus::UI::Label text => "e");
1009
1010 $table->add_at (7, 6, my $c = new CFPlus::UI::Canvas);
1011
1012 $c->add_items ({
1013 type => "line_loop",
1014 color => [0, 1, 0],
1015 width => 9,
1016 coord_mode => "abs",
1017 coord => [[10, 5], [5, 50], [20, 5], [5, 60]],
1018 });
1019
1020 $c->add_items ({
1021 type => "lines",
1022 color => [1, 1, 0],
1023 width => 2,
1024 coord_mode => "rel",
1025 coord => [[0,0], [1,1], [1,0], [0,1]],
1026 });
1027
1028 $c->add_items ({
1029 type => "polygon",
1030 color => [0, 0.43, 0],
1031 width => 2,
1032 coord_mode => "rel",
1033 coord => [[0,0.2], [1,.4], [1,.6], [0,.8]],
1034 });
744 1035
745 $table 1036 $table
746} 1037}
747 1038
748sub stats_window { 1039sub stats_window {
… …
796 [2, 4, st_spd => "Spd", 10.54], 1087 [2, 4, st_spd => "Spd", 10.54],
797 [2, 5, st_wspd => "WSp", 10.54], 1088 [2, 5, st_wspd => "WSp", 10.54],
798 ) { 1089 ) {
799 my ($col, $row, $id, $label, $template) = @$_; 1090 my ($col, $row, $id, $label, $template) = @$_;
800 1091
801 $tbl->add ($col , $row, $STATWIDS->{$id} = new CFPlus::UI::Label 1092 $tbl->add_at ($col , $row, $STATWIDS->{$id} = new CFPlus::UI::Label
802 font => $FONT_FIXED, can_hover => 1, can_events => 1, valign => 0, 1093 font => $FONT_FIXED, can_hover => 1, can_events => 1, valign => 0,
803 align => +1, template => $template, tooltip => "#stat_$label"); 1094 align => +1, template => $template, tooltip => "#stat_$label");
804 $tbl->add ($col + 1, $row, $STATWIDS->{"$id\_lbl"} = new CFPlus::UI::Label 1095 $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, 1096 font => $FONT_FIXED, can_hover => 1, can_events => 1, fg => $color2, valign => 0,
806 align => -1, text => $label, tooltip => "#stat_$label"); 1097 align => -1, text => $label, tooltip => "#stat_$label");
807 } 1098 }
808 1099
809 $vb->add (new CFPlus::UI::FancyFrame 1100 $vb->add (new CFPlus::UI::FancyFrame
… …
850 cold => ["Cold", 1141 cold => ["Cold",
851 "<b>Cold</b> (this is your resistance against cold spells like icestorm, snowstorm, ...)"], 1142 "<b>Cold</b> (this is your resistance against cold spells like icestorm, snowstorm, ...)"],
852 ghit => ["Ghost hit", 1143 ghit => ["Ghost hit",
853 "<b>Ghost hit</b> (special attack used by ghosts and ghost-like beings)"], 1144 "<b>Ghost hit</b> (special attack used by ghosts and ghost-like beings)"],
854 ); 1145 );
1146
855 for (qw/slow holyw conf fire depl magic 1147 for (qw/slow holyw conf fire depl magic
856 drain acid pois para deat phys 1148 drain acid pois para deat phys
857 blind fear tund elec cold ghit/) 1149 blind fear tund elec cold ghit/)
858 { 1150 {
859 $tbl2->add ($col, $row, 1151 $tbl2->add_at ($col, $row,
860 $STATWIDS->{"res_$_"} = 1152 $STATWIDS->{"res_$_"} =
861 new CFPlus::UI::Label 1153 new CFPlus::UI::Label
862 font => $FONT_FIXED, 1154 font => $FONT_FIXED,
863 template => "-100%", 1155 template => "-100%",
864 align => +1, 1156 align => +1,
865 valign => 0, 1157 valign => 0,
866 can_events => 1, 1158 can_events => 1,
867 can_hover => 1, 1159 can_hover => 1,
868 tooltip => $resist_names{$_}->[1], 1160 tooltip => $resist_names{$_}->[1],
869 ); 1161 );
870 $tbl2->add ($col + 1, $row, new CFPlus::UI::Image 1162 $tbl2->add_at ($col + 1, $row, new CFPlus::UI::Image
871 font => $FONT_FIXED, 1163 font => $FONT_FIXED,
872 can_hover => 1, 1164 can_hover => 1,
873 can_events => 1, 1165 can_events => 1,
874 path => "ui/resist/resist_$_.png", 1166 path => "ui/resist/resist_$_.png",
875 tooltip => $resist_names{$_}->[1], 1167 tooltip => $resist_names{$_}->[1],
876 ); 1168 );
877 $tbl2->add ($col + 2, $row, new CFPlus::UI::Label 1169 $tbl2->add_at ($col + 2, $row, new CFPlus::UI::Label
878 text => $resist_names{$_}->[0], 1170 text => $resist_names{$_}->[0],
879 font => $FONT_FIXED, 1171 font => $FONT_FIXED,
880 can_hover => 1, 1172 can_hover => 1,
881 can_events => 1, 1173 can_events => 1,
882 tooltip => $resist_names{$_}->[1], 1174 tooltip => $resist_names{$_}->[1],
… …
915 return if $METASERVER_ATIME > time; 1207 return if $METASERVER_ATIME > time;
916 $METASERVER_ATIME = time + 60; 1208 $METASERVER_ATIME = time + 60;
917 1209
918 my $table = $METASERVER->{table}; 1210 my $table = $METASERVER->{table};
919 $table->clear; 1211 $table->clear;
920 $table->add (0, 0, my $label = new CFPlus::UI::Label max_w => $WIDTH * 0.8, text => "fetching server list..."); 1212 $table->add_at (0, 0, my $label = new CFPlus::UI::Label max_w => $WIDTH * 0.8, text => "fetching server list...");
921 1213
922 my $ok = 0; 1214 my $ok = 0;
923 1215
924 CFPlus::background { 1216 CFPlus::background {
925 my $ua = CFPlus::lwp_useragent; 1217 my $ua = CFPlus::lwp_useragent;
… …
936 "The time this server has been running without being restarted.", 1228 "The time this server has been running without being restarted.",
937 "The server software version - a '+' indicates a Crossfire+ server.", 1229 "The server software version - a '+' indicates a Crossfire+ server.",
938 "Short information about this server provided by its admins.", 1230 "Short information about this server provided by its admins.",
939 ); 1231 );
940 my @col = qw(#Users Host Uptime Version Description); 1232 my @col = qw(#Users Host Uptime Version Description);
941 $table->add ($_, 0, new CFPlus::UI::Label 1233 $table->add_at ($_, 0, new CFPlus::UI::Label
942 can_hover => 1, can_events => 1, 1234 can_hover => 1, can_events => 1,
943 align => 0, fg => [1, 1, 0], 1235 align => 0, fg => [1, 1, 0],
944 text => $col[$_], tooltip => $tip[$_]) 1236 text => $col[$_], tooltip => $tip[$_])
945 for 0 .. $#col; 1237 for 0 .. $#col;
946 1238
… …
968 1260
969 $m = [$users, $host, $uptime, $version, $desc]; 1261 $m = [$users, $host, $uptime, $version, $desc];
970 1262
971 $y++; 1263 $y++;
972 1264
973 $table->add (scalar @$m, $y, new CFPlus::UI::VBox children => [ 1265 $table->add_at (scalar @$m, $y, new CFPlus::UI::VBox children => [
974 (new CFPlus::UI::Button 1266 (new CFPlus::UI::Button
975 text => "Use", 1267 text => "Use",
976 tooltip => "Put this server into the <b>Host:Port</b> field", 1268 tooltip => "Put this server into the <b>Host:Port</b> field",
977 on_activate => sub { 1269 on_activate => sub {
978 $HOST_ENTRY->set_text ($CFG->{profile}{default}{host} = $host); 1270 $HOST_ENTRY->set_text ($CFG->{profile}{default}{host} = $host);
… …
981 }, 1273 },
982 ), 1274 ),
983 (new CFPlus::UI::Empty expand => 1), 1275 (new CFPlus::UI::Empty expand => 1),
984 ]); 1276 ]);
985 1277
986 $table->add ($_, $y, new CFPlus::UI::Label 1278 $table->add_at ($_, $y, new CFPlus::UI::Label
987 max_w => $::WIDTH * 0.4, 1279 max_w => $::WIDTH * 0.4,
988 ellipsise => 0, 1280 ellipsise => 0,
989 align => $align[$_], 1281 align => $align[$_],
990 text => $m->[$_], 1282 text => $m->[$_],
991 tooltip => $tip[$_], 1283 tooltip => $tip[$_],
… …
1032 1324
1033 $vbox->add (new CFPlus::UI::FancyFrame 1325 $vbox->add (new CFPlus::UI::FancyFrame
1034 label => "Connection Settings", 1326 label => "Connection Settings",
1035 child => (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]), 1327 child => (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]),
1036 ); 1328 );
1037 $table->add (0, 2, new CFPlus::UI::Label valign => 0, align => 1, text => "Host:Port"); 1329 $table->add_at (0, 2, new CFPlus::UI::Label valign => 0, align => 1, text => "Host:Port");
1038 1330
1039 { 1331 {
1040 $table->add (1, 2, my $vbox = new CFPlus::UI::VBox); 1332 $table->add_at (1, 2, my $vbox = new CFPlus::UI::VBox);
1041 1333
1042 $vbox->add ( 1334 $vbox->add (
1043 $HOST_ENTRY = new CFPlus::UI::Entry 1335 $HOST_ENTRY = new CFPlus::UI::Entry
1044 expand => 1, 1336 expand => 1,
1045 text => $CFG->{profile}{default}{host}, 1337 text => $CFG->{profile}{default}{host},
1046 tooltip => "The hostname or ip address of the Crossfire(+) server to connect to", 1338 tooltip => "The hostname or ip address of the Crossfire(+) server to connect to",
1047 on_changed => sub { 1339 on_changed => sub {
1048 my ($self, $value) = @_; 1340 my ($self, $value) = @_;
1049 $CFG->{profile}{default}{host} = $value; 1341 $CFG->{profile}{default}{host} = $value;
1050 0 1342 1
1051 } 1343 }
1052 ); 1344 );
1053 1345
1054 $vbox->add (new CFPlus::UI::Button 1346 $vbox->add (new CFPlus::UI::Button
1055 expand => 1, 1347 expand => 1,
1056 text => "Server List", 1348 text => "Server List",
1057 other => $METASERVER, 1349 other => $METASERVER,
1058 tooltip => "Show a list of available crossfire servers", 1350 tooltip => "Show a list of available crossfire servers",
1059 on_activate => sub { $METASERVER->toggle_visibility; 0 }, 1351 on_activate => sub { $METASERVER->toggle_visibility; 0 },
1060 on_visibility_change => sub { $METASERVER->hide unless $_[1]; 0 }, 1352 on_visibility_change => sub { $METASERVER->hide unless $_[1]; 1 },
1061 ); 1353 );
1062 } 1354 }
1063 1355
1064 $table->add (0, 4, new CFPlus::UI::Label valign => 0, align => 1, text => "Username"); 1356 $table->add_at (0, 4, new CFPlus::UI::Label valign => 0, align => 1, text => "Username");
1065 $table->add (1, 4, new CFPlus::UI::Entry 1357 $table->add_at (1, 4, new CFPlus::UI::Entry
1066 text => $CFG->{profile}{default}{user}, 1358 text => $CFG->{profile}{default}{user},
1067 tooltip => "The name of your character on the server", 1359 tooltip => "The name of your character on the server",
1068 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value } 1360 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value; 1 }
1069 ); 1361 );
1070 1362
1071 $table->add (0, 5, new CFPlus::UI::Label valign => 0, align => 1, text => "Password"); 1363 $table->add_at (0, 5, new CFPlus::UI::Label valign => 0, align => 1, text => "Password");
1072 $table->add (1, 5, new CFPlus::UI::Entry 1364 $table->add_at (1, 5, new CFPlus::UI::Entry
1073 text => $CFG->{profile}{default}{password}, 1365 text => $CFG->{profile}{default}{password},
1074 hidden => 1, 1366 hidden => 1,
1075 tooltip => "The password for your character", 1367 tooltip => "The password for your character",
1076 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{password} = $value } 1368 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{password} = $value; 1 }
1077 ); 1369 );
1078 1370
1079 $table->add (0, 7, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Size"); 1371 $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 1372 $table->add_at (1, 7, new CFPlus::UI::Slider
1081 force_w => 100, 1373 force_w => 100,
1082 range => [$CFG->{mapsize}, 10, 100, 0, 1], 1374 range => [$CFG->{mapsize}, 10, 100, 0, 1],
1083 tooltip => "This is the size of the portion of the map update the server sends you. " 1375 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, " 1376 . "If you set this to a high value you will be able to see further, "
1085 . "but you also increase bandwidth requirements and latency. " 1377 . "but you also increase bandwidth requirements and latency. "
1086 . "This option is only used once at log-in.", 1378 . "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 }, 1379 on_changed => sub { my ($self, $value) = @_; $CFG->{mapsize} = $self->{range}[0] = $value = int $value; 1 },
1088 ); 1380 );
1089 1381
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"); 1382 $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 1383 $table->add_at (1, 8, new CFPlus::UI::Entry
1105 text => $CFG->{output_rate}, 1384 text => $CFG->{output_rate},
1106 tooltip => "The approximate bandwidth in bytes per second that the server should not exceed " 1385 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 " 1386 . "when sending data. When 0 or unset, the server "
1108 . "default will be used, which is usually around 100kb/s.", 1387 . "default will be used, which is usually around 100kb/s. Most servers will "
1388 . "dynamically find an optimal rate, so adjust this only when necessary.",
1109 on_changed => sub { $CFG->{output_rate} = $_[1]; 0 }, 1389 on_changed => sub { $CFG->{output_rate} = $_[1]; 1 },
1110 ); 1390 );
1111 1391
1112 $table->add (0, 10, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Count"); 1392 $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 1393 $table->add_at (1, 9, new CFPlus::UI::Entry
1114 text => $CFG->{output_count}, 1394 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.", 1395 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 }, 1396 on_changed => sub { $CFG->{output_count} = $_[1]; 1 },
1117 ); 1397 );
1118 1398
1119 $table->add (0, 11, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Sync"); 1399 $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 1400 $table->add_at (1, 10, new CFPlus::UI::Entry
1121 text => $CFG->{output_sync}, 1401 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.", 1402 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 }, 1403 on_changed => sub { $CFG->{output_sync} = $_[1]; 1 },
1124 ); 1404 );
1125 1405
1126 $table->add (1, 12, $LOGIN_BUTTON = new CFPlus::UI::Button 1406 $table->add_at (1, 11, $LOGIN_BUTTON = new CFPlus::UI::Button
1127 expand => 1, 1407 expand => 1,
1128 align => 0, 1408 align => 0,
1129 text => "Login", 1409 text => "Login",
1130 on_activate => sub { 1410 on_activate => sub {
1131 $CONN ? stop_game 1411 $CONN ? stop_game
1132 : start_game; 1412 : start_game;
1133 0 1413 1
1134 }, 1414 },
1135 ); 1415 );
1136 1416
1137 $vbox->add (new CFPlus::UI::FancyFrame 1417 $vbox->add (new CFPlus::UI::FancyFrame
1138 label => "Server Info", 1418 label => "Server Info",
… …
1145sub client_setup { 1425sub client_setup {
1146 my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]; 1426 my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1];
1147 1427
1148 my $row = 0; 1428 my $row = 0;
1149 1429
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"); 1430 $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 1431 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
1165 state => $CFG->{show_tips}, 1432 state => $CFG->{show_tips},
1166 tooltip => "Show the <b>Tip of the day</b> window at startup?", 1433 tooltip => "Show the <b>Tip of the day</b> window at startup?",
1167 on_changed => sub { 1434 on_changed => sub {
1168 my ($self, $value) = @_; 1435 my ($self, $value) = @_;
1169 $CFG->{show_tips} = $value; 1436 $CFG->{show_tips} = $value;
1170 0 1437 0
1171 } 1438 }
1172 ); 1439 );
1173 1440
1174 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Messages Window Size"); 1441 $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 1442 $table->add_at (1, $row++, my $saycmd = new CFPlus::UI::Entry
1176 text => $CFG->{logview_max_par}, 1443 text => $CFG->{logview_max_par},
1177 tooltip => "This is maximum number of messages remembered in the <b>Messages</b> window. If the server " 1444 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 " 1445 . "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.", 1446 . "computing time. A value of <b>0</b> disables this feature, but that is not recommended.",
1180 on_changed => sub { 1447 on_changed => sub {
1181 my ($self, $value) = @_; 1448 my ($self, $value) = @_;
1182 $LOGVIEW->{max_par} = $CFG->{logview_max_par} = $value*1; 1449 $MESSAGE_WINDOW->set_max_para ($CFG->{logview_max_par} = $value*1);
1183 0 1450 0
1184 }, 1451 },
1185 ); 1452 );
1186 1453
1187 $table 1454 $table
1188} 1455}
1189 1456
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 { 1457sub autopickup_setup {
1458 my $r = new CFPlus::UI::ScrolledWindow (
1459 expand => 1,
1460 scroll_y => 1
1461 );
1254 my $table = new CFPlus::UI::Table; 1462 $r->add (my $table = new CFPlus::UI::Table
1463 row_expand => [0],
1464 col_expand => [0, 1, 0, 1],
1465 );
1255 1466
1256 for ( 1467 for (
1257 ["General", 0, 0, 1468 ["General", 0, 0,
1258 ["Enable autopickup" => PICKUP_NEWMODE, \$PICKUP_ENABLE], 1469 ["Enable autopickup" => PICKUP_NEWMODE, \$PICKUP_ENABLE],
1259 ["Inhibit autopickup" => PICKUP_INHIBIT], 1470 ["Inhibit autopickup" => PICKUP_INHIBIT],
… …
1294 ], 1505 ],
1295 ["Weight/Value ratio", 2, 17] 1506 ["Weight/Value ratio", 2, 17]
1296 ) 1507 )
1297 { 1508 {
1298 my ($title, $x, $y, @bits) = @$_; 1509 my ($title, $x, $y, @bits) = @$_;
1299 $table->add ($x, $y, new CFPlus::UI::Label text => $title, align => 1, fg => [1, 1, 0]); 1510 $table->add_at ($x, $y, new CFPlus::UI::Label text => $title, align => 1, fg => [1, 1, 0]);
1300 1511
1301 for (@bits) { 1512 for (@bits) {
1302 ++$y; 1513 ++$y;
1303 1514
1304 my $mask = $_->[1]; 1515 my $mask = $_->[1];
1305 $table->add ($x , $y, new CFPlus::UI::Label text => $_->[0], align => 1, expand => 1); 1516 $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 1517 $table->add_at ($x+1, $y, my $checkbox = new CFPlus::UI::CheckBox
1307 state => $::CFG->{pickup} & $mask, 1518 state => $::CFG->{pickup} & $mask,
1308 on_changed => sub { 1519 on_changed => sub {
1309 my ($box, $value) = @_; 1520 my ($box, $value) = @_;
1310 1521
1311 if ($value) { 1522 if ($value) {
… …
1322 1533
1323 ${$_->[2]} = $checkbox if $_->[2]; 1534 ${$_->[2]} = $checkbox if $_->[2];
1324 } 1535 }
1325 } 1536 }
1326 1537
1327 $table->add (2, 18, new CFPlus::UI::ValSlider 1538 $table->add_at (2, 18, new CFPlus::UI::ValSlider
1328 range => [$::CFG->{pickup} & 0xF, 0, 16, 1, 1], 1539 range => [$::CFG->{pickup} & 0xF, 0, 16, 1, 1],
1329 template => ">= 99", 1540 template => ">= 99",
1330 to_value => sub { ">= " . 5 * $_[0] }, 1541 to_value => sub { ">= " . 5 * $_[0] },
1331 on_changed => sub { 1542 on_changed => sub {
1332 my ($slider, $value) = @_; 1543 my ($slider, $value) = @_;
… …
1335 $::CFG->{pickup} |= int $value 1546 $::CFG->{pickup} |= int $value
1336 if $value; 1547 if $value;
1337 1; 1548 1;
1338 }); 1549 });
1339 1550
1340 $table->add (3, 18, new CFPlus::UI::Button 1551 $table->add_at (3, 18, new CFPlus::UI::Button
1341 text => "set", 1552 text => "set",
1342 on_activate => sub { 1553 on_activate => sub {
1343 $::CONN->send_command ("pickup $::CFG->{pickup}") 1554 $::CONN->send_command ("pickup $::CFG->{pickup}")
1344 if defined $::CONN; 1555 if defined $::CONN;
1345 0 1556 0
1346 }); 1557 });
1347 1558
1348 $table 1559 $r
1349} 1560}
1350 1561
1351my %SORT_ORDER = ( 1562my %SORT_ORDER = (
1352 type => undef, 1563 type => undef,
1353 mtime => sub { 1564 mtime => sub {
… …
1397 $sw1->add ($INV = new CFPlus::UI::Inventory); 1608 $sw1->add ($INV = new CFPlus::UI::Inventory);
1398 $INV->set_sort_order ($SORT_ORDER{$::CFG->{inv_sort}}); 1609 $INV->set_sort_order ($SORT_ORDER{$::CFG->{inv_sort}});
1399 1610
1400 $hb->add (my $vb2 = new CFPlus::UI::VBox); 1611 $hb->add (my $vb2 = new CFPlus::UI::VBox);
1401 1612
1402 $vb2->add ($INV_RIGHT_HB = new CFPlus::UI::HBox); 1613 $vb2->add ($INVR_HB = new CFPlus::UI::HBox);
1403 1614
1404 $vb2->add (my $sw2 = new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1); 1615 $vb2->add (my $sw2 = new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1);
1405 $sw2->add ($INVR = new CFPlus::UI::Inventory); 1616 $sw2->add ($INVR = new CFPlus::UI::Inventory);
1406 1617
1407 # XXX: Call after $INVR = ... because set_opencont sets the items 1618 # XXX: Call after $INVR = ... because set_opencont sets the items
1408 CFPlus::Protocol::set_opencont ($::CONN, 0, "Floor"); 1619 CFPlus::Protocol::set_opencont ($::CONN, 0, "Floor");
1409 1620
1410 $hb 1621 $hb
1622}
1623
1624sub media_window {
1625 my $vb = new CFPlus::UI::VBox;
1626
1627 $vb->add (new CFPlus::UI::FancyFrame
1628 label => "Currently playing music",
1629 child => new CFPlus::UI::ScrolledWindow scroll_x => 1, scroll_y => 0,
1630 child => ($MUSIC_PLAYING_WIDGET = new CFPlus::UI::Label ellipsise => 0, fontsize => 0.8),
1631 );
1632
1633 $vb->add (new CFPlus::UI::FancyFrame
1634 label => "Other media used in this session",
1635 expand => 1,
1636 child => ($LICENSE_WIDGET = new CFPlus::UI::TextScroller
1637 expand => 1, fontsize => 0.8, padding_x => 4, padding_y => 4),
1638 );
1639
1640 $vb
1641}
1642
1643sub add_license {
1644 my ($meta) = @_;
1645
1646 $meta = $meta->{meta}
1647 or return;
1648
1649 $meta->{license} || $meta->{author} || $meta->{source}
1650 or return;
1651
1652 $LICENSE_WIDGET->add_paragraph ({
1653 fg => [1, 1, 1, 1],
1654 markup => "<small>"
1655 . "<b>Name:</b> " . (CFPlus::asxml $meta->{name}) . "\n"
1656 . "<b>Author:</b> " . (CFPlus::asxml $meta->{author}) . "\n"
1657 . "<b>Source:</b> " . (CFPlus::asxml $meta->{source}) . "\n"
1658 . "<b>License:</b> " . (CFPlus::asxml $meta->{license}) . "\n"
1659 . "</small>",
1660 });
1661 $LICENSE_WIDGET->scroll_to_bottom;
1411} 1662}
1412 1663
1413sub toggle_player_page { 1664sub toggle_player_page {
1414 my ($widget) = @_; 1665 my ($widget) = @_;
1415 1666
… …
1432 has_close_button => 1 1683 has_close_button => 1
1433 ; 1684 ;
1434 1685
1435 my $ntb = 1686 my $ntb =
1436 $PL_NOTEBOOK = 1687 $PL_NOTEBOOK =
1437 new CFPlus::UI::Notebook expand => 1, debug => 1; 1688 new CFPlus::UI::Notebook expand => 1;
1438 1689
1439 $ntb->add ( 1690 $ntb->add_tab (
1440 "Statistics (F2)" => $STATS_PAGE = stats_window, 1691 "Statistics (F2)" => $STATS_PAGE = stats_window,
1441 "Shows statistics, where all your Stats and Resistances are shown." 1692 "Shows statistics, where all your Stats and Resistances are shown."
1442 ); 1693 );
1443 $ntb->add ( 1694 $ntb->add_tab (
1444 "Skills (F3)" => $SKILL_PAGE = skill_window, 1695 "Skills (F3)" => $SKILL_PAGE = skill_window,
1445 "Shows all your Skills." 1696 "Shows all your Skills."
1446 ); 1697 );
1447 1698
1448 my $spellsw = $SPELL_PAGE = new CFPlus::UI::ScrolledWindow (expand => 1, scroll_y => 1); 1699 my $spellsw = $SPELL_PAGE = new CFPlus::UI::ScrolledWindow (expand => 1, scroll_y => 1);
1449 $spellsw->add ($SPELL_LIST = new CFPlus::UI::SpellList); 1700 $spellsw->add ($SPELL_LIST = new CFPlus::UI::SpellList);
1450 $ntb->add ( 1701 $ntb->add_tab (
1451 "Spellbook (F4)" => $spellsw, 1702 "Spellbook (F4)" => $spellsw,
1452 "Displays all spells you have and lets you edit keyboard shortcuts for them." 1703 "Displays all spells you have and lets you edit keyboard shortcuts for them."
1453 ); 1704 );
1454 $ntb->add ( 1705 $ntb->add_tab (
1455 "Inventory (F5)" => $INVENTORY_PAGE = inventory_widget, 1706 "Inventory (F5)" => $INVENTORY_PAGE = inventory_widget,
1456 "Toggles the inventory window, where you can manage your loot (or treasures :). " 1707 "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." 1708 . "You can also hit the <b>Tab</b>-key to show/hide the Inventory."
1458 ); 1709 );
1710 $ntb->add_tab (Pickup => autopickup_setup,
1711 "Configure autopickup settings, i.e. which items you will pick up automatically when walking (or running) over them.");
1712
1713 $ntb->add_tab (Media => media_window,
1714 "License, Author and Source info for media sent by the server.");
1459 1715
1460 $ntb->set_current_page ($INVENTORY_PAGE); 1716 $ntb->set_current_page ($INVENTORY_PAGE);
1461 1717
1462 $plwin->add ($ntb); 1718 $plwin->add ($ntb);
1463 $plwin 1719 $plwin
… …
1617 on_activate => sub { $QUIT_DIALOG->hide; 0 }, 1873 on_activate => sub { $QUIT_DIALOG->hide; 0 },
1618 ); 1874 );
1619 $hb->add (new CFPlus::UI::Button 1875 $hb->add (new CFPlus::UI::Button
1620 text => "Quit anyway", 1876 text => "Quit anyway",
1621 expand => 1, 1877 expand => 1,
1622 on_activate => sub { exit }, 1878 on_activate => sub { Event::unloop_all },
1623 ); 1879 );
1624 } 1880 }
1625 1881
1626 $QUIT_DIALOG->show; 1882 $QUIT_DIALOG->show;
1627 $QUIT_DIALOG->grab_focus; 1883 $QUIT_DIALOG->grab_focus;
… …
1660 expand => 1, fontsize => 0.8, padding_x => 4, padding_y => 4); 1916 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]); 1917 $viewer->add_paragraph (CFPlus::Pod::as_paragraphs CFPlus::Pod::section_of $tod[$todindex]);
1662 1918
1663 $vbox->add (my $table = new CFPlus::UI::Table col_expand => [0, 1]); 1919 $vbox->add (my $table = new CFPlus::UI::Table col_expand => [0, 1]);
1664 1920
1665 $table->add (0, 0, new CFPlus::UI::Button 1921 $table->add_at (0, 0, new CFPlus::UI::Button
1666 text => "Close", 1922 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>.", 1923 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, 1924 on_activate => $close,
1669 ); 1925 );
1670 1926
1671 $table->add (2, 0, new CFPlus::UI::Button 1927 $table->add_at (2, 0, new CFPlus::UI::Button
1672 text => "Next", 1928 text => "Next",
1673 tooltip => "Show the next <b>Tip of the day</b>.", 1929 tooltip => "Show the next <b>Tip of the day</b>.",
1674 on_activate => sub { 1930 on_activate => sub {
1675 $close->(); 1931 $close->();
1676 &show_tip_of_the_day; 1932 &show_tip_of_the_day;
… …
1685 CFPlus::SDL_Init 1941 CFPlus::SDL_Init
1686 and die "SDL::Init failed!\n"; 1942 and die "SDL::Init failed!\n";
1687} 1943}
1688 1944
1689sub video_init { 1945sub video_init {
1690 sdl_init;
1691
1692 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} >= @SDL_MODES; 1946 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} >= @SDL_MODES;
1693 1947
1694 my ($old_w, $old_h) = ($WIDTH, $HEIGHT); 1948 my ($old_w, $old_h) = ($WIDTH, $HEIGHT);
1695 1949
1696 ($WIDTH, $HEIGHT) = @{ $SDL_MODES[$CFG->{sdl_mode}] }; 1950 ($WIDTH, $HEIGHT, my ($rgb, $alpha)) = @{ $SDL_MODES[$CFG->{sdl_mode}] };
1697 $FULLSCREEN = $CFG->{fullscreen}; 1951 $FULLSCREEN = $CFG->{fullscreen};
1698 $FAST = $CFG->{fast}; 1952 $FAST = $CFG->{fast};
1699 1953
1700 CFPlus::SDL_SetVideoMode $WIDTH, $HEIGHT, $FULLSCREEN 1954 CFPlus::SDL_SetVideoMode $WIDTH, $HEIGHT, $rgb, $alpha, $FULLSCREEN
1701 or die "SDL_SetVideoMode failed: " . (CFPlus::SDL_GetError) . "\n"; 1955 or die "SDL_SetVideoMode failed: " . (CFPlus::SDL_GetError) . "\n";
1702 1956
1703 $SDL_ACTIVE = 1; 1957 $SDL_ACTIVE = 1;
1704 $LAST_REFRESH = time - 0.01; 1958 $LAST_REFRESH = time - 0.01;
1705 1959
… …
1747 2001
1748 $MAPWIDGET = new CFPlus::MapWidget; 2002 $MAPWIDGET = new CFPlus::MapWidget;
1749 $MAPWIDGET->connect (activate_console => sub { 2003 $MAPWIDGET->connect (activate_console => sub {
1750 my ($mapwidget, $preset) = @_; 2004 my ($mapwidget, $preset) = @_;
1751 2005
1752 if ($CONSOLE) { 2006 $MESSAGE_WINDOW->activate_console ($preset)
1753 $CONSOLE->{input}->{auto_activated} = 1; 2007 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 }); 2008 });
1761 $MAPWIDGET->show; 2009 $MAPWIDGET->show;
1762 $MAPWIDGET->grab_focus; 2010 $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 2011
1775 $SETUP_DIALOG = new CFPlus::UI::Toplevel 2012 $SETUP_DIALOG = new CFPlus::UI::Toplevel
1776 title => "Setup", 2013 title => "Setup",
1777 name => "setup_dialog", 2014 name => "setup_dialog",
1778 x => 'center', 2015 x => 'center',
… …
1782 force_h => $::HEIGHT * 0.6, 2019 force_h => $::HEIGHT * 0.6,
1783 has_close_button => 1, 2020 has_close_button => 1,
1784 ; 2021 ;
1785 2022
1786 $METASERVER = metaserver_dialog; 2023 $METASERVER = metaserver_dialog;
2024 $MESSAGE_WINDOW = new CFPlus::UI::MessageWindow;
1787 2025
1788 $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new CFPlus::UI::Notebook expand => 1, debug => 1, 2026 $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new CFPlus::UI::Notebook expand => 1, debug => 1,
1789 filter => new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1); 2027 filter => new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1);
1790 2028
1791 $SETUP_NOTEBOOK->add (Server => $SETUP_SERVER = server_setup, 2029 $SETUP_NOTEBOOK->add_tab (Server => $SETUP_SERVER = server_setup,
1792 "Configure the server to play on, your username, password and other server-related options."); 2030 "Configure the server to play on, your username, password and other server-related options.");
1793 $SETUP_NOTEBOOK->add (Client => client_setup, 2031 $SETUP_NOTEBOOK->add_tab (Client => client_setup,
1794 "Configure various client-specific settings."); 2032 "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, 2033 $SETUP_NOTEBOOK->add_tab (Graphics => graphics_setup,
1798 "Configure the video mode, performance, fonts and other graphical aspects of the game."); 2034 "Configure the video mode, performance, fonts and other graphical aspects of the game.");
1799 $SETUP_NOTEBOOK->add (Audio => audio_setup, 2035 $SETUP_NOTEBOOK->add_tab (Audio => audio_setup,
1800 "Configure the use of audio, sound effects and background music."); 2036 "Configure the use of audio, sound effects and background music.");
1801 $SETUP_NOTEBOOK->add (Keyboard => $SETUP_KEYBOARD = keyboard_setup, 2037 $SETUP_NOTEBOOK->add_tab (Keyboard => $SETUP_KEYBOARD = keyboard_setup,
1802 "Lets you define, edit and delete key bindings." 2038 "Lets you define, edit and delete key bindings."
1803 . "There is a shortcut for making bindings: <b>Control-Insert</b> opens the binding editor " 2039 . "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 " 2040 . "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. " 2041 . "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 " 2042 . "After pressing the combo the binding will be saved automatically and the "
1807 . "binding editor closes"); 2043 . "binding editor closes");
1808 $SETUP_NOTEBOOK->add (Debug => debug_setup, 2044 $SETUP_NOTEBOOK->add_tab (Debug => debug_setup,
1809 "Some debuggin' options. Do not ask."); 2045 "Some debuggin' options. Do not ask.");
1810 2046
1811 $BUTTONBAR = new CFPlus::UI::Buttonbar x => 0, y => 0, z => 200; # put on top 2047 $BUTTONBAR = new CFPlus::UI::Buttonbar x => 0, y => 0, z => 200; # put on top
1812 2048
1813 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Setup", other => $SETUP_DIALOG, 2049 $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."); 2050 tooltip => "Toggles a dialog where you can configure all aspects of this client.");
1815 2051
1816 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW = message_window, 2052 $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."); 2053 tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server.");
1818 2054
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 2055 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 2056
1821 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Playerbook", other => player_window, 2057 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Playerbook", other => player_window,
… …
1841 tooltip => "Terminates the program", 2077 tooltip => "Terminates the program",
1842 on_activate => sub { 2078 on_activate => sub {
1843 if ($CONN) { 2079 if ($CONN) {
1844 open_quit_dialog; 2080 open_quit_dialog;
1845 } else { 2081 } else {
1846 exit; 2082 Event::unloop_all;
1847 } 2083 }
1848 0 2084 0
1849 }, 2085 },
1850 ); 2086 );
1851 2087
1852 $BUTTONBAR->show; 2088 $BUTTONBAR->show;
1853 $SETUP_DIALOG->show; 2089 $SETUP_DIALOG->show;
2090 $MESSAGE_WINDOW->show;
1854 } 2091 }
1855 2092
1856 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]); 2093 $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} 2094}
1977 2095
1978sub video_shutdown { 2096sub video_shutdown {
1979 CFPlus::OpenGL::shutdown; 2097 CFPlus::OpenGL::shutdown;
1980 2098
1981 undef $SDL_ACTIVE; 2099 undef $SDL_ACTIVE;
1982} 2100}
1983 2101
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; 2102my %animate_object;
2047my $animate_timer; 2103my $animate_timer;
2048 2104
2049my $fps = 9; 2105my $fps = 9;
2050 2106
2051my %demo;#d#
2052
2053sub force_refresh { 2107sub force_refresh {
2108 if ($ENV{CFPLUS_DEBUG} & 4) {
2054 $fps = $fps * 0.95 + 1 / (($NOW - $LAST_REFRESH) || 0.1) * 0.05; 2109 $fps = $fps * 0.98 + 1 / (($NOW - $LAST_REFRESH) || 0.1) * 0.02;
2055 debug sprintf "%3.2f", $fps if $ENV{CFPLUS_DEBUG} & 4; 2110 debug sprintf "%3.2f", $fps;
2111 }
2056 2112
2057 $CFPlus::UI::ROOT->draw; 2113 $CFPlus::UI::ROOT->draw;
2058 2114 CFPlus::SDL_GL_SwapBuffers;
2059 $WANT_REFRESH = 0;
2060 $CAN_REFRESH = 0;
2061 $LAST_REFRESH = $NOW; 2115 $LAST_REFRESH = $NOW;
2062 2116 $WANT_REFRESH->stop;
2063 CFPlus::SDL_GL_SwapBuffers;
2064} 2117}
2065 2118
2119$WANT_REFRESH = Event->idle (min => 0.001, max => 0.06, parked => 1, cb => \&force_refresh);
2120
2066my $refresh_watcher = Event->timer (after => 0, hard => 0, interval => 1 / $MAX_FPS, cb => sub { 2121my $input = Event->timer (after => 0, hard => 0, interval => 1 / 50, cb => sub {
2067 $NOW = time; 2122 $NOW = time;
2068 2123
2069 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_) 2124 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_)
2070 for CFPlus::SDL_PollEvent; 2125 for CFPlus::poll_events;
2071 2126
2072 if (%animate_object) { 2127 if (%animate_object) {
2073 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object; 2128 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object;
2074 $WANT_REFRESH++; 2129 $WANT_REFRESH->start;
2075 }
2076
2077 if ($WANT_REFRESH) {
2078 force_refresh;
2079 } else {
2080 $CAN_REFRESH = 1;
2081 } 2130 }
2082}); 2131});
2083 2132
2084sub animation_start { 2133sub animation_start {
2085 my ($widget) = @_; 2134 my ($widget) = @_;
… …
2088 2137
2089sub animation_stop { 2138sub animation_stop {
2090 my ($widget) = @_; 2139 my ($widget) = @_;
2091 delete $animate_object{$widget}; 2140 delete $animate_object{$widget};
2092} 2141}
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 2142
2103%SDL_CB = ( 2143%SDL_CB = (
2104 CFPlus::SDL_QUIT => sub { 2144 CFPlus::SDL_QUIT => sub {
2105 exit; 2145 exit;
2106 }, 2146 },
… …
2109 CFPlus::SDL_VIDEOEXPOSE => sub { 2149 CFPlus::SDL_VIDEOEXPOSE => sub {
2110 CFPlus::UI::full_refresh; 2150 CFPlus::UI::full_refresh;
2111 }, 2151 },
2112 CFPlus::SDL_ACTIVEEVENT => sub { 2152 CFPlus::SDL_ACTIVEEVENT => sub {
2113# not useful, as APPACTIVE include sonly iconified state, not unmapped 2153# not useful, as APPACTIVE include sonly iconified state, not unmapped
2114# printf "active %x %x\n", $_[0]{gain}, $_[0]{state};#d# 2154# printf "active %x %x %x\n", $_[0]{gain}, $_[0]{state}, CFPlus::SDL_GetAppState;#d#
2155# printf "a %x\n", CFPlus::SDL_GetAppState & CFPlus::SDL_APPACTIVE;#d#
2115# printf "A\n" if $_[0]{state} & CFPlus::SDL_APPACTIVE; 2156# printf "A\n" if $_[0]{state} & CFPlus::SDL_APPACTIVE;
2116# printf "K\n" if $_[0]{state} & CFPlus::SDL_APPINPUTFOCUS; 2157# printf "K\n" if $_[0]{state} & CFPlus::SDL_APPINPUTFOCUS;
2117# printf "M\n" if $_[0]{state} & CFPlus::SDL_APPMOUSEFOCUS; 2158# printf "M\n" if $_[0]{state} & CFPlus::SDL_APPMOUSEFOCUS;
2118 }, 2159 },
2119 CFPlus::SDL_KEYDOWN => sub { 2160 CFPlus::SDL_KEYDOWN => sub {
… …
2149 2190
2150 CFPlus::UI::set_layout ($::CFG->{layout}); 2191 CFPlus::UI::set_layout ($::CFG->{layout});
2151 2192
2152 my %DEF_CFG = ( 2193 my %DEF_CFG = (
2153 sdl_mode => 0, 2194 sdl_mode => 0,
2154 width => 640,
2155 height => 480,
2156 fullscreen => 0, 2195 fullscreen => 0,
2157 fast => 0, 2196 fast => 0,
2197 opengl11 => 0,
2158 map_scale => 1, 2198 map_scale => 1,
2159 fow_enable => 1, 2199 fow_enable => 1,
2160 fow_intensity => 0.45, 2200 fow_intensity => 0,
2161 fow_smooth => 0,
2162 map_smoothing => 1, 2201 map_smoothing => 1,
2163 gui_fontsize => 1, 2202 gui_fontsize => 1,
2164 log_fontsize => 0.7, 2203 log_fontsize => 0.7,
2165 gauge_fontsize => 1, 2204 gauge_fontsize => 1,
2166 gauge_size => 0.35, 2205 gauge_size => 0.35,
2167 stat_fontsize => 0.7, 2206 stat_fontsize => 0.7,
2168 mapsize => 100, 2207 mapsize => 100,
2169 say_command => 'chat',
2170 audio_enable => 1, 2208 audio_enable => 1,
2209 effects_enable => 1,
2210 effects_volume => 1,
2171 bgm_enable => 1, 2211 bgm_enable => 1,
2172 bgm_volume => 0.25, 2212 bgm_volume => 0.5,
2173 face_prefetch => 0,
2174 output_sync => 1, 2213 output_sync => 1,
2175 output_count => 1, 2214 output_count => 1,
2176 output_rate => "", 2215 output_rate => "",
2177 pickup => 0, 2216 pickup => 0,
2178 inv_sort => "mtime", 2217 inv_sort => "mtime",
… …
2200 } 2239 }
2201 } 2240 }
2202 2241
2203 sdl_init; 2242 sdl_init;
2204 2243
2205 @SDL_MODES = reverse 2244 @SDL_MODES = CFPlus::SDL_ListModes 8, 8;
2206 grep $_->[0] >= 640 && $_->[1] >= 480, 2245 @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)"; 2246 @SDL_MODES or CFPlus::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)";
2247
2248 @SDL_MODES = sort { $a->[0] * $a->[1] <=> $b->[0] * $b->[1] } @SDL_MODES;
2210 2249
2211 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES; 2250 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES;
2212 2251
2213 { 2252 {
2214 my @fonts = map CFPlus::find_rcfile "fonts/$_", qw( 2253 my @fonts = map CFPlus::find_rcfile "fonts/$_", qw(
… …
2252} 2291}
2253 2292
2254show_tip_of_the_day if $CFG->{show_tips}; 2293show_tip_of_the_day if $CFG->{show_tips};
2255 2294
2256Event::loop; 2295Event::loop;
2296
2297#video_shutdown;
2298#audio_shutdown;
2257#CFPlus::SDL_Quit; 2299CFPlus::SDL_Quit;
2258#CFPlus::_exit 0;
2259
2260END {
2261 CFPlus::SDL_Quit;
2262 CFPlus::DB::Server::stop; 2300CFPlus::DB::Server::stop;
2263}
2264 2301
2265=head1 NAME 2302=head1 NAME
2266 2303
2267cfplus - A Crossfire+ and Crossfire game client 2304cfplus - A Crossfire TRT and Crossfire game client
2268 2305
2269=head1 SYNOPSIS 2306=head1 SYNOPSIS
2270 2307
2271Just run it - no commandline arguments are supported. 2308Just run it - no commandline arguments are supported.
2272 2309
2273=head1 USAGE 2310=head1 USAGE
2274 2311
2275cfplus utilises OpenGL for all UI elements and the game. It is supposed to be used 2312cfplus utilises OpenGL for all UI elements and the game. It is supposed to
2276fullscreen and interactively. 2313be used in fullscreen mode and interactively.
2277 2314
2278=head1 DEBUGGING 2315=head1 DEBUGGING
2279 2316
2280 2317
2281CFPLUS_DEBUG - environment variable 2318CFPLUS_DEBUG - environment variable

Diff Legend

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