ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/bin/cfplus
(Generate patch)

Comparing deliantra/Deliantra-Client/bin/cfplus (file contents):
Revision 1.93 by root, Sat Jul 15 01:19:55 2006 UTC vs.
Revision 1.196 by root, Tue Jul 31 02:03:13 2007 UTC

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

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines