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.81 by elmex, Wed Jun 28 09:42:40 2006 UTC vs.
Revision 1.155 by root, Sat May 12 08:13:34 2007 UTC

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

Diff Legend

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