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.33 by root, Tue May 30 07:13:09 2006 UTC vs.
Revision 1.161 by root, Thu Jul 5 06:57:03 2007 UTC

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

Diff Legend

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