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

Diff Legend

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