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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines