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.45 by elmex, Fri Jun 2 16:52:49 2006 UTC vs.
Revision 1.120 by root, Sun Oct 1 14:48:51 2006 UTC

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

Diff Legend

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