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.73 by root, Sat Jun 17 15:07:54 2006 UTC vs.
Revision 1.121 by root, Sun Oct 1 18:17:38 2006 UTC

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

Diff Legend

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