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.84 by root, Sun Jul 2 18:52:05 2006 UTC vs.
Revision 1.116 by root, Mon Aug 14 04:15:04 2006 UTC

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

Diff Legend

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