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

Diff Legend

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