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.102 by root, Mon Jul 24 04:24:43 2006 UTC vs.
Revision 1.155 by root, Sat May 12 08:13:34 2007 UTC

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

Diff Legend

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