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

Diff Legend

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