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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines