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

Diff Legend

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