ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/bin/cfplus
(Generate patch)

Comparing deliantra/Deliantra-Client/bin/cfplus (file contents):
Revision 1.78 by root, Fri Jun 23 20:28:20 2006 UTC vs.
Revision 1.190 by root, Sun Jul 29 18:56:03 2007 UTC

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

Diff Legend

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