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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines