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.102 by root, Mon Jul 24 04:24:43 2006 UTC vs.
Revision 1.195 by root, Tue Jul 31 01:03:52 2007 UTC

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

Diff Legend

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