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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines