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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines