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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines