ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/bin/cfplus
(Generate patch)

Comparing deliantra/Deliantra-Client/bin/cfplus (file contents):
Revision 1.52 by root, Mon Jun 5 00:17:47 2006 UTC vs.
Revision 1.170 by root, Sun Jul 15 21:15:14 2007 UTC

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

Diff Legend

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