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.37 by elmex, Wed May 31 10:15:34 2006 UTC vs.
Revision 1.151 by root, Mon Apr 16 21:12:51 2007 UTC

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

Diff Legend

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