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.67 by root, Sun Jun 11 18:36:15 2006 UTC vs.
Revision 1.189 by root, Sun Jul 29 18:22:34 2007 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines