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.61 by root, Tue Jun 6 03:05:16 2006 UTC vs.
Revision 1.154 by root, Wed May 9 11:46:49 2007 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines