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

Diff Legend

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