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

Diff Legend

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