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

Diff Legend

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