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

Diff Legend

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