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

Diff Legend

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