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

Diff Legend

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