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.90 by elmex, Mon Jul 10 06:59:14 2006 UTC vs.
Revision 1.171 by root, Sun Jul 15 21:42:02 2007 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines