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.56 by root, Mon Jun 5 05:23:21 2006 UTC vs.
Revision 1.120 by root, Sun Oct 1 14:48:51 2006 UTC

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

Diff Legend

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