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

Diff Legend

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