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.1 by root, Thu May 25 16:24:45 2006 UTC vs.
Revision 1.60 by root, Tue Jun 6 02:55:50 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; 33use Crossfire::Protocol::Constants;
35 34
36use Compress::LZF; 35use Compress::LZF;
37 36
38use CFClient; 37use CFClient;
38use CFClient::OpenGL ();
39use CFClient::Protocol;
39use CFClient::UI; 40use CFClient::UI;
40use CFClient::MapWidget; 41use CFClient::MapWidget;
41 42
43$SIG{QUIT} = sub { Carp::cluck "QUIT" };
44
42$Event::DIED = sub { 45$Event::DIED = sub {
43 # TODO: display dialog box or so 46 # TODO: display dialog box or so
47 Carp::confess $_[1];#d#TODO: remove when stable
44 CFClient::error $_[1]; 48 CFClient::error $_[1];
45}; 49};
46 50
47#$SIG{__WARN__} = sub { Carp::cluck $_[0] };#d# 51#$SIG{__WARN__} = sub { Carp::cluck $_[0] };#d#
48 52
… …
50 54
51my $MAX_FPS = 60; 55my $MAX_FPS = 60;
52my $MIN_FPS = 5; # unused as of yet 56my $MIN_FPS = 5; # unused as of yet
53 57
54our $META_SERVER = "crossfire.real-time.com:13326"; 58our $META_SERVER = "crossfire.real-time.com:13326";
55
56our $FACEMAP;
57our $TILECACHE;
58our $MAPCACHE;
59 59
60our $LAST_REFRESH; 60our $LAST_REFRESH;
61our $NOW; 61our $NOW;
62 62
63our $CFG; 63our $CFG;
… …
83our $LOGVIEW; 83our $LOGVIEW;
84our $CONSOLE; 84our $CONSOLE;
85our $METASERVER; 85our $METASERVER;
86our $LOGIN_BUTTON; 86our $LOGIN_BUTTON;
87our $QUIT_DIALOG; 87our $QUIT_DIALOG;
88our $HOST_ENTRY;
88 89
90our $SETUP_DIALOG;
91our $SETUP_NOTEBOOK;
92our $SETUP_SERVER;
93our $SETUP_KEYBOARD;
94our $SETUP_SPELLS;
95
96our $STATS_WINDOW;
97our $MESSAGE_WINDOW;
89our $FLOORBOX; 98our $FLOORBOX;
90our $GAUGES; 99our $GAUGES;
91our $STATWIDS; 100our $STATWIDS;
92 101
93our $SDL_ACTIVE; 102our $SDL_ACTIVE;
… …
99 108
100our $ALT_ENTER_MESSAGE; 109our $ALT_ENTER_MESSAGE;
101our $STATUSBOX; 110our $STATUSBOX;
102our $DEBUG_STATUS; 111our $DEBUG_STATUS;
103 112
104our $INVWIN; 113our $INV_WINDOW;
105our $INV; 114our $INV;
106our $INVR; 115our $INVR;
107our $INVR_LBL; 116our $INV_RIGHT_HB;
108our $OPENCONT; 117
118our $BIND_EDITOR;
119
120our $PICKUP_CFG;
109 121
110sub status { 122sub status {
111 $STATUSBOX->add (CFClient::UI::Label::escape $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]); 123 $STATUSBOX->add (CFClient::UI::Label::escape $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]);
112} 124}
113 125
114sub debug { 126sub debug {
115 $DEBUG_STATUS->set_text ($_[0]); 127 $DEBUG_STATUS->set_text ($_[0]);
116 my ($w, $h) = $DEBUG_STATUS->size_request; 128}
117 $DEBUG_STATUS->move ($WIDTH - $w, 0); 129
130sub destroy_query_dialog {
131 (delete $_[0]{query_dialog})->destroy
132 if $_[0]{query_dialog};
133}
134
135# server query dialog
136sub server_query {
137 my ($conn, $flags, $prompt) = @_;
138
139 $conn->{query_dialog} = my $dialog = new CFClient::UI::FancyFrame
140 x => "center",
141 y => "center",
142 title => "Server Query",
143 child => my $vbox = new CFClient::UI::VBox,
144 ;
145
146 my @dialog = my $label = new CFClient::UI::Label
147 max_w => $::WIDTH * 0.4,
148 ellipsise => 0,
149 text => $prompt;
150
151 if ($flags & CS_QUERY_YESNO) {
152 push @dialog, my $hbox = new CFClient::UI::HBox;
153
154 $hbox->add (new CFClient::UI::Button
155 text => "No",
156 on_activate => sub {
157 $conn->send ("reply n");
158 $dialog->destroy;
159 }
160 );
161 $hbox->add (new CFClient::UI::Button
162 text => "Yes",
163 on_activate => sub {
164 $conn->send ("reply y");
165 destroy_query_dialog $conn;
166 },
167 );
168
169 $dialog->focus_in;
170
171 } elsif ($flags & CS_QUERY_SINGLECHAR) {
172 $dialog->{tooltip} = "Press a key (click on the entry to make sure it has keyboard focus)";
173
174 if ($prompt =~ /Now choose a character|Press any key for the next race/i) {
175 $MESSAGE_WINDOW->show;
176
177 unshift @dialog, new CFClient::UI::Label
178 max_w => $::WIDTH * 0.4,
179 ellipsise => 0,
180 markup => "\nOr use your keyboard:\n";
181
182 unshift @dialog, my $table = new CFClient::UI::Table;
183
184 $table->add (0, 0, new CFClient::UI::Button
185 text => "Next Race",
186 on_activate => sub {
187 $conn->send ("reply n");
188 destroy_query_dialog $conn;
189 },
190 );
191 $table->add (2, 0, new CFClient::UI::Button
192 text => "Accept",
193 on_activate => sub {
194 $conn->send ("reply d");
195 destroy_query_dialog $conn;
196 },
197 );
198
199 unshift @dialog, new CFClient::UI::Label
200 max_w => $::WIDTH * 0.4,
201 ellipsise => 0,
202 markup =>
203 "<big><b>Character Creation: Race</b></big>\n\n"
204 . "Look at the <b>Messages</b> window to see a description of this race "
205 . "(<small>or hover with your mouse over the bottommost entry in the status area in the lower left area of the screen</small>) "
206 . "and the center of the screen to see how this race looks like "
207 . "(<small>this is below this dialog window, you may need to click on the display area to make it visible</small>).\n\n"
208 . "You can look at another race, or accept this race (you will come back to this race eventually, "
209 . "so you can take your time making this important choice."
210 ;
211
212 } elsif ($prompt =~ /roll new stats/) {
213 if (my $stat = delete $conn->{stat_change_with}) {
214 $conn->send ("reply $stat");
215 destroy_query_dialog $conn;
216 return;
217 }
218
219 $STATS_WINDOW->show;
220 $MESSAGE_WINDOW->hide;
221
222 unshift @dialog, new CFClient::UI::Label
223 max_w => $::WIDTH * 0.4,
224 ellipsise => 0,
225 markup => "\nOr use your keyboard:\n";
226
227 unshift @dialog, my $table = new CFClient::UI::Table;
228
229 # left: re-roll
230 $table->add (0, 0, new CFClient::UI::Button
231 text => "Roll Again",
232 on_activate => sub {
233 $conn->send ("reply y");
234 destroy_query_dialog $conn;
235 },
236 );
237
238 # center: swap stats
239 my ($sw1, $sw2) = map +(new CFClient::UI::Combobox
240 value => $_,
241 options => [
242 [Str => 1, "Strength ($conn->{stat}{+CS_STAT_STR})"],
243 [Dex => 2, "Dexterity ($conn->{stat}{+CS_STAT_DEX})"],
244 [Con => 3, "Constitution ($conn->{stat}{+CS_STAT_CON})"],
245 [Int => 4, "Intelligence ($conn->{stat}{+CS_STAT_INT})"],
246 [Wis => 5, "Wisdom ($conn->{stat}{+CS_STAT_WIS})"],
247 [Pow => 6, "Power ($conn->{stat}{+CS_STAT_POW})"],
248 [Cha => 7, "Charisma ($conn->{stat}{+CS_STAT_CHA})"],
249 ],
250 ), 1 .. 2;
251
252 $table->add (2, 0, new CFClient::UI::Button
253 text => "Swap Stats",
254 on_activate => sub {
255 $conn->{stat_change_with} = $sw2->{value};
256 $conn->send ("reply $sw1->{value}");
257 destroy_query_dialog $conn;
258 },
259 );
260 $table->add (2, 1, new CFClient::UI::HBox children => [$sw1, $sw2]);
261
262 # right: accept
263 $table->add (4, 0, new CFClient::UI::Button
264 text => "Accept",
265 on_activate => sub {
266 $conn->send ("reply n");
267 $STATS_WINDOW->hide;
268 destroy_query_dialog $conn;
269 },
270 );
271
272 unshift @dialog, new CFClient::UI::Label
273 max_w => $::WIDTH * 0.4,
274 ellipsise => 0,
275 markup =>
276 "<big><b>Character Creation: Stats</b></big>\n\n"
277 . "Look at the <b>Stats</b> window to see your basic stats "
278 . "(first column: 1 strength, 2 dexterity, 3 constitution, 4 intelligence, 5 wisdom, 6 power and 7 charisma).\n\n"
279 . "You can create another set of stats, swap two stat values with each other or accept the stats as they are now and continue. "
280 . "Race selection will influence those values later on."
281 ;
282 }
283
284 push @dialog, my $entry = new CFClient::UI::Entry
285 on_changed => sub {
286 $conn->send ("reply $_[1]");
287 destroy_query_dialog $conn;
288 },
289 ;
290
291 $entry->focus_in;
292
293 } else {
294 $dialog->{tooltip} = "Enter the reply and press return (click on the entry to make sure it has keyboard focus)";
295
296 push @dialog, my $entry = new CFClient::UI::Entry
297 $flags & CS_QUERY_HIDEINPUT ? (hidden => "*") : (),
298 on_activate => sub {
299 $conn->send ("reply $_[1]");
300 destroy_query_dialog $conn;
301 },
302 ;
303
304 $entry->focus_in;
305 }
306
307 $vbox->add (@dialog);
308 $dialog->show;
118} 309}
119 310
120sub start_game { 311sub start_game {
121 status "logging in..."; 312 status "logging in...";
122 313
314 $LOGIN_BUTTON->set_text ("Logout");
315 $SETUP_DIALOG->hide;
316
123 my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32; 317 my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32;
124 318
125 $MAPCACHE = CFClient::db_table "mapcache_$CFG->{host}"; 319 my ($host, $port) = split /:/, $CFG->{host};
320
126 $MAP = new CFClient::Map $mapsize, $mapsize; 321 $MAP = new CFClient::Map $mapsize, $mapsize;
127
128 my ($host, $port) = split /:/, $CFG->{host};
129 322
130 $CONN = eval { 323 $CONN = eval {
131 new conn 324 new CFClient::Protocol
132 host => $host, 325 host => $host,
133 port => $port || 13327, 326 port => $port || 13327,
134 user => $CFG->{user}, 327 user => $CFG->{user},
135 pass => $CFG->{password}, 328 pass => $CFG->{password},
136 mapw => $mapsize, 329 mapw => $mapsize,
137 maph => $mapsize, 330 maph => $mapsize,
138 ; 331
332 map_widget => $MAPWIDGET,
333 logview => $LOGVIEW,
334 statusbox => $STATUSBOX,
335 map => $MAP,
336 mapmap => $MAPMAP,
337 query => \&server_query,
338
339 sound_play => sub {
340 my ($x, $y, $soundnum, $type) = @_;
341
342 $SDL_MIXER
343 or return;
344
345 my $chunk = $AUDIO_CHUNKS{$SOUNDS[$soundnum]}
346 or return;
347
348 $chunk->play;
349 },
139 }; 350 };
140 351
141 if ($CONN) { 352 if ($CONN) {
142 CFClient::lowdelay fileno $CONN->{fh}; 353 CFClient::lowdelay fileno $CONN->{fh};
143 354
144 $LOGIN_BUTTON->set_text ("Logout");
145 status "login successful"; 355 status "login successful";
146
147 $BUTTONBAR->{children}[1]->emit ("activate")
148 if $BUTTONBAR->{children}[1]->{state};
149
150 } else { 356 } else {
151 status "unable to connect"; 357 status "unable to connect";
152 stop_game(); 358 stop_game();
153 } 359 }
154} 360}
155 361
156sub stop_game { 362sub stop_game {
363 $LOGIN_BUTTON->set_text ("Login");
364 $SETUP_NOTEBOOK->set_current_page ($SETUP_SERVER);
365 $SETUP_DIALOG->show;
366 $INV_WINDOW->hide;
367
157 return unless $CONN; 368 return unless $CONN;
158 369
159 status "connection closed"; 370 status "connection closed";
160 $LOGIN_BUTTON->set_text ("Login"); 371
372 destroy_query_dialog $CONN;
161 $CONN->destroy; 373 $CONN->destroy;
162 $CONN = 0; # false, does not autovivify 374 $CONN = 0; # false, does not autovivify
163
164 $BUTTONBAR->{children}[1]->emit ("activate")
165 unless $BUTTONBAR->{children}[1]->{state};
166
167 undef $MAPCACHE;
168 undef $MAP;
169} 375}
170 376
171sub client_setup { 377sub graphics_setup {
172 my $dialog = new CFClient::UI::FancyFrame
173 title => "Client Setup",
174 child => (my $vbox = new CFClient::UI::VBox); 378 my $vbox = new CFClient::UI::VBox;
379
175 $vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]); 380 $vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]);
176 381
177 $table->add (0, 0, new CFClient::UI::Label valign => 0, align => 1, text => "Video Mode"); 382 $table->add (0, 0, new CFClient::UI::Label valign => 0, align => 1, text => "Video Mode");
178 $table->add (1, 0, my $hbox = new CFClient::UI::HBox); 383 $table->add (1, 0, my $hbox = new CFClient::UI::HBox);
179 384
180 $hbox->add (my $mode_slider = new CFClient::UI::Slider expand => 1, req_w => 100, range => [$CFG->{sdl_mode}, 0, $#SDL_MODES, 0, 1]); 385 $hbox->add (my $mode_slider = new CFClient::UI::Slider force_w => $WIDTH * 0.1, expand => 1, range => [$CFG->{sdl_mode}, 0, $#SDL_MODES, 0, 1]);
181 $hbox->add (my $mode_label = new CFClient::UI::Label align => 0, valign => 0, height => 0.8, template => "9999x9999"); 386 $hbox->add (my $mode_label = new CFClient::UI::Label align => 0, valign => 0, height => 0.8, template => "9999x9999");
182 387
183 $mode_slider->connect (changed => sub { 388 $mode_slider->connect (changed => sub {
184 my ($self, $value) = @_; 389 my ($self, $value) = @_;
185 390
… …
192 397
193 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fullscreen"); 398 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fullscreen");
194 $table->add (1, $row++, new CFClient::UI::CheckBox 399 $table->add (1, $row++, new CFClient::UI::CheckBox
195 state => $CFG->{fullscreen}, 400 state => $CFG->{fullscreen},
196 tooltip => "Bring the client into fullscreen mode.", 401 tooltip => "Bring the client into fullscreen mode.",
197 connect_changed => sub { 402 on_changed => sub {
198 my ($self, $value) = @_; 403 my ($self, $value) = @_;
199 $CFG->{fullscreen} = $value; 404 $CFG->{fullscreen} = $value;
200 } 405 }
201 ); 406 );
202 407
203 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fast & Ugly"); 408 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fast & Ugly");
204 $table->add (1, $row++, new CFClient::UI::CheckBox 409 $table->add (1, $row++, new CFClient::UI::CheckBox
205 state => $CFG->{fast}, 410 state => $CFG->{fast},
206 tooltip => "Lower the visual quality considerably to speed up rendering.", 411 tooltip => "Lower the visual quality considerably to speed up rendering.",
207 connect_changed => sub { 412 on_changed => sub {
208 my ($self, $value) = @_; 413 my ($self, $value) = @_;
209 $CFG->{fast} = $value; 414 $CFG->{fast} = $value;
210 } 415 }
211 ); 416 );
212 417
213 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Map Scale"); 418 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Map Scale");
214 $table->add (1, $row++, new CFClient::UI::Slider 419 $table->add (1, $row++, new CFClient::UI::Slider
215 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1], 420 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1],
216 tooltip => "Enlarge or shrink the displayed map. Changes are instant.", 421 tooltip => "Enlarge or shrink the displayed map. Changes are instant.",
217 connect_changed => sub { 422 on_changed => sub {
218 my ($self, $value) = @_; 423 my ($self, $value) = @_;
219 $CFG->{map_scale} = 2 ** $value; 424 $CFG->{map_scale} = 2 ** $value;
220 } 425 }
221 ); 426 );
222 427
223 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fog of War"); 428 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fog of War");
224 $table->add (1, $row++, new CFClient::UI::CheckBox 429 $table->add (1, $row++, new CFClient::UI::CheckBox
225 state => $CFG->{fow_enable}, 430 state => $CFG->{fow_enable},
226 tooltip => "<b>Fog-of-War</b> marks areas that cannot be seen by the player. Changes are instant.", 431 tooltip => "<b>Fog-of-War</b> marks areas that cannot be seen by the player. Changes are instant.",
227 connect_changed => sub { 432 on_changed => sub {
228 my ($self, $value) = @_; 433 my ($self, $value) = @_;
229 $CFG->{fow_enable} = $value; 434 $CFG->{fow_enable} = $value;
230 } 435 }
231 ); 436 );
232 437
233 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "FoW Intensity"); 438 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "FoW Intensity");
234 $table->add (1, $row++, new CFClient::UI::Slider 439 $table->add (1, $row++, new CFClient::UI::Slider
235 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256], 440 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256],
236 tooltip => "<b>Fog of War Lightness.</b> The higher the intensity, the lighter the Fog-of-War color. Changes are instant.", 441 tooltip => "<b>Fog of War Lightness.</b> The higher the intensity, the lighter the Fog-of-War color. Changes are instant.",
237 connect_changed => sub { 442 on_changed => sub {
238 my ($self, $value) = @_; 443 my ($self, $value) = @_;
239 $CFG->{fow_intensity} = $value; 444 $CFG->{fow_intensity} = $value;
240 } 445 }
241 ); 446 );
242 447
243 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "FoW Smooth"); 448 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "FoW Smooth");
244 $table->add (1, $row++, new CFClient::UI::CheckBox 449 $table->add (1, $row++, new CFClient::UI::CheckBox
245 state => $CFG->{fow_smooth}, 450 state => $CFG->{fow_smooth},
246 tooltip => "Smooth the Fog-of-War a bit to make it more realistic. Changes are instant.", 451 tooltip => "Smooth the Fog-of-War a bit to make it more realistic. Changes are instant.",
247 connect_changed => sub { 452 on_changed => sub {
248 my ($self, $value) = @_; 453 my ($self, $value) = @_;
249 $CFG->{fow_smooth} = $value; 454 $CFG->{fow_smooth} = $value;
250 status "Fog of War smoothing requires OpenGL 1.2 or higher" if $CFClient::GL_VERSION < 1.2; 455 status "Fog of War smoothing requires OpenGL 1.2 or higher" if $CFClient::OpenGL::GL_VERSION < 1.2;
251 } 456 }
252 ); 457 );
253 458
254 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "GUI Fontsize"); 459 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "GUI Fontsize");
255 $table->add (1, $row++, new CFClient::UI::Slider 460 $table->add (1, $row++, new CFClient::UI::Slider
256 range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1], 461 range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1],
257 tooltip => "The base font size used by most GUI elements that do not have their own setting.", 462 tooltip => "The base font size used by most GUI elements that do not have their own setting.",
258 connect_changed => sub { $CFG->{gui_fontsize} = $_[1] }, 463 on_changed => sub { $CFG->{gui_fontsize} = $_[1] },
259 ); 464 );
260 465
261 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Message Fontsize"); 466 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Message Fontsize");
262 $table->add (1, $row++, new CFClient::UI::Slider 467 $table->add (1, $row++, new CFClient::UI::Slider
263 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1], 468 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1],
264 tooltip => "The font size used by the <b>message/server log</b> window only. Changes are instant.", 469 tooltip => "The font size used by the <b>message/server log</b> window only. Changes are instant.",
265 connect_changed => sub { $LOGVIEW->set_fontsize ($CFG->{log_fontsize} = $_[1]) }, 470 on_changed => sub { $LOGVIEW->set_fontsize ($CFG->{log_fontsize} = $_[1]) },
266 ); 471 );
267 472
268 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Stats Fontsize"); 473 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Stats Fontsize");
269 474
270 $table->add (1, $row++, new CFClient::UI::Slider 475 $table->add (1, $row++, new CFClient::UI::Slider
271 range => [$CFG->{stat_fontsize}, 0.5, 2, 0, 0.1], 476 range => [$CFG->{stat_fontsize}, 0.5, 2, 0, 0.1],
272 tooltip => "The font size used by the <b>statistics window</b> only. Changes are instant.", 477 tooltip => "The font size used by the <b>statistics window</b> only. Changes are instant.",
273 connect_changed => sub { 478 on_changed => sub {
274 $CFG->{stat_fontsize} = $_[1]; 479 $CFG->{stat_fontsize} = $_[1];
275 &set_stats_window_fontsize; 480 &set_stats_window_fontsize;
276 } 481 }
277 ); 482 );
278 483
279 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Gauge fontsize"); 484 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Gauge fontsize");
280 $table->add (1, $row++, new CFClient::UI::Slider 485 $table->add (1, $row++, new CFClient::UI::Slider
281 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1], 486 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1],
282 tooltip => "Adjusts the fontsize of the gauges at the bottom right. Changes are instant.", 487 tooltip => "Adjusts the fontsize of the gauges at the bottom right. Changes are instant.",
283 connect_changed => sub { 488 on_changed => sub {
284 $CFG->{gauge_fontsize} = $_[1]; 489 $CFG->{gauge_fontsize} = $_[1];
285 &set_gauge_window_fontsize; 490 &set_gauge_window_fontsize;
286 } 491 }
287 ); 492 );
288 493
289 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Gauge size"); 494 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Gauge size");
290 $table->add (1, $row++, new CFClient::UI::Slider 495 $table->add (1, $row++, new CFClient::UI::Slider
291 range => [$CFG->{gauge_size}, 0.2, 0.8], 496 range => [$CFG->{gauge_size}, 0.2, 0.8],
292 tooltip => "Adjust the size of the stats gauges at the bottom right. Changes are instant.", 497 tooltip => "Adjust the size of the stats gauges at the bottom right. Changes are instant.",
293 connect_changed => sub { 498 on_changed => sub {
294 $CFG->{gauge_size} = $_[1]; 499 $CFG->{gauge_size} = $_[1];
295 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size}); 500 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size});
296 } 501 }
297 ); 502 );
298 503
299 $table->add (1, $row++, new CFClient::UI::Button 504 $table->add (1, $row++, new CFClient::UI::Button
300 expand => 1, align => 0, text => "Apply", 505 expand => 1, align => 0, text => "Apply",
301 tooltip => "Apply the video settings", 506 tooltip => "Apply the video settings",
302 connect_activate => sub { 507 on_activate => sub {
303 video_shutdown (); 508 video_shutdown ();
304 video_init (); 509 video_init ();
305 } 510 }
306 ); 511 );
512
513 $vbox
514}
515
516sub audio_setup {
517 my $vbox = new CFClient::UI::VBox;
518
519 $vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]);
520
521 my $row = 0;
307 522
308 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Audio Enable"); 523 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Audio Enable");
309 $table->add (1, $row++, new CFClient::UI::CheckBox 524 $table->add (1, $row++, new CFClient::UI::CheckBox
310 state => $CFG->{audio_enable}, 525 state => $CFG->{audio_enable},
311 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.", 526 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.",
312 connect_changed => sub { 527 on_changed => sub {
313 $CFG->{audio_enable} = $_[1]; 528 $CFG->{audio_enable} = $_[1];
314 } 529 }
315 ); 530 );
316# $table->add (0, 9, new CFClient::UI::Label valign => 0, align => 1, text => "Effects Volume"); 531# $table->add (0, 9, new CFClient::UI::Label valign => 0, align => 1, text => "Effects Volume");
317# $table->add (1, 8, new CFClient::UI::Slider range => [$CFG->{effects_volume}, 0, 128, 1], connect_changed => sub { 532# $table->add (1, 8, new CFClient::UI::Slider range => [$CFG->{effects_volume}, 0, 128, 1], on_changed => sub {
318# $CFG->{effects_volume} = $_[1]; 533# $CFG->{effects_volume} = $_[1];
319# }); 534# });
320 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Background Music"); 535 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Background Music");
321 $table->add (1, $row++, my $hbox = new CFClient::UI::HBox); 536 $table->add (1, $row++, my $hbox = new CFClient::UI::HBox);
322 $hbox->add (new CFClient::UI::CheckBox 537 $hbox->add (new CFClient::UI::CheckBox
323 expand => 1, state => $CFG->{bgm_enable}, 538 expand => 1, state => $CFG->{bgm_enable},
324 tooltip => "If enabled, playing of background music is enabled. If disabled, no background music will be played.", 539 tooltip => "If enabled, playing of background music is enabled. If disabled, no background music will be played.",
325 connect_changed => sub { 540 on_changed => sub {
326 $CFG->{bgm_enable} = $_[1]; 541 $CFG->{bgm_enable} = $_[1];
327 } 542 }
328 ); 543 );
329 $hbox->add (new CFClient::UI::Slider 544 $hbox->add (new CFClient::UI::Slider
330 expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128], 545 expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128],
331 tooltip => "The volume of the background music. Changes are instant.", 546 tooltip => "The volume of the background music. Changes are instant.",
332 connect_changed => sub { 547 on_changed => sub {
333 $CFG->{bgm_volume} = $_[1]; 548 $CFG->{bgm_volume} = $_[1];
334 CFClient::MixMusic::volume $_[1] * 128; 549 CFClient::MixMusic::volume $_[1] * 128;
335 } 550 }
336 ); 551 );
337 552
338 $table->add (1, $row++, new CFClient::UI::Button 553 $table->add (1, $row++, new CFClient::UI::Button
339 expand => 1, align => 0, text => "Apply", 554 expand => 1, align => 0, text => "Apply",
340 tooltip => "Apply the audio settings", 555 tooltip => "Apply the audio settings",
341 connect_activate => sub { 556 on_activate => sub {
342 audio_shutdown (); 557 audio_shutdown ();
343 audio_init (); 558 audio_init ();
344 } 559 }
345 ); 560 );
346 561
347 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Chat Command"); 562 $vbox
348 $table->add (1, $row++, my $saycmd = new CFClient::UI::Entry
349 text => $CFG->{say_command},
350 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. "
351 . "Usually you want to enter something like 'say' or 'shout' or 'gsay' here. "
352 . "But you could also set it to <b>tell <i>playername</i></b> to only chat with that user.",
353 connect_changed => sub {
354 my ($self, $value) = @_;
355 $CFG->{say_command} = $value;
356 }
357 );
358
359 $dialog
360} 563}
361 564
362sub set_stats_window_fontsize { 565sub set_stats_window_fontsize {
363 for (values %{$STATWIDS}) { 566 for (values %{$STATWIDS}) {
364 $_->set_fontsize ($::CFG->{stat_fontsize}); 567 $_->set_fontsize ($::CFG->{stat_fontsize});
… …
373 576
374sub make_gauge_window { 577sub make_gauge_window {
375 my $gh = int $HEIGHT * $CFG->{gauge_size}; 578 my $gh = int $HEIGHT * $CFG->{gauge_size};
376 579
377 my $win = new CFClient::UI::Frame ( 580 my $win = new CFClient::UI::Frame (
378 req_y => -1, 581 force_x => 0,
582 force_y => "max",
379 user_w => $WIDTH, 583 force_w => $WIDTH,
380 user_h => $gh, 584 force_h => $gh,
381 ); 585 );
382 586
383 $win->add (my $hbox = new CFClient::UI::HBox 587 $win->add (my $hbox = new CFClient::UI::HBox
384 children => [ 588 children => [
385 (new CFClient::UI::HBox expand => 1), 589 (new CFClient::UI::HBox expand => 1),
386 (new CFClient::UI::VBox children => [ 590 (new CFClient::UI::VBox children => [
387 (new CFClient::UI::Empty expand => 1), 591 (new CFClient::UI::Empty expand => 1),
388 (new CFClient::UI::Frame bg => [0, 0, 0, 0.4], child => ($FLOORBOX = new CFClient::UI::VBox)), 592 (new CFClient::UI::Frame bg => [0, 0, 0, 0.4], child => ($FLOORBOX = new CFClient::UI::Table)),
389 ]), 593 ]),
390 (my $vbox = new CFClient::UI::VBox), 594 (my $vbox = new CFClient::UI::VBox),
391 ], 595 ],
392 ); 596 );
393 597
… …
421 &set_gauge_window_fontsize; 625 &set_gauge_window_fontsize;
422 626
423 $win 627 $win
424} 628}
425 629
630
426sub make_stats_window { 631sub stats_window {
427 my $tgw = new CFClient::UI::FancyFrame title => "Stats"; 632 my $tgw = new CFClient::UI::FancyFrame
633 y => $HEIGHT * (2/8),
634 x => "max",
635 title => "Stats",
636 name => "stats_window";
428 637
429 $tgw->add (new CFClient::UI::Window child => my $vb = new CFClient::UI::VBox); 638 $tgw->add (new CFClient::UI::Window child => my $vb = new CFClient::UI::VBox);
430 $vb->add ($STATWIDS->{title} = new CFClient::UI::Label valign => 0, align => -1, text => "Title:", expand => 1, 639 $vb->add ($STATWIDS->{title} = new CFClient::UI::Label valign => 0, align => -1, text => "Title:", expand => 1,
431 can_hover => 1, can_events => 1, 640 can_hover => 1, can_events => 1,
432 tooltip => "Your name and title. You can change your title by using the <b>title</b> command, if supported by the server."); 641 tooltip => "Your name and title. You can change your title by using the <b>title</b> command, if supported by the server.");
433 $vb->add ($STATWIDS->{map} = new CFClient::UI::Label valign => 0, align => -1, text => "Map:", expand => 1, 642 $vb->add ($STATWIDS->{map} = new CFClient::UI::Label valign => 0, align => -1, text => "Map:", expand => 1,
434 can_hover => 1, can_events => 1, 643 can_hover => 1, can_events => 1,
435 tooltip => "The map you are currently on (if supported by the server)."); 644 tooltip => "The map you are currently on (if supported by the server).");
645
646 $vb->add (my $hb0 = new CFClient::UI::HBox);
647 $hb0->add ($STATWIDS->{weight} = new CFClient::UI::Label valign => 0, align => -1, text => "Weight:", expand => 1,
648 can_hover => 1, can_events => 1,
649 tooltip => "The weight of the player including all inventory items.");
650 $hb0->add ($STATWIDS->{m_weight} = new CFClient::UI::Label valign => 0, align => -1, text => "Max weight:", expand => 1,
651 can_hover => 1, can_events => 1,
652 tooltip => "The weight limit: you cannot carry more than this.");
653
436 654
437 $vb->add (my $hb = new CFClient::UI::HBox expand => 1); 655 $vb->add (my $hb = new CFClient::UI::HBox expand => 1);
438 $hb->add (my $tbl = new CFClient::UI::Table expand => 1); 656 $hb->add (my $tbl = new CFClient::UI::Table expand => 1);
439 657
440 my $color2 = [1, 1, 0]; 658 my $color2 = [1, 1, 0];
… …
522 update_stats_window ({}); 740 update_stats_window ({});
523 741
524 $tgw 742 $tgw
525} 743}
526 744
527sub formsep { 745sub formsep($) {
528 reverse join ",", grep length, split /(...)/, reverse $_[0] * 1 746 scalar reverse join ",", unpack "(A3)*", reverse $_[0] * 1
529} 747}
530 748
531sub update_stats_window { 749sub update_stats_window {
532 my ($stats) = @_; 750 my ($stats) = @_;
533 751
534 # i love text protocols!!! 752 # I love text protocols...
753
535 my $hp = $stats->{Crossfire::Protocol::CS_STAT_HP} * 1; 754 my $hp = $stats->{+CS_STAT_HP} * 1;
536 my $hp_m = $stats->{Crossfire::Protocol::CS_STAT_MAXHP} * 1; 755 my $hp_m = $stats->{+CS_STAT_MAXHP} * 1;
537 my $sp = $stats->{Crossfire::Protocol::CS_STAT_SP} * 1; 756 my $sp = $stats->{+CS_STAT_SP} * 1;
538 my $sp_m = $stats->{Crossfire::Protocol::CS_STAT_MAXSP} * 1; 757 my $sp_m = $stats->{+CS_STAT_MAXSP} * 1;
539 my $fo = $stats->{Crossfire::Protocol::CS_STAT_FOOD} * 1; 758 my $fo = $stats->{+CS_STAT_FOOD} * 1;
540 my $fo_m = 999; 759 my $fo_m = 999;
541 my $gr = $stats->{Crossfire::Protocol::CS_STAT_GRACE} * 1; 760 my $gr = $stats->{+CS_STAT_GRACE} * 1;
542 my $gr_m = $stats->{Crossfire::Protocol::CS_STAT_MAXGRACE} * 1; 761 my $gr_m = $stats->{+CS_STAT_MAXGRACE} * 1;
543 762
544 $GAUGES->{hp} ->set_value ($hp, $hp_m); 763 $GAUGES->{hp} ->set_value ($hp, $hp_m);
545 $GAUGES->{mana} ->set_value ($sp, $sp_m); 764 $GAUGES->{mana} ->set_value ($sp, $sp_m);
546 $GAUGES->{food} ->set_value ($fo, $fo_m); 765 $GAUGES->{food} ->set_value ($fo, $fo_m);
547 $GAUGES->{grace} ->set_value ($gr, $gr_m); 766 $GAUGES->{grace} ->set_value ($gr, $gr_m);
548 $GAUGES->{exp} ->set_text ("Exp: " . (formsep $stats->{Crossfire::Protocol::CS_STAT_EXP64}) 767 $GAUGES->{exp} ->set_text ("Exp: " . (formsep $stats->{+CS_STAT_EXP64})
549 . " (lvl " . ($stats->{Crossfire::Protocol::CS_STAT_LEVEL} * 1) . ")"); 768 . " (lvl " . ($stats->{+CS_STAT_LEVEL} * 1) . ")");
550 my $rng = $stats->{Crossfire::Protocol::CS_STAT_RANGE}; 769 my $rng = $stats->{+CS_STAT_RANGE};
551 $rng =~ s/^Range: //; # thank you so much dear server 770 $rng =~ s/^Range: //; # thank you so much dear server
552 $GAUGES->{range} ->set_text ("Rng: " . $rng); 771 $GAUGES->{range} ->set_text ("Rng: " . $rng);
553 my $title = $stats->{Crossfire::Protocol::CS_STAT_TITLE}; 772 my $title = $stats->{+CS_STAT_TITLE};
554 $title =~ s/^Player: //; 773 $title =~ s/^Player: //;
555 $STATWIDS->{title} ->set_text ("Title: " . $title); 774 $STATWIDS->{title} ->set_text ("Title: " . $title);
556 775
557 $STATWIDS->{st_str} ->set_text (sprintf "%d", $stats->{5}); 776 $STATWIDS->{st_str} ->set_text (sprintf "%d" , $stats->{+CS_STAT_STR});
558 $STATWIDS->{st_dex} ->set_text (sprintf "%d", $stats->{8}); 777 $STATWIDS->{st_dex} ->set_text (sprintf "%d" , $stats->{+CS_STAT_DEX});
559 $STATWIDS->{st_con} ->set_text (sprintf "%d", $stats->{9}); 778 $STATWIDS->{st_con} ->set_text (sprintf "%d" , $stats->{+CS_STAT_CON});
560 $STATWIDS->{st_int} ->set_text (sprintf "%d", $stats->{6}); 779 $STATWIDS->{st_int} ->set_text (sprintf "%d" , $stats->{+CS_STAT_INT});
561 $STATWIDS->{st_wis} ->set_text (sprintf "%d", $stats->{7}); 780 $STATWIDS->{st_wis} ->set_text (sprintf "%d" , $stats->{+CS_STAT_WIS});
562 $STATWIDS->{st_pow} ->set_text (sprintf "%d", $stats->{22}); 781 $STATWIDS->{st_pow} ->set_text (sprintf "%d" , $stats->{+CS_STAT_POW});
563 $STATWIDS->{st_cha} ->set_text (sprintf "%d", $stats->{10}); 782 $STATWIDS->{st_cha} ->set_text (sprintf "%d" , $stats->{+CS_STAT_CHA});
564 $STATWIDS->{st_wc} ->set_text (sprintf "%d", $stats->{13}); 783 $STATWIDS->{st_wc} ->set_text (sprintf "%d" , $stats->{+CS_STAT_WC});
565 $STATWIDS->{st_ac} ->set_text (sprintf "%d", $stats->{14}); 784 $STATWIDS->{st_ac} ->set_text (sprintf "%d" , $stats->{+CS_STAT_AC});
566 $STATWIDS->{st_dam} ->set_text (sprintf "%d", $stats->{15}); 785 $STATWIDS->{st_dam} ->set_text (sprintf "%d" , $stats->{+CS_STAT_DAM});
567 $STATWIDS->{st_arm} ->set_text (sprintf "%d", $stats->{16}); 786 $STATWIDS->{st_arm} ->set_text (sprintf "%d" , $stats->{+CS_STAT_ARMOUR});
568 $STATWIDS->{st_spd} ->set_text (sprintf "%.1f", $stats->{Crossfire::Protocol::CS_STAT_SPEED}); 787 $STATWIDS->{st_spd} ->set_text (sprintf "%.1f", $stats->{+CS_STAT_SPEED});
569 $STATWIDS->{st_wspd}->set_text (sprintf "%.1f", $stats->{Crossfire::Protocol::CS_STAT_WEAP_SP}); 788 $STATWIDS->{st_wspd}->set_text (sprintf "%.1f", $stats->{+CS_STAT_WEAP_SP});
570 789
790 $STATWIDS->{m_weight}->set_text (sprintf "Max weight: %.1fkg", $stats->{+CS_STAT_WEIGHT_LIM} / 1000);
791
792 # TODO: replace by CS_STAT_RES_xxx constants
571 my %tbl = ( 793 my %tbl = (
572 phys => 100, 794 phys => 100,
573 magic => 101, 795 magic => 101,
574 fire => 102, 796 fire => 102,
575 elec => 103, 797 elec => 103,
… …
584 tund => 112, 806 tund => 112,
585 fear => 113, 807 fear => 113,
586 depl => 113, 808 depl => 113,
587 deat => 115, 809 deat => 115,
588 holyw => 116, 810 holyw => 116,
589 blind => 117 811 blind => 117,
590 ); 812 );
591 813
592 for (keys %tbl) {
593 $STATWIDS->{"res_$_"}->set_text (sprintf "%d%", $stats->{$tbl{$_}}); 814 $STATWIDS->{"res_$_"}->set_text (sprintf "%d%", $stats->{$tbl{$_}})
594 } 815 for keys %tbl;
595
596}
597
598sub metaserver_dialog {
599 my $dialog = new CFClient::UI::FancyFrame
600 title => "Server List",
601 child => (my $vbox = new CFClient::UI::VBox);
602
603 $vbox->add ($dialog->{table} = new CFClient::UI::Table);
604
605 $dialog
606} 816}
607 817
608my $METASERVER_ATIME; 818my $METASERVER_ATIME;
609 819
610sub update_metaserver { 820sub update_metaserver {
611 my ($HOST) = @_;
612
613 return if $METASERVER_ATIME > time; 821 return if $METASERVER_ATIME > time;
614 $METASERVER_ATIME = time + 60; 822 $METASERVER_ATIME = time + 60;
615 823
616 my $table = $METASERVER->{table}; 824 my $table = $METASERVER->{table};
617 $table->clear; 825 $table->clear;
… …
668 $m = [$users, $host, $uptime, $version, $desc]; 876 $m = [$users, $host, $uptime, $version, $desc];
669 877
670 $y++; 878 $y++;
671 879
672 $table->add (0, $y, new CFClient::UI::VBox children => [ 880 $table->add (0, $y, new CFClient::UI::VBox children => [
673 (new CFClient::UI::Button text => "Use", connect_activate => sub { 881 (new CFClient::UI::Button text => "Use", on_activate => sub {
674 $HOST->set_text ($CFG->{host} = $host); 882 $HOST_ENTRY->set_text ($CFG->{host} = $host);
883 $METASERVER->toggle_visibility;
675 }), 884 }),
676 (new CFClient::UI::Empty expand => 1), 885 (new CFClient::UI::Empty expand => 1),
677 ]); 886 ]);
678 887
679 $table->add ($_ + 1, $y, new CFClient::UI::Label 888 $table->add ($_ + 1, $y, new CFClient::UI::Label
… …
682 } 891 }
683 } 892 }
684 }); 893 });
685} 894}
686 895
896sub metaserver_dialog {
897 my $dialog = new CFClient::UI::FancyFrame
898 title => "Server List",
899 name => 'metaserver_dialog',
900 x => 'center',
901 y => 'center',
902 z => 3,
903 child => (my $vbox = new CFClient::UI::VBox),
904 on_visibility_change => sub {
905 update_metaserver if $_[1];
906 },
907 ;
908
909 $vbox->add ($dialog->{table} = new CFClient::UI::Table);
910
911 $dialog
912}
913
687sub server_setup { 914sub server_setup {
688 my $dialog = new CFClient::UI::FancyFrame
689 title => "Server Setup",
690 child => (my $vbox = new CFClient::UI::VBox); 915 my $vbox = new CFClient::UI::VBox;
691 916
692 $vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]); 917 $vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]);
693 $table->add (0, 2, new CFClient::UI::Label valign => 0, align => 1, text => "Host:Port"); 918 $table->add (0, 2, new CFClient::UI::Label valign => 0, align => 1, text => "Host:Port");
694 919
695 { 920 {
696 $table->add (1, 2, my $vbox = new CFClient::UI::VBox); 921 $table->add (1, 2, my $vbox = new CFClient::UI::VBox);
697 922
698 $vbox->add ( 923 $vbox->add (
699 my $HOST = new CFClient::UI::Entry 924 $HOST_ENTRY = new CFClient::UI::Entry
700 expand => 1, 925 expand => 1,
701 text => $CFG->{host}, 926 text => $CFG->{host},
702 tooltip => "The hostname or ip address of the Crossfire(+) server to connect to", 927 tooltip => "The hostname or ip address of the Crossfire(+) server to connect to",
703 connect_changed => sub { 928 on_changed => sub {
704 my ($self, $value) = @_; 929 my ($self, $value) = @_;
705 $CFG->{host} = $value; 930 $CFG->{host} = $value;
706 } 931 }
707 ); 932 );
708 933
709 $METASERVER = metaserver_dialog; 934 $METASERVER = metaserver_dialog;
710 935
711 $vbox->add (new CFClient::UI::Flopper 936 $vbox->add (new CFClient::UI::Button
712 expand => 1, 937 expand => 1,
713 text => "Server List", 938 text => "Server List",
714 other => $METASERVER, 939 other => $METASERVER,
715 tooltip => "Show a list of available crossfire servers", 940 tooltip => "Show a list of available crossfire servers",
716 connect_open => sub { 941 on_activate => sub { $METASERVER->toggle_visibility },
717 update_metaserver $HOST;
718 }
719 ); 942 );
720 } 943 }
721 944
722 $table->add (0, 4, new CFClient::UI::Label valign => 0, align => 1, text => "Username"); 945 $table->add (0, 4, new CFClient::UI::Label valign => 0, align => 1, text => "Username");
723 $table->add (1, 4, new CFClient::UI::Entry 946 $table->add (1, 4, new CFClient::UI::Entry
724 text => $CFG->{user}, 947 text => $CFG->{user},
725 tooltip => "The name of your character on the server", 948 tooltip => "The name of your character on the server",
726 connect_changed => sub { 949 on_changed => sub {
727 my ($self, $value) = @_; 950 my ($self, $value) = @_;
728 $CFG->{user} = $value; 951 $CFG->{user} = $value;
729 } 952 }
730 ); 953 );
731 954
732 $table->add (0, 5, new CFClient::UI::Label valign => 0, align => 1, text => "Password"); 955 $table->add (0, 5, new CFClient::UI::Label valign => 0, align => 1, text => "Password");
733 $table->add (1, 5, new CFClient::UI::Entry 956 $table->add (1, 5, new CFClient::UI::Entry
734 text => $CFG->{password}, 957 text => $CFG->{password},
735 hidden => 1, 958 hidden => 1,
736 tooltip => "The password for your character", 959 tooltip => "The password for your character",
737 connect_changed => sub { 960 on_changed => sub {
738 my ($self, $value) = @_; 961 my ($self, $value) = @_;
739 $CFG->{password} = $value; 962 $CFG->{password} = $value;
740 } 963 }
741 ); 964 );
742 965
743 $table->add (0, 7, new CFClient::UI::Label valign => 0, align => 1, text => "Map Size"); 966 $table->add (0, 7, new CFClient::UI::Label valign => 0, align => 1, text => "Map Size");
744 $table->add (1, 7, new CFClient::UI::Slider 967 $table->add (1, 7, new CFClient::UI::Slider
745 req_w => 100, 968 force_w => 100,
746 range => [$CFG->{mapsize}, 10, 100, 0, 1], 969 range => [$CFG->{mapsize}, 10, 100, 0, 1],
747 tooltip => "This is the size of the portion of the map update the server sends you. " 970 tooltip => "This is the size of the portion of the map update the server sends you. "
748 . "If you set this to a high value you will be able to see further, " 971 . "If you set this to a high value you will be able to see further, "
749 . "but you also increase bandwidth requirements and latency. " 972 . "but you also increase bandwidth requirements and latency. "
750 . "This option is only used once at log-in.", 973 . "This option is only used once at log-in.",
751 connect_changed => sub { 974 on_changed => sub {
752 my ($self, $value) = @_; 975 my ($self, $value) = @_;
753 976
754 $CFG->{mapsize} = $self->{range}[0] = $value = int $value; 977 $CFG->{mapsize} = $self->{range}[0] = $value = int $value;
755 }, 978 },
756 ); 979 );
… …
763 . "This might increase or create lag, but increases the chances " 986 . "This might increase or create lag, but increases the chances "
764 . "of faces being ready for display when you encounter them. " 987 . "of faces being ready for display when you encounter them. "
765 . "It also uses up server bandwidth on every connect, " 988 . "It also uses up server bandwidth on every connect, "
766 . "so only set it if you really need to prefetch images. " 989 . "so only set it if you really need to prefetch images. "
767 . "This option can be set and unset any time.", 990 . "This option can be set and unset any time.",
768 connect_changed => sub { $CFG->{face_prefetch} = $_[1] }, 991 on_changed => sub { $CFG->{face_prefetch} = $_[1] },
769 ); 992 );
770 993
771 $table->add (0, 9, new CFClient::UI::Label valign => 0, align => 1, text => "Output-Count"); 994 $table->add (0, 9, new CFClient::UI::Label valign => 0, align => 1, text => "Output-Count");
772 $table->add (1, 9, new CFClient::UI::Entry 995 $table->add (1, 9, new CFClient::UI::Entry
773 text => $CFG->{output_count}, 996 text => $CFG->{output_count},
774 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.", 997 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.",
775 connect_changed => sub { $CFG->{output_count} = $_[1] }, 998 on_changed => sub { $CFG->{output_count} = $_[1] },
776 ); 999 );
777 1000
778 $table->add (0, 10, new CFClient::UI::Label valign => 0, align => 1, text => "Output-Sync"); 1001 $table->add (0, 10, new CFClient::UI::Label valign => 0, align => 1, text => "Output-Sync");
779 $table->add (1, 10, new CFClient::UI::Entry 1002 $table->add (1, 10, new CFClient::UI::Entry
780 text => $CFG->{output_sync}, 1003 text => $CFG->{output_sync},
781 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.", 1004 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.",
782 connect_changed => sub { $CFG->{output_sync} = $_[1] }, 1005 on_changed => sub { $CFG->{output_sync} = $_[1] },
783 ); 1006 );
784 1007
785 $table->add (1, 11, $LOGIN_BUTTON = new CFClient::UI::Button 1008 $table->add (1, 11, $LOGIN_BUTTON = new CFClient::UI::Button
786 expand => 1, 1009 expand => 1,
787 align => 0, 1010 align => 0,
788 text => "Login", 1011 text => "Login",
789 connect_activate => sub { 1012 on_activate => sub {
790 $CONN ? stop_game 1013 $CONN ? stop_game
791 : start_game; 1014 : start_game;
792 }, 1015 },
793 ); 1016 );
794 1017
795 $dialog 1018 $table->add (0, 12, new CFClient::UI::Label valign => 0, align => 1, text => "Chat Command");
1019 $table->add (1, 12, my $saycmd = new CFClient::UI::Entry
1020 text => $CFG->{say_command},
1021 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. "
1022 . "Usually you want to enter something like 'say' or 'shout' or 'gsay' here. "
1023 . "But you could also set it to <b>tell <i>playername</i></b> to only chat with that user.",
1024 on_changed => sub {
1025 my ($self, $value) = @_;
1026 $CFG->{say_command} = $value;
1027 }
1028 );
1029
1030 $vbox
796} 1031}
797 1032
798sub message_window { 1033sub message_window {
799 my $window = new CFClient::UI::FancyFrame 1034 my $window = new CFClient::UI::FancyFrame
1035 name => "message_window",
800 title => "Messages", 1036 title => "Messages",
801 border_bg => [1, 1, 1, 1], 1037 border_bg => [1, 1, 1, 1],
802 bg => [0, 0, 0, 0.75], 1038 bg => [0, 0, 0, 0.75],
803 user_w => int $::WIDTH / 3, 1039 x => "max",
1040 y => 0,
1041 force_w => $::WIDTH * 0.4,
804 user_h => int $::HEIGHT / 5, 1042 force_h => $::HEIGHT * 0.5,
805 child => (my $vbox = new CFClient::UI::VBox); 1043 child => (my $vbox = new CFClient::UI::VBox);
806 1044
807 $vbox->add ($LOGVIEW); 1045 $vbox->add ($LOGVIEW);
808 1046
809 $vbox->add (my $input = new CFClient::UI::Entry 1047 $vbox->add (my $input = new CFClient::UI::Entry
810 tooltip => "<b>Chat Box</b>. If you enter a text and press return/enter here, the current <i>communication command</i> " 1048 tooltip => "<b>Chat Box</b>. If you enter a text and press return/enter here, the current <i>communication command</i> "
811 . "from the client setup will be prepended (e.g. <b>shout</b>, <b>chat</b>...). " 1049 . "from the client setup will be prepended (e.g. <b>shout</b>, <b>chat</b>...). "
812 . "If you prepend a slash (/), you will submit a command instead (similar to IRC). " 1050 . "If you prepend a slash (/), you will submit a command instead (similar to IRC). "
813 . "A better way to submit commands (and the occasional chat command) is often the map command completer.", 1051 . "A better way to submit commands (and the occasional chat command) is often the map command completer.",
814 connect_focus_in => sub { 1052 on_focus_in => sub {
815 my ($input, $prev_focus) = @_; 1053 my ($input, $prev_focus) = @_;
816 1054
817 delete $input->{refocus_map}; 1055 delete $input->{refocus_map};
818 1056
819 if ($prev_focus == $MAPWIDGET && $input->{auto_activated}) { 1057 if ($prev_focus == $MAPWIDGET && $input->{auto_activated}) {
820 $input->{refocus_map} = 1; 1058 $input->{refocus_map} = 1;
821 } 1059 }
822 delete $input->{auto_activated}; 1060 delete $input->{auto_activated};
823 }, 1061 },
824 connect_activate => sub { 1062 on_activate => sub {
825 my ($input, $text) = @_; 1063 my ($input, $text) = @_;
826 $input->set_text (''); 1064 $input->set_text ('');
827 1065
828 if ($text =~ /^\/(.*)/) { 1066 if ($text =~ /^\/(.*)/) {
829 $::CONN->user_send ($1); 1067 $::CONN->user_send ($1);
… …
834 if ($input->{refocus_map}) { 1072 if ($input->{refocus_map}) {
835 delete $input->{refocus_map}; 1073 delete $input->{refocus_map};
836 $MAPWIDGET->focus_in 1074 $MAPWIDGET->focus_in
837 } 1075 }
838 }, 1076 },
839 connect_escape => sub { 1077 on_escape => sub {
840 $MAPWIDGET->focus_in 1078 $MAPWIDGET->focus_in
841 }, 1079 },
842 ); 1080 );
843 1081
844 $CONSOLE = { 1082 $CONSOLE = {
845 window => $window, 1083 window => $window,
846 input => $input 1084 input => $input,
847 }; 1085 };
848 1086
849 $window 1087 $window
850} 1088}
851 1089
852sub open_quit_dialog { 1090sub open_quit_dialog {
853 unless ($QUIT_DIALOG) { 1091 unless ($QUIT_DIALOG) {
854
855 $QUIT_DIALOG = new CFClient::UI::FancyFrame title => "Really Quit?"; 1092 $QUIT_DIALOG = new CFClient::UI::FancyFrame
1093 x => "center",
1094 y => "center",
1095 z => 50,
1096 title => "Really Quit?",
1097 ;
856 1098
857 $QUIT_DIALOG->add (my $vb = new CFClient::UI::VBox expand => 1); 1099 $QUIT_DIALOG->add (my $vb = new CFClient::UI::VBox expand => 1);
858 1100
859 $vb->add (new CFClient::UI::Label 1101 $vb->add (new CFClient::UI::Label
860 text => "You should find a savebed and apply it first!", 1102 text => "You should find a savebed and apply it first!",
… …
863 ); 1105 );
864 $vb->add (my $hb = new CFClient::UI::HBox expand => 1); 1106 $vb->add (my $hb = new CFClient::UI::HBox expand => 1);
865 $hb->add (new CFClient::UI::Button 1107 $hb->add (new CFClient::UI::Button
866 text => "Ok", 1108 text => "Ok",
867 expand => 1, 1109 expand => 1,
868 connect_activate => sub { $QUIT_DIALOG->hide }, 1110 on_activate => sub { $QUIT_DIALOG->hide },
869 ); 1111 );
870 $hb->add (new CFClient::UI::Button 1112 $hb->add (new CFClient::UI::Button
871 text => "Quit anyway", 1113 text => "Quit anyway",
872 expand => 1, 1114 expand => 1,
873 connect_activate => sub { exit }, 1115 on_activate => sub { exit },
874 ); 1116 );
875
876 $QUIT_DIALOG->show_centered;
877 } else {
878 $QUIT_DIALOG->show_centered;
879 } 1117 }
880}
881 1118
1119 $QUIT_DIALOG->show;
1120}
1121
1122sub autopickup_setup {
1123 my $table = new CFClient::UI::Table;
1124
1125 for (
1126 ["General", 0, 0,
1127 ["Enable autopickup" => PICKUP_NEWMODE],
1128 ["Inhibit autopickup" => PICKUP_INHIBIT],
1129 ["Stop before pickup" => PICKUP_STOP],
1130 ["Debug autopickup" => PICKUP_DEBUG],
1131 ],
1132 ["Weapons", 0, 6,
1133 ["All weapons" => PICKUP_ALLWEAPON],
1134 ["Missile weapons" => PICKUP_MISSILEWEAPON],
1135 ["Bows" => PICKUP_BOW],
1136 ["Arrows" => PICKUP_ARROW],
1137 ],
1138 ["Armour", 0, 12,
1139 ["Helmets" => PICKUP_HELMET],
1140 ["Shields" => PICKUP_SHIELD],
1141 ["Body Armour" => PICKUP_ARMOUR],
1142 ["Boots" => PICKUP_BOOTS],
1143 ["Gloves" => PICKUP_GLOVES],
1144 ["Cloaks" => PICKUP_CLOAK],
1145 ],
1146
1147 ["Readables", 2, 2,
1148 ["Spellbooks" => PICKUP_SPELLBOOK],
1149 ["Skillscrolls" => PICKUP_SKILLSCROLL],
1150 ["Normal Books/Scrolls" => PICKUP_READABLES],
1151 ],
1152 ["Misc", 2, 7,
1153 ["Food" => PICKUP_FOOD],
1154 ["Drinks" => PICKUP_DRINK],
1155 ["Valuables (Money, Gems)" => PICKUP_VALUABLES],
1156 ["Keys" => PICKUP_KEY],
1157 ["Magical Items" => PICKUP_MAGICAL],
1158 ["Potions" => PICKUP_POTION],
1159 ["Magic Devices" => PICKUP_MAGIC_DEVICE],
1160 ["Ignore cursed" => PICKUP_NOT_CURSED],
1161 ["Jewelery" => PICKUP_JEWELS],
1162 ],
1163 )
1164 {
1165 my ($title, $x, $y, @bits) = @$_;
1166 $table->add ($x, $y, new CFClient::UI::Label text => $title, align => 1, fg => [1, 1, 0]);
1167
1168 for (@bits) {
1169 ++$y;
1170
1171 my $mask = $_->[1];
1172 $table->add ($x , $y, new CFClient::UI::Label text => $_->[0], align => 1, expand => 1);
1173 $table->add ($x+1, $y, new CFClient::UI::CheckBox
1174 state => $CFG->{pickup} & $mask,
1175 on_changed => sub {
1176 my ($box, $value) = @_;
1177 if ($value) {
1178 $::CFG->{pickup} |= $mask;
1179 } else {
1180 $::CFG->{pickup} = $::CFG->{pickup} & ~$mask;
1181 }
1182 $::CONN->send (sprintf "command pickup %u", $::CFG->{pickup})
1183 if defined $::CONN;
1184 });
1185 }
1186 }
1187
1188 $table
1189}
1190
882sub make_inventory_window { 1191sub inventory_window {
883 my $invwin = new CFClient::UI::FancyFrame 1192 my $invwin = $INV_WINDOW = new CFClient::UI::FancyFrame
884 user_w => $WIDTH * (7/8), user_h => $HEIGHT * (7/8), title => "Inventory"; 1193 x => "center",
1194 y => "center",
1195 force_w => $WIDTH * 9/10,
1196 force_h => $HEIGHT * 9/10,
1197 title => "Inventory",
1198 ;
885 1199
886 $invwin->add (my $hb = new CFClient::UI::HBox expand => 1); 1200 $invwin->add (my $hb = new CFClient::UI::HBox homogeneous => 1);
887 1201
888 $hb->add (my $vb1 = new CFClient::UI::VBox expand => 1); 1202 $hb->add (my $vb1 = new CFClient::UI::VBox);
889 $vb1->add (my $lbl = new CFClient::UI::Label); 1203 $vb1->add (new CFClient::UI::Label align => 0, text => "Player");
890 $lbl->set_text ("Player");
891 $vb1->add ($INV = new CFClient::UI::Inventory expand => 1); 1204 $vb1->add ($INV = new CFClient::UI::Inventory expand => 1);
892 1205
893 $hb->add (my $vb2 = new CFClient::UI::VBox expand => 1); 1206 $hb->add (my $vb2 = new CFClient::UI::VBox);
1207
894 $vb2->add ($INVR_LBL = new CFClient::UI::Label); 1208 $vb2->add ($INV_RIGHT_HB = new CFClient::UI::HBox);
895 $INVR_LBL->set_text ("Floor"); 1209
896 $vb2->add ($INVR = new CFClient::UI::Inventory expand => 1); 1210 $vb2->add ($INVR = new CFClient::UI::Inventory expand => 1);
897 1211
1212 # XXX: Call after $INVR = ... because set_opencont sets the items
1213 CFClient::Protocol::set_opencont ($::CONN, 0, "Floor");
1214
898 $invwin 1215 $invwin
1216}
1217
1218sub spell_setup {
1219 new CFClient::UI::SpellList
1220}
1221
1222sub keyboard_setup {
1223 my $binding_list = new CFClient::UI::VBox;
1224
1225 my $refresh;
1226 $refresh = sub {
1227 $binding_list->clear ();
1228
1229 for my $mod (keys %{$::CFG->{bindings}}) {
1230 for my $sym (keys %{$::CFG->{bindings}->{$mod}}) {
1231 my $cmds = $::CFG->{bindings}->{$mod}->{$sym};
1232 next unless ref $cmds eq 'ARRAY' and @$cmds > 0;
1233
1234 my $lbl = join "; ", @$cmds;
1235 my $nam = CFClient::Binder::keycombo_to_name ($mod, $sym);
1236 $binding_list->add (my $hb = new CFClient::UI::HBox);
1237 $hb->add (new CFClient::UI::Button
1238 text => "delete",
1239 tooltip => "Deletes the binding",
1240 on_activate => sub {
1241 $binding_list->remove ($hb);
1242 delete $::CFG->{bindings}->{$mod}->{$sym};
1243 });
1244
1245 $hb->add (new CFClient::UI::Button
1246 text => "edit",
1247 tooltip => "Edits the binding",
1248 on_activate => sub {
1249 $::BIND_EDITOR->set_binding (
1250 $mod, $sym, $::CFG->{bindings}->{$mod}->{$sym},
1251 sub {
1252 my ($nmod, $nsym, $ncmds) = @_;
1253 delete $::CFG->{bindings}->{$mod}->{$sym};
1254 $::CFG->{bindings}->{$nmod}->{$nsym} = $ncmds;
1255 $refresh->();
1256 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1257 $SETUP_DIALOG->show;
1258 },
1259 sub {
1260 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1261 $SETUP_DIALOG->show;
1262 });
1263 $::BIND_EDITOR->show;
1264 $SETUP_DIALOG->hide;
1265 });
1266
1267 $hb->add (new CFClient::UI::Label text => "(Key: $nam)");
1268 $hb->add (new CFClient::UI::Label text => $lbl, expand => 1);
1269 }
1270 }
1271 };
1272
1273 my $vb = new CFClient::UI::VBox;
1274 $vb->add ($binding_list);
1275 $vb->add (my $hb = new CFClient::UI::HBox);
1276
1277 $hb->add (new CFClient::UI::Button
1278 text => "record new",
1279 expand => 1,
1280 tooltip => "This button opens the binding editor with an empty binding.",
1281 on_activate => sub {
1282 $::BIND_EDITOR->set_binding (undef, undef, [],
1283 sub {
1284 my ($mod, $sym, $cmds) = @_;
1285 $::CFG->{bindings}->{$mod}->{$sym} = $cmds;
1286 $refresh->();
1287 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1288 $SETUP_DIALOG->show;
1289 },
1290 sub {
1291 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1292 $SETUP_DIALOG->show;
1293 },
1294 );
1295 $SETUP_DIALOG->hide;
1296 $::BIND_EDITOR->show;
1297 },
1298 );
1299
1300 $hb->add (new CFClient::UI::Button
1301 text => "close",
1302 tooltip => "Closes the binding window",
1303 expand => 1,
1304 on_activate => sub {
1305 $SETUP_DIALOG->hide;
1306 }
1307 );
1308
1309 $refresh->();
1310
1311 $vb
899} 1312}
900 1313
901sub make_help_window { 1314sub make_help_window {
902 my $win = new CFClient::UI::FancyFrame 1315 my $win = new CFClient::UI::FancyFrame
903 user_w => $WIDTH * (7/8), user_h => $HEIGHT * (7/8), title => "Documentation"; 1316 x => 'center',
1317 y => 'center',
1318 z => 2,
1319 name => 'doc_browser',
1320 force_w => int $WIDTH * 7/8,
1321 force_h => int $HEIGHT * 7/8,
1322 title => "Documentation";
904 1323
905 $win->add (my $vbox = new CFClient::UI::VBox); 1324 $win->add (my $vbox = new CFClient::UI::VBox);
906 1325
907 $vbox->add (my $buttons = new CFClient::UI::HBox); 1326 $vbox->add (my $buttons = new CFClient::UI::HBox);
908 $vbox->add (my $viewer = new CFClient::UI::TextView expand => 1, fontsize => 0.8); 1327 $vbox->add (my $viewer = new CFClient::UI::TextView expand => 1, fontsize => 0.8);
… …
915 ) { 1334 ) {
916 my ($pod, $label) = @$_; 1335 my ($pod, $label) = @$_;
917 1336
918 $buttons->add (new CFClient::UI::Button 1337 $buttons->add (new CFClient::UI::Button
919 text => $label, 1338 text => $label,
920 connect_activate => sub { 1339 on_activate => sub {
921 my $parser = new Pod::POM; 1340 my $pom = CFClient::load_pod CFClient::find_rcfile "pod/$pod.pod",
922 my $pom = $parser->parse_file (CFClient::find_rcfile "pod/$pod.pod"); 1341 doc_viewer => 1, sub { CFClient::pod_to_pango_list $_[0] };
923 1342
924 $viewer->clear; 1343 $viewer->clear;
925 1344
926 $viewer->add_paragraph ([1, 1, 1, 1], $_->[1], $_->[0]) 1345 $viewer->add_paragraph ([1, 1, 1, 1], $_->[1], $_->[0])
927 for @{ CFClient::pod_to_pango_list $pom }; 1346 for @$pom;
928 1347
929 $viewer->set_offset (0); 1348 $viewer->set_offset (0);
930 }, 1349 },
931 ); 1350 );
932 } 1351 }
… …
956 or die "SDL_SetVideoMode failed: " . (CFClient::SDL_GetError) . "\n"; 1375 or die "SDL_SetVideoMode failed: " . (CFClient::SDL_GetError) . "\n";
957 1376
958 $SDL_ACTIVE = 1; 1377 $SDL_ACTIVE = 1;
959 $LAST_REFRESH = time - 0.01; 1378 $LAST_REFRESH = time - 0.01;
960 1379
961 CFClient::gl_init; 1380 CFClient::OpenGL::init;
962 1381
963 $FONTSIZE = int $HEIGHT / 40 * $CFG->{gui_fontsize}; 1382 $FONTSIZE = int $HEIGHT / 40 * $CFG->{gui_fontsize};
964 1383
965 $CFClient::UI::ROOT->configure (0, 0, $WIDTH, $HEIGHT);#d# 1384 $CFClient::UI::ROOT->configure (0, 0, $WIDTH, $HEIGHT);#d#
966 1385
… …
969 if ($DEBUG_STATUS) { 1388 if ($DEBUG_STATUS) {
970 CFClient::UI::rescale_widgets $WIDTH / $old_w, $HEIGHT / $old_h; 1389 CFClient::UI::rescale_widgets $WIDTH / $old_w, $HEIGHT / $old_h;
971 } else { 1390 } else {
972 # create the widgets 1391 # create the widgets
973 1392
974 $DEBUG_STATUS = new CFClient::UI::Label padding => 0, z => 100, req_x => -1; 1393 $DEBUG_STATUS = new CFClient::UI::Label
1394 padding => 0,
1395 z => 100,
1396 force_x => "max",
1397 force_y => 0;
975 $DEBUG_STATUS->show; 1398 $DEBUG_STATUS->show;
976 1399
1400 $BIND_EDITOR = new CFClient::UI::BindEditor (x => "max", y => 0);
1401
977 $STATUSBOX = new CFClient::UI::Statusbox; 1402 $STATUSBOX = new CFClient::UI::Statusbox;
978 $STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", pri => -100, color => [1, 1, 1, 0.8]); 1403 $STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", timeout => 864000, pri => -100, color => [1, 1, 1, 0.8]);
979 1404
980 (new CFClient::UI::Frame 1405 (new CFClient::UI::Frame
981 bg => [0, 0, 0, 0.4], 1406 bg => [0, 0, 0, 0.4],
982 req_y => -1, 1407 force_x => 0,
1408 force_y => "max",
983 child => $STATUSBOX, 1409 child => $STATUSBOX,
984 )->show; 1410 )->show;
985 1411
986 CFClient::UI::FancyFrame->new ( 1412 CFClient::UI::FancyFrame->new (
1413 title => "Map",
1414 name => "mapmap",
1415 x => 0,
1416 y => $FONTSIZE + 8,
987 border_bg => [1, 1, 1, 192/255], 1417 border_bg => [1, 1, 1, 192/255],
988 bg => [1, 1, 1, 0], 1418 bg => [1, 1, 1, 0],
989 child => ($MAPMAP = new CFClient::MapWidget::MapMap 1419 child => ($MAPMAP = new CFClient::MapWidget::MapMap
990 tooltip => "<b>Map</b>. On servers that support this feature, this will display an overview of the surrounding areas.", 1420 tooltip => "<b>Map</b>. On servers that support this feature, this will display an overview of the surrounding areas.",
991 ), 1421 ),
… …
1014 can_hover => 1, 1444 can_hover => 1,
1015 can_events => 1, 1445 can_events => 1,
1016 tooltip => "<b>Server Log</b>. This text viewer contains all the messages sent by the server.", 1446 tooltip => "<b>Server Log</b>. This text viewer contains all the messages sent by the server.",
1017 ; 1447 ;
1018 1448
1019 $BUTTONBAR = new CFClient::UI::HBox; 1449 $SETUP_DIALOG = new CFClient::UI::FancyFrame
1450 title => "Setup",
1451 name => "setup_dialog",
1452 x => 'center',
1453 y => 'center',
1454 z => 2,
1455 force_w => $::WIDTH * 0.6,
1456 force_h => $::HEIGHT * 0.6,
1457 ;
1020 1458
1459 $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new CFClient::UI::Notebook expand => 1, debug => 1,
1460 filter => new CFClient::UI::ScrolledWindow expand => 1, scroll_y => 1);
1461
1462 $SETUP_NOTEBOOK->add (Server => $SETUP_SERVER = server_setup,
1463 "Configure the server to play on, your username, password and other server-related options.");
1464 $SETUP_NOTEBOOK->add (Pickup => autopickup_setup,
1465 "Configure autopickup settings, i.e. which items you will pick up automatically when walking (or running) over them.");
1466 $SETUP_NOTEBOOK->add (Graphics => graphics_setup,
1467 "Configure the video mode, performance, fonts and other graphical aspects of the game.");
1468 $SETUP_NOTEBOOK->add (Audio => audio_setup,
1469 "Configure the use of audio, sound effects and background music.");
1470 $SETUP_NOTEBOOK->add (Keyboard => $SETUP_KEYBOARD = keyboard_setup,
1471 "Lets you define, edit and delete bindings."
1472 . "There is a shortcut for making bindings: <b>Left Control + Insert</b> opens the binding editor "
1473 . "with nothing set and the recording started. After doing the actions you "
1474 . "want to record press <b>Insert</b> and you will be asked to press a key-combo. "
1475 . "After pressing the combo the binding will be saved automatically and the "
1476 . "binding editor closes");
1477 $SETUP_NOTEBOOK->add (Spells => $SETUP_SPELLS = spell_setup,
1478 "Displays all spells you have and lets you edit keyboard shortcuts for them.");
1479
1480 $BUTTONBAR = new CFClient::UI::Buttonbar x => 0, y => 0, z => 200; # put on top
1481
1021 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Client Setup", other => client_setup, 1482 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Setup", other => $SETUP_DIALOG,
1022 tooltip => "Toggles a dialog where you can configure various aspects of the client, such as graphics mode, performance, and audio options."); 1483 tooltip => "Toggles a dialog where you can configure all aspects of this client.");
1023 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Server Setup", other => server_setup, 1484
1024 tooltip => "Toggles a dialog where you can configure the server to play on, your username, password and other server-related options.");
1025 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Message Window", other => message_window, 1485 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW = message_window,
1026 tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server."); 1486 tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server.");
1027 1487
1028 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 1488 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
1029 1489
1030 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Stats Window", other => make_stats_window, 1490 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Stats Window", other => $STATS_WINDOW = stats_window,
1031 tooltip => "Toggles the statistics window, where all your Stats and Resistances are being displayed at all times."); 1491 tooltip => "Toggles the statistics window, where all your Stats and Resistances are being displayed at all times.");
1032 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Inventory", other => make_inventory_window, 1492 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Inventory", other => inventory_window,
1033 tooltip => "Toggles the inventory window, where you can manage your loot (or treaures :)."); 1493 tooltip => "Toggles the inventory window, where you can manage your loot (or treasures :). "
1494 . "You can also hit the <b>Tab</b>-key to show/hide the Inventory.");
1034 1495
1035 $BUTTONBAR->add (new CFClient::UI::Button 1496 $BUTTONBAR->add (new CFClient::UI::Button
1036 text => "Save Config", 1497 text => "Save Config",
1037 tooltip => "Saves the options chosen in the client setting, server settings and the window layout to be restored on later runs.", 1498 tooltip => "Saves the options chosen in the client setting, server settings and the window layout to be restored on later runs.",
1038 connect_activate => sub { 1499 on_activate => sub {
1500 $::CFG->{layout} = CFClient::UI::get_layout;
1039 CFClient::write_cfg "$Crossfire::VARDIR/pclientrc"; 1501 CFClient::write_cfg "$Crossfire::VARDIR/cfplusrc";
1040 status "Configuration Saved"; 1502 status "Configuration Saved";
1041 }, 1503 },
1042 ); 1504 );
1043 1505
1044 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Help!", other => make_help_window, 1506 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Help!", other => make_help_window,
1045 tooltip => "View Documentation"); 1507 tooltip => "View Documentation");
1046 1508
1047 $BUTTONBAR->add (new CFClient::UI::Button 1509 $BUTTONBAR->add (new CFClient::UI::Button
1048 text => "Quit", 1510 text => "Quit",
1049 tooltip => "Terminates the program", 1511 tooltip => "Terminates the program",
1050 connect_activate => sub { 1512 on_activate => sub {
1051 if ($CONN) { 1513 if ($CONN) {
1052 open_quit_dialog; 1514 open_quit_dialog;
1053 } else { 1515 } else {
1054 exit; 1516 exit;
1055 } 1517 }
1056 }, 1518 },
1057 ); 1519 );
1058 1520
1059 $BUTTONBAR->show; 1521 $BUTTONBAR->show;
1060 1522 $SETUP_DIALOG->show;
1061 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);
1062
1063 # delay till geometry is constant
1064 $CFClient::UI::ROOT->on_post_alloc (startup => sub {
1065 $BUTTONBAR->{children}[1]->emit ("activate"); # pop up server setup
1066 my $widget = $GAUGES->{win};
1067 $widget->move (0, $HEIGHT - $widget->{h});#d# to in toplevel
1068 });
1069 force_refresh ();
1070 } 1523 }
1524
1525 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);
1071} 1526}
1072 1527
1073sub video_shutdown { 1528sub video_shutdown {
1074 undef $SDL_ACTIVE; 1529 undef $SDL_ACTIVE;
1075} 1530}
… …
1142 1597
1143my %demo;#d# 1598my %demo;#d#
1144 1599
1145sub force_refresh { 1600sub force_refresh {
1146 $fps = $fps * 0.95 + 1 / (($NOW - $LAST_REFRESH) || 0.1) * 0.05; 1601 $fps = $fps * 0.95 + 1 / (($NOW - $LAST_REFRESH) || 0.1) * 0.05;
1147 debug sprintf "%3.2f", $fps; 1602 debug sprintf "%3.2f", $fps if $ENV{CFPLUS_DEBUG} & 4;
1148 1603
1149 $CFClient::UI::ROOT->draw; 1604 $CFClient::UI::ROOT->draw;
1150 1605
1151 $WANT_REFRESH = 0; 1606 $WANT_REFRESH = 0;
1152 $CAN_REFRESH = 0; 1607 $CAN_REFRESH = 0;
… …
1207}; 1662};
1208 1663
1209 CFClient::SDL_GL_SwapBuffers; 1664 CFClient::SDL_GL_SwapBuffers;
1210} 1665}
1211 1666
1212my $refresh_watcher = Event->timer (after => 0, hard => 1, interval => 1 / $MAX_FPS, cb => sub { 1667my $refresh_watcher = Event->timer (after => 0, hard => 0, interval => 1 / $MAX_FPS, cb => sub {
1213 $NOW = time; 1668 $NOW = time;
1214 1669
1215 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_) 1670 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_)
1216 for CFClient::SDL_PollEvent; 1671 for CFClient::SDL_PollEvent;
1217 1672
… …
1235sub animation_stop { 1690sub animation_stop {
1236 my ($widget) = @_; 1691 my ($widget) = @_;
1237 delete $animate_object{$widget}; 1692 delete $animate_object{$widget};
1238} 1693}
1239 1694
1240@conn::ISA = Crossfire::Protocol::;
1241
1242sub conn::new {
1243 my $class = shift;
1244
1245 my $self = $class->Crossfire::Protocol::new (@_);
1246
1247 $MAPWIDGET->clr_commands;
1248
1249 my $parser = new Pod::POM;
1250 my $pod = $parser->parse_file (CFClient::find_rcfile "pod/command_help.pod");
1251
1252 for my $head2 ($pod->head2) {
1253 $head2->title =~ /^(\S+) (?:\s+ \( ([^\)]*) \) )?/x
1254 or next;
1255
1256 my $cmd = $1;
1257 my @args = split /\|/, $2;
1258 @args = (".*") unless @args;
1259
1260 my $text = CFClient::pod_to_pango $head2->content;
1261
1262 for my $arg (@args) {
1263 $arg = $arg eq ".*" ? "" : " $arg";
1264
1265 $MAPWIDGET->add_command ("$cmd$arg", $text);
1266 }
1267 }
1268
1269 $self->{noface} = new_from_file CFClient::Texture
1270 CFClient::find_rcfile "noface.png", minify => 1, mipmap => 1;
1271
1272 $self
1273}
1274
1275sub conn::stats_update {
1276 my ($self, $stats) = @_;
1277
1278 if (my $exp = $stats->{Crossfire::Protocol::CS_STAT_EXP64}) {
1279 my $diff = $exp - $self->{prev_exp};
1280 $STATUSBOX->add ("$diff experience gained", group => "experience $diff", fg => [0.5, 1, 0.5, 0.8], timeout => 5)
1281 if exists $self->{prev_exp} && $diff;
1282 $self->{prev_exp} = $exp;
1283 }
1284
1285 update_stats_window ($stats);
1286}
1287
1288sub conn::user_send {
1289 my ($self, $command) = @_;
1290
1291 $self->send_command ($command);
1292 status $command;
1293}
1294
1295sub conn::map_scroll {
1296 my ($self, $dx, $dy) = @_;
1297
1298 $MAP->scroll ($dx, $dy);
1299}
1300
1301sub conn::feed_map1a {
1302 my ($self, $data) = @_;
1303
1304# $self->Crossfire::Protocol::feed_map1a ($data);
1305
1306 $MAP->map1a_update ($data);
1307 $MAPWIDGET->update;
1308}
1309
1310sub conn::flush_map {
1311 my ($self) = @_;
1312
1313 my $map_info = delete $self->{map_info}
1314 or return;
1315
1316 my ($hash, $x, $y, $w, $h) = @$map_info;
1317
1318 my $data = $MAP->get_rect ($x, $y, $w, $h);
1319 $MAPCACHE->put ($hash => Compress::LZF::compress $data);
1320 #warn sprintf "SAVEmap[%s] length %d\n", $hash, length $data;#d#
1321}
1322
1323sub conn::map_clear {
1324 my ($self) = @_;
1325
1326 $self->flush_map;
1327 delete $self->{neigh_map};
1328
1329 $MAP->clear;
1330}
1331
1332
1333sub conn::load_map($$$) {
1334 my ($self, $hash, $x, $y) = @_;
1335
1336 if (defined (my $data = $MAPCACHE->get ($hash))) {
1337 $data = Compress::LZF::decompress $data;
1338 #warn sprintf "LOADmap[%s,%d,%d] length %d\n", $hash, $x, $y, length $data;#d#
1339 for my $id ($MAP->set_rect ($x, $y, $data)) {
1340 my $data = $TILECACHE->get ($id)
1341 or next;
1342
1343 $self->set_texture ($id => $data);
1344 }
1345 }
1346}
1347
1348# hardcode /world/world_xxx_xxx map names, the savings are enourmous,
1349# (server resource,s latency, bandwidth), so this hack is warranted.
1350# the right fix is to make real tiled maps with an overview file
1351sub conn::send_mapinfo {
1352 my ($self, $data, $cb) = @_;
1353
1354 if ($self->{map_info}[0] =~ m%^/world/world_(\d\d\d)_(\d\d\d)$%) {
1355 my ($wx, $wy) = ($1, $2);
1356
1357 if ($data =~ /^spatial ([1-4]+)$/) {
1358 my @dx = (0, 0, 1, 0, -1);
1359 my @dy = (0, -1, 0, 1, 0);
1360 my ($dx, $dy);
1361
1362 for (split //, $1) {
1363 $dx += $dx[$_];
1364 $dy += $dy[$_];
1365 }
1366
1367 $cb->(spatial => 15,
1368 $self->{map_info}[1] - $MAP->ox + $dx * 50,
1369 $self->{map_info}[2] - $MAP->oy + $dy * 50,
1370 50, 50,
1371 sprintf "/world/world_%03d_%03d", $wx + $dx, $wy + $dy
1372 );
1373
1374 return;
1375 }
1376 }
1377
1378 $self->Crossfire::Protocol::send_mapinfo ($data, $cb);
1379}
1380
1381# this method does a "flood fill" into every tile direction
1382# it assumes that tiles are arranged in a rectangular grid,
1383# i.e. a map is the same as the left of the right map etc.
1384# failure to comply are harmless and result in display errors
1385# at worst.
1386sub conn::flood_fill {
1387 my ($self, $block, $gx, $gy, $path, $hash, $flags) = @_;
1388
1389 # the server does not allow map paths > 6
1390 return if 7 <= length $path;
1391
1392 my ($x0, $y0, $x1, $y1) = @{$self->{neigh_rect}};
1393
1394 for (
1395 [1, 3, 0, -1],
1396 [2, 4, 1, 0],
1397 [3, 1, 0, 1],
1398 [4, 2, -1, 0],
1399 ) {
1400 my ($tile, $tile2, $dx, $dy) = @$_;
1401
1402 next if $block & (1 << $tile);
1403 my $block = $block | (1 << $tile2);
1404
1405 my $gx = $gx + $dx;
1406 my $gy = $gy + $dy;
1407
1408 next unless $flags & (1 << ($tile - 1));
1409 next if $self->{neigh_grid}{$gx, $gy}++;
1410
1411 my $neigh = $self->{neigh_map}{$hash} ||= [];
1412 if (my $info = $neigh->[$tile]) {
1413 my ($flags, $x, $y, $w, $h, $hash) = @$info;
1414
1415 $self->flood_fill ($block, $gx, $gy, "$path$tile", $hash, $flags)
1416 if $x >= $x0 && $x + $w < $x1 && $y >= $y0 && $y + $h < $y1;
1417
1418 } else {
1419 $self->send_mapinfo ("spatial $path$tile", sub {
1420 my ($mode, $flags, $x, $y, $w, $h, $hash) = @_;
1421
1422 return if $mode ne "spatial";
1423
1424 $x += $MAP->ox;
1425 $y += $MAP->oy;
1426
1427 $self->load_map ($hash, $x, $y)
1428 unless $self->{neigh_map}{$hash}[5]++;#d#
1429
1430 $neigh->[$tile] = [$flags, $x, $y, $w, $h, $hash];
1431
1432 $self->flood_fill ($block, $gx, $gy, "$path$tile", $hash, $flags)
1433 if $x >= $x0 && $x + $w < $x1 && $y >= $y0 && $y + $h < $y1;
1434 });
1435 }
1436 }
1437}
1438
1439sub conn::map_change {
1440 my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_;
1441
1442 $self->flush_map;
1443
1444 my ($ox, $oy) = ($::MAP->ox, $::MAP->oy);
1445
1446 my $mapmapw = $MAPMAP->{w};
1447 my $mapmaph = $MAPMAP->{h};
1448
1449 $self->{neigh_rect} = [
1450 $ox - $mapmapw * 0.5, $oy - $mapmapw * 0.5,
1451 $ox + $mapmapw * 0.5 + $w, $oy + $mapmapw * 0.5 + $h,
1452 ];
1453
1454 delete $self->{neigh_grid};
1455
1456 $x += $ox;
1457 $y += $oy;
1458
1459 $self->{map_info} = [$hash, $x, $y, $w, $h];
1460
1461 (my $map = $hash) =~ s/^.*?\/([^\/]+)$/\1/;
1462 $STATWIDS->{map}->set_text ("Map: " . $map);
1463
1464 $self->load_map ($hash, $x, $y);
1465 $self->flood_fill (0, 0, 0, "", $hash, $flags);
1466}
1467
1468sub conn::face_find {
1469 my ($self, $facenum, $face) = @_;
1470
1471 my $hash = "$face->{chksum},$face->{name}";
1472
1473 my $id = $FACEMAP->get ($hash);
1474
1475 unless ($id) {
1476 # create new id for face
1477 # I love transactions
1478 for (1..100) {
1479 my $txn = $CFClient::DB_ENV->txn_begin;
1480 my $status = $FACEMAP->db_get (id => $id, BerkeleyDB::DB_RMW);
1481 if ($status == 0 || $status == BerkeleyDB::DB_NOTFOUND) {
1482 $id = ($id || 16) + 1;
1483 if ($FACEMAP->put (id => $id) == 0
1484 && $FACEMAP->put ($hash => $id) == 0) {
1485 $txn->txn_commit;
1486
1487 goto gotid;
1488 }
1489 }
1490 $txn->abort;
1491 }
1492
1493 CFClient::fatal "maximum number of transaction retries reached - database problems?";
1494 }
1495
1496gotid:
1497 $face->{id} = $id;
1498 $MAP->set_face ($facenum => $id);
1499 $self->{faceid}[$facenum] = $id;#d#
1500
1501 my $face = $TILECACHE->get ($id);
1502
1503 if ($face) {
1504 #$self->face_prefetch;
1505 $face
1506 } else {
1507 my $tex = $self->{noface};
1508 $MAP->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}});
1509 undef
1510 };
1511}
1512
1513sub conn::face_update {
1514 my ($self, $facenum, $face) = @_;
1515
1516 $TILECACHE->put ($face->{id} => $face->{image}); #TODO: try to avoid duplicate writes
1517
1518 $self->set_texture ($face->{id} => delete $face->{image});
1519}
1520
1521sub conn::set_texture {
1522 my ($self, $id, $data) = @_;
1523
1524 $self->{texture}[$id] ||= do {
1525 my $tex =
1526 new_from_image CFClient::Texture
1527 $data, minify => 1, mipmap => 1;
1528
1529 $MAP->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}});
1530 $MAPWIDGET->update;
1531
1532 $tex
1533 };
1534}
1535
1536sub conn::sound_play {
1537 my ($self, $x, $y, $soundnum, $type) = @_;
1538
1539 $SDL_MIXER
1540 or return;
1541
1542 my $chunk = $AUDIO_CHUNKS{$SOUNDS[$soundnum]}
1543 or return;
1544
1545 $chunk->play;
1546# warn "sound $x,$y,$soundnum,$type\n";#d#
1547}
1548
1549my $LAST_QUERY; # server is stupid, stupid, stupid
1550
1551sub conn::query {
1552 my ($self, $flags, $prompt) = @_;
1553
1554 $prompt = $LAST_QUERY unless length $prompt;
1555 $LAST_QUERY = $prompt;
1556
1557 my $dialog = new CFClient::UI::FancyFrame
1558 title => "Query",
1559 child => my $vbox = new CFClient::UI::VBox;
1560
1561 $vbox->add (new CFClient::UI::Label
1562 max_w => $::WIDTH * 0.4,
1563 ellipsise => 0,
1564 text => $prompt);
1565
1566 if ($flags & Crossfire::Protocol::CS_QUERY_YESNO) {
1567 $vbox->add (my $hbox = new CFClient::HBox);
1568 $hbox->add (new CFClient::Button
1569 text => "No",
1570 connect_activate => sub {
1571 $self->send ("reply n");
1572 $dialog->destroy;
1573 $MAPWIDGET->focus_in;
1574 }
1575 );
1576 $hbox->add (new CFClient::Button
1577 text => "Yes",
1578 connect_activate => sub {
1579 $self->send ("reply y");
1580 $dialog->destroy;
1581 },
1582 );
1583
1584 $dialog->focus_in;
1585
1586 } elsif ($flags & Crossfire::Protocol::CS_QUERY_SINGLECHAR) {
1587 $dialog->{tooltip} = "Press a key (click on the entry to make sure it has keyboard focus)";
1588 $vbox->add (my $entry = new CFClient::UI::Entry
1589 connect_changed => sub {
1590 $self->send ("reply $_[1]");
1591 $dialog->destroy;
1592 },
1593 );
1594
1595 $entry->focus_in;
1596
1597 } else {
1598 $dialog->{tooltip} = "Enter the reply and press return (click on the entry to make sure it has keyboard focus)";
1599
1600 $vbox->add (my $entry = new CFClient::UI::Entry
1601 $flags & Crossfire::Protocol::CS_QUERY_HIDEINPUT ? (hiddenchar => "*") : (),
1602 connect_activate => sub {
1603 $self->send ("reply $_[1]");
1604 $dialog->destroy;
1605 },
1606 );
1607
1608 $entry->focus_in;
1609 }
1610
1611 $dialog->show_centered;
1612}
1613
1614sub conn::drawinfo {
1615 my ($self, $color, $text) = @_;
1616
1617 my @color = (
1618 [1.00, 1.00, 1.00], #[0.00, 0.00, 0.00],
1619 [1.00, 1.00, 1.00],
1620 [0.50, 0.50, 1.00], #[0.00, 0.00, 0.55]
1621 [1.00, 0.00, 0.00],
1622 [1.00, 0.54, 0.00],
1623 [0.11, 0.56, 1.00],
1624 [0.93, 0.46, 0.00],
1625 [0.18, 0.54, 0.34],
1626 [0.56, 0.73, 0.56],
1627 [0.80, 0.80, 0.80],
1628 [0.55, 0.41, 0.13],
1629 [0.99, 0.77, 0.26],
1630 [0.74, 0.65, 0.41],
1631 );
1632
1633 my $time = sprintf "%02d:%02d:%02d", (localtime time)[2,1,0];
1634
1635 $text = CFClient::UI::Label::escape $text;
1636 $text =~ s/\[b\](.*?)\[\/b\]/<b>\1<\/b>/g;
1637 $text =~ s/\[color=(.*?)\](.*?)\[\/color\]/<span foreground='\1'>\2<\/span>/g;
1638
1639 $LOGVIEW->add_paragraph ($color[$color],
1640 join "\n", map "$time $_", split /\n/, $text);
1641
1642 $STATUSBOX->add ($text,
1643 group => $text,
1644 fg => $color[$color],
1645 timeout => 10,
1646 tooltip_font => $::FONT_FIXED,
1647 );
1648}
1649
1650sub conn::drawextinfo {
1651 my ($self, $color, $type, $subtype, $message) = @_;
1652
1653 $self->drawinfo ($color, $message);
1654}
1655
1656sub conn::spell_add {
1657 my ($self, $spell) = @_;
1658
1659 # TODO
1660 # create a widget dynamically, using spell face (CF::Protocol downloads them)
1661 $MAPWIDGET->add_command ("invoke $spell->{name}", CFClient::UI::Label::escape $spell->{message});
1662 $MAPWIDGET->add_command ("cast $spell->{name}", CFClient::UI::Label::escape $spell->{message});
1663}
1664
1665sub conn::spell_delete {
1666 my ($self, $spell) = @_;
1667}
1668
1669sub conn::addme_success {
1670 my ($self) = @_;
1671
1672 $self->send ("command output-sync $CFG->{output_sync}");
1673 $self->send ("command output-count $CFG->{output_count}");
1674
1675 my $parser = new Pod::POM;
1676 my $pod = $parser->parse_file (CFClient::find_rcfile "pod/skill_help.pod");
1677
1678 my %skill_tooltip;
1679
1680 for my $head2 ($pod->head2) {
1681 $skill_tooltip{$head2->title} = CFClient::pod_to_pango $head2->content;
1682 }
1683
1684 for my $skill (values %{$self->{skill_info}}) {
1685 $MAPWIDGET->add_command ("ready_skill $skill",
1686 (CFClient::UI::Label::escape "Ready the skill '$skill'\n\n")
1687 . $skill_tooltip{$skill});
1688 $MAPWIDGET->add_command ("use_skill $skill",
1689 (CFClient::UI::Label::escape "Immediately use the skill '$skill'\n\n")
1690 . $skill_tooltip{$skill});
1691 }
1692}
1693
1694sub conn::eof {
1695 $MAPWIDGET->clr_commands;
1696
1697 stop_game;
1698}
1699
1700sub conn::image_info {
1701 my ($self, $numfaces) = @_;
1702
1703 $self->{num_faces} = $numfaces;
1704 $self->{face_prefetch} = [1 .. $numfaces];
1705 $self->face_prefetch;
1706}
1707
1708sub conn::face_prefetch {
1709 my ($self) = @_;
1710
1711 return unless $CFG->{face_prefetch};
1712
1713 if ($self->{num_faces}) {
1714 return if @{ $self->{send_queue} || [] };
1715 my $todo = @{ $self->{face_prefetch} }
1716 or return;
1717
1718 my ($face) = splice @{ $self->{face_prefetch} }, + rand @{ $self->{face_prefetch} }, 1, ();
1719
1720 $self->send ("requestinfo image_sums $face $face");
1721
1722 $STATUSBOX->add (CFClient::UI::Label::escape "prefetching $todo",
1723 group => "prefetch", timeout => 2, fg => [1, 1, 0, 0.5]);
1724 } elsif (!exists $self->{num_faces}) {
1725 $self->send ("requestinfo image_info");
1726
1727 $self->{num_faces} = 0;
1728
1729 $STATUSBOX->add (CFClient::UI::Label::escape "starting to prefetch",
1730 group => "prefetch", timeout => 2, fg => [1, 1, 0, 0.5]);
1731 }
1732}
1733
1734# check once/second for faces that need to be prefetched 1695# check once/second for faces that need to be prefetched
1735# this should, of course, only run on demand, but 1696# this should, of course, only run on demand, but
1736# SDL forces worse things on us.... 1697# SDL forces worse things on us....
1737 1698
1738Event->timer (after => 1, interval => 0.25, cb => sub { 1699Event->timer (after => 1, interval => 0.25, cb => sub {
1739 $CONN->face_prefetch 1700 $CONN->face_prefetch
1740 if $CONN; 1701 if $CONN;
1741}); 1702});
1742
1743sub update_floorbox {
1744 $CFClient::UI::ROOT->on_refresh ($FLOORBOX => sub {
1745 return unless $CONN;
1746
1747 $FLOORBOX->clear;
1748 $FLOORBOX->add (new CFClient::UI::Empty expand => 1);
1749
1750 my $count = 7;
1751 for (@{ $CONN->{container}{0} }) {
1752 if (--$count) {
1753 $FLOORBOX->add (new CFClient::UI::InventoryItem item => $_);
1754 } else {
1755 $FLOORBOX->add (new CFClient::UI::Label text => "More...");
1756 last;
1757 }
1758 }
1759 });
1760
1761 $WANT_REFRESH++;
1762}
1763
1764sub conn::container_add {
1765 my ($self, $tag, $items) = @_;
1766
1767 #d# print "container_add: container $tag ($self->{player}{tag})\n";
1768
1769 if ($tag == 0) {
1770 update_floorbox;
1771 $OPENCONT = 0;
1772 $INVR_LBL->set_text ("Floor");
1773 $INVR->set_items ($self->{container}{0});
1774 } elsif ($tag == $self->{player}{tag}) {
1775 $INVR_LBL->set_text ("Player");
1776 $INV->set_items ($self->{container}{$self->{player}{tag}})
1777 } else {
1778 $OPENCONT = $tag;
1779 $INVR_LBL->set_text (CFClient::UI::InventoryItem::_item_to_desc ($self->{item}->{$OPENCONT}));
1780 $INVR->set_items ($self->{container}{$tag});
1781 }
1782
1783 # $self-<{player}{tag} => player inv
1784 #use PApp::Util; warn PApp::Util::dumpval $self->{container}{$self->{player}{tag}};
1785}
1786
1787sub conn::container_clear {
1788 my ($self, $tag) = @_;
1789
1790 #d# print "container_clear: container $tag ($self->{player}{tag})\n";
1791
1792 if ($tag == 0) {
1793 update_floorbox;
1794 $OPENCONT = 0;
1795 $INVR_LBL->set_text ("Floor");
1796 $INVR->set_items ($self->{container}{0});
1797 } elsif ($tag == $self->{player}{tag}) {
1798 $INVR_LBL->set_text ("Player");
1799 $INV->set_items ($self->{container}{$tag})
1800 } else {
1801 $OPENCONT = $tag;
1802 $INVR_LBL->set_text (CFClient::UI::InventoryItem::_item_to_desc ($self->{item}->{$OPENCONT}));
1803 $INVR->set_items ($self->{container}{$tag});
1804 }
1805
1806# use PApp::Util; warn PApp::Util::dumpval $self->{container}{0};
1807}
1808
1809sub conn::item_delete {
1810 my ($self, @items) = @_;
1811
1812 for (@items) {
1813 #d# print "item_delete: $_->{tag} from $_->{container} ($self->{player}{tag})\n";
1814
1815 if ($_->{container} == 0) {
1816 update_floorbox;
1817 $OPENCONT = 0;
1818 $INVR_LBL->set_text ("Floor");
1819 $INVR->set_items ($self->{container}{0});
1820 } elsif ($_->{container} == $self->{player}{tag}) {
1821 $INVR_LBL->set_text ("Player");
1822 $INV->set_items ($self->{container}{$self->{player}{tag}})
1823 } else {
1824 $OPENCONT = $_->{container};
1825 $INVR_LBL->set_text (CFClient::UI::InventoryItem::_item_to_desc ($self->{item}->{$OPENCONT}));
1826 $INVR->set_items ($self->{container}{$_->{container}});
1827 }
1828 }
1829}
1830
1831sub conn::item_update {
1832 my ($self, $item) = @_;
1833
1834 #d# print "item_update: $item->{tag} in $item->{container} ($self->{player}{tag}) ($OPENCONT)\n";
1835
1836 if ($item->{tag} == $OPENCONT && not ($item->{flags} & Crossfire::Protocol::F_OPEN)) {
1837 $OPENCONT = 0;
1838 $INVR_LBL->set_text ("Floor");
1839 $INVR->set_items ($self->{container}{0});
1840
1841 $item->{widget}->update_item
1842 if $item->{widget};
1843 } else {
1844 if ($item->{container} == 0) {
1845 update_floorbox;
1846 $OPENCONT = 0;
1847 $INVR_LBL->set_text ("Floor");
1848 $INVR->set_items ($self->{container}{0});
1849 } elsif ($item->{container} == $self->{player}{tag}) {
1850 $INV->set_items ($self->{container}{$item->{container}})
1851 }
1852 }
1853}
1854 1703
1855%SDL_CB = ( 1704%SDL_CB = (
1856 CFClient::SDL_QUIT => sub { 1705 CFClient::SDL_QUIT => sub {
1857 Event::unloop -1; 1706 Event::unloop -1;
1858 }, 1707 },
… …
1890############################################################################# 1739#############################################################################
1891 1740
1892$SIG{INT} = $SIG{TERM} = sub { exit }; 1741$SIG{INT} = $SIG{TERM} = sub { exit };
1893 1742
1894{ 1743{
1895 local $SIG{__DIE__} = sub { CFClient::fatal $_[0] }; 1744 local $SIG{__DIE__} = sub {
1745 return unless defined $^S && !$^S;
1746 Carp::confess $_[1];#d#TODO: remove when stable
1747 CFClient::fatal $_[0];
1748 };
1896 1749
1897 CFClient::read_cfg "$Crossfire::VARDIR/pclientrc"; 1750 CFClient::read_cfg "$Crossfire::VARDIR/cfplusrc";
1898 1751 CFClient::UI::set_layout ($::CFG->{layout});
1899 $TILECACHE = CFClient::db_table "tilecache";
1900 $FACEMAP = CFClient::db_table "facemap";
1901 1752
1902 my %DEF_CFG = ( 1753 my %DEF_CFG = (
1903 sdl_mode => 0, 1754 sdl_mode => 0,
1904 width => 640, 1755 width => 640,
1905 height => 480, 1756 height => 480,
… …
1908 map_scale => 1, 1759 map_scale => 1,
1909 fow_enable => 1, 1760 fow_enable => 1,
1910 fow_intensity => 0.45, 1761 fow_intensity => 0.45,
1911 fow_smooth => 0, 1762 fow_smooth => 0,
1912 gui_fontsize => 1, 1763 gui_fontsize => 1,
1913 log_fontsize => 1, 1764 log_fontsize => 0.7,
1914 gauge_fontsize=> 1, 1765 gauge_fontsize=> 1,
1915 gauge_size => 0.35, 1766 gauge_size => 0.35,
1916 stat_fontsize => 1, 1767 stat_fontsize => 0.7,
1917 mapsize => 100, 1768 mapsize => 100,
1918 host => "crossfire.schmorp.de", 1769 host => "crossfire.schmorp.de",
1919 say_command => 'say', 1770 say_command => 'say',
1920 audio_enable => 1, 1771 audio_enable => 1,
1921 bgm_enable => 1, 1772 bgm_enable => 1,
… …
1982 1833
1983END { CFClient::SDL_Quit } 1834END { CFClient::SDL_Quit }
1984 1835
1985=head1 NAME 1836=head1 NAME
1986 1837
1987pclient - A Crossfire+ and Crossfire game client 1838cfplus - A Crossfire+ and Crossfire game client
1988 1839
1989=head1 SYNOPSIS 1840=head1 SYNOPSIS
1990 1841
1991Just run it - no commandline arguments are supported. 1842Just run it - no commandline arguments are supported.
1992 1843
1993=head1 USAGE 1844=head1 USAGE
1994 1845
1995Pclient utilises OpenGL for all UI elements and the game. It is supposed to be used 1846cfplus utilises OpenGL for all UI elements and the game. It is supposed to be used
1996fullscreen and interactively. 1847fullscreen and interactively.
1997 1848
1849=head1 DEBUGGING
1850
1851
1852CFPLUS_DEBUG - environment variable
1853
1854 1 draw borders around widgets
1855 2 add low-level widget info to tooltips
1856 4 show fps
1857 8 suppress tooltips
1858
1998=head1 AUTHOR 1859=head1 AUTHOR
1999 1860
2000Marc Lehmann <crossfire@schmorp.de>, Robin Redeker <elmex@ta-sa.org> 1861Marc Lehmann <crossfire@schmorp.de>, Robin Redeker <elmex@ta-sa.org>
2001 1862
2002 1863

Diff Legend

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