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

Diff Legend

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