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

Diff Legend

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