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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines