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.65 by root, Thu Jun 8 01:51:32 2006 UTC vs.
Revision 1.188 by root, Sun Jul 29 03:58:26 2007 UTC

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

Diff Legend

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