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.84 by root, Sun Jul 2 18:52:05 2006 UTC vs.
Revision 1.178 by root, Fri Jul 20 16:32:04 2007 UTC

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

Diff Legend

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