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.93 by root, Sat Jul 15 01:19:55 2006 UTC vs.
Revision 1.227 by root, Sun Sep 2 09:48:42 2007 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines