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

Diff Legend

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