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.56 by root, Mon Jun 5 05:23:21 2006 UTC vs.
Revision 1.116 by root, Mon Aug 14 04:15:04 2006 UTC

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

Diff Legend

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