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

Diff Legend

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