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

Diff Legend

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