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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines