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.155 by root, Sat May 12 08:13:34 2007 UTC vs.
Revision 1.223 by root, Tue Aug 28 01:23:47 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, 1000, $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 @MUSIC_HAVE = @have
349 if @have;
350
351 # default MUSIC_HAVE == MUSIC_DEFAULT
352 @MUSIC_HAVE = { path => CFPlus::find_rcfile "music/$MUSIC_DEFAULT" } unless @MUSIC_HAVE;
353 $fade_out = 1000;
354 }
355
356 # if the currently playing song is acceptable, let it continue
357 return if grep $MUSIC_PLAYING_META == $_, @MUSIC_HAVE;
358
359 my $NOW = time;
360
361 if ($MUSIC_PLAYING_META) {
362 $MUSIC_PLAYING_META->{stop_time} = $NOW;
363 $MUSIC_PLAYING_META->{stop_pos} = $NOW - $MUSIC_START;
364 CFPlus::MixMusic::fade_out $fade_out;
365 } else {
366 # sort by stop time, oldest first
367 @MUSIC_HAVE = sort { $a->{stop_time} <=> $b->{stop_time} } @MUSIC_HAVE;
368
369 # if the most recently-played piece played very recently,
370 # resume it, else choose the oldest piece for rotation.
371 audio_music_set_meta
372 $MUSIC_HAVE[-1]{stop_time} > $NOW - $MUSIC_RESUME
373 ? $MUSIC_HAVE[-1]
374 : $MUSIC_HAVE[0];
375
376 audio_music_start;
377 }
378}
379
380sub audio_music_set_ambient {
381 my ($songs) = @_;
382
383 $MUSIC_WANT = $songs;
384 audio_music_push;
385}
386
387sub audio_music_finished {
388 # we compress multiple jingles of the same type
389 shift @MUSIC_JINGLE
390 while @MUSIC_JINGLE && $MUSIC_PLAYING_META == $MUSIC_JINGLE[0];
391
392 $MUSIC_PLAYING_WIDGET->clear;
393
394 undef $MUSIC_PLAYER;
395 undef $MUSIC_PLAYING_META;
396 undef $MUSIC_PLAYING_DATA;
397
398 audio_music_push;
399}
400
401sub audio_init {
402 if ($CFG->{audio_enable}) {
403 $ENV{MIX_EFFECTSMAXSPEED} = 1;
404 $SDL_MIXER = !CFPlus::Mix_OpenAudio;
405
406 unless ($SDL_MIXER) {
407 status "Unable to open sound device: there will be no sound";
408 return;
409 }
410
411 CFPlus::Mix_AllocateChannels 16;
412
413 audio_music_finished;
414 } else {
415 undef $SDL_MIXER;
416 }
417}
418
419sub audio_shutdown {
420 undef $MUSIC_PLAYER;
421 undef $MUSIC_PLAYING_META;
422 undef $MUSIC_PLAYING_DATA;
423
424 $MUSIC_WANT = [];
425 @MUSIC_JINGLE = ();
426 %AUDIO_PLAY = ();
427 %AUDIO_CHUNK = ();
428
429 CFPlus::Mix_CloseAudio if $SDL_MIXER;
430 undef $SDL_MIXER;
431}
432
433#############################################################################
197 434
198sub destroy_query_dialog { 435sub destroy_query_dialog {
199 (delete $_[0]{query_dialog})->destroy 436 (delete $_[0]{query_dialog})->destroy
200 if $_[0]{query_dialog}; 437 if $_[0]{query_dialog};
201} 438}
… …
265 ellipsise => 0, 502 ellipsise => 0,
266 markup => "\nOr use your keyboard and the text entry below:\n"; 503 markup => "\nOr use your keyboard and the text entry below:\n";
267 504
268 unshift @dialog, my $table = new CFPlus::UI::Table; 505 unshift @dialog, my $table = new CFPlus::UI::Table;
269 506
270 $table->add (0, 0, new CFPlus::UI::Button 507 $table->add_at (0, 0, new CFPlus::UI::Button
271 text => "Next Race", 508 text => "Next Race",
272 on_activate => sub { 509 on_activate => sub {
273 $conn->send ("reply n"); 510 $conn->send ("reply n");
274 destroy_query_dialog $conn; 511 destroy_query_dialog $conn;
275 0 512 0
276 }, 513 },
277 ); 514 );
278 $table->add (2, 0, new CFPlus::UI::Button 515 $table->add_at (2, 0, new CFPlus::UI::Button
279 text => "Accept", 516 text => "Accept",
280 on_activate => sub { 517 on_activate => sub {
281 $conn->send ("reply d"); 518 $conn->send ("reply d");
282 destroy_query_dialog $conn; 519 destroy_query_dialog $conn;
283 0 520 0
… …
318 $conn->send ("reply $stat"); 555 $conn->send ("reply $stat");
319 destroy_query_dialog $conn; 556 destroy_query_dialog $conn;
320 return; 557 return;
321 } 558 }
322 559
323 $STATS_PAGE->show;
324 $MESSAGE_WINDOW->hide;
325
326 unshift @dialog, new CFPlus::UI::Label 560 unshift @dialog, new CFPlus::UI::Label
327 max_w => $::WIDTH * 0.4, 561 max_w => $::WIDTH * 0.4,
328 ellipsise => 0, 562 ellipsise => 0,
329 markup => "\nOr use your keyboard and the text entry below:\n"; 563 markup => "\nOr use your keyboard and the text entry below:\n";
330 564
331 unshift @dialog, my $table = new CFPlus::UI::Table; 565 unshift @dialog, my $table = new CFPlus::UI::Table;
332 566
333 # left: re-roll 567 # left: re-roll
334 $table->add (0, 0, new CFPlus::UI::Button 568 $table->add_at (0, 0, new CFPlus::UI::Button
335 text => "Roll Again", 569 text => "Roll Again",
336 on_activate => sub { 570 on_activate => sub {
337 $conn->send ("reply y"); 571 $conn->send ("reply y");
338 destroy_query_dialog $conn; 572 destroy_query_dialog $conn;
339 0 573 0
… …
353 [6 => "Pow", "Power ($conn->{stat}{+CS_STAT_POW})"], 587 [6 => "Pow", "Power ($conn->{stat}{+CS_STAT_POW})"],
354 [7 => "Cha", "Charisma ($conn->{stat}{+CS_STAT_CHA})"], 588 [7 => "Cha", "Charisma ($conn->{stat}{+CS_STAT_CHA})"],
355 ], 589 ],
356 ), 1 .. 2; 590 ), 1 .. 2;
357 591
358 $table->add (2, 0, new CFPlus::UI::Button 592 $table->add_at (2, 0, new CFPlus::UI::Button
359 text => "Swap Stats", 593 text => "Swap Stats",
360 on_activate => sub { 594 on_activate => sub {
361 $conn->{stat_change_with} = $sw2->{value}; 595 $conn->{stat_change_with} = $sw2->{value};
362 $conn->send ("reply $sw1->{value}"); 596 $conn->send ("reply $sw1->{value}");
363 destroy_query_dialog $conn; 597 destroy_query_dialog $conn;
364 0 598 0
365 }, 599 },
366 ); 600 );
367 $table->add (2, 1, new CFPlus::UI::HBox children => [$sw1, $sw2]); 601 $table->add_at (2, 1, new CFPlus::UI::HBox children => [$sw1, $sw2]);
368 602
369 # right: accept 603 # right: accept
370 $table->add (4, 0, new CFPlus::UI::Button 604 $table->add_at (4, 0, new CFPlus::UI::Button
371 text => "Accept", 605 text => "Accept",
372 on_activate => sub { 606 on_activate => sub {
373 $conn->send ("reply n"); 607 $conn->send ("reply n");
374 $STATS_PAGE->hide; 608 $STATS_PAGE->hide;
375 destroy_query_dialog $conn; 609 destroy_query_dialog $conn;
… …
456 maph => $mapsize, 690 maph => $mapsize,
457 691
458 client => "cfplus $CFPlus::VERSION $] $^O", 692 client => "cfplus $CFPlus::VERSION $] $^O",
459 693
460 map_widget => $MAPWIDGET, 694 map_widget => $MAPWIDGET,
461 logview => $LOGVIEW,
462 statusbox => $STATUSBOX, 695 statusbox => $STATUSBOX,
463 map => $MAP, 696 map => $MAP,
464 mapmap => $MAPMAP, 697 mapmap => $MAPMAP,
465 query => \&server_query, 698 query => \&server_query,
466 699
467 setup_req => { 700 setup_req => {
468 smoothing => $CFG->{map_smoothing}*1, 701 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 }, 702 },
482 }; 703 };
483 704
484 if ($CONN) { 705 if ($CONN) {
485 CFPlus::lowdelay fileno $CONN->{fh}; 706 CFPlus::lowdelay fileno $CONN->{fh};
… …
495 $LOGIN_BUTTON->set_text ("Login"); 716 $LOGIN_BUTTON->set_text ("Login");
496 $SETUP_NOTEBOOK->set_current_page ($SETUP_SERVER); 717 $SETUP_NOTEBOOK->set_current_page ($SETUP_SERVER);
497 $SETUP_DIALOG->show; 718 $SETUP_DIALOG->show;
498 $PL_WINDOW->hide; 719 $PL_WINDOW->hide;
499 $SPELL_LIST->clear_spells; 720 $SPELL_LIST->clear_spells;
721 $CFPlus::UI::ROOT->emit (stop_game => ! ! $CONN);
722
723 &audio_music_set_ambient ([]);
500 724
501 return unless $CONN; 725 return unless $CONN;
502 726
503 status "connection closed"; 727 status "connection closed";
504 728
… …
514 738
515 $vbox->add (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]); 739 $vbox->add (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]);
516 740
517 my $row = 0; 741 my $row = 0;
518 742
519 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "OpenGL Info"); 743 $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, 744 $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, 745 can_events => 1,
522 tooltip => "<tt><span size='8192'>" . (CFPlus::OpenGL::gl_extensions) . "</span></tt>"); 746 tooltip => "<tt><span size='8192'>" . (CFPlus::OpenGL::gl_extensions) . "</span></tt>");
523 747
748 my $vidmode_tooltip =
749 "<b>Video Mode.</b> The video mode to use for fullscreen (and the window size for windowed operation). "
750 . "The format is <i>width</i> x <i>height</i> \@ <i>depth-per-channel</i> + <i>alpha-channel</i>.";
751
524 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Video Mode"); 752 $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); 753 $table->add_at (1, $row++, my $hbox = new CFPlus::UI::HBox);
526 754
755 $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]); 756 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"); 757 tooltip => $vidmode_tooltip);
758 $hbox->add (my $mode_label = new CFPlus::UI::Label
759 align => 0, valign => 0, height => 0.8, template => "9999x9999@9+9",
760 can_events => 1, tooltip => $vidmode_tooltip);
529 761
530 $mode_slider->connect (changed => sub { 762 $mode_slider->connect (changed => sub {
531 my ($self, $value) = @_; 763 my ($self, $value) = @_;
532 764
533 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value; 765 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value;
534 $mode_label->set_text (sprintf "%dx%d", @{$SDL_MODES[$value]}); 766 $mode_label->set_text (sprintf '%dx%d@%d+%d', @{$SDL_MODES[$value]});
535 }); 767 });
536 $mode_slider->emit (changed => $mode_slider->{range}[0]); 768 $mode_slider->emit (changed => $mode_slider->{range}[0]);
537 769
538 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fullscreen"); 770 $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 771 $table->add_at (1, $row++, $FULLSCREEN_ENABLE = new CFPlus::UI::CheckBox
540 state => $CFG->{fullscreen}, 772 state => $CFG->{fullscreen},
541 tooltip => "Bring the client into fullscreen mode.", 773 tooltip => "Bring the client into fullscreen mode.",
542 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 } 774 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 }
543 ); 775 );
544 776
777 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Force OpenGL 1.1");
778 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
779 state => $CFG->{force_opengl11},
780 tooltip => "Limit CFPlus to use OpenGL 1.1 features only. This will normally result in "
781 . "higher memory usage and slower performance. It will, however, help tremendously on "
782 . "cards that claim to support a feature but fall back to software rendering. "
783 . "Nvidia Geforce FX cards are known to claim features the hardware doesn't support, "
784 . "but cards and drivers from other vendors (ATI) are often just as bad. <b>If you "
785 . "experience extremely low framerates and your card should do better, try this option.</b>",
786 on_changed => sub { my ($self, $value) = @_; $CFG->{force_opengl11} = $value; 0 }
787 );
788
789 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Compress Textures");
790 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
791 state => $CFG->{texture_compression},
792 tooltip => "Use texture compression. Normally this will not reduce visual quality noticable but "
793 . "will save a lot of memory and increase performance. The compression algorithm "
794 . "can differ form card to card, so your mileage may vary. This setting is ignored in "
795 . "forced OpenGL 1.1 mode.",
796 on_changed => sub { my ($self, $value) = @_; $CFG->{texture_compression} = $value; 0 }
797 );
798
545 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fast & Ugly"); 799 $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 800 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
547 state => $CFG->{fast}, 801 state => $CFG->{fast},
548 tooltip => "Lower the visual quality considerably to speed up rendering.", 802 tooltip => "Lower the visual quality considerably to speed up rendering.",
549 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 } 803 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 }
550 ); 804 );
551 805
552 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "GUI Fontsize"); 806 $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 807 $table->add_at (1, $row++, new CFPlus::UI::Slider
554 range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1], 808 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.", 809 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 }, 810 on_changed => sub { $CFG->{gui_fontsize} = $_[1]; 0 },
557 ); 811 );
558 812
559 $table->add (1, $row++, new CFPlus::UI::Button 813 $table->add_at (1, $row++, new CFPlus::UI::Button
560 expand => 1, align => 0, text => "Apply", 814 expand => 1, align => 0, text => "Apply",
561 tooltip => "Apply the video settings above.", 815 tooltip => "Apply the video settings above.",
562 on_activate => sub { 816 on_activate => sub {
563 video_shutdown (); 817 video_shutdown ();
564 video_init (); 818 video_init ();
565 0 819 0
566 } 820 }
567 ); 821 );
568 822
569 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Scale"); 823 $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 824 $table->add_at (1, $row++, new CFPlus::UI::Slider
571 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1], 825 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1],
572 tooltip => "Enlarge or shrink the displayed map. Changes are instant.", 826 tooltip => "Enlarge or shrink the displayed map. Changes are instant.",
573 on_changed => sub { my ($self, $value) = @_; $CFG->{map_scale} = 2 ** $value; 0 } 827 on_changed => sub { my ($self, $value) = @_; $CFG->{map_scale} = 2 ** $value; 0 }
574 ); 828 );
575 829
576 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Smoothing"); 830 $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 831 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
578 state => $CFG->{map_smoothing}, 832 state => $CFG->{map_smoothing},
579 tooltip => "<b>Map Smoothing</b> tries to make tile borders less square. " 833 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. " 834 . "This increases load on the graphics subsystem and works only with TRT servers. "
581 . "Changes take effect at next connection only.", 835 . "Changes take effect at next login only.",
582 on_changed => sub { my ($self, $value) = @_; $CFG->{map_smoothing} = $value; 0 } 836 on_changed => sub { my ($self, $value) = @_; $CFG->{map_smoothing} = $value; 0 }
583 ); 837 );
584 838
585 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fog of War"); 839 $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 840 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
587 state => $CFG->{fow_enable}, 841 state => $CFG->{fow_enable},
588 tooltip => "<b>Fog-of-War</b> marks areas that cannot be seen by the player. Changes are instant.", 842 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 } 843 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; 0 }
590 ); 844 );
591 845
592 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "FoW Intensity"); 846 $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 847 $table->add_at (1, $row++, new CFPlus::UI::Slider
594 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256], 848 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.", 849 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 } 850 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_intensity} = $value; 0 }
597 ); 851 );
598 852
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"); 853 $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 854 $table->add_at (1, $row++, new CFPlus::UI::Slider
613 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1], 855 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.", 856 tooltip => "The font size used by the <b>message/server log</b> window only. Changes are instant, "
857 . "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 }, 858 on_changed => sub { $MESSAGE_WINDOW->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 },
616 ); 859 );
617 860
618 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Gauge fontsize"); 861 $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 862 $table->add_at (1, $row++, new CFPlus::UI::Slider
620 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1], 863 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.", 864 tooltip => "Adjusts the fontsize of the gauges at the bottom right. Changes are instant.",
622 on_changed => sub { 865 on_changed => sub {
623 $CFG->{gauge_fontsize} = $_[1]; 866 $CFG->{gauge_fontsize} = $_[1];
624 &set_gauge_window_fontsize; 867 &set_gauge_window_fontsize;
625 0 868 0
626 } 869 }
627 ); 870 );
628 871
629 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Gauge size"); 872 $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 873 $table->add_at (1, $row++, new CFPlus::UI::Slider
631 range => [$CFG->{gauge_size}, 0.2, 0.8], 874 range => [$CFG->{gauge_size}, 0.2, 0.8],
632 tooltip => "Adjust the size of the stats gauges at the bottom right. Changes are instant.", 875 tooltip => "Adjust the size of the stats gauges at the bottom right. Changes are instant.",
633 on_changed => sub { 876 on_changed => sub {
634 $CFG->{gauge_size} = $_[1]; 877 $CFG->{gauge_size} = $_[1];
635 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size}); 878 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size});
… …
641} 884}
642 885
643sub audio_setup { 886sub audio_setup {
644 my $vbox = new CFPlus::UI::VBox; 887 my $vbox = new CFPlus::UI::VBox;
645 888
646 $vbox->add (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]); 889 $vbox->add (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 0, 1]);
647 890
648 my $row = 0; 891 my $row = 0;
649 892
650 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Audio Enable"); 893 $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 894 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
652 state => $CFG->{audio_enable}, 895 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.", 896 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 } 897 on_changed => sub { $CFG->{audio_enable} = $_[1]; 0 }
655 ); 898 );
656# $table->add (0, 9, new CFPlus::UI::Label valign => 0, align => 1, text => "Effects Volume"); 899# $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 { 900# $table->add_at (1, 8, new CFPlus::UI::Slider range => [$CFG->{effects_volume}, 0, 128, 1], on_changed => sub {
658# $CFG->{effects_volume} = $_[1]; 901# $CFG->{effects_volume} = $_[1];
659# }); 902# });
903
904 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Sound Effects");
905 $table->add_at (1, $row, new CFPlus::UI::CheckBox
906 expand => 1, state => $CFG->{effects_enable},
907 tooltip => "If enabled, sound effects are enabled. If disabled, no sound effects will be played.",
908 on_changed => sub {
909 $CFG->{effects_enable} = $_[1];
910 $CONN->update_fx_want if $CONN;
911 0
912 }
913 );
914 $table->add_at (2, $row++, new CFPlus::UI::Slider
915 expand => 1, range => [$CFG->{effects_volume}, 0, 1, 0, 1/128],
916 tooltip => "The relative volume of sound effects. Best audio quality is achieved if this "
917 . "is set highest (rightmost) and you use your operating system volume setting. Changes are instant.",
918 on_changed => sub { $CFG->{effects_volume} = $_[1]; 0 }
919 );
920
660 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Background Music"); 921 $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 922 $table->add_at (1, $row, new CFPlus::UI::CheckBox
663 expand => 1, state => $CFG->{bgm_enable}, 923 expand => 1, state => $CFG->{bgm_enable},
664 tooltip => "If enabled, playing of background music is enabled. If disabled, no background music will be played.", 924 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 } 925 on_changed => sub {
926 $CFG->{bgm_enable} = $_[1];
927 $CONN->update_fx_want if $CONN;
928 audio_music_push;
929 0
930 }
666 ); 931 );
667 $hbox->add (new CFPlus::UI::Slider 932 $table->add_at (2, $row++, new CFPlus::UI::Slider
668 expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128], 933 expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128],
669 tooltip => "The volume of the background music. Changes are instant.", 934 tooltip => "The volume of the background music. Changes are instant.",
670 on_changed => sub { $CFG->{bgm_volume} = $_[1]; CFPlus::MixMusic::volume $_[1] * 128; 0 } 935 on_changed => sub { $CFG->{bgm_volume} = $_[1]; audio_music_update_volume; 0 }
671 ); 936 );
672 937
673 $table->add (1, $row++, new CFPlus::UI::Button 938 $table->add_at (1, $row++, new CFPlus::UI::Button
674 expand => 1, align => 0, text => "Apply", 939 c_colspan => 2, expand => 1, align => 0, text => "Apply",
675 tooltip => "Apply the audio settings", 940 tooltip => "Apply the audio settings",
676 on_activate => sub { 941 on_activate => sub {
677 audio_shutdown (); 942 audio_shutdown ();
678 audio_init (); 943 audio_init ();
679 0 944 0
… …
721 $hb->add (my $hg = new CFPlus::UI::Gauge type => 'hp', tooltip => "#stat_health"); 986 $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"); 987 $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"); 988 $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"); 989 $hb->add (my $fg = new CFPlus::UI::Gauge type => 'food', tooltip => "#stat_food");
725 990
726 $vbox->add (my $exp = new CFPlus::UI::Label valign => 0, align => 1, can_hover => 1, can_events => 1, tooltip => "#stat_exp"); 991 $vbox->add (my $exp = new CFPlus::UI::Label valign => 0, align => 1, can_hover => 1, can_events => 1, tooltip => "#stat_exp");
992 $vbox->add (my $prg = new CFPlus::UI::ExperienceProgress);
993 $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"); 994 $vbox->add (my $rng = new CFPlus::UI::Label valign => 0, align => 1, can_hover => 1, can_events => 1, tooltip => "#stat_ranged");
728 995
729 $GAUGES = { 996 $GAUGES = {
997 exp => $exp, prg => $prg, sklprg => $sklprg,
730 exp => $exp, win => $win, range => $rng, 998 win => $win, range => $rng,
731 food => $fg, mana => $mg, hp => $hg, grace => $gg 999 hp => $hg, mana => $mg, grace => $gg, food => $fg,
732 }; 1000 };
733 1001
734 &set_gauge_window_fontsize; 1002 &set_gauge_window_fontsize;
735 1003
736 $win 1004 $win
737} 1005}
738 1006
739sub debug_setup { 1007sub debug_setup {
740 my $table = new CFPlus::UI::Table; 1008 my $table = new CFPlus::UI::Table;
741 1009
742 $table->add (0, 0, new CFPlus::UI::Label text => "Widget Borders"); 1010 $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 }); 1011 $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"); 1012 $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 }); 1013 $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"); 1014 $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 }); 1015 $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"); 1016 $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 }); 1017 $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" } ); 1018 $table->add_at (0, 4, new CFPlus::UI::Button text => "die on click(tm)", on_activate => sub { &CFPlus::debug() } );
751 1019
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# 1020 $table->add_at (0, 5, new CFPlus::UI::TextEdit text => "line1\0152\0153");#d#
1021
1022 $table->add_at (7,7, my $t = new CFPlus::UI::Table expand => 0);
1023 $t->add_at (0,0, new CFPlus::UI::Label text => "a a a a", c_rowspan => 1, c_colspan => 2);
1024 $t->add_at (2,0, new CFPlus::UI::Label text => "b\nb", c_rowspan => 2, c_colspan => 1);
1025 $t->add_at (1,2, new CFPlus::UI::Label text => "c c c c", c_rowspan => 1, c_colspan => 2);
1026 $t->add_at (0,1, new CFPlus::UI::Label text => "d\nd", c_rowspan => 2, c_colspan => 1);
1027 $t->add_at (1,1, new CFPlus::UI::Label text => "e");
1028
1029 $table->add_at (7, 6, my $c = new CFPlus::UI::Canvas);
1030
1031 $c->add_items ({
1032 type => "line_loop",
1033 color => [0, 1, 0],
1034 width => 9,
1035 coord_mode => "abs",
1036 coord => [[10, 5], [5, 50], [20, 5], [5, 60]],
1037 });
1038
1039 $c->add_items ({
1040 type => "lines",
1041 color => [1, 1, 0],
1042 width => 2,
1043 coord_mode => "rel",
1044 coord => [[0,0], [1,1], [1,0], [0,1]],
1045 });
1046
1047 $c->add_items ({
1048 type => "polygon",
1049 color => [0, 0.43, 0],
1050 width => 2,
1051 coord_mode => "rel",
1052 coord => [[0,0.2], [1,.4], [1,.6], [0,.8]],
1053 });
765 1054
766 $table 1055 $table
767} 1056}
768 1057
769sub stats_window { 1058sub stats_window {
… …
817 [2, 4, st_spd => "Spd", 10.54], 1106 [2, 4, st_spd => "Spd", 10.54],
818 [2, 5, st_wspd => "WSp", 10.54], 1107 [2, 5, st_wspd => "WSp", 10.54],
819 ) { 1108 ) {
820 my ($col, $row, $id, $label, $template) = @$_; 1109 my ($col, $row, $id, $label, $template) = @$_;
821 1110
822 $tbl->add ($col , $row, $STATWIDS->{$id} = new CFPlus::UI::Label 1111 $tbl->add_at ($col , $row, $STATWIDS->{$id} = new CFPlus::UI::Label
823 font => $FONT_FIXED, can_hover => 1, can_events => 1, valign => 0, 1112 font => $FONT_FIXED, can_hover => 1, can_events => 1, valign => 0,
824 align => +1, template => $template, tooltip => "#stat_$label"); 1113 align => +1, template => $template, tooltip => "#stat_$label");
825 $tbl->add ($col + 1, $row, $STATWIDS->{"$id\_lbl"} = new CFPlus::UI::Label 1114 $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, 1115 font => $FONT_FIXED, can_hover => 1, can_events => 1, fg => $color2, valign => 0,
827 align => -1, text => $label, tooltip => "#stat_$label"); 1116 align => -1, text => $label, tooltip => "#stat_$label");
828 } 1117 }
829 1118
830 $vb->add (new CFPlus::UI::FancyFrame 1119 $vb->add (new CFPlus::UI::FancyFrame
… …
871 cold => ["Cold", 1160 cold => ["Cold",
872 "<b>Cold</b> (this is your resistance against cold spells like icestorm, snowstorm, ...)"], 1161 "<b>Cold</b> (this is your resistance against cold spells like icestorm, snowstorm, ...)"],
873 ghit => ["Ghost hit", 1162 ghit => ["Ghost hit",
874 "<b>Ghost hit</b> (special attack used by ghosts and ghost-like beings)"], 1163 "<b>Ghost hit</b> (special attack used by ghosts and ghost-like beings)"],
875 ); 1164 );
1165
876 for (qw/slow holyw conf fire depl magic 1166 for (qw/slow holyw conf fire depl magic
877 drain acid pois para deat phys 1167 drain acid pois para deat phys
878 blind fear tund elec cold ghit/) 1168 blind fear tund elec cold ghit/)
879 { 1169 {
880 $tbl2->add ($col, $row, 1170 $tbl2->add_at ($col, $row,
881 $STATWIDS->{"res_$_"} = 1171 $STATWIDS->{"res_$_"} =
882 new CFPlus::UI::Label 1172 new CFPlus::UI::Label
883 font => $FONT_FIXED, 1173 font => $FONT_FIXED,
884 template => "-100%", 1174 template => "-100%",
885 align => +1, 1175 align => +1,
886 valign => 0, 1176 valign => 0,
887 can_events => 1, 1177 can_events => 1,
888 can_hover => 1, 1178 can_hover => 1,
889 tooltip => $resist_names{$_}->[1], 1179 tooltip => $resist_names{$_}->[1],
890 ); 1180 );
891 $tbl2->add ($col + 1, $row, new CFPlus::UI::Image 1181 $tbl2->add_at ($col + 1, $row, new CFPlus::UI::Image
892 font => $FONT_FIXED, 1182 font => $FONT_FIXED,
893 can_hover => 1, 1183 can_hover => 1,
894 can_events => 1, 1184 can_events => 1,
895 path => "ui/resist/resist_$_.png", 1185 path => "ui/resist/resist_$_.png",
896 tooltip => $resist_names{$_}->[1], 1186 tooltip => $resist_names{$_}->[1],
897 ); 1187 );
898 $tbl2->add ($col + 2, $row, new CFPlus::UI::Label 1188 $tbl2->add_at ($col + 2, $row, new CFPlus::UI::Label
899 text => $resist_names{$_}->[0], 1189 text => $resist_names{$_}->[0],
900 font => $FONT_FIXED, 1190 font => $FONT_FIXED,
901 can_hover => 1, 1191 can_hover => 1,
902 can_events => 1, 1192 can_events => 1,
903 tooltip => $resist_names{$_}->[1], 1193 tooltip => $resist_names{$_}->[1],
… …
915 $r 1205 $r
916} 1206}
917 1207
918sub skill_window { 1208sub skill_window {
919 my $sw = new CFPlus::UI::ScrolledWindow (expand => 1); 1209 my $sw = new CFPlus::UI::ScrolledWindow (expand => 1);
1210
920 $sw->add ($STATWIDS->{skill_tbl} = new CFPlus::UI::Table expand => 1, col_expand => [0, 0, 1, 0, 0, 1]); 1211 $sw->add ($STATWIDS->{skill_tbl} = new CFPlus::UI::Table expand => 1, col_expand => [0, 0, 1, .1, 0, 0, 1, .1]);
1212
921 $sw 1213 $sw
922} 1214}
923 1215
924sub formsep($) { 1216sub formsep($) {
925 scalar reverse join ",", unpack "(A3)*", reverse $_[0] * 1 1217 scalar reverse join ",", unpack "(A3)*", reverse $_[0] * 1
… …
936 return if $METASERVER_ATIME > time; 1228 return if $METASERVER_ATIME > time;
937 $METASERVER_ATIME = time + 60; 1229 $METASERVER_ATIME = time + 60;
938 1230
939 my $table = $METASERVER->{table}; 1231 my $table = $METASERVER->{table};
940 $table->clear; 1232 $table->clear;
941 $table->add (0, 0, my $label = new CFPlus::UI::Label max_w => $WIDTH * 0.8, text => "fetching server list..."); 1233 $table->add_at (0, 0, my $label = new CFPlus::UI::Label max_w => $WIDTH * 0.8, text => "fetching server list...");
942 1234
943 my $ok = 0; 1235 my $ok = 0;
944 1236
945 CFPlus::background { 1237 CFPlus::background {
946 my $ua = CFPlus::lwp_useragent; 1238 my $ua = CFPlus::lwp_useragent;
… …
957 "The time this server has been running without being restarted.", 1249 "The time this server has been running without being restarted.",
958 "The server software version - a '+' indicates a Crossfire+ server.", 1250 "The server software version - a '+' indicates a Crossfire+ server.",
959 "Short information about this server provided by its admins.", 1251 "Short information about this server provided by its admins.",
960 ); 1252 );
961 my @col = qw(#Users Host Uptime Version Description); 1253 my @col = qw(#Users Host Uptime Version Description);
962 $table->add ($_, 0, new CFPlus::UI::Label 1254 $table->add_at ($_, 0, new CFPlus::UI::Label
963 can_hover => 1, can_events => 1, 1255 can_hover => 1, can_events => 1,
964 align => 0, fg => [1, 1, 0], 1256 align => 0, fg => [1, 1, 0],
965 text => $col[$_], tooltip => $tip[$_]) 1257 text => $col[$_], tooltip => $tip[$_])
966 for 0 .. $#col; 1258 for 0 .. $#col;
967 1259
… …
989 1281
990 $m = [$users, $host, $uptime, $version, $desc]; 1282 $m = [$users, $host, $uptime, $version, $desc];
991 1283
992 $y++; 1284 $y++;
993 1285
994 $table->add (scalar @$m, $y, new CFPlus::UI::VBox children => [ 1286 $table->add_at (scalar @$m, $y, new CFPlus::UI::VBox children => [
995 (new CFPlus::UI::Button 1287 (new CFPlus::UI::Button
996 text => "Use", 1288 text => "Use",
997 tooltip => "Put this server into the <b>Host:Port</b> field", 1289 tooltip => "Put this server into the <b>Host:Port</b> field",
998 on_activate => sub { 1290 on_activate => sub {
999 $HOST_ENTRY->set_text ($CFG->{profile}{default}{host} = $host); 1291 $HOST_ENTRY->set_text ($CFG->{profile}{default}{host} = $host);
… …
1002 }, 1294 },
1003 ), 1295 ),
1004 (new CFPlus::UI::Empty expand => 1), 1296 (new CFPlus::UI::Empty expand => 1),
1005 ]); 1297 ]);
1006 1298
1007 $table->add ($_, $y, new CFPlus::UI::Label 1299 $table->add_at ($_, $y, new CFPlus::UI::Label
1008 max_w => $::WIDTH * 0.4, 1300 max_w => $::WIDTH * 0.4,
1009 ellipsise => 0, 1301 ellipsise => 0,
1010 align => $align[$_], 1302 align => $align[$_],
1011 text => $m->[$_], 1303 text => $m->[$_],
1012 tooltip => $tip[$_], 1304 tooltip => $tip[$_],
… …
1053 1345
1054 $vbox->add (new CFPlus::UI::FancyFrame 1346 $vbox->add (new CFPlus::UI::FancyFrame
1055 label => "Connection Settings", 1347 label => "Connection Settings",
1056 child => (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]), 1348 child => (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]),
1057 ); 1349 );
1058 $table->add (0, 2, new CFPlus::UI::Label valign => 0, align => 1, text => "Host:Port"); 1350 $table->add_at (0, 2, new CFPlus::UI::Label valign => 0, align => 1, text => "Host:Port");
1059 1351
1060 { 1352 {
1061 $table->add (1, 2, my $vbox = new CFPlus::UI::VBox); 1353 $table->add_at (1, 2, my $vbox = new CFPlus::UI::VBox);
1062 1354
1063 $vbox->add ( 1355 $vbox->add (
1064 $HOST_ENTRY = new CFPlus::UI::Entry 1356 $HOST_ENTRY = new CFPlus::UI::Entry
1065 expand => 1, 1357 expand => 1,
1066 text => $CFG->{profile}{default}{host}, 1358 text => $CFG->{profile}{default}{host},
1067 tooltip => "The hostname or ip address of the Crossfire(+) server to connect to", 1359 tooltip => "The hostname or ip address of the Crossfire(+) server to connect to",
1068 on_changed => sub { 1360 on_changed => sub {
1069 my ($self, $value) = @_; 1361 my ($self, $value) = @_;
1070 $CFG->{profile}{default}{host} = $value; 1362 $CFG->{profile}{default}{host} = $value;
1071 0 1363 1
1072 } 1364 }
1073 ); 1365 );
1074 1366
1075 $vbox->add (new CFPlus::UI::Button 1367 $vbox->add (new CFPlus::UI::Button
1076 expand => 1, 1368 expand => 1,
1077 text => "Server List", 1369 text => "Server List",
1078 other => $METASERVER, 1370 other => $METASERVER,
1079 tooltip => "Show a list of available crossfire servers", 1371 tooltip => "Show a list of available crossfire servers",
1080 on_activate => sub { $METASERVER->toggle_visibility; 0 }, 1372 on_activate => sub { $METASERVER->toggle_visibility; 0 },
1081 on_visibility_change => sub { $METASERVER->hide unless $_[1]; 0 }, 1373 on_visibility_change => sub { $METASERVER->hide unless $_[1]; 1 },
1082 ); 1374 );
1083 } 1375 }
1084 1376
1085 $table->add (0, 4, new CFPlus::UI::Label valign => 0, align => 1, text => "Username"); 1377 $table->add_at (0, 4, new CFPlus::UI::Label valign => 0, align => 1, text => "Username");
1086 $table->add (1, 4, new CFPlus::UI::Entry 1378 $table->add_at (1, 4, new CFPlus::UI::Entry
1087 text => $CFG->{profile}{default}{user}, 1379 text => $CFG->{profile}{default}{user},
1088 tooltip => "The name of your character on the server", 1380 tooltip => "The name of your character on the server",
1089 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value } 1381 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value; 1 }
1090 ); 1382 );
1091 1383
1092 $table->add (0, 5, new CFPlus::UI::Label valign => 0, align => 1, text => "Password"); 1384 $table->add_at (0, 5, new CFPlus::UI::Label valign => 0, align => 1, text => "Password");
1093 $table->add (1, 5, new CFPlus::UI::Entry 1385 $table->add_at (1, 5, new CFPlus::UI::Entry
1094 text => $CFG->{profile}{default}{password}, 1386 text => $CFG->{profile}{default}{password},
1095 hidden => 1, 1387 hidden => 1,
1096 tooltip => "The password for your character", 1388 tooltip => "The password for your character",
1097 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{password} = $value } 1389 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{password} = $value; 1 }
1098 ); 1390 );
1099 1391
1100 $table->add (0, 7, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Size"); 1392 $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 1393 $table->add_at (1, 7, new CFPlus::UI::Slider
1102 force_w => 100, 1394 force_w => 100,
1103 range => [$CFG->{mapsize}, 10, 100, 0, 1], 1395 range => [$CFG->{mapsize}, 10, 100, 0, 1],
1104 tooltip => "This is the size of the portion of the map update the server sends you. " 1396 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, " 1397 . "If you set this to a high value you will be able to see further, "
1106 . "but you also increase bandwidth requirements and latency. " 1398 . "but you also increase bandwidth requirements and latency. "
1107 . "This option is only used once at log-in.", 1399 . "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 }, 1400 on_changed => sub { my ($self, $value) = @_; $CFG->{mapsize} = $self->{range}[0] = $value = int $value; 1 },
1109 ); 1401 );
1110 1402
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"); 1403 $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 1404 $table->add_at (1, 8, new CFPlus::UI::Entry
1126 text => $CFG->{output_rate}, 1405 text => $CFG->{output_rate},
1127 tooltip => "The approximate bandwidth in bytes per second that the server should not exceed " 1406 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 " 1407 . "when sending data. When 0 or unset, the server "
1129 . "default will be used, which is usually around 100kb/s.", 1408 . "default will be used, which is usually around 100kb/s. Most servers will "
1409 . "dynamically find an optimal rate, so adjust this only when necessary.",
1130 on_changed => sub { $CFG->{output_rate} = $_[1]; 0 }, 1410 on_changed => sub { $CFG->{output_rate} = $_[1]; 1 },
1131 ); 1411 );
1132 1412
1133 $table->add (0, 10, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Count"); 1413 $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 1414 $table->add_at (1, 9, new CFPlus::UI::Entry
1135 text => $CFG->{output_count}, 1415 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.", 1416 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 }, 1417 on_changed => sub { $CFG->{output_count} = $_[1]; 1 },
1138 ); 1418 );
1139 1419
1140 $table->add (0, 11, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Sync"); 1420 $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 1421 $table->add_at (1, 10, new CFPlus::UI::Entry
1142 text => $CFG->{output_sync}, 1422 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.", 1423 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 }, 1424 on_changed => sub { $CFG->{output_sync} = $_[1]; 1 },
1145 ); 1425 );
1146 1426
1147 $table->add (1, 12, $LOGIN_BUTTON = new CFPlus::UI::Button 1427 $table->add_at (1, 11, $LOGIN_BUTTON = new CFPlus::UI::Button
1148 expand => 1, 1428 expand => 1,
1149 align => 0, 1429 align => 0,
1150 text => "Login", 1430 text => "Login",
1151 on_activate => sub { 1431 on_activate => sub {
1152 $CONN ? stop_game 1432 $CONN ? stop_game
1153 : start_game; 1433 : start_game;
1154 0 1434 1
1155 }, 1435 },
1156 ); 1436 );
1157 1437
1158 $vbox->add (new CFPlus::UI::FancyFrame 1438 $vbox->add (new CFPlus::UI::FancyFrame
1159 label => "Server Info", 1439 label => "Server Info",
… …
1166sub client_setup { 1446sub client_setup {
1167 my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]; 1447 my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1];
1168 1448
1169 my $row = 0; 1449 my $row = 0;
1170 1450
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"); 1451 $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 1452 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
1186 state => $CFG->{show_tips}, 1453 state => $CFG->{show_tips},
1187 tooltip => "Show the <b>Tip of the day</b> window at startup?", 1454 tooltip => "Show the <b>Tip of the day</b> window at startup?",
1188 on_changed => sub { 1455 on_changed => sub {
1189 my ($self, $value) = @_; 1456 my ($self, $value) = @_;
1190 $CFG->{show_tips} = $value; 1457 $CFG->{show_tips} = $value;
1191 0 1458 0
1192 } 1459 }
1193 ); 1460 );
1194 1461
1195 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Messages Window Size"); 1462 $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 1463 $table->add_at (1, $row++, my $saycmd = new CFPlus::UI::Entry
1197 text => $CFG->{logview_max_par}, 1464 text => $CFG->{logview_max_par},
1198 tooltip => "This is maximum number of messages remembered in the <b>Messages</b> window. If the server " 1465 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 " 1466 . "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.", 1467 . "computing time. A value of <b>0</b> disables this feature, but that is not recommended.",
1201 on_changed => sub { 1468 on_changed => sub {
1202 my ($self, $value) = @_; 1469 my ($self, $value) = @_;
1203 $LOGVIEW->{max_par} = $CFG->{logview_max_par} = $value*1; 1470 $MESSAGE_WINDOW->set_max_para ($CFG->{logview_max_par} = $value*1);
1204 0 1471 0
1205 }, 1472 },
1206 ); 1473 );
1207 1474
1208 $table 1475 $table
1209} 1476}
1210 1477
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 { 1478sub autopickup_setup {
1479 my $r = new CFPlus::UI::ScrolledWindow (
1480 expand => 1,
1481 scroll_y => 1
1482 );
1275 my $table = new CFPlus::UI::Table; 1483 $r->add (my $table = new CFPlus::UI::Table
1484 row_expand => [0],
1485 col_expand => [0, 1, 0, 1],
1486 );
1276 1487
1277 for ( 1488 for (
1278 ["General", 0, 0, 1489 ["General", 0, 0,
1279 ["Enable autopickup" => PICKUP_NEWMODE, \$PICKUP_ENABLE], 1490 ["Enable autopickup" => PICKUP_NEWMODE, \$PICKUP_ENABLE],
1280 ["Inhibit autopickup" => PICKUP_INHIBIT], 1491 ["Inhibit autopickup" => PICKUP_INHIBIT],
… …
1315 ], 1526 ],
1316 ["Weight/Value ratio", 2, 17] 1527 ["Weight/Value ratio", 2, 17]
1317 ) 1528 )
1318 { 1529 {
1319 my ($title, $x, $y, @bits) = @$_; 1530 my ($title, $x, $y, @bits) = @$_;
1320 $table->add ($x, $y, new CFPlus::UI::Label text => $title, align => 1, fg => [1, 1, 0]); 1531 $table->add_at ($x, $y, new CFPlus::UI::Label text => $title, align => 1, fg => [1, 1, 0]);
1321 1532
1322 for (@bits) { 1533 for (@bits) {
1323 ++$y; 1534 ++$y;
1324 1535
1325 my $mask = $_->[1]; 1536 my $mask = $_->[1];
1326 $table->add ($x , $y, new CFPlus::UI::Label text => $_->[0], align => 1, expand => 1); 1537 $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 1538 $table->add_at ($x+1, $y, my $checkbox = new CFPlus::UI::CheckBox
1328 state => $::CFG->{pickup} & $mask, 1539 state => $::CFG->{pickup} & $mask,
1329 on_changed => sub { 1540 on_changed => sub {
1330 my ($box, $value) = @_; 1541 my ($box, $value) = @_;
1331 1542
1332 if ($value) { 1543 if ($value) {
… …
1343 1554
1344 ${$_->[2]} = $checkbox if $_->[2]; 1555 ${$_->[2]} = $checkbox if $_->[2];
1345 } 1556 }
1346 } 1557 }
1347 1558
1348 $table->add (2, 18, new CFPlus::UI::ValSlider 1559 $table->add_at (2, 18, new CFPlus::UI::ValSlider
1349 range => [$::CFG->{pickup} & 0xF, 0, 16, 1, 1], 1560 range => [$::CFG->{pickup} & 0xF, 0, 16, 1, 1],
1350 template => ">= 99", 1561 template => ">= 99",
1351 to_value => sub { ">= " . 5 * $_[0] }, 1562 to_value => sub { ">= " . 5 * $_[0] },
1352 on_changed => sub { 1563 on_changed => sub {
1353 my ($slider, $value) = @_; 1564 my ($slider, $value) = @_;
… …
1356 $::CFG->{pickup} |= int $value 1567 $::CFG->{pickup} |= int $value
1357 if $value; 1568 if $value;
1358 1; 1569 1;
1359 }); 1570 });
1360 1571
1361 $table->add (3, 18, new CFPlus::UI::Button 1572 $table->add_at (3, 18, new CFPlus::UI::Button
1362 text => "set", 1573 text => "set",
1363 on_activate => sub { 1574 on_activate => sub {
1364 $::CONN->send_command ("pickup $::CFG->{pickup}") 1575 $::CONN->send_command ("pickup $::CFG->{pickup}")
1365 if defined $::CONN; 1576 if defined $::CONN;
1366 0 1577 0
1367 }); 1578 });
1368 1579
1369 $table 1580 $r
1370} 1581}
1371 1582
1372my %SORT_ORDER = ( 1583my %SORT_ORDER = (
1373 type => undef, 1584 type => undef,
1374 mtime => sub { 1585 mtime => sub {
… …
1418 $sw1->add ($INV = new CFPlus::UI::Inventory); 1629 $sw1->add ($INV = new CFPlus::UI::Inventory);
1419 $INV->set_sort_order ($SORT_ORDER{$::CFG->{inv_sort}}); 1630 $INV->set_sort_order ($SORT_ORDER{$::CFG->{inv_sort}});
1420 1631
1421 $hb->add (my $vb2 = new CFPlus::UI::VBox); 1632 $hb->add (my $vb2 = new CFPlus::UI::VBox);
1422 1633
1423 $vb2->add ($INV_RIGHT_HB = new CFPlus::UI::HBox); 1634 $vb2->add ($INVR_HB = new CFPlus::UI::HBox);
1424 1635
1425 $vb2->add (my $sw2 = new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1); 1636 $vb2->add (my $sw2 = new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1);
1426 $sw2->add ($INVR = new CFPlus::UI::Inventory); 1637 $sw2->add ($INVR = new CFPlus::UI::Inventory);
1427 1638
1428 # XXX: Call after $INVR = ... because set_opencont sets the items 1639 # XXX: Call after $INVR = ... because set_opencont sets the items
1429 CFPlus::Protocol::set_opencont ($::CONN, 0, "Floor"); 1640 CFPlus::Protocol::set_opencont ($::CONN, 0, "Floor");
1430 1641
1431 $hb 1642 $hb
1643}
1644
1645sub media_window {
1646 my $vb = new CFPlus::UI::VBox;
1647
1648 $vb->add (new CFPlus::UI::FancyFrame
1649 label => "Currently playing music",
1650 child => new CFPlus::UI::ScrolledWindow scroll_x => 1, scroll_y => 0,
1651 child => ($MUSIC_PLAYING_WIDGET = new CFPlus::UI::Label ellipsise => 0, fontsize => 0.8),
1652 );
1653
1654 $vb->add (new CFPlus::UI::FancyFrame
1655 label => "Other media used in this session",
1656 expand => 1,
1657 child => ($LICENSE_WIDGET = new CFPlus::UI::TextScroller
1658 expand => 1, fontsize => 0.8, padding_x => 4, padding_y => 4),
1659 );
1660
1661 $vb
1662}
1663
1664sub add_license {
1665 my ($meta) = @_;
1666
1667 $meta = $meta->{data}
1668 or return;
1669
1670 $meta->{license} || $meta->{author} || $meta->{source}
1671 or return;
1672
1673 $LICENSE_WIDGET->add_paragraph ({
1674 fg => [1, 1, 1, 1],
1675 markup => "<small>"
1676 . "<b>Name:</b> " . (CFPlus::asxml $meta->{name}) . "\n"
1677 . "<b>Author:</b> " . (CFPlus::asxml $meta->{author}) . "\n"
1678 . "<b>Source:</b> " . (CFPlus::asxml $meta->{source}) . "\n"
1679 . "<b>License:</b> " . (CFPlus::asxml $meta->{license}) . "\n"
1680 . "</small>",
1681 });
1682 $LICENSE_WIDGET->scroll_to_bottom;
1432} 1683}
1433 1684
1434sub toggle_player_page { 1685sub toggle_player_page {
1435 my ($widget) = @_; 1686 my ($widget) = @_;
1436 1687
… …
1453 has_close_button => 1 1704 has_close_button => 1
1454 ; 1705 ;
1455 1706
1456 my $ntb = 1707 my $ntb =
1457 $PL_NOTEBOOK = 1708 $PL_NOTEBOOK =
1458 new CFPlus::UI::Notebook expand => 1, debug => 1; 1709 new CFPlus::UI::Notebook expand => 1;
1459 1710
1460 $ntb->add ( 1711 $ntb->add_tab (
1461 "Statistics (F2)" => $STATS_PAGE = stats_window, 1712 "Statistics (F2)" => $STATS_PAGE = stats_window,
1462 "Shows statistics, where all your Stats and Resistances are shown." 1713 "Shows statistics, where all your Stats and Resistances are shown."
1463 ); 1714 );
1464 $ntb->add ( 1715 $ntb->add_tab (
1465 "Skills (F3)" => $SKILL_PAGE = skill_window, 1716 "Skills (F3)" => $SKILL_PAGE = skill_window,
1466 "Shows all your Skills." 1717 "Shows all your Skills."
1467 ); 1718 );
1468 1719
1469 my $spellsw = $SPELL_PAGE = new CFPlus::UI::ScrolledWindow (expand => 1, scroll_y => 1); 1720 my $spellsw = $SPELL_PAGE = new CFPlus::UI::ScrolledWindow (expand => 1, scroll_y => 1);
1470 $spellsw->add ($SPELL_LIST = new CFPlus::UI::SpellList); 1721 $spellsw->add ($SPELL_LIST = new CFPlus::UI::SpellList);
1471 $ntb->add ( 1722 $ntb->add_tab (
1472 "Spellbook (F4)" => $spellsw, 1723 "Spellbook (F4)" => $spellsw,
1473 "Displays all spells you have and lets you edit keyboard shortcuts for them." 1724 "Displays all spells you have and lets you edit keyboard shortcuts for them."
1474 ); 1725 );
1475 $ntb->add ( 1726 $ntb->add_tab (
1476 "Inventory (F5)" => $INVENTORY_PAGE = inventory_widget, 1727 "Inventory (F5)" => $INVENTORY_PAGE = inventory_widget,
1477 "Toggles the inventory window, where you can manage your loot (or treasures :). " 1728 "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." 1729 . "You can also hit the <b>Tab</b>-key to show/hide the Inventory."
1479 ); 1730 );
1480 $ntb->add (Pickup => autopickup_setup, 1731 $ntb->add_tab (Pickup => $PICKUP_PAGE = autopickup_setup,
1481 "Configure autopickup settings, i.e. which items you will pick up automatically when walking (or running) over them."); 1732 "Configure autopickup settings, i.e. which items you will pick up automatically when walking (or running) over them.");
1733
1734 $ntb->add_tab (Media => media_window,
1735 "License, Author and Source info for media sent by the server.");
1482 1736
1483 $ntb->set_current_page ($INVENTORY_PAGE); 1737 $ntb->set_current_page ($INVENTORY_PAGE);
1484 1738
1485 $plwin->add ($ntb); 1739 $plwin->add ($ntb);
1486 $plwin 1740 $plwin
… …
1640 on_activate => sub { $QUIT_DIALOG->hide; 0 }, 1894 on_activate => sub { $QUIT_DIALOG->hide; 0 },
1641 ); 1895 );
1642 $hb->add (new CFPlus::UI::Button 1896 $hb->add (new CFPlus::UI::Button
1643 text => "Quit anyway", 1897 text => "Quit anyway",
1644 expand => 1, 1898 expand => 1,
1645 on_activate => sub { exit }, 1899 on_activate => sub { Event::unloop_all },
1646 ); 1900 );
1647 } 1901 }
1648 1902
1649 $QUIT_DIALOG->show; 1903 $QUIT_DIALOG->show;
1650 $QUIT_DIALOG->grab_focus; 1904 $QUIT_DIALOG->grab_focus;
… …
1683 expand => 1, fontsize => 0.8, padding_x => 4, padding_y => 4); 1937 expand => 1, fontsize => 0.8, padding_x => 4, padding_y => 4);
1684 $viewer->add_paragraph (CFPlus::Pod::as_paragraphs CFPlus::Pod::section_of $tod[$todindex]); 1938 $viewer->add_paragraph (CFPlus::Pod::as_paragraphs CFPlus::Pod::section_of $tod[$todindex]);
1685 1939
1686 $vbox->add (my $table = new CFPlus::UI::Table col_expand => [0, 1]); 1940 $vbox->add (my $table = new CFPlus::UI::Table col_expand => [0, 1]);
1687 1941
1688 $table->add (0, 0, new CFPlus::UI::Button 1942 $table->add_at (0, 0, new CFPlus::UI::Button
1689 text => "Close", 1943 text => "Close",
1690 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>.", 1944 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>.",
1691 on_activate => $close, 1945 on_activate => $close,
1692 ); 1946 );
1693 1947
1694 $table->add (2, 0, new CFPlus::UI::Button 1948 $table->add_at (2, 0, new CFPlus::UI::Button
1695 text => "Next", 1949 text => "Next",
1696 tooltip => "Show the next <b>Tip of the day</b>.", 1950 tooltip => "Show the next <b>Tip of the day</b>.",
1697 on_activate => sub { 1951 on_activate => sub {
1698 $close->(); 1952 $close->();
1699 &show_tip_of_the_day; 1953 &show_tip_of_the_day;
… …
1708 CFPlus::SDL_Init 1962 CFPlus::SDL_Init
1709 and die "SDL::Init failed!\n"; 1963 and die "SDL::Init failed!\n";
1710} 1964}
1711 1965
1712sub video_init { 1966sub video_init {
1713 sdl_init;
1714
1715 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} >= @SDL_MODES; 1967 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} >= @SDL_MODES;
1716 1968
1717 my ($old_w, $old_h) = ($WIDTH, $HEIGHT); 1969 my ($old_w, $old_h) = ($WIDTH, $HEIGHT);
1718 1970
1719 ($WIDTH, $HEIGHT) = @{ $SDL_MODES[$CFG->{sdl_mode}] }; 1971 ($WIDTH, $HEIGHT, my ($rgb, $alpha)) = @{ $SDL_MODES[$CFG->{sdl_mode}] };
1720 $FULLSCREEN = $CFG->{fullscreen}; 1972 $FULLSCREEN = $CFG->{fullscreen};
1721 $FAST = $CFG->{fast}; 1973 $FAST = $CFG->{fast};
1722 1974
1723 CFPlus::SDL_SetVideoMode $WIDTH, $HEIGHT, $FULLSCREEN 1975 CFPlus::SDL_SetVideoMode $WIDTH, $HEIGHT, $rgb, $alpha, $FULLSCREEN
1724 or die "SDL_SetVideoMode failed: " . (CFPlus::SDL_GetError) . "\n"; 1976 or die "SDL_SetVideoMode failed: " . (CFPlus::SDL_GetError) . "\n";
1725 1977
1726 $SDL_ACTIVE = 1; 1978 $SDL_ACTIVE = 1;
1727 $LAST_REFRESH = time - 0.01; 1979 $LAST_REFRESH = time - 0.01;
1728 1980
1729 CFPlus::OpenGL::init; 1981 CFPlus::OpenGL::init;
1982 CFPlus::Macro::init;
1730 1983
1731 $FONTSIZE = int $HEIGHT / 40 * $CFG->{gui_fontsize}; 1984 $FONTSIZE = int $HEIGHT / 40 * $CFG->{gui_fontsize};
1732 1985
1733 $CFPlus::UI::ROOT->configure (0, 0, $WIDTH, $HEIGHT);#d# 1986 $CFPlus::UI::ROOT->configure (0, 0, $WIDTH, $HEIGHT);#d#
1734 1987
1735 ############################################################################# 1988 #############################################################################
1736 1989
1737 if ($DEBUG_STATUS) { 1990 if ($DEBUG_STATUS) {
1738 CFPlus::UI::rescale_widgets $WIDTH / $old_w, $HEIGHT / $old_h; 1991 CFPlus::UI::rescale_widgets $WIDTH / $old_w, $HEIGHT / $old_h;
1739 } else { 1992 } else {
1740 # create the widgets 1993 # create/configure the widgets
1994
1995 $CFPlus::UI::ROOT->connect (key_down => sub {
1996 my (undef, $ev) = @_;
1997
1998 if (my @macros = CFPlus::Macro::find $ev) {
1999 CFPlus::Macro::execute $_ for @macros;
2000
2001 return 1;
2002 }
2003
2004 0
2005 });
1741 2006
1742 $DEBUG_STATUS = new CFPlus::UI::Label 2007 $DEBUG_STATUS = new CFPlus::UI::Label
1743 padding => 0, 2008 padding => 0,
1744 z => 100, 2009 z => 100,
1745 force_x => "max", 2010 force_x => "max",
… …
1770 2035
1771 $MAPWIDGET = new CFPlus::MapWidget; 2036 $MAPWIDGET = new CFPlus::MapWidget;
1772 $MAPWIDGET->connect (activate_console => sub { 2037 $MAPWIDGET->connect (activate_console => sub {
1773 my ($mapwidget, $preset) = @_; 2038 my ($mapwidget, $preset) = @_;
1774 2039
1775 if ($CONSOLE) { 2040 $MESSAGE_WINDOW->activate_console ($preset)
1776 $CONSOLE->{input}->{auto_activated} = 1; 2041 if $MESSAGE_WINDOW;
1777 $CONSOLE->{input}->grab_focus;
1778
1779 if ($preset && $CONSOLE->{input}->get_text eq '') {
1780 $CONSOLE->{input}->set_text ($preset);
1781 }
1782 }
1783 }); 2042 });
1784 $MAPWIDGET->show; 2043 $MAPWIDGET->show;
1785 $MAPWIDGET->grab_focus; 2044 $MAPWIDGET->grab_focus;
1786 2045
1787 $LOGVIEW = new CFPlus::UI::TextScroller 2046 $COMPLETER = new CFPlus::MapWidget::Command::
1788 expand => 1, 2047 command => { },
1789 font => $FONT_FIXED, 2048 tooltip => "#completer_help",
1790 fontsize => $::CFG->{log_fontsize},
1791 indent => -4,
1792 can_hover => 1,
1793 can_events => 1,
1794 max_par => $CFG->{logview_max_par},
1795 tooltip => "<b>Server Log</b>. This text viewer contains all recent messages sent by the server.",
1796 ; 2049 ;
1797 2050
1798 $SETUP_DIALOG = new CFPlus::UI::Toplevel 2051 $SETUP_DIALOG = new CFPlus::UI::Toplevel
1799 title => "Setup", 2052 title => "Setup",
1800 name => "setup_dialog", 2053 name => "setup_dialog",
… …
1805 force_h => $::HEIGHT * 0.6, 2058 force_h => $::HEIGHT * 0.6,
1806 has_close_button => 1, 2059 has_close_button => 1,
1807 ; 2060 ;
1808 2061
1809 $METASERVER = metaserver_dialog; 2062 $METASERVER = metaserver_dialog;
2063 $MESSAGE_WINDOW = new CFPlus::UI::MessageWindow;
1810 2064
1811 $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new CFPlus::UI::Notebook expand => 1, debug => 1, 2065 $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new CFPlus::UI::Notebook expand => 1, debug => 1,
1812 filter => new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1); 2066 filter => new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1);
1813 2067
1814 $SETUP_NOTEBOOK->add (Server => $SETUP_SERVER = server_setup, 2068 $SETUP_NOTEBOOK->add_tab (Server => $SETUP_SERVER = server_setup,
1815 "Configure the server to play on, your username, password and other server-related options."); 2069 "Configure the server to play on, your username, password and other server-related options.");
1816 $SETUP_NOTEBOOK->add (Client => client_setup, 2070 $SETUP_NOTEBOOK->add_tab (Client => client_setup,
1817 "Configure various client-specific settings."); 2071 "Configure various client-specific settings.");
1818 $SETUP_NOTEBOOK->add (Graphics => graphics_setup, 2072 $SETUP_NOTEBOOK->add_tab (Graphics => graphics_setup,
1819 "Configure the video mode, performance, fonts and other graphical aspects of the game."); 2073 "Configure the video mode, performance, fonts and other graphical aspects of the game.");
1820 $SETUP_NOTEBOOK->add (Audio => audio_setup, 2074 $SETUP_NOTEBOOK->add_tab (Audio => audio_setup,
1821 "Configure the use of audio, sound effects and background music."); 2075 "Configure the use of audio, sound effects and background music.");
1822 $SETUP_NOTEBOOK->add (Keyboard => $SETUP_KEYBOARD = keyboard_setup, 2076 $SETUP_NOTEBOOK->add_tab (Keyboard => $SETUP_KEYBOARD = keyboard_setup,
1823 "Lets you define, edit and delete key bindings." 2077 "Lets you define, edit and delete key bindings."
1824 . "There is a shortcut for making bindings: <b>Control-Insert</b> opens the binding editor " 2078 . "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 " 2079 . "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. " 2080 . "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 " 2081 . "After pressing the combo the binding will be saved automatically and the "
1828 . "binding editor closes"); 2082 . "binding editor closes");
1829 $SETUP_NOTEBOOK->add (Debug => debug_setup, 2083 $SETUP_NOTEBOOK->add_tab (Debug => debug_setup,
1830 "Some debuggin' options. Do not ask."); 2084 "Some debuggin' options. Do not ask.");
1831 2085
1832 $BUTTONBAR = new CFPlus::UI::Buttonbar x => 0, y => 0, z => 200; # put on top 2086 $BUTTONBAR = new CFPlus::UI::Buttonbar x => 0, y => 0, z => 200; # put on top
1833 2087
1834 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Setup", other => $SETUP_DIALOG, 2088 $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."); 2089 tooltip => "Toggles a dialog where you can configure all aspects of this client.");
1836 2090
1837 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW = message_window, 2091 $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."); 2092 tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server.");
1839 2093
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 2094 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 2095
1842 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Playerbook", other => player_window, 2096 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Playerbook", other => player_window,
… …
1862 tooltip => "Terminates the program", 2116 tooltip => "Terminates the program",
1863 on_activate => sub { 2117 on_activate => sub {
1864 if ($CONN) { 2118 if ($CONN) {
1865 open_quit_dialog; 2119 open_quit_dialog;
1866 } else { 2120 } else {
1867 exit; 2121 Event::unloop_all;
1868 } 2122 }
1869 0 2123 0
1870 }, 2124 },
1871 ); 2125 );
1872 2126
1873 $BUTTONBAR->show; 2127 $BUTTONBAR->show;
1874 $SETUP_DIALOG->show; 2128 $SETUP_DIALOG->show;
2129 $MESSAGE_WINDOW->show;
1875 } 2130 }
1876 2131
1877 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]); 2132 $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} 2133}
1998 2134
1999sub video_shutdown { 2135sub video_shutdown {
2000 CFPlus::OpenGL::shutdown; 2136 CFPlus::OpenGL::shutdown;
2001 2137
2002 undef $SDL_ACTIVE; 2138 undef $SDL_ACTIVE;
2003} 2139}
2004 2140
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; 2141my %animate_object;
2068my $animate_timer; 2142my $animate_timer;
2069 2143
2070my $fps = 9; 2144my $fps = 9;
2071 2145
2072my %demo;#d#
2073
2074sub force_refresh { 2146sub force_refresh {
2147 if ($ENV{CFPLUS_DEBUG} & 4) {
2075 $fps = $fps * 0.95 + 1 / (($NOW - $LAST_REFRESH) || 0.1) * 0.05; 2148 $fps = $fps * 0.98 + 1 / (($NOW - $LAST_REFRESH) || 0.1) * 0.02;
2076 debug sprintf "%3.2f", $fps if $ENV{CFPLUS_DEBUG} & 4; 2149 debug sprintf "%3.2f", $fps;
2150 }
2077 2151
2078 $CFPlus::UI::ROOT->draw; 2152 $CFPlus::UI::ROOT->draw;
2079 2153 CFPlus::SDL_GL_SwapBuffers;
2080 $WANT_REFRESH = 0;
2081 $CAN_REFRESH = 0;
2082 $LAST_REFRESH = $NOW; 2154 $LAST_REFRESH = $NOW;
2083 2155 $WANT_REFRESH->stop;
2084 CFPlus::SDL_GL_SwapBuffers;
2085} 2156}
2086 2157
2158$WANT_REFRESH = Event->idle (min => 0.001, max => 0.06, parked => 1, cb => \&force_refresh);
2159
2087my $refresh_watcher = Event->timer (after => 0, hard => 0, interval => 1 / $MAX_FPS, cb => sub { 2160my $input = Event->timer (after => 0, hard => 0, interval => 1 / 50, cb => sub {
2088 $NOW = time; 2161 $NOW = time;
2089 2162
2090 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_) 2163 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_)
2091 for CFPlus::SDL_PollEvent; 2164 for CFPlus::poll_events;
2092 2165
2093 if (%animate_object) { 2166 if (%animate_object) {
2094 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object; 2167 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object;
2095 $WANT_REFRESH++; 2168 $WANT_REFRESH->start;
2096 }
2097
2098 if ($WANT_REFRESH) {
2099 force_refresh;
2100 } else {
2101 $CAN_REFRESH = 1;
2102 } 2169 }
2103}); 2170});
2104 2171
2105sub animation_start { 2172sub animation_start {
2106 my ($widget) = @_; 2173 my ($widget) = @_;
… …
2110sub animation_stop { 2177sub animation_stop {
2111 my ($widget) = @_; 2178 my ($widget) = @_;
2112 delete $animate_object{$widget}; 2179 delete $animate_object{$widget};
2113} 2180}
2114 2181
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 = ( 2182%SDL_CB = (
2125 CFPlus::SDL_QUIT => sub { 2183 CFPlus::SDL_QUIT => sub {
2126 exit; 2184 Event::unloop_all;
2127 }, 2185 },
2128 CFPlus::SDL_VIDEORESIZE => sub { 2186 CFPlus::SDL_VIDEORESIZE => sub {
2129 }, 2187 },
2130 CFPlus::SDL_VIDEOEXPOSE => sub { 2188 CFPlus::SDL_VIDEOEXPOSE => sub {
2131 CFPlus::UI::full_refresh; 2189 CFPlus::UI::full_refresh;
2132 }, 2190 },
2133 CFPlus::SDL_ACTIVEEVENT => sub { 2191 CFPlus::SDL_ACTIVEEVENT => sub {
2134# not useful, as APPACTIVE include sonly iconified state, not unmapped 2192# not useful, as APPACTIVE include sonly iconified state, not unmapped
2135# printf "active %x %x\n", $_[0]{gain}, $_[0]{state};#d# 2193# printf "active %x %x %x\n", $_[0]{gain}, $_[0]{state}, CFPlus::SDL_GetAppState;#d#
2194# printf "a %x\n", CFPlus::SDL_GetAppState & CFPlus::SDL_APPACTIVE;#d#
2136# printf "A\n" if $_[0]{state} & CFPlus::SDL_APPACTIVE; 2195# printf "A\n" if $_[0]{state} & CFPlus::SDL_APPACTIVE;
2137# printf "K\n" if $_[0]{state} & CFPlus::SDL_APPINPUTFOCUS; 2196# printf "K\n" if $_[0]{state} & CFPlus::SDL_APPINPUTFOCUS;
2138# printf "M\n" if $_[0]{state} & CFPlus::SDL_APPMOUSEFOCUS; 2197# printf "M\n" if $_[0]{state} & CFPlus::SDL_APPMOUSEFOCUS;
2139 }, 2198 },
2140 CFPlus::SDL_KEYDOWN => sub { 2199 CFPlus::SDL_KEYDOWN => sub {
… …
2169 CFPlus::DB::Server::run; 2228 CFPlus::DB::Server::run;
2170 2229
2171 CFPlus::UI::set_layout ($::CFG->{layout}); 2230 CFPlus::UI::set_layout ($::CFG->{layout});
2172 2231
2173 my %DEF_CFG = ( 2232 my %DEF_CFG = (
2174 sdl_mode => 0, 2233 sdl_mode => 0,
2175 width => 640,
2176 height => 480,
2177 fullscreen => 0, 2234 fullscreen => 0,
2178 fast => 0, 2235 fast => 0,
2236 force_opengl11 => undef,
2237 texture_compression => 1,
2179 map_scale => 1, 2238 map_scale => 1,
2180 fow_enable => 1, 2239 fow_enable => 1,
2181 fow_intensity => 0.45, 2240 fow_intensity => 0,
2182 fow_smooth => 0,
2183 map_smoothing => 1, 2241 map_smoothing => 1,
2184 gui_fontsize => 1, 2242 gui_fontsize => 1,
2185 log_fontsize => 0.7, 2243 log_fontsize => 0.7,
2186 gauge_fontsize => 1, 2244 gauge_fontsize => 1,
2187 gauge_size => 0.35, 2245 gauge_size => 0.35,
2188 stat_fontsize => 0.7, 2246 stat_fontsize => 0.7,
2189 mapsize => 100, 2247 mapsize => 100,
2190 say_command => 'chat',
2191 audio_enable => 1, 2248 audio_enable => 1,
2249 effects_enable => 1,
2250 effects_volume => 1,
2192 bgm_enable => 1, 2251 bgm_enable => 1,
2193 bgm_volume => 0.25, 2252 bgm_volume => 0.5,
2194 face_prefetch => 0,
2195 output_sync => 1, 2253 output_sync => 1,
2196 output_count => 1, 2254 output_count => 1,
2197 output_rate => "", 2255 output_rate => "",
2198 pickup => 0, 2256 pickup => 0,
2199 inv_sort => "mtime", 2257 inv_sort => "mtime",
2200 default => "profile", # default profile 2258 default => "profile", # default profile
2201 show_tips => 1, 2259 show_tips => 1,
2202 logview_max_par => 1000, 2260 logview_max_par => 1000,
2203 ); 2261 );
2204 2262
2205 while (my ($k, $v) = each %DEF_CFG) { 2263 while (my ($k, $v) = each %DEF_CFG) {
2206 $CFG->{$k} = $v unless exists $CFG->{$k}; 2264 $CFG->{$k} = $v unless exists $CFG->{$k};
2207 } 2265 }
… …
2221 } 2279 }
2222 } 2280 }
2223 2281
2224 sdl_init; 2282 sdl_init;
2225 2283
2226 @SDL_MODES = reverse 2284 @SDL_MODES = CFPlus::SDL_ListModes 8, 8;
2227 grep $_->[0] >= 640 && $_->[1] >= 480, 2285 @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)"; 2286 @SDL_MODES or CFPlus::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)";
2287
2288 @SDL_MODES = sort { $a->[0] * $a->[1] <=> $b->[0] * $b->[1] } @SDL_MODES;
2231 2289
2232 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES; 2290 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES;
2233 2291
2234 { 2292 {
2235 my @fonts = map CFPlus::find_rcfile "fonts/$_", qw( 2293 my @fonts = map CFPlus::find_rcfile "fonts/$_", qw(
… …
2264# } 2322# }
2265# my $t2 = Time::HiRes::time; 2323# my $t2 = Time::HiRes::time;
2266# warn $t2-$t1; 2324# warn $t2-$t1;
2267# } 2325# }
2268 2326
2269 $startup_done->();
2270
2271 video_init; 2327 video_init;
2272 audio_init; 2328 audio_init;
2273} 2329}
2274 2330
2275show_tip_of_the_day if $CFG->{show_tips}; 2331show_tip_of_the_day if $CFG->{show_tips};
2276 2332
2333Event->idle (cb => sub {
2334 $_[0]->w->cancel;
2335 $startup_done->();
2336});
2337
2277Event::loop; 2338Event::loop;
2339
2340#video_shutdown;
2341#audio_shutdown;
2278#CFPlus::SDL_Quit; 2342CFPlus::SDL_Quit;
2279#CFPlus::_exit 0;
2280
2281END {
2282 CFPlus::SDL_Quit;
2283 CFPlus::DB::Server::stop; 2343CFPlus::DB::Server::stop;
2284}
2285 2344
2286=head1 NAME 2345=head1 NAME
2287 2346
2288cfplus - A Crossfire+ and Crossfire game client 2347cfplus - A Crossfire TRT and Crossfire game client
2289 2348
2290=head1 SYNOPSIS 2349=head1 SYNOPSIS
2291 2350
2292Just run it - no commandline arguments are supported. 2351Just run it - no commandline arguments are supported.
2293 2352
2294=head1 USAGE 2353=head1 USAGE
2295 2354
2296cfplus utilises OpenGL for all UI elements and the game. It is supposed to be used 2355cfplus utilises OpenGL for all UI elements and the game. It is supposed to
2297fullscreen and interactively. 2356be used in fullscreen mode and interactively.
2298 2357
2299=head1 DEBUGGING 2358=head1 DEBUGGING
2300 2359
2301 2360
2302CFPLUS_DEBUG - environment variable 2361CFPLUS_DEBUG - environment variable

Diff Legend

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