ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/bin/cfplus
(Generate patch)

Comparing deliantra/Deliantra-Client/bin/cfplus (file contents):
Revision 1.86 by root, Sun Jul 2 21:07:27 2006 UTC vs.
Revision 1.161 by root, Thu Jul 5 06:57:03 2007 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines