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.100 by root, Sun Jul 23 16:11:12 2006 UTC vs.
Revision 1.158 by root, Sun Jul 1 03:12:35 2007 UTC

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

Diff Legend

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