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.62 by root, Tue Jun 6 08:35:22 2006 UTC vs.
Revision 1.120 by root, Sun Oct 1 14:48:51 2006 UTC

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

Diff Legend

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