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.94 by root, Sun Jul 16 20:04:08 2006 UTC vs.
Revision 1.210 by root, Sun Aug 12 01:49:09 2007 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines