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.19 by elmex, Sat May 27 21:15:57 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;
135our $HOST_ENTRY;
136our $FULLSCREEN_ENABLE;
137our $PICKUP_ENABLE;
138our $SERVER_INFO;
86 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;
87our $FLOORBOX; 156our $FLOORBOX;
88our $GAUGES; 157our $GAUGES;
89our $STATWIDS; 158our $STATWIDS;
90 159
91our $SDL_ACTIVE; 160our $SDL_ACTIVE;
… …
99our $STATUSBOX; 168our $STATUSBOX;
100our $DEBUG_STATUS; 169our $DEBUG_STATUS;
101 170
102our $INV; 171our $INV;
103our $INVR; 172our $INVR;
104our $INVR_LBL; 173our $INV_RIGHT_HB;
174
175our $PICKUP_CFG;
176
177our $IN_BUILD_MODE;
178our $BUILD_BUTTON;
105 179
106sub status { 180sub status {
107 $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]);
108} 182}
109 183
110sub debug { 184sub debug {
111 $DEBUG_STATUS->set_text ($_[0]); 185 $DEBUG_STATUS->set_text ($_[0]);
112 my ($w, $h) = $DEBUG_STATUS->size_request; 186}
113 $DEBUG_STATUS->move ($WIDTH - $w, 0); 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;
114} 436}
115 437
116sub start_game { 438sub start_game {
117 status "logging in..."; 439 status "logging in...";
118 440
441 $LOGIN_BUTTON->set_text ("Logout");
442 $SETUP_DIALOG->hide;
443
119 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;
120 445
121 my ($host, $port) = split /:/, $CFG->{host}; 446 my ($host, $port) = split /:/, $PROFILE->{host};
122 447
123 $MAP = new CFClient::Map $mapsize, $mapsize; 448 $MAP = new CFPlus::Map;
124 449
450 warn "connecting...\n";#d#
125 $CONN = eval { 451 $CONN = eval {
126 new CFClient::Protocol 452 new CFPlus::Protocol
127 host => $host, 453 host => $host,
128 port => $port || 13327, 454 port => $port || 13327,
129 user => $CFG->{user}, 455 user => $PROFILE->{user},
130 pass => $CFG->{password}, 456 pass => $PROFILE->{password},
131 mapw => $mapsize, 457 mapw => $mapsize,
132 maph => $mapsize, 458 maph => $mapsize,
459
460 client => "cfplus $CFPlus::VERSION $] $^O",
133 461
134 map_widget => $MAPWIDGET, 462 map_widget => $MAPWIDGET,
135 logview => $LOGVIEW, 463 logview => $LOGVIEW,
136 statusbox => $STATUSBOX, 464 statusbox => $STATUSBOX,
137 map => $MAP, 465 map => $MAP,
138 mapmap => $MAPMAP, 466 mapmap => $MAPMAP,
467 query => \&server_query,
468
469 setup_req => {
470 smoothing => $CFG->{map_smoothing}*1,
471 },
139 472
140 sound_play => sub { 473 sound_play => sub {
141 my ($x, $y, $soundnum, $type) = @_; 474 my ($x, $y, $soundnum, $type) = @_;
142 475
143 $SDL_MIXER 476 $SDL_MIXER
… …
147 or return; 480 or return;
148 481
149 $chunk->play; 482 $chunk->play;
150 }, 483 },
151 }; 484 };
485 warn "connected<$CONN,$@>\n";#d#
152 486
153 if ($CONN) { 487 if ($CONN) {
154 CFClient::lowdelay fileno $CONN->{fh}; 488 CFPlus::lowdelay fileno $CONN->{fh};
155 489
156 $LOGIN_BUTTON->set_text ("Logout");
157 status "login successful"; 490 status "login successful";
158
159 $BUTTONBAR->{children}[1]->emit ("activate")
160 if $BUTTONBAR->{children}[1]->{state};
161
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 {
498 $LOGIN_BUTTON->set_text ("Login");
499 $SETUP_NOTEBOOK->set_current_page ($SETUP_SERVER);
500 $SETUP_DIALOG->show;
501 $PL_WINDOW->hide;
502 $SPELL_LIST->clear_spells;
503 $CFPlus::UI::ROOT->emit (stop_game => ! ! $CONN);
504
169 return unless $CONN; 505 return unless $CONN;
170 506
171 status "connection closed"; 507 status "connection closed";
172 $LOGIN_BUTTON->set_text ("Login"); 508
509 destroy_query_dialog $CONN;
173 $CONN->destroy; 510 $CONN->destroy;
174 $CONN = 0; # false, does not autovivify 511 $CONN = 0; # false, does not autovivify
175 512
176 $BUTTONBAR->{children}[1]->emit ("activate") 513 undef $MAP;
177 unless $BUTTONBAR->{children}[1]->{state};
178} 514}
179 515
180sub client_setup { 516sub graphics_setup {
181 my $dialog = new CFClient::UI::FancyFrame 517 my $vbox = new CFPlus::UI::VBox;
182 req_x => 1, 518
183 req_y => $HEIGHT * (1/8),
184 name => "client_setup",
185 title => "Client Setup",
186 child => (my $vbox = new CFClient::UI::VBox);
187 $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]);
188 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
189 $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");
190 $table->add (1, 0, my $hbox = new CFClient::UI::HBox); 529 $table->add (1, $row++, my $hbox = new CFPlus::UI::HBox);
191 530
192 $hbox->add (my $mode_slider = new CFClient::UI::Slider expand => 1, req_w => 100, 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]);
193 $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");
194 533
195 $mode_slider->connect (changed => sub { 534 $mode_slider->connect (changed => sub {
196 my ($self, $value) = @_; 535 my ($self, $value) = @_;
197 536
198 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value; 537 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value;
199 $mode_label->set_text (sprintf "%dx%d", @{$SDL_MODES[$value]}); 538 $mode_label->set_text (sprintf "%dx%d", @{$SDL_MODES[$value]});
200 }); 539 });
201 $mode_slider->emit (changed => $mode_slider->{range}[0]); 540 $mode_slider->emit (changed => $mode_slider->{range}[0]);
202 541
203 my $row = 1;
204
205 $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");
206 $table->add (1, $row++, new CFClient::UI::CheckBox 543 $table->add (1, $row++, $FULLSCREEN_ENABLE = new CFPlus::UI::CheckBox
207 state => $CFG->{fullscreen}, 544 state => $CFG->{fullscreen},
208 tooltip => "Bring the client into fullscreen mode.", 545 tooltip => "Bring the client into fullscreen mode.",
209 on_changed => sub { 546 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 }
210 my ($self, $value) = @_;
211 $CFG->{fullscreen} = $value;
212 }
213 ); 547 );
214 548
215 $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");
216 $table->add (1, $row++, new CFClient::UI::CheckBox 550 $table->add (1, $row++, new CFPlus::UI::CheckBox
217 state => $CFG->{fast}, 551 state => $CFG->{fast},
218 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.",
219 on_changed => sub { 566 on_activate => sub {
220 my ($self, $value) = @_; 567 video_shutdown ();
221 $CFG->{fast} = $value; 568 video_init ();
569 0
222 } 570 }
223 ); 571 );
224 572
225 $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");
226 $table->add (1, $row++, new CFClient::UI::Slider 574 $table->add (1, $row++, new CFPlus::UI::Slider
227 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1], 575 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1],
228 tooltip => "Enlarge or shrink the displayed map. Changes are instant.", 576 tooltip => "Enlarge or shrink the displayed map. Changes are instant.",
229 on_changed => sub { 577 on_changed => sub { my ($self, $value) = @_; $CFG->{map_scale} = 2 ** $value; 0 }
230 my ($self, $value) = @_;
231 $CFG->{map_scale} = 2 ** $value;
232 }
233 ); 578 );
234 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
235 $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");
236 $table->add (1, $row++, new CFClient::UI::CheckBox 590 $table->add (1, $row++, new CFPlus::UI::CheckBox
237 state => $CFG->{fow_enable}, 591 state => $CFG->{fow_enable},
238 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.",
239 on_changed => sub { 593 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; 0 }
240 my ($self, $value) = @_;
241 $CFG->{fow_enable} = $value;
242 }
243 ); 594 );
244 595
245 $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");
246 $table->add (1, $row++, new CFClient::UI::Slider 597 $table->add (1, $row++, new CFPlus::UI::Slider
247 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256], 598 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256],
248 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.",
249 on_changed => sub { 600 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_intensity} = $value; 0 }
250 my ($self, $value) = @_;
251 $CFG->{fow_intensity} = $value;
252 }
253 ); 601 );
254 602
255 $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");
256 $table->add (1, $row++, new CFClient::UI::CheckBox 604 $table->add (1, $row++, new CFPlus::UI::CheckBox
257 state => $CFG->{fow_smooth}, 605 state => $CFG->{fow_smooth},
258 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.",
259 on_changed => sub { 607 on_changed => sub {
260 my ($self, $value) = @_; 608 my ($self, $value) = @_;
261 $CFG->{fow_smooth} = $value; 609 $CFG->{fow_smooth} = $value;
262 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
263 } 612 }
264 ); 613 );
265 614
266 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "GUI Fontsize");
267 $table->add (1, $row++, new CFClient::UI::Slider
268 range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1],
269 tooltip => "The base font size used by most GUI elements that do not have their own setting.",
270 on_changed => sub { $CFG->{gui_fontsize} = $_[1] },
271 );
272
273 $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");
274 $table->add (1, $row++, new CFClient::UI::Slider 616 $table->add (1, $row++, new CFPlus::UI::Slider
275 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1], 617 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1],
276 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.",
277 on_changed => sub { $LOGVIEW->set_fontsize ($CFG->{log_fontsize} = $_[1]) }, 619 on_changed => sub { $LOGVIEW->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 },
278 ); 620 );
279 621
280 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Stats Fontsize");
281
282 $table->add (1, $row++, new CFClient::UI::Slider
283 range => [$CFG->{stat_fontsize}, 0.5, 2, 0, 0.1],
284 tooltip => "The font size used by the <b>statistics window</b> only. Changes are instant.",
285 on_changed => sub {
286 $CFG->{stat_fontsize} = $_[1];
287 &set_stats_window_fontsize;
288 }
289 );
290
291 $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");
292 $table->add (1, $row++, new CFClient::UI::Slider 623 $table->add (1, $row++, new CFPlus::UI::Slider
293 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1], 624 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1],
294 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.",
295 on_changed => sub { 626 on_changed => sub {
296 $CFG->{gauge_fontsize} = $_[1]; 627 $CFG->{gauge_fontsize} = $_[1];
297 &set_gauge_window_fontsize; 628 &set_gauge_window_fontsize;
629 0
298 } 630 }
299 ); 631 );
300 632
301 $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");
302 $table->add (1, $row++, new CFClient::UI::Slider 634 $table->add (1, $row++, new CFPlus::UI::Slider
303 range => [$CFG->{gauge_size}, 0.2, 0.8], 635 range => [$CFG->{gauge_size}, 0.2, 0.8],
304 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.",
305 on_changed => sub { 637 on_changed => sub {
306 $CFG->{gauge_size} = $_[1]; 638 $CFG->{gauge_size} = $_[1];
307 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size}); 639 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size});
640 0
308 } 641 }
309 ); 642 );
310 643
311 $table->add (1, $row++, new CFClient::UI::Button 644 $vbox
312 expand => 1, align => 0, text => "Apply", 645}
313 tooltip => "Apply the video settings",
314 on_activate => sub {
315 video_shutdown ();
316 video_init ();
317 }
318 );
319 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
320 $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");
321 $table->add (1, $row++, new CFClient::UI::CheckBox 655 $table->add (1, $row++, new CFPlus::UI::CheckBox
322 state => $CFG->{audio_enable}, 656 state => $CFG->{audio_enable},
323 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.",
324 on_changed => sub { 658 on_changed => sub { $CFG->{audio_enable} = $_[1]; 0 }
325 $CFG->{audio_enable} = $_[1];
326 }
327 ); 659 );
328# $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");
329# $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 {
330# $CFG->{effects_volume} = $_[1]; 662# $CFG->{effects_volume} = $_[1];
331# }); 663# });
332 $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");
333 $table->add (1, $row++, my $hbox = new CFClient::UI::HBox); 665 $table->add (1, $row++, my $hbox = new CFPlus::UI::HBox);
334 $hbox->add (new CFClient::UI::CheckBox 666 $hbox->add (new CFPlus::UI::CheckBox
335 expand => 1, state => $CFG->{bgm_enable}, 667 expand => 1, state => $CFG->{bgm_enable},
336 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.",
337 on_changed => sub { 669 on_changed => sub { $CFG->{bgm_enable} = $_[1]; 0 }
338 $CFG->{bgm_enable} = $_[1];
339 }
340 ); 670 );
341 $hbox->add (new CFClient::UI::Slider 671 $hbox->add (new CFPlus::UI::Slider
342 expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128], 672 expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128],
343 tooltip => "The volume of the background music. Changes are instant.", 673 tooltip => "The volume of the background music. Changes are instant.",
344 on_changed => sub { 674 on_changed => sub { $CFG->{bgm_volume} = $_[1]; CFPlus::MixMusic::volume $_[1] * 128; 0 }
345 $CFG->{bgm_volume} = $_[1];
346 CFClient::MixMusic::volume $_[1] * 128;
347 }
348 ); 675 );
349 676
350 $table->add (1, $row++, new CFClient::UI::Button 677 $table->add (1, $row++, new CFPlus::UI::Button
351 expand => 1, align => 0, text => "Apply", 678 expand => 1, align => 0, text => "Apply",
352 tooltip => "Apply the audio settings", 679 tooltip => "Apply the audio settings",
353 on_activate => sub { 680 on_activate => sub {
354 audio_shutdown (); 681 audio_shutdown ();
355 audio_init (); 682 audio_init ();
683 0
356 } 684 }
357 ); 685 );
358 686
359 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Chat Command"); 687 $vbox
360 $table->add (1, $row++, my $saycmd = new CFClient::UI::Entry
361 text => $CFG->{say_command},
362 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. "
363 . "Usually you want to enter something like 'say' or 'shout' or 'gsay' here. "
364 . "But you could also set it to <b>tell <i>playername</i></b> to only chat with that user.",
365 on_changed => sub {
366 my ($self, $value) = @_;
367 $CFG->{say_command} = $value;
368 }
369 );
370
371 $dialog
372}
373
374sub set_stats_window_fontsize {
375 for (values %{$STATWIDS}) {
376 $_->set_fontsize ($::CFG->{stat_fontsize});
377 }
378} 688}
379 689
380sub set_gauge_window_fontsize { 690sub set_gauge_window_fontsize {
381 for (map { $GAUGES->{$_} } grep { $_ ne 'win' } keys %{$GAUGES}) { 691 for (map { $GAUGES->{$_} } grep { $_ ne 'win' } keys %{$GAUGES}) {
382 $_->set_fontsize ($::CFG->{gauge_fontsize}); 692 $_->set_fontsize ($::CFG->{gauge_fontsize});
… …
384} 694}
385 695
386sub make_gauge_window { 696sub make_gauge_window {
387 my $gh = int $HEIGHT * $CFG->{gauge_size}; 697 my $gh = int $HEIGHT * $CFG->{gauge_size};
388 698
389 my $win = new CFClient::UI::Frame ( 699 my $win = new CFPlus::UI::Frame (
390 req_y => -1, 700 force_x => 0,
701 force_y => "max",
391 user_w => $WIDTH, 702 force_w => $WIDTH,
392 user_h => $gh, 703 force_h => $gh,
393 ); 704 );
394 705
395 $win->add (my $hbox = new CFClient::UI::HBox 706 $win->add (my $hbox = new CFPlus::UI::HBox
396 children => [ 707 children => [
397 (new CFClient::UI::HBox expand => 1), 708 (new CFPlus::UI::HBox expand => 1),
398 (new CFClient::UI::VBox children => [ 709 (new CFPlus::UI::VBox children => [
399 (new CFClient::UI::Empty expand => 1), 710 (new CFPlus::UI::Empty expand => 1),
400 (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)),
401 ]), 712 ]),
402 (my $vbox = new CFClient::UI::VBox), 713 (my $vbox = new CFPlus::UI::VBox),
403 ], 714 ],
404 ); 715 );
405 716
406 $vbox->add (new CFClient::UI::HBox 717 $vbox->add (new CFPlus::UI::HBox
407 expand => 1, 718 expand => 1,
408 children => [ 719 children => [
409 (new CFClient::UI::Empty expand => 1), 720 (new CFPlus::UI::Empty expand => 1),
410 (my $hb = new CFClient::UI::HBox), 721 (my $hb = new CFPlus::UI::HBox),
411 ], 722 ],
412 ); 723 );
413 724
414 $hb->add (my $hg = new CFClient::UI::Gauge type => 'hp', 725 $hb->add (my $hg = new CFPlus::UI::Gauge type => 'hp', tooltip => "#stat_health");
415 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.");
416 $hb->add (my $mg = new CFClient::UI::Gauge type => 'mana', 726 $hb->add (my $mg = new CFPlus::UI::Gauge type => 'mana', tooltip => "#stat_mana");
417 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.");
418 $hb->add (my $gg = new CFClient::UI::Gauge type => 'grace', 727 $hb->add (my $gg = new CFPlus::UI::Gauge type => 'grace', tooltip => "#stat_grace");
419 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.");
420 $hb->add (my $fg = new CFClient::UI::Gauge type => 'food', 728 $hb->add (my $fg = new CFPlus::UI::Gauge type => 'food', tooltip => "#stat_food");
421 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.");
422 729
423 $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");
424 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.");
425 $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");
426 tooltip => "<b>Ranged attack</b> - how you attack when you press shift-cursor (spell, skill, weapon etc.)");
427 732
428 $GAUGES = { 733 $GAUGES = {
429 exp => $exp, win => $win, range => $rng, 734 exp => $exp, win => $win, range => $rng,
430 food => $fg, mana => $mg, hp => $hg, grace => $gg 735 food => $fg, mana => $mg, hp => $hg, grace => $gg
431 }; 736 };
… …
433 &set_gauge_window_fontsize; 738 &set_gauge_window_fontsize;
434 739
435 $win 740 $win
436} 741}
437 742
743sub debug_setup {
744 my $table = new CFPlus::UI::Table;
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
438sub make_stats_window { 773sub stats_window {
439 my $tgw = new CFClient::UI::FancyFrame 774 my $r = new CFPlus::UI::ScrolledWindow (
440 req_y => $HEIGHT * (2/8),
441 req_x => -1, 775 expand => 1,
442 title => "Stats", 776 scroll_y => 1
443 name => "stats_window"; 777 );
778 $r->add (my $vb = new CFPlus::UI::VBox);
444 779
445 $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
446 $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,
447 can_hover => 1, can_events => 1, 786 can_hover => 1, can_events => 1,
448 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.");
449 $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,
450 can_hover => 1, can_events => 1, 789 can_hover => 1, can_events => 1,
451 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).");
452 791
453 $vb->add (my $hb0 = new CFClient::UI::HBox); 792 $pi->add (my $hb0 = new CFPlus::UI::HBox);
454 $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,
455 can_hover => 1, can_events => 1, 794 can_hover => 1, can_events => 1,
456 tooltip => "The weight of the player including all inventory items."); 795 tooltip => "The weight of the player including all inventory items.");
457 $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,
458 can_hover => 1, can_events => 1, 797 can_hover => 1, can_events => 1,
459 tooltip => "The weight limit: you cannot carry more than this."); 798 tooltip => "The weight limit: you cannot carry more than this.");
460 799
461 800 $vb->add (new CFPlus::UI::FancyFrame
801 label => "Primary/Secondary Statistics",
462 $vb->add (my $hb = new CFClient::UI::HBox expand => 1); 802 child => (my $hb = new CFPlus::UI::HBox expand => 1),
803 );
463 $hb->add (my $tbl = new CFClient::UI::Table expand => 1); 804 $hb->add (my $tbl = new CFPlus::UI::Table expand => 1);
464 805
465 my $color2 = [1, 1, 0]; 806 my $color2 = [1, 1, 0];
466 807
467 for ( 808 for (
468 [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],
469 [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],
470 [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],
471 [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],
472 [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],
473 [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],
474 [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],
475 816
476 [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],
477 [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],
478 [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],
479 [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],
480 [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],
481 [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],
482 ) { 823 ) {
483 my ($col, $row, $id, $label, $template, $tooltip) = @$_; 824 my ($col, $row, $id, $label, $template) = @$_;
484 825
485 $tbl->add ($col , $row, $STATWIDS->{$id} = new CFClient::UI::Label 826 $tbl->add ($col , $row, $STATWIDS->{$id} = new CFPlus::UI::Label
486 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");
487 $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
488 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");
489 } 832 }
490 833
834 $vb->add (new CFPlus::UI::FancyFrame
835 label => "Resistancies",
491 $hb->add (my $tbl2 = new CFClient::UI::Table expand => 1); 836 child => (my $tbl2 = new CFPlus::UI::Table expand => 1),
837 );
492 838
493 my $row = 0; 839 my $row = 0;
494 my $col = 0; 840 my $col = 0;
495 841
496 my %resist_names = ( 842 my %resist_names = (
843 slow => ["Slow",
497 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",
498 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",
499 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",
500 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",
501 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",
502 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",
503 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",
504 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",
505 pois => "<b>Poison</b> (resistance to getting poisoned)", 860 "<b>Poison</b> (resistance to getting poisoned)"],
861 para => ["Paralysation",
506 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",
507 deat => "<b>Death</b> (resistance against death spells)", 864 "<b>Death</b> (resistance against death spells)"],
508 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",
509 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",
510 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",
511 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",
512 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",
513 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",
514 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)"],
515 ); 879 );
516 for (qw/slow holyw conf fire depl magic 880 for (qw/slow holyw conf fire depl magic
517 drain acid pois para deat phys 881 drain acid pois para deat phys
518 blind fear tund elec cold ghit/) 882 blind fear tund elec cold ghit/)
519 { 883 {
520 $tbl2->add ($col, $row, 884 $tbl2->add ($col, $row,
521 $STATWIDS->{"res_$_"} = 885 $STATWIDS->{"res_$_"} =
522 new CFClient::UI::Label 886 new CFPlus::UI::Label
523 font => $FONT_FIXED, 887 font => $FONT_FIXED,
524 template => "-100%", 888 template => "-100%",
525 align => +1, 889 align => +1,
526 valign => 0, 890 valign => 0,
527 can_events => 1, 891 can_events => 1,
528 can_hover => 1, 892 can_hover => 1,
529 tooltip => $resist_names{$_}, 893 tooltip => $resist_names{$_}->[1],
530 ); 894 );
531 $tbl2->add ($col + 1, $row, new CFClient::UI::Image 895 $tbl2->add ($col + 1, $row, new CFPlus::UI::Image
532 font => $FONT_FIXED, 896 font => $FONT_FIXED,
533 can_hover => 1, 897 can_hover => 1,
534 can_events => 1, 898 can_events => 1,
535 image => "ui/resist/resist_$_.png", 899 path => "ui/resist/resist_$_.png",
536 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],
537 ); 908 );
538 909
539 $row++; 910 $row++;
540 if ($row % 6 == 0) { 911 if ($row % 6 == 0) {
541 $col += 2; 912 $col += 3;
542 $row = 0; 913 $row = 0;
543 } 914 }
544 } 915 }
545 916
546 &set_stats_window_fontsize;
547 update_stats_window ({}); 917 #update_stats_window ({});
548 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]);
549 $tgw 925 $sw
550} 926}
551 927
552sub formsep { 928sub formsep($) {
553 reverse join ",", grep length, split /(...)/, reverse $_[0] * 1 929 scalar reverse join ",", unpack "(A3)*", reverse $_[0] * 1
554}
555
556sub update_stats_window {
557 my ($stats) = @_;
558
559 # I love text protocols...
560
561 my $hp = $stats->{+CS_STAT_HP} * 1;
562 my $hp_m = $stats->{+CS_STAT_MAXHP} * 1;
563 my $sp = $stats->{+CS_STAT_SP} * 1;
564 my $sp_m = $stats->{+CS_STAT_MAXSP} * 1;
565 my $fo = $stats->{+CS_STAT_FOOD} * 1;
566 my $fo_m = 999;
567 my $gr = $stats->{+CS_STAT_GRACE} * 1;
568 my $gr_m = $stats->{+CS_STAT_MAXGRACE} * 1;
569
570 $GAUGES->{hp} ->set_value ($hp, $hp_m);
571 $GAUGES->{mana} ->set_value ($sp, $sp_m);
572 $GAUGES->{food} ->set_value ($fo, $fo_m);
573 $GAUGES->{grace} ->set_value ($gr, $gr_m);
574 $GAUGES->{exp} ->set_text ("Exp: " . (formsep $stats->{+CS_STAT_EXP64})
575 . " (lvl " . ($stats->{+CS_STAT_LEVEL} * 1) . ")");
576 my $rng = $stats->{+CS_STAT_RANGE};
577 $rng =~ s/^Range: //; # thank you so much dear server
578 $GAUGES->{range} ->set_text ("Rng: " . $rng);
579 my $title = $stats->{+CS_STAT_TITLE};
580 $title =~ s/^Player: //;
581 $STATWIDS->{title} ->set_text ("Title: " . $title);
582
583 $STATWIDS->{st_str} ->set_text (sprintf "%d" , $stats->{+CS_STAT_STR});
584 $STATWIDS->{st_dex} ->set_text (sprintf "%d" , $stats->{+CS_STAT_DEX});
585 $STATWIDS->{st_con} ->set_text (sprintf "%d" , $stats->{+CS_STAT_CON});
586 $STATWIDS->{st_int} ->set_text (sprintf "%d" , $stats->{+CS_STAT_INT});
587 $STATWIDS->{st_wis} ->set_text (sprintf "%d" , $stats->{+CS_STAT_WIS});
588 $STATWIDS->{st_pow} ->set_text (sprintf "%d" , $stats->{+CS_STAT_POW});
589 $STATWIDS->{st_cha} ->set_text (sprintf "%d" , $stats->{+CS_STAT_CHA});
590 $STATWIDS->{st_wc} ->set_text (sprintf "%d" , $stats->{+CS_STAT_WC});
591 $STATWIDS->{st_ac} ->set_text (sprintf "%d" , $stats->{+CS_STAT_AC});
592 $STATWIDS->{st_dam} ->set_text (sprintf "%d" , $stats->{+CS_STAT_DAM});
593 $STATWIDS->{st_arm} ->set_text (sprintf "%d" , $stats->{+CS_STAT_ARMOUR});
594 $STATWIDS->{st_spd} ->set_text (sprintf "%.1f", $stats->{+CS_STAT_SPEED});
595 $STATWIDS->{st_wspd}->set_text (sprintf "%.1f", $stats->{+CS_STAT_WEAP_SP});
596
597 $STATWIDS->{m_weight}->set_text (sprintf "Max weight: %.1fkg", $stats->{+CS_STAT_WEIGHT_LIM} / 1000);
598
599 # TODO: replace by CS_STAT_RES_xxx constants
600 my %tbl = (
601 phys => 100,
602 magic => 101,
603 fire => 102,
604 elec => 103,
605 cold => 104,
606 conf => 105,
607 acid => 106,
608 drain => 107,
609 ghit => 108,
610 pois => 109,
611 slow => 110,
612 para => 111,
613 tund => 112,
614 fear => 113,
615 depl => 113,
616 deat => 115,
617 holyw => 116,
618 blind => 117,
619 );
620
621 $STATWIDS->{"res_$_"}->set_text (sprintf "%d%", $stats->{$tbl{$_}})
622 for keys %tbl;
623}
624
625sub metaserver_dialog {
626 my $dialog = new CFClient::UI::FancyFrame
627 title => "Server List",
628 child => (my $vbox = new CFClient::UI::VBox);
629
630 $vbox->add ($dialog->{table} = new CFClient::UI::Table);
631
632 $dialog
633} 930}
634 931
635my $METASERVER_ATIME; 932my $METASERVER_ATIME;
636 933
637sub update_metaserver { 934sub update_metaserver {
638 my ($HOST) = @_; 935 my ($metaserver_dialog) = @_;
936
937 $METASERVER = $metaserver_dialog
938 if defined $metaserver_dialog;
639 939
640 return if $METASERVER_ATIME > time; 940 return if $METASERVER_ATIME > time;
641 $METASERVER_ATIME = time + 60; 941 $METASERVER_ATIME = time + 60;
642 942
643 my $table = $METASERVER->{table}; 943 my $table = $METASERVER->{table};
644 $table->clear; 944 $table->clear;
645 $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...");
646 946
647 my $buf; 947 my $ok = 0;
648 948
649 my $fh = new IO::Socket::INET PeerHost => $META_SERVER, Blocking => 0; 949 CFPlus::background {
950 my $ua = CFPlus::lwp_useragent;
650 951
651 unless ($fh) { 952 CFPlus::background_msg CFPlus::from_json +(CFPlus::lwp_check $ua->get ($META_SERVER))->decoded_content;
652 $label->set_text ("unable to contact metaserver: $!"); 953 } sub {
653 return; 954 my ($msg) = @_;
654 } 955 if ($msg) {
655
656 Event->io (fd => $fh, poll => 'r', cb => sub {
657 my $res = sysread $fh, $buf, 8192, length $buf;
658
659 if (!defined $res) {
660 $_[0]->w->cancel;
661 $label->set_text ("error while retrieving server list: $!");
662 } elsif ($res == 0) {
663 $_[0]->w->cancel;
664 status "server list retrieved";
665
666 utf8::decode $buf if utf8::valid $buf;
667
668 $table->clear; 956 $table->clear;
669 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 );
670 my @col = qw(Use #Users Host Uptime Version Description); 965 my @col = qw(#Users Host Uptime Version Description);
671 $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[$_])
672 for 0 .. $#col; 970 for 0 .. $#col;
673 971
674 my @align = qw(1 0 1 1 -1); 972 my @align = qw(1 0 1 1 -1);
675 973
676 my $y = 0; 974 my $y = 0;
677 for my $m (sort { $b->[3] <=> $a->[3] } map [split /\|/], split /\015?\012/, $buf) { 975 for my $m (@{ $msg->{servers} }) {
678 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)};
679 978
680 for ($desc) { 979 for ($desc) {
681 s/<br>/\n/gi; 980 s/<br>/\n/gi;
682 s/<li>/\n· /gi; 981 s/<li>/\n· /gi;
683 s/<.*?>//sgi; 982 s/<.*?>//sgi;
684 s/&/&amp;/g; 983 s/&amp;/&/g;
685 s/</&lt;/g; 984 s/&lt;/</g;
686 s/>/&gt;/g; 985 s/&gt;/>/g;
687 } 986 }
688 987
689 $uptime = sprintf "%dd %02d:%02d:%02d", 988 $uptime = sprintf "%dd %02d:%02d:%02d",
690 (int $m->[8] / 86400), 989 (int $uptime / 86400),
691 (int $m->[8] / 3600) % 24, 990 (int $uptime / 3600) % 24,
692 (int $m->[8] / 60) % 60, 991 (int $uptime / 60) % 60,
693 $m->[8] % 60; 992 $uptime % 60;
694 993
695 $m = [$users, $host, $uptime, $version, $desc]; 994 $m = [$users, $host, $uptime, $version, $desc];
696 995
697 $y++; 996 $y++;
698 997
699 $table->add (0, $y, new CFClient::UI::VBox children => [ 998 $table->add (scalar @$m, $y, new CFPlus::UI::VBox children => [
700 (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 {
701 $HOST->set_text ($CFG->{host} = $host); 1003 $HOST_ENTRY->set_text ($CFG->{profile}{default}{host} = $host);
1004 $METASERVER->hide;
1005 0
1006 },
702 }), 1007 ),
703 (new CFClient::UI::Empty expand => 1), 1008 (new CFPlus::UI::Empty expand => 1),
704 ]); 1009 ]);
705 1010
706 $table->add ($_ + 1, $y, new CFClient::UI::Label 1011 $table->add ($_, $y, new CFPlus::UI::Label
707 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)
708 for 0 .. $#$m; 1021 for 0 .. $#$m;
709 } 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
710 } 1049 },
711 }); 1050 ;
1051
1052 $dialog
712} 1053}
713 1054
714sub server_setup { 1055sub server_setup {
715 my $dialog = new CFClient::UI::FancyFrame 1056 my $vbox = new CFPlus::UI::VBox;
716 x => $WIDTH * (1/3),
717 y => $HEIGHT * (1/8),
718 name => "server_setup",
719 title => "Server Setup",
720 child => (my $vbox = new CFClient::UI::VBox),
721 on_visibility_change => sub {
722 $_[0]->show_centered if $_[1]
723 };
724 1057
1058 $vbox->add (new CFPlus::UI::FancyFrame
1059 label => "Connection Settings",
725 $vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]); 1060 child => (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]),
1061 );
726 $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");
727 1063
728 { 1064 {
729 $table->add (1, 2, my $vbox = new CFClient::UI::VBox); 1065 $table->add (1, 2, my $vbox = new CFPlus::UI::VBox);
730 1066
731 $vbox->add ( 1067 $vbox->add (
732 my $HOST = new CFClient::UI::Entry 1068 $HOST_ENTRY = new CFPlus::UI::Entry
733 expand => 1, 1069 expand => 1,
734 text => $CFG->{host}, 1070 text => $CFG->{profile}{default}{host},
735 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",
736 on_changed => sub { 1072 on_changed => sub {
737 my ($self, $value) = @_; 1073 my ($self, $value) = @_;
738 $CFG->{host} = $value; 1074 $CFG->{profile}{default}{host} = $value;
1075 0
739 } 1076 }
740 ); 1077 );
741 1078
742 $METASERVER = metaserver_dialog;
743
744 $vbox->add (new CFClient::UI::Flopper 1079 $vbox->add (new CFPlus::UI::Button
745 expand => 1, 1080 expand => 1,
746 text => "Server List", 1081 text => "Server List",
747 other => $METASERVER, 1082 other => $METASERVER,
748 tooltip => "Show a list of available crossfire servers", 1083 tooltip => "Show a list of available crossfire servers",
749 on_open => sub { 1084 on_activate => sub { $METASERVER->toggle_visibility; 0 },
750 update_metaserver $HOST; 1085 on_visibility_change => sub { $METASERVER->hide unless $_[1]; 0 },
751 }
752 ); 1086 );
753 } 1087 }
754 1088
755 $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");
756 $table->add (1, 4, new CFClient::UI::Entry 1090 $table->add (1, 4, new CFPlus::UI::Entry
757 text => $CFG->{user}, 1091 text => $CFG->{profile}{default}{user},
758 tooltip => "The name of your character on the server", 1092 tooltip => "The name of your character on the server",
759 on_changed => sub { 1093 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value }
760 my ($self, $value) = @_;
761 $CFG->{user} = $value;
762 }
763 ); 1094 );
764 1095
765 $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");
766 $table->add (1, 5, new CFClient::UI::Entry 1097 $table->add (1, 5, new CFPlus::UI::Entry
767 text => $CFG->{password}, 1098 text => $CFG->{profile}{default}{password},
768 hidden => 1, 1099 hidden => 1,
769 tooltip => "The password for your character", 1100 tooltip => "The password for your character",
770 on_changed => sub { 1101 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{password} = $value }
771 my ($self, $value) = @_;
772 $CFG->{password} = $value;
773 }
774 ); 1102 );
775 1103
776 $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");
777 $table->add (1, 7, new CFClient::UI::Slider 1105 $table->add (1, 7, new CFPlus::UI::Slider
778 req_w => 100, 1106 force_w => 100,
779 range => [$CFG->{mapsize}, 10, 100, 0, 1], 1107 range => [$CFG->{mapsize}, 10, 100, 0, 1],
780 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. "
781 . "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, "
782 . "but you also increase bandwidth requirements and latency. " 1110 . "but you also increase bandwidth requirements and latency. "
783 . "This option is only used once at log-in.", 1111 . "This option is only used once at log-in.",
784 on_changed => sub { 1112 on_changed => sub { my ($self, $value) = @_; $CFG->{mapsize} = $self->{range}[0] = $value = int $value; 0 },
785 my ($self, $value) = @_;
786
787 $CFG->{mapsize} = $self->{range}[0] = $value = int $value;
788 },
789 ); 1113 );
790 1114
791 $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");
792 $table->add (1, 8, new CFClient::UI::CheckBox 1116 $table->add (1, 8, new CFPlus::UI::CheckBox
793 state => $CFG->{face_prefetch}, 1117 state => $CFG->{face_prefetch},
794 tooltip => "<b>Background Image Prefetch</b>\n\n" 1118 tooltip => "<b>Background Image Prefetch</b>\n\n"
795 . "If enabled, the client automatically pre-fetches images from the server. " 1119 . "If enabled, the client automatically pre-fetches images from the server. "
796 . "This might increase or create lag, but increases the chances " 1120 . "This might increase or create lag, but increases the chances "
797 . "of faces being ready for display when you encounter them. " 1121 . "of faces being ready for display when you encounter them. "
798 . "It also uses up server bandwidth on every connect, " 1122 . "It also uses up server bandwidth on every connect, "
799 . "so only set it if you really need to prefetch images. " 1123 . "so only set it if you really need to prefetch images. "
800 . "This option can be set and unset any time.", 1124 . "This option can be set and unset any time.",
801 on_changed => sub { $CFG->{face_prefetch} = $_[1] }, 1125 on_changed => sub { $CFG->{face_prefetch} = $_[1]; 0 },
802 ); 1126 );
803 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
804 $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");
805 $table->add (1, 9, new CFClient::UI::Entry 1138 $table->add (1, 10, new CFPlus::UI::Entry
806 text => $CFG->{output_count}, 1139 text => $CFG->{output_count},
807 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.",
808 on_changed => sub { $CFG->{output_count} = $_[1] }, 1141 on_changed => sub { $CFG->{output_count} = $_[1]; 0 },
809 ); 1142 );
810 1143
811 $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");
812 $table->add (1, 10, new CFClient::UI::Entry 1145 $table->add (1, 11, new CFPlus::UI::Entry
813 text => $CFG->{output_sync}, 1146 text => $CFG->{output_sync},
814 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.",
815 on_changed => sub { $CFG->{output_sync} = $_[1] }, 1148 on_changed => sub { $CFG->{output_sync} = $_[1]; 0 },
816 ); 1149 );
817 1150
818 $table->add (1, 11, $LOGIN_BUTTON = new CFClient::UI::Button 1151 $table->add (1, 12, $LOGIN_BUTTON = new CFPlus::UI::Button
819 expand => 1, 1152 expand => 1,
820 align => 0, 1153 align => 0,
821 text => "Login", 1154 text => "Login",
822 on_activate => sub { 1155 on_activate => sub {
823 $CONN ? stop_game 1156 $CONN ? stop_game
824 : start_game; 1157 : start_game;
1158 0
825 }, 1159 },
826 ); 1160 );
827 1161
828 $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
829} 1213}
830 1214
831sub message_window { 1215sub message_window {
832 my $window = new CFClient::UI::FancyFrame 1216 my $window = new CFPlus::UI::Toplevel
833 name => "message_window", 1217 name => "message_window",
834 title => "Messages", 1218 title => "Messages",
835 border_bg => [1, 1, 1, 1], 1219 border_bg => [1, 1, 1, 1],
836 bg => [0, 0, 0, 0.75], 1220 x => "max",
837 req_x => -1, 1221 y => 0,
838 user_w => int $::WIDTH / 3, 1222 force_w => $::WIDTH * 0.4,
839 user_h => int $::HEIGHT / 5, 1223 force_h => $::HEIGHT * 0.5,
840 child => (my $vbox = new CFClient::UI::VBox); 1224 child => (my $vbox = new CFPlus::UI::VBox),
1225 has_close_button => 1;
841 1226
842 $vbox->add ($LOGVIEW); 1227 $vbox->add ($LOGVIEW);
843 1228
844 $vbox->add (my $input = new CFClient::UI::Entry 1229 $vbox->add (my $input = new CFPlus::UI::Entry
845 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> "
846 . "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>...). "
847 . "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). "
848 . "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.",
849 on_focus_in => sub { 1234 on_focus_in => sub {
… …
853 1238
854 if ($prev_focus == $MAPWIDGET && $input->{auto_activated}) { 1239 if ($prev_focus == $MAPWIDGET && $input->{auto_activated}) {
855 $input->{refocus_map} = 1; 1240 $input->{refocus_map} = 1;
856 } 1241 }
857 delete $input->{auto_activated}; 1242 delete $input->{auto_activated};
1243
1244 0
858 }, 1245 },
859 on_activate => sub { 1246 on_activate => sub {
860 my ($input, $text) = @_; 1247 my ($input, $text) = @_;
861 $input->set_text (''); 1248 $input->set_text ('');
862 1249
… …
868 } 1255 }
869 if ($input->{refocus_map}) { 1256 if ($input->{refocus_map}) {
870 delete $input->{refocus_map}; 1257 delete $input->{refocus_map};
871 $MAPWIDGET->focus_in 1258 $MAPWIDGET->focus_in
872 } 1259 }
1260
1261 0
873 }, 1262 },
874 on_escape => sub { 1263 on_escape => sub {
875 $MAPWIDGET->focus_in 1264 $MAPWIDGET->grab_focus;
1265
1266 0
876 }, 1267 },
877 ); 1268 );
878 1269
879 $CONSOLE = { 1270 $CONSOLE = {
880 window => $window, 1271 window => $window,
881 input => $input 1272 input => $input,
882 }; 1273 };
883 1274
884 $window 1275 $window
1276}
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;
885} 1618}
886 1619
887sub open_quit_dialog { 1620sub open_quit_dialog {
888 unless ($QUIT_DIALOG) { 1621 unless ($QUIT_DIALOG) {
1622 $QUIT_DIALOG = new CFPlus::UI::Toplevel
1623 x => "center",
1624 y => "center",
1625 z => 50,
1626 title => "Really Quit?",
1627 on_key_down => sub {
1628 my ($dialog, $ev) = @_;
1629 $ev->{sym} == 27 and $dialog->hide;
1630 }
1631 ;
889 1632
890 $QUIT_DIALOG = new CFClient::UI::FancyFrame title => "Really Quit?";
891
892 $QUIT_DIALOG->add (my $vb = new CFClient::UI::VBox expand => 1); 1633 $QUIT_DIALOG->add (my $vb = new CFPlus::UI::VBox expand => 1);
893 1634
894 $vb->add (new CFClient::UI::Label 1635 $vb->add (new CFPlus::UI::Label
895 text => "You should find a savebed and apply it first!", 1636 text => "You should find a savebed and apply it first!",
896 max_w => $WIDTH * 0.25, 1637 max_w => $WIDTH * 0.25,
897 ellipsize => 0, 1638 ellipsize => 0,
898 ); 1639 );
899 $vb->add (my $hb = new CFClient::UI::HBox expand => 1); 1640 $vb->add (my $hb = new CFPlus::UI::HBox expand => 1);
900 $hb->add (new CFClient::UI::Button 1641 $hb->add (new CFPlus::UI::Button
901 text => "Ok", 1642 text => "Ok",
902 expand => 1, 1643 expand => 1,
903 on_activate => sub { $QUIT_DIALOG->hide }, 1644 on_activate => sub { $QUIT_DIALOG->hide; 0 },
904 ); 1645 );
905 $hb->add (new CFClient::UI::Button 1646 $hb->add (new CFPlus::UI::Button
906 text => "Quit anyway", 1647 text => "Quit anyway",
907 expand => 1, 1648 expand => 1,
908 on_activate => sub { exit }, 1649 on_activate => sub { exit },
909 ); 1650 );
910
911 $QUIT_DIALOG->show_centered;
912 } else {
913 $QUIT_DIALOG->show_centered;
914 } 1651 }
915}
916 1652
917sub make_inventory_window { 1653 $QUIT_DIALOG->show;
918 my $invwin = new CFClient::UI::FancyFrame 1654 $QUIT_DIALOG->grab_focus;
919 user_w => $WIDTH * (7/8), 1655}
920 user_h => $HEIGHT * (7/8), 1656
921 title => "Inventory", 1657sub show_tip_of_the_day {
922 name => "inventory_window", 1658 # find all tips
923 on_visibility_change => sub { 1659 my @tod = CFPlus::Pod::find tip_of_the_day => "*";
924 $_[0]->show_centered if $_[1] 1660
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 { };
1665
1666 # create dialog
1667 my $dialog;
1668
1669 my $close = sub {
1670 $dialog->destroy;
925 }; 1671 };
926 1672
927 $invwin->add (my $hb = new CFClient::UI::HBox expand => 1); 1673 $dialog = new CFPlus::UI::Toplevel
1674 x => "center",
1675 y => "center",
1676 z => 3,
1677 name => 'tip_of_the_day',
1678 force_w => int $WIDTH * 4/9,
1679 force_h => int $WIDTH * 2/9,
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 ;
928 1685
929 $hb->add (my $vb1 = new CFClient::UI::VBox expand => 1); 1686 $vbox->add (my $viewer = new CFPlus::UI::TextScroller
930 $vb1->add (my $lbl = new CFClient::UI::Label align => 0); 1687 expand => 1, fontsize => 0.8, padding_x => 4, padding_y => 4);
931 $lbl->set_text ("Player"); 1688 $viewer->add_paragraph (CFPlus::Pod::as_paragraphs CFPlus::Pod::section_of $tod[$todindex]);
932 $vb1->add ($INV = new CFClient::UI::Inventory expand => 1);
933 1689
934 $hb->add (my $vb2 = new CFClient::UI::VBox expand => 1); 1690 $vbox->add (my $table = new CFPlus::UI::Table col_expand => [0, 1]);
935 1691
936 $vb2->add (my $hb2 = new CFClient::UI::HBox); 1692 $table->add (0, 0, new CFPlus::UI::Button
937 $hb2->add ($INVR_LBL = new CFClient::UI::Label align => 0, expand => 1);
938 $hb2->add (new CFClient::UI::Button
939 text => "Close", 1693 text => "Close",
940 tooltip => "Close the currently open container (if one is open)", 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>.",
941 on_activate => sub { 1695 on_activate => $close,
942 $CONN->send ("apply $CONN->{open_container}")
943 if $CONN->{open_container} != 0;
944 },
945 ); 1696 );
946 1697
947 $INVR_LBL->set_text ("Floor"); 1698 $table->add (2, 0, new CFPlus::UI::Button
948 $vb2->add ($INVR = new CFClient::UI::Inventory expand => 1); 1699 text => "Next",
949 1700 tooltip => "Show the next <b>Tip of the day</b>.",
950 $invwin
951}
952
953sub make_help_window {
954 my $win = new CFClient::UI::FancyFrame
955 user_w => $WIDTH * (7/8), user_h => $HEIGHT * (7/8), title => "Documentation";
956
957 $win->add (my $vbox = new CFClient::UI::VBox);
958
959 $vbox->add (my $buttons = new CFClient::UI::HBox);
960 $vbox->add (my $viewer = new CFClient::UI::TextView expand => 1, fontsize => 0.8);
961
962 for (
963 [intro => "Introduction"],
964 [manual => "Manual"],
965 [command_help => "Commands"],
966 [skill_help => "Skills"],
967 ) {
968 my ($pod, $label) = @$_;
969
970 $buttons->add (new CFClient::UI::Button
971 text => $label,
972 on_activate => sub { 1701 on_activate => sub {
973 my $parser = new Pod::POM; 1702 $close->();
974 my $pom = $parser->parse_file (CFClient::find_rcfile "pod/$pod.pod"); 1703 &show_tip_of_the_day;
975
976 $viewer->clear;
977
978 $viewer->add_paragraph ([1, 1, 1, 1], $_->[1], $_->[0])
979 for @{ CFClient::pod_to_pango_list $pom };
980
981 $viewer->set_offset (0);
982 }, 1704 },
983 ); 1705 );
1706
1707 $dialog->show;
984 } 1708 };
985
986 $viewer->add_paragraph ([1, 1, 0, 1], "<big>Use one of the buttons above to display a document.</big>");
987
988 $win
989} 1709}
990 1710
991sub sdl_init { 1711sub sdl_init {
992 CFClient::SDL_Init 1712 CFPlus::SDL_Init
993 and die "SDL::Init failed!\n"; 1713 and die "SDL::Init failed!\n";
994} 1714}
995 1715
996sub video_init { 1716sub video_init {
997 sdl_init; 1717 sdl_init;
… …
1002 1722
1003 ($WIDTH, $HEIGHT) = @{ $SDL_MODES[$CFG->{sdl_mode}] }; 1723 ($WIDTH, $HEIGHT) = @{ $SDL_MODES[$CFG->{sdl_mode}] };
1004 $FULLSCREEN = $CFG->{fullscreen}; 1724 $FULLSCREEN = $CFG->{fullscreen};
1005 $FAST = $CFG->{fast}; 1725 $FAST = $CFG->{fast};
1006 1726
1007 CFClient::SDL_SetVideoMode $WIDTH, $HEIGHT, $FULLSCREEN 1727 CFPlus::SDL_SetVideoMode $WIDTH, $HEIGHT, $FULLSCREEN
1008 or die "SDL_SetVideoMode failed: " . (CFClient::SDL_GetError) . "\n"; 1728 or die "SDL_SetVideoMode failed: " . (CFPlus::SDL_GetError) . "\n";
1009 1729
1010 $SDL_ACTIVE = 1; 1730 $SDL_ACTIVE = 1;
1011 $LAST_REFRESH = time - 0.01; 1731 $LAST_REFRESH = time - 0.01;
1012 1732
1013 CFClient::OpenGL::init; 1733 CFPlus::OpenGL::init;
1014 1734
1015 $FONTSIZE = int $HEIGHT / 40 * $CFG->{gui_fontsize}; 1735 $FONTSIZE = int $HEIGHT / 40 * $CFG->{gui_fontsize};
1016 1736
1017 $CFClient::UI::ROOT->configure (0, 0, $WIDTH, $HEIGHT);#d# 1737 $CFPlus::UI::ROOT->configure (0, 0, $WIDTH, $HEIGHT);#d#
1018 1738
1019 ############################################################################# 1739 #############################################################################
1020 1740
1021 if ($DEBUG_STATUS) { 1741 if ($DEBUG_STATUS) {
1022 CFClient::UI::rescale_widgets $WIDTH / $old_w, $HEIGHT / $old_h; 1742 CFPlus::UI::rescale_widgets $WIDTH / $old_w, $HEIGHT / $old_h;
1023 } else { 1743 } else {
1024 # create the widgets 1744 # create the widgets
1025 1745
1026 $DEBUG_STATUS = new CFClient::UI::Label padding => 0, z => 100, req_x => -1; 1746 $DEBUG_STATUS = new CFPlus::UI::Label
1747 padding => 0,
1748 z => 100,
1749 force_x => "max",
1750 force_y => 0;
1027 $DEBUG_STATUS->show; 1751 $DEBUG_STATUS->show;
1028 1752
1029 $STATUSBOX = new CFClient::UI::Statusbox; 1753 $STATUSBOX = new CFPlus::UI::Statusbox;
1030 $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]);
1031 1755
1032 (new CFClient::UI::Frame 1756 (new CFPlus::UI::Frame
1033 bg => [0, 0, 0, 0.4], 1757 bg => [0, 0, 0, 0.4],
1034 req_y => -1, 1758 force_x => 0,
1759 force_y => "max",
1035 child => $STATUSBOX, 1760 child => $STATUSBOX,
1036 )->show; 1761 )->show;
1037 1762
1038 CFClient::UI::FancyFrame->new ( 1763 CFPlus::UI::Toplevel->new (
1764 title => "Map",
1765 name => "mapmap",
1766 x => 0,
1767 y => $FONTSIZE + 8,
1039 border_bg => [1, 1, 1, 192/255], 1768 border_bg => [1, 1, 1, 192/255],
1040 bg => [1, 1, 1, 0], 1769 bg => [1, 1, 1, 0],
1041 child => ($MAPMAP = new CFClient::MapWidget::MapMap 1770 child => ($MAPMAP = new CFPlus::MapWidget::MapMap
1042 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.",
1043 ), 1772 ),
1044 )->show; 1773 )->show;
1045 1774
1046 $MAPWIDGET = new CFClient::MapWidget; 1775 $MAPWIDGET = new CFPlus::MapWidget;
1047 $MAPWIDGET->connect (activate_console => sub { 1776 $MAPWIDGET->connect (activate_console => sub {
1048 my ($mapwidget, $preset) = @_; 1777 my ($mapwidget, $preset) = @_;
1049 1778
1050 if ($CONSOLE) { 1779 if ($CONSOLE) {
1051 $CONSOLE->{input}->{auto_activated} = 1; 1780 $CONSOLE->{input}->{auto_activated} = 1;
1052 $CONSOLE->{input}->focus_in; 1781 $CONSOLE->{input}->grab_focus;
1053 1782
1054 if ($preset && $CONSOLE->{input}->get_text eq '') { 1783 if ($preset && $CONSOLE->{input}->get_text eq '') {
1055 $CONSOLE->{input}->set_text ($preset); 1784 $CONSOLE->{input}->set_text ($preset);
1056 } 1785 }
1057 } 1786 }
1058 }); 1787 });
1059 $MAPWIDGET->show; 1788 $MAPWIDGET->show;
1060 $MAPWIDGET->focus_in; 1789 $MAPWIDGET->grab_focus;
1061 1790
1062 $LOGVIEW = new CFClient::UI::TextView 1791 $LOGVIEW = new CFPlus::UI::TextScroller
1063 expand => 1, 1792 expand => 1,
1064 font => $FONT_FIXED, 1793 font => $FONT_FIXED,
1065 fontsize => $::CFG->{log_fontsize}, 1794 fontsize => $::CFG->{log_fontsize},
1795 indent => -4,
1066 can_hover => 1, 1796 can_hover => 1,
1067 can_events => 1, 1797 can_events => 1,
1798 max_par => $CFG->{logview_max_par},
1068 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.",
1069 ; 1800 ;
1070 1801
1071 $BUTTONBAR = new CFClient::UI::HBox; 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 ;
1072 1812
1073 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Client Setup", other => client_setup, 1813 $METASERVER = metaserver_dialog;
1074 tooltip => "Toggles a dialog where you can configure various aspects of the client, such as graphics mode, performance, and audio options."); 1814
1075 $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,
1076 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
1077 $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,
1078 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.");
1079 1843
1080 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
1081 1845
1082 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Stats Window", other => make_stats_window,
1083 tooltip => "Toggles the statistics window, where all your Stats and Resistances are being displayed at all times.");
1084 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Inventory", other => make_inventory_window, 1846 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Playerbook", other => player_window,
1085 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.");
1086 1848
1087 $BUTTONBAR->add (new CFClient::UI::Button 1849 $BUTTONBAR->add (new CFPlus::UI::Button
1088 text => "Save Config", 1850 text => "Save Config",
1089 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.",
1090 on_activate => sub { 1852 on_activate => sub {
1091 $::CFG->{layout} = CFClient::UI::get_layout; 1853 $::CFG->{layout} = CFPlus::UI::get_layout;
1092 CFClient::write_cfg "$Crossfire::VARDIR/pclientrc"; 1854 CFPlus::write_cfg "$Crossfire::VARDIR/cfplusrc";
1093 status "Configuration Saved"; 1855 status "Configuration Saved";
1856 0
1094 }, 1857 },
1095 ); 1858 );
1096 1859
1097 $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,
1098 tooltip => "View Documentation"); 1861 tooltip => "View Documentation");
1099 1862
1863
1100 $BUTTONBAR->add (new CFClient::UI::Button 1864 $BUTTONBAR->add (new CFPlus::UI::Button
1101 text => "Quit", 1865 text => "Quit",
1102 tooltip => "Terminates the program", 1866 tooltip => "Terminates the program",
1103 on_activate => sub { 1867 on_activate => sub {
1104 if ($CONN) { 1868 if ($CONN) {
1105 open_quit_dialog; 1869 open_quit_dialog;
1106 } else { 1870 } else {
1107 exit; 1871 exit;
1108 } 1872 }
1873 0
1109 }, 1874 },
1110 ); 1875 );
1111 1876
1112 $BUTTONBAR->show; 1877 $BUTTONBAR->show;
1113 1878 $SETUP_DIALOG->show;
1114 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);
1115
1116 # delay till geometry is constant
1117 $CFClient::UI::ROOT->on_post_alloc (startup => sub {
1118 $BUTTONBAR->{children}[1]->emit ("activate"); # pop up server setup
1119 my $widget = $GAUGES->{win};
1120 $widget->move (0, $HEIGHT - $widget->{h});#d# to in toplevel
1121 });
1122 force_refresh ();
1123 } 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;
1124} 2001}
1125 2002
1126sub video_shutdown { 2003sub video_shutdown {
2004 CFPlus::OpenGL::shutdown;
2005
1127 undef $SDL_ACTIVE; 2006 undef $SDL_ACTIVE;
1128} 2007}
1129 2008
1130my @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#
1131my $bgmusic;#TODO#hack#d# 2010my $bgmusic;#TODO#hack#d#
… …
1138 2017
1139sub audio_music_finished { 2018sub audio_music_finished {
1140 return unless $CFG->{bgm_enable}; 2019 return unless $CFG->{bgm_enable};
1141 2020
1142 # TODO: hack, do play loop and mood music 2021 # TODO: hack, do play loop and mood music
1143 $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]";
1144 $bgmusic->play (0); 2023 $bgmusic->play (0);
1145 2024
1146 push @bgmusic, shift @bgmusic; 2025 push @bgmusic, shift @bgmusic;
1147} 2026}
1148 2027
1149sub audio_init { 2028sub audio_init {
1150 if ($CFG->{audio_enable}) { 2029 if ($CFG->{audio_enable}) {
1151 if (open my $fh, "<", CFClient::find_rcfile "sounds/config") { 2030 if (open my $fh, "<", CFPlus::find_rcfile "sounds/config") {
1152 $SDL_MIXER = !CFClient::Mix_OpenAudio; 2031 $SDL_MIXER = !CFPlus::Mix_OpenAudio;
1153 2032
1154 unless ($SDL_MIXER) { 2033 unless ($SDL_MIXER) {
1155 status "Unable to open sound device: there will be no sound"; 2034 status "Unable to open sound device: there will be no sound";
1156 return; 2035 return;
1157 } 2036 }
1158 2037
1159 CFClient::Mix_AllocateChannels 8; 2038 CFPlus::Mix_AllocateChannels 8;
1160 CFClient::MixMusic::volume $CFG->{bgm_volume} * 128; 2039 CFPlus::MixMusic::volume $CFG->{bgm_volume} * 128;
1161 2040
1162 audio_music_finished; 2041 audio_music_finished;
1163 2042
2043 local $_;
1164 while (<$fh>) { 2044 while (<$fh>) {
1165 next if /^\s*#/; 2045 next if /^\s*#/;
1166 next if /^\s*$/; 2046 next if /^\s*$/;
1167 2047
1168 my ($file, $volume, $event) = split /\s+/, $_, 3; 2048 my ($file, $volume, $event) = split /\s+/, $_, 3;
1169 2049
1170 push @SOUNDS, "$volume,$file"; 2050 push @SOUNDS, "$volume,$file";
1171 2051
1172 $AUDIO_CHUNKS{"$volume,$file"} ||= do { 2052 $AUDIO_CHUNKS{"$volume,$file"} ||= do {
1173 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";
1174 $chunk->volume ($volume * 128 / 100); 2054 $chunk->volume ($volume * 128 / 100);
1175 $chunk 2055 $chunk
1176 }; 2056 };
1177 } 2057 }
1178 } else { 2058 } else {
… …
1180 } 2060 }
1181 } 2061 }
1182} 2062}
1183 2063
1184sub audio_shutdown { 2064sub audio_shutdown {
1185 CFClient::Mix_CloseAudio if $SDL_MIXER; 2065 CFPlus::Mix_CloseAudio if $SDL_MIXER;
1186 undef $SDL_MIXER; 2066 undef $SDL_MIXER;
1187 @SOUNDS = (); 2067 @SOUNDS = ();
1188 %AUDIO_CHUNKS = (); 2068 %AUDIO_CHUNKS = ();
1189} 2069}
1190 2070
… …
1195 2075
1196my %demo;#d# 2076my %demo;#d#
1197 2077
1198sub force_refresh { 2078sub force_refresh {
1199 $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;
1200 debug sprintf "%3.2f", $fps; 2080 debug sprintf "%3.2f", $fps if $ENV{CFPLUS_DEBUG} & 4;
1201 2081
1202 $CFClient::UI::ROOT->draw; 2082 $CFPlus::UI::ROOT->draw;
1203 2083
1204 $WANT_REFRESH = 0; 2084 $WANT_REFRESH = 0;
1205 $CAN_REFRESH = 0; 2085 $CAN_REFRESH = 0;
1206 $LAST_REFRESH = $NOW; 2086 $LAST_REFRESH = $NOW;
1207 2087
12080 && do {
1209 # some weird model-drawing code, just a joke right now
1210 use CFClient::OpenGL;
1211
1212 $demo{t}{eye_auv} ||= new_from_file CFClient::Texture "eye2.png" or die;
1213 $demo{t}{body_auv} ||= new_from_file CFClient::Texture "body_auv3.png" or die;
1214 $demo{r} ||= do {
1215 my $mod = Compress::LZF::sthaw do { local $/; open my $fh, "<:raw:perlio", "dread.lz3"; <$fh> };
1216 $mod->{v} = pack "f*", @{$mod->{v}};
1217 $_ = [scalar @$_, pack "S!*", @$_]
1218 for values %{$mod->{g}};
1219 $mod
1220 };
1221
1222 my $r = $demo{r} or die;
1223
1224 glDepthMask 1;
1225 glClear GL_DEPTH_BUFFER_BIT;
1226 glEnable GL_TEXTURE_2D;
1227 glEnable GL_DEPTH_TEST;
1228 glEnable GL_CULL_FACE;
1229 glShadeModel $::FAST ? GL_FLAT : GL_SMOOTH;
1230
1231 glMatrixMode GL_PROJECTION;
1232 glLoadIdentity;
1233 glFrustum -1 * ($::WIDTH / $::HEIGHT), 1 * ($::WIDTH / $::HEIGHT), 1, -1, 1, 10000;
1234 #glOrtho 0, $::WIDTH, 0, $::HEIGHT, -10000, 10000;
1235 glMatrixMode GL_MODELVIEW;
1236 glLoadIdentity;
1237
1238 glPushMatrix;
1239 glTranslate 0, 0, -800;
1240 glScale 1, -1, 1;
1241 glRotate $NOW * 1000 % 36000 / 5, 0, 1, 0;
1242 glRotate $NOW * 1000 % 36000 / 6, 1, 0, 0;
1243 glRotate $NOW * 1000 % 36000 / 7, 0, 0, 1;
1244 glScale 50, 50, 50;
1245
1246 glInterleavedArrays GL_T2F_N3F_V3F, 0, $r->{v};
1247 while (my ($k, $v) = each %{$r->{g}}) {
1248 glBindTexture GL_TEXTURE_2D, ($demo{t}{$k}{name} or die);
1249 glDrawElements GL_TRIANGLES, $v->[0], GL_UNSIGNED_SHORT, $v->[1];
1250 }
1251
1252 glPopMatrix;
1253
1254 glShadeModel GL_FLAT;
1255 glDisable GL_DEPTH_TEST;
1256 glDisable GL_TEXTURE_2D;
1257 glDepthMask 0;
1258
1259 $WANT_REFRESH++;
1260};
1261
1262 CFClient::SDL_GL_SwapBuffers; 2088 CFPlus::SDL_GL_SwapBuffers;
1263} 2089}
1264 2090
1265my $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 {
1266 $NOW = time; 2092 $NOW = time;
1267 2093
1268 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_) 2094 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_)
1269 for CFClient::SDL_PollEvent; 2095 for CFPlus::SDL_PollEvent;
1270 2096
1271 if (%animate_object) { 2097 if (%animate_object) {
1272 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object; 2098 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object;
1273 $WANT_REFRESH++; 2099 $WANT_REFRESH++;
1274 } 2100 }
… …
1298 $CONN->face_prefetch 2124 $CONN->face_prefetch
1299 if $CONN; 2125 if $CONN;
1300}); 2126});
1301 2127
1302%SDL_CB = ( 2128%SDL_CB = (
1303 CFClient::SDL_QUIT => sub { 2129 CFPlus::SDL_QUIT => sub {
1304 Event::unloop -1; 2130 exit;
1305 }, 2131 },
1306 CFClient::SDL_VIDEORESIZE => sub { 2132 CFPlus::SDL_VIDEORESIZE => sub {
1307 }, 2133 },
1308 CFClient::SDL_VIDEOEXPOSE => sub { 2134 CFPlus::SDL_VIDEOEXPOSE => sub {
1309 CFClient::UI::full_refresh; 2135 CFPlus::UI::full_refresh;
1310 }, 2136 },
1311 CFClient::SDL_ACTIVEEVENT => sub { 2137 CFPlus::SDL_ACTIVEEVENT => sub {
1312# 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;
1313 }, 2143 },
1314 CFClient::SDL_KEYDOWN => sub { 2144 CFPlus::SDL_KEYDOWN => sub {
1315 if ($_[0]{mod} & CFClient::KMOD_ALT && $_[0]{sym} == 13) { 2145 if ($_[0]{mod} & CFPlus::KMOD_ALT && $_[0]{sym} == 13) {
1316 # alt-enter 2146 # alt-enter
2147 $FULLSCREEN_ENABLE->toggle;
1317 video_shutdown; 2148 video_shutdown;
1318 $CFG->{fullscreen} = !$CFG->{fullscreen};
1319 video_init; 2149 video_init;
1320 } else { 2150 } else {
1321 CFClient::UI::feed_sdl_key_down_event ($_[0]); 2151 CFPlus::UI::feed_sdl_key_down_event ($_[0]);
1322 } 2152 }
1323 }, 2153 },
1324 CFClient::SDL_KEYUP => \&CFClient::UI::feed_sdl_key_up_event, 2154 CFPlus::SDL_KEYUP => \&CFPlus::UI::feed_sdl_key_up_event,
1325 CFClient::SDL_MOUSEMOTION => \&CFClient::UI::feed_sdl_motion_event, 2155 CFPlus::SDL_MOUSEMOTION => \&CFPlus::UI::feed_sdl_motion_event,
1326 CFClient::SDL_MOUSEBUTTONDOWN => \&CFClient::UI::feed_sdl_button_down_event, 2156 CFPlus::SDL_MOUSEBUTTONDOWN => \&CFPlus::UI::feed_sdl_button_down_event,
1327 CFClient::SDL_MOUSEBUTTONUP => \&CFClient::UI::feed_sdl_button_up_event, 2157 CFPlus::SDL_MOUSEBUTTONUP => \&CFPlus::UI::feed_sdl_button_up_event,
1328 CFClient::SDL_USEREVENT => sub { 2158 CFPlus::SDL_USEREVENT => sub {
1329 if ($_[0]{code} == 1) { 2159 if ($_[0]{code} == 1) {
1330 audio_channel_finished $_[0]{data1}; 2160 audio_channel_finished $_[0]{data1};
1331 } elsif ($_[0]{code} == 0) { 2161 } elsif ($_[0]{code} == 0) {
1332 audio_music_finished; 2162 audio_music_finished;
1333 } 2163 }
… …
1337############################################################################# 2167#############################################################################
1338 2168
1339$SIG{INT} = $SIG{TERM} = sub { exit }; 2169$SIG{INT} = $SIG{TERM} = sub { exit };
1340 2170
1341{ 2171{
1342 local $SIG{__DIE__} = sub { CFClient::fatal $_[0] };
1343
1344 CFClient::read_cfg "$Crossfire::VARDIR/pclientrc"; 2172 CFPlus::read_cfg "$Crossfire::VARDIR/cfplusrc";
2173 CFPlus::DB::Server::run;
2174
1345 CFClient::UI::set_layout ($::CFG->{layout}); 2175 CFPlus::UI::set_layout ($::CFG->{layout});
1346 2176
1347 my %DEF_CFG = ( 2177 my %DEF_CFG = (
1348 sdl_mode => 0, 2178 sdl_mode => 0,
1349 width => 640, 2179 width => 640,
1350 height => 480, 2180 height => 480,
1351 fullscreen => 0, 2181 fullscreen => 0,
1352 fast => 0, 2182 fast => 0,
1353 map_scale => 1, 2183 map_scale => 1,
1354 fow_enable => 1, 2184 fow_enable => 1,
1355 fow_intensity => 0.45, 2185 fow_intensity => 0.45,
1356 fow_smooth => 0, 2186 fow_smooth => 0,
2187 map_smoothing => 1,
1357 gui_fontsize => 1, 2188 gui_fontsize => 1,
1358 log_fontsize => 1, 2189 log_fontsize => 0.7,
1359 gauge_fontsize=> 1, 2190 gauge_fontsize => 1,
1360 gauge_size => 0.35, 2191 gauge_size => 0.35,
1361 stat_fontsize => 1, 2192 stat_fontsize => 0.7,
1362 mapsize => 100, 2193 mapsize => 100,
1363 host => "crossfire.schmorp.de",
1364 say_command => 'say', 2194 say_command => 'chat',
1365 audio_enable => 1, 2195 audio_enable => 1,
1366 bgm_enable => 1, 2196 bgm_enable => 1,
1367 bgm_volume => 0.25, 2197 bgm_volume => 0.25,
1368 face_prefetch => 0, 2198 face_prefetch => 0,
1369 output_sync => 1, 2199 output_sync => 1,
1370 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 );
1371 ); 2208
1372
1373 while (my ($k, $v) = each %DEF_CFG) { 2209 while (my ($k, $v) = each %DEF_CFG) {
1374 $CFG->{$k} = $v unless exists $CFG->{$k}; 2210 $CFG->{$k} = $v unless exists $CFG->{$k};
1375 } 2211 }
1376 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
1377 sdl_init; 2228 sdl_init;
1378 2229
1379 @SDL_MODES = reverse 2230 @SDL_MODES = reverse
1380 grep $_->[0] >= 640 && $_->[1] >= 480, 2231 grep $_->[0] >= 640 && $_->[1] >= 480,
1381 CFClient::SDL_ListModes; 2232 CFPlus::SDL_ListModes;
1382 2233
1383 @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)";
1384 2235
1385 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES; 2236 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES;
1386 2237
1387 { 2238 {
1388 my @fonts = map CFClient::find_rcfile "fonts/$_", qw( 2239 my @fonts = map CFPlus::find_rcfile "fonts/$_", qw(
1389 DejaVuSans.ttf 2240 DejaVuSans.ttf
1390 DejaVuSansMono.ttf 2241 DejaVuSansMono.ttf
1391 DejaVuSans-Bold.ttf 2242 DejaVuSans-Bold.ttf
1392 DejaVuSansMono-Bold.ttf 2243 DejaVuSansMono-Bold.ttf
1393 DejaVuSans-Oblique.ttf 2244 DejaVuSans-Oblique.ttf
1394 DejaVuSansMono-Oblique.ttf 2245 DejaVuSansMono-Oblique.ttf
1395 DejaVuSans-BoldOblique.ttf 2246 DejaVuSans-BoldOblique.ttf
1396 DejaVuSansMono-BoldOblique.ttf 2247 DejaVuSansMono-BoldOblique.ttf
1397 ); 2248 );
1398 2249
1399 CFClient::add_font $_ for @fonts; 2250 CFPlus::add_font $_ for @fonts;
1400 2251
1401 CFClient::pango_init; 2252 CFPlus::pango_init;
1402 2253
1403 $FONT_PROP = new_from_file CFClient::Font $fonts[0]; 2254 $FONT_PROP = new_from_file CFPlus::Font $fonts[0];
1404 $FONT_FIXED = new_from_file CFClient::Font $fonts[1]; 2255 $FONT_FIXED = new_from_file CFPlus::Font $fonts[1];
1405 2256
1406 $FONT_PROP->make_default; 2257 $FONT_PROP->make_default;
1407 } 2258 }
1408 2259
1409# compare mono (ft) vs. rgba (cairo) 2260# compare mono (ft) vs. rgba (cairo)
1410# ft - 1.8s, cairo 3s, even in alpha-only mode 2261# ft - 1.8s, cairo 3s, even in alpha-only mode
1411# for my $rgba (0..1) { 2262# for my $rgba (0..1) {
1412# my $t1 = Time::HiRes::time; 2263# my $t1 = Time::HiRes::time;
1413# for (1..1000) { 2264# for (1..1000) {
1414# my $layout = CFClient::Layout->new ($rgba); 2265# my $layout = CFPlus::Layout->new ($rgba);
1415# $layout->set_text ("hallo" x 100); 2266# $layout->set_text ("hallo" x 100);
1416# $layout->render; 2267# $layout->render;
1417# } 2268# }
1418# my $t2 = Time::HiRes::time; 2269# my $t2 = Time::HiRes::time;
1419# warn $t2-$t1; 2270# warn $t2-$t1;
1420# } 2271# }
1421 2272
2273 $startup_done->();
2274
1422 video_init; 2275 video_init;
1423 audio_init; 2276 audio_init;
1424} 2277}
1425 2278
2279show_tip_of_the_day if $CFG->{show_tips};
2280
1426Event::loop; 2281Event::loop;
2282#CFPlus::SDL_Quit;
2283#CFPlus::_exit 0;
1427 2284
1428END { CFClient::SDL_Quit } 2285END {
2286 CFPlus::SDL_Quit;
2287 CFPlus::DB::Server::stop;
2288}
1429 2289
1430=head1 NAME 2290=head1 NAME
1431 2291
1432pclient - A Crossfire+ and Crossfire game client 2292cfplus - A Crossfire+ and Crossfire game client
1433 2293
1434=head1 SYNOPSIS 2294=head1 SYNOPSIS
1435 2295
1436Just run it - no commandline arguments are supported. 2296Just run it - no commandline arguments are supported.
1437 2297
1438=head1 USAGE 2298=head1 USAGE
1439 2299
1440Pclient 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
1441fullscreen and interactively. 2301fullscreen and interactively.
1442 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
1443=head1 AUTHOR 2313=head1 AUTHOR
1444 2314
1445Marc Lehmann <crossfire@schmorp.de>, Robin Redeker <elmex@ta-sa.org> 2315Marc Lehmann <crossfire@schmorp.de>, Robin Redeker <elmex@ta-sa.org>
1446 2316
1447 2317

Diff Legend

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