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

Diff Legend

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