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.11 by root, Fri May 26 18:56:14 2006 UTC vs.
Revision 1.119 by root, Fri Sep 29 00:56:06 2006 UTC

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

Diff Legend

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