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.80 by root, Mon Jun 26 21:59:04 2006 UTC vs.
Revision 1.222 by root, Sun Aug 26 03:12:34 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);
991 $vbox->add (my $sklprg = new CFPlus::UI::ExperienceProgress);
616 $vbox->add (my $rng = new CFClient::UI::Label valign => 0, align => 1, can_hover => 1, can_events => 1, 992 $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 993
619 $GAUGES = { 994 $GAUGES = {
995 exp => $exp, prg => $prg, sklprg => $sklprg,
620 exp => $exp, win => $win, range => $rng, 996 win => $win, range => $rng,
621 food => $fg, mana => $mg, hp => $hg, grace => $gg 997 hp => $hg, mana => $mg, grace => $gg, food => $fg,
622 }; 998 };
623 999
624 &set_gauge_window_fontsize; 1000 &set_gauge_window_fontsize;
625 1001
626 $win 1002 $win
627} 1003}
628 1004
629sub debug_setup { 1005sub debug_setup {
630 my $table = new CFClient::UI::Table; 1006 my $table = new CFPlus::UI::Table;
631 1007
632 $table->add (0, 0, new CFClient::UI::Label text => "Widget Borders"); 1008 $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 }); 1009 $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"); 1010 $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 }); 1011 $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"); 1012 $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 }); 1013 $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"); 1014 $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 }); 1015 $table->add_at (1, 3, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 8; 0 });
1016 $table->add_at (0, 4, new CFPlus::UI::Button text => "die on click(tm)", on_activate => sub { &CFPlus::debug() } );
640 1017
641 my @default_smooth = (0.05, 0.13, 0.05, 0.13, 0.30, 0.13, 0.05, 0.13, 0.05); 1018 $table->add_at (0, 5, new CFPlus::UI::TextEdit text => "line1\0152\0153");#d#
642 1019
643 for my $x (0..2) { 1020 $table->add_at (7,7, my $t = new CFPlus::UI::Table expand => 0);
644 for my $y (0 .. 2) { 1021 $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, 1022 $t->add_at (2,0, new CFPlus::UI::Label text => "b\nb", c_rowspan => 2, c_colspan => 1);
646 new CFClient::UI::Entry 1023 $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], 1024 $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 }, 1025 $t->add_at (1,1, new CFPlus::UI::Label text => "e");
649 ); 1026
650 } 1027 $table->add_at (7, 6, my $c = new CFPlus::UI::Canvas);
1028
1029 $c->add_items ({
1030 type => "line_loop",
1031 color => [0, 1, 0],
1032 width => 9,
1033 coord_mode => "abs",
1034 coord => [[10, 5], [5, 50], [20, 5], [5, 60]],
651 } 1035 });
652 1036
1037 $c->add_items ({
1038 type => "lines",
1039 color => [1, 1, 0],
1040 width => 2,
1041 coord_mode => "rel",
1042 coord => [[0,0], [1,1], [1,0], [0,1]],
1043 });
1044
1045 $c->add_items ({
1046 type => "polygon",
1047 color => [0, 0.43, 0],
1048 width => 2,
1049 coord_mode => "rel",
1050 coord => [[0,0.2], [1,.4], [1,.6], [0,.8]],
1051 });
653 1052
654 $table 1053 $table
655} 1054}
656 1055
657sub stats_window { 1056sub stats_window {
658 my $tgw = new CFClient::UI::FancyFrame 1057 my $r = new CFPlus::UI::ScrolledWindow (
659 y => $HEIGHT * (2/8), 1058 expand => 1,
660 x => "max", 1059 scroll_y => 1
661 title => "Stats", 1060 );
662 name => "stats_window", 1061 $r->add (my $vb = new CFPlus::UI::VBox);
663 has_close_button => 1;
664 1062
665 $tgw->add (new CFClient::UI::Window child => my $vb = new CFClient::UI::VBox); 1063 $vb->add (new CFPlus::UI::FancyFrame
1064 label => "Player",
1065 child => (my $pi = new CFPlus::UI::VBox),
1066 );
1067
666 $vb->add ($STATWIDS->{title} = new CFClient::UI::Label valign => 0, align => -1, text => "Title:", expand => 1, 1068 $pi->add ($STATWIDS->{title} = new CFPlus::UI::Label valign => 0, align => -1, text => "Title:", expand => 1,
667 can_hover => 1, can_events => 1, 1069 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."); 1070 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, 1071 $pi->add ($STATWIDS->{map} = new CFPlus::UI::Label valign => 0, align => -1, text => "Map:", expand => 1,
670 can_hover => 1, can_events => 1, 1072 can_hover => 1, can_events => 1,
671 tooltip => "The map you are currently on (if supported by the server)."); 1073 tooltip => "The map you are currently on (if supported by the server).");
672 1074
673 $vb->add (my $hb0 = new CFClient::UI::HBox); 1075 $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, 1076 $hb0->add ($STATWIDS->{weight} = new CFPlus::UI::Label valign => 0, align => -1, text => "Weight:", expand => 1,
675 can_hover => 1, can_events => 1, 1077 can_hover => 1, can_events => 1,
676 tooltip => "The weight of the player including all inventory items."); 1078 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, 1079 $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, 1080 can_hover => 1, can_events => 1,
679 tooltip => "The weight limit: you cannot carry more than this."); 1081 tooltip => "The weight limit: you cannot carry more than this.");
680 1082
681 1083 $vb->add (new CFPlus::UI::FancyFrame
1084 label => "Primary/Secondary Statistics",
682 $vb->add (my $hb = new CFClient::UI::HBox expand => 1); 1085 child => (my $hb = new CFPlus::UI::HBox expand => 1),
1086 );
683 $hb->add (my $tbl = new CFClient::UI::Table expand => 1); 1087 $hb->add (my $tbl = new CFPlus::UI::Table expand => 1);
684 1088
685 my $color2 = [1, 1, 0]; 1089 my $color2 = [1, 1, 0];
686 1090
687 for ( 1091 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"], 1092 [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"], 1093 [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"], 1094 [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"], 1095 [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"], 1096 [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"], 1097 [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."], 1098 [0, 6, st_cha => "Cha", 30],
695 1099
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."], 1100 [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."], 1101 [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."], 1102 [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."], 1103 [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."], 1104 [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."], 1105 [2, 5, st_wspd => "WSp", 10.54],
702 ) { 1106 ) {
703 my ($col, $row, $id, $label, $template, $tooltip) = @$_; 1107 my ($col, $row, $id, $label, $template) = @$_;
704 1108
705 $tbl->add ($col , $row, $STATWIDS->{$id} = new CFClient::UI::Label 1109 $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); 1110 font => $FONT_FIXED, can_hover => 1, can_events => 1, valign => 0,
1111 align => +1, template => $template, tooltip => "#stat_$label");
707 $tbl->add ($col + 1, $row, $STATWIDS->{"$id\_lbl"} = new CFClient::UI::Label 1112 $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); 1113 font => $FONT_FIXED, can_hover => 1, can_events => 1, fg => $color2, valign => 0,
1114 align => -1, text => $label, tooltip => "#stat_$label");
709 } 1115 }
710 1116
1117 $vb->add (new CFPlus::UI::FancyFrame
1118 label => "Resistancies",
711 $hb->add (my $tbl2 = new CFClient::UI::Table expand => 1); 1119 child => (my $tbl2 = new CFPlus::UI::Table expand => 1),
1120 );
712 1121
713 my $row = 0; 1122 my $row = 0;
714 my $col = 0; 1123 my $col = 0;
715 1124
716 my %resist_names = ( 1125 my %resist_names = (
1126 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.)", 1127 "<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.)"],
1128 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.)", 1129 "<b>Holy Word</b> (resistance you against getting the fear when someone whose god doesn't like you spells the holy word on you.)"],
1130 conf => ["Confusion",
719 conf => "<b>Confusion</b> (If you are hit by confusion you will move into random directions, and likely into monsters.)", 1131 "<b>Confusion</b> (If you are hit by confusion you will move into random directions, and likely into monsters.)"],
1132 fire => ["Fire",
720 fire => "<b>Fire</b> (just your resistance to fire spells like burning hands, dragonbreath, meteor swarm fire, ...)", 1133 "<b>Fire</b> (just your resistance to fire spells like burning hands, dragonbreath, meteor swarm fire, ...)"],
1134 depl => ["Depletion",
721 depl => "<b>Depletion</b> (some monsters and other effects can cause stats depletion)", 1135 "<b>Depletion</b> (some monsters and other effects can cause stats depletion)"],
1136 magic => ["Magic",
722 magic => "<b>Magic</b> (resistance to magic spells like magic missile or similar)", 1137 "<b>Magic</b> (resistance to magic spells like magic missile or similar)"],
1138 drain => ["Draining",
723 drain => "<b>Draining</b> (some monsters (e.g. vampires) and other effects can steal experience)", 1139 "<b>Draining</b> (some monsters (e.g. vampires) and other effects can steal experience)"],
1140 acid => ["Acid",
724 acid => "<b>Acid</b> (resistance to acid, acid hurts pretty much and also corrodes your weapons)", 1141 "<b>Acid</b> (resistance to acid, acid hurts pretty much and also corrodes your weapons)"],
1142 pois => ["Poison",
725 pois => "<b>Poison</b> (resistance to getting poisoned)", 1143 "<b>Poison</b> (resistance to getting poisoned)"],
1144 para => ["Paralysation",
726 para => "<b>Paralysation</b> (this resistance affects the chance you get paralysed)", 1145 "<b>Paralysation</b> (this resistance affects the chance you get paralysed)"],
1146 deat => ["Death",
727 deat => "<b>Death</b> (resistance against death spells)", 1147 "<b>Death</b> (resistance against death spells)"],
728 phys => "<b>Physical</b> (this is the resistance against physical attacks, like when a monster hit you in melee combat)", 1148 phys => ["Physical",
1149 "<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.)"],
1150 blind => ["Blind",
729 blind => "<b>Blind</b> (blind resistance affects the chance of a successful blinding attack)", 1151 "<b>Blind</b> (blind resistance affects the chance of a successful blinding attack)"],
1152 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)", 1153 "<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)"],
1154 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...", 1155 "<b>Turn undead</b> (affects your resistancy to various forms of 'turn undead' spells. Only relevant when you are, in fact, undead..."],
1156 elec => ["Electricity",
732 elec => "<b>Electricity</b> (resistance against electricity, spells like large lightning, small lightning, ...)", 1157 "<b>Electricity</b> (resistance against electricity, spells like large lightning, small lightning, ...)"],
1158 cold => ["Cold",
733 cold => "<b>Cold</b> (this is your resistance against cold spells like icestorm, snowstorm, ...)", 1159 "<b>Cold</b> (this is your resistance against cold spells like icestorm, snowstorm, ...)"],
1160 ghit => ["Ghost hit",
734 ghit => "<b>Ghost hit</b> (special attack used by ghosts and ghost-like beings)", 1161 "<b>Ghost hit</b> (special attack used by ghosts and ghost-like beings)"],
735 ); 1162 );
1163
736 for (qw/slow holyw conf fire depl magic 1164 for (qw/slow holyw conf fire depl magic
737 drain acid pois para deat phys 1165 drain acid pois para deat phys
738 blind fear tund elec cold ghit/) 1166 blind fear tund elec cold ghit/)
739 { 1167 {
740 $tbl2->add ($col, $row, 1168 $tbl2->add_at ($col, $row,
741 $STATWIDS->{"res_$_"} = 1169 $STATWIDS->{"res_$_"} =
742 new CFClient::UI::Label 1170 new CFPlus::UI::Label
743 font => $FONT_FIXED, 1171 font => $FONT_FIXED,
744 template => "-100%", 1172 template => "-100%",
745 align => +1, 1173 align => +1,
746 valign => 0, 1174 valign => 0,
747 can_events => 1, 1175 can_events => 1,
748 can_hover => 1, 1176 can_hover => 1,
749 tooltip => $resist_names{$_}, 1177 tooltip => $resist_names{$_}->[1],
750 ); 1178 );
751 $tbl2->add ($col + 1, $row, new CFClient::UI::Image 1179 $tbl2->add_at ($col + 1, $row, new CFPlus::UI::Image
752 font => $FONT_FIXED, 1180 font => $FONT_FIXED,
753 can_hover => 1, 1181 can_hover => 1,
754 can_events => 1, 1182 can_events => 1,
755 path => "ui/resist/resist_$_.png", 1183 path => "ui/resist/resist_$_.png",
756 tooltip => $resist_names{$_}, 1184 tooltip => $resist_names{$_}->[1],
1185 );
1186 $tbl2->add_at ($col + 2, $row, new CFPlus::UI::Label
1187 text => $resist_names{$_}->[0],
1188 font => $FONT_FIXED,
1189 can_hover => 1,
1190 can_events => 1,
1191 tooltip => $resist_names{$_}->[1],
757 ); 1192 );
758 1193
759 $row++; 1194 $row++;
760 if ($row % 6 == 0) { 1195 if ($row % 6 == 0) {
761 $col += 2; 1196 $col += 3;
762 $row = 0; 1197 $row = 0;
763 } 1198 }
764 } 1199 }
765 1200
766 &set_stats_window_fontsize;
767 update_stats_window ({}); 1201 #update_stats_window ({});
768 1202
1203 $r
1204}
1205
1206sub skill_window {
1207 my $sw = new CFPlus::UI::ScrolledWindow (expand => 1);
1208
1209 $sw->add ($STATWIDS->{skill_tbl} = new CFPlus::UI::Table expand => 1, col_expand => [0, 0, 1, .1, 0, 0, 1, .1]);
1210
769 $tgw 1211 $sw
770} 1212}
771 1213
772sub formsep($) { 1214sub formsep($) {
773 scalar reverse join ",", unpack "(A3)*", reverse $_[0] * 1 1215 scalar reverse join ",", unpack "(A3)*", reverse $_[0] * 1
774} 1216}
775 1217
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_ARMOUR});
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; 1218my $METASERVER_ATIME;
845 1219
846sub update_metaserver { 1220sub update_metaserver {
1221 my ($metaserver_dialog) = @_;
1222
1223 $METASERVER = $metaserver_dialog
1224 if defined $metaserver_dialog;
1225
847 return if $METASERVER_ATIME > time; 1226 return if $METASERVER_ATIME > time;
848 $METASERVER_ATIME = time + 60; 1227 $METASERVER_ATIME = time + 60;
849 1228
850 my $table = $METASERVER->{table}; 1229 my $table = $METASERVER->{table};
851 $table->clear; 1230 $table->clear;
852 $table->add (0, 0, my $label = new CFClient::UI::Label max_w => $WIDTH * 0.8, text => "fetching server list..."); 1231 $table->add_at (0, 0, my $label = new CFPlus::UI::Label max_w => $WIDTH * 0.8, text => "fetching server list...");
853 1232
854 my $buf; 1233 my $ok = 0;
855 1234
856 my $fh = new IO::Socket::INET PeerHost => $META_SERVER, Blocking => 0; 1235 CFPlus::background {
1236 my $ua = CFPlus::lwp_useragent;
857 1237
858 unless ($fh) { 1238 CFPlus::background_msg CFPlus::from_json +(CFPlus::lwp_check $ua->get ($META_SERVER))->decoded_content;
859 $label->set_text ("unable to contact metaserver: $!"); 1239 } sub {
860 return; 1240 my ($msg) = @_;
861 } 1241 if ($msg) {
862
863 Event->io (fd => $fh, poll => 'r', cb => sub {
864 my $res = sysread $fh, $buf, 8192, length $buf;
865
866 if (!defined $res) {
867 $_[0]->w->cancel;
868 $label->set_text ("error while retrieving server list: $!");
869 } elsif ($res == 0) {
870 $_[0]->w->cancel;
871 status "server list retrieved";
872
873 utf8::decode $buf if utf8::valid $buf;
874
875 $table->clear; 1242 $table->clear;
876 1243
877 my @tip = ( 1244 my @tip = (
878 "The current number of users logged in on the server.", 1245 "The current number of users logged in on the server.",
879 "The hostname of the server.", 1246 "The hostname of the server.",
880 "The time this server has been running without being restarted.", 1247 "The time this server has been running without being restarted.",
881 "The server software version - a '+' indicates a Crossfire+ server.", 1248 "The server software version - a '+' indicates a Crossfire+ server.",
882 "Short information about this server provided by its admins.", 1249 "Short information about this server provided by its admins.",
883 ); 1250 );
884 my @col = qw(#Users Host Uptime Version Description); 1251 my @col = qw(#Users Host Uptime Version Description);
885 $table->add ($_, 0, new CFClient::UI::Label 1252 $table->add_at ($_, 0, new CFPlus::UI::Label
886 can_hover => 1, can_events => 1, 1253 can_hover => 1, can_events => 1,
887 align => 0, fg => [1, 1, 0], 1254 align => 0, fg => [1, 1, 0],
888 text => $col[$_], tooltip => $tip[$_]) 1255 text => $col[$_], tooltip => $tip[$_])
889 for 0 .. $#col; 1256 for 0 .. $#col;
890 1257
891 my @align = qw(1 0 1 1 -1); 1258 my @align = qw(1 0 1 1 -1);
892 1259
893 my $y = 0; 1260 my $y = 0;
894 for my $m (sort { $b->[3] <=> $a->[3] } map [split /\|/], split /\015?\012/, $buf) { 1261 for my $m (@{ $msg->{servers} }) {
895 my ($ip, $last, $host, $users, $version, $desc, $ibytes, $obytes, $uptime) = @$m; 1262 my ($ip, $last, $host, $users, $version, $desc, $ibytes, $obytes, $uptime, $highlight) =
1263 @$m{qw(ip age hostname users version description ibytes obytes uptime highlight)};
896 1264
897 for ($desc) { 1265 for ($desc) {
898 s/<br>/\n/gi; 1266 s/<br>/\n/gi;
899 s/<li>/\n· /gi; 1267 s/<li>/\n· /gi;
900 s/<.*?>//sgi; 1268 s/<.*?>//sgi;
901 s/&/&amp;/g; 1269 s/&amp;/&/g;
902 s/</&lt;/g; 1270 s/&lt;/</g;
903 s/>/&gt;/g; 1271 s/&gt;/>/g;
904 } 1272 }
905 1273
906 $uptime = sprintf "%dd %02d:%02d:%02d", 1274 $uptime = sprintf "%dd %02d:%02d:%02d",
907 (int $m->[8] / 86400), 1275 (int $uptime / 86400),
908 (int $m->[8] / 3600) % 24, 1276 (int $uptime / 3600) % 24,
909 (int $m->[8] / 60) % 60, 1277 (int $uptime / 60) % 60,
910 $m->[8] % 60; 1278 $uptime % 60;
911 1279
912 $m = [$users, $host, $uptime, $version, $desc]; 1280 $m = [$users, $host, $uptime, $version, $desc];
913 1281
914 $y++; 1282 $y++;
915 1283
916 $table->add (scalar @$m, $y, new CFClient::UI::VBox children => [ 1284 $table->add_at (scalar @$m, $y, new CFPlus::UI::VBox children => [
917 (new CFClient::UI::Button 1285 (new CFPlus::UI::Button
918 text => "Use", 1286 text => "Use",
919 tooltip => "Put this server into the <b>Host:Port</b> field", 1287 tooltip => "Put this server into the <b>Host:Port</b> field",
920 on_activate => sub { 1288 on_activate => sub {
921 $HOST_ENTRY->set_text ($CFG->{profile}{default}{host} = $host); 1289 $HOST_ENTRY->set_text ($CFG->{profile}{default}{host} = $host);
922 $METASERVER->hide; 1290 $METASERVER->hide;
923 0 1291 0
924 }, 1292 },
925 ), 1293 ),
926 (new CFClient::UI::Empty expand => 1), 1294 (new CFPlus::UI::Empty expand => 1),
927 ]); 1295 ]);
928 1296
929 $table->add ($_, $y, new CFClient::UI::Label 1297 $table->add_at ($_, $y, new CFPlus::UI::Label
1298 max_w => $::WIDTH * 0.4,
930 ellipsise => 0, 1299 ellipsise => 0,
931 align => $align[$_], 1300 align => $align[$_],
932 text => $m->[$_], 1301 text => $m->[$_],
933 tooltip => $tip[$_], 1302 tooltip => $tip[$_],
1303 fg => ($highlight ? [1, 1, 1] : [.7, .7, .7]),
934 can_hover => 1, 1304 can_hover => 1,
935 can_events => 1, 1305 can_events => 1,
936 fontsize => 0.8) 1306 fontsize => 0.8)
937 for 0 .. $#$m; 1307 for 0 .. $#$m;
938 } 1308 }
1309 } else {
1310 $ok or $label->set_text ("error while contacting metaserver");
939 } 1311 }
940 }); 1312 };
1313
941} 1314}
942 1315
943sub metaserver_dialog { 1316sub metaserver_dialog {
944 my $dialog = new CFClient::UI::FancyFrame 1317 my $vbox = new CFPlus::UI::VBox;
1318 my $table = new CFPlus::UI::Table;
1319 $vbox->add (new CFPlus::UI::ScrolledWindow expand => 1, child => $table);
1320
1321 my $dialog = new CFPlus::UI::Toplevel
945 title => "Server List", 1322 title => "Server List",
946 name => 'metaserver_dialog', 1323 name => 'metaserver_dialog',
947 x => 'center', 1324 x => 'center',
948 y => 'center', 1325 y => 'center',
949 z => 3, 1326 z => 3,
1327 force_w => $::WIDTH * 0.9,
950 force_h => $::HEIGHT * 0.4, 1328 force_h => $::HEIGHT * 0.7,
951 child => (my $vbox = new CFClient::UI::VBox), 1329 child => $vbox,
952 has_close_button => 1, 1330 has_close_button => 1,
1331 table => $table,
953 on_visibility_change => sub { 1332 on_visibility_change => sub {
954 update_metaserver if $_[1]; 1333 update_metaserver ($_[0]) if $_[1];
955 0 1334 0
956 }, 1335 },
957 ; 1336 ;
958 1337
959 $dialog->{table} = new CFClient::UI::Table;
960
961 $vbox->add (new CFClient::UI::ScrolledWindow expand => 1, child => $dialog->{table});
962
963 $dialog 1338 $dialog
964} 1339}
965 1340
966sub server_setup { 1341sub server_setup {
967 my $vbox = new CFClient::UI::VBox; 1342 my $vbox = new CFPlus::UI::VBox;
968 1343
1344 $vbox->add (new CFPlus::UI::FancyFrame
1345 label => "Connection Settings",
969 $vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]); 1346 child => (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]),
1347 );
970 $table->add (0, 2, new CFClient::UI::Label valign => 0, align => 1, text => "Host:Port"); 1348 $table->add_at (0, 2, new CFPlus::UI::Label valign => 0, align => 1, text => "Host:Port");
971 1349
972 { 1350 {
973 $table->add (1, 2, my $vbox = new CFClient::UI::VBox); 1351 $table->add_at (1, 2, my $vbox = new CFPlus::UI::VBox);
974 1352
975 $vbox->add ( 1353 $vbox->add (
976 $HOST_ENTRY = new CFClient::UI::Entry 1354 $HOST_ENTRY = new CFPlus::UI::Entry
977 expand => 1, 1355 expand => 1,
978 text => $CFG->{profile}{default}{host}, 1356 text => $CFG->{profile}{default}{host},
979 tooltip => "The hostname or ip address of the Crossfire(+) server to connect to", 1357 tooltip => "The hostname or ip address of the Crossfire(+) server to connect to",
980 on_changed => sub { 1358 on_changed => sub {
981 my ($self, $value) = @_; 1359 my ($self, $value) = @_;
982 $CFG->{profile}{default}{host} = $value; 1360 $CFG->{profile}{default}{host} = $value;
983 0 1361 1
984 } 1362 }
985 ); 1363 );
986 1364
987 $METASERVER = metaserver_dialog;
988
989 $vbox->add (new CFClient::UI::Button 1365 $vbox->add (new CFPlus::UI::Button
990 expand => 1, 1366 expand => 1,
991 text => "Server List", 1367 text => "Server List",
992 other => $METASERVER, 1368 other => $METASERVER,
993 tooltip => "Show a list of available crossfire servers", 1369 tooltip => "Show a list of available crossfire servers",
994 on_activate => sub { $METASERVER->toggle_visibility; 0 }, 1370 on_activate => sub { $METASERVER->toggle_visibility; 0 },
995 on_visibility_change => sub { $METASERVER->hide unless $_[1]; 0 }, 1371 on_visibility_change => sub { $METASERVER->hide unless $_[1]; 1 },
996 ); 1372 );
997 } 1373 }
998 1374
999 $table->add (0, 4, new CFClient::UI::Label valign => 0, align => 1, text => "Username"); 1375 $table->add_at (0, 4, new CFPlus::UI::Label valign => 0, align => 1, text => "Username");
1000 $table->add (1, 4, new CFClient::UI::Entry 1376 $table->add_at (1, 4, new CFPlus::UI::Entry
1001 text => $CFG->{profile}{default}{user}, 1377 text => $CFG->{profile}{default}{user},
1002 tooltip => "The name of your character on the server", 1378 tooltip => "The name of your character on the server",
1003 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value } 1379 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value; 1 }
1004 ); 1380 );
1005 1381
1006 $table->add (0, 5, new CFClient::UI::Label valign => 0, align => 1, text => "Password"); 1382 $table->add_at (0, 5, new CFPlus::UI::Label valign => 0, align => 1, text => "Password");
1007 $table->add (1, 5, new CFClient::UI::Entry 1383 $table->add_at (1, 5, new CFPlus::UI::Entry
1008 text => $CFG->{profile}{default}{password}, 1384 text => $CFG->{profile}{default}{password},
1009 hidden => 1, 1385 hidden => 1,
1010 tooltip => "The password for your character", 1386 tooltip => "The password for your character",
1011 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{password} = $value } 1387 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{password} = $value; 1 }
1012 ); 1388 );
1013 1389
1014 $table->add (0, 7, new CFClient::UI::Label valign => 0, align => 1, text => "Map Size"); 1390 $table->add_at (0, 7, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Size");
1015 $table->add (1, 7, new CFClient::UI::Slider 1391 $table->add_at (1, 7, new CFPlus::UI::Slider
1016 force_w => 100, 1392 force_w => 100,
1017 range => [$CFG->{mapsize}, 10, 100, 0, 1], 1393 range => [$CFG->{mapsize}, 10, 100, 0, 1],
1018 tooltip => "This is the size of the portion of the map update the server sends you. " 1394 tooltip => "This is the size of the portion of the map update the server sends you. "
1019 . "If you set this to a high value you will be able to see further, " 1395 . "If you set this to a high value you will be able to see further, "
1020 . "but you also increase bandwidth requirements and latency. " 1396 . "but you also increase bandwidth requirements and latency. "
1021 . "This option is only used once at log-in.", 1397 . "This option is only used once at log-in.",
1022 on_changed => sub { my ($self, $value) = @_; $CFG->{mapsize} = $self->{range}[0] = $value = int $value; 0 }, 1398 on_changed => sub { my ($self, $value) = @_; $CFG->{mapsize} = $self->{range}[0] = $value = int $value; 1 },
1023 ); 1399 );
1024 1400
1025 $table->add (0, 8, new CFClient::UI::Label valign => 0, align => 1, text => "Face Prefetch"); 1401 $table->add_at (0, 8, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Rate");
1026 $table->add (1, 8, new CFClient::UI::CheckBox 1402 $table->add_at (1, 8, new CFPlus::UI::Entry
1027 state => $CFG->{face_prefetch}, 1403 text => $CFG->{output_rate},
1028 tooltip => "<b>Background Image Prefetch</b>\n\n" 1404 tooltip => "The maximum bandwidth in bytes per second that the server should not exceed "
1029 . "If enabled, the client automatically pre-fetches images from the server. " 1405 . "when sending data. When 0 or unset, the server "
1030 . "This might increase or create lag, but increases the chances " 1406 . "default will be used, which is usually around 100kb/s. Most servers will "
1031 . "of faces being ready for display when you encounter them. " 1407 . "dynamically find an optimal rate, so adjust this only when necessary.",
1032 . "It also uses up server bandwidth on every connect, "
1033 . "so only set it if you really need to prefetch images. "
1034 . "This option can be set and unset any time.",
1035 on_changed => sub { $CFG->{face_prefetch} = $_[1]; 0 }, 1408 on_changed => sub { $CFG->{output_rate} = $_[1]; 1 },
1036 ); 1409 );
1037 1410
1038 $table->add (0, 9, new CFClient::UI::Label valign => 0, align => 1, text => "Output-Count"); 1411 $table->add_at (0, 9, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Count");
1039 $table->add (1, 9, new CFClient::UI::Entry 1412 $table->add_at (1, 9, new CFPlus::UI::Entry
1040 text => $CFG->{output_count}, 1413 text => $CFG->{output_count},
1041 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.", 1414 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.",
1042 on_changed => sub { $CFG->{output_count} = $_[1]; 0 }, 1415 on_changed => sub { $CFG->{output_count} = $_[1]; 1 },
1043 ); 1416 );
1044 1417
1045 $table->add (0, 10, new CFClient::UI::Label valign => 0, align => 1, text => "Output-Sync"); 1418 $table->add_at (0, 10, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Sync");
1046 $table->add (1, 10, new CFClient::UI::Entry 1419 $table->add_at (1, 10, new CFPlus::UI::Entry
1047 text => $CFG->{output_sync}, 1420 text => $CFG->{output_sync},
1048 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.", 1421 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.",
1049 on_changed => sub { $CFG->{output_sync} = $_[1]; 0 }, 1422 on_changed => sub { $CFG->{output_sync} = $_[1]; 1 },
1050 ); 1423 );
1051 1424
1052 $table->add (1, 11, $LOGIN_BUTTON = new CFClient::UI::Button 1425 $table->add_at (1, 11, $LOGIN_BUTTON = new CFPlus::UI::Button
1053 expand => 1, 1426 expand => 1,
1054 align => 0, 1427 align => 0,
1055 text => "Login", 1428 text => "Login",
1056 on_activate => sub { 1429 on_activate => sub {
1057 $CONN ? stop_game 1430 $CONN ? stop_game
1058 : start_game; 1431 : start_game;
1432 1
1433 },
1434 );
1435
1436 $vbox->add (new CFPlus::UI::FancyFrame
1437 label => "Server Info",
1438 child => ($SERVER_INFO = new CFPlus::UI::Label ellipsise => 0),
1439 );
1440
1441 $vbox
1442}
1443
1444sub client_setup {
1445 my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1];
1446
1447 my $row = 0;
1448
1449 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Tip of the day");
1450 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
1451 state => $CFG->{show_tips},
1452 tooltip => "Show the <b>Tip of the day</b> window at startup?",
1453 on_changed => sub {
1454 my ($self, $value) = @_;
1455 $CFG->{show_tips} = $value;
1456 0
1457 }
1458 );
1459
1460 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Messages Window Size");
1461 $table->add_at (1, $row++, my $saycmd = new CFPlus::UI::Entry
1462 text => $CFG->{logview_max_par},
1463 tooltip => "This is maximum number of messages remembered in the <b>Messages</b> window. If the server "
1464 . "sends more messages than this number, older messages get removed to save memory and "
1465 . "computing time. A value of <b>0</b> disables this feature, but that is not recommended.",
1466 on_changed => sub {
1467 my ($self, $value) = @_;
1468 $MESSAGE_WINDOW->set_max_para ($CFG->{logview_max_par} = $value*1);
1059 0 1469 0
1060 }, 1470 },
1061 ); 1471 );
1062 1472
1063 $table->add (0, 12, new CFClient::UI::Label valign => 0, align => 1, text => "Chat Command"); 1473 $table
1064 $table->add (1, 12, my $saycmd = new CFClient::UI::Entry
1065 text => $CFG->{say_command},
1066 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. "
1067 . "Usually you want to enter something like 'say' or 'shout' or 'gsay' here. "
1068 . "But you could also set it to <b>tell <i>playername</i></b> to only chat with that user.",
1069 on_changed => sub {
1070 my ($self, $value) = @_;
1071 $CFG->{say_command} = $value;
1072 0
1073 }
1074 );
1075
1076 $vbox->add (new CFClient::UI::Label
1077 text => "Server Info",
1078 fontsize => 1.2,
1079 padding_y => 8,
1080 fg => [1, 1, 0, 1],
1081 );
1082
1083 $vbox->add ($SERVER_INFO = new CFClient::UI::Label ellipsise => 0);
1084
1085 $vbox
1086}
1087
1088sub message_window {
1089 my $window = new CFClient::UI::FancyFrame
1090 name => "message_window",
1091 title => "Messages",
1092 border_bg => [1, 1, 1, 1],
1093 bg => [0, 0, 0, 0.75],
1094 x => "max",
1095 y => 0,
1096 force_w => $::WIDTH * 0.4,
1097 force_h => $::HEIGHT * 0.5,
1098 child => (my $vbox = new CFClient::UI::VBox),
1099 has_close_button => 1;
1100
1101 $vbox->add ($LOGVIEW);
1102
1103 $vbox->add (my $input = new CFClient::UI::Entry
1104 tooltip => "<b>Chat Box</b>. If you enter a text and press return/enter here, the current <i>communication command</i> "
1105 . "from the client setup will be prepended (e.g. <b>shout</b>, <b>chat</b>...). "
1106 . "If you prepend a slash (/), you will submit a command instead (similar to IRC). "
1107 . "A better way to submit commands (and the occasional chat command) is often the map command completer.",
1108 on_focus_in => sub {
1109 my ($input, $prev_focus) = @_;
1110
1111 delete $input->{refocus_map};
1112
1113 if ($prev_focus == $MAPWIDGET && $input->{auto_activated}) {
1114 $input->{refocus_map} = 1;
1115 }
1116 delete $input->{auto_activated};
1117
1118 0
1119 },
1120 on_activate => sub {
1121 my ($input, $text) = @_;
1122 $input->set_text ('');
1123
1124 if ($text =~ /^\/(.*)/) {
1125 $::CONN->user_send ($1);
1126 } else {
1127 my $say_cmd = $::CFG->{say_command} || 'say';
1128 $::CONN->user_send ("$say_cmd $text");
1129 }
1130 if ($input->{refocus_map}) {
1131 delete $input->{refocus_map};
1132 $MAPWIDGET->focus_in
1133 }
1134
1135 0
1136 },
1137 on_escape => sub {
1138 $MAPWIDGET->grab_focus;
1139
1140 0
1141 },
1142 );
1143
1144 $CONSOLE = {
1145 window => $window,
1146 input => $input,
1147 };
1148
1149 $window
1150}
1151
1152sub open_quit_dialog {
1153 unless ($QUIT_DIALOG) {
1154 $QUIT_DIALOG = new CFClient::UI::FancyFrame
1155 x => "center",
1156 y => "center",
1157 z => 50,
1158 title => "Really Quit?",
1159 ;
1160
1161 $QUIT_DIALOG->add (my $vb = new CFClient::UI::VBox expand => 1);
1162
1163 $vb->add (new CFClient::UI::Label
1164 text => "You should find a savebed and apply it first!",
1165 max_w => $WIDTH * 0.25,
1166 ellipsize => 0,
1167 );
1168 $vb->add (my $hb = new CFClient::UI::HBox expand => 1);
1169 $hb->add (new CFClient::UI::Button
1170 text => "Ok",
1171 expand => 1,
1172 on_activate => sub { $QUIT_DIALOG->hide; 0 },
1173 );
1174 $hb->add (new CFClient::UI::Button
1175 text => "Quit anyway",
1176 expand => 1,
1177 on_activate => sub { exit },
1178 );
1179 }
1180
1181 $QUIT_DIALOG->show;
1182} 1474}
1183 1475
1184sub autopickup_setup { 1476sub autopickup_setup {
1477 my $r = new CFPlus::UI::ScrolledWindow (
1478 expand => 1,
1479 scroll_y => 1
1480 );
1185 my $table = new CFClient::UI::Table; 1481 $r->add (my $table = new CFPlus::UI::Table
1482 row_expand => [0],
1483 col_expand => [0, 1, 0, 1],
1484 );
1186 1485
1187 for ( 1486 for (
1188 ["General", 0, 0, 1487 ["General", 0, 0,
1189 ["Enable autopickup" => PICKUP_NEWMODE], 1488 ["Enable autopickup" => PICKUP_NEWMODE, \$PICKUP_ENABLE],
1190 ["Inhibit autopickup" => PICKUP_INHIBIT], 1489 ["Inhibit autopickup" => PICKUP_INHIBIT],
1191 ["Stop before pickup" => PICKUP_STOP], 1490 ["Stop before pickup" => PICKUP_STOP],
1192 ["Debug autopickup" => PICKUP_DEBUG], 1491 ["Debug autopickup" => PICKUP_DEBUG],
1193 ], 1492 ],
1194 ["Weapons", 0, 6, 1493 ["Weapons", 0, 6,
1204 ["Boots" => PICKUP_BOOTS], 1503 ["Boots" => PICKUP_BOOTS],
1205 ["Gloves" => PICKUP_GLOVES], 1504 ["Gloves" => PICKUP_GLOVES],
1206 ["Cloaks" => PICKUP_CLOAK], 1505 ["Cloaks" => PICKUP_CLOAK],
1207 ], 1506 ],
1208 1507
1209 ["Readables", 2, 2, 1508 ["Readables", 2, 0,
1210 ["Spellbooks" => PICKUP_SPELLBOOK], 1509 ["Spellbooks" => PICKUP_SPELLBOOK],
1211 ["Skillscrolls" => PICKUP_SKILLSCROLL], 1510 ["Skillscrolls" => PICKUP_SKILLSCROLL],
1212 ["Normal Books/Scrolls" => PICKUP_READABLES], 1511 ["Normal Books/Scrolls" => PICKUP_READABLES],
1213 ], 1512 ],
1214 ["Misc", 2, 7, 1513 ["Misc", 2, 5,
1215 ["Food" => PICKUP_FOOD], 1514 ["Food" => PICKUP_FOOD],
1216 ["Drinks" => PICKUP_DRINK], 1515 ["Drinks" => PICKUP_DRINK],
1217 ["Valuables (Money, Gems)" => PICKUP_VALUABLES], 1516 ["Valuables (Money, Gems)" => PICKUP_VALUABLES],
1218 ["Keys" => PICKUP_KEY], 1517 ["Keys" => PICKUP_KEY],
1219 ["Magical Items" => PICKUP_MAGICAL], 1518 ["Magical Items" => PICKUP_MAGICAL],
1220 ["Potions" => PICKUP_POTION], 1519 ["Potions" => PICKUP_POTION],
1221 ["Magic Devices" => PICKUP_MAGIC_DEVICE], 1520 ["Magic Devices" => PICKUP_MAGIC_DEVICE],
1222 ["Ignore cursed" => PICKUP_NOT_CURSED], 1521 ["Ignore cursed" => PICKUP_NOT_CURSED],
1223 ["Jewelery" => PICKUP_JEWELS], 1522 ["Jewelery" => PICKUP_JEWELS],
1523 ["Flesh" => PICKUP_FLESH],
1224 ], 1524 ],
1225 ["Weight/Value ratio", 2, 17] 1525 ["Weight/Value ratio", 2, 17]
1226 ) 1526 )
1227 { 1527 {
1228 my ($title, $x, $y, @bits) = @$_; 1528 my ($title, $x, $y, @bits) = @$_;
1229 $table->add ($x, $y, new CFClient::UI::Label text => $title, align => 1, fg => [1, 1, 0]); 1529 $table->add_at ($x, $y, new CFPlus::UI::Label text => $title, align => 1, fg => [1, 1, 0]);
1230 1530
1231 for (@bits) { 1531 for (@bits) {
1232 ++$y; 1532 ++$y;
1233 1533
1234 my $mask = $_->[1]; 1534 my $mask = $_->[1];
1235 $table->add ($x , $y, new CFClient::UI::Label text => $_->[0], align => 1, expand => 1); 1535 $table->add_at ($x , $y, new CFPlus::UI::Label text => $_->[0], align => 1, expand => 1);
1236 $table->add ($x+1, $y, new CFClient::UI::CheckBox 1536 $table->add_at ($x+1, $y, my $checkbox = new CFPlus::UI::CheckBox
1237 state => $CFG->{pickup} & $mask, 1537 state => $::CFG->{pickup} & $mask,
1238 on_changed => sub { 1538 on_changed => sub {
1239 my ($box, $value) = @_; 1539 my ($box, $value) = @_;
1240 1540
1241 if ($value) { 1541 if ($value) {
1242 $::CFG->{pickup} |= $mask; 1542 $::CFG->{pickup} |= $mask;
1247 $::CONN->send_command ("pickup $::CFG->{pickup}") 1547 $::CONN->send_command ("pickup $::CFG->{pickup}")
1248 if defined $::CONN; 1548 if defined $::CONN;
1249 1549
1250 0 1550 0
1251 }); 1551 });
1552
1553 ${$_->[2]} = $checkbox if $_->[2];
1252 } 1554 }
1253 } 1555 }
1254 1556
1255 $table->add (2, 18, new CFClient::UI::ValSlider 1557 $table->add_at (2, 18, new CFPlus::UI::ValSlider
1256 range => [0, 0, 16, 1, 1], 1558 range => [$::CFG->{pickup} & 0xF, 0, 16, 1, 1],
1559 template => ">= 99",
1257 to_value => sub { ">= " . 5 * $_[0] }, 1560 to_value => sub { ">= " . 5 * $_[0] },
1258 on_changed => sub { 1561 on_changed => sub {
1259 my ($slider, $value) = @_; 1562 my ($slider, $value) = @_;
1260 1563
1261 $::CFG->{pickup} &= ~0x7; 1564 $::CFG->{pickup} &= ~0xF;
1262 $::CFG->{pickup} |= int $value 1565 $::CFG->{pickup} |= int $value
1263 if $value; 1566 if $value;
1264 1; 1567 1;
1265 }); 1568 });
1569
1266 $table->add (3, 18, new CFClient::UI::Button 1570 $table->add_at (3, 18, new CFPlus::UI::Button
1267 text => "set", 1571 text => "set",
1268 on_activate => sub { 1572 on_activate => sub {
1269 $::CONN->send_command ("pickup $::CFG->{pickup}") 1573 $::CONN->send_command ("pickup $::CFG->{pickup}")
1270 if defined $::CONN; 1574 if defined $::CONN;
1271 0 1575 0
1272 }); 1576 });
1273 1577
1274 $table 1578 $r
1275} 1579}
1276 1580
1581my %SORT_ORDER = (
1582 type => undef,
1583 mtime => sub {
1584 my $NOW = time;
1585 sort {
1586 my $atime = $a->{mtime} - $NOW; $atime = $atime < 5 * 60 ? int $atime / 60 : 6;
1587 my $btime = $b->{mtime} - $NOW; $btime = $btime < 5 * 60 ? int $btime / 60 : 6;
1588
1589 ($a->{flags} & F_LOCKED) <=> ($b->{flags} & F_LOCKED)
1590 or $btime <=> $atime
1591 or $a->{type} <=> $b->{type}
1592 } @_
1593 },
1594 weight => sub { sort {
1595 $a->{weight} * ($a->{nrof} || 1) <=> $b->{weight} * ($b->{nrof} || 1)
1596 or $a->{type} <=> $b->{type}
1597 } @_ },
1598);
1599
1277sub inventory_window { 1600sub inventory_widget {
1278 my $invwin = $INV_WINDOW = new CFClient::UI::FancyFrame 1601 my $hb = new CFPlus::UI::HBox homogeneous => 1;
1602
1603 $hb->add (my $vb1 = new CFPlus::UI::VBox);
1604 $vb1->add (new CFPlus::UI::Label align => 0, text => "Player");
1605
1606 $vb1->add (my $hb1 = new CFPlus::UI::HBox);
1607
1608 use sort 'stable';
1609
1610 $hb1->add (new CFPlus::UI::Selector
1611 value => $::CFG->{inv_sort},
1612 options => [
1613 [type => "Type/Name"],
1614 [mtime => "Recent/Normal/Locked"],
1615 [weight => "Weight/Type"],
1616 ],
1617 on_changed => sub {
1618 $::CFG->{inv_sort} = $_[1];
1619 $INV->set_sort_order ($SORT_ORDER{$_[1]});
1620 },
1621 );
1622 $hb1->add (new CFPlus::UI::Label text => "Weight: ", align => 1, expand => 1);
1623 #TODO# update to weigh/maxweight
1624 $hb1->add ($STATWIDS->{i_weight} = new CFPlus::UI::Label align => -1);
1625
1626 $vb1->add (my $sw1 = new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1);
1627 $sw1->add ($INV = new CFPlus::UI::Inventory);
1628 $INV->set_sort_order ($SORT_ORDER{$::CFG->{inv_sort}});
1629
1630 $hb->add (my $vb2 = new CFPlus::UI::VBox);
1631
1632 $vb2->add ($INVR_HB = new CFPlus::UI::HBox);
1633
1634 $vb2->add (my $sw2 = new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1);
1635 $sw2->add ($INVR = new CFPlus::UI::Inventory);
1636
1637 # XXX: Call after $INVR = ... because set_opencont sets the items
1638 CFPlus::Protocol::set_opencont ($::CONN, 0, "Floor");
1639
1640 $hb
1641}
1642
1643sub media_window {
1644 my $vb = new CFPlus::UI::VBox;
1645
1646 $vb->add (new CFPlus::UI::FancyFrame
1647 label => "Currently playing music",
1648 child => new CFPlus::UI::ScrolledWindow scroll_x => 1, scroll_y => 0,
1649 child => ($MUSIC_PLAYING_WIDGET = new CFPlus::UI::Label ellipsise => 0, fontsize => 0.8),
1650 );
1651
1652 $vb->add (new CFPlus::UI::FancyFrame
1653 label => "Other media used in this session",
1654 expand => 1,
1655 child => ($LICENSE_WIDGET = new CFPlus::UI::TextScroller
1656 expand => 1, fontsize => 0.8, padding_x => 4, padding_y => 4),
1657 );
1658
1659 $vb
1660}
1661
1662sub add_license {
1663 my ($meta) = @_;
1664
1665 $meta = $meta->{data}
1666 or return;
1667
1668 $meta->{license} || $meta->{author} || $meta->{source}
1669 or return;
1670
1671 $LICENSE_WIDGET->add_paragraph ({
1672 fg => [1, 1, 1, 1],
1673 markup => "<small>"
1674 . "<b>Name:</b> " . (CFPlus::asxml $meta->{name}) . "\n"
1675 . "<b>Author:</b> " . (CFPlus::asxml $meta->{author}) . "\n"
1676 . "<b>Source:</b> " . (CFPlus::asxml $meta->{source}) . "\n"
1677 . "<b>License:</b> " . (CFPlus::asxml $meta->{license}) . "\n"
1678 . "</small>",
1679 });
1680 $LICENSE_WIDGET->scroll_to_bottom;
1681}
1682
1683sub toggle_player_page {
1684 my ($widget) = @_;
1685
1686 if ($PL_WINDOW->{visible} && $PL_NOTEBOOK->get_current_page == $widget) {
1687 $PL_WINDOW->hide;
1688 } else {
1689 $PL_NOTEBOOK->set_current_page ($widget);
1690 $PL_WINDOW->show;
1691 }
1692}
1693
1694sub player_window {
1695 my $plwin = $PL_WINDOW = new CFPlus::UI::Toplevel
1279 x => "center", 1696 x => "center",
1280 y => "center", 1697 y => "center",
1281 force_w => $WIDTH * 9/10, 1698 force_w => $WIDTH * 9/10,
1282 force_h => $HEIGHT * 9/10, 1699 force_h => $HEIGHT * 9/10,
1283 title => "Inventory", 1700 title => "Player",
1701 name => "playerbook",
1284 has_close_button => 1, 1702 has_close_button => 1
1285 ; 1703 ;
1286 1704
1287 $invwin->add (my $hb = new CFClient::UI::HBox homogeneous => 1); 1705 my $ntb =
1706 $PL_NOTEBOOK =
1707 new CFPlus::UI::Notebook expand => 1;
1288 1708
1289 $hb->add (my $vb1 = new CFClient::UI::VBox); 1709 $ntb->add_tab (
1290 $vb1->add (new CFClient::UI::Label align => 0, text => "Player"); 1710 "Statistics (F2)" => $STATS_PAGE = stats_window,
1291 $vb1->add ($INV = new CFClient::UI::Inventory expand => 1); 1711 "Shows statistics, where all your Stats and Resistances are shown."
1712 );
1713 $ntb->add_tab (
1714 "Skills (F3)" => $SKILL_PAGE = skill_window,
1715 "Shows all your Skills."
1716 );
1292 1717
1293 $hb->add (my $vb2 = new CFClient::UI::VBox); 1718 my $spellsw = $SPELL_PAGE = new CFPlus::UI::ScrolledWindow (expand => 1, scroll_y => 1);
1719 $spellsw->add ($SPELL_LIST = new CFPlus::UI::SpellList);
1720 $ntb->add_tab (
1721 "Spellbook (F4)" => $spellsw,
1722 "Displays all spells you have and lets you edit keyboard shortcuts for them."
1723 );
1724 $ntb->add_tab (
1725 "Inventory (F5)" => $INVENTORY_PAGE = inventory_widget,
1726 "Toggles the inventory window, where you can manage your loot (or treasures :). "
1727 . "You can also hit the <b>Tab</b>-key to show/hide the Inventory."
1728 );
1729 $ntb->add_tab (Pickup => autopickup_setup,
1730 "Configure autopickup settings, i.e. which items you will pick up automatically when walking (or running) over them.");
1294 1731
1295 $vb2->add ($INV_RIGHT_HB = new CFClient::UI::HBox); 1732 $ntb->add_tab (Media => media_window,
1733 "License, Author and Source info for media sent by the server.");
1296 1734
1297 $vb2->add ($INVR = new CFClient::UI::Inventory expand => 1); 1735 $ntb->set_current_page ($INVENTORY_PAGE);
1298 1736
1299 # XXX: Call after $INVR = ... because set_opencont sets the items 1737 $plwin->add ($ntb);
1300 CFClient::Protocol::set_opencont ($::CONN, 0, "Floor"); 1738 $plwin
1301
1302 $invwin
1303}
1304
1305sub spell_setup {
1306 new CFClient::UI::SpellList
1307}
1308
1309sub update_bindings {
1310 $BIND_UPD_CB->() if $BIND_UPD_CB;
1311} 1739}
1312 1740
1313sub keyboard_setup { 1741sub keyboard_setup {
1314 my $binding_list = new CFClient::UI::VBox; 1742 CFPlus::Macro::keyboard_setup
1315
1316 my $refresh;
1317 $refresh = $BIND_UPD_CB = sub {
1318 $binding_list->clear ();
1319
1320 for my $mod (keys %{$::CFG->{profile}{default}{bindings}}) {
1321 for my $sym (keys %{$::CFG->{profile}{default}{bindings}{$mod}}) {
1322 my $cmds = $::CFG->{profile}{default}{bindings}{$mod}{$sym};
1323 next unless ref $cmds eq 'ARRAY' and @$cmds > 0;
1324
1325 my $lbl = join "; ", @$cmds;
1326 my $nam = CFClient::Binder::keycombo_to_name ($mod, $sym);
1327 $binding_list->add (my $hb = new CFClient::UI::HBox);
1328 $hb->add (new CFClient::UI::Button
1329 text => "delete",
1330 tooltip => "Deletes the binding",
1331 on_activate => sub {
1332 $binding_list->remove ($hb);
1333 delete $::CFG->{profile}{default}{bindings}{$mod}{$sym};
1334 0
1335 });
1336
1337 $hb->add (new CFClient::UI::Button
1338 text => "edit",
1339 tooltip => "Edits the binding",
1340 on_activate => sub {
1341 $::BIND_EDITOR->set_binding (
1342 $mod, $sym, $::CFG->{profile}{default}{bindings}{$mod}{$sym},
1343 sub {
1344 my ($nmod, $nsym, $ncmds) = @_;
1345 $::BIND_EDITOR->cfg_unbind ($mod, $sym);
1346 $::BIND_EDITOR->cfg_bind ($nmod, $nsym, $ncmds);
1347 $refresh->();
1348 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1349 $SETUP_DIALOG->show;
1350 },
1351 sub {
1352 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1353 $SETUP_DIALOG->show;
1354 });
1355 $::BIND_EDITOR->show;
1356 $SETUP_DIALOG->hide;
1357 0
1358 });
1359
1360 $hb->add (new CFClient::UI::Label text => "(Key: $nam)");
1361 $hb->add (new CFClient::UI::Label text => $lbl, expand => 1);
1362 }
1363 }
1364 };
1365
1366 my $vb = new CFClient::UI::VBox;
1367 $vb->add (my $hb = new CFClient::UI::HBox);
1368 $hb->add (new CFClient::UI::Label text => "only shift-up stops fire");
1369 $hb->add (new CFClient::UI::CheckBox
1370 expand => 1,
1371 state => $CFG->{shift_fire_stop},
1372 tooltip => "If this checkbox is enabled you will stop fire only if you stop pressing shift",
1373 on_changed => sub {
1374 my ($cbox, $value) = @_;
1375 $CFG->{shift_fire_stop} = $value;
1376 0
1377 });
1378
1379 $vb->add ($binding_list);
1380 $vb->add (my $hb = new CFClient::UI::HBox);
1381
1382 $hb->add (new CFClient::UI::Button
1383 text => "record new",
1384 expand => 1,
1385 tooltip => "This button opens the binding editor with an empty binding.",
1386 on_activate => sub {
1387 $::BIND_EDITOR->set_binding (undef, undef, [],
1388 sub {
1389 my ($mod, $sym, $cmds) = @_;
1390 $::BIND_EDITOR->cfg_bind ($mod, $sym, $cmds);
1391 $refresh->();
1392 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1393 $SETUP_DIALOG->show;
1394 },
1395 sub {
1396 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1397 $SETUP_DIALOG->show;
1398 },
1399 );
1400 $SETUP_DIALOG->hide;
1401 $::BIND_EDITOR->show;
1402 0
1403 },
1404 );
1405
1406 $hb->add (new CFClient::UI::Button
1407 text => "close",
1408 tooltip => "Closes the binding window",
1409 expand => 1,
1410 on_activate => sub {
1411 $SETUP_DIALOG->hide;
1412 0
1413 }
1414 );
1415
1416 $refresh->();
1417
1418 $vb
1419} 1743}
1420 1744
1421sub help_window { 1745sub help_window {
1422 my $win = new CFClient::UI::FancyFrame 1746 my $win = new CFPlus::UI::Toplevel
1423 x => 'center', 1747 x => 'center',
1424 y => 'center', 1748 y => 'center',
1425 z => 2, 1749 z => 4,
1426 name => 'doc_browser', 1750 name => 'doc_browser',
1427 force_w => int $WIDTH * 7/8, 1751 force_w => int $WIDTH * 7/8,
1428 force_h => int $HEIGHT * 7/8, 1752 force_h => int $HEIGHT * 7/8,
1429 title => "Documentation"; 1753 title => "Help Browser",
1754 has_close_button => 1;
1430 1755
1431 $win->add (my $vbox = new CFClient::UI::VBox); 1756 $win->add (my $vbox = new CFPlus::UI::VBox);
1432 1757
1433 $vbox->add (my $buttons = new CFClient::UI::HBox); 1758 $vbox->add (new CFPlus::UI::FancyFrame
1759 label => "Navigation",
1760 child => (my $buttons = new CFPlus::UI::HBox),
1761 );
1434 $vbox->add (my $viewer = new CFClient::UI::TextScroller 1762 $vbox->add (my $viewer = new CFPlus::UI::TextScroller
1435 expand => 1, fontsize => 0.8, padding_x => 4); 1763 expand => 1, fontsize => 0.8, padding_x => 4, padding_y => 4);
1436 1764
1437 $buttons->add (new CFClient::UI::Label text => "Choose a document to display: "); 1765 my @history;
1438 $buttons->add (my $combo = new CFClient::UI::Combobox 1766 my @future;
1439 value => undef, 1767 my $curnode;
1440 options => [ 1768
1441 [intro => "Introduction"], 1769 my $load_node; $load_node = sub {
1442 [manual => "Main Manual"], 1770 my ($node, $para) = @_;
1443 [skill_help => "Skill Reference"], 1771
1444 [command_help => "Command Reference"], 1772 $buttons->clear;
1445 [dmcommand_help => "DM Commands"], 1773
1446 [COPYING => "License Terms"], 1774 $buttons->add (new CFPlus::UI::Button
1447 ], 1775 text => "⇤",
1776 tooltip => "back to the starting page",
1448 on_changed => sub { 1777 on_activate => sub {
1449 my ($self, $pod) = @_; 1778 unshift @future, [$curnode, $viewer->current_paragraph] if $curnode;
1450 1779 unshift @future, @history;
1451 my $pom = CFClient::load_pod CFClient::find_rcfile "pod/$pod.pod", 1780 @history = ();
1452 doc_viewer => 1, sub { CFClient::pod_to_pango_list $_[0] }; 1781 $load_node->(@{shift @future});
1453
1454 $viewer->clear;
1455
1456# $viewer->add_paragraph ([1, 1, 1, 1], ["<big>Test</big>\n\n \x{fffc} \x{fffc}\n",
1457# (new CFClient::UI::Image path => "x.png", can_hover => 1, can_events => 1),
1458# (new CFClient::UI::Label text => "üüüü", can_hover => 1, can_events => 1, tooltip => "??"),
1459# ]);#d#
1460 1782 },
1461 $viewer->add_paragraph ([1, 1, 1, 1], $_->[1], $_->[0]) 1783 );
1462 for @$pom;
1463 1784
1464 $viewer->set_offset (0); 1785 if (@history) {
1465 1786 $buttons->add (new CFPlus::UI::Button
1787 text => "⋘",
1788 tooltip => "back to <i>" . (CFPlus::asxml CFPlus::Pod::full_path $history[-1][0]) . "</i>",
1789 on_activate => sub {
1790 unshift @future, [$curnode, $viewer->current_paragraph] if $curnode;
1791 $load_node->(@{pop @history});
1792 },
1466 0 1793 );
1467 }, 1794 }
1468 on_visibility_change => sub { 1795
1469 my ($self, $visible) = @_; 1796 if (@future) {
1470 return unless $visible; 1797 $buttons->add (new CFPlus::UI::Button
1471 return if $self->{value}; 1798 text => "⋙",
1472 $self->set_value ("intro"); 1799 tooltip => "forward to <i>" . (CFPlus::asxml CFPlus::Pod::full_path $future[0][0]) . "</i>",
1800 on_activate => sub {
1801 push @history, [$curnode, $viewer->current_paragraph];
1802 $load_node->(@{shift @future});
1803 },
1473 0 1804 );
1474 }, 1805 }
1806
1807 $buttons->add (new CFPlus::UI::Label text => " ");
1808
1809 my @path = CFPlus::Pod::full_path_of $node;
1810 pop @path; # drop current node
1811
1812 for my $node (@path) {
1813 $buttons->add (new CFPlus::UI::Button
1814 text => $node->{kw}[0],
1815 tooltip => "go to <i>" . (CFPlus::asxml CFPlus::Pod::full_path $node) . "</i>",
1816 on_activate => sub {
1817 push @history, [$curnode, $viewer->current_paragraph] if $curnode; @future = ();
1818 $load_node->($node);
1819 },
1820 );
1821 $buttons->add (new CFPlus::UI::Label text => "/");
1822 }
1823
1824 $buttons->add (new CFPlus::UI::Label text => $node->{kw}[0], padding_x => 4, padding_y => 4);
1825
1826 $curnode = $node;
1827
1828 $viewer->clear;
1829 $viewer->add_paragraph (CFPlus::Pod::as_paragraphs CFPlus::Pod::section_of $curnode);
1830 $viewer->scroll_to ($para);
1475 ); 1831 };
1832
1833 $load_node->(CFPlus::Pod::find pod => "mainpage");
1834
1835 $CFPlus::Pod::goto_document = sub {
1836 my (@path) = @_;
1837
1838 push @history, [$curnode, $viewer->current_paragraph] if $curnode; @future = ();
1839
1840 $load_node->((CFPlus::Pod::find @path)[0]);
1841 $win->show;
1842 };
1476 1843
1477 $win 1844 $win
1478} 1845}
1479 1846
1847sub open_string_query {
1848 my ($title, $cb, $txt, $tooltip) = @_;
1849 my $dialog = new CFPlus::UI::Toplevel
1850 x => "center",
1851 y => "center",
1852 z => 50,
1853 force_w => $WIDTH * 4/5,
1854 title => $title;
1855
1856 $dialog->add (
1857 my $e = new CFPlus::UI::Entry
1858 on_activate => sub { $cb->(@_); $dialog->hide; 0 },
1859 on_key_down => sub { $_[1]->{sym} == 27 and $dialog->hide; 0 },
1860 tooltip => $tooltip
1861 );
1862
1863 $e->grab_focus;
1864 $e->set_text ($txt) if $txt;
1865 $dialog->show;
1866}
1867
1868sub open_quit_dialog {
1869 unless ($QUIT_DIALOG) {
1870 $QUIT_DIALOG = new CFPlus::UI::Toplevel
1871 x => "center",
1872 y => "center",
1873 z => 50,
1874 title => "Really Quit?",
1875 on_key_down => sub {
1876 my ($dialog, $ev) = @_;
1877 $ev->{sym} == 27 and $dialog->hide;
1878 }
1879 ;
1880
1881 $QUIT_DIALOG->add (my $vb = new CFPlus::UI::VBox expand => 1);
1882
1883 $vb->add (new CFPlus::UI::Label
1884 text => "You should find a savebed and apply it first!",
1885 max_w => $WIDTH * 0.25,
1886 ellipsize => 0,
1887 );
1888 $vb->add (my $hb = new CFPlus::UI::HBox expand => 1);
1889 $hb->add (new CFPlus::UI::Button
1890 text => "Ok",
1891 expand => 1,
1892 on_activate => sub { $QUIT_DIALOG->hide; 0 },
1893 );
1894 $hb->add (new CFPlus::UI::Button
1895 text => "Quit anyway",
1896 expand => 1,
1897 on_activate => sub { Event::unloop_all },
1898 );
1899 }
1900
1901 $QUIT_DIALOG->show;
1902 $QUIT_DIALOG->grab_focus;
1903}
1904
1905sub show_tip_of_the_day {
1906 # find all tips
1907 my @tod = CFPlus::Pod::find tip_of_the_day => "*";
1908
1909 CFPlus::DB::get state => "tip_of_the_day", sub {
1910 my ($todindex) = @_;
1911 $todindex = 0 if $todindex >= @tod;
1912 CFPlus::DB::put state => tip_of_the_day => $todindex + 1, sub { };
1913
1914 # create dialog
1915 my $dialog;
1916
1917 my $close = sub {
1918 $dialog->destroy;
1919 };
1920
1921 $dialog = new CFPlus::UI::Toplevel
1922 x => "center",
1923 y => "center",
1924 z => 3,
1925 name => 'tip_of_the_day',
1926 force_w => int $WIDTH * 4/9,
1927 force_h => int $WIDTH * 2/9,
1928 title => "Tip of the day #" . (1 + $todindex),
1929 child => my $vbox = new CFPlus::UI::VBox,
1930 has_close_button => 1,
1931 on_delete => $close,
1932 ;
1933
1934 $vbox->add (my $viewer = new CFPlus::UI::TextScroller
1935 expand => 1, fontsize => 0.8, padding_x => 4, padding_y => 4);
1936 $viewer->add_paragraph (CFPlus::Pod::as_paragraphs CFPlus::Pod::section_of $tod[$todindex]);
1937
1938 $vbox->add (my $table = new CFPlus::UI::Table col_expand => [0, 1]);
1939
1940 $table->add_at (0, 0, new CFPlus::UI::Button
1941 text => "Close",
1942 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>.",
1943 on_activate => $close,
1944 );
1945
1946 $table->add_at (2, 0, new CFPlus::UI::Button
1947 text => "Next",
1948 tooltip => "Show the next <b>Tip of the day</b>.",
1949 on_activate => sub {
1950 $close->();
1951 &show_tip_of_the_day;
1952 },
1953 );
1954
1955 $dialog->show;
1956 };
1957}
1958
1480sub sdl_init { 1959sub sdl_init {
1481 CFClient::SDL_Init 1960 CFPlus::SDL_Init
1482 and die "SDL::Init failed!\n"; 1961 and die "SDL::Init failed!\n";
1483} 1962}
1484 1963
1485sub video_init { 1964sub video_init {
1486 sdl_init;
1487
1488 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} >= @SDL_MODES; 1965 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} >= @SDL_MODES;
1489 1966
1490 my ($old_w, $old_h) = ($WIDTH, $HEIGHT); 1967 my ($old_w, $old_h) = ($WIDTH, $HEIGHT);
1491 1968
1492 ($WIDTH, $HEIGHT) = @{ $SDL_MODES[$CFG->{sdl_mode}] }; 1969 ($WIDTH, $HEIGHT, my ($rgb, $alpha)) = @{ $SDL_MODES[$CFG->{sdl_mode}] };
1493 $FULLSCREEN = $CFG->{fullscreen}; 1970 $FULLSCREEN = $CFG->{fullscreen};
1494 $FAST = $CFG->{fast}; 1971 $FAST = $CFG->{fast};
1495 1972
1496 CFClient::SDL_SetVideoMode $WIDTH, $HEIGHT, $FULLSCREEN 1973 CFPlus::SDL_SetVideoMode $WIDTH, $HEIGHT, $rgb, $alpha, $FULLSCREEN
1497 or die "SDL_SetVideoMode failed: " . (CFClient::SDL_GetError) . "\n"; 1974 or die "SDL_SetVideoMode failed: " . (CFPlus::SDL_GetError) . "\n";
1498 1975
1499 $SDL_ACTIVE = 1; 1976 $SDL_ACTIVE = 1;
1500 $LAST_REFRESH = time - 0.01; 1977 $LAST_REFRESH = time - 0.01;
1501 1978
1502 CFClient::OpenGL::init; 1979 CFPlus::OpenGL::init;
1503 1980
1504 $FONTSIZE = int $HEIGHT / 40 * $CFG->{gui_fontsize}; 1981 $FONTSIZE = int $HEIGHT / 40 * $CFG->{gui_fontsize};
1505 1982
1506 $CFClient::UI::ROOT->configure (0, 0, $WIDTH, $HEIGHT);#d# 1983 $CFPlus::UI::ROOT->configure (0, 0, $WIDTH, $HEIGHT);#d#
1507 1984
1508 ############################################################################# 1985 #############################################################################
1509 1986
1510 if ($DEBUG_STATUS) { 1987 if ($DEBUG_STATUS) {
1511 CFClient::UI::rescale_widgets $WIDTH / $old_w, $HEIGHT / $old_h; 1988 CFPlus::UI::rescale_widgets $WIDTH / $old_w, $HEIGHT / $old_h;
1512 } else { 1989 } else {
1513 # create the widgets 1990 # create the widgets
1514 1991
1515 $DEBUG_STATUS = new CFClient::UI::Label 1992 $DEBUG_STATUS = new CFPlus::UI::Label
1516 padding => 0, 1993 padding => 0,
1517 z => 100, 1994 z => 100,
1518 force_x => "max", 1995 force_x => "max",
1519 force_y => 0; 1996 force_y => 0;
1520 $DEBUG_STATUS->show; 1997 $DEBUG_STATUS->show;
1521 1998
1522 $BIND_EDITOR = new CFClient::BindingEditor (x => "max", y => 0);
1523
1524 $STATUSBOX = new CFClient::UI::Statusbox; 1999 $STATUSBOX = new CFPlus::UI::Statusbox;
1525 $STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", timeout => 864000, pri => -100, color => [1, 1, 1, 0.8]); 2000 $STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", timeout => 864000, pri => -100, color => [1, 1, 1, 0.8]);
1526 2001
1527 (new CFClient::UI::Frame 2002 (new CFPlus::UI::Frame
1528 bg => [0, 0, 0, 0.4], 2003 bg => [0, 0, 0, 0.4],
1529 force_x => 0, 2004 force_x => 0,
1530 force_y => "max", 2005 force_y => "max",
1531 child => $STATUSBOX, 2006 child => $STATUSBOX,
1532 )->show; 2007 )->show;
1533 2008
1534 CFClient::UI::FancyFrame->new ( 2009 CFPlus::UI::Toplevel->new (
1535 title => "Map", 2010 title => "Map",
1536 name => "mapmap", 2011 name => "mapmap",
1537 x => 0, 2012 x => 0,
1538 y => $FONTSIZE + 8, 2013 y => $FONTSIZE + 8,
1539 border_bg => [1, 1, 1, 192/255], 2014 border_bg => [1, 1, 1, 192/255],
1540 bg => [1, 1, 1, 0], 2015 bg => [1, 1, 1, 0],
1541 child => ($MAPMAP = new CFClient::MapWidget::MapMap 2016 child => ($MAPMAP = new CFPlus::MapWidget::MapMap
1542 tooltip => "<b>Map</b>. On servers that support this feature, this will display an overview of the surrounding areas.", 2017 tooltip => "<b>Map</b>. On servers that support this feature, this will display an overview of the surrounding areas.",
1543 ), 2018 ),
1544 )->show; 2019 )->show;
1545 2020
1546 $MAPWIDGET = new CFClient::MapWidget; 2021 $MAPWIDGET = new CFPlus::MapWidget;
1547 $MAPWIDGET->connect (activate_console => sub { 2022 $MAPWIDGET->connect (activate_console => sub {
1548 my ($mapwidget, $preset) = @_; 2023 my ($mapwidget, $preset) = @_;
1549 2024
1550 if ($CONSOLE) { 2025 $MESSAGE_WINDOW->activate_console ($preset)
1551 $CONSOLE->{input}->{auto_activated} = 1; 2026 if $MESSAGE_WINDOW;
1552 $CONSOLE->{input}->grab_focus;
1553
1554 if ($preset && $CONSOLE->{input}->get_text eq '') {
1555 $CONSOLE->{input}->set_text ($preset);
1556 }
1557 }
1558 }); 2027 });
1559 $MAPWIDGET->show; 2028 $MAPWIDGET->show;
1560 $MAPWIDGET->grab_focus; 2029 $MAPWIDGET->grab_focus;
1561 2030
1562 $LOGVIEW = new CFClient::UI::TextScroller
1563 expand => 1,
1564 font => $FONT_FIXED,
1565 fontsize => $::CFG->{log_fontsize},
1566 indent => -4,
1567 can_hover => 1,
1568 can_events => 1,
1569 tooltip => "<b>Server Log</b>. This text viewer contains all the messages sent by the server.",
1570 ;
1571
1572 $SETUP_DIALOG = new CFClient::UI::FancyFrame 2031 $SETUP_DIALOG = new CFPlus::UI::Toplevel
1573 title => "Setup", 2032 title => "Setup",
1574 name => "setup_dialog", 2033 name => "setup_dialog",
1575 x => 'center', 2034 x => 'center',
1576 y => 'center', 2035 y => 'center',
1577 z => 2, 2036 z => 2,
1578 force_w => $::WIDTH * 0.6, 2037 force_w => $::WIDTH * 0.6,
1579 force_h => $::HEIGHT * 0.6, 2038 force_h => $::HEIGHT * 0.6,
1580 has_close_button => 1, 2039 has_close_button => 1,
1581 ; 2040 ;
1582 2041
2042 $METASERVER = metaserver_dialog;
2043 $MESSAGE_WINDOW = new CFPlus::UI::MessageWindow;
2044
1583 $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new CFClient::UI::Notebook expand => 1, debug => 1, 2045 $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new CFPlus::UI::Notebook expand => 1, debug => 1,
1584 filter => new CFClient::UI::ScrolledWindow expand => 1, scroll_y => 1); 2046 filter => new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1);
1585 2047
1586 $SETUP_NOTEBOOK->add (Server => $SETUP_SERVER = server_setup, 2048 $SETUP_NOTEBOOK->add_tab (Server => $SETUP_SERVER = server_setup,
1587 "Configure the server to play on, your username, password and other server-related options."); 2049 "Configure the server to play on, your username, password and other server-related options.");
1588 $SETUP_NOTEBOOK->add (Pickup => autopickup_setup, 2050 $SETUP_NOTEBOOK->add_tab (Client => client_setup,
1589 "Configure autopickup settings, i.e. which items you will pick up automatically when walking (or running) over them."); 2051 "Configure various client-specific settings.");
1590 $SETUP_NOTEBOOK->add (Graphics => graphics_setup, 2052 $SETUP_NOTEBOOK->add_tab (Graphics => graphics_setup,
1591 "Configure the video mode, performance, fonts and other graphical aspects of the game."); 2053 "Configure the video mode, performance, fonts and other graphical aspects of the game.");
1592 $SETUP_NOTEBOOK->add (Audio => audio_setup, 2054 $SETUP_NOTEBOOK->add_tab (Audio => audio_setup,
1593 "Configure the use of audio, sound effects and background music."); 2055 "Configure the use of audio, sound effects and background music.");
1594 $SETUP_NOTEBOOK->add (Keyboard => $SETUP_KEYBOARD = keyboard_setup, 2056 $SETUP_NOTEBOOK->add_tab (Keyboard => $SETUP_KEYBOARD = keyboard_setup,
1595 "Lets you define, edit and delete key bindings." 2057 "Lets you define, edit and delete key bindings."
1596 . "There is a shortcut for making bindings: <b>Control-Insert</b> opens the binding editor " 2058 . "There is a shortcut for making bindings: <b>Control-Insert</b> opens the binding editor "
1597 . "with nothing set and the recording started. After doing the actions you " 2059 . "with nothing set and the recording started. After doing the actions you "
1598 . "want to record press <b>Insert</b> and you will be asked to press a key-combo. " 2060 . "want to record press <b>Insert</b> and you will be asked to press a key-combo. "
1599 . "After pressing the combo the binding will be saved automatically and the " 2061 . "After pressing the combo the binding will be saved automatically and the "
1600 . "binding editor closes"); 2062 . "binding editor closes");
1601 $SETUP_NOTEBOOK->add (Spells => $SETUP_SPELLS = spell_setup,
1602 "Displays all spells you have and lets you edit keyboard shortcuts for them.");
1603 $SETUP_NOTEBOOK->add (Debug => debug_setup, 2063 $SETUP_NOTEBOOK->add_tab (Debug => debug_setup,
1604 "Some debuggin' options. Do not ask."); 2064 "Some debuggin' options. Do not ask.");
1605 2065
1606 $BUTTONBAR = new CFClient::UI::Buttonbar x => 0, y => 0, z => 200; # put on top 2066 $BUTTONBAR = new CFPlus::UI::Buttonbar x => 0, y => 0, z => 200; # put on top
1607 2067
1608 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Setup", other => $SETUP_DIALOG, 2068 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Setup", other => $SETUP_DIALOG,
1609 tooltip => "Toggles a dialog where you can configure all aspects of this client."); 2069 tooltip => "Toggles a dialog where you can configure all aspects of this client.");
1610 2070
1611 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW = message_window, 2071 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW,
1612 tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server."); 2072 tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server.");
1613 2073
1614 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 2074 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
1615 2075
1616 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Stats Window", other => $STATS_WINDOW = stats_window,
1617 tooltip => "Toggles the statistics window, where all your Stats and Resistances are being displayed at all times.");
1618 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Inventory", other => inventory_window, 2076 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Playerbook", other => player_window,
1619 tooltip => "Toggles the inventory window, where you can manage your loot (or treasures :). " 2077 tooltip => "Toggles the player view, where you can manage Inventory, Spells, Skills and see your Stats.");
1620 . "You can also hit the <b>Tab</b>-key to show/hide the Inventory.");
1621 2078
1622 $BUTTONBAR->add (new CFClient::UI::Button 2079 $BUTTONBAR->add (new CFPlus::UI::Button
1623 text => "Save Config", 2080 text => "Save Config",
1624 tooltip => "Saves the options chosen in the client setting, server settings and the window layout to be restored on later runs.", 2081 tooltip => "Saves the options chosen in the client setting, server settings and the window layout to be restored on later runs.",
1625 on_activate => sub { 2082 on_activate => sub {
1626 $::CFG->{layout} = CFClient::UI::get_layout; 2083 $::CFG->{layout} = CFPlus::UI::get_layout;
1627 CFClient::write_cfg "$Crossfire::VARDIR/cfplusrc"; 2084 CFPlus::write_cfg "$Crossfire::VARDIR/cfplusrc";
1628 status "Configuration Saved"; 2085 status "Configuration Saved";
1629 0 2086 0
1630 }, 2087 },
1631 ); 2088 );
1632 2089
1633 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Help!", other => help_window, 2090 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Help!", other => $HELP_WINDOW = help_window,
1634 tooltip => "View Documentation"); 2091 tooltip => "View Documentation");
1635 2092
2093
1636 $BUTTONBAR->add (new CFClient::UI::Button 2094 $BUTTONBAR->add (new CFPlus::UI::Button
1637 text => "Quit", 2095 text => "Quit",
1638 tooltip => "Terminates the program", 2096 tooltip => "Terminates the program",
1639 on_activate => sub { 2097 on_activate => sub {
1640 if ($CONN) { 2098 if ($CONN) {
1641 open_quit_dialog; 2099 open_quit_dialog;
1642 } else { 2100 } else {
1643 exit; 2101 Event::unloop_all;
1644 } 2102 }
1645 0 2103 0
1646 }, 2104 },
1647 ); 2105 );
1648 2106
1649 $BUTTONBAR->show; 2107 $BUTTONBAR->show;
1650 $SETUP_DIALOG->show; 2108 $SETUP_DIALOG->show;
2109 $MESSAGE_WINDOW->show;
1651 } 2110 }
1652 2111
1653 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]); 2112 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);
1654} 2113}
1655 2114
1656sub video_shutdown { 2115sub video_shutdown {
1657 CFClient::OpenGL::shutdown; 2116 CFPlus::OpenGL::shutdown;
1658 2117
1659 undef $SDL_ACTIVE; 2118 undef $SDL_ACTIVE;
1660} 2119}
1661 2120
1662my @bgmusic = qw(game1.ogg game2.ogg game3.ogg game5.ogg game6.ogg ross1.ogg ross2.ogg ross3.ogg ross4.ogg ross5.ogg); #d#
1663my $bgmusic;#TODO#hack#d#
1664
1665sub audio_channel_finished {
1666 my ($channel) = @_;
1667
1668 #warn "channel $channel finished\n";#d#
1669}
1670
1671sub audio_music_finished {
1672 return unless $CFG->{bgm_enable};
1673
1674 # TODO: hack, do play loop and mood music
1675 $bgmusic = new_from_file CFClient::MixMusic CFClient::find_rcfile "music/$bgmusic[0]";
1676 $bgmusic->play (0);
1677
1678 push @bgmusic, shift @bgmusic;
1679}
1680
1681sub audio_init {
1682 if ($CFG->{audio_enable}) {
1683 if (open my $fh, "<", CFClient::find_rcfile "sounds/config") {
1684 $SDL_MIXER = !CFClient::Mix_OpenAudio;
1685
1686 unless ($SDL_MIXER) {
1687 status "Unable to open sound device: there will be no sound";
1688 return;
1689 }
1690
1691 CFClient::Mix_AllocateChannels 8;
1692 CFClient::MixMusic::volume $CFG->{bgm_volume} * 128;
1693
1694 audio_music_finished;
1695
1696 while (<$fh>) {
1697 next if /^\s*#/;
1698 next if /^\s*$/;
1699
1700 my ($file, $volume, $event) = split /\s+/, $_, 3;
1701
1702 push @SOUNDS, "$volume,$file";
1703
1704 $AUDIO_CHUNKS{"$volume,$file"} ||= do {
1705 my $chunk = new_from_file CFClient::MixChunk CFClient::find_rcfile "sounds/$file";
1706 $chunk->volume ($volume * 128 / 100);
1707 $chunk
1708 };
1709 }
1710 } else {
1711 status "unable to open sound config: $!";
1712 }
1713 }
1714}
1715
1716sub audio_shutdown {
1717 CFClient::Mix_CloseAudio if $SDL_MIXER;
1718 undef $SDL_MIXER;
1719 @SOUNDS = ();
1720 %AUDIO_CHUNKS = ();
1721}
1722
1723my %animate_object; 2121my %animate_object;
1724my $animate_timer; 2122my $animate_timer;
1725 2123
1726my $fps = 9; 2124my $fps = 9;
1727 2125
1728my %demo;#d#
1729
1730sub force_refresh { 2126sub force_refresh {
2127 if ($ENV{CFPLUS_DEBUG} & 4) {
1731 $fps = $fps * 0.95 + 1 / (($NOW - $LAST_REFRESH) || 0.1) * 0.05; 2128 $fps = $fps * 0.98 + 1 / (($NOW - $LAST_REFRESH) || 0.1) * 0.02;
1732 debug sprintf "%3.2f", $fps if $ENV{CFPLUS_DEBUG} & 4; 2129 debug sprintf "%3.2f", $fps;
2130 }
1733 2131
1734 $CFClient::UI::ROOT->draw; 2132 $CFPlus::UI::ROOT->draw;
1735 2133 CFPlus::SDL_GL_SwapBuffers;
1736 $WANT_REFRESH = 0;
1737 $CAN_REFRESH = 0;
1738 $LAST_REFRESH = $NOW; 2134 $LAST_REFRESH = $NOW;
1739
17400 && do {
1741 # some weird model-drawing code, just a joke right now
1742 use CFClient::OpenGL;
1743
1744 $demo{t}{eye_auv} ||= new_from_file CFClient::Texture "eye2.png" or die;
1745 $demo{t}{body_auv} ||= new_from_file CFClient::Texture "body_auv3.png" or die;
1746 $demo{r} ||= do {
1747 my $mod = Compress::LZF::sthaw do { local $/; open my $fh, "<:raw:perlio", "dread.lz3"; <$fh> };
1748 $mod->{v} = pack "f*", @{$mod->{v}};
1749 $_ = [scalar @$_, pack "S!*", @$_]
1750 for values %{$mod->{g}};
1751 $mod
1752 };
1753
1754 my $r = $demo{r} or die;
1755
1756 glDepthMask 1;
1757 glClear GL_DEPTH_BUFFER_BIT;
1758 glEnable GL_TEXTURE_2D;
1759 glEnable GL_DEPTH_TEST;
1760 glEnable GL_CULL_FACE;
1761 glShadeModel $::FAST ? GL_FLAT : GL_SMOOTH;
1762
1763 glMatrixMode GL_PROJECTION;
1764 glLoadIdentity;
1765 glFrustum -1 * ($::WIDTH / $::HEIGHT), 1 * ($::WIDTH / $::HEIGHT), 1, -1, 1, 10000;
1766 #glOrtho 0, $::WIDTH, 0, $::HEIGHT, -10000, 10000;
1767 glMatrixMode GL_MODELVIEW;
1768 glLoadIdentity;
1769
1770 glPushMatrix;
1771 glTranslate 0, 0, -800;
1772 glScale 1, -1, 1;
1773 glRotate $NOW * 1000 % 36000 / 5, 0, 1, 0;
1774 glRotate $NOW * 1000 % 36000 / 6, 1, 0, 0;
1775 glRotate $NOW * 1000 % 36000 / 7, 0, 0, 1;
1776 glScale 50, 50, 50;
1777
1778 glInterleavedArrays GL_T2F_N3F_V3F, 0, $r->{v};
1779 while (my ($k, $v) = each %{$r->{g}}) {
1780 glBindTexture GL_TEXTURE_2D, ($demo{t}{$k}{name} or die);
1781 glDrawElements GL_TRIANGLES, $v->[0], GL_UNSIGNED_SHORT, $v->[1];
1782 }
1783
1784 glPopMatrix;
1785
1786 glShadeModel GL_FLAT;
1787 glDisable GL_DEPTH_TEST;
1788 glDisable GL_TEXTURE_2D;
1789 glDepthMask 0;
1790
1791 $WANT_REFRESH++; 2135 $WANT_REFRESH->stop;
1792};
1793
1794 CFClient::SDL_GL_SwapBuffers;
1795} 2136}
1796 2137
2138$WANT_REFRESH = Event->idle (min => 0.001, max => 0.06, parked => 1, cb => \&force_refresh);
2139
1797my $refresh_watcher = Event->timer (after => 0, hard => 0, interval => 1 / $MAX_FPS, cb => sub { 2140my $input = Event->timer (after => 0, hard => 0, interval => 1 / 50, cb => sub {
1798 $NOW = time; 2141 $NOW = time;
1799 2142
1800 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_) 2143 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_)
1801 for CFClient::SDL_PollEvent; 2144 for CFPlus::poll_events;
1802 2145
1803 if (%animate_object) { 2146 if (%animate_object) {
1804 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object; 2147 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object;
1805 $WANT_REFRESH++; 2148 $WANT_REFRESH->start;
1806 }
1807
1808 if ($WANT_REFRESH) {
1809 force_refresh;
1810 } else {
1811 $CAN_REFRESH = 1;
1812 } 2149 }
1813}); 2150});
1814 2151
1815sub animation_start { 2152sub animation_start {
1816 my ($widget) = @_; 2153 my ($widget) = @_;
1820sub animation_stop { 2157sub animation_stop {
1821 my ($widget) = @_; 2158 my ($widget) = @_;
1822 delete $animate_object{$widget}; 2159 delete $animate_object{$widget};
1823} 2160}
1824 2161
1825# check once/second for faces that need to be prefetched
1826# this should, of course, only run on demand, but
1827# SDL forces worse things on us....
1828
1829Event->timer (after => 1, interval => 0.25, cb => sub {
1830 $CONN->face_prefetch
1831 if $CONN;
1832});
1833
1834%SDL_CB = ( 2162%SDL_CB = (
1835 CFClient::SDL_QUIT => sub { 2163 CFPlus::SDL_QUIT => sub {
1836 Event::unloop -1; 2164 Event::unloop_all;
1837 }, 2165 },
1838 CFClient::SDL_VIDEORESIZE => sub { 2166 CFPlus::SDL_VIDEORESIZE => sub {
1839 }, 2167 },
1840 CFClient::SDL_VIDEOEXPOSE => sub { 2168 CFPlus::SDL_VIDEOEXPOSE => sub {
1841 CFClient::UI::full_refresh; 2169 CFPlus::UI::full_refresh;
1842 }, 2170 },
1843 CFClient::SDL_ACTIVEEVENT => sub { 2171 CFPlus::SDL_ACTIVEEVENT => sub {
1844# printf "active %x %x\n", $SDL_EV->active_gain, $SDL_EV->active_state;#d# 2172# not useful, as APPACTIVE include sonly iconified state, not unmapped
2173# printf "active %x %x %x\n", $_[0]{gain}, $_[0]{state}, CFPlus::SDL_GetAppState;#d#
2174# printf "a %x\n", CFPlus::SDL_GetAppState & CFPlus::SDL_APPACTIVE;#d#
2175# printf "A\n" if $_[0]{state} & CFPlus::SDL_APPACTIVE;
2176# printf "K\n" if $_[0]{state} & CFPlus::SDL_APPINPUTFOCUS;
2177# printf "M\n" if $_[0]{state} & CFPlus::SDL_APPMOUSEFOCUS;
1845 }, 2178 },
1846 CFClient::SDL_KEYDOWN => sub { 2179 CFPlus::SDL_KEYDOWN => sub {
1847 if ($_[0]{mod} & CFClient::KMOD_ALT && $_[0]{sym} == 13) { 2180 if ($_[0]{mod} & CFPlus::KMOD_ALT && $_[0]{sym} == 13) {
1848 # alt-enter 2181 # alt-enter
2182 $FULLSCREEN_ENABLE->toggle;
1849 video_shutdown; 2183 video_shutdown;
1850 $CFG->{fullscreen} = !$CFG->{fullscreen};
1851 video_init; 2184 video_init;
1852 } else { 2185 } else {
1853 CFClient::UI::feed_sdl_key_down_event ($_[0]); 2186 CFPlus::UI::feed_sdl_key_down_event ($_[0]);
1854 } 2187 }
1855 }, 2188 },
1856 CFClient::SDL_KEYUP => \&CFClient::UI::feed_sdl_key_up_event, 2189 CFPlus::SDL_KEYUP => \&CFPlus::UI::feed_sdl_key_up_event,
1857 CFClient::SDL_MOUSEMOTION => \&CFClient::UI::feed_sdl_motion_event, 2190 CFPlus::SDL_MOUSEMOTION => \&CFPlus::UI::feed_sdl_motion_event,
1858 CFClient::SDL_MOUSEBUTTONDOWN => \&CFClient::UI::feed_sdl_button_down_event, 2191 CFPlus::SDL_MOUSEBUTTONDOWN => \&CFPlus::UI::feed_sdl_button_down_event,
1859 CFClient::SDL_MOUSEBUTTONUP => \&CFClient::UI::feed_sdl_button_up_event, 2192 CFPlus::SDL_MOUSEBUTTONUP => \&CFPlus::UI::feed_sdl_button_up_event,
1860 CFClient::SDL_USEREVENT => sub { 2193 CFPlus::SDL_USEREVENT => sub {
1861 if ($_[0]{code} == 1) { 2194 if ($_[0]{code} == 1) {
1862 audio_channel_finished $_[0]{data1}; 2195 audio_channel_finished $_[0]{data1};
1863 } elsif ($_[0]{code} == 0) { 2196 } elsif ($_[0]{code} == 0) {
1864 audio_music_finished; 2197 audio_music_finished;
1865 } 2198 }
1869############################################################################# 2202#############################################################################
1870 2203
1871$SIG{INT} = $SIG{TERM} = sub { exit }; 2204$SIG{INT} = $SIG{TERM} = sub { exit };
1872 2205
1873{ 2206{
1874 local $SIG{__DIE__} = sub {
1875 return unless defined $^S && !$^S;
1876 Carp::confess $_[1];#d#TODO: remove when stable
1877 CFClient::fatal $_[0];
1878 };
1879
1880 CFClient::read_cfg "$Crossfire::VARDIR/cfplusrc"; 2207 CFPlus::read_cfg "$Crossfire::VARDIR/cfplusrc";
2208 CFPlus::DB::Server::run;
2209
1881 CFClient::UI::set_layout ($::CFG->{layout}); 2210 CFPlus::UI::set_layout ($::CFG->{layout});
1882 2211
1883 my %DEF_CFG = ( 2212 my %DEF_CFG = (
1884 sdl_mode => 0, 2213 sdl_mode => 0,
1885 width => 640,
1886 height => 480,
1887 fullscreen => 0, 2214 fullscreen => 0,
1888 fast => 0, 2215 fast => 0,
2216 force_opengl11 => undef,
2217 texture_compression => 1,
1889 map_scale => 1, 2218 map_scale => 1,
1890 fow_enable => 1, 2219 fow_enable => 1,
1891 fow_intensity => 0.45, 2220 fow_intensity => 0,
1892 fow_smooth => 0, 2221 map_smoothing => 1,
1893 gui_fontsize => 1, 2222 gui_fontsize => 1,
1894 log_fontsize => 0.7, 2223 log_fontsize => 0.7,
1895 gauge_fontsize => 1, 2224 gauge_fontsize => 1,
1896 gauge_size => 0.35, 2225 gauge_size => 0.35,
1897 stat_fontsize => 0.7, 2226 stat_fontsize => 0.7,
1898 mapsize => 100, 2227 mapsize => 100,
1899 say_command => 'say',
1900 audio_enable => 1, 2228 audio_enable => 1,
2229 effects_enable => 1,
2230 effects_volume => 1,
1901 bgm_enable => 1, 2231 bgm_enable => 1,
1902 bgm_volume => 0.25, 2232 bgm_volume => 0.5,
1903 face_prefetch => 0,
1904 output_sync => 1, 2233 output_sync => 1,
1905 output_count => 1, 2234 output_count => 1,
2235 output_rate => "",
1906 pickup => 0, 2236 pickup => 0,
2237 inv_sort => "mtime",
1907 default => "profile", # default profile 2238 default => "profile", # default profile
2239 show_tips => 1,
2240 logview_max_par => 1000,
1908 ); 2241 );
1909 2242
1910 while (my ($k, $v) = each %DEF_CFG) { 2243 while (my ($k, $v) = each %DEF_CFG) {
1911 $CFG->{$k} = $v unless exists $CFG->{$k}; 2244 $CFG->{$k} = $v unless exists $CFG->{$k};
1912 } 2245 }
1913 2246
1914 $CFG->{profile}{default}{host} ||= "crossfire.schmorp.de"; 2247 $CFG->{profile}{default}{host} ||= "crossfire.schmorp.de";
2248 $PROFILE = $CFG->{profile}{default};
2249
2250 # convert old bindings (only default profile matters)
2251 if (my $bindings = delete $PROFILE->{bindings}) {
2252 while (my ($mod, $syms) = each %$bindings) {
2253 while (my ($sym, $cmds) = each %$syms) {
2254 push @{ $PROFILE->{macro} }, {
2255 accelkey => [$mod*1, $sym*1],
2256 action => $cmds,
2257 };
2258 }
2259 }
2260 }
1915 2261
1916 sdl_init; 2262 sdl_init;
1917 2263
1918 @SDL_MODES = reverse 2264 @SDL_MODES = CFPlus::SDL_ListModes 8, 8;
1919 grep $_->[0] >= 640 && $_->[1] >= 480, 2265 @SDL_MODES = CFPlus::SDL_ListModes 5, 0 unless @SDL_MODES;
1920 CFClient::SDL_ListModes;
1921
1922 @SDL_MODES or CFClient::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)"; 2266 @SDL_MODES or CFPlus::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)";
2267
2268 @SDL_MODES = sort { $a->[0] * $a->[1] <=> $b->[0] * $b->[1] } @SDL_MODES;
1923 2269
1924 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES; 2270 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES;
1925 2271
1926 { 2272 {
1927 my @fonts = map CFClient::find_rcfile "fonts/$_", qw( 2273 my @fonts = map CFPlus::find_rcfile "fonts/$_", qw(
1928 DejaVuSans.ttf 2274 DejaVuSans.ttf
1929 DejaVuSansMono.ttf 2275 DejaVuSansMono.ttf
1930 DejaVuSans-Bold.ttf 2276 DejaVuSans-Bold.ttf
1931 DejaVuSansMono-Bold.ttf 2277 DejaVuSansMono-Bold.ttf
1932 DejaVuSans-Oblique.ttf 2278 DejaVuSans-Oblique.ttf
1933 DejaVuSansMono-Oblique.ttf 2279 DejaVuSansMono-Oblique.ttf
1934 DejaVuSans-BoldOblique.ttf 2280 DejaVuSans-BoldOblique.ttf
1935 DejaVuSansMono-BoldOblique.ttf 2281 DejaVuSansMono-BoldOblique.ttf
1936 ); 2282 );
1937 2283
1938 CFClient::add_font $_ for @fonts; 2284 CFPlus::add_font $_ for @fonts;
1939 2285
1940 CFClient::pango_init; 2286 CFPlus::pango_init;
1941 2287
1942 $FONT_PROP = new_from_file CFClient::Font $fonts[0]; 2288 $FONT_PROP = new_from_file CFPlus::Font $fonts[0];
1943 $FONT_FIXED = new_from_file CFClient::Font $fonts[1]; 2289 $FONT_FIXED = new_from_file CFPlus::Font $fonts[1];
1944 2290
1945 $FONT_PROP->make_default; 2291 $FONT_PROP->make_default;
1946 } 2292 }
1947 2293
1948# compare mono (ft) vs. rgba (cairo) 2294# compare mono (ft) vs. rgba (cairo)
1949# ft - 1.8s, cairo 3s, even in alpha-only mode 2295# ft - 1.8s, cairo 3s, even in alpha-only mode
1950# for my $rgba (0..1) { 2296# for my $rgba (0..1) {
1951# my $t1 = Time::HiRes::time; 2297# my $t1 = Time::HiRes::time;
1952# for (1..1000) { 2298# for (1..1000) {
1953# my $layout = CFClient::Layout->new ($rgba); 2299# my $layout = CFPlus::Layout->new ($rgba);
1954# $layout->set_text ("hallo" x 100); 2300# $layout->set_text ("hallo" x 100);
1955# $layout->render; 2301# $layout->render;
1956# } 2302# }
1957# my $t2 = Time::HiRes::time; 2303# my $t2 = Time::HiRes::time;
1958# warn $t2-$t1; 2304# warn $t2-$t1;
1960 2306
1961 video_init; 2307 video_init;
1962 audio_init; 2308 audio_init;
1963} 2309}
1964 2310
2311show_tip_of_the_day if $CFG->{show_tips};
2312
2313Event->idle (cb => sub {
2314 $_[0]->w->cancel;
2315 $startup_done->();
2316});
2317
1965Event::loop; 2318Event::loop;
2319
2320#video_shutdown;
2321#audio_shutdown;
1966#CFClient::SDL_Quit; 2322CFPlus::SDL_Quit;
1967#CFClient::_exit 0; 2323CFPlus::DB::Server::stop;
1968
1969END { CFClient::SDL_Quit }
1970 2324
1971=head1 NAME 2325=head1 NAME
1972 2326
1973cfplus - A Crossfire+ and Crossfire game client 2327cfplus - A Crossfire TRT and Crossfire game client
1974 2328
1975=head1 SYNOPSIS 2329=head1 SYNOPSIS
1976 2330
1977Just run it - no commandline arguments are supported. 2331Just run it - no commandline arguments are supported.
1978 2332
1979=head1 USAGE 2333=head1 USAGE
1980 2334
1981cfplus utilises OpenGL for all UI elements and the game. It is supposed to be used 2335cfplus utilises OpenGL for all UI elements and the game. It is supposed to
1982fullscreen and interactively. 2336be used in fullscreen mode and interactively.
1983 2337
1984=head1 DEBUGGING 2338=head1 DEBUGGING
1985 2339
1986 2340
1987CFPLUS_DEBUG - environment variable 2341CFPLUS_DEBUG - environment variable

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines