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.74 by root, Sun Jun 18 17:13:12 2006 UTC vs.
Revision 1.163 by root, Thu Jul 12 17:56:51 2007 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines