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

Diff Legend

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