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.87 by root, Sun Jul 2 21:41:34 2006 UTC vs.
Revision 1.188 by root, Sun Jul 29 03:58:26 2007 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines