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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines