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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines