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.51 by root, Sat Jun 3 21:59:55 2006 UTC vs.
Revision 1.152 by root, Tue Apr 24 01:13:15 2007 UTC

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

Diff Legend

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