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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines