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.151 by root, Mon Apr 16 21:12:51 2007 UTC vs.
Revision 1.226 by root, Sat Sep 1 07:22:21 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::Dockable;
92use CFPlus::UI::MessageWindow;
93use CFPlus::UI::ChatView;
67use CFPlus::Pod; 94use CFPlus::Pod;
68use CFPlus::MapWidget; 95use CFPlus::MapWidget;
69use CFPlus::Macro; 96use CFPlus::Macro;
70 97
71$SIG{QUIT} = sub { Carp::cluck "QUIT" }; 98$SIG{QUIT} = sub { Carp::cluck "QUIT" };
… …
88our $CONN; 115our $CONN;
89our $PROFILE; # current profile 116our $PROFILE; # current profile
90our $FAST; # fast, low-quality mode, possibly useful for software-rendering 117our $FAST; # fast, low-quality mode, possibly useful for software-rendering
91 118
92our $WANT_REFRESH; 119our $WANT_REFRESH;
93our $CAN_REFRESH;
94 120
95our @SDL_MODES; 121our @SDL_MODES;
96our $WIDTH; 122our $WIDTH;
97our $HEIGHT; 123our $HEIGHT;
98our $FULLSCREEN; 124our $FULLSCREEN;
… …
102our $FONT_FIXED; 128our $FONT_FIXED;
103 129
104our $MAP; 130our $MAP;
105our $MAPMAP; 131our $MAPMAP;
106our $MAPWIDGET; 132our $MAPWIDGET;
133our $COMPLETER;
107our $BUTTONBAR; 134our $BUTTONBAR;
108our $LOGVIEW;
109our $CONSOLE;
110our $METASERVER; 135our $METASERVER;
111our $LOGIN_BUTTON; 136our $LOGIN_BUTTON;
112our $QUIT_DIALOG; 137our $QUIT_DIALOG;
113our $HOST_ENTRY; 138our $HOST_ENTRY;
114our $FULLSCREEN_ENABLE; 139our $FULLSCREEN_ENABLE;
… …
121our $SETUP_KEYBOARD; 146our $SETUP_KEYBOARD;
122 147
123our $PL_NOTEBOOK; 148our $PL_NOTEBOOK;
124our $PL_WINDOW; 149our $PL_WINDOW;
125 150
151our $MUSIC_PLAYING_WIDGET;
152our $LICENSE_WIDGET;
153
154our $PICKUP_PAGE;
126our $INVENTORY_PAGE; 155our $INVENTORY_PAGE;
127our $STATS_PAGE; 156our $STATS_PAGE;
128our $SKILL_PAGE; 157our $SKILL_PAGE;
129our $SPELL_PAGE; 158our $SPELL_PAGE;
130our $SPELL_LIST; 159our $SPELL_LIST;
… …
136our $STATWIDS; 165our $STATWIDS;
137 166
138our $SDL_ACTIVE; 167our $SDL_ACTIVE;
139our %SDL_CB; 168our %SDL_CB;
140 169
141our $SDL_MIXER;
142our @SOUNDS; # event => file mapping
143our %AUDIO_CHUNKS; # audio files
144
145our $ALT_ENTER_MESSAGE; 170our $ALT_ENTER_MESSAGE;
146our $STATUSBOX; 171our $STATUSBOX;
147our $DEBUG_STATUS; 172our $DEBUG_STATUS;
148 173
149our $INV; 174our $INV;
150our $INVR; 175our $INVR;
151our $INV_RIGHT_HB; 176our $INVR_HB;
152 177
153our $PICKUP_CFG; 178#############################################################################
154
155our $IN_BUILD_MODE;
156our $BUILD_BUTTON;
157 179
158sub status { 180sub status {
159 $STATUSBOX->add (CFPlus::asxml $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]); 181 $STATUSBOX->add (CFPlus::asxml $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]);
160} 182}
161 183
162sub debug { 184sub debug {
163 $DEBUG_STATUS->set_text ($_[0]); 185 $DEBUG_STATUS->set_text ($_[0]);
164} 186}
165 187
166sub message { 188sub message {
189 $MESSAGE_WINDOW->message (@_);
190}
191
192#############################################################################
193#TODO: maybe move into own audio module...
194
195our $SDL_MIXER;
196
197our $MUSIC_DEFAULT = "in_a_heartbeat.ogg";
198our $MUSIC_WANT; # arryref of ambient music we want to play
199our @MUSIC_HAVE; # ambient music we have on disk
200our $MUSIC_START;
201our @MUSIC_JINGLE; # which jingles to play next
202our $MUSIC_PLAYING_DATA;
203our $MUSIC_PLAYING_META;
204our $MUSIC_PLAYER;
205our $MUSIC_RESUME = 30; # resume music when played less than these many seconds before
206
207our %AUDIO_CHUNK; # audio "files"
208our %AUDIO_PLAY; # which audio faces should be played
209
210sub audio_channel_finished {
211 my ($channel) = @_;
212
213# warn "channel $channel finished\n";#d#
214}
215
216sub audio_sound_push($) {
167 my ($para) = @_; 217 my ($face) = @_;
168 218
169 my $time = sprintf "%02d:%02d:%02d", (localtime time)[2,1,0]; 219 $CFG->{effects_enable}
220 or return;
170 221
171 $para->{markup} = "<span foreground='#ffffff'>$time</span> $para->{markup}"; 222 $AUDIO_PLAY{$face}
223 or return;
172 224
173 $LOGVIEW->add_paragraph ($para); 225 if (my $chunk = $AUDIO_CHUNK{$face}) {
174 $LOGVIEW->scroll_to_bottom; 226 for (grep $_->[0] >= Event::time, @{(delete $AUDIO_PLAY{$face}) || []}) {
227 my (undef, $dx, $dy, $vol) = @$_;
228
229 my $channel = CFPlus::Channel::find;
230 $channel->volume ($vol * $CFG->{effects_volume} * 128 / 255);
231 $channel->set_position_r ($dx, $dy, 20);
232 $chunk->play ($channel);
233 }
234 } else {
235 # sound_meta not set means data is in flight either way
236 my $meta = $CONN->{face}[$face]
237 or return;
238
239 $meta->{data}
240 or return;
241
242 # if its a jingle, play it as ambient music
243 if ($meta->{data}{jingle}) {
244 if (delete $AUDIO_PLAY{$face}) { # take the jingle out of the sound queue
245 push @MUSIC_JINGLE, $meta; # push it oto the music/jingle queue
246 &audio_music_push ($face);
247 }
248 } else {
249 # fetch from database
250 CFPlus::DB::get res_data => $meta->{name}, sub {
251 my $rwops = new CFPlus::RW $_[0];
252 my $chunk = new CFPlus::MixChunk $rwops
253 or Carp::confess "sound face " . (JSON::XS::to_json $meta) . " unloadable: " . CFPlus::Mix_GetError;
254 $chunk->volume (($meta->{data}{volume} || 1) * 128);
255 $AUDIO_CHUNK{$face} = $chunk;
256
257 audio_sound_push ($face);
258 };
259 }
260 }
175} 261}
262
263sub audio_sound_play {
264 my ($face, $dx, $dy, $vol) = @_;
265
266 $SDL_MIXER
267 or return;
268 $CFG->{effects_enable}
269 or return;
270
271 my $queue = $AUDIO_PLAY{$face} ||= [];
272 push @$queue, [Event::time + 0.6, $dx, $dy, $vol]; # do not play sound for outdated events
273 audio_sound_push $face
274 unless @$queue > 1;
275}
276
277sub audio_music_set_meta {
278 my ($meta) = @_;
279
280 $MUSIC_PLAYING_META = $meta;
281 $MUSIC_PLAYING_WIDGET->set_markup (
282 "<b>Name</b>: " . (CFPlus::asxml $meta->{data}{name}) . "\n"
283 . "<b>Author</b>: " . (CFPlus::asxml $meta->{data}{author}) . "\n"
284 . "<b>Source</b>: " . (CFPlus::asxml $meta->{data}{source}) . "\n"
285 . "<b>License</b>: " . (CFPlus::asxml $meta->{data}{license})
286 );
287}
288
289sub audio_music_update_volume {
290 return unless $MUSIC_PLAYING_META;
291 my $volume = $MUSIC_PLAYING_META->{data}{volume} || 1;
292 my $base = $MUSIC_PLAYING_META->{data}{jingle} ? 1 : $CFG->{bgm_volume};
293 CFPlus::MixMusic::volume $base * $volume * 128;
294}
295
296sub audio_music_start {
297 my $meta = $MUSIC_PLAYING_META;
298
299 CFPlus::DB::get res_data => $meta->{name}, sub {
300 return unless $SDL_MIXER;
301
302 # music might have changed...
303 $meta eq $MUSIC_PLAYING_META
304 or return &audio_music_start ();
305
306 audio_music_update_volume;
307
308 $MUSIC_PLAYING_DATA = \$_[0];
309
310 my $rwops = $meta->{path}
311 ? new_from_file CFPlus::RW $meta->{path}
312 : new CFPlus::RW $$MUSIC_PLAYING_DATA;
313
314 $MUSIC_PLAYER = new CFPlus::MixMusic $rwops
315 or Carp::confess "music face $meta->{face} unloadable: " . CFPlus::Mix_GetError;
316
317 my $NOW = time;
318
319 if ($MUSIC_PLAYING_META->{stop_time} > $NOW - $MUSIC_RESUME) {
320 my $pos = $MUSIC_PLAYING_META->{stop_pos};
321 $MUSIC_PLAYER->fade_in_pos (0, 700, $pos);
322 $MUSIC_START = time - $pos;
323 } else {
324 $MUSIC_PLAYER->play (0);
325 $MUSIC_START = time;
326 }
327
328 delete $meta->{stop_time};
329 delete $meta->{stop_pos};
330 }
331}
332
333sub audio_music_push {
334 return unless $SDL_MIXER;
335
336 my $fade_out;
337
338 if (@MUSIC_JINGLE) {
339 @MUSIC_HAVE = $MUSIC_JINGLE[0];
340 $fade_out = 333;
341 } else {
342 return unless $CFG->{bgm_enable};
343
344 my @have =
345 grep $_ && $_->{data},
346 map $CONN->{face}[$_],
347 @$MUSIC_WANT;
348
349 # randomize music a bit so that the order is not always the same
350 $_->{stop_time} ||= rand for @have;
351
352 @MUSIC_HAVE = @have
353 if @have;
354
355 # default MUSIC_HAVE == MUSIC_DEFAULT
356 @MUSIC_HAVE = { path => CFPlus::find_rcfile "music/$MUSIC_DEFAULT" } unless @MUSIC_HAVE;
357 $fade_out = 700;
358 }
359
360 # if the currently playing song is acceptable, let it continue
361 return if grep $MUSIC_PLAYING_META == $_, @MUSIC_HAVE;
362
363 my $NOW = time;
364
365 if ($MUSIC_PLAYING_META) {
366 $MUSIC_PLAYING_META->{stop_time} = $NOW;
367 $MUSIC_PLAYING_META->{stop_pos} = $NOW - $MUSIC_START;
368 CFPlus::MixMusic::fade_out $fade_out;
369 } else {
370 # sort by stop time, oldest first
371 @MUSIC_HAVE = sort { $a->{stop_time} <=> $b->{stop_time} } @MUSIC_HAVE;
372
373 # if the most recently-played piece played very recently,
374 # resume it, else choose the oldest piece for rotation.
375 audio_music_set_meta
376 $MUSIC_HAVE[-1]{stop_pos} && $MUSIC_HAVE[-1]{stop_time} > $NOW - $MUSIC_RESUME
377 ? $MUSIC_HAVE[-1]
378 : $MUSIC_HAVE[0];
379
380 audio_music_start;
381 }
382}
383
384sub audio_music_set_ambient {
385 my ($songs) = @_;
386
387 $MUSIC_WANT = $songs;
388 audio_music_push;
389}
390
391sub audio_music_finished {
392 if ($MUSIC_PLAYING_META) {
393 $MUSIC_PLAYING_META->{stop_time} = time;
394 }
395
396 # we compress multiple jingles of the same type
397 shift @MUSIC_JINGLE
398 while @MUSIC_JINGLE && $MUSIC_PLAYING_META == $MUSIC_JINGLE[0];
399
400 $MUSIC_PLAYING_WIDGET->clear;
401
402 undef $MUSIC_PLAYER;
403 undef $MUSIC_PLAYING_META;
404 undef $MUSIC_PLAYING_DATA;
405
406 audio_music_push;
407}
408
409sub audio_init {
410 if ($CFG->{audio_enable}) {
411 $ENV{MIX_EFFECTSMAXSPEED} = 1;
412 $SDL_MIXER = !CFPlus::Mix_OpenAudio;
413
414 unless ($SDL_MIXER) {
415 status "Unable to open sound device: there will be no sound";
416 return;
417 }
418
419 CFPlus::Mix_AllocateChannels 16;
420
421 audio_music_finished;
422 } else {
423 undef $SDL_MIXER;
424 }
425}
426
427sub audio_shutdown {
428 undef $MUSIC_PLAYER;
429 undef $MUSIC_PLAYING_META;
430 undef $MUSIC_PLAYING_DATA;
431
432 $MUSIC_WANT = [];
433 @MUSIC_JINGLE = ();
434 %AUDIO_PLAY = ();
435 %AUDIO_CHUNK = ();
436
437 CFPlus::Mix_CloseAudio if $SDL_MIXER;
438 undef $SDL_MIXER;
439}
440
441#############################################################################
176 442
177sub destroy_query_dialog { 443sub destroy_query_dialog {
178 (delete $_[0]{query_dialog})->destroy 444 (delete $_[0]{query_dialog})->destroy
179 if $_[0]{query_dialog}; 445 if $_[0]{query_dialog};
180} 446}
… …
207 title => "Server Query", 473 title => "Server Query",
208 child => my $vbox = new CFPlus::UI::VBox, 474 child => my $vbox = new CFPlus::UI::VBox,
209 ; 475 ;
210 476
211 my @dialog = my $label = new CFPlus::UI::Label 477 my @dialog = my $label = new CFPlus::UI::Label
212 max_w => $::WIDTH * 0.4, 478 max_w => $::WIDTH * 0.8,
213 ellipsise => 0, 479 ellipsise => 0,
214 text => $prompt; 480 text => $prompt;
215 481
216 if ($flags & CS_QUERY_YESNO) { 482 if ($flags & CS_QUERY_YESNO) {
217 push @dialog, my $hbox = new CFPlus::UI::HBox; 483 push @dialog, my $hbox = new CFPlus::UI::HBox;
… …
234 ); 500 );
235 501
236 $dialog->grab_focus; 502 $dialog->grab_focus;
237 503
238 } elsif ($flags & CS_QUERY_SINGLECHAR) { 504 } elsif ($flags & CS_QUERY_SINGLECHAR) {
239 $dialog->{tooltip} = "#charcreation_focus";
240
241 if ($prompt =~ /Now choose a character|Press any key for the next race/i) { 505 if ($prompt =~ /Now choose a character|Press any key for the next race/i) {
242 $MESSAGE_WINDOW->show; 506 $dialog->{tooltip} = "#charcreation_focus";
243 507
244 unshift @dialog, new CFPlus::UI::Label 508 unshift @dialog, new CFPlus::UI::Label
245 max_w => $::WIDTH * 0.4, 509 max_w => $::WIDTH * 0.8,
246 ellipsise => 0, 510 ellipsise => 0,
247 markup => "\nOr use your keyboard and the text entry below:\n"; 511 markup => "\nOr use your keyboard and the text entry below:\n";
248 512
249 unshift @dialog, my $table = new CFPlus::UI::Table; 513 unshift @dialog, my $table = new CFPlus::UI::Table;
250 514
251 $table->add (0, 0, new CFPlus::UI::Button 515 $table->add_at (0, 0, new CFPlus::UI::Button
252 text => "Next Race", 516 text => "Next Race",
253 on_activate => sub { 517 on_activate => sub {
254 $conn->send ("reply n"); 518 $conn->send ("reply n");
255 destroy_query_dialog $conn; 519 destroy_query_dialog $conn;
256 0 520 0
257 }, 521 },
258 ); 522 );
259 $table->add (2, 0, new CFPlus::UI::Button 523 $table->add_at (2, 0, new CFPlus::UI::Button
260 text => "Accept", 524 text => "Accept",
261 on_activate => sub { 525 on_activate => sub {
262 $conn->send ("reply d"); 526 $conn->send ("reply d");
263 destroy_query_dialog $conn; 527 destroy_query_dialog $conn;
264 0 528 0
265 }, 529 },
266 ); 530 );
267 531
532 if ($conn->{chargen_race_description}) {
533 unshift @dialog, new CFPlus::UI::Label
534 max_w => $::WIDTH * 0.8,
535 ellipsise => 0,
536 markup => "<span foreground='#ccccff'>$conn->{chargen_race_description}</span>",
537 ;
538 }
539
540 unshift @dialog, new CFPlus::UI::Face
541 face => $conn->{player}{face},
542 bg => [.2, .2, .2, 1],
543 min_w => 64,
544 min_h => 64,
545 ;
546
547 if ($conn->{chargen_race_title}) {
548 unshift @dialog, new CFPlus::UI::Label
549 allign => 1,
550 ellipsise => 0,
551 markup => "<span foreground='#ccccff' size='large'>Race: $conn->{chargen_race_title}</span>",
552 ;
553 }
554
268 unshift @dialog, new CFPlus::UI::Label 555 unshift @dialog, new CFPlus::UI::Label
269 max_w => $::WIDTH * 0.4, 556 max_w => $::WIDTH * 0.4,
270 ellipsise => 0, 557 ellipsise => 0,
271 markup => (CFPlus::Pod::section_label ui => "chargen_race"), 558 markup => (CFPlus::Pod::section_label ui => "chargen_race"),
272 ; 559 ;
… …
276 $conn->send ("reply $stat"); 563 $conn->send ("reply $stat");
277 destroy_query_dialog $conn; 564 destroy_query_dialog $conn;
278 return; 565 return;
279 } 566 }
280 567
281 $STATS_PAGE->show;
282 $MESSAGE_WINDOW->hide;
283
284 unshift @dialog, new CFPlus::UI::Label 568 unshift @dialog, new CFPlus::UI::Label
285 max_w => $::WIDTH * 0.4, 569 max_w => $::WIDTH * 0.4,
286 ellipsise => 0, 570 ellipsise => 0,
287 markup => "\nOr use your keyboard and the text entry below:\n"; 571 markup => "\nOr use your keyboard and the text entry below:\n";
288 572
289 unshift @dialog, my $table = new CFPlus::UI::Table; 573 unshift @dialog, my $table = new CFPlus::UI::Table;
290 574
291 # left: re-roll 575 # left: re-roll
292 $table->add (0, 0, new CFPlus::UI::Button 576 $table->add_at (0, 0, new CFPlus::UI::Button
293 text => "Roll Again", 577 text => "Roll Again",
294 on_activate => sub { 578 on_activate => sub {
295 $conn->send ("reply y"); 579 $conn->send ("reply y");
296 destroy_query_dialog $conn; 580 destroy_query_dialog $conn;
297 0 581 0
… …
311 [6 => "Pow", "Power ($conn->{stat}{+CS_STAT_POW})"], 595 [6 => "Pow", "Power ($conn->{stat}{+CS_STAT_POW})"],
312 [7 => "Cha", "Charisma ($conn->{stat}{+CS_STAT_CHA})"], 596 [7 => "Cha", "Charisma ($conn->{stat}{+CS_STAT_CHA})"],
313 ], 597 ],
314 ), 1 .. 2; 598 ), 1 .. 2;
315 599
316 $table->add (2, 0, new CFPlus::UI::Button 600 $table->add_at (2, 0, new CFPlus::UI::Button
317 text => "Swap Stats", 601 text => "Swap Stats",
318 on_activate => sub { 602 on_activate => sub {
319 $conn->{stat_change_with} = $sw2->{value}; 603 $conn->{stat_change_with} = $sw2->{value};
320 $conn->send ("reply $sw1->{value}"); 604 $conn->send ("reply $sw1->{value}");
321 destroy_query_dialog $conn; 605 destroy_query_dialog $conn;
322 0 606 0
323 }, 607 },
324 ); 608 );
325 $table->add (2, 1, new CFPlus::UI::HBox children => [$sw1, $sw2]); 609 $table->add_at (2, 1, new CFPlus::UI::HBox children => [$sw1, $sw2]);
326 610
327 # right: accept 611 # right: accept
328 $table->add (4, 0, new CFPlus::UI::Button 612 $table->add_at (4, 0, new CFPlus::UI::Button
329 text => "Accept", 613 text => "Accept",
330 on_activate => sub { 614 on_activate => sub {
331 $conn->send ("reply n"); 615 $conn->send ("reply n");
332 $STATS_PAGE->hide; 616 $STATS_PAGE->hide;
333 destroy_query_dialog $conn; 617 destroy_query_dialog $conn;
… …
414 maph => $mapsize, 698 maph => $mapsize,
415 699
416 client => "cfplus $CFPlus::VERSION $] $^O", 700 client => "cfplus $CFPlus::VERSION $] $^O",
417 701
418 map_widget => $MAPWIDGET, 702 map_widget => $MAPWIDGET,
419 logview => $LOGVIEW,
420 statusbox => $STATUSBOX, 703 statusbox => $STATUSBOX,
421 map => $MAP, 704 map => $MAP,
422 mapmap => $MAPMAP, 705 mapmap => $MAPMAP,
423 query => \&server_query, 706 query => \&server_query,
424 707
425 setup_req => { 708 setup_req => {
426 smoothing => $CFG->{map_smoothing}*1, 709 smoothing => $CFG->{map_smoothing}*1,
427 },
428
429 sound_play => sub {
430 my ($x, $y, $soundnum, $type) = @_;
431
432 $SDL_MIXER
433 or return;
434
435 my $chunk = $AUDIO_CHUNKS{$SOUNDS[$soundnum]}
436 or return;
437
438 $chunk->play;
439 }, 710 },
440 }; 711 };
441 712
442 if ($CONN) { 713 if ($CONN) {
443 CFPlus::lowdelay fileno $CONN->{fh}; 714 CFPlus::lowdelay fileno $CONN->{fh};
… …
453 $LOGIN_BUTTON->set_text ("Login"); 724 $LOGIN_BUTTON->set_text ("Login");
454 $SETUP_NOTEBOOK->set_current_page ($SETUP_SERVER); 725 $SETUP_NOTEBOOK->set_current_page ($SETUP_SERVER);
455 $SETUP_DIALOG->show; 726 $SETUP_DIALOG->show;
456 $PL_WINDOW->hide; 727 $PL_WINDOW->hide;
457 $SPELL_LIST->clear_spells; 728 $SPELL_LIST->clear_spells;
729 $CFPlus::UI::ROOT->emit (stop_game => ! ! $CONN);
730
731 &audio_music_set_ambient ([]);
458 732
459 return unless $CONN; 733 return unless $CONN;
460 734
461 status "connection closed"; 735 status "connection closed";
462 736
… …
472 746
473 $vbox->add (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]); 747 $vbox->add (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]);
474 748
475 my $row = 0; 749 my $row = 0;
476 750
477 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "OpenGL Info"); 751 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "OpenGL Info");
478 $table->add (1, $row++, new CFPlus::UI::Label valign => 0, fontsize => 0.8, text => CFPlus::OpenGL::gl_vendor . ", " . CFPlus::OpenGL::gl_version, 752 $table->add_at (1, $row++, new CFPlus::UI::Label valign => 0, fontsize => 0.8, text => CFPlus::OpenGL::gl_vendor . ", " . CFPlus::OpenGL::gl_version,
479 can_events => 1, 753 can_events => 1,
480 tooltip => "<tt><span size='8192'>" . (CFPlus::OpenGL::gl_extensions) . "</span></tt>"); 754 tooltip => "<tt><span size='8192'>" . (CFPlus::OpenGL::gl_extensions) . "</span></tt>");
481 755
756 my $vidmode_tooltip =
757 "<b>Video Mode.</b> The video mode to use for fullscreen (and the window size for windowed operation). "
758 . "The format is <i>width</i> x <i>height</i> \@ <i>depth-per-channel</i> + <i>alpha-channel</i>.";
759
482 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Video Mode"); 760 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Video Mode");
483 $table->add (1, $row++, my $hbox = new CFPlus::UI::HBox); 761 $table->add_at (1, $row++, my $hbox = new CFPlus::UI::HBox);
484 762
763 $hbox->add (my $mode_slider = new CFPlus::UI::Slider
485 $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]); 764 force_w => $WIDTH * 0.1, expand => 1, range => [$CFG->{sdl_mode}, 0, $#SDL_MODES, 0, 1],
486 $hbox->add (my $mode_label = new CFPlus::UI::Label align => 0, valign => 0, height => 0.8, template => "9999x9999"); 765 tooltip => $vidmode_tooltip);
766 $hbox->add (my $mode_label = new CFPlus::UI::Label
767 align => 0, valign => 0, height => 0.8, template => "9999x9999@9+9",
768 can_events => 1, tooltip => $vidmode_tooltip);
487 769
488 $mode_slider->connect (changed => sub { 770 $mode_slider->connect (changed => sub {
489 my ($self, $value) = @_; 771 my ($self, $value) = @_;
490 772
491 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value; 773 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value;
492 $mode_label->set_text (sprintf "%dx%d", @{$SDL_MODES[$value]}); 774 $mode_label->set_text (sprintf '%dx%d@%d+%d', @{$SDL_MODES[$value]});
493 }); 775 });
494 $mode_slider->emit (changed => $mode_slider->{range}[0]); 776 $mode_slider->emit (changed => $mode_slider->{range}[0]);
495 777
496 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fullscreen"); 778 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fullscreen");
497 $table->add (1, $row++, $FULLSCREEN_ENABLE = new CFPlus::UI::CheckBox 779 $table->add_at (1, $row++, $FULLSCREEN_ENABLE = new CFPlus::UI::CheckBox
498 state => $CFG->{fullscreen}, 780 state => $CFG->{fullscreen},
499 tooltip => "Bring the client into fullscreen mode.", 781 tooltip => "Bring the client into fullscreen mode.",
500 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 } 782 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 }
501 ); 783 );
502 784
785 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Force OpenGL 1.1");
786 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
787 state => $CFG->{force_opengl11},
788 tooltip => "Limit CFPlus to use OpenGL 1.1 features only. This will normally result in "
789 . "higher memory usage and slower performance. It will, however, help tremendously on "
790 . "cards that claim to support a feature but fall back to software rendering. "
791 . "Nvidia Geforce FX cards are known to claim features the hardware doesn't support, "
792 . "but cards and drivers from other vendors (ATI) are often just as bad. <b>If you "
793 . "experience extremely low framerates and your card should do better, try this option.</b>",
794 on_changed => sub { my ($self, $value) = @_; $CFG->{force_opengl11} = $value; 0 }
795 );
796
797 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Compress Textures");
798 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
799 state => $CFG->{texture_compression},
800 tooltip => "Use texture compression. Normally this will not reduce visual quality noticable but "
801 . "will save a lot of memory and increase performance. The compression algorithm "
802 . "can differ form card to card, so your mileage may vary. This setting is ignored in "
803 . "forced OpenGL 1.1 mode.",
804 on_changed => sub { my ($self, $value) = @_; $CFG->{texture_compression} = $value; 0 }
805 );
806
503 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fast & Ugly"); 807 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fast & Ugly");
504 $table->add (1, $row++, new CFPlus::UI::CheckBox 808 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
505 state => $CFG->{fast}, 809 state => $CFG->{fast},
506 tooltip => "Lower the visual quality considerably to speed up rendering.", 810 tooltip => "Lower the visual quality considerably to speed up rendering.",
507 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 } 811 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 }
508 ); 812 );
509 813
510 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "GUI Fontsize"); 814 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "GUI Fontsize");
511 $table->add (1, $row++, new CFPlus::UI::Slider 815 $table->add_at (1, $row++, new CFPlus::UI::Slider
512 range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1], 816 range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1],
513 tooltip => "The base font size used by most GUI elements that do not have their own setting.", 817 tooltip => "The base font size used by most GUI elements that do not have their own setting.",
514 on_changed => sub { $CFG->{gui_fontsize} = $_[1]; 0 }, 818 on_changed => sub { $CFG->{gui_fontsize} = $_[1]; 0 },
515 ); 819 );
516 820
517 $table->add (1, $row++, new CFPlus::UI::Button 821 $table->add_at (1, $row++, new CFPlus::UI::Button
518 expand => 1, align => 0, text => "Apply", 822 expand => 1, align => 0, text => "Apply",
519 tooltip => "Apply the video settings above.", 823 tooltip => "Apply the video settings above.",
520 on_activate => sub { 824 on_activate => sub {
521 video_shutdown (); 825 video_shutdown ();
522 video_init (); 826 video_init ();
523 0 827 0
524 } 828 }
525 ); 829 );
526 830
527 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Scale"); 831 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Scale");
528 $table->add (1, $row++, new CFPlus::UI::Slider 832 $table->add_at (1, $row++, new CFPlus::UI::Slider
529 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1], 833 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1],
530 tooltip => "Enlarge or shrink the displayed map. Changes are instant.", 834 tooltip => "Enlarge or shrink the displayed map. Changes are instant.",
531 on_changed => sub { my ($self, $value) = @_; $CFG->{map_scale} = 2 ** $value; 0 } 835 on_changed => sub { my ($self, $value) = @_; $CFG->{map_scale} = 2 ** $value; 0 }
532 ); 836 );
533 837
534 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Smoothing"); 838 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Smoothing");
535 $table->add (1, $row++, new CFPlus::UI::CheckBox 839 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
536 state => $CFG->{map_smoothing}, 840 state => $CFG->{map_smoothing},
537 tooltip => "<b>Map Smoothing</b> tries to make tile borders less square. " 841 tooltip => "<b>Map Smoothing</b> tries to make tile borders less square. "
538 . "This increases load on the graphics subsystem and works only with 2.x servers. " 842 . "This increases load on the graphics subsystem and works only with TRT servers. "
539 . "Changes take effect at next connection only.", 843 . "Changes take effect at next login only.",
540 on_changed => sub { my ($self, $value) = @_; $CFG->{map_smoothing} = $value; 0 } 844 on_changed => sub { my ($self, $value) = @_; $CFG->{map_smoothing} = $value; 0 }
541 ); 845 );
542 846
543 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fog of War"); 847 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fog of War");
544 $table->add (1, $row++, new CFPlus::UI::CheckBox 848 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
545 state => $CFG->{fow_enable}, 849 state => $CFG->{fow_enable},
546 tooltip => "<b>Fog-of-War</b> marks areas that cannot be seen by the player. Changes are instant.", 850 tooltip => "<b>Fog-of-War</b> marks areas that cannot be seen by the player. Changes are instant.",
547 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; 0 } 851 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; 0 }
548 ); 852 );
549 853
550 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "FoW Intensity"); 854 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "FoW Intensity");
551 $table->add (1, $row++, new CFPlus::UI::Slider 855 $table->add_at (1, $row++, new CFPlus::UI::Slider
552 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256], 856 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256],
553 tooltip => "<b>Fog of War Lightness.</b> The higher the intensity, the lighter the Fog-of-War color. Changes are instant.", 857 tooltip => "<b>Fog of War Lightness.</b> The higher the intensity, the lighter the Fog-of-War color. Changes are instant.",
554 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_intensity} = $value; 0 } 858 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_intensity} = $value; 0 }
555 ); 859 );
556 860
557 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "FoW Smooth");
558 $table->add (1, $row++, new CFPlus::UI::CheckBox
559 state => $CFG->{fow_smooth},
560 tooltip => "Smooth the Fog-of-War a bit to make it more realistic. Changes are instant.",
561 on_changed => sub {
562 my ($self, $value) = @_;
563 $CFG->{fow_smooth} = $value;
564 status "Fog of War smoothing requires OpenGL 1.2 or higher" if $CFPlus::OpenGL::GL_VERSION < 1.2;
565 0
566 }
567 );
568
569 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Message Fontsize"); 861 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Message Fontsize");
570 $table->add (1, $row++, new CFPlus::UI::Slider 862 $table->add_at (1, $row++, new CFPlus::UI::Slider
571 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1], 863 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1],
572 tooltip => "The font size used by the <b>message/server log</b> window only. Changes are instant.", 864 tooltip => "The font size used by the <b>message/server log</b> window only. Changes are instant, "
865 . "but you still need to press apply to correctly re-layout the widget.",
573 on_changed => sub { $LOGVIEW->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 }, 866 on_changed => sub { $MESSAGE_WINDOW->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 },
574 ); 867 );
575 868
576 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Gauge fontsize"); 869 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Gauge fontsize");
577 $table->add (1, $row++, new CFPlus::UI::Slider 870 $table->add_at (1, $row++, new CFPlus::UI::Slider
578 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1], 871 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1],
579 tooltip => "Adjusts the fontsize of the gauges at the bottom right. Changes are instant.", 872 tooltip => "Adjusts the fontsize of the gauges at the bottom right. Changes are instant.",
580 on_changed => sub { 873 on_changed => sub {
581 $CFG->{gauge_fontsize} = $_[1]; 874 $CFG->{gauge_fontsize} = $_[1];
582 &set_gauge_window_fontsize; 875 &set_gauge_window_fontsize;
583 0 876 0
584 } 877 }
585 ); 878 );
586 879
587 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Gauge size"); 880 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Gauge size");
588 $table->add (1, $row++, new CFPlus::UI::Slider 881 $table->add_at (1, $row++, new CFPlus::UI::Slider
589 range => [$CFG->{gauge_size}, 0.2, 0.8], 882 range => [$CFG->{gauge_size}, 0.2, 0.8],
590 tooltip => "Adjust the size of the stats gauges at the bottom right. Changes are instant.", 883 tooltip => "Adjust the size of the stats gauges at the bottom right. Changes are instant.",
591 on_changed => sub { 884 on_changed => sub {
592 $CFG->{gauge_size} = $_[1]; 885 $CFG->{gauge_size} = $_[1];
593 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size}); 886 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size});
… …
599} 892}
600 893
601sub audio_setup { 894sub audio_setup {
602 my $vbox = new CFPlus::UI::VBox; 895 my $vbox = new CFPlus::UI::VBox;
603 896
604 $vbox->add (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]); 897 $vbox->add (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 0, 1]);
605 898
606 my $row = 0; 899 my $row = 0;
607 900
608 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Audio Enable"); 901 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Audio Enable");
609 $table->add (1, $row++, new CFPlus::UI::CheckBox 902 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
610 state => $CFG->{audio_enable}, 903 state => $CFG->{audio_enable},
611 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.", 904 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.",
612 on_changed => sub { $CFG->{audio_enable} = $_[1]; 0 } 905 on_changed => sub { $CFG->{audio_enable} = $_[1]; 0 }
613 ); 906 );
614# $table->add (0, 9, new CFPlus::UI::Label valign => 0, align => 1, text => "Effects Volume"); 907# $table->add_at (0, 9, new CFPlus::UI::Label valign => 0, align => 1, text => "Effects Volume");
615# $table->add (1, 8, new CFPlus::UI::Slider range => [$CFG->{effects_volume}, 0, 128, 1], on_changed => sub { 908# $table->add_at (1, 8, new CFPlus::UI::Slider range => [$CFG->{effects_volume}, 0, 128, 1], on_changed => sub {
616# $CFG->{effects_volume} = $_[1]; 909# $CFG->{effects_volume} = $_[1];
617# }); 910# });
911
912 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Sound Effects");
913 $table->add_at (1, $row, new CFPlus::UI::CheckBox
914 expand => 1, state => $CFG->{effects_enable},
915 tooltip => "If enabled, sound effects are enabled. If disabled, no sound effects will be played.",
916 on_changed => sub {
917 $CFG->{effects_enable} = $_[1];
918 $CONN->update_fx_want if $CONN;
919 0
920 }
921 );
922 $table->add_at (2, $row++, new CFPlus::UI::Slider
923 expand => 1, range => [$CFG->{effects_volume}, 0, 1, 0, 1/128],
924 tooltip => "The relative volume of sound effects. Best audio quality is achieved if this "
925 . "is set highest (rightmost) and you use your operating system volume setting. Changes are instant.",
926 on_changed => sub { $CFG->{effects_volume} = $_[1]; 0 }
927 );
928
618 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Background Music"); 929 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Background Music");
619 $table->add (1, $row++, my $hbox = new CFPlus::UI::HBox);
620 $hbox->add (new CFPlus::UI::CheckBox 930 $table->add_at (1, $row, new CFPlus::UI::CheckBox
621 expand => 1, state => $CFG->{bgm_enable}, 931 expand => 1, state => $CFG->{bgm_enable},
622 tooltip => "If enabled, playing of background music is enabled. If disabled, no background music will be played.", 932 tooltip => "If enabled, playing of background music is enabled. If disabled, no background music will be played.",
623 on_changed => sub { $CFG->{bgm_enable} = $_[1]; 0 } 933 on_changed => sub {
934 $CFG->{bgm_enable} = $_[1];
935 $CONN->update_fx_want if $CONN;
936 audio_music_push;
937 0
938 }
624 ); 939 );
625 $hbox->add (new CFPlus::UI::Slider 940 $table->add_at (2, $row++, new CFPlus::UI::Slider
626 expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128], 941 expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128],
627 tooltip => "The volume of the background music. Changes are instant.", 942 tooltip => "The volume of the background music. Changes are instant.",
628 on_changed => sub { $CFG->{bgm_volume} = $_[1]; CFPlus::MixMusic::volume $_[1] * 128; 0 } 943 on_changed => sub { $CFG->{bgm_volume} = $_[1]; audio_music_update_volume; 0 }
629 ); 944 );
630 945
631 $table->add (1, $row++, new CFPlus::UI::Button 946 $table->add_at (1, $row++, new CFPlus::UI::Button
632 expand => 1, align => 0, text => "Apply", 947 c_colspan => 2, expand => 1, align => 0, text => "Apply",
633 tooltip => "Apply the audio settings", 948 tooltip => "Apply the audio settings",
634 on_activate => sub { 949 on_activate => sub {
635 audio_shutdown (); 950 audio_shutdown ();
636 audio_init (); 951 audio_init ();
637 0 952 0
… …
679 $hb->add (my $hg = new CFPlus::UI::Gauge type => 'hp', tooltip => "#stat_health"); 994 $hb->add (my $hg = new CFPlus::UI::Gauge type => 'hp', tooltip => "#stat_health");
680 $hb->add (my $mg = new CFPlus::UI::Gauge type => 'mana', tooltip => "#stat_mana"); 995 $hb->add (my $mg = new CFPlus::UI::Gauge type => 'mana', tooltip => "#stat_mana");
681 $hb->add (my $gg = new CFPlus::UI::Gauge type => 'grace', tooltip => "#stat_grace"); 996 $hb->add (my $gg = new CFPlus::UI::Gauge type => 'grace', tooltip => "#stat_grace");
682 $hb->add (my $fg = new CFPlus::UI::Gauge type => 'food', tooltip => "#stat_food"); 997 $hb->add (my $fg = new CFPlus::UI::Gauge type => 'food', tooltip => "#stat_food");
683 998
684 $vbox->add (my $exp = new CFPlus::UI::Label valign => 0, align => 1, can_hover => 1, can_events => 1, tooltip => "#stat_exp"); 999 $vbox->add (my $exp = new CFPlus::UI::Label valign => 0, align => 1, can_hover => 1, can_events => 1, tooltip => "#stat_exp");
1000 $vbox->add (my $prg = new CFPlus::UI::ExperienceProgress);
1001 $vbox->add (my $sklprg = new CFPlus::UI::ExperienceProgress);
685 $vbox->add (my $rng = new CFPlus::UI::Label valign => 0, align => 1, can_hover => 1, can_events => 1, tooltip => "#stat_ranged"); 1002 $vbox->add (my $rng = new CFPlus::UI::Label valign => 0, align => 1, can_hover => 1, can_events => 1, tooltip => "#stat_ranged");
686 1003
687 $GAUGES = { 1004 $GAUGES = {
1005 exp => $exp, prg => $prg, sklprg => $sklprg,
688 exp => $exp, win => $win, range => $rng, 1006 win => $win, range => $rng,
689 food => $fg, mana => $mg, hp => $hg, grace => $gg 1007 hp => $hg, mana => $mg, grace => $gg, food => $fg,
690 }; 1008 };
691 1009
692 &set_gauge_window_fontsize; 1010 &set_gauge_window_fontsize;
693 1011
694 $win 1012 $win
695} 1013}
696 1014
697sub debug_setup { 1015sub debug_setup {
698 my $table = new CFPlus::UI::Table; 1016 my $table = new CFPlus::UI::Table;
699 1017
700 $table->add (0, 0, new CFPlus::UI::Label text => "Widget Borders"); 1018 $table->add_at (0, 0, new CFPlus::UI::Label text => "Widget Borders");
701 $table->add (1, 0, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 1; 0 }); 1019 $table->add_at (1, 0, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 1; 0 });
702 $table->add (0, 1, new CFPlus::UI::Label text => "Tooltip Widget Info"); 1020 $table->add_at (0, 1, new CFPlus::UI::Label text => "Tooltip Widget Info");
703 $table->add (1, 1, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 2; 0 }); 1021 $table->add_at (1, 1, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 2; 0 });
704 $table->add (0, 2, new CFPlus::UI::Label text => "Show FPS"); 1022 $table->add_at (0, 2, new CFPlus::UI::Label text => "Show FPS");
705 $table->add (1, 2, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 4; 0 }); 1023 $table->add_at (1, 2, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 4; 0 });
706 $table->add (0, 3, new CFPlus::UI::Label text => "Suppress Tooltips"); 1024 $table->add_at (0, 3, new CFPlus::UI::Label text => "Suppress Tooltips");
707 $table->add (1, 3, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 8; 0 }); 1025 $table->add_at (1, 3, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 8; 0 });
708 $table->add (0, 4, new CFPlus::UI::Button text => "die on click(tm)", on_activate => sub { die "violator" } ); 1026 $table->add_at (0, 4, new CFPlus::UI::Button text => "die on click(tm)", on_activate => sub { &CFPlus::debug() } );
709 1027
710 my @default_smooth = (0.05, 0.13, 0.05, 0.13, 0.30, 0.13, 0.05, 0.13, 0.05);
711
712 for my $x (0..2) {
713 for my $y (0 .. 2) {
714 $table->add ($x + 3, $y,
715 new CFPlus::UI::Entry
716 text => $default_smooth[$x * 3 + $y],
717 on_changed => sub { $MAP->{smooth_matrix}[$x * 3 + $y] = $_[1] if $MAP; 0 },
718 );
719 }
720 }
721
722 $table->add (0, 5, new CFPlus::UI::TextEdit text => "line1\0152\0153");#d# 1028 $table->add_at (0, 5, new CFPlus::UI::TextEdit text => "line1\0152\0153");#d#
1029
1030 $table->add_at (7,7, my $t = new CFPlus::UI::Table expand => 0);
1031 $t->add_at (0,0, new CFPlus::UI::Label text => "a a a a", c_rowspan => 1, c_colspan => 2);
1032 $t->add_at (2,0, new CFPlus::UI::Label text => "b\nb", c_rowspan => 2, c_colspan => 1);
1033 $t->add_at (1,2, new CFPlus::UI::Label text => "c c c c", c_rowspan => 1, c_colspan => 2);
1034 $t->add_at (0,1, new CFPlus::UI::Label text => "d\nd", c_rowspan => 2, c_colspan => 1);
1035 $t->add_at (1,1, new CFPlus::UI::Label text => "e");
1036
1037 $table->add_at (7, 6, my $c = new CFPlus::UI::Canvas);
1038
1039 $c->add_items ({
1040 type => "line_loop",
1041 color => [0, 1, 0],
1042 width => 9,
1043 coord_mode => "abs",
1044 coord => [[10, 5], [5, 50], [20, 5], [5, 60]],
1045 });
1046
1047 $c->add_items ({
1048 type => "lines",
1049 color => [1, 1, 0],
1050 width => 2,
1051 coord_mode => "rel",
1052 coord => [[0,0], [1,1], [1,0], [0,1]],
1053 });
1054
1055 $c->add_items ({
1056 type => "polygon",
1057 color => [0, 0.43, 0],
1058 width => 2,
1059 coord_mode => "rel",
1060 coord => [[0,0.2], [1,.4], [1,.6], [0,.8]],
1061 });
723 1062
724 $table 1063 $table
725} 1064}
726 1065
727sub stats_window { 1066sub stats_window {
… …
775 [2, 4, st_spd => "Spd", 10.54], 1114 [2, 4, st_spd => "Spd", 10.54],
776 [2, 5, st_wspd => "WSp", 10.54], 1115 [2, 5, st_wspd => "WSp", 10.54],
777 ) { 1116 ) {
778 my ($col, $row, $id, $label, $template) = @$_; 1117 my ($col, $row, $id, $label, $template) = @$_;
779 1118
780 $tbl->add ($col , $row, $STATWIDS->{$id} = new CFPlus::UI::Label 1119 $tbl->add_at ($col , $row, $STATWIDS->{$id} = new CFPlus::UI::Label
781 font => $FONT_FIXED, can_hover => 1, can_events => 1, valign => 0, 1120 font => $FONT_FIXED, can_hover => 1, can_events => 1, valign => 0,
782 align => +1, template => $template, tooltip => "#stat_$label"); 1121 align => +1, template => $template, tooltip => "#stat_$label");
783 $tbl->add ($col + 1, $row, $STATWIDS->{"$id\_lbl"} = new CFPlus::UI::Label 1122 $tbl->add_at ($col + 1, $row, $STATWIDS->{"$id\_lbl"} = new CFPlus::UI::Label
784 font => $FONT_FIXED, can_hover => 1, can_events => 1, fg => $color2, valign => 0, 1123 font => $FONT_FIXED, can_hover => 1, can_events => 1, fg => $color2, valign => 0,
785 align => -1, text => $label, tooltip => "#stat_$label"); 1124 align => -1, text => $label, tooltip => "#stat_$label");
786 } 1125 }
787 1126
788 $vb->add (new CFPlus::UI::FancyFrame 1127 $vb->add (new CFPlus::UI::FancyFrame
… …
829 cold => ["Cold", 1168 cold => ["Cold",
830 "<b>Cold</b> (this is your resistance against cold spells like icestorm, snowstorm, ...)"], 1169 "<b>Cold</b> (this is your resistance against cold spells like icestorm, snowstorm, ...)"],
831 ghit => ["Ghost hit", 1170 ghit => ["Ghost hit",
832 "<b>Ghost hit</b> (special attack used by ghosts and ghost-like beings)"], 1171 "<b>Ghost hit</b> (special attack used by ghosts and ghost-like beings)"],
833 ); 1172 );
1173
834 for (qw/slow holyw conf fire depl magic 1174 for (qw/slow holyw conf fire depl magic
835 drain acid pois para deat phys 1175 drain acid pois para deat phys
836 blind fear tund elec cold ghit/) 1176 blind fear tund elec cold ghit/)
837 { 1177 {
838 $tbl2->add ($col, $row, 1178 $tbl2->add_at ($col, $row,
839 $STATWIDS->{"res_$_"} = 1179 $STATWIDS->{"res_$_"} =
840 new CFPlus::UI::Label 1180 new CFPlus::UI::Label
841 font => $FONT_FIXED, 1181 font => $FONT_FIXED,
842 template => "-100%", 1182 template => "-100%",
843 align => +1, 1183 align => +1,
844 valign => 0, 1184 valign => 0,
845 can_events => 1, 1185 can_events => 1,
846 can_hover => 1, 1186 can_hover => 1,
847 tooltip => $resist_names{$_}->[1], 1187 tooltip => $resist_names{$_}->[1],
848 ); 1188 );
849 $tbl2->add ($col + 1, $row, new CFPlus::UI::Image 1189 $tbl2->add_at ($col + 1, $row, new CFPlus::UI::Image
850 font => $FONT_FIXED, 1190 font => $FONT_FIXED,
851 can_hover => 1, 1191 can_hover => 1,
852 can_events => 1, 1192 can_events => 1,
853 path => "ui/resist/resist_$_.png", 1193 path => "ui/resist/resist_$_.png",
854 tooltip => $resist_names{$_}->[1], 1194 tooltip => $resist_names{$_}->[1],
855 ); 1195 );
856 $tbl2->add ($col + 2, $row, new CFPlus::UI::Label 1196 $tbl2->add_at ($col + 2, $row, new CFPlus::UI::Label
857 text => $resist_names{$_}->[0], 1197 text => $resist_names{$_}->[0],
858 font => $FONT_FIXED, 1198 font => $FONT_FIXED,
859 can_hover => 1, 1199 can_hover => 1,
860 can_events => 1, 1200 can_events => 1,
861 tooltip => $resist_names{$_}->[1], 1201 tooltip => $resist_names{$_}->[1],
… …
873 $r 1213 $r
874} 1214}
875 1215
876sub skill_window { 1216sub skill_window {
877 my $sw = new CFPlus::UI::ScrolledWindow (expand => 1); 1217 my $sw = new CFPlus::UI::ScrolledWindow (expand => 1);
1218
878 $sw->add ($STATWIDS->{skill_tbl} = new CFPlus::UI::Table expand => 1, col_expand => [0, 0, 1, 0, 0, 1]); 1219 $sw->add ($STATWIDS->{skill_tbl} = new CFPlus::UI::Table expand => 1, col_expand => [0, 0, 1, .1, 0, 0, 1, .1]);
1220
879 $sw 1221 $sw
880} 1222}
881 1223
882sub formsep($) { 1224sub formsep($) {
883 scalar reverse join ",", unpack "(A3)*", reverse $_[0] * 1 1225 scalar reverse join ",", unpack "(A3)*", reverse $_[0] * 1
… …
894 return if $METASERVER_ATIME > time; 1236 return if $METASERVER_ATIME > time;
895 $METASERVER_ATIME = time + 60; 1237 $METASERVER_ATIME = time + 60;
896 1238
897 my $table = $METASERVER->{table}; 1239 my $table = $METASERVER->{table};
898 $table->clear; 1240 $table->clear;
899 $table->add (0, 0, my $label = new CFPlus::UI::Label max_w => $WIDTH * 0.8, text => "fetching server list..."); 1241 $table->add_at (0, 0, my $label = new CFPlus::UI::Label max_w => $WIDTH * 0.8, text => "fetching server list...");
900 1242
901 my $ok = 0; 1243 my $ok = 0;
902 1244
903 CFPlus::background { 1245 CFPlus::background {
904 my $ua = CFPlus::lwp_useragent; 1246 my $ua = CFPlus::lwp_useragent;
… …
915 "The time this server has been running without being restarted.", 1257 "The time this server has been running without being restarted.",
916 "The server software version - a '+' indicates a Crossfire+ server.", 1258 "The server software version - a '+' indicates a Crossfire+ server.",
917 "Short information about this server provided by its admins.", 1259 "Short information about this server provided by its admins.",
918 ); 1260 );
919 my @col = qw(#Users Host Uptime Version Description); 1261 my @col = qw(#Users Host Uptime Version Description);
920 $table->add ($_, 0, new CFPlus::UI::Label 1262 $table->add_at ($_, 0, new CFPlus::UI::Label
921 can_hover => 1, can_events => 1, 1263 can_hover => 1, can_events => 1,
922 align => 0, fg => [1, 1, 0], 1264 align => 0, fg => [1, 1, 0],
923 text => $col[$_], tooltip => $tip[$_]) 1265 text => $col[$_], tooltip => $tip[$_])
924 for 0 .. $#col; 1266 for 0 .. $#col;
925 1267
… …
947 1289
948 $m = [$users, $host, $uptime, $version, $desc]; 1290 $m = [$users, $host, $uptime, $version, $desc];
949 1291
950 $y++; 1292 $y++;
951 1293
952 $table->add (scalar @$m, $y, new CFPlus::UI::VBox children => [ 1294 $table->add_at (scalar @$m, $y, new CFPlus::UI::VBox children => [
953 (new CFPlus::UI::Button 1295 (new CFPlus::UI::Button
954 text => "Use", 1296 text => "Use",
955 tooltip => "Put this server into the <b>Host:Port</b> field", 1297 tooltip => "Put this server into the <b>Host:Port</b> field",
956 on_activate => sub { 1298 on_activate => sub {
957 $HOST_ENTRY->set_text ($CFG->{profile}{default}{host} = $host); 1299 $HOST_ENTRY->set_text ($CFG->{profile}{default}{host} = $host);
… …
960 }, 1302 },
961 ), 1303 ),
962 (new CFPlus::UI::Empty expand => 1), 1304 (new CFPlus::UI::Empty expand => 1),
963 ]); 1305 ]);
964 1306
965 $table->add ($_, $y, new CFPlus::UI::Label 1307 $table->add_at ($_, $y, new CFPlus::UI::Label
966 max_w => $::WIDTH * 0.4, 1308 max_w => $::WIDTH * 0.4,
967 ellipsise => 0, 1309 ellipsise => 0,
968 align => $align[$_], 1310 align => $align[$_],
969 text => $m->[$_], 1311 text => $m->[$_],
970 tooltip => $tip[$_], 1312 tooltip => $tip[$_],
… …
1011 1353
1012 $vbox->add (new CFPlus::UI::FancyFrame 1354 $vbox->add (new CFPlus::UI::FancyFrame
1013 label => "Connection Settings", 1355 label => "Connection Settings",
1014 child => (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]), 1356 child => (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]),
1015 ); 1357 );
1016 $table->add (0, 2, new CFPlus::UI::Label valign => 0, align => 1, text => "Host:Port"); 1358 $table->add_at (0, 2, new CFPlus::UI::Label valign => 0, align => 1, text => "Host:Port");
1017 1359
1018 { 1360 {
1019 $table->add (1, 2, my $vbox = new CFPlus::UI::VBox); 1361 $table->add_at (1, 2, my $vbox = new CFPlus::UI::VBox);
1020 1362
1021 $vbox->add ( 1363 $vbox->add (
1022 $HOST_ENTRY = new CFPlus::UI::Entry 1364 $HOST_ENTRY = new CFPlus::UI::Entry
1023 expand => 1, 1365 expand => 1,
1024 text => $CFG->{profile}{default}{host}, 1366 text => $CFG->{profile}{default}{host},
1025 tooltip => "The hostname or ip address of the Crossfire(+) server to connect to", 1367 tooltip => "The hostname or ip address of the Crossfire(+) server to connect to",
1026 on_changed => sub { 1368 on_changed => sub {
1027 my ($self, $value) = @_; 1369 my ($self, $value) = @_;
1028 $CFG->{profile}{default}{host} = $value; 1370 $CFG->{profile}{default}{host} = $value;
1029 0 1371 1
1030 } 1372 }
1031 ); 1373 );
1032 1374
1033 $vbox->add (new CFPlus::UI::Button 1375 $vbox->add (new CFPlus::UI::Button
1034 expand => 1, 1376 expand => 1,
1035 text => "Server List", 1377 text => "Server List",
1036 other => $METASERVER, 1378 other => $METASERVER,
1037 tooltip => "Show a list of available crossfire servers", 1379 tooltip => "Show a list of available crossfire servers",
1038 on_activate => sub { $METASERVER->toggle_visibility; 0 }, 1380 on_activate => sub { $METASERVER->toggle_visibility; 0 },
1039 on_visibility_change => sub { $METASERVER->hide unless $_[1]; 0 }, 1381 on_visibility_change => sub { $METASERVER->hide unless $_[1]; 1 },
1040 ); 1382 );
1041 } 1383 }
1042 1384
1043 $table->add (0, 4, new CFPlus::UI::Label valign => 0, align => 1, text => "Username"); 1385 $table->add_at (0, 4, new CFPlus::UI::Label valign => 0, align => 1, text => "Username");
1044 $table->add (1, 4, new CFPlus::UI::Entry 1386 $table->add_at (1, 4, new CFPlus::UI::Entry
1045 text => $CFG->{profile}{default}{user}, 1387 text => $CFG->{profile}{default}{user},
1046 tooltip => "The name of your character on the server", 1388 tooltip => "The name of your character on the server",
1047 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value } 1389 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value; 1 }
1048 ); 1390 );
1049 1391
1050 $table->add (0, 5, new CFPlus::UI::Label valign => 0, align => 1, text => "Password"); 1392 $table->add_at (0, 5, new CFPlus::UI::Label valign => 0, align => 1, text => "Password");
1051 $table->add (1, 5, new CFPlus::UI::Entry 1393 $table->add_at (1, 5, new CFPlus::UI::Entry
1052 text => $CFG->{profile}{default}{password}, 1394 text => $CFG->{profile}{default}{password},
1053 hidden => 1, 1395 hidden => 1,
1054 tooltip => "The password for your character", 1396 tooltip => "The password for your character",
1055 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{password} = $value } 1397 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{password} = $value; 1 }
1056 ); 1398 );
1057 1399
1058 $table->add (0, 7, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Size"); 1400 $table->add_at (0, 7, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Size");
1059 $table->add (1, 7, new CFPlus::UI::Slider 1401 $table->add_at (1, 7, new CFPlus::UI::Slider
1060 force_w => 100, 1402 force_w => 100,
1061 range => [$CFG->{mapsize}, 10, 100, 0, 1], 1403 range => [$CFG->{mapsize}, 10, 100, 0, 1],
1062 tooltip => "This is the size of the portion of the map update the server sends you. " 1404 tooltip => "This is the size of the portion of the map update the server sends you. "
1063 . "If you set this to a high value you will be able to see further, " 1405 . "If you set this to a high value you will be able to see further, "
1064 . "but you also increase bandwidth requirements and latency. " 1406 . "but you also increase bandwidth requirements and latency. "
1065 . "This option is only used once at log-in.", 1407 . "This option is only used once at log-in.",
1066 on_changed => sub { my ($self, $value) = @_; $CFG->{mapsize} = $self->{range}[0] = $value = int $value; 0 }, 1408 on_changed => sub { my ($self, $value) = @_; $CFG->{mapsize} = $self->{range}[0] = $value = int $value; 1 },
1067 ); 1409 );
1068 1410
1069 $table->add (0, 8, new CFPlus::UI::Label valign => 0, align => 1, text => "Face Prefetch");
1070 $table->add (1, 8, new CFPlus::UI::CheckBox
1071 state => $CFG->{face_prefetch},
1072 tooltip => "<b>Background Image Prefetch</b>\n\n"
1073 . "If enabled, the client automatically pre-fetches images from the server. "
1074 . "This might increase or create lag, but increases the chances "
1075 . "of faces being ready for display when you encounter them. "
1076 . "It also uses up server bandwidth on every connect, "
1077 . "so only set it if you really need to prefetch images. "
1078 . "This option can be set and unset any time.",
1079 on_changed => sub { $CFG->{face_prefetch} = $_[1]; 0 },
1080 );
1081
1082 $table->add (0, 9, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Rate"); 1411 $table->add_at (0, 8, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Rate");
1083 $table->add (1, 9, new CFPlus::UI::Entry 1412 $table->add_at (1, 8, new CFPlus::UI::Entry
1084 text => $CFG->{output_rate}, 1413 text => $CFG->{output_rate},
1085 tooltip => "The approximate bandwidth in bytes per second that the server should not exceed " 1414 tooltip => "The maximum bandwidth in bytes per second that the server should not exceed "
1086 . "when sending images, to ensure interactiveness. When 0 or unset, the server " 1415 . "when sending data. When 0 or unset, the server "
1087 . "default will be used, which is usually around 100kb/s.", 1416 . "default will be used, which is usually around 100kb/s. Most servers will "
1417 . "dynamically find an optimal rate, so adjust this only when necessary.",
1088 on_changed => sub { $CFG->{output_rate} = $_[1]; 0 }, 1418 on_changed => sub { $CFG->{output_rate} = $_[1]; 1 },
1089 ); 1419 );
1090 1420
1091 $table->add (0, 10, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Count"); 1421 $table->add_at (0, 9, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Count");
1092 $table->add (1, 10, new CFPlus::UI::Entry 1422 $table->add_at (1, 9, new CFPlus::UI::Entry
1093 text => $CFG->{output_count}, 1423 text => $CFG->{output_count},
1094 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.", 1424 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.",
1095 on_changed => sub { $CFG->{output_count} = $_[1]; 0 }, 1425 on_changed => sub { $CFG->{output_count} = $_[1]; 1 },
1096 ); 1426 );
1097 1427
1098 $table->add (0, 11, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Sync"); 1428 $table->add_at (0, 10, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Sync");
1099 $table->add (1, 11, new CFPlus::UI::Entry 1429 $table->add_at (1, 10, new CFPlus::UI::Entry
1100 text => $CFG->{output_sync}, 1430 text => $CFG->{output_sync},
1101 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.", 1431 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.",
1102 on_changed => sub { $CFG->{output_sync} = $_[1]; 0 }, 1432 on_changed => sub { $CFG->{output_sync} = $_[1]; 1 },
1103 ); 1433 );
1104 1434
1105 $table->add (1, 12, $LOGIN_BUTTON = new CFPlus::UI::Button 1435 $table->add_at (1, 11, $LOGIN_BUTTON = new CFPlus::UI::Button
1106 expand => 1, 1436 expand => 1,
1107 align => 0, 1437 align => 0,
1108 text => "Login", 1438 text => "Login",
1109 on_activate => sub { 1439 on_activate => sub {
1110 $CONN ? stop_game 1440 $CONN ? stop_game
1111 : start_game; 1441 : start_game;
1112 0 1442 1
1113 }, 1443 },
1114 ); 1444 );
1115 1445
1116 $vbox->add (new CFPlus::UI::FancyFrame 1446 $vbox->add (new CFPlus::UI::FancyFrame
1117 label => "Server Info", 1447 label => "Server Info",
… …
1124sub client_setup { 1454sub client_setup {
1125 my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]; 1455 my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1];
1126 1456
1127 my $row = 0; 1457 my $row = 0;
1128 1458
1129 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Chat Command");
1130 $table->add (1, $row++, my $saycmd = new CFPlus::UI::Entry
1131 text => $CFG->{say_command},
1132 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. "
1133 . "Usually you want to enter something like 'say' or 'shout' or 'gsay' here. "
1134 . "But you could also set it to <b>tell <i>playername</i></b> to only chat with that user.",
1135 on_changed => sub {
1136 my ($self, $value) = @_;
1137 $CFG->{say_command} = $value;
1138 0
1139 }
1140 );
1141
1142 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Tip of the day"); 1459 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Tip of the day");
1143 $table->add (1, $row++, new CFPlus::UI::CheckBox 1460 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
1144 state => $CFG->{show_tips}, 1461 state => $CFG->{show_tips},
1145 tooltip => "Show the <b>Tip of the day</b> window at startup?", 1462 tooltip => "Show the <b>Tip of the day</b> window at startup?",
1146 on_changed => sub { 1463 on_changed => sub {
1147 my ($self, $value) = @_; 1464 my ($self, $value) = @_;
1148 $CFG->{show_tips} = $value; 1465 $CFG->{show_tips} = $value;
1149 0 1466 0
1150 } 1467 }
1151 ); 1468 );
1152 1469
1153 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Messages Window Size"); 1470 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Messages Window Size");
1154 $table->add (1, $row++, my $saycmd = new CFPlus::UI::Entry 1471 $table->add_at (1, $row++, my $saycmd = new CFPlus::UI::Entry
1155 text => $CFG->{logview_max_par}, 1472 text => $CFG->{logview_max_par},
1156 tooltip => "This is maximum number of messages remembered in the <b>Messages</b> window. If the server " 1473 tooltip => "This is maximum number of messages remembered in the <b>Messages</b> window. If the server "
1157 . "sends more messages than this number, older messages get removed to save memory and " 1474 . "sends more messages than this number, older messages get removed to save memory and "
1158 . "computing time. A value of <b>0</b> disables this feature, but that is not recommended.", 1475 . "computing time. A value of <b>0</b> disables this feature, but that is not recommended.",
1159 on_changed => sub { 1476 on_changed => sub {
1160 my ($self, $value) = @_; 1477 my ($self, $value) = @_;
1161 $LOGVIEW->{max_par} = $CFG->{logview_max_par} = $value*1; 1478 $MESSAGE_WINDOW->set_max_para ($CFG->{logview_max_par} = $value*1);
1162 0 1479 0
1163 }, 1480 },
1164 ); 1481 );
1165 1482
1166 $table 1483 $table
1167} 1484}
1168 1485
1169sub message_window {
1170 my $window = new CFPlus::UI::Toplevel
1171 name => "message_window",
1172 title => "Messages",
1173 border_bg => [1, 1, 1, 1],
1174 x => "max",
1175 y => 0,
1176 force_w => $::WIDTH * 0.4,
1177 force_h => $::HEIGHT * 0.5,
1178 child => (my $vbox = new CFPlus::UI::VBox),
1179 has_close_button => 1;
1180
1181 $vbox->add ($LOGVIEW);
1182
1183 $vbox->add (my $input = new CFPlus::UI::Entry
1184 tooltip => "<b>Chat Box</b>. If you enter a text and press return/enter here, the current <i>communication command</i> "
1185 . "from the client setup will be prepended (e.g. <b>shout</b>, <b>chat</b>...). "
1186 . "If you prepend a slash (/), you will submit a command instead (similar to IRC). "
1187 . "A better way to submit commands (and the occasional chat command) is often the map command completer.",
1188 on_focus_in => sub {
1189 my ($input, $prev_focus) = @_;
1190
1191 delete $input->{refocus_map};
1192
1193 if ($prev_focus == $MAPWIDGET && $input->{auto_activated}) {
1194 $input->{refocus_map} = 1;
1195 }
1196 delete $input->{auto_activated};
1197
1198 0
1199 },
1200 on_activate => sub {
1201 my ($input, $text) = @_;
1202 $input->set_text ('');
1203
1204 if ($text =~ /^\/(.*)/) {
1205 $::CONN->user_send ($1);
1206 } else {
1207 my $say_cmd = $::CFG->{say_command} || 'say';
1208 $::CONN->user_send ("$say_cmd $text");
1209 }
1210 if ($input->{refocus_map}) {
1211 delete $input->{refocus_map};
1212 $MAPWIDGET->focus_in
1213 }
1214
1215 0
1216 },
1217 on_escape => sub {
1218 $MAPWIDGET->grab_focus;
1219
1220 0
1221 },
1222 );
1223
1224 $CONSOLE = {
1225 window => $window,
1226 input => $input,
1227 };
1228
1229 $window
1230}
1231
1232sub autopickup_setup { 1486sub autopickup_setup {
1487 my $r = new CFPlus::UI::ScrolledWindow (
1488 expand => 1,
1489 scroll_y => 1
1490 );
1233 my $table = new CFPlus::UI::Table; 1491 $r->add (my $table = new CFPlus::UI::Table
1492 row_expand => [0],
1493 col_expand => [0, 1, 0, 1],
1494 );
1234 1495
1235 for ( 1496 for (
1236 ["General", 0, 0, 1497 ["General", 0, 0,
1237 ["Enable autopickup" => PICKUP_NEWMODE, \$PICKUP_ENABLE], 1498 ["Enable autopickup" => PICKUP_NEWMODE, \$PICKUP_ENABLE],
1238 ["Inhibit autopickup" => PICKUP_INHIBIT], 1499 ["Inhibit autopickup" => PICKUP_INHIBIT],
… …
1273 ], 1534 ],
1274 ["Weight/Value ratio", 2, 17] 1535 ["Weight/Value ratio", 2, 17]
1275 ) 1536 )
1276 { 1537 {
1277 my ($title, $x, $y, @bits) = @$_; 1538 my ($title, $x, $y, @bits) = @$_;
1278 $table->add ($x, $y, new CFPlus::UI::Label text => $title, align => 1, fg => [1, 1, 0]); 1539 $table->add_at ($x, $y, new CFPlus::UI::Label text => $title, align => 1, fg => [1, 1, 0]);
1279 1540
1280 for (@bits) { 1541 for (@bits) {
1281 ++$y; 1542 ++$y;
1282 1543
1283 my $mask = $_->[1]; 1544 my $mask = $_->[1];
1284 $table->add ($x , $y, new CFPlus::UI::Label text => $_->[0], align => 1, expand => 1); 1545 $table->add_at ($x , $y, new CFPlus::UI::Label text => $_->[0], align => 1, expand => 1);
1285 $table->add ($x+1, $y, my $checkbox = new CFPlus::UI::CheckBox 1546 $table->add_at ($x+1, $y, my $checkbox = new CFPlus::UI::CheckBox
1286 state => $::CFG->{pickup} & $mask, 1547 state => $::CFG->{pickup} & $mask,
1287 on_changed => sub { 1548 on_changed => sub {
1288 my ($box, $value) = @_; 1549 my ($box, $value) = @_;
1289 1550
1290 if ($value) { 1551 if ($value) {
… …
1301 1562
1302 ${$_->[2]} = $checkbox if $_->[2]; 1563 ${$_->[2]} = $checkbox if $_->[2];
1303 } 1564 }
1304 } 1565 }
1305 1566
1306 $table->add (2, 18, new CFPlus::UI::ValSlider 1567 $table->add_at (2, 18, new CFPlus::UI::ValSlider
1307 range => [$::CFG->{pickup} & 0xF, 0, 16, 1, 1], 1568 range => [$::CFG->{pickup} & 0xF, 0, 16, 1, 1],
1308 template => ">= 99", 1569 template => ">= 99",
1309 to_value => sub { ">= " . 5 * $_[0] }, 1570 to_value => sub { ">= " . 5 * $_[0] },
1310 on_changed => sub { 1571 on_changed => sub {
1311 my ($slider, $value) = @_; 1572 my ($slider, $value) = @_;
… …
1314 $::CFG->{pickup} |= int $value 1575 $::CFG->{pickup} |= int $value
1315 if $value; 1576 if $value;
1316 1; 1577 1;
1317 }); 1578 });
1318 1579
1319 $table->add (3, 18, new CFPlus::UI::Button 1580 $table->add_at (3, 18, new CFPlus::UI::Button
1320 text => "set", 1581 text => "set",
1321 on_activate => sub { 1582 on_activate => sub {
1322 $::CONN->send_command ("pickup $::CFG->{pickup}") 1583 $::CONN->send_command ("pickup $::CFG->{pickup}")
1323 if defined $::CONN; 1584 if defined $::CONN;
1324 0 1585 0
1325 }); 1586 });
1326 1587
1327 $table 1588 $r
1328} 1589}
1329 1590
1330my %SORT_ORDER = ( 1591my %SORT_ORDER = (
1331 type => undef, 1592 type => undef,
1332 mtime => sub { 1593 mtime => sub {
… …
1376 $sw1->add ($INV = new CFPlus::UI::Inventory); 1637 $sw1->add ($INV = new CFPlus::UI::Inventory);
1377 $INV->set_sort_order ($SORT_ORDER{$::CFG->{inv_sort}}); 1638 $INV->set_sort_order ($SORT_ORDER{$::CFG->{inv_sort}});
1378 1639
1379 $hb->add (my $vb2 = new CFPlus::UI::VBox); 1640 $hb->add (my $vb2 = new CFPlus::UI::VBox);
1380 1641
1381 $vb2->add ($INV_RIGHT_HB = new CFPlus::UI::HBox); 1642 $vb2->add ($INVR_HB = new CFPlus::UI::HBox);
1382 1643
1383 $vb2->add (my $sw2 = new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1); 1644 $vb2->add (my $sw2 = new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1);
1384 $sw2->add ($INVR = new CFPlus::UI::Inventory); 1645 $sw2->add ($INVR = new CFPlus::UI::Inventory);
1385 1646
1386 # XXX: Call after $INVR = ... because set_opencont sets the items 1647 # XXX: Call after $INVR = ... because set_opencont sets the items
1387 CFPlus::Protocol::set_opencont ($::CONN, 0, "Floor"); 1648 CFPlus::Protocol::set_opencont ($::CONN, 0, "Floor");
1388 1649
1389 $hb 1650 $hb
1651}
1652
1653sub media_window {
1654 my $vb = new CFPlus::UI::VBox;
1655
1656 $vb->add (new CFPlus::UI::FancyFrame
1657 label => "Currently playing music",
1658 child => new CFPlus::UI::ScrolledWindow scroll_x => 1, scroll_y => 0,
1659 child => ($MUSIC_PLAYING_WIDGET = new CFPlus::UI::Label ellipsise => 0, fontsize => 0.8),
1660 );
1661
1662 $vb->add (new CFPlus::UI::FancyFrame
1663 label => "Other media used in this session",
1664 expand => 1,
1665 child => ($LICENSE_WIDGET = new CFPlus::UI::TextScroller
1666 expand => 1, fontsize => 0.8, padding_x => 4, padding_y => 4),
1667 );
1668
1669 $vb
1670}
1671
1672sub add_license {
1673 my ($meta) = @_;
1674
1675 $meta = $meta->{data}
1676 or return;
1677
1678 $meta->{license} || $meta->{author} || $meta->{source}
1679 or return;
1680
1681 $LICENSE_WIDGET->add_paragraph ({
1682 fg => [1, 1, 1, 1],
1683 markup => "<small>"
1684 . "<b>Name:</b> " . (CFPlus::asxml $meta->{name}) . "\n"
1685 . "<b>Author:</b> " . (CFPlus::asxml $meta->{author}) . "\n"
1686 . "<b>Source:</b> " . (CFPlus::asxml $meta->{source}) . "\n"
1687 . "<b>License:</b> " . (CFPlus::asxml $meta->{license}) . "\n"
1688 . "</small>",
1689 });
1690 $LICENSE_WIDGET->scroll_to_bottom;
1390} 1691}
1391 1692
1392sub toggle_player_page { 1693sub toggle_player_page {
1393 my ($widget) = @_; 1694 my ($widget) = @_;
1394 1695
… …
1411 has_close_button => 1 1712 has_close_button => 1
1412 ; 1713 ;
1413 1714
1414 my $ntb = 1715 my $ntb =
1415 $PL_NOTEBOOK = 1716 $PL_NOTEBOOK =
1416 new CFPlus::UI::Notebook expand => 1, debug => 1; 1717 new CFPlus::UI::Notebook expand => 1;
1417 1718
1418 $ntb->add ( 1719 $ntb->add_tab (
1419 "Statistics (F2)" => $STATS_PAGE = stats_window, 1720 "Statistics (F2)" => $STATS_PAGE = stats_window,
1420 "Shows statistics, where all your Stats and Resistances are shown." 1721 "Shows statistics, where all your Stats and Resistances are shown."
1421 ); 1722 );
1422 $ntb->add ( 1723 $ntb->add_tab (
1423 "Skills (F3)" => $SKILL_PAGE = skill_window, 1724 "Skills (F3)" => $SKILL_PAGE = skill_window,
1424 "Shows all your Skills." 1725 "Shows all your Skills."
1425 ); 1726 );
1426 1727
1427 my $spellsw = $SPELL_PAGE = new CFPlus::UI::ScrolledWindow (expand => 1, scroll_y => 1); 1728 my $spellsw = $SPELL_PAGE = new CFPlus::UI::ScrolledWindow (expand => 1, scroll_y => 1);
1428 $spellsw->add ($SPELL_LIST = new CFPlus::UI::SpellList); 1729 $spellsw->add ($SPELL_LIST = new CFPlus::UI::SpellList);
1429 $ntb->add ( 1730 $ntb->add_tab (
1430 "Spellbook (F4)" => $spellsw, 1731 "Spellbook (F4)" => $spellsw,
1431 "Displays all spells you have and lets you edit keyboard shortcuts for them." 1732 "Displays all spells you have and lets you edit keyboard shortcuts for them."
1432 ); 1733 );
1433 $ntb->add ( 1734 $ntb->add_tab (
1434 "Inventory (F5)" => $INVENTORY_PAGE = inventory_widget, 1735 "Inventory (F5)" => $INVENTORY_PAGE = inventory_widget,
1435 "Toggles the inventory window, where you can manage your loot (or treasures :). " 1736 "Toggles the inventory window, where you can manage your loot (or treasures :). "
1436 . "You can also hit the <b>Tab</b>-key to show/hide the Inventory." 1737 . "You can also hit the <b>Tab</b>-key to show/hide the Inventory."
1437 ); 1738 );
1739 $ntb->add_tab (Pickup => $PICKUP_PAGE = autopickup_setup,
1740 "Configure autopickup settings, i.e. which items you will pick up automatically when walking (or running) over them.");
1741
1742 $ntb->add_tab (Media => media_window,
1743 "License, Author and Source info for media sent by the server.");
1438 1744
1439 $ntb->set_current_page ($INVENTORY_PAGE); 1745 $ntb->set_current_page ($INVENTORY_PAGE);
1440 1746
1441 $plwin->add ($ntb); 1747 $plwin->add ($ntb);
1442 $plwin 1748 $plwin
… …
1596 on_activate => sub { $QUIT_DIALOG->hide; 0 }, 1902 on_activate => sub { $QUIT_DIALOG->hide; 0 },
1597 ); 1903 );
1598 $hb->add (new CFPlus::UI::Button 1904 $hb->add (new CFPlus::UI::Button
1599 text => "Quit anyway", 1905 text => "Quit anyway",
1600 expand => 1, 1906 expand => 1,
1601 on_activate => sub { exit }, 1907 on_activate => sub { Event::unloop_all },
1602 ); 1908 );
1603 } 1909 }
1604 1910
1605 $QUIT_DIALOG->show; 1911 $QUIT_DIALOG->show;
1606 $QUIT_DIALOG->grab_focus; 1912 $QUIT_DIALOG->grab_focus;
… …
1639 expand => 1, fontsize => 0.8, padding_x => 4, padding_y => 4); 1945 expand => 1, fontsize => 0.8, padding_x => 4, padding_y => 4);
1640 $viewer->add_paragraph (CFPlus::Pod::as_paragraphs CFPlus::Pod::section_of $tod[$todindex]); 1946 $viewer->add_paragraph (CFPlus::Pod::as_paragraphs CFPlus::Pod::section_of $tod[$todindex]);
1641 1947
1642 $vbox->add (my $table = new CFPlus::UI::Table col_expand => [0, 1]); 1948 $vbox->add (my $table = new CFPlus::UI::Table col_expand => [0, 1]);
1643 1949
1644 $table->add (0, 0, new CFPlus::UI::Button 1950 $table->add_at (0, 0, new CFPlus::UI::Button
1645 text => "Close", 1951 text => "Close",
1646 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>.", 1952 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>.",
1647 on_activate => $close, 1953 on_activate => $close,
1648 ); 1954 );
1649 1955
1650 $table->add (2, 0, new CFPlus::UI::Button 1956 $table->add_at (2, 0, new CFPlus::UI::Button
1651 text => "Next", 1957 text => "Next",
1652 tooltip => "Show the next <b>Tip of the day</b>.", 1958 tooltip => "Show the next <b>Tip of the day</b>.",
1653 on_activate => sub { 1959 on_activate => sub {
1654 $close->(); 1960 $close->();
1655 &show_tip_of_the_day; 1961 &show_tip_of_the_day;
… …
1664 CFPlus::SDL_Init 1970 CFPlus::SDL_Init
1665 and die "SDL::Init failed!\n"; 1971 and die "SDL::Init failed!\n";
1666} 1972}
1667 1973
1668sub video_init { 1974sub video_init {
1669 sdl_init;
1670
1671 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} >= @SDL_MODES; 1975 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} >= @SDL_MODES;
1672 1976
1673 my ($old_w, $old_h) = ($WIDTH, $HEIGHT); 1977 my ($old_w, $old_h) = ($WIDTH, $HEIGHT);
1674 1978
1675 ($WIDTH, $HEIGHT) = @{ $SDL_MODES[$CFG->{sdl_mode}] }; 1979 ($WIDTH, $HEIGHT, my ($rgb, $alpha)) = @{ $SDL_MODES[$CFG->{sdl_mode}] };
1676 $FULLSCREEN = $CFG->{fullscreen}; 1980 $FULLSCREEN = $CFG->{fullscreen};
1677 $FAST = $CFG->{fast}; 1981 $FAST = $CFG->{fast};
1678 1982
1679 CFPlus::SDL_SetVideoMode $WIDTH, $HEIGHT, $FULLSCREEN 1983 CFPlus::SDL_SetVideoMode $WIDTH, $HEIGHT, $rgb, $alpha, $FULLSCREEN
1680 or die "SDL_SetVideoMode failed: " . (CFPlus::SDL_GetError) . "\n"; 1984 or die "SDL_SetVideoMode failed: " . (CFPlus::SDL_GetError) . "\n";
1681 1985
1682 $SDL_ACTIVE = 1; 1986 $SDL_ACTIVE = 1;
1683 $LAST_REFRESH = time - 0.01; 1987 $LAST_REFRESH = time - 0.01;
1684 1988
1685 CFPlus::OpenGL::init; 1989 CFPlus::OpenGL::init;
1990 CFPlus::Macro::init;
1686 1991
1687 $FONTSIZE = int $HEIGHT / 40 * $CFG->{gui_fontsize}; 1992 $FONTSIZE = int $HEIGHT / 40 * $CFG->{gui_fontsize};
1688 1993
1689 $CFPlus::UI::ROOT->configure (0, 0, $WIDTH, $HEIGHT);#d# 1994 $CFPlus::UI::ROOT->configure (0, 0, $WIDTH, $HEIGHT);#d#
1690 1995
1691 ############################################################################# 1996 #############################################################################
1692 1997
1693 if ($DEBUG_STATUS) { 1998 if ($DEBUG_STATUS) {
1694 CFPlus::UI::rescale_widgets $WIDTH / $old_w, $HEIGHT / $old_h; 1999 CFPlus::UI::rescale_widgets $WIDTH / $old_w, $HEIGHT / $old_h;
1695 } else { 2000 } else {
1696 # create the widgets 2001 # create/configure the widgets
2002
2003 $CFPlus::UI::ROOT->connect (key_down => sub {
2004 my (undef, $ev) = @_;
2005
2006 if (my @macros = CFPlus::Macro::find $ev) {
2007 CFPlus::Macro::execute $_ for @macros;
2008
2009 return 1;
2010 }
2011
2012 0
2013 });
1697 2014
1698 $DEBUG_STATUS = new CFPlus::UI::Label 2015 $DEBUG_STATUS = new CFPlus::UI::Label
1699 padding => 0, 2016 padding => 0,
1700 z => 100, 2017 z => 100,
1701 force_x => "max", 2018 force_x => "max",
… …
1726 2043
1727 $MAPWIDGET = new CFPlus::MapWidget; 2044 $MAPWIDGET = new CFPlus::MapWidget;
1728 $MAPWIDGET->connect (activate_console => sub { 2045 $MAPWIDGET->connect (activate_console => sub {
1729 my ($mapwidget, $preset) = @_; 2046 my ($mapwidget, $preset) = @_;
1730 2047
1731 if ($CONSOLE) { 2048 $MESSAGE_WINDOW->activate_console ($preset)
1732 $CONSOLE->{input}->{auto_activated} = 1; 2049 if $MESSAGE_WINDOW;
1733 $CONSOLE->{input}->grab_focus;
1734
1735 if ($preset && $CONSOLE->{input}->get_text eq '') {
1736 $CONSOLE->{input}->set_text ($preset);
1737 }
1738 }
1739 }); 2050 });
1740 $MAPWIDGET->show; 2051 $MAPWIDGET->show;
1741 $MAPWIDGET->grab_focus; 2052 $MAPWIDGET->grab_focus;
1742 2053
1743 $LOGVIEW = new CFPlus::UI::TextScroller 2054 $COMPLETER = new CFPlus::MapWidget::Command::
1744 expand => 1, 2055 command => { },
1745 font => $FONT_FIXED, 2056 tooltip => "#completer_help",
1746 fontsize => $::CFG->{log_fontsize},
1747 indent => -4,
1748 can_hover => 1,
1749 can_events => 1,
1750 max_par => $CFG->{logview_max_par},
1751 tooltip => "<b>Server Log</b>. This text viewer contains all recent messages sent by the server.",
1752 ; 2057 ;
1753 2058
1754 $SETUP_DIALOG = new CFPlus::UI::Toplevel 2059 $SETUP_DIALOG = new CFPlus::UI::Toplevel
1755 title => "Setup", 2060 title => "Setup",
1756 name => "setup_dialog", 2061 name => "setup_dialog",
… …
1761 force_h => $::HEIGHT * 0.6, 2066 force_h => $::HEIGHT * 0.6,
1762 has_close_button => 1, 2067 has_close_button => 1,
1763 ; 2068 ;
1764 2069
1765 $METASERVER = metaserver_dialog; 2070 $METASERVER = metaserver_dialog;
2071 $MESSAGE_WINDOW = new CFPlus::UI::MessageWindow;
1766 2072
1767 $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new CFPlus::UI::Notebook expand => 1, debug => 1, 2073 $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new CFPlus::UI::Notebook expand => 1, debug => 1,
1768 filter => new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1); 2074 filter => new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1);
1769 2075
1770 $SETUP_NOTEBOOK->add (Server => $SETUP_SERVER = server_setup, 2076 $SETUP_NOTEBOOK->add_tab (Server => $SETUP_SERVER = server_setup,
1771 "Configure the server to play on, your username, password and other server-related options."); 2077 "Configure the server to play on, your username, password and other server-related options.");
1772 $SETUP_NOTEBOOK->add (Client => client_setup, 2078 $SETUP_NOTEBOOK->add_tab (Client => client_setup,
1773 "Configure various client-specific settings."); 2079 "Configure various client-specific settings.");
1774 $SETUP_NOTEBOOK->add (Pickup => autopickup_setup,
1775 "Configure autopickup settings, i.e. which items you will pick up automatically when walking (or running) over them.");
1776 $SETUP_NOTEBOOK->add (Graphics => graphics_setup, 2080 $SETUP_NOTEBOOK->add_tab (Graphics => graphics_setup,
1777 "Configure the video mode, performance, fonts and other graphical aspects of the game."); 2081 "Configure the video mode, performance, fonts and other graphical aspects of the game.");
1778 $SETUP_NOTEBOOK->add (Audio => audio_setup, 2082 $SETUP_NOTEBOOK->add_tab (Audio => audio_setup,
1779 "Configure the use of audio, sound effects and background music."); 2083 "Configure the use of audio, sound effects and background music.");
1780 $SETUP_NOTEBOOK->add (Keyboard => $SETUP_KEYBOARD = keyboard_setup, 2084 $SETUP_NOTEBOOK->add_tab (Keyboard => $SETUP_KEYBOARD = keyboard_setup,
1781 "Lets you define, edit and delete key bindings." 2085 "Lets you define, edit and delete key bindings."
1782 . "There is a shortcut for making bindings: <b>Control-Insert</b> opens the binding editor " 2086 . "There is a shortcut for making bindings: <b>Control-Insert</b> opens the binding editor "
1783 . "with nothing set and the recording started. After doing the actions you " 2087 . "with nothing set and the recording started. After doing the actions you "
1784 . "want to record press <b>Insert</b> and you will be asked to press a key-combo. " 2088 . "want to record press <b>Insert</b> and you will be asked to press a key-combo. "
1785 . "After pressing the combo the binding will be saved automatically and the " 2089 . "After pressing the combo the binding will be saved automatically and the "
1786 . "binding editor closes"); 2090 . "binding editor closes");
1787 $SETUP_NOTEBOOK->add (Debug => debug_setup, 2091 $SETUP_NOTEBOOK->add_tab (Debug => debug_setup,
1788 "Some debuggin' options. Do not ask."); 2092 "Some debuggin' options. Do not ask.");
1789 2093
1790 $BUTTONBAR = new CFPlus::UI::Buttonbar x => 0, y => 0, z => 200; # put on top 2094 $BUTTONBAR = new CFPlus::UI::Buttonbar x => 0, y => 0, z => 200; # put on top
1791 2095
1792 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Setup", other => $SETUP_DIALOG, 2096 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Setup", other => $SETUP_DIALOG,
1793 tooltip => "Toggles a dialog where you can configure all aspects of this client."); 2097 tooltip => "Toggles a dialog where you can configure all aspects of this client.");
1794 2098
1795 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW = message_window, 2099 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW,
1796 tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server."); 2100 tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server.");
1797 2101
1798 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 2102 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
1799 2103
1800 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Playerbook", other => player_window, 2104 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Playerbook", other => player_window,
… …
1820 tooltip => "Terminates the program", 2124 tooltip => "Terminates the program",
1821 on_activate => sub { 2125 on_activate => sub {
1822 if ($CONN) { 2126 if ($CONN) {
1823 open_quit_dialog; 2127 open_quit_dialog;
1824 } else { 2128 } else {
1825 exit; 2129 Event::unloop_all;
1826 } 2130 }
1827 0 2131 0
1828 }, 2132 },
1829 ); 2133 );
1830 2134
1831 $BUTTONBAR->show; 2135 $BUTTONBAR->show;
1832 $SETUP_DIALOG->show; 2136 $SETUP_DIALOG->show;
2137 $MESSAGE_WINDOW->show;
1833 } 2138 }
1834 2139
1835 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]); 2140 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);
1836}
1837
1838sub setup_build_button {
1839 my ($enabled) = @_;
1840 if ($enabled) {
1841 $BUILD_BUTTON->hide if $BUILD_BUTTON;
1842 $BUILD_BUTTON ||= new CFPlus::UI::Button
1843 text => "Build",
1844 tooltip => "Opens the ingame builder",
1845 on_activate => sub {
1846 if ($CONN) {
1847 $CONN->send_ext_req (builder_player_items => sub {
1848 open_ingame_editor ($_[0]) if exists $_[0]->{items};
1849 });
1850 }
1851 0
1852 };
1853 $BUTTONBAR->add ($BUILD_BUTTON);
1854 } else {
1855 $BUILD_BUTTON->hide if $BUILD_BUTTON;
1856 }
1857}
1858
1859sub open_ingame_editor {
1860 my ($msg) = @_;
1861
1862 my $win = new CFPlus::UI::Toplevel
1863 x => 0,
1864 y => 'center',
1865 z => 4,
1866 name => 'builder_window',
1867 force_w => int $WIDTH * 1/4,
1868 force_h => int $HEIGHT * 3/4,
1869 title => "In game builder",
1870 has_close_button => 1;
1871
1872 my $r = new CFPlus::UI::ScrolledWindow (
1873 expand => 1,
1874 scroll_y => 1
1875 );
1876 $r->add (my $vb = new CFPlus::UI::VBox);
1877 $win->add ($r);
1878
1879
1880 $vb->add (
1881 new CFPlus::UI::Button
1882 text => "Disable build mode",
1883 on_activate => sub { $::IN_BUILD_MODE = undef }
1884 );
1885 $vb->add (
1886 new CFPlus::UI::Button
1887 text => "ERASE",
1888 on_activate => sub { $::IN_BUILD_MODE = { do_erase => 1 } }
1889 );
1890
1891 for my $itemarchname (
1892 sort {
1893 $msg->{items}->{$a}->{build_arch_name}
1894 cmp $msg->{items}->{$b}->{build_arch_name}
1895 } keys %{$msg->{items}}
1896 ) {
1897 my $info = $msg->{items}->{$itemarchname};
1898 $vb->add (
1899 new CFPlus::UI::Button text => $info->{build_arch_name},
1900 on_activate => sub {
1901 $::IN_BUILD_MODE = { item => $itemarchname, info => $info };
1902
1903 if (grep { $msg->{items}->{$itemarchname}->{$_} } qw/has_connection has_name has_text/) {
1904 build_mode_query_arch_info ();
1905 }
1906 }
1907 );
1908 }
1909
1910 $win->show;
1911}
1912
1913sub build_mode_query_arch_info {
1914 my ($iteminfo) = $::IN_BUILD_MODE;
1915 my $itemarchname = $iteminfo->{item};
1916 my $info = $iteminfo->{info};
1917
1918 my $dialog = new CFPlus::UI::Toplevel
1919 x => "center",
1920 y => "center",
1921 z => 50,
1922 force_w => int $WIDTH * 1/2,
1923 title => "Enter information for placement of '$itemarchname'",
1924 has_close_button => 1;
1925
1926 $dialog->add (my $vb = new CFPlus::UI::VBox expand => 1);
1927
1928 $vb->add (my $table = new CFPlus::UI::Table expand => 1);
1929 my $row = 0;
1930 if ($info->{has_name}) {
1931 $table->add (0, $row, new CFPlus::UI::Label text => "Name:");
1932 $table->add (1, $row++, new CFPlus::UI::Entry expand => 1, on_changed => sub { $::IN_BUILD_MODE->{name} = $_[1]; 0 });
1933 }
1934 if ($info->{has_text}) {
1935 $table->add (0, $row, new CFPlus::UI::Label text => "Text:");
1936 $table->add (1, $row++, new CFPlus::UI::Entry expand => 1, on_changed => sub { $::IN_BUILD_MODE->{text} = $_[1]; 0 });
1937 }
1938 if ($info->{has_connection}) {
1939 $table->add (0, $row, new CFPlus::UI::Label text => "Connection ID:");
1940 $table->add (1, $row++,
1941 new CFPlus::UI::Entry
1942 expand => 1,
1943 on_changed => sub { $::IN_BUILD_MODE->{connection} = $_[1]; 0 },
1944 tooltip => "Enter the connection ID here. The connection ID connects actors like a lever to a gate or a magic ear to a gate"
1945 );
1946 }
1947
1948 $vb->add (my $hb = new CFPlus::UI::HBox expand => 1);
1949 $hb->add (new CFPlus::UI::Button
1950 text => "Close",
1951 expand => 1,
1952 on_activate => sub { $dialog->hide; 0 },
1953 );
1954 $dialog->show;
1955} 2141}
1956 2142
1957sub video_shutdown { 2143sub video_shutdown {
1958 CFPlus::OpenGL::shutdown; 2144 CFPlus::OpenGL::shutdown;
1959 2145
1960 undef $SDL_ACTIVE; 2146 undef $SDL_ACTIVE;
1961} 2147}
1962 2148
1963my @bgmusic = qw(game1.ogg game2.ogg game3.ogg game5.ogg game6.ogg ross1.ogg ross2.ogg ross3.ogg ross4.ogg ross5.ogg); #d#
1964my $bgmusic;#TODO#hack#d#
1965
1966sub audio_channel_finished {
1967 my ($channel) = @_;
1968
1969 #warn "channel $channel finished\n";#d#
1970}
1971
1972sub audio_music_finished {
1973 return unless $CFG->{bgm_enable};
1974
1975 # TODO: hack, do play loop and mood music
1976 $bgmusic = new_from_file CFPlus::MixMusic CFPlus::find_rcfile "music/$bgmusic[0]";
1977 $bgmusic->play (0);
1978
1979 push @bgmusic, shift @bgmusic;
1980}
1981
1982sub audio_init {
1983 if ($CFG->{audio_enable}) {
1984 if (open my $fh, "<", CFPlus::find_rcfile "sounds/config") {
1985 $SDL_MIXER = !CFPlus::Mix_OpenAudio;
1986
1987 unless ($SDL_MIXER) {
1988 status "Unable to open sound device: there will be no sound";
1989 return;
1990 }
1991
1992 CFPlus::Mix_AllocateChannels 8;
1993 CFPlus::MixMusic::volume $CFG->{bgm_volume} * 128;
1994
1995 audio_music_finished;
1996
1997 local $_;
1998 while (<$fh>) {
1999 next if /^\s*#/;
2000 next if /^\s*$/;
2001
2002 my ($file, $volume, $event) = split /\s+/, $_, 3;
2003
2004 push @SOUNDS, "$volume,$file";
2005
2006 $AUDIO_CHUNKS{"$volume,$file"} ||= do {
2007 my $chunk = new_from_file CFPlus::MixChunk CFPlus::find_rcfile "sounds/$file";
2008 $chunk->volume ($volume * 128 / 100);
2009 $chunk
2010 };
2011 }
2012 } else {
2013 status "unable to open sound config: $!";
2014 }
2015 }
2016}
2017
2018sub audio_shutdown {
2019 CFPlus::Mix_CloseAudio if $SDL_MIXER;
2020 undef $SDL_MIXER;
2021 @SOUNDS = ();
2022 %AUDIO_CHUNKS = ();
2023}
2024
2025my %animate_object; 2149my %animate_object;
2026my $animate_timer; 2150my $animate_timer;
2027 2151
2028my $fps = 9; 2152my $fps = 9;
2029 2153
2030my %demo;#d#
2031
2032sub force_refresh { 2154sub force_refresh {
2155 if ($ENV{CFPLUS_DEBUG} & 4) {
2033 $fps = $fps * 0.95 + 1 / (($NOW - $LAST_REFRESH) || 0.1) * 0.05; 2156 $fps = $fps * 0.98 + 1 / (($NOW - $LAST_REFRESH) || 0.1) * 0.02;
2034 debug sprintf "%3.2f", $fps if $ENV{CFPLUS_DEBUG} & 4; 2157 debug sprintf "%3.2f", $fps;
2158 }
2035 2159
2036 $CFPlus::UI::ROOT->draw; 2160 $CFPlus::UI::ROOT->draw;
2037 2161 CFPlus::SDL_GL_SwapBuffers;
2038 $WANT_REFRESH = 0;
2039 $CAN_REFRESH = 0;
2040 $LAST_REFRESH = $NOW; 2162 $LAST_REFRESH = $NOW;
2041 2163 $WANT_REFRESH->stop;
2042 CFPlus::SDL_GL_SwapBuffers;
2043} 2164}
2044 2165
2166$WANT_REFRESH = Event->idle (min => 0.001, max => 0.06, parked => 1, cb => \&force_refresh);
2167
2045my $refresh_watcher = Event->timer (after => 0, hard => 0, interval => 1 / $MAX_FPS, cb => sub { 2168my $input = Event->timer (after => 0, hard => 0, interval => 1 / 50, cb => sub {
2046 $NOW = time; 2169 $NOW = time;
2047 2170
2048 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_) 2171 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_)
2049 for CFPlus::SDL_PollEvent; 2172 for CFPlus::poll_events;
2050 2173
2051 if (%animate_object) { 2174 if (%animate_object) {
2052 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object; 2175 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object;
2053 $WANT_REFRESH++; 2176 $WANT_REFRESH->start;
2054 }
2055
2056 if ($WANT_REFRESH) {
2057 force_refresh;
2058 } else {
2059 $CAN_REFRESH = 1;
2060 } 2177 }
2061}); 2178});
2062 2179
2063sub animation_start { 2180sub animation_start {
2064 my ($widget) = @_; 2181 my ($widget) = @_;
… …
2068sub animation_stop { 2185sub animation_stop {
2069 my ($widget) = @_; 2186 my ($widget) = @_;
2070 delete $animate_object{$widget}; 2187 delete $animate_object{$widget};
2071} 2188}
2072 2189
2073# check once/second for faces that need to be prefetched
2074# this should, of course, only run on demand, but
2075# SDL forces worse things on us....
2076
2077Event->timer (after => 1, interval => 0.25, cb => sub {
2078 $CONN->face_prefetch
2079 if $CONN;
2080});
2081
2082%SDL_CB = ( 2190%SDL_CB = (
2083 CFPlus::SDL_QUIT => sub { 2191 CFPlus::SDL_QUIT => sub {
2084 exit; 2192 Event::unloop_all;
2085 }, 2193 },
2086 CFPlus::SDL_VIDEORESIZE => sub { 2194 CFPlus::SDL_VIDEORESIZE => sub {
2087 }, 2195 },
2088 CFPlus::SDL_VIDEOEXPOSE => sub { 2196 CFPlus::SDL_VIDEOEXPOSE => sub {
2089 CFPlus::UI::full_refresh; 2197 CFPlus::UI::full_refresh;
2090 }, 2198 },
2091 CFPlus::SDL_ACTIVEEVENT => sub { 2199 CFPlus::SDL_ACTIVEEVENT => sub {
2092# not useful, as APPACTIVE include sonly iconified state, not unmapped 2200# not useful, as APPACTIVE include sonly iconified state, not unmapped
2093# printf "active %x %x\n", $_[0]{gain}, $_[0]{state};#d# 2201# printf "active %x %x %x\n", $_[0]{gain}, $_[0]{state}, CFPlus::SDL_GetAppState;#d#
2202# printf "a %x\n", CFPlus::SDL_GetAppState & CFPlus::SDL_APPACTIVE;#d#
2094# printf "A\n" if $_[0]{state} & CFPlus::SDL_APPACTIVE; 2203# printf "A\n" if $_[0]{state} & CFPlus::SDL_APPACTIVE;
2095# printf "K\n" if $_[0]{state} & CFPlus::SDL_APPINPUTFOCUS; 2204# printf "K\n" if $_[0]{state} & CFPlus::SDL_APPINPUTFOCUS;
2096# printf "M\n" if $_[0]{state} & CFPlus::SDL_APPMOUSEFOCUS; 2205# printf "M\n" if $_[0]{state} & CFPlus::SDL_APPMOUSEFOCUS;
2097 }, 2206 },
2098 CFPlus::SDL_KEYDOWN => sub { 2207 CFPlus::SDL_KEYDOWN => sub {
… …
2127 CFPlus::DB::Server::run; 2236 CFPlus::DB::Server::run;
2128 2237
2129 CFPlus::UI::set_layout ($::CFG->{layout}); 2238 CFPlus::UI::set_layout ($::CFG->{layout});
2130 2239
2131 my %DEF_CFG = ( 2240 my %DEF_CFG = (
2132 sdl_mode => 0, 2241 sdl_mode => 0,
2133 width => 640,
2134 height => 480,
2135 fullscreen => 0, 2242 fullscreen => 0,
2136 fast => 0, 2243 fast => 0,
2244 force_opengl11 => undef,
2245 texture_compression => 1,
2137 map_scale => 1, 2246 map_scale => 1,
2138 fow_enable => 1, 2247 fow_enable => 1,
2139 fow_intensity => 0.45, 2248 fow_intensity => 0,
2140 fow_smooth => 0,
2141 map_smoothing => 1, 2249 map_smoothing => 1,
2142 gui_fontsize => 1, 2250 gui_fontsize => 1,
2143 log_fontsize => 0.7, 2251 log_fontsize => 0.7,
2144 gauge_fontsize => 1, 2252 gauge_fontsize => 1,
2145 gauge_size => 0.35, 2253 gauge_size => 0.35,
2146 stat_fontsize => 0.7, 2254 stat_fontsize => 0.7,
2147 mapsize => 100, 2255 mapsize => 100,
2148 say_command => 'chat',
2149 audio_enable => 1, 2256 audio_enable => 1,
2257 effects_enable => 1,
2258 effects_volume => 1,
2150 bgm_enable => 1, 2259 bgm_enable => 1,
2151 bgm_volume => 0.25, 2260 bgm_volume => 0.5,
2152 face_prefetch => 0,
2153 output_sync => 1, 2261 output_sync => 1,
2154 output_count => 1, 2262 output_count => 1,
2155 output_rate => "", 2263 output_rate => "",
2156 pickup => 0, 2264 pickup => 0,
2157 inv_sort => "mtime", 2265 inv_sort => "mtime",
2158 default => "profile", # default profile 2266 default => "profile", # default profile
2159 show_tips => 1, 2267 show_tips => 1,
2160 logview_max_par => 1000, 2268 logview_max_par => 1000,
2161 ); 2269 );
2162 2270
2163 while (my ($k, $v) = each %DEF_CFG) { 2271 while (my ($k, $v) = each %DEF_CFG) {
2164 $CFG->{$k} = $v unless exists $CFG->{$k}; 2272 $CFG->{$k} = $v unless exists $CFG->{$k};
2165 } 2273 }
… …
2179 } 2287 }
2180 } 2288 }
2181 2289
2182 sdl_init; 2290 sdl_init;
2183 2291
2184 @SDL_MODES = reverse 2292 @SDL_MODES = CFPlus::SDL_ListModes 8, 8;
2185 grep $_->[0] >= 640 && $_->[1] >= 480, 2293 @SDL_MODES = CFPlus::SDL_ListModes 5, 0 unless @SDL_MODES;
2186 CFPlus::SDL_ListModes;
2187
2188 @SDL_MODES or CFPlus::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)"; 2294 @SDL_MODES or CFPlus::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)";
2295
2296 @SDL_MODES = sort { $a->[0] * $a->[1] <=> $b->[0] * $b->[1] } @SDL_MODES;
2189 2297
2190 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES; 2298 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES;
2191 2299
2192 { 2300 {
2193 my @fonts = map CFPlus::find_rcfile "fonts/$_", qw( 2301 my @fonts = map CFPlus::find_rcfile "fonts/$_", qw(
… …
2222# } 2330# }
2223# my $t2 = Time::HiRes::time; 2331# my $t2 = Time::HiRes::time;
2224# warn $t2-$t1; 2332# warn $t2-$t1;
2225# } 2333# }
2226 2334
2227 $startup_done->();
2228
2229 video_init; 2335 video_init;
2230 audio_init; 2336 audio_init;
2231} 2337}
2232 2338
2233show_tip_of_the_day if $CFG->{show_tips}; 2339show_tip_of_the_day if $CFG->{show_tips};
2234 2340
2341Event->idle (cb => sub {
2342 $_[0]->w->cancel;
2343 $startup_done->();
2344});
2345
2235Event::loop; 2346Event::loop;
2347
2348#video_shutdown;
2349#audio_shutdown;
2236#CFPlus::SDL_Quit; 2350CFPlus::SDL_Quit;
2237#CFPlus::_exit 0;
2238
2239END {
2240 CFPlus::SDL_Quit;
2241 CFPlus::DB::Server::stop; 2351CFPlus::DB::Server::stop;
2242}
2243 2352
2244=head1 NAME 2353=head1 NAME
2245 2354
2246cfplus - A Crossfire+ and Crossfire game client 2355cfplus - A Crossfire TRT and Crossfire game client
2247 2356
2248=head1 SYNOPSIS 2357=head1 SYNOPSIS
2249 2358
2250Just run it - no commandline arguments are supported. 2359Just run it - no commandline arguments are supported.
2251 2360
2252=head1 USAGE 2361=head1 USAGE
2253 2362
2254cfplus utilises OpenGL for all UI elements and the game. It is supposed to be used 2363cfplus utilises OpenGL for all UI elements and the game. It is supposed to
2255fullscreen and interactively. 2364be used in fullscreen mode and interactively.
2256 2365
2257=head1 DEBUGGING 2366=head1 DEBUGGING
2258 2367
2259 2368
2260CFPLUS_DEBUG - environment variable 2369CFPLUS_DEBUG - environment variable

Diff Legend

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