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.78 by root, Fri Jun 23 20:28:20 2006 UTC vs.
Revision 1.171 by root, Sun Jul 15 21:42:02 2007 UTC

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

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines