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

Diff Legend

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