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.52 by root, Mon Jun 5 00:17:47 2006 UTC vs.
Revision 1.117 by elmex, Tue Aug 15 06:30:05 2006 UTC

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

Diff Legend

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