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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines