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.72 by elmex, Tue Jun 13 18:14:03 2006 UTC vs.
Revision 1.120 by root, Sun Oct 1 14:48:51 2006 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines