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.78 by root, Fri Jun 23 20:28:20 2006 UTC vs.
Revision 1.117 by elmex, Tue Aug 15 06:30:05 2006 UTC

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

Diff Legend

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