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.50 by root, Sat Jun 3 02:32:35 2006 UTC vs.
Revision 1.119 by root, Fri Sep 29 00:56:06 2006 UTC

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

Diff Legend

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