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.92 by elmex, Fri Jul 14 17:35:35 2006 UTC vs.
Revision 1.120 by root, Sun Oct 1 14:48:51 2006 UTC

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

Diff Legend

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