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.190 by root, Sun Jul 29 18:56:03 2007 UTC

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

Diff Legend

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