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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines