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.75 by root, Sun Jun 18 17:23:36 2006 UTC vs.
Revision 1.220 by root, Tue Aug 21 02:39:17 2007 UTC

1#!/opt/bin/perl 1#!/opt/bin/perl
2
3my $startup_done = sub { };
4our $PANGO = "1.5.0";
5
6# do splash-screen thingy on win32
7BEGIN {
8 if (%PAR::LibCache && $^O eq "MSWin32") {
9 while (my ($filename, $zip) = each %PAR::LibCache) {
10 $zip->extractMember ("SPLASH.bmp", "$ENV{PAR_TEMP}/SPLASH.bmp");
11 }
12
13 require Win32::GUI::SplashScreen;
14
15 Win32::GUI::SplashScreen::Show (
16 -file => "$ENV{PAR_TEMP}/SPLASH.bmp",
17 );
18
19 $startup_done = sub {
20 Win32::GUI::SplashScreen::Done (1);
21 };
22 }
23}
2 24
3use strict; 25use strict;
4use utf8; 26use utf8;
27
28use Carp 'verbose';
5 29
6# do things only needed for single-binary version (par) 30# do things only needed for single-binary version (par)
7BEGIN { 31BEGIN {
8 if (%PAR::LibCache) { 32 if (%PAR::LibCache) {
9 @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
10 34
35 my $tmp = $ENV{PAR_TEMP};
36
11 while (my ($filename, $zip) = each %PAR::LibCache) { 37 while (my ($filename, $zip) = each %PAR::LibCache) {
12 for ($zip->memberNames) { 38 for ($zip->memberNames) {
13 next unless /^\/root\/(.*)/; 39 next unless /^root\/(.*)/;
14 $zip->extractMember ($_, "$ENV{PAR_TEMP}/$1") 40 $zip->extractMember ($_, "$tmp/$1")
15 unless -e "$ENV{PAR_TEMP}/$1"; 41 unless -e "$tmp/$1";
16 } 42 }
17 } 43 }
18 44
19 # 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
20 54
21 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;
22 } 67 }
23} 68}
24 69
25# 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
26unshift @INC, $ENV{PAR_TEMP} 71unshift @INC, $ENV{PAR_TEMP}
27 if %PAR::LibCache; 72 if %PAR::LibCache;
28 73
29use Time::HiRes 'time'; 74use Time::HiRes 'time';
30use Event; 75use Event;
76use List::Util qw(max min);
31 77
32use Crossfire; 78use Crossfire;
33use Crossfire::Protocol::Constants; 79use Crossfire::Protocol::Constants;
34 80
35use Compress::LZF; 81use Compress::LZF;
36 82
37use CFClient; 83use CFPlus;
38use CFClient::OpenGL (); 84use CFPlus::OpenGL ();
39use CFClient::Protocol; 85use CFPlus::Protocol;
86use CFPlus::DB;
40use CFClient::UI; 87use CFPlus::UI;
88use CFPlus::UI::Canvas;
89use CFPlus::UI::Inventory;
90use CFPlus::UI::SpellList;
91use CFPlus::UI::MessageWindow;
92use CFPlus::Pod;
41use CFClient::MapWidget; 93use CFPlus::MapWidget;
94use CFPlus::Macro;
42 95
43$SIG{QUIT} = sub { Carp::cluck "QUIT" }; 96$SIG{QUIT} = sub { Carp::cluck "QUIT" };
97$SIG{PIPE} = 'IGNORE';
44 98
99$Event::Eval = 1;
45$Event::DIED = sub { 100$Event::DIED = sub {
46 # TODO: display dialog box or so 101 CFPlus::fatal Carp::longmess $_[1]
47 Carp::confess $_[1];#d#TODO: remove when stable
48 CFClient::error $_[1];
49}; 102};
50
51#$SIG{__WARN__} = sub { Carp::cluck $_[0] };#d#
52
53our $VERSION = '0.1';
54 103
55my $MAX_FPS = 60; 104my $MAX_FPS = 60;
56my $MIN_FPS = 5; # unused as of yet 105my $MIN_FPS = 5; # unused as of yet
57 106
58our $META_SERVER = "crossfire.real-time.com:13326"; 107our $META_SERVER = "http://metaserver.schmorp.de/current.json";
59 108
60our $LAST_REFRESH; 109our $LAST_REFRESH;
61our $NOW; 110our $NOW;
62 111
63our $CFG; 112our $CFG;
64our $CONN; 113our $CONN;
114our $PROFILE; # current profile
65our $FAST; # fast, low-quality mode, possibly useful for software-rendering 115our $FAST; # fast, low-quality mode, possibly useful for software-rendering
66 116
67our $WANT_REFRESH; 117our $WANT_REFRESH;
68our $CAN_REFRESH;
69 118
70our @SDL_MODES; 119our @SDL_MODES;
71our $WIDTH; 120our $WIDTH;
72our $HEIGHT; 121our $HEIGHT;
73our $FULLSCREEN; 122our $FULLSCREEN;
78 127
79our $MAP; 128our $MAP;
80our $MAPMAP; 129our $MAPMAP;
81our $MAPWIDGET; 130our $MAPWIDGET;
82our $BUTTONBAR; 131our $BUTTONBAR;
83our $LOGVIEW;
84our $CONSOLE;
85our $METASERVER; 132our $METASERVER;
86our $LOGIN_BUTTON; 133our $LOGIN_BUTTON;
87our $QUIT_DIALOG; 134our $QUIT_DIALOG;
88our $HOST_ENTRY; 135our $HOST_ENTRY;
136our $FULLSCREEN_ENABLE;
137our $PICKUP_ENABLE;
89our $SERVER_INFO; 138our $SERVER_INFO;
90 139
91our $SETUP_DIALOG; 140our $SETUP_DIALOG;
92our $SETUP_NOTEBOOK; 141our $SETUP_NOTEBOOK;
93our $SETUP_SERVER; 142our $SETUP_SERVER;
94our $SETUP_KEYBOARD; 143our $SETUP_KEYBOARD;
95our $SETUP_SPELLS;
96 144
145our $PL_NOTEBOOK;
97our $STATS_WINDOW; 146our $PL_WINDOW;
147
148our $MUSIC_PLAYING_WIDGET;
149our $LICENSE_WIDGET;
150
151our $INVENTORY_PAGE;
152our $STATS_PAGE;
153our $SKILL_PAGE;
154our $SPELL_PAGE;
155our $SPELL_LIST;
156
157our $HELP_WINDOW;
98our $MESSAGE_WINDOW; 158our $MESSAGE_WINDOW;
99our $FLOORBOX; 159our $FLOORBOX;
100our $GAUGES; 160our $GAUGES;
101our $STATWIDS; 161our $STATWIDS;
102 162
103our $SDL_ACTIVE; 163our $SDL_ACTIVE;
104our %SDL_CB; 164our %SDL_CB;
105 165
106our $SDL_MIXER;
107our @SOUNDS; # event => file mapping
108our %AUDIO_CHUNKS; # audio files
109
110our $ALT_ENTER_MESSAGE; 166our $ALT_ENTER_MESSAGE;
111our $STATUSBOX; 167our $STATUSBOX;
112our $DEBUG_STATUS; 168our $DEBUG_STATUS;
113 169
114our $INV_WINDOW;
115our $INV; 170our $INV;
116our $INVR; 171our $INVR;
117our $INV_RIGHT_HB; 172our $INVR_HB;
118 173
119our $BIND_EDITOR; 174#############################################################################
120
121our $PICKUP_CFG;
122 175
123sub status { 176sub status {
124 $STATUSBOX->add (CFClient::UI::Label::escape $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]); 177 $STATUSBOX->add (CFPlus::asxml $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]);
125} 178}
126 179
127sub debug { 180sub debug {
128 $DEBUG_STATUS->set_text ($_[0]); 181 $DEBUG_STATUS->set_text ($_[0]);
129} 182}
183
184sub message {
185 my ($para) = @_;
186 $MESSAGE_WINDOW->message ($para);
187}
188
189#############################################################################
190#TODO: maybe move into own audio module...
191
192our $SDL_MIXER;
193
194our $MUSIC_DEFAULT = "in_a_heartbeat.ogg";
195our $MUSIC_WANT; # arryref of ambient music we want to play
196our @MUSIC_HAVE; # ambient music we have on disk
197our $MUSIC_START;
198our @MUSIC_JINGLE; # which jingles to play next
199our $MUSIC_PLAYING_DATA;
200our $MUSIC_PLAYING_META;
201our $MUSIC_PLAYER;
202our $MUSIC_RESUME = 30; # resume music when played less than these many seconds before
203
204our %AUDIO_CHUNK; # audio "files"
205our %AUDIO_PLAY; # which audio faces should be played
206
207sub audio_channel_finished {
208 my ($channel) = @_;
209
210# warn "channel $channel finished\n";#d#
211}
212
213sub audio_sound_push($) {
214 my ($face) = @_;
215
216 $CFG->{effects_enable}
217 or return;
218
219 $AUDIO_PLAY{$face}
220 or return;
221
222 if (my $chunk = $AUDIO_CHUNK{$face}) {
223 for (grep $_->[0] >= Event::time, @{(delete $AUDIO_PLAY{$face}) || []}) {
224 my (undef, $dx, $dy, $vol) = @$_;
225
226 my $channel = CFPlus::Channel::find;
227 $channel->volume ($vol * $CFG->{effects_volume} * 128 / 255);
228 $channel->set_position_r ($dx, $dy, 20);
229 $chunk->play ($channel);
230 }
231 } else {
232 # sound_meta not set means data is in flight either way
233 my $meta = $CONN->{face}[$face]
234 or return;
235
236 $meta->{data}
237 or return;
238
239 # if its a jingle, play it as ambient music
240 if ($meta->{data}{jingle}) {
241 if (delete $AUDIO_PLAY{$face}) { # take the jingle out of the sound queue
242 push @MUSIC_JINGLE, $meta; # push it oto the music/jingle queue
243 &audio_music_push ($face);
244 }
245 } else {
246 # fetch from database
247 CFPlus::DB::get res_data => $meta->{name}, sub {
248 my $rwops = new CFPlus::RW $_[0];
249 my $chunk = new CFPlus::MixChunk $rwops
250 or Carp::confess "sound face " . (JSON::XS::to_json $meta) . " unloadable: " . CFPlus::Mix_GetError;
251 $chunk->volume (($meta->{data}{volume} || 1) * 128);
252 $AUDIO_CHUNK{$face} = $chunk;
253
254 audio_sound_push ($face);
255 };
256 }
257 }
258}
259
260sub audio_sound_play {
261 my ($face, $dx, $dy, $vol) = @_;
262
263 $SDL_MIXER
264 or return;
265 $CFG->{effects_enable}
266 or return;
267
268 my $queue = $AUDIO_PLAY{$face} ||= [];
269 push @$queue, [Event::time + 0.6, $dx, $dy, $vol]; # do not play sound for outdated events
270 audio_sound_push $face
271 unless @$queue > 1;
272}
273
274sub audio_music_set_meta {
275 my ($meta) = @_;
276
277 $MUSIC_PLAYING_META = $meta;
278 $MUSIC_PLAYING_WIDGET->set_markup (
279 "<b>Name</b>: " . (CFPlus::asxml $meta->{data}{name}) . "\n"
280 . "<b>Author</b>: " . (CFPlus::asxml $meta->{data}{author}) . "\n"
281 . "<b>Source</b>: " . (CFPlus::asxml $meta->{data}{source}) . "\n"
282 . "<b>License</b>: " . (CFPlus::asxml $meta->{data}{license})
283 );
284}
285
286sub audio_music_update_volume {
287 return unless $MUSIC_PLAYING_META;
288 my $volume = $MUSIC_PLAYING_META->{data}{volume} || 1;
289 my $base = $MUSIC_PLAYING_META->{data}{jingle} ? 1 : $CFG->{bgm_volume};
290 CFPlus::MixMusic::volume $base * $volume * 128;
291}
292
293sub audio_music_start {
294 my $meta = $MUSIC_PLAYING_META;
295
296 CFPlus::DB::get res_data => $meta->{name}, sub {
297 return unless $SDL_MIXER;
298
299 # music might have changed...
300 $meta eq $MUSIC_PLAYING_META
301 or return &audio_music_start ();
302
303 audio_music_update_volume;
304
305 $MUSIC_PLAYING_DATA = \$_[0];
306
307 my $rwops = $meta->{path}
308 ? new_from_file CFPlus::RW $meta->{path}
309 : new CFPlus::RW $$MUSIC_PLAYING_DATA;
310
311 $MUSIC_PLAYER = new CFPlus::MixMusic $rwops
312 or Carp::confess "music face $meta->{face} unloadable: " . CFPlus::Mix_GetError;
313
314 my $NOW = time;
315
316 if ($MUSIC_PLAYING_META->{stop_time} > $NOW - $MUSIC_RESUME) {
317 my $pos = $MUSIC_PLAYING_META->{stop_pos};
318 $MUSIC_PLAYER->fade_in_pos (0, 1000, $pos);
319 $MUSIC_START = time - $pos;
320 } else {
321 $MUSIC_PLAYER->play (0);
322 $MUSIC_START = time;
323 }
324
325 delete $meta->{stop_time};
326 delete $meta->{stop_pos};
327 }
328}
329
330sub audio_music_push {
331 return unless $SDL_MIXER;
332
333 my $fade_out;
334
335 if (@MUSIC_JINGLE) {
336 @MUSIC_HAVE = $MUSIC_JINGLE[0];
337 $fade_out = 333;
338 } else {
339 return unless $CFG->{bgm_enable};
340
341 my @have =
342 grep $_ && $_->{data},
343 map $CONN->{face}[$_],
344 @$MUSIC_WANT;
345
346 @MUSIC_HAVE = @have
347 if @have;
348
349 # default MUSIC_HAVE == MUSIC_DEFAULT
350 @MUSIC_HAVE = { path => CFPlus::find_rcfile "music/$MUSIC_DEFAULT" } unless @MUSIC_HAVE;
351 $fade_out = 1000;
352 }
353
354 # if the currently playing song is acceptable, let it continue
355 return if grep $MUSIC_PLAYING_META == $_, @MUSIC_HAVE;
356
357 my $NOW = time;
358
359 if ($MUSIC_PLAYING_META) {
360 $MUSIC_PLAYING_META->{stop_time} = $NOW;
361 $MUSIC_PLAYING_META->{stop_pos} = $NOW - $MUSIC_START;
362 CFPlus::MixMusic::fade_out $fade_out;
363 } else {
364 # sort by stop time, oldest first
365 @MUSIC_HAVE = sort { $a->{stop_time} <=> $b->{stop_time} } @MUSIC_HAVE;
366
367 # if the most recently-played piece played very recently,
368 # resume it, else choose the oldest piece for rotation.
369 audio_music_set_meta
370 $MUSIC_HAVE[-1]{stop_time} > $NOW - $MUSIC_RESUME
371 ? $MUSIC_HAVE[-1]
372 : $MUSIC_HAVE[0];
373
374 audio_music_start;
375 }
376}
377
378sub audio_music_set_ambient {
379 my ($songs) = @_;
380
381 $MUSIC_WANT = $songs;
382 audio_music_push;
383}
384
385sub audio_music_finished {
386 # we compress multiple jingles of the same type
387 shift @MUSIC_JINGLE
388 while @MUSIC_JINGLE && $MUSIC_PLAYING_META == $MUSIC_JINGLE[0];
389
390 $MUSIC_PLAYING_WIDGET->clear;
391
392 undef $MUSIC_PLAYER;
393 undef $MUSIC_PLAYING_META;
394 undef $MUSIC_PLAYING_DATA;
395
396 audio_music_push;
397}
398
399sub audio_init {
400 if ($CFG->{audio_enable}) {
401 $ENV{MIX_EFFECTSMAXSPEED} = 1;
402 $SDL_MIXER = !CFPlus::Mix_OpenAudio;
403
404 unless ($SDL_MIXER) {
405 status "Unable to open sound device: there will be no sound";
406 return;
407 }
408
409 CFPlus::Mix_AllocateChannels 16;
410
411 audio_music_finished;
412 } else {
413 undef $SDL_MIXER;
414 }
415}
416
417sub audio_shutdown {
418 undef $MUSIC_PLAYER;
419 undef $MUSIC_PLAYING_META;
420 undef $MUSIC_PLAYING_DATA;
421
422 $MUSIC_WANT = [];
423 @MUSIC_JINGLE = ();
424 %AUDIO_PLAY = ();
425 %AUDIO_CHUNK = ();
426
427 CFPlus::Mix_CloseAudio if $SDL_MIXER;
428 undef $SDL_MIXER;
429}
430
431#############################################################################
130 432
131sub destroy_query_dialog { 433sub destroy_query_dialog {
132 (delete $_[0]{query_dialog})->destroy 434 (delete $_[0]{query_dialog})->destroy
133 if $_[0]{query_dialog}; 435 if $_[0]{query_dialog};
134} 436}
135 437
438# FIXME: a very ugly hack to wait for stat update look below! #d#
439our $QUERY_TIMER; #d#
440
136# server query dialog 441# server query dialog
137sub server_query { 442sub server_query {
138 my ($conn, $flags, $prompt) = @_; 443 my ($conn, $flags, $prompt) = @_;
139 444
445 # FIXME: a very ugly hack to wait for stat update #d#
446 if ($prompt =~ /roll new stats/ and not $conn->{stat_change_with}) {
447 unless ($QUERY_TIMER) {
448 $QUERY_TIMER =
449 Event->timer (
450 after => 1,
451 cb => sub {
452 server_query ($conn, $flags, $prompt, 1);
453 $QUERY_TIMER = undef
454 }
455 );
456 return;
457 }
458 }
459
140 $conn->{query_dialog} = my $dialog = new CFClient::UI::FancyFrame 460 $conn->{query_dialog} = my $dialog = new CFPlus::UI::Toplevel
141 x => "center", 461 x => "center",
142 y => "center", 462 y => "center",
143 title => "Server Query", 463 title => "Server Query",
144 child => my $vbox = new CFClient::UI::VBox, 464 child => my $vbox = new CFPlus::UI::VBox,
145 ; 465 ;
146 466
147 my @dialog = my $label = new CFClient::UI::Label 467 my @dialog = my $label = new CFPlus::UI::Label
148 max_w => $::WIDTH * 0.4, 468 max_w => $::WIDTH * 0.8,
149 ellipsise => 0, 469 ellipsise => 0,
150 text => $prompt; 470 text => $prompt;
151 471
152 if ($flags & CS_QUERY_YESNO) { 472 if ($flags & CS_QUERY_YESNO) {
153 push @dialog, my $hbox = new CFClient::UI::HBox; 473 push @dialog, my $hbox = new CFPlus::UI::HBox;
154 474
155 $hbox->add (new CFClient::UI::Button 475 $hbox->add (new CFPlus::UI::Button
156 text => "No", 476 text => "No",
157 on_activate => sub { 477 on_activate => sub {
158 $conn->send ("reply n"); 478 $conn->send ("reply n");
159 $dialog->destroy; 479 $dialog->destroy;
160 0 480 0
161 } 481 }
162 ); 482 );
163 $hbox->add (new CFClient::UI::Button 483 $hbox->add (new CFPlus::UI::Button
164 text => "Yes", 484 text => "Yes",
165 on_activate => sub { 485 on_activate => sub {
166 $conn->send ("reply y"); 486 $conn->send ("reply y");
167 destroy_query_dialog $conn; 487 destroy_query_dialog $conn;
168 0 488 0
170 ); 490 );
171 491
172 $dialog->grab_focus; 492 $dialog->grab_focus;
173 493
174 } elsif ($flags & CS_QUERY_SINGLECHAR) { 494 } elsif ($flags & CS_QUERY_SINGLECHAR) {
175 $dialog->{tooltip} = "Press a key (click on the entry to make sure it has keyboard focus)";
176
177 if ($prompt =~ /Now choose a character|Press any key for the next race/i) { 495 if ($prompt =~ /Now choose a character|Press any key for the next race/i) {
178 $MESSAGE_WINDOW->show; 496 $dialog->{tooltip} = "#charcreation_focus";
179 497
180 unshift @dialog, new CFClient::UI::Label 498 unshift @dialog, new CFPlus::UI::Label
181 max_w => $::WIDTH * 0.4, 499 max_w => $::WIDTH * 0.8,
182 ellipsise => 0, 500 ellipsise => 0,
183 markup => "\nOr use your keyboard:\n"; 501 markup => "\nOr use your keyboard and the text entry below:\n";
184 502
185 unshift @dialog, my $table = new CFClient::UI::Table; 503 unshift @dialog, my $table = new CFPlus::UI::Table;
186 504
187 $table->add (0, 0, new CFClient::UI::Button 505 $table->add_at (0, 0, new CFPlus::UI::Button
188 text => "Next Race", 506 text => "Next Race",
189 on_activate => sub { 507 on_activate => sub {
190 $conn->send ("reply n"); 508 $conn->send ("reply n");
191 destroy_query_dialog $conn; 509 destroy_query_dialog $conn;
192 0 510 0
193 }, 511 },
194 ); 512 );
195 $table->add (2, 0, new CFClient::UI::Button 513 $table->add_at (2, 0, new CFPlus::UI::Button
196 text => "Accept", 514 text => "Accept",
197 on_activate => sub { 515 on_activate => sub {
198 $conn->send ("reply d"); 516 $conn->send ("reply d");
199 destroy_query_dialog $conn; 517 destroy_query_dialog $conn;
200 0 518 0
201 }, 519 },
202 ); 520 );
203 521
522 if ($conn->{chargen_race_description}) {
523 unshift @dialog, new CFPlus::UI::Label
524 max_w => $::WIDTH * 0.8,
525 ellipsise => 0,
526 markup => "<span foreground='#ccccff'>$conn->{chargen_race_description}</span>",
527 ;
528 }
529
530 unshift @dialog, new CFPlus::UI::Face
531 face => $conn->{player}{face},
532 bg => [.2, .2, .2, 1],
533 min_w => 64,
534 min_h => 64,
535 ;
536
537 if ($conn->{chargen_race_title}) {
538 unshift @dialog, new CFPlus::UI::Label
539 allign => 1,
540 ellipsise => 0,
541 markup => "<span foreground='#ccccff' size='large'>Race: $conn->{chargen_race_title}</span>",
542 ;
543 }
544
204 unshift @dialog, new CFClient::UI::Label 545 unshift @dialog, new CFPlus::UI::Label
205 max_w => $::WIDTH * 0.4, 546 max_w => $::WIDTH * 0.4,
206 ellipsise => 0, 547 ellipsise => 0,
207 markup => 548 markup => (CFPlus::Pod::section_label ui => "chargen_race"),
208 "<big><b>Character Creation: Race</b></big>\n\n"
209 . "Look at the <b>Messages</b> window to see a description of this race "
210 . "(<small>or hover with your mouse over the bottommost entry in the status area in the lower left area of the screen</small>) "
211 . "and the center of the screen to see how this race looks like "
212 . "(<small>this is below this dialog window, you may need to click on the display area to make it visible</small>).\n\n"
213 . "You can look at another race, or accept this race (you will come back to this race eventually, "
214 . "so you can take your time making this important choice."
215 ; 549 ;
216 550
217 } elsif ($prompt =~ /roll new stats/) { 551 } elsif ($prompt =~ /roll new stats/) {
218 if (my $stat = delete $conn->{stat_change_with}) { 552 if (my $stat = delete $conn->{stat_change_with}) {
219 $conn->send ("reply $stat"); 553 $conn->send ("reply $stat");
220 destroy_query_dialog $conn; 554 destroy_query_dialog $conn;
221 return; 555 return;
222 } 556 }
223 557
224 $STATS_WINDOW->show;
225 $MESSAGE_WINDOW->hide;
226
227 unshift @dialog, new CFClient::UI::Label 558 unshift @dialog, new CFPlus::UI::Label
228 max_w => $::WIDTH * 0.4, 559 max_w => $::WIDTH * 0.4,
229 ellipsise => 0, 560 ellipsise => 0,
230 markup => "\nOr use your keyboard:\n"; 561 markup => "\nOr use your keyboard and the text entry below:\n";
231 562
232 unshift @dialog, my $table = new CFClient::UI::Table; 563 unshift @dialog, my $table = new CFPlus::UI::Table;
233 564
234 # left: re-roll 565 # left: re-roll
235 $table->add (0, 0, new CFClient::UI::Button 566 $table->add_at (0, 0, new CFPlus::UI::Button
236 text => "Roll Again", 567 text => "Roll Again",
237 on_activate => sub { 568 on_activate => sub {
238 $conn->send ("reply y"); 569 $conn->send ("reply y");
239 destroy_query_dialog $conn; 570 destroy_query_dialog $conn;
240 0 571 0
241 }, 572 },
242 ); 573 );
243 574
244 # center: swap stats 575 # center: swap stats
245 my ($sw1, $sw2) = map +(new CFClient::UI::Combobox 576 my ($sw1, $sw2) = map +(new CFPlus::UI::Selector
577 expand => 1,
246 value => $_, 578 value => $_,
247 options => [ 579 options => [
248 [1 => "Str", "Strength ($conn->{stat}{+CS_STAT_STR})"], 580 [1 => "Str", "Strength ($conn->{stat}{+CS_STAT_STR})"],
249 [2 => "Dex", "Dexterity ($conn->{stat}{+CS_STAT_DEX})"], 581 [2 => "Dex", "Dexterity ($conn->{stat}{+CS_STAT_DEX})"],
250 [3 => "Con", "Constitution ($conn->{stat}{+CS_STAT_CON})"], 582 [3 => "Con", "Constitution ($conn->{stat}{+CS_STAT_CON})"],
253 [6 => "Pow", "Power ($conn->{stat}{+CS_STAT_POW})"], 585 [6 => "Pow", "Power ($conn->{stat}{+CS_STAT_POW})"],
254 [7 => "Cha", "Charisma ($conn->{stat}{+CS_STAT_CHA})"], 586 [7 => "Cha", "Charisma ($conn->{stat}{+CS_STAT_CHA})"],
255 ], 587 ],
256 ), 1 .. 2; 588 ), 1 .. 2;
257 589
258 $table->add (2, 0, new CFClient::UI::Button 590 $table->add_at (2, 0, new CFPlus::UI::Button
259 text => "Swap Stats", 591 text => "Swap Stats",
260 on_activate => sub { 592 on_activate => sub {
261 $conn->{stat_change_with} = $sw2->{value}; 593 $conn->{stat_change_with} = $sw2->{value};
262 $conn->send ("reply $sw1->{value}"); 594 $conn->send ("reply $sw1->{value}");
263 destroy_query_dialog $conn; 595 destroy_query_dialog $conn;
264 0 596 0
265 }, 597 },
266 ); 598 );
267 $table->add (2, 1, new CFClient::UI::HBox children => [$sw1, $sw2]); 599 $table->add_at (2, 1, new CFPlus::UI::HBox children => [$sw1, $sw2]);
268 600
269 # right: accept 601 # right: accept
270 $table->add (4, 0, new CFClient::UI::Button 602 $table->add_at (4, 0, new CFPlus::UI::Button
271 text => "Accept", 603 text => "Accept",
272 on_activate => sub { 604 on_activate => sub {
273 $conn->send ("reply n"); 605 $conn->send ("reply n");
274 $STATS_WINDOW->hide; 606 $STATS_PAGE->hide;
275 destroy_query_dialog $conn; 607 destroy_query_dialog $conn;
276 0 608 0
277 }, 609 },
278 ); 610 );
279 611
612 unshift @dialog, my $hbox = new CFPlus::UI::HBox;
613 for (
614 [Str => CS_STAT_STR],
615 [Dex => CS_STAT_DEX],
616 [Con => CS_STAT_CON],
617 [Int => CS_STAT_INT],
618 [Wis => CS_STAT_WIS],
619 [Pow => CS_STAT_POW],
620 [Cha => CS_STAT_CHA],
621 ) {
622 my ($name, $id) = @$_;
623 $hbox->add (new CFPlus::UI::Label
624 markup => "$conn->{stat}{$id} <span foreground='yellow'>$name</span>",
625 align => 0,
626 expand => 1,
627 can_events => 1,
628 can_hover => 1,
629 tooltip => "#stat_$name",
630 );
631 }
632
280 unshift @dialog, new CFClient::UI::Label 633 unshift @dialog, new CFPlus::UI::Label
281 max_w => $::WIDTH * 0.4, 634 max_w => $::WIDTH * 0.4,
282 ellipsise => 0, 635 ellipsise => 0,
283 markup => 636 markup => (CFPlus::Pod::section_label ui => "chargen_stats"),
284 "<big><b>Character Creation: Stats</b></big>\n\n"
285 . "Look at the <b>Stats</b> window to see your basic stats "
286 . "(first column: 1 strength, 2 dexterity, 3 constitution, 4 intelligence, 5 wisdom, 6 power and 7 charisma).\n\n"
287 . "You can create another set of stats, swap two stat values with each other or accept the stats as they are now and continue. "
288 . "Race selection will influence those values later on."
289 ; 637 ;
290 } 638 }
291 639
292 push @dialog, my $entry = new CFClient::UI::Entry 640 push @dialog, my $entry = new CFPlus::UI::Entry
293 on_changed => sub { 641 on_changed => sub {
294 $conn->send ("reply $_[1]"); 642 $conn->send ("reply $_[1]");
295 destroy_query_dialog $conn; 643 destroy_query_dialog $conn;
296 0 644 0
297 }, 645 },
300 $entry->grab_focus; 648 $entry->grab_focus;
301 649
302 } else { 650 } else {
303 $dialog->{tooltip} = "Enter the reply and press return (click on the entry to make sure it has keyboard focus)"; 651 $dialog->{tooltip} = "Enter the reply and press return (click on the entry to make sure it has keyboard focus)";
304 652
305 push @dialog, my $entry = new CFClient::UI::Entry 653 push @dialog, my $entry = new CFPlus::UI::Entry
306 $flags & CS_QUERY_HIDEINPUT ? (hidden => "*") : (), 654 $flags & CS_QUERY_HIDEINPUT ? (hidden => "*") : (),
307 on_activate => sub { 655 on_activate => sub {
308 $conn->send ("reply $_[1]"); 656 $conn->send ("reply $_[1]");
309 destroy_query_dialog $conn; 657 destroy_query_dialog $conn;
310 0 658 0
324 $LOGIN_BUTTON->set_text ("Logout"); 672 $LOGIN_BUTTON->set_text ("Logout");
325 $SETUP_DIALOG->hide; 673 $SETUP_DIALOG->hide;
326 674
327 my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32; 675 my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32;
328 676
329 my ($host, $port) = split /:/, $CFG->{profile}{default}{host}; 677 my ($host, $port) = split /:/, $PROFILE->{host};
330 678
331 $MAP = new CFClient::Map $mapsize, $mapsize; 679 $MAP = new CFPlus::Map;
332 680
333 $CONN = eval { 681 $CONN = eval {
334 new CFClient::Protocol 682 new CFPlus::Protocol
335 host => $host, 683 host => $host,
336 port => $port || 13327, 684 port => $port || 13327,
337 user => $CFG->{profile}{default}{user}, 685 user => $PROFILE->{user},
338 pass => $CFG->{profile}{default}{password}, 686 pass => $PROFILE->{password},
339 mapw => $mapsize, 687 mapw => $mapsize,
340 maph => $mapsize, 688 maph => $mapsize,
341 689
690 client => "cfplus $CFPlus::VERSION $] $^O",
691
342 map_widget => $MAPWIDGET, 692 map_widget => $MAPWIDGET,
343 logview => $LOGVIEW,
344 statusbox => $STATUSBOX, 693 statusbox => $STATUSBOX,
345 map => $MAP, 694 map => $MAP,
346 mapmap => $MAPMAP, 695 mapmap => $MAPMAP,
347 query => \&server_query, 696 query => \&server_query,
348 697
349 sound_play => sub { 698 setup_req => {
350 my ($x, $y, $soundnum, $type) = @_; 699 smoothing => $CFG->{map_smoothing}*1,
351
352 $SDL_MIXER
353 or return;
354
355 my $chunk = $AUDIO_CHUNKS{$SOUNDS[$soundnum]}
356 or return;
357
358 $chunk->play;
359 }, 700 },
360 }; 701 };
361 702
362 if ($CONN) { 703 if ($CONN) {
363 CFClient::lowdelay fileno $CONN->{fh}; 704 CFPlus::lowdelay fileno $CONN->{fh};
364 705
365 status "login successful"; 706 status "login successful";
366 } else { 707 } else {
367 status "unable to connect"; 708 status "unable to connect";
368 stop_game(); 709 stop_game();
371 712
372sub stop_game { 713sub stop_game {
373 $LOGIN_BUTTON->set_text ("Login"); 714 $LOGIN_BUTTON->set_text ("Login");
374 $SETUP_NOTEBOOK->set_current_page ($SETUP_SERVER); 715 $SETUP_NOTEBOOK->set_current_page ($SETUP_SERVER);
375 $SETUP_DIALOG->show; 716 $SETUP_DIALOG->show;
376 $INV_WINDOW->hide; 717 $PL_WINDOW->hide;
377 $SETUP_SPELLS->clear_spells; 718 $SPELL_LIST->clear_spells;
719 $CFPlus::UI::ROOT->emit (stop_game => ! ! $CONN);
720
721 &audio_music_set_ambient ([]);
378 722
379 return unless $CONN; 723 return unless $CONN;
380 724
381 status "connection closed"; 725 status "connection closed";
382 726
383 destroy_query_dialog $CONN; 727 destroy_query_dialog $CONN;
384 $CONN->destroy; 728 $CONN->destroy;
385 $CONN = 0; # false, does not autovivify 729 $CONN = 0; # false, does not autovivify
730
731 undef $MAP;
386} 732}
387 733
388sub graphics_setup { 734sub graphics_setup {
389 my $vbox = new CFClient::UI::VBox; 735 my $vbox = new CFPlus::UI::VBox;
390 736
391 $vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]); 737 $vbox->add (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]);
392 738
739 my $row = 0;
740
741 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "OpenGL Info");
742 $table->add_at (1, $row++, new CFPlus::UI::Label valign => 0, fontsize => 0.8, text => CFPlus::OpenGL::gl_vendor . ", " . CFPlus::OpenGL::gl_version,
743 can_events => 1,
744 tooltip => "<tt><span size='8192'>" . (CFPlus::OpenGL::gl_extensions) . "</span></tt>");
745
746 my $vidmode_tooltip =
747 "<b>Video Mode.</b> The video mode to use for fullscreen (and the window size for windowed operation). "
748 . "The format is <i>width</i> x <i>height</i> \@ <i>depth-per-channel</i> + <i>alpha-channel</i>.";
749
393 $table->add (0, 0, new CFClient::UI::Label valign => 0, align => 1, text => "Video Mode"); 750 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Video Mode");
394 $table->add (1, 0, my $hbox = new CFClient::UI::HBox); 751 $table->add_at (1, $row++, my $hbox = new CFPlus::UI::HBox);
395 752
753 $hbox->add (my $mode_slider = new CFPlus::UI::Slider
396 $hbox->add (my $mode_slider = new CFClient::UI::Slider force_w => $WIDTH * 0.1, expand => 1, range => [$CFG->{sdl_mode}, 0, $#SDL_MODES, 0, 1]); 754 force_w => $WIDTH * 0.1, expand => 1, range => [$CFG->{sdl_mode}, 0, $#SDL_MODES, 0, 1],
397 $hbox->add (my $mode_label = new CFClient::UI::Label align => 0, valign => 0, height => 0.8, template => "9999x9999"); 755 tooltip => $vidmode_tooltip);
756 $hbox->add (my $mode_label = new CFPlus::UI::Label
757 align => 0, valign => 0, height => 0.8, template => "9999x9999@9+9",
758 can_events => 1, tooltip => $vidmode_tooltip);
398 759
399 $mode_slider->connect (changed => sub { 760 $mode_slider->connect (changed => sub {
400 my ($self, $value) = @_; 761 my ($self, $value) = @_;
401 762
402 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value; 763 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value;
403 $mode_label->set_text (sprintf "%dx%d", @{$SDL_MODES[$value]}); 764 $mode_label->set_text (sprintf '%dx%d@%d+%d', @{$SDL_MODES[$value]});
404 }); 765 });
405 $mode_slider->emit (changed => $mode_slider->{range}[0]); 766 $mode_slider->emit (changed => $mode_slider->{range}[0]);
406 767
407 my $row = 1;
408
409 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fullscreen"); 768 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fullscreen");
410 $table->add (1, $row++, new CFClient::UI::CheckBox 769 $table->add_at (1, $row++, $FULLSCREEN_ENABLE = new CFPlus::UI::CheckBox
411 state => $CFG->{fullscreen}, 770 state => $CFG->{fullscreen},
412 tooltip => "Bring the client into fullscreen mode.", 771 tooltip => "Bring the client into fullscreen mode.",
413 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 } 772 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 }
414 ); 773 );
415 774
775 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Force OpenGL 1.1");
776 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
777 state => $CFG->{force_opengl11},
778 tooltip => "Limit CFPlus to use OpenGL 1.1 features only. This will normally result in "
779 . "higher memory usage and slower performance. It will, however, help tremendously on "
780 . "cards that claim to support a feature but fall back to software rendering. "
781 . "Nvidia Geforce FX cards are known to claim features the hardware doesn't support, "
782 . "but cards and drivers from other vendors (ATI) are often just as bad. <b>If you "
783 . "experience extremely low framerates and your card should do better, try this option.</b>",
784 on_changed => sub { my ($self, $value) = @_; $CFG->{force_opengl11} = $value; 0 }
785 );
786
787 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Compress Textures");
788 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
789 state => $CFG->{texture_compression},
790 tooltip => "Use texture compression. Normally this will not reduce visual quality noticable but "
791 . "will save a lot of memory and increase performance. The compression algorithm "
792 . "can differ form card to card, so your mileage may vary. This setting is ignored in "
793 . "forced OpenGL 1.1 mode.",
794 on_changed => sub { my ($self, $value) = @_; $CFG->{texture_compression} = $value; 0 }
795 );
796
416 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fast & Ugly"); 797 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fast & Ugly");
417 $table->add (1, $row++, new CFClient::UI::CheckBox 798 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
418 state => $CFG->{fast}, 799 state => $CFG->{fast},
419 tooltip => "Lower the visual quality considerably to speed up rendering.", 800 tooltip => "Lower the visual quality considerably to speed up rendering.",
420 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 } 801 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 }
421 ); 802 );
422 803
804 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "GUI Fontsize");
805 $table->add_at (1, $row++, new CFPlus::UI::Slider
806 range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1],
807 tooltip => "The base font size used by most GUI elements that do not have their own setting.",
808 on_changed => sub { $CFG->{gui_fontsize} = $_[1]; 0 },
809 );
810
811 $table->add_at (1, $row++, new CFPlus::UI::Button
812 expand => 1, align => 0, text => "Apply",
813 tooltip => "Apply the video settings above.",
814 on_activate => sub {
815 video_shutdown ();
816 video_init ();
817 0
818 }
819 );
820
423 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Map Scale"); 821 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Scale");
424 $table->add (1, $row++, new CFClient::UI::Slider 822 $table->add_at (1, $row++, new CFPlus::UI::Slider
425 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1], 823 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1],
426 tooltip => "Enlarge or shrink the displayed map. Changes are instant.", 824 tooltip => "Enlarge or shrink the displayed map. Changes are instant.",
427 on_changed => sub { my ($self, $value) = @_; $CFG->{map_scale} = 2 ** $value; 0 } 825 on_changed => sub { my ($self, $value) = @_; $CFG->{map_scale} = 2 ** $value; 0 }
428 ); 826 );
429 827
828 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Smoothing");
829 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
830 state => $CFG->{map_smoothing},
831 tooltip => "<b>Map Smoothing</b> tries to make tile borders less square. "
832 . "This increases load on the graphics subsystem and works only with TRT servers. "
833 . "Changes take effect at next login only.",
834 on_changed => sub { my ($self, $value) = @_; $CFG->{map_smoothing} = $value; 0 }
835 );
836
430 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fog of War"); 837 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fog of War");
431 $table->add (1, $row++, new CFClient::UI::CheckBox 838 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
432 state => $CFG->{fow_enable}, 839 state => $CFG->{fow_enable},
433 tooltip => "<b>Fog-of-War</b> marks areas that cannot be seen by the player. Changes are instant.", 840 tooltip => "<b>Fog-of-War</b> marks areas that cannot be seen by the player. Changes are instant.",
434 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; 0 } 841 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; 0 }
435 ); 842 );
436 843
437 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "FoW Intensity"); 844 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "FoW Intensity");
438 $table->add (1, $row++, new CFClient::UI::Slider 845 $table->add_at (1, $row++, new CFPlus::UI::Slider
439 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256], 846 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256],
440 tooltip => "<b>Fog of War Lightness.</b> The higher the intensity, the lighter the Fog-of-War color. Changes are instant.", 847 tooltip => "<b>Fog of War Lightness.</b> The higher the intensity, the lighter the Fog-of-War color. Changes are instant.",
441 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_intensity} = $value; 0 } 848 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_intensity} = $value; 0 }
442 ); 849 );
443 850
444 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "FoW Smooth");
445 $table->add (1, $row++, new CFClient::UI::CheckBox
446 state => $CFG->{fow_smooth},
447 tooltip => "Smooth the Fog-of-War a bit to make it more realistic. Changes are instant.",
448 on_changed => sub {
449 my ($self, $value) = @_;
450 $CFG->{fow_smooth} = $value;
451 status "Fog of War smoothing requires OpenGL 1.2 or higher" if $CFClient::OpenGL::GL_VERSION < 1.2;
452 0
453 }
454 );
455
456 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "GUI Fontsize");
457 $table->add (1, $row++, new CFClient::UI::Slider
458 range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1],
459 tooltip => "The base font size used by most GUI elements that do not have their own setting.",
460 on_changed => sub { $CFG->{gui_fontsize} = $_[1]; 0 },
461 );
462
463 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Message Fontsize"); 851 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Message Fontsize");
464 $table->add (1, $row++, new CFClient::UI::Slider 852 $table->add_at (1, $row++, new CFPlus::UI::Slider
465 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1], 853 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1],
466 tooltip => "The font size used by the <b>message/server log</b> window only. Changes are instant.", 854 tooltip => "The font size used by the <b>message/server log</b> window only. Changes are instant, "
855 . "but you still need to press apply to correctly re-layout the widget.",
467 on_changed => sub { $LOGVIEW->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 }, 856 on_changed => sub { $MESSAGE_WINDOW->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 },
468 ); 857 );
469 858
470 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Stats Fontsize");
471
472 $table->add (1, $row++, new CFClient::UI::Slider
473 range => [$CFG->{stat_fontsize}, 0.5, 2, 0, 0.1],
474 tooltip => "The font size used by the <b>statistics window</b> only. Changes are instant.",
475 on_changed => sub {
476 $CFG->{stat_fontsize} = $_[1];
477 &set_stats_window_fontsize;
478 0
479 }
480 );
481
482 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Gauge fontsize"); 859 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Gauge fontsize");
483 $table->add (1, $row++, new CFClient::UI::Slider 860 $table->add_at (1, $row++, new CFPlus::UI::Slider
484 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1], 861 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1],
485 tooltip => "Adjusts the fontsize of the gauges at the bottom right. Changes are instant.", 862 tooltip => "Adjusts the fontsize of the gauges at the bottom right. Changes are instant.",
486 on_changed => sub { 863 on_changed => sub {
487 $CFG->{gauge_fontsize} = $_[1]; 864 $CFG->{gauge_fontsize} = $_[1];
488 &set_gauge_window_fontsize; 865 &set_gauge_window_fontsize;
489 0 866 0
490 } 867 }
491 ); 868 );
492 869
493 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Gauge size"); 870 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Gauge size");
494 $table->add (1, $row++, new CFClient::UI::Slider 871 $table->add_at (1, $row++, new CFPlus::UI::Slider
495 range => [$CFG->{gauge_size}, 0.2, 0.8], 872 range => [$CFG->{gauge_size}, 0.2, 0.8],
496 tooltip => "Adjust the size of the stats gauges at the bottom right. Changes are instant.", 873 tooltip => "Adjust the size of the stats gauges at the bottom right. Changes are instant.",
497 on_changed => sub { 874 on_changed => sub {
498 $CFG->{gauge_size} = $_[1]; 875 $CFG->{gauge_size} = $_[1];
499 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size}); 876 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size});
500 0 877 0
501 } 878 }
502 ); 879 );
503 880
504 $table->add (1, $row++, new CFClient::UI::Button
505 expand => 1, align => 0, text => "Apply",
506 tooltip => "Apply the video settings",
507 on_activate => sub {
508 video_shutdown ();
509 video_init ();
510 0
511 }
512 );
513
514 $vbox 881 $vbox
515} 882}
516 883
517sub audio_setup { 884sub audio_setup {
518 my $vbox = new CFClient::UI::VBox; 885 my $vbox = new CFPlus::UI::VBox;
519 886
520 $vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]); 887 $vbox->add (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 0, 1]);
521 888
522 my $row = 0; 889 my $row = 0;
523 890
524 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Audio Enable"); 891 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Audio Enable");
525 $table->add (1, $row++, new CFClient::UI::CheckBox 892 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
526 state => $CFG->{audio_enable}, 893 state => $CFG->{audio_enable},
527 tooltip => "<b>Master Audio Enable.</b> If enabled, sound effects and music will be played. If disabled, no audio will be used and the soundcard will not be opened.", 894 tooltip => "<b>Master Audio Enable.</b> If enabled, sound effects and music will be played. If disabled, no audio will be used and the soundcard will not be opened.",
528 on_changed => sub { $CFG->{audio_enable} = $_[1]; 0 } 895 on_changed => sub { $CFG->{audio_enable} = $_[1]; 0 }
529 ); 896 );
530# $table->add (0, 9, new CFClient::UI::Label valign => 0, align => 1, text => "Effects Volume"); 897# $table->add_at (0, 9, new CFPlus::UI::Label valign => 0, align => 1, text => "Effects Volume");
531# $table->add (1, 8, new CFClient::UI::Slider range => [$CFG->{effects_volume}, 0, 128, 1], on_changed => sub { 898# $table->add_at (1, 8, new CFPlus::UI::Slider range => [$CFG->{effects_volume}, 0, 128, 1], on_changed => sub {
532# $CFG->{effects_volume} = $_[1]; 899# $CFG->{effects_volume} = $_[1];
533# }); 900# });
901
902 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Sound Effects");
903 $table->add_at (1, $row, new CFPlus::UI::CheckBox
904 expand => 1, state => $CFG->{effects_enable},
905 tooltip => "If enabled, sound effects are enabled. If disabled, no sound effects will be played.",
906 on_changed => sub {
907 $CFG->{effects_enable} = $_[1];
908 $CONN->update_fx_want if $CONN;
909 0
910 }
911 );
912 $table->add_at (2, $row++, new CFPlus::UI::Slider
913 expand => 1, range => [$CFG->{effects_volume}, 0, 1, 0, 1/128],
914 tooltip => "The relative volume of sound effects. Best audio quality is achieved if this "
915 . "is set highest (rightmost) and you use your operating system volume setting. Changes are instant.",
916 on_changed => sub { $CFG->{effects_volume} = $_[1]; 0 }
917 );
918
534 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Background Music"); 919 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Background Music");
535 $table->add (1, $row++, my $hbox = new CFClient::UI::HBox); 920 $table->add_at (1, $row, new CFPlus::UI::CheckBox
536 $hbox->add (new CFClient::UI::CheckBox
537 expand => 1, state => $CFG->{bgm_enable}, 921 expand => 1, state => $CFG->{bgm_enable},
538 tooltip => "If enabled, playing of background music is enabled. If disabled, no background music will be played.", 922 tooltip => "If enabled, playing of background music is enabled. If disabled, no background music will be played.",
539 on_changed => sub { $CFG->{bgm_enable} = $_[1]; 0 } 923 on_changed => sub {
924 $CFG->{bgm_enable} = $_[1];
925 $CONN->update_fx_want if $CONN;
926 audio_music_push;
927 0
928 }
540 ); 929 );
541 $hbox->add (new CFClient::UI::Slider 930 $table->add_at (2, $row++, new CFPlus::UI::Slider
542 expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128], 931 expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128],
543 tooltip => "The volume of the background music. Changes are instant.", 932 tooltip => "The volume of the background music. Changes are instant.",
544 on_changed => sub { $CFG->{bgm_volume} = $_[1]; CFClient::MixMusic::volume $_[1] * 128; 0 } 933 on_changed => sub { $CFG->{bgm_volume} = $_[1]; audio_music_update_volume; 0 }
545 ); 934 );
546 935
547 $table->add (1, $row++, new CFClient::UI::Button 936 $table->add_at (1, $row++, new CFPlus::UI::Button
548 expand => 1, align => 0, text => "Apply", 937 c_colspan => 2, expand => 1, align => 0, text => "Apply",
549 tooltip => "Apply the audio settings", 938 tooltip => "Apply the audio settings",
550 on_activate => sub { 939 on_activate => sub {
551 audio_shutdown (); 940 audio_shutdown ();
552 audio_init (); 941 audio_init ();
553 0 942 0
555 ); 944 );
556 945
557 $vbox 946 $vbox
558} 947}
559 948
560sub set_stats_window_fontsize {
561 for (values %{$STATWIDS}) {
562 $_->set_fontsize ($::CFG->{stat_fontsize});
563 }
564}
565
566sub set_gauge_window_fontsize { 949sub set_gauge_window_fontsize {
567 for (map { $GAUGES->{$_} } grep { $_ ne 'win' } keys %{$GAUGES}) { 950 for (map { $GAUGES->{$_} } grep { $_ ne 'win' } keys %{$GAUGES}) {
568 $_->set_fontsize ($::CFG->{gauge_fontsize}); 951 $_->set_fontsize ($::CFG->{gauge_fontsize});
569 } 952 }
570} 953}
571 954
572sub make_gauge_window { 955sub make_gauge_window {
573 my $gh = int $HEIGHT * $CFG->{gauge_size}; 956 my $gh = int $HEIGHT * $CFG->{gauge_size};
574 957
575 my $win = new CFClient::UI::Frame ( 958 my $win = new CFPlus::UI::Frame (
576 force_x => 0, 959 force_x => 0,
577 force_y => "max", 960 force_y => "max",
578 force_w => $WIDTH, 961 force_w => $WIDTH,
579 force_h => $gh, 962 force_h => $gh,
580 ); 963 );
581 964
582 $win->add (my $hbox = new CFClient::UI::HBox 965 $win->add (my $hbox = new CFPlus::UI::HBox
583 children => [ 966 children => [
584 (new CFClient::UI::HBox expand => 1), 967 (new CFPlus::UI::HBox expand => 1),
585 (new CFClient::UI::VBox children => [ 968 (new CFPlus::UI::VBox children => [
586 (new CFClient::UI::Empty expand => 1), 969 (new CFPlus::UI::Empty expand => 1),
587 (new CFClient::UI::Frame bg => [0, 0, 0, 0.4], child => ($FLOORBOX = new CFClient::UI::Table)), 970 (new CFPlus::UI::Frame bg => [0, 0, 0, 0.4], child => ($FLOORBOX = new CFPlus::UI::Table)),
588 ]), 971 ]),
589 (my $vbox = new CFClient::UI::VBox), 972 (my $vbox = new CFPlus::UI::VBox),
590 ], 973 ],
591 ); 974 );
592 975
593 $vbox->add (new CFClient::UI::HBox 976 $vbox->add (new CFPlus::UI::HBox
594 expand => 1, 977 expand => 1,
595 children => [ 978 children => [
596 (new CFClient::UI::Empty expand => 1), 979 (new CFPlus::UI::Empty expand => 1),
597 (my $hb = new CFClient::UI::HBox), 980 (my $hb = new CFPlus::UI::HBox),
598 ], 981 ],
599 ); 982 );
600 983
601 $hb->add (my $hg = new CFClient::UI::Gauge type => 'hp', 984 $hb->add (my $hg = new CFPlus::UI::Gauge type => 'hp', tooltip => "#stat_health");
602 tooltip => "<b>Health points</b>. Measures of how much damage you can take before dying. Hit points are determined from your level and are influenced by the value of your Con. Hp value may range between 1 to beyond 500 and higher values indicate a greater ability to withstand punishment.");
603 $hb->add (my $mg = new CFClient::UI::Gauge type => 'mana', 985 $hb->add (my $mg = new CFPlus::UI::Gauge type => 'mana', tooltip => "#stat_mana");
604 tooltip => "<b>Spell points</b>. Measures of how much \"fuel\" you have for casting spells and incantations. Mana is calculated from your level and your Pow. Mana values can range between 1 to beyond 500 (glowing crystals can increase the current spell points beyond your normal maximum). Higher values indicate greater amounts of mana.");
605 $hb->add (my $gg = new CFClient::UI::Gauge type => 'grace', 986 $hb->add (my $gg = new CFPlus::UI::Gauge type => 'grace', tooltip => "#stat_grace");
606 tooltip => "<b>Grace points</b> - how favored you are by your god. In game terms, how much divine magic you can cast. Your level, Wis and Pow effect what the value of grace is. Prayong on an altar of your god can increase this value beyond your normal maximum. Grace can take on large positive and negative values. Positive values indicate favor by the gods.");
607 $hb->add (my $fg = new CFClient::UI::Gauge type => 'food', 987 $hb->add (my $fg = new CFPlus::UI::Gauge type => 'food', tooltip => "#stat_food");
608 tooltip => "<b>Food</b>. Ranges between 0 (starving) and 999 (satiated). At a value of 0 the character begins to die. Some magic can speed up or slow down the character digestion. Healing wounds will speed up digestion too.");
609 988
610 $vbox->add (my $exp = new CFClient::UI::Label valign => 0, align => 1, can_hover => 1, can_events => 1, 989 $vbox->add (my $exp = new CFPlus::UI::Label valign => 0, align => 1, can_hover => 1, can_events => 1, tooltip => "#stat_exp");
611 tooltip => "<b>Experience points and overall level</b> - experience is increased as a reward for appropriate action (such as killing monsters) and may decrease as a result of a magical attack or dying. Level is directly derived from the experience value. As the level of the character increases, the character becomes able to succeed at more difficult tasks. A character's level starts at a value of 0 and may range up beyond 100."); 990 $vbox->add (my $prg = new CFPlus::UI::ExperienceProgress);
612 $vbox->add (my $rng = new CFClient::UI::Label valign => 0, align => 1, can_hover => 1, can_events => 1, 991 $vbox->add (my $rng = new CFPlus::UI::Label valign => 0, align => 1, can_hover => 1, can_events => 1, tooltip => "#stat_ranged");
613 tooltip => "<b>Ranged attack</b> - how you attack when you press shift-cursor (spell, skill, weapon etc.)");
614 992
615 $GAUGES = { 993 $GAUGES = {
616 exp => $exp, win => $win, range => $rng, 994 exp => $exp, prg => $prg, win => $win, range => $rng,
617 food => $fg, mana => $mg, hp => $hg, grace => $gg 995 food => $fg, mana => $mg, hp => $hg, grace => $gg
618 }; 996 };
619 997
620 &set_gauge_window_fontsize; 998 &set_gauge_window_fontsize;
621 999
622 $win 1000 $win
623} 1001}
624 1002
625sub debug_setup { 1003sub debug_setup {
626 my $table = new CFClient::UI::Table; 1004 my $table = new CFPlus::UI::Table;
627 1005
628 $table->add (0, 0, new CFClient::UI::Label text => "Widget Borders"); 1006 $table->add_at (0, 0, new CFPlus::UI::Label text => "Widget Borders");
629 $table->add (1, 0, new CFClient::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 1; 0 }); 1007 $table->add_at (1, 0, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 1; 0 });
630 $table->add (0, 1, new CFClient::UI::Label text => "Tooltip Widget Info"); 1008 $table->add_at (0, 1, new CFPlus::UI::Label text => "Tooltip Widget Info");
631 $table->add (1, 1, new CFClient::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 2; 0 }); 1009 $table->add_at (1, 1, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 2; 0 });
632 $table->add (0, 2, new CFClient::UI::Label text => "Show FPS"); 1010 $table->add_at (0, 2, new CFPlus::UI::Label text => "Show FPS");
633 $table->add (1, 2, new CFClient::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 4; 0 }); 1011 $table->add_at (1, 2, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 4; 0 });
634 $table->add (0, 3, new CFClient::UI::Label text => "Suppress Tooltips"); 1012 $table->add_at (0, 3, new CFPlus::UI::Label text => "Suppress Tooltips");
635 $table->add (1, 3, new CFClient::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 8; 0 }); 1013 $table->add_at (1, 3, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 8; 0 });
1014 $table->add_at (0, 4, new CFPlus::UI::Button text => "die on click(tm)", on_activate => sub { &CFPlus::debug() } );
636 1015
637 my @default_smooth = (0.05, 0.13, 0.05, 0.13, 0.30, 0.13, 0.05, 0.13, 0.05); 1016 $table->add_at (0, 5, new CFPlus::UI::TextEdit text => "line1\0152\0153");#d#
638 1017
639 for my $x (0..2) { 1018 $table->add_at (7,7, my $t = new CFPlus::UI::Table expand => 0);
640 for my $y (0 .. 2) { 1019 $t->add_at (0,0, new CFPlus::UI::Label text => "a a a a", c_rowspan => 1, c_colspan => 2);
641 $table->add ($x + 3, $y, 1020 $t->add_at (2,0, new CFPlus::UI::Label text => "b\nb", c_rowspan => 2, c_colspan => 1);
642 new CFClient::UI::Entry 1021 $t->add_at (1,2, new CFPlus::UI::Label text => "c c c c", c_rowspan => 1, c_colspan => 2);
643 text => $default_smooth[$x * 3 + $y], 1022 $t->add_at (0,1, new CFPlus::UI::Label text => "d\nd", c_rowspan => 2, c_colspan => 1);
644 on_changed => sub { $MAP->{smooth_matrix}[$x * 3 + $y] = $_[1] if $MAP; 0 }, 1023 $t->add_at (1,1, new CFPlus::UI::Label text => "e");
645 ); 1024
646 } 1025 $table->add_at (7, 6, my $c = new CFPlus::UI::Canvas);
1026
1027 $c->add_items ({
1028 type => "line_loop",
1029 color => [0, 1, 0],
1030 width => 9,
1031 coord_mode => "abs",
1032 coord => [[10, 5], [5, 50], [20, 5], [5, 60]],
647 } 1033 });
648 1034
1035 $c->add_items ({
1036 type => "lines",
1037 color => [1, 1, 0],
1038 width => 2,
1039 coord_mode => "rel",
1040 coord => [[0,0], [1,1], [1,0], [0,1]],
1041 });
1042
1043 $c->add_items ({
1044 type => "polygon",
1045 color => [0, 0.43, 0],
1046 width => 2,
1047 coord_mode => "rel",
1048 coord => [[0,0.2], [1,.4], [1,.6], [0,.8]],
1049 });
649 1050
650 $table 1051 $table
651} 1052}
652 1053
653sub stats_window { 1054sub stats_window {
654 my $tgw = new CFClient::UI::FancyFrame 1055 my $r = new CFPlus::UI::ScrolledWindow (
655 y => $HEIGHT * (2/8), 1056 expand => 1,
656 x => "max", 1057 scroll_y => 1
657 title => "Stats", 1058 );
658 name => "stats_window", 1059 $r->add (my $vb = new CFPlus::UI::VBox);
659 has_close_button => 1;
660 1060
661 $tgw->add (new CFClient::UI::Window child => my $vb = new CFClient::UI::VBox); 1061 $vb->add (new CFPlus::UI::FancyFrame
1062 label => "Player",
1063 child => (my $pi = new CFPlus::UI::VBox),
1064 );
1065
662 $vb->add ($STATWIDS->{title} = new CFClient::UI::Label valign => 0, align => -1, text => "Title:", expand => 1, 1066 $pi->add ($STATWIDS->{title} = new CFPlus::UI::Label valign => 0, align => -1, text => "Title:", expand => 1,
663 can_hover => 1, can_events => 1, 1067 can_hover => 1, can_events => 1,
664 tooltip => "Your name and title. You can change your title by using the <b>title</b> command, if supported by the server."); 1068 tooltip => "Your name and title. You can change your title by using the <b>title</b> command, if supported by the server.");
665 $vb->add ($STATWIDS->{map} = new CFClient::UI::Label valign => 0, align => -1, text => "Map:", expand => 1, 1069 $pi->add ($STATWIDS->{map} = new CFPlus::UI::Label valign => 0, align => -1, text => "Map:", expand => 1,
666 can_hover => 1, can_events => 1, 1070 can_hover => 1, can_events => 1,
667 tooltip => "The map you are currently on (if supported by the server)."); 1071 tooltip => "The map you are currently on (if supported by the server).");
668 1072
669 $vb->add (my $hb0 = new CFClient::UI::HBox); 1073 $pi->add (my $hb0 = new CFPlus::UI::HBox);
670 $hb0->add ($STATWIDS->{weight} = new CFClient::UI::Label valign => 0, align => -1, text => "Weight:", expand => 1, 1074 $hb0->add ($STATWIDS->{weight} = new CFPlus::UI::Label valign => 0, align => -1, text => "Weight:", expand => 1,
671 can_hover => 1, can_events => 1, 1075 can_hover => 1, can_events => 1,
672 tooltip => "The weight of the player including all inventory items."); 1076 tooltip => "The weight of the player including all inventory items.");
673 $hb0->add ($STATWIDS->{m_weight} = new CFClient::UI::Label valign => 0, align => -1, text => "Max weight:", expand => 1, 1077 $hb0->add ($STATWIDS->{m_weight} = new CFPlus::UI::Label valign => 0, align => -1, text => "Max weight:", expand => 1,
674 can_hover => 1, can_events => 1, 1078 can_hover => 1, can_events => 1,
675 tooltip => "The weight limit: you cannot carry more than this."); 1079 tooltip => "The weight limit: you cannot carry more than this.");
676 1080
677 1081 $vb->add (new CFPlus::UI::FancyFrame
1082 label => "Primary/Secondary Statistics",
678 $vb->add (my $hb = new CFClient::UI::HBox expand => 1); 1083 child => (my $hb = new CFPlus::UI::HBox expand => 1),
1084 );
679 $hb->add (my $tbl = new CFClient::UI::Table expand => 1); 1085 $hb->add (my $tbl = new CFPlus::UI::Table expand => 1);
680 1086
681 my $color2 = [1, 1, 0]; 1087 my $color2 = [1, 1, 0];
682 1088
683 for ( 1089 for (
684 [0, 0, st_str => "Str", 30, "<b>Physical Strength</b>, determines damage dealt with weapons, how much you can carry, and how often you can attack"], 1090 [0, 0, st_str => "Str", 30],
685 [0, 1, st_dex => "Dex", 30, "<b>Dexterity</b>, your physical agility. Determines chance of being hit and affects armor class and speed"], 1091 [0, 1, st_dex => "Dex", 30],
686 [0, 2, st_con => "Con", 30, "<b>Constitution</b>, physical health and toughness. Determines how many healthpoints you can have"], 1092 [0, 2, st_con => "Con", 30],
687 [0, 3, st_int => "Int", 30, "<b>Intelligence</b>, your ability to learn and use skills and incantations (both prayers and magic) and determines how much spell points you can have"], 1093 [0, 3, st_int => "Int", 30],
688 [0, 4, st_wis => "Wis", 30, "<b>Wisdom</b>, the ability to learn and use divine magic (prayers). Determines how many grace points you can have"], 1094 [0, 4, st_wis => "Wis", 30],
689 [0, 5, st_pow => "Pow", 30, "<b>Power</b>, your magical potential. Influences the strength of spell effects, and also how much your spell and grace points increase when leveling up"], 1095 [0, 5, st_pow => "Pow", 30],
690 [0, 6, st_cha => "Cha", 30, "<b>Charisma</b>, how well you are received by NPCs. Affects buying and selling prices in shops."], 1096 [0, 6, st_cha => "Cha", 30],
691 1097
692 [2, 0, st_wc => "Wc", -120, "<b>Weapon Class</b>, effectiveness of melee/missile attacks. Lower is more potent. Current weapon, level and Str are some things which effect the value of Wc. The value of Wc may range between 25 and -72."], 1098 [2, 0, st_wc => "Wc", -120],
693 [2, 1, st_ac => "Ac", -120, "<b>Armour Class</b>, how protected you are from being hit by any attack. Lower values are better. Ac is based on your race and is modified by the Dex and current armour worn. For characters that cannot wear armour, Ac improves as their level increases."], 1099 [2, 1, st_ac => "Ac", -120],
694 [2, 2, st_dam => "Dam", 120, "<b>Damage</b>, how much damage your melee/missile attack inflicts. Higher values indicate a greater amount of damage will be inflicted with each attack."], 1100 [2, 2, st_dam => "Dam", 120],
695 [2, 3, st_arm => "Arm", 120, "<b>Armour</b>, how much damage (from physical attacks) will be subtracted from successful hits made upon you. This value ranges between 0 to 99%. Current armour worn primarily determines Arm value."], 1101 [2, 3, st_arm => "Arm", 120],
696 [2, 4, st_spd => "Spd", 10.54, "<b>Speed</b>, how fast you can move. The value of speed may range between nearly 0 (\"very slow\") to higher than 5 (\"lightning fast\"). Base speed is determined from the Dex and modified downward proportionally by the amount of weight carried which exceeds the Max Carry limit. The armour worn also sets the upper limit on speed."], 1102 [2, 4, st_spd => "Spd", 10.54],
697 [2, 5, st_wspd => "WSp", 10.54, "<b>Weapon Speed</b>, how many attacks you may make per unit of time (0.120s). Higher values indicate faster attack speed. Current weapon and Dex effect the value of weapon speed."], 1103 [2, 5, st_wspd => "WSp", 10.54],
698 ) { 1104 ) {
699 my ($col, $row, $id, $label, $template, $tooltip) = @$_; 1105 my ($col, $row, $id, $label, $template) = @$_;
700 1106
701 $tbl->add ($col , $row, $STATWIDS->{$id} = new CFClient::UI::Label 1107 $tbl->add_at ($col , $row, $STATWIDS->{$id} = new CFPlus::UI::Label
702 font => $FONT_FIXED, can_hover => 1, can_events => 1, valign => 0, align => +1, template => $template, tooltip => $tooltip); 1108 font => $FONT_FIXED, can_hover => 1, can_events => 1, valign => 0,
1109 align => +1, template => $template, tooltip => "#stat_$label");
703 $tbl->add ($col + 1, $row, $STATWIDS->{"$id\_lbl"} = new CFClient::UI::Label 1110 $tbl->add_at ($col + 1, $row, $STATWIDS->{"$id\_lbl"} = new CFPlus::UI::Label
704 font => $FONT_FIXED, can_hover => 1, can_events => 1, fg => $color2, valign => 0, align => -1, text => $label, tooltip => $tooltip); 1111 font => $FONT_FIXED, can_hover => 1, can_events => 1, fg => $color2, valign => 0,
1112 align => -1, text => $label, tooltip => "#stat_$label");
705 } 1113 }
706 1114
1115 $vb->add (new CFPlus::UI::FancyFrame
1116 label => "Resistancies",
707 $hb->add (my $tbl2 = new CFClient::UI::Table expand => 1); 1117 child => (my $tbl2 = new CFPlus::UI::Table expand => 1),
1118 );
708 1119
709 my $row = 0; 1120 my $row = 0;
710 my $col = 0; 1121 my $col = 0;
711 1122
712 my %resist_names = ( 1123 my %resist_names = (
1124 slow => ["Slow",
713 slow => "<b>Slow</b> (slows you down when you are hit by the spell. Monsters will have an opportunity to come near you faster and hit you more often.)", 1125 "<b>Slow</b> (slows you down when you are hit by the spell. Monsters will have an opportunity to come near you faster and hit you more often.)"],
1126 holyw => ["Holy Word",
714 holyw => "<b>Holy Word</b> (resistance you against getting the fear when someone whose god doesn't like you spells the holy word on you.)", 1127 "<b>Holy Word</b> (resistance you against getting the fear when someone whose god doesn't like you spells the holy word on you.)"],
1128 conf => ["Confusion",
715 conf => "<b>Confusion</b> (If you are hit by confusion you will move into random directions, and likely into monsters.)", 1129 "<b>Confusion</b> (If you are hit by confusion you will move into random directions, and likely into monsters.)"],
1130 fire => ["Fire",
716 fire => "<b>Fire</b> (just your resistance to fire spells like burning hands, dragonbreath, meteor swarm fire, ...)", 1131 "<b>Fire</b> (just your resistance to fire spells like burning hands, dragonbreath, meteor swarm fire, ...)"],
1132 depl => ["Depletion",
717 depl => "<b>Depletion</b> (some monsters and other effects can cause stats depletion)", 1133 "<b>Depletion</b> (some monsters and other effects can cause stats depletion)"],
1134 magic => ["Magic",
718 magic => "<b>Magic</b> (resistance to magic spells like magic missile or similar)", 1135 "<b>Magic</b> (resistance to magic spells like magic missile or similar)"],
1136 drain => ["Draining",
719 drain => "<b>Draining</b> (some monsters (e.g. vampires) and other effects can steal experience)", 1137 "<b>Draining</b> (some monsters (e.g. vampires) and other effects can steal experience)"],
1138 acid => ["Acid",
720 acid => "<b>Acid</b> (resistance to acid, acid hurts pretty much and also corrodes your weapons)", 1139 "<b>Acid</b> (resistance to acid, acid hurts pretty much and also corrodes your weapons)"],
1140 pois => ["Poison",
721 pois => "<b>Poison</b> (resistance to getting poisoned)", 1141 "<b>Poison</b> (resistance to getting poisoned)"],
1142 para => ["Paralysation",
722 para => "<b>Paralysation</b> (this resistance affects the chance you get paralysed)", 1143 "<b>Paralysation</b> (this resistance affects the chance you get paralysed)"],
1144 deat => ["Death",
723 deat => "<b>Death</b> (resistance against death spells)", 1145 "<b>Death</b> (resistance against death spells)"],
724 phys => "<b>Physical</b> (this is the resistance against physical attacks, like when a monster hit you in melee combat)", 1146 phys => ["Physical",
1147 "<b>Physical</b> (this is the resistance against physical attacks, like when a monster hit you in melee combat. The value displayed here is also displayed in the 'Arm' field on the left.)"],
1148 blind => ["Blind",
725 blind => "<b>Blind</b> (blind resistance affects the chance of a successful blinding attack)", 1149 "<b>Blind</b> (blind resistance affects the chance of a successful blinding attack)"],
1150 fear => ["Fear",
726 fear => "<b>Fear</b> (this attack will drive you away from monsters who cast this and hit you successfully, being resistant to this helps a lot when fighting those monsters)", 1151 "<b>Fear</b> (this attack will drive you away from monsters who cast this and hit you successfully, being resistant to this helps a lot when fighting those monsters)"],
1152 tund => ["Turn undead",
727 tund => "<b>Turn undead</b> (affects your resistancy to various forms of 'turn undead' spells. Only relevant when you are, in fact, undead...", 1153 "<b>Turn undead</b> (affects your resistancy to various forms of 'turn undead' spells. Only relevant when you are, in fact, undead..."],
1154 elec => ["Electricity",
728 elec => "<b>Electricity</b> (resistance against electricity, spells like large lightning, small lightning, ...)", 1155 "<b>Electricity</b> (resistance against electricity, spells like large lightning, small lightning, ...)"],
1156 cold => ["Cold",
729 cold => "<b>Cold</b> (this is your resistance against cold spells like icestorm, snowstorm, ...)", 1157 "<b>Cold</b> (this is your resistance against cold spells like icestorm, snowstorm, ...)"],
1158 ghit => ["Ghost hit",
730 ghit => "<b>Ghost hit</b> (special attack used by ghosts and ghost-like beings)", 1159 "<b>Ghost hit</b> (special attack used by ghosts and ghost-like beings)"],
731 ); 1160 );
1161
732 for (qw/slow holyw conf fire depl magic 1162 for (qw/slow holyw conf fire depl magic
733 drain acid pois para deat phys 1163 drain acid pois para deat phys
734 blind fear tund elec cold ghit/) 1164 blind fear tund elec cold ghit/)
735 { 1165 {
736 $tbl2->add ($col, $row, 1166 $tbl2->add_at ($col, $row,
737 $STATWIDS->{"res_$_"} = 1167 $STATWIDS->{"res_$_"} =
738 new CFClient::UI::Label 1168 new CFPlus::UI::Label
739 font => $FONT_FIXED, 1169 font => $FONT_FIXED,
740 template => "-100%", 1170 template => "-100%",
741 align => +1, 1171 align => +1,
742 valign => 0, 1172 valign => 0,
743 can_events => 1, 1173 can_events => 1,
744 can_hover => 1, 1174 can_hover => 1,
745 tooltip => $resist_names{$_}, 1175 tooltip => $resist_names{$_}->[1],
746 ); 1176 );
747 $tbl2->add ($col + 1, $row, new CFClient::UI::Image 1177 $tbl2->add_at ($col + 1, $row, new CFPlus::UI::Image
748 font => $FONT_FIXED, 1178 font => $FONT_FIXED,
749 can_hover => 1, 1179 can_hover => 1,
750 can_events => 1, 1180 can_events => 1,
751 image => "ui/resist/resist_$_.png", 1181 path => "ui/resist/resist_$_.png",
752 tooltip => $resist_names{$_}, 1182 tooltip => $resist_names{$_}->[1],
1183 );
1184 $tbl2->add_at ($col + 2, $row, new CFPlus::UI::Label
1185 text => $resist_names{$_}->[0],
1186 font => $FONT_FIXED,
1187 can_hover => 1,
1188 can_events => 1,
1189 tooltip => $resist_names{$_}->[1],
753 ); 1190 );
754 1191
755 $row++; 1192 $row++;
756 if ($row % 6 == 0) { 1193 if ($row % 6 == 0) {
757 $col += 2; 1194 $col += 3;
758 $row = 0; 1195 $row = 0;
759 } 1196 }
760 } 1197 }
761 1198
762 &set_stats_window_fontsize;
763 update_stats_window ({}); 1199 #update_stats_window ({});
764 1200
1201 $r
1202}
1203
1204sub skill_window {
1205 my $sw = new CFPlus::UI::ScrolledWindow (expand => 1);
1206
1207 $sw->add ($STATWIDS->{skill_tbl} = new CFPlus::UI::Table expand => 1, col_expand => [0, 0, 1, .1, 0, 0, 1, .1]);
1208
765 $tgw 1209 $sw
766} 1210}
767 1211
768sub formsep($) { 1212sub formsep($) {
769 scalar reverse join ",", unpack "(A3)*", reverse $_[0] * 1 1213 scalar reverse join ",", unpack "(A3)*", reverse $_[0] * 1
770} 1214}
771 1215
772sub update_stats_window {
773 my ($stats) = @_;
774
775 # I love text protocols...
776
777 my $hp = $stats->{+CS_STAT_HP} * 1;
778 my $hp_m = $stats->{+CS_STAT_MAXHP} * 1;
779 my $sp = $stats->{+CS_STAT_SP} * 1;
780 my $sp_m = $stats->{+CS_STAT_MAXSP} * 1;
781 my $fo = $stats->{+CS_STAT_FOOD} * 1;
782 my $fo_m = 999;
783 my $gr = $stats->{+CS_STAT_GRACE} * 1;
784 my $gr_m = $stats->{+CS_STAT_MAXGRACE} * 1;
785
786 $GAUGES->{hp} ->set_value ($hp, $hp_m);
787 $GAUGES->{mana} ->set_value ($sp, $sp_m);
788 $GAUGES->{food} ->set_value ($fo, $fo_m);
789 $GAUGES->{grace} ->set_value ($gr, $gr_m);
790 $GAUGES->{exp} ->set_text ("Exp: " . (formsep $stats->{+CS_STAT_EXP64})
791 . " (lvl " . ($stats->{+CS_STAT_LEVEL} * 1) . ")");
792 my $rng = $stats->{+CS_STAT_RANGE};
793 $rng =~ s/^Range: //; # thank you so much dear server
794 $GAUGES->{range} ->set_text ("Rng: " . $rng);
795 my $title = $stats->{+CS_STAT_TITLE};
796 $title =~ s/^Player: //;
797 $STATWIDS->{title} ->set_text ("Title: " . $title);
798
799 $STATWIDS->{st_str} ->set_text (sprintf "%d" , $stats->{+CS_STAT_STR});
800 $STATWIDS->{st_dex} ->set_text (sprintf "%d" , $stats->{+CS_STAT_DEX});
801 $STATWIDS->{st_con} ->set_text (sprintf "%d" , $stats->{+CS_STAT_CON});
802 $STATWIDS->{st_int} ->set_text (sprintf "%d" , $stats->{+CS_STAT_INT});
803 $STATWIDS->{st_wis} ->set_text (sprintf "%d" , $stats->{+CS_STAT_WIS});
804 $STATWIDS->{st_pow} ->set_text (sprintf "%d" , $stats->{+CS_STAT_POW});
805 $STATWIDS->{st_cha} ->set_text (sprintf "%d" , $stats->{+CS_STAT_CHA});
806 $STATWIDS->{st_wc} ->set_text (sprintf "%d" , $stats->{+CS_STAT_WC});
807 $STATWIDS->{st_ac} ->set_text (sprintf "%d" , $stats->{+CS_STAT_AC});
808 $STATWIDS->{st_dam} ->set_text (sprintf "%d" , $stats->{+CS_STAT_DAM});
809 $STATWIDS->{st_arm} ->set_text (sprintf "%d" , $stats->{+CS_STAT_ARMOUR});
810 $STATWIDS->{st_spd} ->set_text (sprintf "%.1f", $stats->{+CS_STAT_SPEED});
811 $STATWIDS->{st_wspd}->set_text (sprintf "%.1f", $stats->{+CS_STAT_WEAP_SP});
812
813 $STATWIDS->{m_weight}->set_text (sprintf "Max weight: %.1fkg", $stats->{+CS_STAT_WEIGHT_LIM} / 1000);
814
815 my %tbl = (
816 phys => CS_STAT_RES_PHYS,
817 magic => CS_STAT_RES_MAG,
818 fire => CS_STAT_RES_FIRE,
819 elec => CS_STAT_RES_ELEC,
820 cold => CS_STAT_RES_COLD,
821 conf => CS_STAT_RES_CONF,
822 acid => CS_STAT_RES_ACID,
823 drain => CS_STAT_RES_DRAIN,
824 ghit => CS_STAT_RES_GHOSTHIT,
825 pois => CS_STAT_RES_POISON,
826 slow => CS_STAT_RES_SLOW,
827 para => CS_STAT_RES_PARA,
828 tund => CS_STAT_TURN_UNDEAD,
829 fear => CS_STAT_RES_FEAR,
830 depl => CS_STAT_RES_DEPLETE,
831 deat => CS_STAT_RES_DEATH,
832 holyw => CS_STAT_RES_HOLYWORD,
833 blind => CS_STAT_RES_BLIND,
834 );
835
836 $STATWIDS->{"res_$_"}->set_text (sprintf "%d%", $stats->{$tbl{$_}})
837 for keys %tbl;
838}
839
840my $METASERVER_ATIME; 1216my $METASERVER_ATIME;
841 1217
842sub update_metaserver { 1218sub update_metaserver {
1219 my ($metaserver_dialog) = @_;
1220
1221 $METASERVER = $metaserver_dialog
1222 if defined $metaserver_dialog;
1223
843 return if $METASERVER_ATIME > time; 1224 return if $METASERVER_ATIME > time;
844 $METASERVER_ATIME = time + 60; 1225 $METASERVER_ATIME = time + 60;
845 1226
846 my $table = $METASERVER->{table}; 1227 my $table = $METASERVER->{table};
847 $table->clear; 1228 $table->clear;
848 $table->add (0, 0, my $label = new CFClient::UI::Label max_w => $WIDTH * 0.8, text => "fetching server list..."); 1229 $table->add_at (0, 0, my $label = new CFPlus::UI::Label max_w => $WIDTH * 0.8, text => "fetching server list...");
849 1230
850 my $buf; 1231 my $ok = 0;
851 1232
852 my $fh = new IO::Socket::INET PeerHost => $META_SERVER, Blocking => 0; 1233 CFPlus::background {
1234 my $ua = CFPlus::lwp_useragent;
853 1235
854 unless ($fh) { 1236 CFPlus::background_msg CFPlus::from_json +(CFPlus::lwp_check $ua->get ($META_SERVER))->decoded_content;
855 $label->set_text ("unable to contact metaserver: $!"); 1237 } sub {
856 return; 1238 my ($msg) = @_;
857 } 1239 if ($msg) {
858
859 Event->io (fd => $fh, poll => 'r', cb => sub {
860 my $res = sysread $fh, $buf, 8192, length $buf;
861
862 if (!defined $res) {
863 $_[0]->w->cancel;
864 $label->set_text ("error while retrieving server list: $!");
865 } elsif ($res == 0) {
866 $_[0]->w->cancel;
867 status "server list retrieved";
868
869 utf8::decode $buf if utf8::valid $buf;
870
871 $table->clear; 1240 $table->clear;
872 1241
873 my @tip = ( 1242 my @tip = (
874 "The current number of users logged in on the server.", 1243 "The current number of users logged in on the server.",
875 "The hostname of the server.", 1244 "The hostname of the server.",
876 "The time this server has been running without being restarted.", 1245 "The time this server has been running without being restarted.",
877 "The server software version - a '+' indicates a Crossfire+ server.", 1246 "The server software version - a '+' indicates a Crossfire+ server.",
878 "Short information about this server provided by its admins.", 1247 "Short information about this server provided by its admins.",
879 ); 1248 );
880 my @col = qw(#Users Host Uptime Version Description); 1249 my @col = qw(#Users Host Uptime Version Description);
881 $table->add ($_, 0, new CFClient::UI::Label 1250 $table->add_at ($_, 0, new CFPlus::UI::Label
882 can_hover => 1, can_events => 1, 1251 can_hover => 1, can_events => 1,
883 align => 0, fg => [1, 1, 0], 1252 align => 0, fg => [1, 1, 0],
884 text => $col[$_], tooltip => $tip[$_]) 1253 text => $col[$_], tooltip => $tip[$_])
885 for 0 .. $#col; 1254 for 0 .. $#col;
886 1255
887 my @align = qw(1 0 1 1 -1); 1256 my @align = qw(1 0 1 1 -1);
888 1257
889 my $y = 0; 1258 my $y = 0;
890 for my $m (sort { $b->[3] <=> $a->[3] } map [split /\|/], split /\015?\012/, $buf) { 1259 for my $m (@{ $msg->{servers} }) {
891 my ($ip, $last, $host, $users, $version, $desc, $ibytes, $obytes, $uptime) = @$m; 1260 my ($ip, $last, $host, $users, $version, $desc, $ibytes, $obytes, $uptime, $highlight) =
1261 @$m{qw(ip age hostname users version description ibytes obytes uptime highlight)};
892 1262
893 for ($desc) { 1263 for ($desc) {
894 s/<br>/\n/gi; 1264 s/<br>/\n/gi;
895 s/<li>/\n· /gi; 1265 s/<li>/\n· /gi;
896 s/<.*?>//sgi; 1266 s/<.*?>//sgi;
897 s/&/&amp;/g; 1267 s/&amp;/&/g;
898 s/</&lt;/g; 1268 s/&lt;/</g;
899 s/>/&gt;/g; 1269 s/&gt;/>/g;
900 } 1270 }
901 1271
902 $uptime = sprintf "%dd %02d:%02d:%02d", 1272 $uptime = sprintf "%dd %02d:%02d:%02d",
903 (int $m->[8] / 86400), 1273 (int $uptime / 86400),
904 (int $m->[8] / 3600) % 24, 1274 (int $uptime / 3600) % 24,
905 (int $m->[8] / 60) % 60, 1275 (int $uptime / 60) % 60,
906 $m->[8] % 60; 1276 $uptime % 60;
907 1277
908 $m = [$users, $host, $uptime, $version, $desc]; 1278 $m = [$users, $host, $uptime, $version, $desc];
909 1279
910 $y++; 1280 $y++;
911 1281
912 $table->add (scalar @$m, $y, new CFClient::UI::VBox children => [ 1282 $table->add_at (scalar @$m, $y, new CFPlus::UI::VBox children => [
913 (new CFClient::UI::Button 1283 (new CFPlus::UI::Button
914 text => "Use", 1284 text => "Use",
915 tooltip => "Put this server into the <b>Host:Port</b> field", 1285 tooltip => "Put this server into the <b>Host:Port</b> field",
916 on_activate => sub { 1286 on_activate => sub {
917 $HOST_ENTRY->set_text ($CFG->{profile}{default}{host} = $host); 1287 $HOST_ENTRY->set_text ($CFG->{profile}{default}{host} = $host);
918 $METASERVER->hide; 1288 $METASERVER->hide;
919 0 1289 0
920 }, 1290 },
921 ), 1291 ),
922 (new CFClient::UI::Empty expand => 1), 1292 (new CFPlus::UI::Empty expand => 1),
923 ]); 1293 ]);
924 1294
925 $table->add ($_, $y, new CFClient::UI::Label 1295 $table->add_at ($_, $y, new CFPlus::UI::Label
1296 max_w => $::WIDTH * 0.4,
926 ellipsise => 0, 1297 ellipsise => 0,
927 align => $align[$_], 1298 align => $align[$_],
928 text => $m->[$_], 1299 text => $m->[$_],
929 tooltip => $tip[$_], 1300 tooltip => $tip[$_],
1301 fg => ($highlight ? [1, 1, 1] : [.7, .7, .7]),
930 can_hover => 1, 1302 can_hover => 1,
931 can_events => 1, 1303 can_events => 1,
932 fontsize => 0.8) 1304 fontsize => 0.8)
933 for 0 .. $#$m; 1305 for 0 .. $#$m;
934 } 1306 }
1307 } else {
1308 $ok or $label->set_text ("error while contacting metaserver");
935 } 1309 }
936 }); 1310 };
1311
937} 1312}
938 1313
939sub metaserver_dialog { 1314sub metaserver_dialog {
940 my $dialog = new CFClient::UI::FancyFrame 1315 my $vbox = new CFPlus::UI::VBox;
1316 my $table = new CFPlus::UI::Table;
1317 $vbox->add (new CFPlus::UI::ScrolledWindow expand => 1, child => $table);
1318
1319 my $dialog = new CFPlus::UI::Toplevel
941 title => "Server List", 1320 title => "Server List",
942 name => 'metaserver_dialog', 1321 name => 'metaserver_dialog',
943 x => 'center', 1322 x => 'center',
944 y => 'center', 1323 y => 'center',
945 z => 3, 1324 z => 3,
1325 force_w => $::WIDTH * 0.9,
946 force_h => $::HEIGHT * 0.4, 1326 force_h => $::HEIGHT * 0.7,
947 child => (my $vbox = new CFClient::UI::VBox), 1327 child => $vbox,
1328 has_close_button => 1,
1329 table => $table,
948 on_visibility_change => sub { 1330 on_visibility_change => sub {
949 update_metaserver if $_[1]; 1331 update_metaserver ($_[0]) if $_[1];
950 0 1332 0
951 }, 1333 },
952 ; 1334 ;
953 1335
954 $dialog->{table} = new CFClient::UI::Table;
955
956 $vbox->add (new CFClient::UI::ScrolledWindow expand => 1, child => $dialog->{table});
957
958 $dialog 1336 $dialog
959} 1337}
960 1338
961sub server_setup { 1339sub server_setup {
962 my $vbox = new CFClient::UI::VBox; 1340 my $vbox = new CFPlus::UI::VBox;
963 1341
1342 $vbox->add (new CFPlus::UI::FancyFrame
1343 label => "Connection Settings",
964 $vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]); 1344 child => (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]),
1345 );
965 $table->add (0, 2, new CFClient::UI::Label valign => 0, align => 1, text => "Host:Port"); 1346 $table->add_at (0, 2, new CFPlus::UI::Label valign => 0, align => 1, text => "Host:Port");
966 1347
967 { 1348 {
968 $table->add (1, 2, my $vbox = new CFClient::UI::VBox); 1349 $table->add_at (1, 2, my $vbox = new CFPlus::UI::VBox);
969 1350
970 $vbox->add ( 1351 $vbox->add (
971 $HOST_ENTRY = new CFClient::UI::Entry 1352 $HOST_ENTRY = new CFPlus::UI::Entry
972 expand => 1, 1353 expand => 1,
973 text => $CFG->{profile}{default}{host}, 1354 text => $CFG->{profile}{default}{host},
974 tooltip => "The hostname or ip address of the Crossfire(+) server to connect to", 1355 tooltip => "The hostname or ip address of the Crossfire(+) server to connect to",
975 on_changed => sub { 1356 on_changed => sub {
976 my ($self, $value) = @_; 1357 my ($self, $value) = @_;
977 $CFG->{profile}{default}{host} = $value; 1358 $CFG->{profile}{default}{host} = $value;
978 0 1359 1
979 } 1360 }
980 ); 1361 );
981 1362
982 $METASERVER = metaserver_dialog;
983
984 $vbox->add (new CFClient::UI::Button 1363 $vbox->add (new CFPlus::UI::Button
985 expand => 1, 1364 expand => 1,
986 text => "Server List", 1365 text => "Server List",
987 other => $METASERVER, 1366 other => $METASERVER,
988 tooltip => "Show a list of available crossfire servers", 1367 tooltip => "Show a list of available crossfire servers",
989 on_activate => sub { $METASERVER->toggle_visibility; 0 }, 1368 on_activate => sub { $METASERVER->toggle_visibility; 0 },
990 on_visibility_change => sub { $METASERVER->hide unless $_[1]; 0 }, 1369 on_visibility_change => sub { $METASERVER->hide unless $_[1]; 1 },
991 ); 1370 );
992 } 1371 }
993 1372
994 $table->add (0, 4, new CFClient::UI::Label valign => 0, align => 1, text => "Username"); 1373 $table->add_at (0, 4, new CFPlus::UI::Label valign => 0, align => 1, text => "Username");
995 $table->add (1, 4, new CFClient::UI::Entry 1374 $table->add_at (1, 4, new CFPlus::UI::Entry
996 text => $CFG->{profile}{default}{user}, 1375 text => $CFG->{profile}{default}{user},
997 tooltip => "The name of your character on the server", 1376 tooltip => "The name of your character on the server",
998 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value } 1377 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value; 1 }
999 ); 1378 );
1000 1379
1001 $table->add (0, 5, new CFClient::UI::Label valign => 0, align => 1, text => "Password"); 1380 $table->add_at (0, 5, new CFPlus::UI::Label valign => 0, align => 1, text => "Password");
1002 $table->add (1, 5, new CFClient::UI::Entry 1381 $table->add_at (1, 5, new CFPlus::UI::Entry
1003 text => $CFG->{profile}{default}{password}, 1382 text => $CFG->{profile}{default}{password},
1004 hidden => 1, 1383 hidden => 1,
1005 tooltip => "The password for your character", 1384 tooltip => "The password for your character",
1006 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{password} = $value } 1385 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{password} = $value; 1 }
1007 ); 1386 );
1008 1387
1009 $table->add (0, 7, new CFClient::UI::Label valign => 0, align => 1, text => "Map Size"); 1388 $table->add_at (0, 7, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Size");
1010 $table->add (1, 7, new CFClient::UI::Slider 1389 $table->add_at (1, 7, new CFPlus::UI::Slider
1011 force_w => 100, 1390 force_w => 100,
1012 range => [$CFG->{mapsize}, 10, 100, 0, 1], 1391 range => [$CFG->{mapsize}, 10, 100, 0, 1],
1013 tooltip => "This is the size of the portion of the map update the server sends you. " 1392 tooltip => "This is the size of the portion of the map update the server sends you. "
1014 . "If you set this to a high value you will be able to see further, " 1393 . "If you set this to a high value you will be able to see further, "
1015 . "but you also increase bandwidth requirements and latency. " 1394 . "but you also increase bandwidth requirements and latency. "
1016 . "This option is only used once at log-in.", 1395 . "This option is only used once at log-in.",
1017 on_changed => sub { my ($self, $value) = @_; $CFG->{mapsize} = $self->{range}[0] = $value = int $value; 0 }, 1396 on_changed => sub { my ($self, $value) = @_; $CFG->{mapsize} = $self->{range}[0] = $value = int $value; 1 },
1018 ); 1397 );
1019 1398
1020 $table->add (0, 8, new CFClient::UI::Label valign => 0, align => 1, text => "Face Prefetch"); 1399 $table->add_at (0, 8, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Rate");
1021 $table->add (1, 8, new CFClient::UI::CheckBox 1400 $table->add_at (1, 8, new CFPlus::UI::Entry
1022 state => $CFG->{face_prefetch}, 1401 text => $CFG->{output_rate},
1023 tooltip => "<b>Background Image Prefetch</b>\n\n" 1402 tooltip => "The maximum bandwidth in bytes per second that the server should not exceed "
1024 . "If enabled, the client automatically pre-fetches images from the server. " 1403 . "when sending data. When 0 or unset, the server "
1025 . "This might increase or create lag, but increases the chances " 1404 . "default will be used, which is usually around 100kb/s. Most servers will "
1026 . "of faces being ready for display when you encounter them. " 1405 . "dynamically find an optimal rate, so adjust this only when necessary.",
1027 . "It also uses up server bandwidth on every connect, "
1028 . "so only set it if you really need to prefetch images. "
1029 . "This option can be set and unset any time.",
1030 on_changed => sub { $CFG->{face_prefetch} = $_[1]; 0 }, 1406 on_changed => sub { $CFG->{output_rate} = $_[1]; 1 },
1031 ); 1407 );
1032 1408
1033 $table->add (0, 9, new CFClient::UI::Label valign => 0, align => 1, text => "Output-Count"); 1409 $table->add_at (0, 9, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Count");
1034 $table->add (1, 9, new CFClient::UI::Entry 1410 $table->add_at (1, 9, new CFPlus::UI::Entry
1035 text => $CFG->{output_count}, 1411 text => $CFG->{output_count},
1036 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.", 1412 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.",
1037 on_changed => sub { $CFG->{output_count} = $_[1]; 0 }, 1413 on_changed => sub { $CFG->{output_count} = $_[1]; 1 },
1038 ); 1414 );
1039 1415
1040 $table->add (0, 10, new CFClient::UI::Label valign => 0, align => 1, text => "Output-Sync"); 1416 $table->add_at (0, 10, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Sync");
1041 $table->add (1, 10, new CFClient::UI::Entry 1417 $table->add_at (1, 10, new CFPlus::UI::Entry
1042 text => $CFG->{output_sync}, 1418 text => $CFG->{output_sync},
1043 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.", 1419 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.",
1044 on_changed => sub { $CFG->{output_sync} = $_[1]; 0 }, 1420 on_changed => sub { $CFG->{output_sync} = $_[1]; 1 },
1045 ); 1421 );
1046 1422
1047 $table->add (1, 11, $LOGIN_BUTTON = new CFClient::UI::Button 1423 $table->add_at (1, 11, $LOGIN_BUTTON = new CFPlus::UI::Button
1048 expand => 1, 1424 expand => 1,
1049 align => 0, 1425 align => 0,
1050 text => "Login", 1426 text => "Login",
1051 on_activate => sub { 1427 on_activate => sub {
1052 $CONN ? stop_game 1428 $CONN ? stop_game
1053 : start_game; 1429 : start_game;
1430 1
1431 },
1432 );
1433
1434 $vbox->add (new CFPlus::UI::FancyFrame
1435 label => "Server Info",
1436 child => ($SERVER_INFO = new CFPlus::UI::Label ellipsise => 0),
1437 );
1438
1439 $vbox
1440}
1441
1442sub client_setup {
1443 my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1];
1444
1445 my $row = 0;
1446
1447 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Tip of the day");
1448 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
1449 state => $CFG->{show_tips},
1450 tooltip => "Show the <b>Tip of the day</b> window at startup?",
1451 on_changed => sub {
1452 my ($self, $value) = @_;
1453 $CFG->{show_tips} = $value;
1454 0
1455 }
1456 );
1457
1458 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Messages Window Size");
1459 $table->add_at (1, $row++, my $saycmd = new CFPlus::UI::Entry
1460 text => $CFG->{logview_max_par},
1461 tooltip => "This is maximum number of messages remembered in the <b>Messages</b> window. If the server "
1462 . "sends more messages than this number, older messages get removed to save memory and "
1463 . "computing time. A value of <b>0</b> disables this feature, but that is not recommended.",
1464 on_changed => sub {
1465 my ($self, $value) = @_;
1466 $MESSAGE_WINDOW->set_max_para ($CFG->{logview_max_par} = $value*1);
1054 0 1467 0
1055 }, 1468 },
1056 ); 1469 );
1057 1470
1058 $table->add (0, 12, new CFClient::UI::Label valign => 0, align => 1, text => "Chat Command"); 1471 $table
1059 $table->add (1, 12, my $saycmd = new CFClient::UI::Entry
1060 text => $CFG->{say_command},
1061 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. "
1062 . "Usually you want to enter something like 'say' or 'shout' or 'gsay' here. "
1063 . "But you could also set it to <b>tell <i>playername</i></b> to only chat with that user.",
1064 on_changed => sub {
1065 my ($self, $value) = @_;
1066 $CFG->{say_command} = $value;
1067 0
1068 }
1069 );
1070
1071 $vbox->add (new CFClient::UI::Label
1072 text => "Server Info",
1073 fontsize => 1.2,
1074 padding_y => 8,
1075 fg => [1, 1, 0, 1],
1076 );
1077
1078 $vbox->add ($SERVER_INFO = new CFClient::UI::Label ellipsise => 0);
1079
1080 $vbox
1081}
1082
1083sub message_window {
1084 my $window = new CFClient::UI::FancyFrame
1085 name => "message_window",
1086 title => "Messages",
1087 border_bg => [1, 1, 1, 1],
1088 bg => [0, 0, 0, 0.75],
1089 x => "max",
1090 y => 0,
1091 force_w => $::WIDTH * 0.4,
1092 force_h => $::HEIGHT * 0.5,
1093 child => (my $vbox = new CFClient::UI::VBox),
1094 has_close_button => 1;
1095
1096 $vbox->add ($LOGVIEW);
1097
1098 $vbox->add (my $input = new CFClient::UI::Entry
1099 tooltip => "<b>Chat Box</b>. If you enter a text and press return/enter here, the current <i>communication command</i> "
1100 . "from the client setup will be prepended (e.g. <b>shout</b>, <b>chat</b>...). "
1101 . "If you prepend a slash (/), you will submit a command instead (similar to IRC). "
1102 . "A better way to submit commands (and the occasional chat command) is often the map command completer.",
1103 on_focus_in => sub {
1104 my ($input, $prev_focus) = @_;
1105
1106 delete $input->{refocus_map};
1107
1108 if ($prev_focus == $MAPWIDGET && $input->{auto_activated}) {
1109 $input->{refocus_map} = 1;
1110 }
1111 delete $input->{auto_activated};
1112
1113 0
1114 },
1115 on_activate => sub {
1116 my ($input, $text) = @_;
1117 $input->set_text ('');
1118
1119 if ($text =~ /^\/(.*)/) {
1120 $::CONN->user_send ($1);
1121 } else {
1122 my $say_cmd = $::CFG->{say_command} || 'say';
1123 $::CONN->user_send ("$say_cmd $text");
1124 }
1125 if ($input->{refocus_map}) {
1126 delete $input->{refocus_map};
1127 $MAPWIDGET->focus_in
1128 }
1129
1130 0
1131 },
1132 on_escape => sub {
1133 $MAPWIDGET->grab_focus;
1134
1135 0
1136 },
1137 );
1138
1139 $CONSOLE = {
1140 window => $window,
1141 input => $input,
1142 };
1143
1144 $window
1145}
1146
1147sub open_quit_dialog {
1148 unless ($QUIT_DIALOG) {
1149 $QUIT_DIALOG = new CFClient::UI::FancyFrame
1150 x => "center",
1151 y => "center",
1152 z => 50,
1153 title => "Really Quit?",
1154 ;
1155
1156 $QUIT_DIALOG->add (my $vb = new CFClient::UI::VBox expand => 1);
1157
1158 $vb->add (new CFClient::UI::Label
1159 text => "You should find a savebed and apply it first!",
1160 max_w => $WIDTH * 0.25,
1161 ellipsize => 0,
1162 );
1163 $vb->add (my $hb = new CFClient::UI::HBox expand => 1);
1164 $hb->add (new CFClient::UI::Button
1165 text => "Ok",
1166 expand => 1,
1167 on_activate => sub { $QUIT_DIALOG->hide; 0 },
1168 );
1169 $hb->add (new CFClient::UI::Button
1170 text => "Quit anyway",
1171 expand => 1,
1172 on_activate => sub { exit },
1173 );
1174 }
1175
1176 $QUIT_DIALOG->show;
1177} 1472}
1178 1473
1179sub autopickup_setup { 1474sub autopickup_setup {
1475 my $r = new CFPlus::UI::ScrolledWindow (
1476 expand => 1,
1477 scroll_y => 1
1478 );
1180 my $table = new CFClient::UI::Table; 1479 $r->add (my $table = new CFPlus::UI::Table
1480 row_expand => [0],
1481 col_expand => [0, 1, 0, 1],
1482 );
1181 1483
1182 for ( 1484 for (
1183 ["General", 0, 0, 1485 ["General", 0, 0,
1184 ["Enable autopickup" => PICKUP_NEWMODE], 1486 ["Enable autopickup" => PICKUP_NEWMODE, \$PICKUP_ENABLE],
1185 ["Inhibit autopickup" => PICKUP_INHIBIT], 1487 ["Inhibit autopickup" => PICKUP_INHIBIT],
1186 ["Stop before pickup" => PICKUP_STOP], 1488 ["Stop before pickup" => PICKUP_STOP],
1187 ["Debug autopickup" => PICKUP_DEBUG], 1489 ["Debug autopickup" => PICKUP_DEBUG],
1188 ], 1490 ],
1189 ["Weapons", 0, 6, 1491 ["Weapons", 0, 6,
1199 ["Boots" => PICKUP_BOOTS], 1501 ["Boots" => PICKUP_BOOTS],
1200 ["Gloves" => PICKUP_GLOVES], 1502 ["Gloves" => PICKUP_GLOVES],
1201 ["Cloaks" => PICKUP_CLOAK], 1503 ["Cloaks" => PICKUP_CLOAK],
1202 ], 1504 ],
1203 1505
1204 ["Readables", 2, 2, 1506 ["Readables", 2, 0,
1205 ["Spellbooks" => PICKUP_SPELLBOOK], 1507 ["Spellbooks" => PICKUP_SPELLBOOK],
1206 ["Skillscrolls" => PICKUP_SKILLSCROLL], 1508 ["Skillscrolls" => PICKUP_SKILLSCROLL],
1207 ["Normal Books/Scrolls" => PICKUP_READABLES], 1509 ["Normal Books/Scrolls" => PICKUP_READABLES],
1208 ], 1510 ],
1209 ["Misc", 2, 7, 1511 ["Misc", 2, 5,
1210 ["Food" => PICKUP_FOOD], 1512 ["Food" => PICKUP_FOOD],
1211 ["Drinks" => PICKUP_DRINK], 1513 ["Drinks" => PICKUP_DRINK],
1212 ["Valuables (Money, Gems)" => PICKUP_VALUABLES], 1514 ["Valuables (Money, Gems)" => PICKUP_VALUABLES],
1213 ["Keys" => PICKUP_KEY], 1515 ["Keys" => PICKUP_KEY],
1214 ["Magical Items" => PICKUP_MAGICAL], 1516 ["Magical Items" => PICKUP_MAGICAL],
1215 ["Potions" => PICKUP_POTION], 1517 ["Potions" => PICKUP_POTION],
1216 ["Magic Devices" => PICKUP_MAGIC_DEVICE], 1518 ["Magic Devices" => PICKUP_MAGIC_DEVICE],
1217 ["Ignore cursed" => PICKUP_NOT_CURSED], 1519 ["Ignore cursed" => PICKUP_NOT_CURSED],
1218 ["Jewelery" => PICKUP_JEWELS], 1520 ["Jewelery" => PICKUP_JEWELS],
1521 ["Flesh" => PICKUP_FLESH],
1219 ], 1522 ],
1220 ["Weight/Value ratio", 2, 17] 1523 ["Weight/Value ratio", 2, 17]
1221 ) 1524 )
1222 { 1525 {
1223 my ($title, $x, $y, @bits) = @$_; 1526 my ($title, $x, $y, @bits) = @$_;
1224 $table->add ($x, $y, new CFClient::UI::Label text => $title, align => 1, fg => [1, 1, 0]); 1527 $table->add_at ($x, $y, new CFPlus::UI::Label text => $title, align => 1, fg => [1, 1, 0]);
1225 1528
1226 for (@bits) { 1529 for (@bits) {
1227 ++$y; 1530 ++$y;
1228 1531
1229 my $mask = $_->[1]; 1532 my $mask = $_->[1];
1230 $table->add ($x , $y, new CFClient::UI::Label text => $_->[0], align => 1, expand => 1); 1533 $table->add_at ($x , $y, new CFPlus::UI::Label text => $_->[0], align => 1, expand => 1);
1231 $table->add ($x+1, $y, new CFClient::UI::CheckBox 1534 $table->add_at ($x+1, $y, my $checkbox = new CFPlus::UI::CheckBox
1232 state => $CFG->{pickup} & $mask, 1535 state => $::CFG->{pickup} & $mask,
1233 on_changed => sub { 1536 on_changed => sub {
1234 my ($box, $value) = @_; 1537 my ($box, $value) = @_;
1235 1538
1236 if ($value) { 1539 if ($value) {
1237 $::CFG->{pickup} |= $mask; 1540 $::CFG->{pickup} |= $mask;
1242 $::CONN->send_command ("pickup $::CFG->{pickup}") 1545 $::CONN->send_command ("pickup $::CFG->{pickup}")
1243 if defined $::CONN; 1546 if defined $::CONN;
1244 1547
1245 0 1548 0
1246 }); 1549 });
1550
1551 ${$_->[2]} = $checkbox if $_->[2];
1247 } 1552 }
1248 } 1553 }
1249 1554
1250 $table->add (2, 18, new CFClient::UI::ValSlider 1555 $table->add_at (2, 18, new CFPlus::UI::ValSlider
1251 range => [0, 0, 16, 1, 1], 1556 range => [$::CFG->{pickup} & 0xF, 0, 16, 1, 1],
1557 template => ">= 99",
1252 to_value => sub { ">= " . 5 * $_[0] }, 1558 to_value => sub { ">= " . 5 * $_[0] },
1253 on_changed => sub { 1559 on_changed => sub {
1254 my ($slider, $value) = @_; 1560 my ($slider, $value) = @_;
1255 1561
1256 $::CFG->{pickup} &= ~0x7; 1562 $::CFG->{pickup} &= ~0xF;
1257 $::CFG->{pickup} |= int $value 1563 $::CFG->{pickup} |= int $value
1258 if $value; 1564 if $value;
1259 1; 1565 1;
1260 }); 1566 });
1567
1261 $table->add (3, 18, new CFClient::UI::Button 1568 $table->add_at (3, 18, new CFPlus::UI::Button
1262 text => "set", 1569 text => "set",
1263 on_activate => sub { 1570 on_activate => sub {
1264 $::CONN->send_command ("pickup $::CFG->{pickup}") 1571 $::CONN->send_command ("pickup $::CFG->{pickup}")
1265 if defined $::CONN; 1572 if defined $::CONN;
1266 0 1573 0
1267 }); 1574 });
1268 1575
1269 $table 1576 $r
1270} 1577}
1271 1578
1579my %SORT_ORDER = (
1580 type => undef,
1581 mtime => sub {
1582 my $NOW = time;
1583 sort {
1584 my $atime = $a->{mtime} - $NOW; $atime = $atime < 5 * 60 ? int $atime / 60 : 6;
1585 my $btime = $b->{mtime} - $NOW; $btime = $btime < 5 * 60 ? int $btime / 60 : 6;
1586
1587 ($a->{flags} & F_LOCKED) <=> ($b->{flags} & F_LOCKED)
1588 or $btime <=> $atime
1589 or $a->{type} <=> $b->{type}
1590 } @_
1591 },
1592 weight => sub { sort {
1593 $a->{weight} * ($a->{nrof} || 1) <=> $b->{weight} * ($b->{nrof} || 1)
1594 or $a->{type} <=> $b->{type}
1595 } @_ },
1596);
1597
1272sub inventory_window { 1598sub inventory_widget {
1273 my $invwin = $INV_WINDOW = new CFClient::UI::FancyFrame 1599 my $hb = new CFPlus::UI::HBox homogeneous => 1;
1600
1601 $hb->add (my $vb1 = new CFPlus::UI::VBox);
1602 $vb1->add (new CFPlus::UI::Label align => 0, text => "Player");
1603
1604 $vb1->add (my $hb1 = new CFPlus::UI::HBox);
1605
1606 use sort 'stable';
1607
1608 $hb1->add (new CFPlus::UI::Selector
1609 value => $::CFG->{inv_sort},
1610 options => [
1611 [type => "Type/Name"],
1612 [mtime => "Recent/Normal/Locked"],
1613 [weight => "Weight/Type"],
1614 ],
1615 on_changed => sub {
1616 $::CFG->{inv_sort} = $_[1];
1617 $INV->set_sort_order ($SORT_ORDER{$_[1]});
1618 },
1619 );
1620 $hb1->add (new CFPlus::UI::Label text => "Weight: ", align => 1, expand => 1);
1621 #TODO# update to weigh/maxweight
1622 $hb1->add ($STATWIDS->{i_weight} = new CFPlus::UI::Label align => -1);
1623
1624 $vb1->add (my $sw1 = new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1);
1625 $sw1->add ($INV = new CFPlus::UI::Inventory);
1626 $INV->set_sort_order ($SORT_ORDER{$::CFG->{inv_sort}});
1627
1628 $hb->add (my $vb2 = new CFPlus::UI::VBox);
1629
1630 $vb2->add ($INVR_HB = new CFPlus::UI::HBox);
1631
1632 $vb2->add (my $sw2 = new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1);
1633 $sw2->add ($INVR = new CFPlus::UI::Inventory);
1634
1635 # XXX: Call after $INVR = ... because set_opencont sets the items
1636 CFPlus::Protocol::set_opencont ($::CONN, 0, "Floor");
1637
1638 $hb
1639}
1640
1641sub media_window {
1642 my $vb = new CFPlus::UI::VBox;
1643
1644 $vb->add (new CFPlus::UI::FancyFrame
1645 label => "Currently playing music",
1646 child => new CFPlus::UI::ScrolledWindow scroll_x => 1, scroll_y => 0,
1647 child => ($MUSIC_PLAYING_WIDGET = new CFPlus::UI::Label ellipsise => 0, fontsize => 0.8),
1648 );
1649
1650 $vb->add (new CFPlus::UI::FancyFrame
1651 label => "Other media used in this session",
1652 expand => 1,
1653 child => ($LICENSE_WIDGET = new CFPlus::UI::TextScroller
1654 expand => 1, fontsize => 0.8, padding_x => 4, padding_y => 4),
1655 );
1656
1657 $vb
1658}
1659
1660sub add_license {
1661 my ($meta) = @_;
1662
1663 $meta = $meta->{data}
1664 or return;
1665
1666 $meta->{license} || $meta->{author} || $meta->{source}
1667 or return;
1668
1669 $LICENSE_WIDGET->add_paragraph ({
1670 fg => [1, 1, 1, 1],
1671 markup => "<small>"
1672 . "<b>Name:</b> " . (CFPlus::asxml $meta->{name}) . "\n"
1673 . "<b>Author:</b> " . (CFPlus::asxml $meta->{author}) . "\n"
1674 . "<b>Source:</b> " . (CFPlus::asxml $meta->{source}) . "\n"
1675 . "<b>License:</b> " . (CFPlus::asxml $meta->{license}) . "\n"
1676 . "</small>",
1677 });
1678 $LICENSE_WIDGET->scroll_to_bottom;
1679}
1680
1681sub toggle_player_page {
1682 my ($widget) = @_;
1683
1684 if ($PL_WINDOW->{visible} && $PL_NOTEBOOK->get_current_page == $widget) {
1685 $PL_WINDOW->hide;
1686 } else {
1687 $PL_NOTEBOOK->set_current_page ($widget);
1688 $PL_WINDOW->show;
1689 }
1690}
1691
1692sub player_window {
1693 my $plwin = $PL_WINDOW = new CFPlus::UI::Toplevel
1274 x => "center", 1694 x => "center",
1275 y => "center", 1695 y => "center",
1276 force_w => $WIDTH * 9/10, 1696 force_w => $WIDTH * 9/10,
1277 force_h => $HEIGHT * 9/10, 1697 force_h => $HEIGHT * 9/10,
1278 title => "Inventory", 1698 title => "Player",
1699 name => "playerbook",
1279 has_close_button => 1, 1700 has_close_button => 1
1280 ; 1701 ;
1281 1702
1282 $invwin->add (my $hb = new CFClient::UI::HBox homogeneous => 1); 1703 my $ntb =
1704 $PL_NOTEBOOK =
1705 new CFPlus::UI::Notebook expand => 1;
1283 1706
1284 $hb->add (my $vb1 = new CFClient::UI::VBox); 1707 $ntb->add_tab (
1285 $vb1->add (new CFClient::UI::Label align => 0, text => "Player"); 1708 "Statistics (F2)" => $STATS_PAGE = stats_window,
1286 $vb1->add ($INV = new CFClient::UI::Inventory expand => 1); 1709 "Shows statistics, where all your Stats and Resistances are shown."
1710 );
1711 $ntb->add_tab (
1712 "Skills (F3)" => $SKILL_PAGE = skill_window,
1713 "Shows all your Skills."
1714 );
1287 1715
1288 $hb->add (my $vb2 = new CFClient::UI::VBox); 1716 my $spellsw = $SPELL_PAGE = new CFPlus::UI::ScrolledWindow (expand => 1, scroll_y => 1);
1717 $spellsw->add ($SPELL_LIST = new CFPlus::UI::SpellList);
1718 $ntb->add_tab (
1719 "Spellbook (F4)" => $spellsw,
1720 "Displays all spells you have and lets you edit keyboard shortcuts for them."
1721 );
1722 $ntb->add_tab (
1723 "Inventory (F5)" => $INVENTORY_PAGE = inventory_widget,
1724 "Toggles the inventory window, where you can manage your loot (or treasures :). "
1725 . "You can also hit the <b>Tab</b>-key to show/hide the Inventory."
1726 );
1727 $ntb->add_tab (Pickup => autopickup_setup,
1728 "Configure autopickup settings, i.e. which items you will pick up automatically when walking (or running) over them.");
1289 1729
1290 $vb2->add ($INV_RIGHT_HB = new CFClient::UI::HBox); 1730 $ntb->add_tab (Media => media_window,
1731 "License, Author and Source info for media sent by the server.");
1291 1732
1292 $vb2->add ($INVR = new CFClient::UI::Inventory expand => 1); 1733 $ntb->set_current_page ($INVENTORY_PAGE);
1293 1734
1294 # XXX: Call after $INVR = ... because set_opencont sets the items 1735 $plwin->add ($ntb);
1295 CFClient::Protocol::set_opencont ($::CONN, 0, "Floor"); 1736 $plwin
1296
1297 $invwin
1298}
1299
1300sub spell_setup {
1301 new CFClient::UI::SpellList
1302} 1737}
1303 1738
1304sub keyboard_setup { 1739sub keyboard_setup {
1305 my $binding_list = new CFClient::UI::VBox; 1740 CFPlus::Macro::keyboard_setup
1306
1307 my $refresh;
1308 $refresh = sub {
1309 $binding_list->clear ();
1310
1311 for my $mod (keys %{$::CFG->{profile}{default}{bindings}}) {
1312 for my $sym (keys %{$::CFG->{profile}{default}{bindings}{$mod}}) {
1313 my $cmds = $::CFG->{profile}{default}{bindings}{$mod}{$sym};
1314 next unless ref $cmds eq 'ARRAY' and @$cmds > 0;
1315
1316 my $lbl = join "; ", @$cmds;
1317 my $nam = CFClient::Binder::keycombo_to_name ($mod, $sym);
1318 $binding_list->add (my $hb = new CFClient::UI::HBox);
1319 $hb->add (new CFClient::UI::Button
1320 text => "delete",
1321 tooltip => "Deletes the binding",
1322 on_activate => sub {
1323 $binding_list->remove ($hb);
1324 delete $::CFG->{profile}{default}{bindings}{$mod}{$sym};
1325 0
1326 });
1327
1328 $hb->add (new CFClient::UI::Button
1329 text => "edit",
1330 tooltip => "Edits the binding",
1331 on_activate => sub {
1332 $::BIND_EDITOR->set_binding (
1333 $mod, $sym, $::CFG->{profile}{default}{bindings}{$mod}{$sym},
1334 sub {
1335 my ($nmod, $nsym, $ncmds) = @_;
1336 delete $::CFG->{profile}{default}{bindings}{$mod}{$sym};
1337 $::CFG->{profile}{default}{bindings}{$nmod}{$nsym} = $ncmds;
1338 $refresh->();
1339 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1340 $SETUP_DIALOG->show;
1341 },
1342 sub {
1343 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1344 $SETUP_DIALOG->show;
1345 });
1346 $::BIND_EDITOR->show;
1347 $SETUP_DIALOG->hide;
1348 0
1349 });
1350
1351 $hb->add (new CFClient::UI::Label text => "(Key: $nam)");
1352 $hb->add (new CFClient::UI::Label text => $lbl, expand => 1);
1353 }
1354 }
1355 };
1356
1357 my $vb = new CFClient::UI::VBox;
1358 $vb->add (my $hb = new CFClient::UI::HBox);
1359 $hb->add (new CFClient::UI::Label text => "only shift-up stops fire");
1360 $hb->add (new CFClient::UI::CheckBox
1361 expand => 1,
1362 state => $CFG->{shift_fire_stop},
1363 tooltip => "If this checkbox is enabled you will stop fire only if you stop pressing shift",
1364 on_changed => sub {
1365 my ($cbox, $value) = @_;
1366 $CFG->{shift_fire_stop} = $value;
1367 0
1368 });
1369
1370 $vb->add ($binding_list);
1371 $vb->add (my $hb = new CFClient::UI::HBox);
1372
1373 $hb->add (new CFClient::UI::Button
1374 text => "record new",
1375 expand => 1,
1376 tooltip => "This button opens the binding editor with an empty binding.",
1377 on_activate => sub {
1378 $::BIND_EDITOR->set_binding (undef, undef, [],
1379 sub {
1380 my ($mod, $sym, $cmds) = @_;
1381 $::CFG->{profile}{default}{bindings}{$mod}{$sym} = $cmds;
1382 $refresh->();
1383 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1384 $SETUP_DIALOG->show;
1385 },
1386 sub {
1387 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1388 $SETUP_DIALOG->show;
1389 },
1390 );
1391 $SETUP_DIALOG->hide;
1392 $::BIND_EDITOR->show;
1393 0
1394 },
1395 );
1396
1397 $hb->add (new CFClient::UI::Button
1398 text => "close",
1399 tooltip => "Closes the binding window",
1400 expand => 1,
1401 on_activate => sub {
1402 $SETUP_DIALOG->hide;
1403 0
1404 }
1405 );
1406
1407 $refresh->();
1408
1409 $vb
1410} 1741}
1411 1742
1412sub help_window { 1743sub help_window {
1413 my $win = new CFClient::UI::FancyFrame 1744 my $win = new CFPlus::UI::Toplevel
1414 x => 'center', 1745 x => 'center',
1415 y => 'center', 1746 y => 'center',
1416 z => 2, 1747 z => 4,
1417 name => 'doc_browser', 1748 name => 'doc_browser',
1418 force_w => int $WIDTH * 7/8, 1749 force_w => int $WIDTH * 7/8,
1419 force_h => int $HEIGHT * 7/8, 1750 force_h => int $HEIGHT * 7/8,
1420 title => "Documentation"; 1751 title => "Help Browser",
1752 has_close_button => 1;
1421 1753
1422 $win->add (my $vbox = new CFClient::UI::VBox); 1754 $win->add (my $vbox = new CFPlus::UI::VBox);
1423 1755
1424 $vbox->add (my $buttons = new CFClient::UI::HBox); 1756 $vbox->add (new CFPlus::UI::FancyFrame
1757 label => "Navigation",
1758 child => (my $buttons = new CFPlus::UI::HBox),
1759 );
1425 $vbox->add (my $viewer = new CFClient::UI::TextScroller 1760 $vbox->add (my $viewer = new CFPlus::UI::TextScroller
1426 expand => 1, fontsize => 0.8, padding_x => 4); 1761 expand => 1, fontsize => 0.8, padding_x => 4, padding_y => 4);
1427 1762
1428 $buttons->add (new CFClient::UI::Label text => "Choose a document to display: "); 1763 my @history;
1429 $buttons->add (my $combo = new CFClient::UI::Combobox 1764 my @future;
1430 value => undef, 1765 my $curnode;
1431 options => [ 1766
1432 [intro => "Introduction"], 1767 my $load_node; $load_node = sub {
1433 [manual => "Manual"], 1768 my ($node, $para) = @_;
1434 [skill_help => "Skills"], 1769
1435 [command_help => "Commands"], 1770 $buttons->clear;
1436 [dmcommand_help => "DM Commands"], 1771
1437 [COPYING => "License Terms"], 1772 $buttons->add (new CFPlus::UI::Button
1438 ], 1773 text => "⇤",
1774 tooltip => "back to the starting page",
1439 on_changed => sub { 1775 on_activate => sub {
1440 my ($self, $pod) = @_; 1776 unshift @future, [$curnode, $viewer->current_paragraph] if $curnode;
1441 1777 unshift @future, @history;
1442 my $pom = CFClient::load_pod CFClient::find_rcfile "pod/$pod.pod", 1778 @history = ();
1443 doc_viewer => 1, sub { CFClient::pod_to_pango_list $_[0] }; 1779 $load_node->(@{shift @future});
1444
1445 $viewer->clear;
1446 1780 },
1447 $viewer->add_paragraph ([1, 1, 1, 1], $_->[1], $_->[0]) 1781 );
1448 for @$pom;
1449 1782
1450 $viewer->set_offset (0); 1783 if (@history) {
1784 $buttons->add (new CFPlus::UI::Button
1785 text => "⋘",
1786 tooltip => "back to <i>" . (CFPlus::asxml CFPlus::Pod::full_path $history[-1][0]) . "</i>",
1787 on_activate => sub {
1788 unshift @future, [$curnode, $viewer->current_paragraph] if $curnode;
1789 $load_node->(@{pop @history});
1790 },
1451 0 1791 );
1452 }, 1792 }
1453 on_visibility_change => sub { 1793
1454 my ($self, $visible) = @_; 1794 if (@future) {
1455 return unless $visible; 1795 $buttons->add (new CFPlus::UI::Button
1456 return if $self->{value}; 1796 text => "⋙",
1457 $self->set_value ("intro"); 1797 tooltip => "forward to <i>" . (CFPlus::asxml CFPlus::Pod::full_path $future[0][0]) . "</i>",
1798 on_activate => sub {
1799 push @history, [$curnode, $viewer->current_paragraph];
1800 $load_node->(@{shift @future});
1801 },
1458 0 1802 );
1459 }, 1803 }
1804
1805 $buttons->add (new CFPlus::UI::Label text => " ");
1806
1807 my @path = CFPlus::Pod::full_path_of $node;
1808 pop @path; # drop current node
1809
1810 for my $node (@path) {
1811 $buttons->add (new CFPlus::UI::Button
1812 text => $node->{kw}[0],
1813 tooltip => "go to <i>" . (CFPlus::asxml CFPlus::Pod::full_path $node) . "</i>",
1814 on_activate => sub {
1815 push @history, [$curnode, $viewer->current_paragraph] if $curnode; @future = ();
1816 $load_node->($node);
1817 },
1818 );
1819 $buttons->add (new CFPlus::UI::Label text => "/");
1820 }
1821
1822 $buttons->add (new CFPlus::UI::Label text => $node->{kw}[0], padding_x => 4, padding_y => 4);
1823
1824 $curnode = $node;
1825
1826 $viewer->clear;
1827 $viewer->add_paragraph (CFPlus::Pod::as_paragraphs CFPlus::Pod::section_of $curnode);
1828 $viewer->scroll_to ($para);
1460 ); 1829 };
1830
1831 $load_node->(CFPlus::Pod::find pod => "mainpage");
1832
1833 $CFPlus::Pod::goto_document = sub {
1834 my (@path) = @_;
1835
1836 push @history, [$curnode, $viewer->current_paragraph] if $curnode; @future = ();
1837
1838 $load_node->((CFPlus::Pod::find @path)[0]);
1839 $win->show;
1840 };
1461 1841
1462 $win 1842 $win
1463} 1843}
1464 1844
1845sub open_string_query {
1846 my ($title, $cb, $txt, $tooltip) = @_;
1847 my $dialog = new CFPlus::UI::Toplevel
1848 x => "center",
1849 y => "center",
1850 z => 50,
1851 force_w => $WIDTH * 4/5,
1852 title => $title;
1853
1854 $dialog->add (
1855 my $e = new CFPlus::UI::Entry
1856 on_activate => sub { $cb->(@_); $dialog->hide; 0 },
1857 on_key_down => sub { $_[1]->{sym} == 27 and $dialog->hide; 0 },
1858 tooltip => $tooltip
1859 );
1860
1861 $e->grab_focus;
1862 $e->set_text ($txt) if $txt;
1863 $dialog->show;
1864}
1865
1866sub open_quit_dialog {
1867 unless ($QUIT_DIALOG) {
1868 $QUIT_DIALOG = new CFPlus::UI::Toplevel
1869 x => "center",
1870 y => "center",
1871 z => 50,
1872 title => "Really Quit?",
1873 on_key_down => sub {
1874 my ($dialog, $ev) = @_;
1875 $ev->{sym} == 27 and $dialog->hide;
1876 }
1877 ;
1878
1879 $QUIT_DIALOG->add (my $vb = new CFPlus::UI::VBox expand => 1);
1880
1881 $vb->add (new CFPlus::UI::Label
1882 text => "You should find a savebed and apply it first!",
1883 max_w => $WIDTH * 0.25,
1884 ellipsize => 0,
1885 );
1886 $vb->add (my $hb = new CFPlus::UI::HBox expand => 1);
1887 $hb->add (new CFPlus::UI::Button
1888 text => "Ok",
1889 expand => 1,
1890 on_activate => sub { $QUIT_DIALOG->hide; 0 },
1891 );
1892 $hb->add (new CFPlus::UI::Button
1893 text => "Quit anyway",
1894 expand => 1,
1895 on_activate => sub { Event::unloop_all },
1896 );
1897 }
1898
1899 $QUIT_DIALOG->show;
1900 $QUIT_DIALOG->grab_focus;
1901}
1902
1903sub show_tip_of_the_day {
1904 # find all tips
1905 my @tod = CFPlus::Pod::find tip_of_the_day => "*";
1906
1907 CFPlus::DB::get state => "tip_of_the_day", sub {
1908 my ($todindex) = @_;
1909 $todindex = 0 if $todindex >= @tod;
1910 CFPlus::DB::put state => tip_of_the_day => $todindex + 1, sub { };
1911
1912 # create dialog
1913 my $dialog;
1914
1915 my $close = sub {
1916 $dialog->destroy;
1917 };
1918
1919 $dialog = new CFPlus::UI::Toplevel
1920 x => "center",
1921 y => "center",
1922 z => 3,
1923 name => 'tip_of_the_day',
1924 force_w => int $WIDTH * 4/9,
1925 force_h => int $WIDTH * 2/9,
1926 title => "Tip of the day #" . (1 + $todindex),
1927 child => my $vbox = new CFPlus::UI::VBox,
1928 has_close_button => 1,
1929 on_delete => $close,
1930 ;
1931
1932 $vbox->add (my $viewer = new CFPlus::UI::TextScroller
1933 expand => 1, fontsize => 0.8, padding_x => 4, padding_y => 4);
1934 $viewer->add_paragraph (CFPlus::Pod::as_paragraphs CFPlus::Pod::section_of $tod[$todindex]);
1935
1936 $vbox->add (my $table = new CFPlus::UI::Table col_expand => [0, 1]);
1937
1938 $table->add_at (0, 0, new CFPlus::UI::Button
1939 text => "Close",
1940 tooltip => "Close the tip of the day window. To never see it again, disable the tip of the day in the <b>Server Setup</b>.",
1941 on_activate => $close,
1942 );
1943
1944 $table->add_at (2, 0, new CFPlus::UI::Button
1945 text => "Next",
1946 tooltip => "Show the next <b>Tip of the day</b>.",
1947 on_activate => sub {
1948 $close->();
1949 &show_tip_of_the_day;
1950 },
1951 );
1952
1953 $dialog->show;
1954 };
1955}
1956
1465sub sdl_init { 1957sub sdl_init {
1466 CFClient::SDL_Init 1958 CFPlus::SDL_Init
1467 and die "SDL::Init failed!\n"; 1959 and die "SDL::Init failed!\n";
1468} 1960}
1469 1961
1470sub video_init { 1962sub video_init {
1471 sdl_init;
1472
1473 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} >= @SDL_MODES; 1963 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} >= @SDL_MODES;
1474 1964
1475 my ($old_w, $old_h) = ($WIDTH, $HEIGHT); 1965 my ($old_w, $old_h) = ($WIDTH, $HEIGHT);
1476 1966
1477 ($WIDTH, $HEIGHT) = @{ $SDL_MODES[$CFG->{sdl_mode}] }; 1967 ($WIDTH, $HEIGHT, my ($rgb, $alpha)) = @{ $SDL_MODES[$CFG->{sdl_mode}] };
1478 $FULLSCREEN = $CFG->{fullscreen}; 1968 $FULLSCREEN = $CFG->{fullscreen};
1479 $FAST = $CFG->{fast}; 1969 $FAST = $CFG->{fast};
1480 1970
1481 CFClient::SDL_SetVideoMode $WIDTH, $HEIGHT, $FULLSCREEN 1971 CFPlus::SDL_SetVideoMode $WIDTH, $HEIGHT, $rgb, $alpha, $FULLSCREEN
1482 or die "SDL_SetVideoMode failed: " . (CFClient::SDL_GetError) . "\n"; 1972 or die "SDL_SetVideoMode failed: " . (CFPlus::SDL_GetError) . "\n";
1483 1973
1484 $SDL_ACTIVE = 1; 1974 $SDL_ACTIVE = 1;
1485 $LAST_REFRESH = time - 0.01; 1975 $LAST_REFRESH = time - 0.01;
1486 1976
1487 CFClient::OpenGL::init; 1977 CFPlus::OpenGL::init;
1488 1978
1489 $FONTSIZE = int $HEIGHT / 40 * $CFG->{gui_fontsize}; 1979 $FONTSIZE = int $HEIGHT / 40 * $CFG->{gui_fontsize};
1490 1980
1491 $CFClient::UI::ROOT->configure (0, 0, $WIDTH, $HEIGHT);#d# 1981 $CFPlus::UI::ROOT->configure (0, 0, $WIDTH, $HEIGHT);#d#
1492 1982
1493 ############################################################################# 1983 #############################################################################
1494 1984
1495 if ($DEBUG_STATUS) { 1985 if ($DEBUG_STATUS) {
1496 CFClient::UI::rescale_widgets $WIDTH / $old_w, $HEIGHT / $old_h; 1986 CFPlus::UI::rescale_widgets $WIDTH / $old_w, $HEIGHT / $old_h;
1497 } else { 1987 } else {
1498 # create the widgets 1988 # create the widgets
1499 1989
1500 $DEBUG_STATUS = new CFClient::UI::Label 1990 $DEBUG_STATUS = new CFPlus::UI::Label
1501 padding => 0, 1991 padding => 0,
1502 z => 100, 1992 z => 100,
1503 force_x => "max", 1993 force_x => "max",
1504 force_y => 0; 1994 force_y => 0;
1505 $DEBUG_STATUS->show; 1995 $DEBUG_STATUS->show;
1506 1996
1507 $BIND_EDITOR = new CFClient::UI::BindEditor (x => "max", y => 0);
1508
1509 $STATUSBOX = new CFClient::UI::Statusbox; 1997 $STATUSBOX = new CFPlus::UI::Statusbox;
1510 $STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", timeout => 864000, pri => -100, color => [1, 1, 1, 0.8]); 1998 $STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", timeout => 864000, pri => -100, color => [1, 1, 1, 0.8]);
1511 1999
1512 (new CFClient::UI::Frame 2000 (new CFPlus::UI::Frame
1513 bg => [0, 0, 0, 0.4], 2001 bg => [0, 0, 0, 0.4],
1514 force_x => 0, 2002 force_x => 0,
1515 force_y => "max", 2003 force_y => "max",
1516 child => $STATUSBOX, 2004 child => $STATUSBOX,
1517 )->show; 2005 )->show;
1518 2006
1519 CFClient::UI::FancyFrame->new ( 2007 CFPlus::UI::Toplevel->new (
1520 title => "Map", 2008 title => "Map",
1521 name => "mapmap", 2009 name => "mapmap",
1522 x => 0, 2010 x => 0,
1523 y => $FONTSIZE + 8, 2011 y => $FONTSIZE + 8,
1524 border_bg => [1, 1, 1, 192/255], 2012 border_bg => [1, 1, 1, 192/255],
1525 bg => [1, 1, 1, 0], 2013 bg => [1, 1, 1, 0],
1526 child => ($MAPMAP = new CFClient::MapWidget::MapMap 2014 child => ($MAPMAP = new CFPlus::MapWidget::MapMap
1527 tooltip => "<b>Map</b>. On servers that support this feature, this will display an overview of the surrounding areas.", 2015 tooltip => "<b>Map</b>. On servers that support this feature, this will display an overview of the surrounding areas.",
1528 ), 2016 ),
1529 )->show; 2017 )->show;
1530 2018
1531 $MAPWIDGET = new CFClient::MapWidget; 2019 $MAPWIDGET = new CFPlus::MapWidget;
1532 $MAPWIDGET->connect (activate_console => sub { 2020 $MAPWIDGET->connect (activate_console => sub {
1533 my ($mapwidget, $preset) = @_; 2021 my ($mapwidget, $preset) = @_;
1534 2022
1535 if ($CONSOLE) { 2023 $MESSAGE_WINDOW->activate_console ($preset)
1536 $CONSOLE->{input}->{auto_activated} = 1; 2024 if $MESSAGE_WINDOW;
1537 $CONSOLE->{input}->grab_focus;
1538
1539 if ($preset && $CONSOLE->{input}->get_text eq '') {
1540 $CONSOLE->{input}->set_text ($preset);
1541 }
1542 }
1543 }); 2025 });
1544 $MAPWIDGET->show; 2026 $MAPWIDGET->show;
1545 $MAPWIDGET->grab_focus; 2027 $MAPWIDGET->grab_focus;
1546 2028
1547 $LOGVIEW = new CFClient::UI::TextScroller
1548 expand => 1,
1549 font => $FONT_FIXED,
1550 fontsize => $::CFG->{log_fontsize},
1551 indent => -4,
1552 can_hover => 1,
1553 can_events => 1,
1554 tooltip => "<b>Server Log</b>. This text viewer contains all the messages sent by the server.",
1555 ;
1556
1557 $SETUP_DIALOG = new CFClient::UI::FancyFrame 2029 $SETUP_DIALOG = new CFPlus::UI::Toplevel
1558 title => "Setup", 2030 title => "Setup",
1559 name => "setup_dialog", 2031 name => "setup_dialog",
1560 x => 'center', 2032 x => 'center',
1561 y => 'center', 2033 y => 'center',
1562 z => 2, 2034 z => 2,
1563 force_w => $::WIDTH * 0.6, 2035 force_w => $::WIDTH * 0.6,
1564 force_h => $::HEIGHT * 0.6, 2036 force_h => $::HEIGHT * 0.6,
1565 has_close_button => 1, 2037 has_close_button => 1,
1566 ; 2038 ;
1567 2039
2040 $METASERVER = metaserver_dialog;
2041 $MESSAGE_WINDOW = new CFPlus::UI::MessageWindow;
2042
1568 $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new CFClient::UI::Notebook expand => 1, debug => 1, 2043 $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new CFPlus::UI::Notebook expand => 1, debug => 1,
1569 filter => new CFClient::UI::ScrolledWindow expand => 1, scroll_y => 1); 2044 filter => new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1);
1570 2045
1571 $SETUP_NOTEBOOK->add (Server => $SETUP_SERVER = server_setup, 2046 $SETUP_NOTEBOOK->add_tab (Server => $SETUP_SERVER = server_setup,
1572 "Configure the server to play on, your username, password and other server-related options."); 2047 "Configure the server to play on, your username, password and other server-related options.");
1573 $SETUP_NOTEBOOK->add (Pickup => autopickup_setup, 2048 $SETUP_NOTEBOOK->add_tab (Client => client_setup,
1574 "Configure autopickup settings, i.e. which items you will pick up automatically when walking (or running) over them."); 2049 "Configure various client-specific settings.");
1575 $SETUP_NOTEBOOK->add (Graphics => graphics_setup, 2050 $SETUP_NOTEBOOK->add_tab (Graphics => graphics_setup,
1576 "Configure the video mode, performance, fonts and other graphical aspects of the game."); 2051 "Configure the video mode, performance, fonts and other graphical aspects of the game.");
1577 $SETUP_NOTEBOOK->add (Audio => audio_setup, 2052 $SETUP_NOTEBOOK->add_tab (Audio => audio_setup,
1578 "Configure the use of audio, sound effects and background music."); 2053 "Configure the use of audio, sound effects and background music.");
1579 $SETUP_NOTEBOOK->add (Keyboard => $SETUP_KEYBOARD = keyboard_setup, 2054 $SETUP_NOTEBOOK->add_tab (Keyboard => $SETUP_KEYBOARD = keyboard_setup,
1580 "Lets you define, edit and delete key bindings." 2055 "Lets you define, edit and delete key bindings."
1581 . "There is a shortcut for making bindings: <b>Control-Insert</b> opens the binding editor " 2056 . "There is a shortcut for making bindings: <b>Control-Insert</b> opens the binding editor "
1582 . "with nothing set and the recording started. After doing the actions you " 2057 . "with nothing set and the recording started. After doing the actions you "
1583 . "want to record press <b>Insert</b> and you will be asked to press a key-combo. " 2058 . "want to record press <b>Insert</b> and you will be asked to press a key-combo. "
1584 . "After pressing the combo the binding will be saved automatically and the " 2059 . "After pressing the combo the binding will be saved automatically and the "
1585 . "binding editor closes"); 2060 . "binding editor closes");
1586 $SETUP_NOTEBOOK->add (Spells => $SETUP_SPELLS = spell_setup,
1587 "Displays all spells you have and lets you edit keyboard shortcuts for them.");
1588 $SETUP_NOTEBOOK->add (Debug => debug_setup, 2061 $SETUP_NOTEBOOK->add_tab (Debug => debug_setup,
1589 "Some debuggin' options. Do not ask."); 2062 "Some debuggin' options. Do not ask.");
1590 2063
1591 $BUTTONBAR = new CFClient::UI::Buttonbar x => 0, y => 0, z => 200; # put on top 2064 $BUTTONBAR = new CFPlus::UI::Buttonbar x => 0, y => 0, z => 200; # put on top
1592 2065
1593 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Setup", other => $SETUP_DIALOG, 2066 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Setup", other => $SETUP_DIALOG,
1594 tooltip => "Toggles a dialog where you can configure all aspects of this client."); 2067 tooltip => "Toggles a dialog where you can configure all aspects of this client.");
1595 2068
1596 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW = message_window, 2069 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW,
1597 tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server."); 2070 tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server.");
1598 2071
1599 make_gauge_window->show; # XXX: this has to be set before make_stats_window as make_stats_window calls update_stats_window which updated the gauges also X-D 2072 make_gauge_window->show; # XXX: this has to be set before make_stats_window as make_stats_window calls update_stats_window which updated the gauges also X-D
1600 2073
1601 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Stats Window", other => $STATS_WINDOW = stats_window,
1602 tooltip => "Toggles the statistics window, where all your Stats and Resistances are being displayed at all times.");
1603 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Inventory", other => inventory_window, 2074 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Playerbook", other => player_window,
1604 tooltip => "Toggles the inventory window, where you can manage your loot (or treasures :). " 2075 tooltip => "Toggles the player view, where you can manage Inventory, Spells, Skills and see your Stats.");
1605 . "You can also hit the <b>Tab</b>-key to show/hide the Inventory.");
1606 2076
1607 $BUTTONBAR->add (new CFClient::UI::Button 2077 $BUTTONBAR->add (new CFPlus::UI::Button
1608 text => "Save Config", 2078 text => "Save Config",
1609 tooltip => "Saves the options chosen in the client setting, server settings and the window layout to be restored on later runs.", 2079 tooltip => "Saves the options chosen in the client setting, server settings and the window layout to be restored on later runs.",
1610 on_activate => sub { 2080 on_activate => sub {
1611 $::CFG->{layout} = CFClient::UI::get_layout; 2081 $::CFG->{layout} = CFPlus::UI::get_layout;
1612 CFClient::write_cfg "$Crossfire::VARDIR/cfplusrc"; 2082 CFPlus::write_cfg "$Crossfire::VARDIR/cfplusrc";
1613 status "Configuration Saved"; 2083 status "Configuration Saved";
1614 0 2084 0
1615 }, 2085 },
1616 ); 2086 );
1617 2087
1618 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Help!", other => help_window, 2088 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Help!", other => $HELP_WINDOW = help_window,
1619 tooltip => "View Documentation"); 2089 tooltip => "View Documentation");
1620 2090
2091
1621 $BUTTONBAR->add (new CFClient::UI::Button 2092 $BUTTONBAR->add (new CFPlus::UI::Button
1622 text => "Quit", 2093 text => "Quit",
1623 tooltip => "Terminates the program", 2094 tooltip => "Terminates the program",
1624 on_activate => sub { 2095 on_activate => sub {
1625 if ($CONN) { 2096 if ($CONN) {
1626 open_quit_dialog; 2097 open_quit_dialog;
1627 } else { 2098 } else {
1628 exit; 2099 Event::unloop_all;
1629 } 2100 }
1630 0 2101 0
1631 }, 2102 },
1632 ); 2103 );
1633 2104
1634 $BUTTONBAR->show; 2105 $BUTTONBAR->show;
1635 $SETUP_DIALOG->show; 2106 $SETUP_DIALOG->show;
2107 $MESSAGE_WINDOW->show;
1636 } 2108 }
1637 2109
1638 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]); 2110 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);
1639} 2111}
1640 2112
1641sub video_shutdown { 2113sub video_shutdown {
1642 CFClient::OpenGL::shutdown; 2114 CFPlus::OpenGL::shutdown;
1643 2115
1644 undef $SDL_ACTIVE; 2116 undef $SDL_ACTIVE;
1645} 2117}
1646 2118
1647my @bgmusic = qw(game1.ogg game2.ogg game3.ogg game5.ogg game6.ogg ross1.ogg ross2.ogg ross3.ogg ross4.ogg ross5.ogg); #d#
1648my $bgmusic;#TODO#hack#d#
1649
1650sub audio_channel_finished {
1651 my ($channel) = @_;
1652
1653 #warn "channel $channel finished\n";#d#
1654}
1655
1656sub audio_music_finished {
1657 return unless $CFG->{bgm_enable};
1658
1659 # TODO: hack, do play loop and mood music
1660 $bgmusic = new_from_file CFClient::MixMusic CFClient::find_rcfile "music/$bgmusic[0]";
1661 $bgmusic->play (0);
1662
1663 push @bgmusic, shift @bgmusic;
1664}
1665
1666sub audio_init {
1667 if ($CFG->{audio_enable}) {
1668 if (open my $fh, "<", CFClient::find_rcfile "sounds/config") {
1669 $SDL_MIXER = !CFClient::Mix_OpenAudio;
1670
1671 unless ($SDL_MIXER) {
1672 status "Unable to open sound device: there will be no sound";
1673 return;
1674 }
1675
1676 CFClient::Mix_AllocateChannels 8;
1677 CFClient::MixMusic::volume $CFG->{bgm_volume} * 128;
1678
1679 audio_music_finished;
1680
1681 while (<$fh>) {
1682 next if /^\s*#/;
1683 next if /^\s*$/;
1684
1685 my ($file, $volume, $event) = split /\s+/, $_, 3;
1686
1687 push @SOUNDS, "$volume,$file";
1688
1689 $AUDIO_CHUNKS{"$volume,$file"} ||= do {
1690 my $chunk = new_from_file CFClient::MixChunk CFClient::find_rcfile "sounds/$file";
1691 $chunk->volume ($volume * 128 / 100);
1692 $chunk
1693 };
1694 }
1695 } else {
1696 status "unable to open sound config: $!";
1697 }
1698 }
1699}
1700
1701sub audio_shutdown {
1702 CFClient::Mix_CloseAudio if $SDL_MIXER;
1703 undef $SDL_MIXER;
1704 @SOUNDS = ();
1705 %AUDIO_CHUNKS = ();
1706}
1707
1708my %animate_object; 2119my %animate_object;
1709my $animate_timer; 2120my $animate_timer;
1710 2121
1711my $fps = 9; 2122my $fps = 9;
1712 2123
1713my %demo;#d#
1714
1715sub force_refresh { 2124sub force_refresh {
2125 if ($ENV{CFPLUS_DEBUG} & 4) {
1716 $fps = $fps * 0.95 + 1 / (($NOW - $LAST_REFRESH) || 0.1) * 0.05; 2126 $fps = $fps * 0.98 + 1 / (($NOW - $LAST_REFRESH) || 0.1) * 0.02;
1717 debug sprintf "%3.2f", $fps if $ENV{CFPLUS_DEBUG} & 4; 2127 debug sprintf "%3.2f", $fps;
2128 }
1718 2129
1719 $CFClient::UI::ROOT->draw; 2130 $CFPlus::UI::ROOT->draw;
1720 2131 CFPlus::SDL_GL_SwapBuffers;
1721 $WANT_REFRESH = 0;
1722 $CAN_REFRESH = 0;
1723 $LAST_REFRESH = $NOW; 2132 $LAST_REFRESH = $NOW;
1724
17250 && do {
1726 # some weird model-drawing code, just a joke right now
1727 use CFClient::OpenGL;
1728
1729 $demo{t}{eye_auv} ||= new_from_file CFClient::Texture "eye2.png" or die;
1730 $demo{t}{body_auv} ||= new_from_file CFClient::Texture "body_auv3.png" or die;
1731 $demo{r} ||= do {
1732 my $mod = Compress::LZF::sthaw do { local $/; open my $fh, "<:raw:perlio", "dread.lz3"; <$fh> };
1733 $mod->{v} = pack "f*", @{$mod->{v}};
1734 $_ = [scalar @$_, pack "S!*", @$_]
1735 for values %{$mod->{g}};
1736 $mod
1737 };
1738
1739 my $r = $demo{r} or die;
1740
1741 glDepthMask 1;
1742 glClear GL_DEPTH_BUFFER_BIT;
1743 glEnable GL_TEXTURE_2D;
1744 glEnable GL_DEPTH_TEST;
1745 glEnable GL_CULL_FACE;
1746 glShadeModel $::FAST ? GL_FLAT : GL_SMOOTH;
1747
1748 glMatrixMode GL_PROJECTION;
1749 glLoadIdentity;
1750 glFrustum -1 * ($::WIDTH / $::HEIGHT), 1 * ($::WIDTH / $::HEIGHT), 1, -1, 1, 10000;
1751 #glOrtho 0, $::WIDTH, 0, $::HEIGHT, -10000, 10000;
1752 glMatrixMode GL_MODELVIEW;
1753 glLoadIdentity;
1754
1755 glPushMatrix;
1756 glTranslate 0, 0, -800;
1757 glScale 1, -1, 1;
1758 glRotate $NOW * 1000 % 36000 / 5, 0, 1, 0;
1759 glRotate $NOW * 1000 % 36000 / 6, 1, 0, 0;
1760 glRotate $NOW * 1000 % 36000 / 7, 0, 0, 1;
1761 glScale 50, 50, 50;
1762
1763 glInterleavedArrays GL_T2F_N3F_V3F, 0, $r->{v};
1764 while (my ($k, $v) = each %{$r->{g}}) {
1765 glBindTexture GL_TEXTURE_2D, ($demo{t}{$k}{name} or die);
1766 glDrawElements GL_TRIANGLES, $v->[0], GL_UNSIGNED_SHORT, $v->[1];
1767 }
1768
1769 glPopMatrix;
1770
1771 glShadeModel GL_FLAT;
1772 glDisable GL_DEPTH_TEST;
1773 glDisable GL_TEXTURE_2D;
1774 glDepthMask 0;
1775
1776 $WANT_REFRESH++; 2133 $WANT_REFRESH->stop;
1777};
1778
1779 CFClient::SDL_GL_SwapBuffers;
1780} 2134}
1781 2135
2136$WANT_REFRESH = Event->idle (min => 0.001, max => 0.06, parked => 1, cb => \&force_refresh);
2137
1782my $refresh_watcher = Event->timer (after => 0, hard => 0, interval => 1 / $MAX_FPS, cb => sub { 2138my $input = Event->timer (after => 0, hard => 0, interval => 1 / 50, cb => sub {
1783 $NOW = time; 2139 $NOW = time;
1784 2140
1785 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_) 2141 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_)
1786 for CFClient::SDL_PollEvent; 2142 for CFPlus::poll_events;
1787 2143
1788 if (%animate_object) { 2144 if (%animate_object) {
1789 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object; 2145 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object;
1790 $WANT_REFRESH++; 2146 $WANT_REFRESH->start;
1791 }
1792
1793 if ($WANT_REFRESH) {
1794 force_refresh;
1795 } else {
1796 $CAN_REFRESH = 1;
1797 } 2147 }
1798}); 2148});
1799 2149
1800sub animation_start { 2150sub animation_start {
1801 my ($widget) = @_; 2151 my ($widget) = @_;
1805sub animation_stop { 2155sub animation_stop {
1806 my ($widget) = @_; 2156 my ($widget) = @_;
1807 delete $animate_object{$widget}; 2157 delete $animate_object{$widget};
1808} 2158}
1809 2159
1810# check once/second for faces that need to be prefetched
1811# this should, of course, only run on demand, but
1812# SDL forces worse things on us....
1813
1814Event->timer (after => 1, interval => 0.25, cb => sub {
1815 $CONN->face_prefetch
1816 if $CONN;
1817});
1818
1819%SDL_CB = ( 2160%SDL_CB = (
1820 CFClient::SDL_QUIT => sub { 2161 CFPlus::SDL_QUIT => sub {
1821 Event::unloop -1; 2162 exit;
1822 }, 2163 },
1823 CFClient::SDL_VIDEORESIZE => sub { 2164 CFPlus::SDL_VIDEORESIZE => sub {
1824 }, 2165 },
1825 CFClient::SDL_VIDEOEXPOSE => sub { 2166 CFPlus::SDL_VIDEOEXPOSE => sub {
1826 CFClient::UI::full_refresh; 2167 CFPlus::UI::full_refresh;
1827 }, 2168 },
1828 CFClient::SDL_ACTIVEEVENT => sub { 2169 CFPlus::SDL_ACTIVEEVENT => sub {
1829# printf "active %x %x\n", $SDL_EV->active_gain, $SDL_EV->active_state;#d# 2170# not useful, as APPACTIVE include sonly iconified state, not unmapped
2171# printf "active %x %x %x\n", $_[0]{gain}, $_[0]{state}, CFPlus::SDL_GetAppState;#d#
2172# printf "a %x\n", CFPlus::SDL_GetAppState & CFPlus::SDL_APPACTIVE;#d#
2173# printf "A\n" if $_[0]{state} & CFPlus::SDL_APPACTIVE;
2174# printf "K\n" if $_[0]{state} & CFPlus::SDL_APPINPUTFOCUS;
2175# printf "M\n" if $_[0]{state} & CFPlus::SDL_APPMOUSEFOCUS;
1830 }, 2176 },
1831 CFClient::SDL_KEYDOWN => sub { 2177 CFPlus::SDL_KEYDOWN => sub {
1832 if ($_[0]{mod} & CFClient::KMOD_ALT && $_[0]{sym} == 13) { 2178 if ($_[0]{mod} & CFPlus::KMOD_ALT && $_[0]{sym} == 13) {
1833 # alt-enter 2179 # alt-enter
2180 $FULLSCREEN_ENABLE->toggle;
1834 video_shutdown; 2181 video_shutdown;
1835 $CFG->{fullscreen} = !$CFG->{fullscreen};
1836 video_init; 2182 video_init;
1837 } else { 2183 } else {
1838 CFClient::UI::feed_sdl_key_down_event ($_[0]); 2184 CFPlus::UI::feed_sdl_key_down_event ($_[0]);
1839 } 2185 }
1840 }, 2186 },
1841 CFClient::SDL_KEYUP => \&CFClient::UI::feed_sdl_key_up_event, 2187 CFPlus::SDL_KEYUP => \&CFPlus::UI::feed_sdl_key_up_event,
1842 CFClient::SDL_MOUSEMOTION => \&CFClient::UI::feed_sdl_motion_event, 2188 CFPlus::SDL_MOUSEMOTION => \&CFPlus::UI::feed_sdl_motion_event,
1843 CFClient::SDL_MOUSEBUTTONDOWN => \&CFClient::UI::feed_sdl_button_down_event, 2189 CFPlus::SDL_MOUSEBUTTONDOWN => \&CFPlus::UI::feed_sdl_button_down_event,
1844 CFClient::SDL_MOUSEBUTTONUP => \&CFClient::UI::feed_sdl_button_up_event, 2190 CFPlus::SDL_MOUSEBUTTONUP => \&CFPlus::UI::feed_sdl_button_up_event,
1845 CFClient::SDL_USEREVENT => sub { 2191 CFPlus::SDL_USEREVENT => sub {
1846 if ($_[0]{code} == 1) { 2192 if ($_[0]{code} == 1) {
1847 audio_channel_finished $_[0]{data1}; 2193 audio_channel_finished $_[0]{data1};
1848 } elsif ($_[0]{code} == 0) { 2194 } elsif ($_[0]{code} == 0) {
1849 audio_music_finished; 2195 audio_music_finished;
1850 } 2196 }
1854############################################################################# 2200#############################################################################
1855 2201
1856$SIG{INT} = $SIG{TERM} = sub { exit }; 2202$SIG{INT} = $SIG{TERM} = sub { exit };
1857 2203
1858{ 2204{
1859 local $SIG{__DIE__} = sub {
1860 return unless defined $^S && !$^S;
1861 Carp::confess $_[1];#d#TODO: remove when stable
1862 CFClient::fatal $_[0];
1863 };
1864
1865 CFClient::read_cfg "$Crossfire::VARDIR/cfplusrc"; 2205 CFPlus::read_cfg "$Crossfire::VARDIR/cfplusrc";
2206 CFPlus::DB::Server::run;
2207
1866 CFClient::UI::set_layout ($::CFG->{layout}); 2208 CFPlus::UI::set_layout ($::CFG->{layout});
1867 2209
1868 my %DEF_CFG = ( 2210 my %DEF_CFG = (
1869 sdl_mode => 0, 2211 sdl_mode => 0,
1870 width => 640,
1871 height => 480,
1872 fullscreen => 0, 2212 fullscreen => 0,
1873 fast => 0, 2213 fast => 0,
2214 force_opengl11 => undef,
2215 texture_compression => 1,
1874 map_scale => 1, 2216 map_scale => 1,
1875 fow_enable => 1, 2217 fow_enable => 1,
1876 fow_intensity => 0.45, 2218 fow_intensity => 0,
1877 fow_smooth => 0, 2219 map_smoothing => 1,
1878 gui_fontsize => 1, 2220 gui_fontsize => 1,
1879 log_fontsize => 0.7, 2221 log_fontsize => 0.7,
1880 gauge_fontsize => 1, 2222 gauge_fontsize => 1,
1881 gauge_size => 0.35, 2223 gauge_size => 0.35,
1882 stat_fontsize => 0.7, 2224 stat_fontsize => 0.7,
1883 mapsize => 100, 2225 mapsize => 100,
1884 say_command => 'say',
1885 audio_enable => 1, 2226 audio_enable => 1,
2227 effects_enable => 1,
2228 effects_volume => 1,
1886 bgm_enable => 1, 2229 bgm_enable => 1,
1887 bgm_volume => 0.25, 2230 bgm_volume => 0.5,
1888 face_prefetch => 0,
1889 output_sync => 1, 2231 output_sync => 1,
1890 output_count => 1, 2232 output_count => 1,
2233 output_rate => "",
1891 pickup => 0, 2234 pickup => 0,
2235 inv_sort => "mtime",
1892 default => "profile", # default profile 2236 default => "profile", # default profile
2237 show_tips => 1,
2238 logview_max_par => 1000,
1893 ); 2239 );
1894 2240
1895 while (my ($k, $v) = each %DEF_CFG) { 2241 while (my ($k, $v) = each %DEF_CFG) {
1896 $CFG->{$k} = $v unless exists $CFG->{$k}; 2242 $CFG->{$k} = $v unless exists $CFG->{$k};
1897 } 2243 }
1898 2244
1899 $CFG->{profile}{default}{host} ||= "crossfire.schmorp.de"; 2245 $CFG->{profile}{default}{host} ||= "crossfire.schmorp.de";
2246 $PROFILE = $CFG->{profile}{default};
2247
2248 # convert old bindings (only default profile matters)
2249 if (my $bindings = delete $PROFILE->{bindings}) {
2250 while (my ($mod, $syms) = each %$bindings) {
2251 while (my ($sym, $cmds) = each %$syms) {
2252 push @{ $PROFILE->{macro} }, {
2253 accelkey => [$mod*1, $sym*1],
2254 action => $cmds,
2255 };
2256 }
2257 }
2258 }
1900 2259
1901 sdl_init; 2260 sdl_init;
1902 2261
1903 @SDL_MODES = reverse 2262 @SDL_MODES = CFPlus::SDL_ListModes 8, 8;
1904 grep $_->[0] >= 640 && $_->[1] >= 480, 2263 @SDL_MODES = CFPlus::SDL_ListModes 5, 0 unless @SDL_MODES;
1905 CFClient::SDL_ListModes;
1906
1907 @SDL_MODES or CFClient::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)"; 2264 @SDL_MODES or CFPlus::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)";
2265
2266 @SDL_MODES = sort { $a->[0] * $a->[1] <=> $b->[0] * $b->[1] } @SDL_MODES;
1908 2267
1909 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES; 2268 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES;
1910 2269
1911 { 2270 {
1912 my @fonts = map CFClient::find_rcfile "fonts/$_", qw( 2271 my @fonts = map CFPlus::find_rcfile "fonts/$_", qw(
1913 DejaVuSans.ttf 2272 DejaVuSans.ttf
1914 DejaVuSansMono.ttf 2273 DejaVuSansMono.ttf
1915 DejaVuSans-Bold.ttf 2274 DejaVuSans-Bold.ttf
1916 DejaVuSansMono-Bold.ttf 2275 DejaVuSansMono-Bold.ttf
1917 DejaVuSans-Oblique.ttf 2276 DejaVuSans-Oblique.ttf
1918 DejaVuSansMono-Oblique.ttf 2277 DejaVuSansMono-Oblique.ttf
1919 DejaVuSans-BoldOblique.ttf 2278 DejaVuSans-BoldOblique.ttf
1920 DejaVuSansMono-BoldOblique.ttf 2279 DejaVuSansMono-BoldOblique.ttf
1921 ); 2280 );
1922 2281
1923 CFClient::add_font $_ for @fonts; 2282 CFPlus::add_font $_ for @fonts;
1924 2283
1925 CFClient::pango_init; 2284 CFPlus::pango_init;
1926 2285
1927 $FONT_PROP = new_from_file CFClient::Font $fonts[0]; 2286 $FONT_PROP = new_from_file CFPlus::Font $fonts[0];
1928 $FONT_FIXED = new_from_file CFClient::Font $fonts[1]; 2287 $FONT_FIXED = new_from_file CFPlus::Font $fonts[1];
1929 2288
1930 $FONT_PROP->make_default; 2289 $FONT_PROP->make_default;
1931 } 2290 }
1932 2291
1933# compare mono (ft) vs. rgba (cairo) 2292# compare mono (ft) vs. rgba (cairo)
1934# ft - 1.8s, cairo 3s, even in alpha-only mode 2293# ft - 1.8s, cairo 3s, even in alpha-only mode
1935# for my $rgba (0..1) { 2294# for my $rgba (0..1) {
1936# my $t1 = Time::HiRes::time; 2295# my $t1 = Time::HiRes::time;
1937# for (1..1000) { 2296# for (1..1000) {
1938# my $layout = CFClient::Layout->new ($rgba); 2297# my $layout = CFPlus::Layout->new ($rgba);
1939# $layout->set_text ("hallo" x 100); 2298# $layout->set_text ("hallo" x 100);
1940# $layout->render; 2299# $layout->render;
1941# } 2300# }
1942# my $t2 = Time::HiRes::time; 2301# my $t2 = Time::HiRes::time;
1943# warn $t2-$t1; 2302# warn $t2-$t1;
1944# } 2303# }
1945 2304
2305 $startup_done->();
2306
1946 video_init; 2307 video_init;
1947 audio_init; 2308 audio_init;
1948} 2309}
1949 2310
2311show_tip_of_the_day if $CFG->{show_tips};
2312
1950Event::loop; 2313Event::loop;
2314
2315#video_shutdown;
2316#audio_shutdown;
1951#CFClient::SDL_Quit; 2317CFPlus::SDL_Quit;
1952#CFClient::_exit 0; 2318CFPlus::DB::Server::stop;
1953
1954END { CFClient::SDL_Quit }
1955 2319
1956=head1 NAME 2320=head1 NAME
1957 2321
1958cfplus - A Crossfire+ and Crossfire game client 2322cfplus - A Crossfire TRT and Crossfire game client
1959 2323
1960=head1 SYNOPSIS 2324=head1 SYNOPSIS
1961 2325
1962Just run it - no commandline arguments are supported. 2326Just run it - no commandline arguments are supported.
1963 2327
1964=head1 USAGE 2328=head1 USAGE
1965 2329
1966cfplus utilises OpenGL for all UI elements and the game. It is supposed to be used 2330cfplus utilises OpenGL for all UI elements and the game. It is supposed to
1967fullscreen and interactively. 2331be used in fullscreen mode and interactively.
1968 2332
1969=head1 DEBUGGING 2333=head1 DEBUGGING
1970 2334
1971 2335
1972CFPLUS_DEBUG - environment variable 2336CFPLUS_DEBUG - environment variable

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines