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

Diff Legend

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