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.36 by elmex, Tue May 30 14:59:26 2006 UTC vs.
Revision 1.147 by root, Fri Apr 6 07:45:35 2007 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines