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.56 by root, Mon Jun 5 05:23:21 2006 UTC vs.
Revision 1.175 by root, Tue Jul 17 22:08:57 2007 UTC

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

Diff Legend

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