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.60 by root, Tue Jun 6 02:55:50 2006 UTC vs.
Revision 1.163 by root, Thu Jul 12 17:56:51 2007 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines