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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines