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

Diff Legend

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