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

Diff Legend

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