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.60 by root, Tue Jun 6 02:55:50 2006 UTC vs.
Revision 1.132 by root, Mon Nov 20 16:41:46 2006 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines