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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines