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.3 by root, Thu May 25 16:54:29 2006 UTC vs.
Revision 1.59 by root, Mon Jun 5 22:30:35 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;
89
90our $SETUP_DIALOG;
91our $SETUP_NOTEBOOK;
92our $SETUP_SERVER;
93our $SETUP_KEYBOARD;
94our $SETUP_SPELLS;
88 95
89our $FLOORBOX; 96our $FLOORBOX;
90our $GAUGES; 97our $GAUGES;
91our $STATWIDS; 98our $STATWIDS;
92 99
… …
99 106
100our $ALT_ENTER_MESSAGE; 107our $ALT_ENTER_MESSAGE;
101our $STATUSBOX; 108our $STATUSBOX;
102our $DEBUG_STATUS; 109our $DEBUG_STATUS;
103 110
104our $INVWIN; 111our $INV_WINDOW;
105our $INV; 112our $INV;
106our $INVR; 113our $INVR;
107our $INVR_LBL; 114our $INV_RIGHT_HB;
108our $OPENCONT; 115
116our $BIND_EDITOR;
117
118our $PICKUP_CFG;
109 119
110sub status { 120sub status {
111 $STATUSBOX->add (CFClient::UI::Label::escape $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]); 121 $STATUSBOX->add (CFClient::UI::Label::escape $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]);
112} 122}
113 123
114sub debug { 124sub debug {
115 $DEBUG_STATUS->set_text ($_[0]); 125 $DEBUG_STATUS->set_text ($_[0]);
116 my ($w, $h) = $DEBUG_STATUS->size_request;
117 $DEBUG_STATUS->move ($WIDTH - $w, 0);
118} 126}
119 127
120sub start_game { 128sub start_game {
121 status "logging in..."; 129 status "logging in...";
122 130
131 $LOGIN_BUTTON->set_text ("Logout");
132 $SETUP_DIALOG->hide;
133
123 my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32; 134 my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32;
124 135
125 $MAPCACHE = CFClient::db_table "mapcache_$CFG->{host}"; 136 my ($host, $port) = split /:/, $CFG->{host};
137
126 $MAP = new CFClient::Map $mapsize, $mapsize; 138 $MAP = new CFClient::Map $mapsize, $mapsize;
127
128 my ($host, $port) = split /:/, $CFG->{host};
129 139
130 $CONN = eval { 140 $CONN = eval {
131 new conn 141 new CFClient::Protocol
132 host => $host, 142 host => $host,
133 port => $port || 13327, 143 port => $port || 13327,
134 user => $CFG->{user}, 144 user => $CFG->{user},
135 pass => $CFG->{password}, 145 pass => $CFG->{password},
136 mapw => $mapsize, 146 mapw => $mapsize,
137 maph => $mapsize, 147 maph => $mapsize,
138 ; 148
149 map_widget => $MAPWIDGET,
150 logview => $LOGVIEW,
151 statusbox => $STATUSBOX,
152 map => $MAP,
153 mapmap => $MAPMAP,
154
155 sound_play => sub {
156 my ($x, $y, $soundnum, $type) = @_;
157
158 $SDL_MIXER
159 or return;
160
161 my $chunk = $AUDIO_CHUNKS{$SOUNDS[$soundnum]}
162 or return;
163
164 $chunk->play;
165 },
139 }; 166 };
140 167
141 if ($CONN) { 168 if ($CONN) {
142 CFClient::lowdelay fileno $CONN->{fh}; 169 CFClient::lowdelay fileno $CONN->{fh};
143 170
144 $LOGIN_BUTTON->set_text ("Logout");
145 status "login successful"; 171 status "login successful";
146
147 $BUTTONBAR->{children}[1]->emit ("activate")
148 if $BUTTONBAR->{children}[1]->{state};
149
150 } else { 172 } else {
151 status "unable to connect"; 173 status "unable to connect";
152 stop_game(); 174 stop_game();
153 } 175 }
154} 176}
155 177
156sub stop_game { 178sub stop_game {
179 $LOGIN_BUTTON->set_text ("Login");
180 $SETUP_NOTEBOOK->set_current_page ($SETUP_SERVER);
181 $SETUP_DIALOG->show;
182 $INV_WINDOW->hide;
183
157 return unless $CONN; 184 return unless $CONN;
158 185
159 status "connection closed"; 186 status "connection closed";
160 $LOGIN_BUTTON->set_text ("Login"); 187
161 $CONN->destroy; 188 $CONN->destroy;
162 $CONN = 0; # false, does not autovivify 189 $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} 190}
170 191
171sub client_setup { 192sub graphics_setup {
172 my $dialog = new CFClient::UI::FancyFrame
173 title => "Client Setup",
174 child => (my $vbox = new CFClient::UI::VBox); 193 my $vbox = new CFClient::UI::VBox;
194
175 $vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]); 195 $vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]);
176 196
177 $table->add (0, 0, new CFClient::UI::Label valign => 0, align => 1, text => "Video Mode"); 197 $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); 198 $table->add (1, 0, my $hbox = new CFClient::UI::HBox);
179 199
180 $hbox->add (my $mode_slider = new CFClient::UI::Slider expand => 1, req_w => 100, range => [$CFG->{sdl_mode}, 0, $#SDL_MODES, 0, 1]); 200 $hbox->add (my $mode_slider = new CFClient::UI::Slider force_w => $WIDTH * 0.1, expand => 1, range => [$CFG->{sdl_mode}, 0, $#SDL_MODES, 0, 1]);
181 $hbox->add (my $mode_label = new CFClient::UI::Label align => 0, valign => 0, height => 0.8, template => "9999x9999"); 201 $hbox->add (my $mode_label = new CFClient::UI::Label align => 0, valign => 0, height => 0.8, template => "9999x9999");
182 202
183 $mode_slider->connect (changed => sub { 203 $mode_slider->connect (changed => sub {
184 my ($self, $value) = @_; 204 my ($self, $value) = @_;
185 205
… …
192 212
193 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fullscreen"); 213 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fullscreen");
194 $table->add (1, $row++, new CFClient::UI::CheckBox 214 $table->add (1, $row++, new CFClient::UI::CheckBox
195 state => $CFG->{fullscreen}, 215 state => $CFG->{fullscreen},
196 tooltip => "Bring the client into fullscreen mode.", 216 tooltip => "Bring the client into fullscreen mode.",
197 connect_changed => sub { 217 on_changed => sub {
198 my ($self, $value) = @_; 218 my ($self, $value) = @_;
199 $CFG->{fullscreen} = $value; 219 $CFG->{fullscreen} = $value;
200 } 220 }
201 ); 221 );
202 222
203 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fast & Ugly"); 223 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fast & Ugly");
204 $table->add (1, $row++, new CFClient::UI::CheckBox 224 $table->add (1, $row++, new CFClient::UI::CheckBox
205 state => $CFG->{fast}, 225 state => $CFG->{fast},
206 tooltip => "Lower the visual quality considerably to speed up rendering.", 226 tooltip => "Lower the visual quality considerably to speed up rendering.",
207 connect_changed => sub { 227 on_changed => sub {
208 my ($self, $value) = @_; 228 my ($self, $value) = @_;
209 $CFG->{fast} = $value; 229 $CFG->{fast} = $value;
210 } 230 }
211 ); 231 );
212 232
213 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Map Scale"); 233 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Map Scale");
214 $table->add (1, $row++, new CFClient::UI::Slider 234 $table->add (1, $row++, new CFClient::UI::Slider
215 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1], 235 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1],
216 tooltip => "Enlarge or shrink the displayed map. Changes are instant.", 236 tooltip => "Enlarge or shrink the displayed map. Changes are instant.",
217 connect_changed => sub { 237 on_changed => sub {
218 my ($self, $value) = @_; 238 my ($self, $value) = @_;
219 $CFG->{map_scale} = 2 ** $value; 239 $CFG->{map_scale} = 2 ** $value;
220 } 240 }
221 ); 241 );
222 242
223 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fog of War"); 243 $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 244 $table->add (1, $row++, new CFClient::UI::CheckBox
225 state => $CFG->{fow_enable}, 245 state => $CFG->{fow_enable},
226 tooltip => "<b>Fog-of-War</b> marks areas that cannot be seen by the player. Changes are instant.", 246 tooltip => "<b>Fog-of-War</b> marks areas that cannot be seen by the player. Changes are instant.",
227 connect_changed => sub { 247 on_changed => sub {
228 my ($self, $value) = @_; 248 my ($self, $value) = @_;
229 $CFG->{fow_enable} = $value; 249 $CFG->{fow_enable} = $value;
230 } 250 }
231 ); 251 );
232 252
233 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "FoW Intensity"); 253 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "FoW Intensity");
234 $table->add (1, $row++, new CFClient::UI::Slider 254 $table->add (1, $row++, new CFClient::UI::Slider
235 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256], 255 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.", 256 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 { 257 on_changed => sub {
238 my ($self, $value) = @_; 258 my ($self, $value) = @_;
239 $CFG->{fow_intensity} = $value; 259 $CFG->{fow_intensity} = $value;
240 } 260 }
241 ); 261 );
242 262
243 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "FoW Smooth"); 263 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "FoW Smooth");
244 $table->add (1, $row++, new CFClient::UI::CheckBox 264 $table->add (1, $row++, new CFClient::UI::CheckBox
245 state => $CFG->{fow_smooth}, 265 state => $CFG->{fow_smooth},
246 tooltip => "Smooth the Fog-of-War a bit to make it more realistic. Changes are instant.", 266 tooltip => "Smooth the Fog-of-War a bit to make it more realistic. Changes are instant.",
247 connect_changed => sub { 267 on_changed => sub {
248 my ($self, $value) = @_; 268 my ($self, $value) = @_;
249 $CFG->{fow_smooth} = $value; 269 $CFG->{fow_smooth} = $value;
250 status "Fog of War smoothing requires OpenGL 1.2 or higher" if $CFClient::GL_VERSION < 1.2; 270 status "Fog of War smoothing requires OpenGL 1.2 or higher" if $CFClient::OpenGL::GL_VERSION < 1.2;
251 } 271 }
252 ); 272 );
253 273
254 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "GUI Fontsize"); 274 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "GUI Fontsize");
255 $table->add (1, $row++, new CFClient::UI::Slider 275 $table->add (1, $row++, new CFClient::UI::Slider
256 range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1], 276 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.", 277 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] }, 278 on_changed => sub { $CFG->{gui_fontsize} = $_[1] },
259 ); 279 );
260 280
261 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Message Fontsize"); 281 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Message Fontsize");
262 $table->add (1, $row++, new CFClient::UI::Slider 282 $table->add (1, $row++, new CFClient::UI::Slider
263 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1], 283 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.", 284 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]) }, 285 on_changed => sub { $LOGVIEW->set_fontsize ($CFG->{log_fontsize} = $_[1]) },
266 ); 286 );
267 287
268 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Stats Fontsize"); 288 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Stats Fontsize");
269 289
270 $table->add (1, $row++, new CFClient::UI::Slider 290 $table->add (1, $row++, new CFClient::UI::Slider
271 range => [$CFG->{stat_fontsize}, 0.5, 2, 0, 0.1], 291 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.", 292 tooltip => "The font size used by the <b>statistics window</b> only. Changes are instant.",
273 connect_changed => sub { 293 on_changed => sub {
274 $CFG->{stat_fontsize} = $_[1]; 294 $CFG->{stat_fontsize} = $_[1];
275 &set_stats_window_fontsize; 295 &set_stats_window_fontsize;
276 } 296 }
277 ); 297 );
278 298
279 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Gauge fontsize"); 299 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Gauge fontsize");
280 $table->add (1, $row++, new CFClient::UI::Slider 300 $table->add (1, $row++, new CFClient::UI::Slider
281 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1], 301 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.", 302 tooltip => "Adjusts the fontsize of the gauges at the bottom right. Changes are instant.",
283 connect_changed => sub { 303 on_changed => sub {
284 $CFG->{gauge_fontsize} = $_[1]; 304 $CFG->{gauge_fontsize} = $_[1];
285 &set_gauge_window_fontsize; 305 &set_gauge_window_fontsize;
286 } 306 }
287 ); 307 );
288 308
289 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Gauge size"); 309 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Gauge size");
290 $table->add (1, $row++, new CFClient::UI::Slider 310 $table->add (1, $row++, new CFClient::UI::Slider
291 range => [$CFG->{gauge_size}, 0.2, 0.8], 311 range => [$CFG->{gauge_size}, 0.2, 0.8],
292 tooltip => "Adjust the size of the stats gauges at the bottom right. Changes are instant.", 312 tooltip => "Adjust the size of the stats gauges at the bottom right. Changes are instant.",
293 connect_changed => sub { 313 on_changed => sub {
294 $CFG->{gauge_size} = $_[1]; 314 $CFG->{gauge_size} = $_[1];
295 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size}); 315 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size});
296 } 316 }
297 ); 317 );
298 318
299 $table->add (1, $row++, new CFClient::UI::Button 319 $table->add (1, $row++, new CFClient::UI::Button
300 expand => 1, align => 0, text => "Apply", 320 expand => 1, align => 0, text => "Apply",
301 tooltip => "Apply the video settings", 321 tooltip => "Apply the video settings",
302 connect_activate => sub { 322 on_activate => sub {
303 video_shutdown (); 323 video_shutdown ();
304 video_init (); 324 video_init ();
305 } 325 }
306 ); 326 );
327
328 $vbox
329}
330
331sub audio_setup {
332 my $vbox = new CFClient::UI::VBox;
333
334 $vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]);
335
336 my $row = 0;
307 337
308 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Audio Enable"); 338 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Audio Enable");
309 $table->add (1, $row++, new CFClient::UI::CheckBox 339 $table->add (1, $row++, new CFClient::UI::CheckBox
310 state => $CFG->{audio_enable}, 340 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.", 341 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 { 342 on_changed => sub {
313 $CFG->{audio_enable} = $_[1]; 343 $CFG->{audio_enable} = $_[1];
314 } 344 }
315 ); 345 );
316# $table->add (0, 9, new CFClient::UI::Label valign => 0, align => 1, text => "Effects Volume"); 346# $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 { 347# $table->add (1, 8, new CFClient::UI::Slider range => [$CFG->{effects_volume}, 0, 128, 1], on_changed => sub {
318# $CFG->{effects_volume} = $_[1]; 348# $CFG->{effects_volume} = $_[1];
319# }); 349# });
320 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Background Music"); 350 $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); 351 $table->add (1, $row++, my $hbox = new CFClient::UI::HBox);
322 $hbox->add (new CFClient::UI::CheckBox 352 $hbox->add (new CFClient::UI::CheckBox
323 expand => 1, state => $CFG->{bgm_enable}, 353 expand => 1, state => $CFG->{bgm_enable},
324 tooltip => "If enabled, playing of background music is enabled. If disabled, no background music will be played.", 354 tooltip => "If enabled, playing of background music is enabled. If disabled, no background music will be played.",
325 connect_changed => sub { 355 on_changed => sub {
326 $CFG->{bgm_enable} = $_[1]; 356 $CFG->{bgm_enable} = $_[1];
327 } 357 }
328 ); 358 );
329 $hbox->add (new CFClient::UI::Slider 359 $hbox->add (new CFClient::UI::Slider
330 expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128], 360 expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128],
331 tooltip => "The volume of the background music. Changes are instant.", 361 tooltip => "The volume of the background music. Changes are instant.",
332 connect_changed => sub { 362 on_changed => sub {
333 $CFG->{bgm_volume} = $_[1]; 363 $CFG->{bgm_volume} = $_[1];
334 CFClient::MixMusic::volume $_[1] * 128; 364 CFClient::MixMusic::volume $_[1] * 128;
335 } 365 }
336 ); 366 );
337 367
338 $table->add (1, $row++, new CFClient::UI::Button 368 $table->add (1, $row++, new CFClient::UI::Button
339 expand => 1, align => 0, text => "Apply", 369 expand => 1, align => 0, text => "Apply",
340 tooltip => "Apply the audio settings", 370 tooltip => "Apply the audio settings",
341 connect_activate => sub { 371 on_activate => sub {
342 audio_shutdown (); 372 audio_shutdown ();
343 audio_init (); 373 audio_init ();
344 } 374 }
345 ); 375 );
346 376
347 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Chat Command"); 377 $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} 378}
361 379
362sub set_stats_window_fontsize { 380sub set_stats_window_fontsize {
363 for (values %{$STATWIDS}) { 381 for (values %{$STATWIDS}) {
364 $_->set_fontsize ($::CFG->{stat_fontsize}); 382 $_->set_fontsize ($::CFG->{stat_fontsize});
… …
373 391
374sub make_gauge_window { 392sub make_gauge_window {
375 my $gh = int $HEIGHT * $CFG->{gauge_size}; 393 my $gh = int $HEIGHT * $CFG->{gauge_size};
376 394
377 my $win = new CFClient::UI::Frame ( 395 my $win = new CFClient::UI::Frame (
378 req_y => -1, 396 force_x => 0,
397 force_y => "max",
379 user_w => $WIDTH, 398 force_w => $WIDTH,
380 user_h => $gh, 399 force_h => $gh,
381 ); 400 );
382 401
383 $win->add (my $hbox = new CFClient::UI::HBox 402 $win->add (my $hbox = new CFClient::UI::HBox
384 children => [ 403 children => [
385 (new CFClient::UI::HBox expand => 1), 404 (new CFClient::UI::HBox expand => 1),
… …
421 &set_gauge_window_fontsize; 440 &set_gauge_window_fontsize;
422 441
423 $win 442 $win
424} 443}
425 444
445
426sub make_stats_window { 446sub make_stats_window {
427 my $tgw = new CFClient::UI::FancyFrame title => "Stats"; 447 my $tgw = new CFClient::UI::FancyFrame
448 y => $HEIGHT * (2/8),
449 x => "max",
450 title => "Stats",
451 name => "stats_window";
428 452
429 $tgw->add (new CFClient::UI::Window child => my $vb = new CFClient::UI::VBox); 453 $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, 454 $vb->add ($STATWIDS->{title} = new CFClient::UI::Label valign => 0, align => -1, text => "Title:", expand => 1,
431 can_hover => 1, can_events => 1, 455 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."); 456 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, 457 $vb->add ($STATWIDS->{map} = new CFClient::UI::Label valign => 0, align => -1, text => "Map:", expand => 1,
434 can_hover => 1, can_events => 1, 458 can_hover => 1, can_events => 1,
435 tooltip => "The map you are currently on (if supported by the server)."); 459 tooltip => "The map you are currently on (if supported by the server).");
460
461 $vb->add (my $hb0 = new CFClient::UI::HBox);
462 $hb0->add ($STATWIDS->{weight} = new CFClient::UI::Label valign => 0, align => -1, text => "Weight:", expand => 1,
463 can_hover => 1, can_events => 1,
464 tooltip => "The weight of the player including all inventory items.");
465 $hb0->add ($STATWIDS->{m_weight} = new CFClient::UI::Label valign => 0, align => -1, text => "Max weight:", expand => 1,
466 can_hover => 1, can_events => 1,
467 tooltip => "The weight limit: you cannot carry more than this.");
468
436 469
437 $vb->add (my $hb = new CFClient::UI::HBox expand => 1); 470 $vb->add (my $hb = new CFClient::UI::HBox expand => 1);
438 $hb->add (my $tbl = new CFClient::UI::Table expand => 1); 471 $hb->add (my $tbl = new CFClient::UI::Table expand => 1);
439 472
440 my $color2 = [1, 1, 0]; 473 my $color2 = [1, 1, 0];
… …
522 update_stats_window ({}); 555 update_stats_window ({});
523 556
524 $tgw 557 $tgw
525} 558}
526 559
527sub formsep { 560sub formsep($) {
528 reverse join ",", grep length, split /(...)/, reverse $_[0] * 1 561 scalar reverse join ",", unpack "(A3)*", reverse $_[0] * 1
529} 562}
530 563
531sub update_stats_window { 564sub update_stats_window {
532 my ($stats) = @_; 565 my ($stats) = @_;
533 566
534 # i love text protocols!!! 567 # I love text protocols...
568
535 my $hp = $stats->{Crossfire::Protocol::CS_STAT_HP} * 1; 569 my $hp = $stats->{+CS_STAT_HP} * 1;
536 my $hp_m = $stats->{Crossfire::Protocol::CS_STAT_MAXHP} * 1; 570 my $hp_m = $stats->{+CS_STAT_MAXHP} * 1;
537 my $sp = $stats->{Crossfire::Protocol::CS_STAT_SP} * 1; 571 my $sp = $stats->{+CS_STAT_SP} * 1;
538 my $sp_m = $stats->{Crossfire::Protocol::CS_STAT_MAXSP} * 1; 572 my $sp_m = $stats->{+CS_STAT_MAXSP} * 1;
539 my $fo = $stats->{Crossfire::Protocol::CS_STAT_FOOD} * 1; 573 my $fo = $stats->{+CS_STAT_FOOD} * 1;
540 my $fo_m = 999; 574 my $fo_m = 999;
541 my $gr = $stats->{Crossfire::Protocol::CS_STAT_GRACE} * 1; 575 my $gr = $stats->{+CS_STAT_GRACE} * 1;
542 my $gr_m = $stats->{Crossfire::Protocol::CS_STAT_MAXGRACE} * 1; 576 my $gr_m = $stats->{+CS_STAT_MAXGRACE} * 1;
543 577
544 $GAUGES->{hp} ->set_value ($hp, $hp_m); 578 $GAUGES->{hp} ->set_value ($hp, $hp_m);
545 $GAUGES->{mana} ->set_value ($sp, $sp_m); 579 $GAUGES->{mana} ->set_value ($sp, $sp_m);
546 $GAUGES->{food} ->set_value ($fo, $fo_m); 580 $GAUGES->{food} ->set_value ($fo, $fo_m);
547 $GAUGES->{grace} ->set_value ($gr, $gr_m); 581 $GAUGES->{grace} ->set_value ($gr, $gr_m);
548 $GAUGES->{exp} ->set_text ("Exp: " . (formsep $stats->{Crossfire::Protocol::CS_STAT_EXP64}) 582 $GAUGES->{exp} ->set_text ("Exp: " . (formsep $stats->{+CS_STAT_EXP64})
549 . " (lvl " . ($stats->{Crossfire::Protocol::CS_STAT_LEVEL} * 1) . ")"); 583 . " (lvl " . ($stats->{+CS_STAT_LEVEL} * 1) . ")");
550 my $rng = $stats->{Crossfire::Protocol::CS_STAT_RANGE}; 584 my $rng = $stats->{+CS_STAT_RANGE};
551 $rng =~ s/^Range: //; # thank you so much dear server 585 $rng =~ s/^Range: //; # thank you so much dear server
552 $GAUGES->{range} ->set_text ("Rng: " . $rng); 586 $GAUGES->{range} ->set_text ("Rng: " . $rng);
553 my $title = $stats->{Crossfire::Protocol::CS_STAT_TITLE}; 587 my $title = $stats->{+CS_STAT_TITLE};
554 $title =~ s/^Player: //; 588 $title =~ s/^Player: //;
555 $STATWIDS->{title} ->set_text ("Title: " . $title); 589 $STATWIDS->{title} ->set_text ("Title: " . $title);
556 590
557 $STATWIDS->{st_str} ->set_text (sprintf "%d", $stats->{5}); 591 $STATWIDS->{st_str} ->set_text (sprintf "%d" , $stats->{+CS_STAT_STR});
558 $STATWIDS->{st_dex} ->set_text (sprintf "%d", $stats->{8}); 592 $STATWIDS->{st_dex} ->set_text (sprintf "%d" , $stats->{+CS_STAT_DEX});
559 $STATWIDS->{st_con} ->set_text (sprintf "%d", $stats->{9}); 593 $STATWIDS->{st_con} ->set_text (sprintf "%d" , $stats->{+CS_STAT_CON});
560 $STATWIDS->{st_int} ->set_text (sprintf "%d", $stats->{6}); 594 $STATWIDS->{st_int} ->set_text (sprintf "%d" , $stats->{+CS_STAT_INT});
561 $STATWIDS->{st_wis} ->set_text (sprintf "%d", $stats->{7}); 595 $STATWIDS->{st_wis} ->set_text (sprintf "%d" , $stats->{+CS_STAT_WIS});
562 $STATWIDS->{st_pow} ->set_text (sprintf "%d", $stats->{22}); 596 $STATWIDS->{st_pow} ->set_text (sprintf "%d" , $stats->{+CS_STAT_POW});
563 $STATWIDS->{st_cha} ->set_text (sprintf "%d", $stats->{10}); 597 $STATWIDS->{st_cha} ->set_text (sprintf "%d" , $stats->{+CS_STAT_CHA});
564 $STATWIDS->{st_wc} ->set_text (sprintf "%d", $stats->{13}); 598 $STATWIDS->{st_wc} ->set_text (sprintf "%d" , $stats->{+CS_STAT_WC});
565 $STATWIDS->{st_ac} ->set_text (sprintf "%d", $stats->{14}); 599 $STATWIDS->{st_ac} ->set_text (sprintf "%d" , $stats->{+CS_STAT_AC});
566 $STATWIDS->{st_dam} ->set_text (sprintf "%d", $stats->{15}); 600 $STATWIDS->{st_dam} ->set_text (sprintf "%d" , $stats->{+CS_STAT_DAM});
567 $STATWIDS->{st_arm} ->set_text (sprintf "%d", $stats->{16}); 601 $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}); 602 $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}); 603 $STATWIDS->{st_wspd}->set_text (sprintf "%.1f", $stats->{+CS_STAT_WEAP_SP});
570 604
605 $STATWIDS->{m_weight}->set_text (sprintf "Max weight: %.1fkg", $stats->{+CS_STAT_WEIGHT_LIM} / 1000);
606
607 # TODO: replace by CS_STAT_RES_xxx constants
571 my %tbl = ( 608 my %tbl = (
572 phys => 100, 609 phys => 100,
573 magic => 101, 610 magic => 101,
574 fire => 102, 611 fire => 102,
575 elec => 103, 612 elec => 103,
… …
584 tund => 112, 621 tund => 112,
585 fear => 113, 622 fear => 113,
586 depl => 113, 623 depl => 113,
587 deat => 115, 624 deat => 115,
588 holyw => 116, 625 holyw => 116,
589 blind => 117 626 blind => 117,
590 ); 627 );
591 628
592 for (keys %tbl) {
593 $STATWIDS->{"res_$_"}->set_text (sprintf "%d%", $stats->{$tbl{$_}}); 629 $STATWIDS->{"res_$_"}->set_text (sprintf "%d%", $stats->{$tbl{$_}})
594 } 630 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} 631}
607 632
608my $METASERVER_ATIME; 633my $METASERVER_ATIME;
609 634
610sub update_metaserver { 635sub update_metaserver {
611 my ($HOST) = @_;
612
613 return if $METASERVER_ATIME > time; 636 return if $METASERVER_ATIME > time;
614 $METASERVER_ATIME = time + 60; 637 $METASERVER_ATIME = time + 60;
615 638
616 my $table = $METASERVER->{table}; 639 my $table = $METASERVER->{table};
617 $table->clear; 640 $table->clear;
… …
668 $m = [$users, $host, $uptime, $version, $desc]; 691 $m = [$users, $host, $uptime, $version, $desc];
669 692
670 $y++; 693 $y++;
671 694
672 $table->add (0, $y, new CFClient::UI::VBox children => [ 695 $table->add (0, $y, new CFClient::UI::VBox children => [
673 (new CFClient::UI::Button text => "Use", connect_activate => sub { 696 (new CFClient::UI::Button text => "Use", on_activate => sub {
674 $HOST->set_text ($CFG->{host} = $host); 697 $HOST_ENTRY->set_text ($CFG->{host} = $host);
698 $METASERVER->toggle_visibility;
675 }), 699 }),
676 (new CFClient::UI::Empty expand => 1), 700 (new CFClient::UI::Empty expand => 1),
677 ]); 701 ]);
678 702
679 $table->add ($_ + 1, $y, new CFClient::UI::Label 703 $table->add ($_ + 1, $y, new CFClient::UI::Label
… …
682 } 706 }
683 } 707 }
684 }); 708 });
685} 709}
686 710
711sub metaserver_dialog {
712 my $dialog = new CFClient::UI::FancyFrame
713 title => "Server List",
714 name => 'metaserver_dialog',
715 x => 'center',
716 y => 'center',
717 z => 3,
718 child => (my $vbox = new CFClient::UI::VBox),
719 on_visibility_change => sub {
720 update_metaserver if $_[1];
721 },
722 ;
723
724 $vbox->add ($dialog->{table} = new CFClient::UI::Table);
725
726 $dialog
727}
728
687sub server_setup { 729sub server_setup {
688 my $dialog = new CFClient::UI::FancyFrame
689 title => "Server Setup",
690 child => (my $vbox = new CFClient::UI::VBox); 730 my $vbox = new CFClient::UI::VBox;
691 731
692 $vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]); 732 $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"); 733 $table->add (0, 2, new CFClient::UI::Label valign => 0, align => 1, text => "Host:Port");
694 734
695 { 735 {
696 $table->add (1, 2, my $vbox = new CFClient::UI::VBox); 736 $table->add (1, 2, my $vbox = new CFClient::UI::VBox);
697 737
698 $vbox->add ( 738 $vbox->add (
699 my $HOST = new CFClient::UI::Entry 739 $HOST_ENTRY = new CFClient::UI::Entry
700 expand => 1, 740 expand => 1,
701 text => $CFG->{host}, 741 text => $CFG->{host},
702 tooltip => "The hostname or ip address of the Crossfire(+) server to connect to", 742 tooltip => "The hostname or ip address of the Crossfire(+) server to connect to",
703 connect_changed => sub { 743 on_changed => sub {
704 my ($self, $value) = @_; 744 my ($self, $value) = @_;
705 $CFG->{host} = $value; 745 $CFG->{host} = $value;
706 } 746 }
707 ); 747 );
708 748
709 $METASERVER = metaserver_dialog; 749 $METASERVER = metaserver_dialog;
710 750
711 $vbox->add (new CFClient::UI::Flopper 751 $vbox->add (new CFClient::UI::Button
712 expand => 1, 752 expand => 1,
713 text => "Server List", 753 text => "Server List",
714 other => $METASERVER, 754 other => $METASERVER,
715 tooltip => "Show a list of available crossfire servers", 755 tooltip => "Show a list of available crossfire servers",
716 connect_open => sub { 756 on_activate => sub { $METASERVER->toggle_visibility },
717 update_metaserver $HOST;
718 }
719 ); 757 );
720 } 758 }
721 759
722 $table->add (0, 4, new CFClient::UI::Label valign => 0, align => 1, text => "Username"); 760 $table->add (0, 4, new CFClient::UI::Label valign => 0, align => 1, text => "Username");
723 $table->add (1, 4, new CFClient::UI::Entry 761 $table->add (1, 4, new CFClient::UI::Entry
724 text => $CFG->{user}, 762 text => $CFG->{user},
725 tooltip => "The name of your character on the server", 763 tooltip => "The name of your character on the server",
726 connect_changed => sub { 764 on_changed => sub {
727 my ($self, $value) = @_; 765 my ($self, $value) = @_;
728 $CFG->{user} = $value; 766 $CFG->{user} = $value;
729 } 767 }
730 ); 768 );
731 769
732 $table->add (0, 5, new CFClient::UI::Label valign => 0, align => 1, text => "Password"); 770 $table->add (0, 5, new CFClient::UI::Label valign => 0, align => 1, text => "Password");
733 $table->add (1, 5, new CFClient::UI::Entry 771 $table->add (1, 5, new CFClient::UI::Entry
734 text => $CFG->{password}, 772 text => $CFG->{password},
735 hidden => 1, 773 hidden => 1,
736 tooltip => "The password for your character", 774 tooltip => "The password for your character",
737 connect_changed => sub { 775 on_changed => sub {
738 my ($self, $value) = @_; 776 my ($self, $value) = @_;
739 $CFG->{password} = $value; 777 $CFG->{password} = $value;
740 } 778 }
741 ); 779 );
742 780
743 $table->add (0, 7, new CFClient::UI::Label valign => 0, align => 1, text => "Map Size"); 781 $table->add (0, 7, new CFClient::UI::Label valign => 0, align => 1, text => "Map Size");
744 $table->add (1, 7, new CFClient::UI::Slider 782 $table->add (1, 7, new CFClient::UI::Slider
745 req_w => 100, 783 force_w => 100,
746 range => [$CFG->{mapsize}, 10, 100, 0, 1], 784 range => [$CFG->{mapsize}, 10, 100, 0, 1],
747 tooltip => "This is the size of the portion of the map update the server sends you. " 785 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, " 786 . "If you set this to a high value you will be able to see further, "
749 . "but you also increase bandwidth requirements and latency. " 787 . "but you also increase bandwidth requirements and latency. "
750 . "This option is only used once at log-in.", 788 . "This option is only used once at log-in.",
751 connect_changed => sub { 789 on_changed => sub {
752 my ($self, $value) = @_; 790 my ($self, $value) = @_;
753 791
754 $CFG->{mapsize} = $self->{range}[0] = $value = int $value; 792 $CFG->{mapsize} = $self->{range}[0] = $value = int $value;
755 }, 793 },
756 ); 794 );
… …
763 . "This might increase or create lag, but increases the chances " 801 . "This might increase or create lag, but increases the chances "
764 . "of faces being ready for display when you encounter them. " 802 . "of faces being ready for display when you encounter them. "
765 . "It also uses up server bandwidth on every connect, " 803 . "It also uses up server bandwidth on every connect, "
766 . "so only set it if you really need to prefetch images. " 804 . "so only set it if you really need to prefetch images. "
767 . "This option can be set and unset any time.", 805 . "This option can be set and unset any time.",
768 connect_changed => sub { $CFG->{face_prefetch} = $_[1] }, 806 on_changed => sub { $CFG->{face_prefetch} = $_[1] },
769 ); 807 );
770 808
771 $table->add (0, 9, new CFClient::UI::Label valign => 0, align => 1, text => "Output-Count"); 809 $table->add (0, 9, new CFClient::UI::Label valign => 0, align => 1, text => "Output-Count");
772 $table->add (1, 9, new CFClient::UI::Entry 810 $table->add (1, 9, new CFClient::UI::Entry
773 text => $CFG->{output_count}, 811 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.", 812 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] }, 813 on_changed => sub { $CFG->{output_count} = $_[1] },
776 ); 814 );
777 815
778 $table->add (0, 10, new CFClient::UI::Label valign => 0, align => 1, text => "Output-Sync"); 816 $table->add (0, 10, new CFClient::UI::Label valign => 0, align => 1, text => "Output-Sync");
779 $table->add (1, 10, new CFClient::UI::Entry 817 $table->add (1, 10, new CFClient::UI::Entry
780 text => $CFG->{output_sync}, 818 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.", 819 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] }, 820 on_changed => sub { $CFG->{output_sync} = $_[1] },
783 ); 821 );
784 822
785 $table->add (1, 11, $LOGIN_BUTTON = new CFClient::UI::Button 823 $table->add (1, 11, $LOGIN_BUTTON = new CFClient::UI::Button
786 expand => 1, 824 expand => 1,
787 align => 0, 825 align => 0,
788 text => "Login", 826 text => "Login",
789 connect_activate => sub { 827 on_activate => sub {
790 $CONN ? stop_game 828 $CONN ? stop_game
791 : start_game; 829 : start_game;
792 }, 830 },
793 ); 831 );
794 832
795 $dialog 833 $table->add (0, 12, new CFClient::UI::Label valign => 0, align => 1, text => "Chat Command");
834 $table->add (1, 12, my $saycmd = new CFClient::UI::Entry
835 text => $CFG->{say_command},
836 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. "
837 . "Usually you want to enter something like 'say' or 'shout' or 'gsay' here. "
838 . "But you could also set it to <b>tell <i>playername</i></b> to only chat with that user.",
839 on_changed => sub {
840 my ($self, $value) = @_;
841 $CFG->{say_command} = $value;
842 }
843 );
844
845 $vbox
796} 846}
797 847
798sub message_window { 848sub message_window {
799 my $window = new CFClient::UI::FancyFrame 849 my $window = new CFClient::UI::FancyFrame
850 name => "message_window",
800 title => "Messages", 851 title => "Messages",
801 border_bg => [1, 1, 1, 1], 852 border_bg => [1, 1, 1, 1],
802 bg => [0, 0, 0, 0.75], 853 bg => [0, 0, 0, 0.75],
854 x => "max",
855 y => 0,
803 user_w => int $::WIDTH / 3, 856 force_w => $::WIDTH / 3,
804 user_h => int $::HEIGHT / 5, 857 force_h => $::HEIGHT / 5,
805 child => (my $vbox = new CFClient::UI::VBox); 858 child => (my $vbox = new CFClient::UI::VBox);
806 859
807 $vbox->add ($LOGVIEW); 860 $vbox->add ($LOGVIEW);
808 861
809 $vbox->add (my $input = new CFClient::UI::Entry 862 $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> " 863 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>...). " 864 . "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). " 865 . "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.", 866 . "A better way to submit commands (and the occasional chat command) is often the map command completer.",
814 connect_focus_in => sub { 867 on_focus_in => sub {
815 my ($input, $prev_focus) = @_; 868 my ($input, $prev_focus) = @_;
816 869
817 delete $input->{refocus_map}; 870 delete $input->{refocus_map};
818 871
819 if ($prev_focus == $MAPWIDGET && $input->{auto_activated}) { 872 if ($prev_focus == $MAPWIDGET && $input->{auto_activated}) {
820 $input->{refocus_map} = 1; 873 $input->{refocus_map} = 1;
821 } 874 }
822 delete $input->{auto_activated}; 875 delete $input->{auto_activated};
823 }, 876 },
824 connect_activate => sub { 877 on_activate => sub {
825 my ($input, $text) = @_; 878 my ($input, $text) = @_;
826 $input->set_text (''); 879 $input->set_text ('');
827 880
828 if ($text =~ /^\/(.*)/) { 881 if ($text =~ /^\/(.*)/) {
829 $::CONN->user_send ($1); 882 $::CONN->user_send ($1);
… …
834 if ($input->{refocus_map}) { 887 if ($input->{refocus_map}) {
835 delete $input->{refocus_map}; 888 delete $input->{refocus_map};
836 $MAPWIDGET->focus_in 889 $MAPWIDGET->focus_in
837 } 890 }
838 }, 891 },
839 connect_escape => sub { 892 on_escape => sub {
840 $MAPWIDGET->focus_in 893 $MAPWIDGET->focus_in
841 }, 894 },
842 ); 895 );
843 896
844 $CONSOLE = { 897 $CONSOLE = {
845 window => $window, 898 window => $window,
846 input => $input 899 input => $input,
847 }; 900 };
848 901
849 $window 902 $window
850} 903}
851 904
852sub open_quit_dialog { 905sub open_quit_dialog {
853 unless ($QUIT_DIALOG) { 906 unless ($QUIT_DIALOG) {
854
855 $QUIT_DIALOG = new CFClient::UI::FancyFrame title => "Really Quit?"; 907 $QUIT_DIALOG = new CFClient::UI::FancyFrame
908 x => "center",
909 y => "center",
910 z => 50,
911 title => "Really Quit?",
912 ;
856 913
857 $QUIT_DIALOG->add (my $vb = new CFClient::UI::VBox expand => 1); 914 $QUIT_DIALOG->add (my $vb = new CFClient::UI::VBox expand => 1);
858 915
859 $vb->add (new CFClient::UI::Label 916 $vb->add (new CFClient::UI::Label
860 text => "You should find a savebed and apply it first!", 917 text => "You should find a savebed and apply it first!",
… …
863 ); 920 );
864 $vb->add (my $hb = new CFClient::UI::HBox expand => 1); 921 $vb->add (my $hb = new CFClient::UI::HBox expand => 1);
865 $hb->add (new CFClient::UI::Button 922 $hb->add (new CFClient::UI::Button
866 text => "Ok", 923 text => "Ok",
867 expand => 1, 924 expand => 1,
868 connect_activate => sub { $QUIT_DIALOG->hide }, 925 on_activate => sub { $QUIT_DIALOG->hide },
869 ); 926 );
870 $hb->add (new CFClient::UI::Button 927 $hb->add (new CFClient::UI::Button
871 text => "Quit anyway", 928 text => "Quit anyway",
872 expand => 1, 929 expand => 1,
873 connect_activate => sub { exit }, 930 on_activate => sub { exit },
874 ); 931 );
932 }
875 933
876 $QUIT_DIALOG->show_centered; 934 $QUIT_DIALOG->show;
877 } else { 935}
878 $QUIT_DIALOG->show_centered; 936
937sub autopickup_setup {
938 my $table = new CFClient::UI::Table;
939
940 for (
941 ["General", 0, 0,
942 ["Enable autopickup" => PICKUP_NEWMODE],
943 ["Inhibit autopickup" => PICKUP_INHIBIT],
944 ["Stop before pickup" => PICKUP_STOP],
945 ["Debug autopickup" => PICKUP_DEBUG],
946 ],
947 ["Weapons", 0, 6,
948 ["All weapons" => PICKUP_ALLWEAPON],
949 ["Missile weapons" => PICKUP_MISSILEWEAPON],
950 ["Bows" => PICKUP_BOW],
951 ["Arrows" => PICKUP_ARROW],
952 ],
953 ["Armour", 0, 12,
954 ["Helmets" => PICKUP_HELMET],
955 ["Shields" => PICKUP_SHIELD],
956 ["Body Armour" => PICKUP_ARMOUR],
957 ["Boots" => PICKUP_BOOTS],
958 ["Gloves" => PICKUP_GLOVES],
959 ["Cloaks" => PICKUP_CLOAK],
960 ],
961
962 ["Readables", 2, 2,
963 ["Spellbooks" => PICKUP_SPELLBOOK],
964 ["Skillscrolls" => PICKUP_SKILLSCROLL],
965 ["Normal Books/Scrolls" => PICKUP_READABLES],
966 ],
967 ["Misc", 2, 7,
968 ["Food" => PICKUP_FOOD],
969 ["Drinks" => PICKUP_DRINK],
970 ["Valuables (Money, Gems)" => PICKUP_VALUABLES],
971 ["Keys" => PICKUP_KEY],
972 ["Magical Items" => PICKUP_MAGICAL],
973 ["Potions" => PICKUP_POTION],
974 ["Magic Devices" => PICKUP_MAGIC_DEVICE],
975 ["Ignore cursed" => PICKUP_NOT_CURSED],
976 ["Jewelery" => PICKUP_JEWELS],
977 ],
978 )
879 } 979 {
980 my ($title, $x, $y, @bits) = @$_;
981 $table->add ($x, $y, new CFClient::UI::Label text => $title, align => 1, fg => [1, 1, 0]);
982
983 for (@bits) {
984 ++$y;
985
986 my $mask = $_->[1];
987 $table->add ($x , $y, new CFClient::UI::Label text => $_->[0], align => 1, expand => 1);
988 $table->add ($x+1, $y, new CFClient::UI::CheckBox
989 state => $CFG->{pickup} & $mask,
990 on_changed => sub {
991 my ($box, $value) = @_;
992 if ($value) {
993 $::CFG->{pickup} |= $mask;
994 } else {
995 $::CFG->{pickup} = $::CFG->{pickup} & ~$mask;
996 }
997 $::CONN->send (sprintf "command pickup %u", $::CFG->{pickup})
998 if defined $::CONN;
999 });
1000 }
1001 }
1002
1003 $table
880} 1004}
881 1005
882sub make_inventory_window { 1006sub make_inventory_window {
883 my $invwin = new CFClient::UI::FancyFrame 1007 my $invwin = $INV_WINDOW = new CFClient::UI::FancyFrame
884 user_w => $WIDTH * (7/8), user_h => $HEIGHT * (7/8), title => "Inventory"; 1008 x => "center",
1009 y => "center",
1010 force_w => $WIDTH * 9/10,
1011 force_h => $HEIGHT * 9/10,
1012 title => "Inventory",
1013 ;
885 1014
886 $invwin->add (my $hb = new CFClient::UI::HBox expand => 1); 1015 $invwin->add (my $hb = new CFClient::UI::HBox homogeneous => 1);
887 1016
888 $hb->add (my $vb1 = new CFClient::UI::VBox expand => 1); 1017 $hb->add (my $vb1 = new CFClient::UI::VBox);
889 $vb1->add (my $lbl = new CFClient::UI::Label); 1018 $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); 1019 $vb1->add ($INV = new CFClient::UI::Inventory expand => 1);
892 1020
893 $hb->add (my $vb2 = new CFClient::UI::VBox expand => 1); 1021 $hb->add (my $vb2 = new CFClient::UI::VBox);
1022
894 $vb2->add ($INVR_LBL = new CFClient::UI::Label); 1023 $vb2->add ($INV_RIGHT_HB = new CFClient::UI::HBox);
895 $INVR_LBL->set_text ("Floor"); 1024
896 $vb2->add ($INVR = new CFClient::UI::Inventory expand => 1); 1025 $vb2->add ($INVR = new CFClient::UI::Inventory expand => 1);
897 1026
1027 # XXX: Call after $INVR = ... because set_opencont sets the items
1028 CFClient::Protocol::set_opencont ($::CONN, 0, "Floor");
1029
898 $invwin 1030 $invwin
1031}
1032
1033sub spell_setup {
1034 new CFClient::UI::SpellList
1035}
1036
1037sub keyboard_setup {
1038 my $binding_list = new CFClient::UI::VBox;
1039
1040 my $refresh;
1041 $refresh = sub {
1042 $binding_list->clear ();
1043
1044 for my $mod (keys %{$::CFG->{bindings}}) {
1045 for my $sym (keys %{$::CFG->{bindings}->{$mod}}) {
1046 my $cmds = $::CFG->{bindings}->{$mod}->{$sym};
1047 next unless ref $cmds eq 'ARRAY' and @$cmds > 0;
1048
1049 my $lbl = join "; ", @$cmds;
1050 my $nam = CFClient::Binder::keycombo_to_name ($mod, $sym);
1051 $binding_list->add (my $hb = new CFClient::UI::HBox);
1052 $hb->add (new CFClient::UI::Button
1053 text => "delete",
1054 tooltip => "Deletes the binding",
1055 on_activate => sub {
1056 $binding_list->remove ($hb);
1057 delete $::CFG->{bindings}->{$mod}->{$sym};
1058 });
1059
1060 $hb->add (new CFClient::UI::Button
1061 text => "edit",
1062 tooltip => "Edits the binding",
1063 on_activate => sub {
1064 $::BIND_EDITOR->set_binding (
1065 $mod, $sym, $::CFG->{bindings}->{$mod}->{$sym},
1066 sub {
1067 my ($nmod, $nsym, $ncmds) = @_;
1068 delete $::CFG->{bindings}->{$mod}->{$sym};
1069 $::CFG->{bindings}->{$nmod}->{$nsym} = $ncmds;
1070 $refresh->();
1071 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1072 $SETUP_DIALOG->show;
1073 },
1074 sub {
1075 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1076 $SETUP_DIALOG->show;
1077 });
1078 $::BIND_EDITOR->show;
1079 $SETUP_DIALOG->hide;
1080 });
1081
1082 $hb->add (new CFClient::UI::Label text => "(Key: $nam)");
1083 $hb->add (new CFClient::UI::Label text => $lbl, expand => 1);
1084 }
1085 }
1086 };
1087
1088 my $vb = new CFClient::UI::VBox;
1089 $vb->add ($binding_list);
1090 $vb->add (my $hb = new CFClient::UI::HBox);
1091
1092 $hb->add (new CFClient::UI::Button
1093 text => "record new",
1094 expand => 1,
1095 tooltip => "This button opens the binding editor with an empty binding.",
1096 on_activate => sub {
1097 $::BIND_EDITOR->set_binding (undef, undef, [],
1098 sub {
1099 my ($mod, $sym, $cmds) = @_;
1100 $::CFG->{bindings}->{$mod}->{$sym} = $cmds;
1101 $refresh->();
1102 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1103 $SETUP_DIALOG->show;
1104 },
1105 sub {
1106 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1107 $SETUP_DIALOG->show;
1108 },
1109 );
1110 $SETUP_DIALOG->hide;
1111 $::BIND_EDITOR->show;
1112 },
1113 );
1114
1115 $hb->add (new CFClient::UI::Button
1116 text => "close",
1117 tooltip => "Closes the binding window",
1118 expand => 1,
1119 on_activate => sub {
1120 $SETUP_DIALOG->hide;
1121 }
1122 );
1123
1124 $refresh->();
1125
1126 $vb
899} 1127}
900 1128
901sub make_help_window { 1129sub make_help_window {
902 my $win = new CFClient::UI::FancyFrame 1130 my $win = new CFClient::UI::FancyFrame
903 user_w => $WIDTH * (7/8), user_h => $HEIGHT * (7/8), title => "Documentation"; 1131 x => 'center',
1132 y => 'center',
1133 z => 2,
1134 name => 'doc_browser',
1135 force_w => int $WIDTH * 7/8,
1136 force_h => int $HEIGHT * 7/8,
1137 title => "Documentation";
904 1138
905 $win->add (my $vbox = new CFClient::UI::VBox); 1139 $win->add (my $vbox = new CFClient::UI::VBox);
906 1140
907 $vbox->add (my $buttons = new CFClient::UI::HBox); 1141 $vbox->add (my $buttons = new CFClient::UI::HBox);
908 $vbox->add (my $viewer = new CFClient::UI::TextView expand => 1, fontsize => 0.8); 1142 $vbox->add (my $viewer = new CFClient::UI::TextView expand => 1, fontsize => 0.8);
… …
915 ) { 1149 ) {
916 my ($pod, $label) = @$_; 1150 my ($pod, $label) = @$_;
917 1151
918 $buttons->add (new CFClient::UI::Button 1152 $buttons->add (new CFClient::UI::Button
919 text => $label, 1153 text => $label,
920 connect_activate => sub { 1154 on_activate => sub {
921 my $parser = new Pod::POM; 1155 my $pom = CFClient::load_pod CFClient::find_rcfile "pod/$pod.pod",
922 my $pom = $parser->parse_file (CFClient::find_rcfile "pod/$pod.pod"); 1156 doc_viewer => 1, sub { CFClient::pod_to_pango_list $_[0] };
923 1157
924 $viewer->clear; 1158 $viewer->clear;
925 1159
926 $viewer->add_paragraph ([1, 1, 1, 1], $_->[1], $_->[0]) 1160 $viewer->add_paragraph ([1, 1, 1, 1], $_->[1], $_->[0])
927 for @{ CFClient::pod_to_pango_list $pom }; 1161 for @$pom;
928 1162
929 $viewer->set_offset (0); 1163 $viewer->set_offset (0);
930 }, 1164 },
931 ); 1165 );
932 } 1166 }
… …
956 or die "SDL_SetVideoMode failed: " . (CFClient::SDL_GetError) . "\n"; 1190 or die "SDL_SetVideoMode failed: " . (CFClient::SDL_GetError) . "\n";
957 1191
958 $SDL_ACTIVE = 1; 1192 $SDL_ACTIVE = 1;
959 $LAST_REFRESH = time - 0.01; 1193 $LAST_REFRESH = time - 0.01;
960 1194
961 CFClient::gl_init; 1195 CFClient::OpenGL::init;
962 1196
963 $FONTSIZE = int $HEIGHT / 40 * $CFG->{gui_fontsize}; 1197 $FONTSIZE = int $HEIGHT / 40 * $CFG->{gui_fontsize};
964 1198
965 $CFClient::UI::ROOT->configure (0, 0, $WIDTH, $HEIGHT);#d# 1199 $CFClient::UI::ROOT->configure (0, 0, $WIDTH, $HEIGHT);#d#
966 1200
… …
969 if ($DEBUG_STATUS) { 1203 if ($DEBUG_STATUS) {
970 CFClient::UI::rescale_widgets $WIDTH / $old_w, $HEIGHT / $old_h; 1204 CFClient::UI::rescale_widgets $WIDTH / $old_w, $HEIGHT / $old_h;
971 } else { 1205 } else {
972 # create the widgets 1206 # create the widgets
973 1207
974 $DEBUG_STATUS = new CFClient::UI::Label padding => 0, z => 100, req_x => -1; 1208 $DEBUG_STATUS = new CFClient::UI::Label
1209 padding => 0,
1210 z => 100,
1211 force_x => "max",
1212 force_y => 0;
975 $DEBUG_STATUS->show; 1213 $DEBUG_STATUS->show;
976 1214
1215 $BIND_EDITOR = new CFClient::UI::BindEditor (x => "max", y => 0);
1216
977 $STATUSBOX = new CFClient::UI::Statusbox; 1217 $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]); 1218 $STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", timeout => 864000, pri => -100, color => [1, 1, 1, 0.8]);
979 1219
980 (new CFClient::UI::Frame 1220 (new CFClient::UI::Frame
981 bg => [0, 0, 0, 0.4], 1221 bg => [0, 0, 0, 0.4],
982 req_y => -1, 1222 force_x => 0,
1223 force_y => "max",
983 child => $STATUSBOX, 1224 child => $STATUSBOX,
984 )->show; 1225 )->show;
985 1226
986 CFClient::UI::FancyFrame->new ( 1227 CFClient::UI::FancyFrame->new (
1228 title => "Map",
1229 name => "mapmap",
1230 x => 0,
1231 y => $FONTSIZE + 8,
987 border_bg => [1, 1, 1, 192/255], 1232 border_bg => [1, 1, 1, 192/255],
988 bg => [1, 1, 1, 0], 1233 bg => [1, 1, 1, 0],
989 child => ($MAPMAP = new CFClient::MapWidget::MapMap 1234 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.", 1235 tooltip => "<b>Map</b>. On servers that support this feature, this will display an overview of the surrounding areas.",
991 ), 1236 ),
… …
1014 can_hover => 1, 1259 can_hover => 1,
1015 can_events => 1, 1260 can_events => 1,
1016 tooltip => "<b>Server Log</b>. This text viewer contains all the messages sent by the server.", 1261 tooltip => "<b>Server Log</b>. This text viewer contains all the messages sent by the server.",
1017 ; 1262 ;
1018 1263
1019 $BUTTONBAR = new CFClient::UI::HBox; 1264 $SETUP_DIALOG = new CFClient::UI::FancyFrame
1265 title => "Setup",
1266 name => "setup_dialog",
1267 x => 'center',
1268 y => 'center',
1269 z => 2,
1270 force_w => $::WIDTH * 0.6,
1271 force_h => $::HEIGHT * 0.6,
1272 ;
1020 1273
1274 $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new CFClient::UI::Notebook expand => 1, debug => 1,
1275 filter => new CFClient::UI::ScrolledWindow xxx => 1, expand => 1, scroll_y => 1);
1276
1277 $SETUP_NOTEBOOK->add (Server => $SETUP_SERVER = server_setup,
1278 "Configure the server to play on, your username, password and other server-related options.");
1279 $SETUP_NOTEBOOK->add (Pickup => autopickup_setup,
1280 "Configure autopickup settings, i.e. which items you will pick up automatically when walking (or running) over them.");
1281 $SETUP_NOTEBOOK->add (Graphics => graphics_setup,
1282 "Configure the video mode, performance, fonts and other graphical aspects of the game.");
1283 $SETUP_NOTEBOOK->add (Audio => audio_setup,
1284 "Configure the use of audio, sound effects and background music.");
1285 $SETUP_NOTEBOOK->add (Keyboard => $SETUP_KEYBOARD = keyboard_setup,
1286 "Lets you define, edit and delete bindings."
1287 . "There is a shortcut for making bindings: <b>Left Control + Insert</b> opens the binding editor "
1288 . "with nothing set and the recording started. After doing the actions you "
1289 . "want to record press <b>Insert</b> and you will be asked to press a key-combo. "
1290 . "After pressing the combo the binding will be saved automatically and the "
1291 . "binding editor closes");
1292 $SETUP_NOTEBOOK->add (Spells => $SETUP_SPELLS = spell_setup,
1293 "Displays all spells you have and lets you edit keyboard shortcuts for them.");
1294
1295 $BUTTONBAR = new CFClient::UI::Buttonbar x => 0, y => 0, z => 200; # put on top
1296
1021 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Client Setup", other => client_setup, 1297 $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."); 1298 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, 1299
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, 1300 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Message Window", other => message_window,
1026 tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server."); 1301 tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server.");
1027 1302
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 1303 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 1304
1030 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Stats Window", other => make_stats_window, 1305 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Stats Window", other => make_stats_window,
1031 tooltip => "Toggles the statistics window, where all your Stats and Resistances are being displayed at all times."); 1306 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, 1307 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Inventory", other => make_inventory_window,
1033 tooltip => "Toggles the inventory window, where you can manage your loot (or treaures :)."); 1308 tooltip => "Toggles the inventory window, where you can manage your loot (or treasures :). "
1309 . "You can also hit the <b>Tab</b>-key to show/hide the Inventory.");
1034 1310
1035 $BUTTONBAR->add (new CFClient::UI::Button 1311 $BUTTONBAR->add (new CFClient::UI::Button
1036 text => "Save Config", 1312 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.", 1313 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 { 1314 on_activate => sub {
1315 $::CFG->{layout} = CFClient::UI::get_layout;
1039 CFClient::write_cfg "$Crossfire::VARDIR/pclientrc"; 1316 CFClient::write_cfg "$Crossfire::VARDIR/cfplusrc";
1040 status "Configuration Saved"; 1317 status "Configuration Saved";
1041 }, 1318 },
1042 ); 1319 );
1043 1320
1044 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Help!", other => make_help_window, 1321 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Help!", other => make_help_window,
1045 tooltip => "View Documentation"); 1322 tooltip => "View Documentation");
1046 1323
1047 $BUTTONBAR->add (new CFClient::UI::Button 1324 $BUTTONBAR->add (new CFClient::UI::Button
1048 text => "Quit", 1325 text => "Quit",
1049 tooltip => "Terminates the program", 1326 tooltip => "Terminates the program",
1050 connect_activate => sub { 1327 on_activate => sub {
1051 if ($CONN) { 1328 if ($CONN) {
1052 open_quit_dialog; 1329 open_quit_dialog;
1053 } else { 1330 } else {
1054 exit; 1331 exit;
1055 } 1332 }
1056 }, 1333 },
1057 ); 1334 );
1058 1335
1059 $BUTTONBAR->show; 1336 $BUTTONBAR->show;
1337 $SETUP_DIALOG->show;
1338 }
1060 1339
1061 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]); 1340 $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 }
1071} 1341}
1072 1342
1073sub video_shutdown { 1343sub video_shutdown {
1074 undef $SDL_ACTIVE; 1344 undef $SDL_ACTIVE;
1075} 1345}
… …
1142 1412
1143my %demo;#d# 1413my %demo;#d#
1144 1414
1145sub force_refresh { 1415sub force_refresh {
1146 $fps = $fps * 0.95 + 1 / (($NOW - $LAST_REFRESH) || 0.1) * 0.05; 1416 $fps = $fps * 0.95 + 1 / (($NOW - $LAST_REFRESH) || 0.1) * 0.05;
1147 debug sprintf "%3.2f", $fps; 1417 debug sprintf "%3.2f", $fps if $ENV{CFPLUS_DEBUG} & 4;
1148 1418
1149 $CFClient::UI::ROOT->draw; 1419 $CFClient::UI::ROOT->draw;
1150 1420
1151 $WANT_REFRESH = 0; 1421 $WANT_REFRESH = 0;
1152 $CAN_REFRESH = 0; 1422 $CAN_REFRESH = 0;
… …
1207}; 1477};
1208 1478
1209 CFClient::SDL_GL_SwapBuffers; 1479 CFClient::SDL_GL_SwapBuffers;
1210} 1480}
1211 1481
1212my $refresh_watcher = Event->timer (after => 0, hard => 1, interval => 1 / $MAX_FPS, cb => sub { 1482my $refresh_watcher = Event->timer (after => 0, hard => 0, interval => 1 / $MAX_FPS, cb => sub {
1213 $NOW = time; 1483 $NOW = time;
1214 1484
1215 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_) 1485 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_)
1216 for CFClient::SDL_PollEvent; 1486 for CFClient::SDL_PollEvent;
1217 1487
… …
1235sub animation_stop { 1505sub animation_stop {
1236 my ($widget) = @_; 1506 my ($widget) = @_;
1237 delete $animate_object{$widget}; 1507 delete $animate_object{$widget};
1238} 1508}
1239 1509
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 1510# check once/second for faces that need to be prefetched
1735# this should, of course, only run on demand, but 1511# this should, of course, only run on demand, but
1736# SDL forces worse things on us.... 1512# SDL forces worse things on us....
1737 1513
1738Event->timer (after => 1, interval => 0.25, cb => sub { 1514Event->timer (after => 1, interval => 0.25, cb => sub {
1739 $CONN->face_prefetch 1515 $CONN->face_prefetch
1740 if $CONN; 1516 if $CONN;
1741}); 1517});
1742
1743sub update_floorbox {
1744 $CFClient::UI::ROOT->on_refresh ($FLOORBOX => sub {
1745 return unless $CONN;
1746
1747 $FLOORBOX->clear;
1748 $FLOORBOX->add (0, 1, new CFClient::UI::Empty expand => 1);
1749
1750 my $row;
1751 for (@{ $CONN->{container}{0} }) {
1752 if (++$row < 7) {
1753 local $_->{face_widget}; # hack to force recreation of widget
1754 local $_->{desc_widget}; # hack to force recreation of widget
1755 CFClient::Item::update_widgets $_;
1756
1757 $FLOORBOX->add (0, $row, $_->{face_widget});
1758 $FLOORBOX->add (1, $row, $_->{desc_widget});
1759 } else {
1760 $FLOORBOX->add (new CFClient::UI::Label text => "More...");
1761 last;
1762 }
1763 }
1764 });
1765
1766 $WANT_REFRESH++;
1767}
1768
1769sub conn::container_add {
1770 my ($self, $tag, $items) = @_;
1771
1772 #d# print "container_add: container $tag ($self->{player}{tag})\n";
1773
1774 if ($tag == 0) {
1775 update_floorbox;
1776 $OPENCONT = 0;
1777 $INVR_LBL->set_text ("Floor");
1778 $INVR->set_items ($self->{container}{0});
1779 } elsif ($tag == $self->{player}{tag}) {
1780 $INVR_LBL->set_text ("Player");
1781 $INV->set_items ($self->{container}{$self->{player}{tag}})
1782 } else {
1783 $OPENCONT = $tag;
1784 $INVR_LBL->set_text (CFClient::UI::InventoryItem::_item_to_desc ($self->{item}->{$OPENCONT}));
1785 $INVR->set_items ($self->{container}{$tag});
1786 }
1787
1788 # $self-<{player}{tag} => player inv
1789 #use PApp::Util; warn PApp::Util::dumpval $self->{container}{$self->{player}{tag}};
1790}
1791
1792sub conn::container_clear {
1793 my ($self, $tag) = @_;
1794
1795 #d# print "container_clear: container $tag ($self->{player}{tag})\n";
1796
1797 if ($tag == 0) {
1798 update_floorbox;
1799 $OPENCONT = 0;
1800 $INVR_LBL->set_text ("Floor");
1801 $INVR->set_items ($self->{container}{0});
1802 } elsif ($tag == $self->{player}{tag}) {
1803 $INVR_LBL->set_text ("Player");
1804 $INV->set_items ($self->{container}{$tag})
1805 } else {
1806 $OPENCONT = $tag;
1807 $INVR_LBL->set_text (CFClient::UI::InventoryItem::_item_to_desc ($self->{item}->{$OPENCONT}));
1808 $INVR->set_items ($self->{container}{$tag});
1809 }
1810
1811# use PApp::Util; warn PApp::Util::dumpval $self->{container}{0};
1812}
1813
1814sub conn::item_delete {
1815 my ($self, @items) = @_;
1816
1817 for (@items) {
1818 #d# print "item_delete: $_->{tag} from $_->{container} ($self->{player}{tag})\n";
1819
1820 if ($_->{container} == 0) {
1821 update_floorbox;
1822 $OPENCONT = 0;
1823 $INVR_LBL->set_text ("Floor");
1824 $INVR->set_items ($self->{container}{0});
1825 } elsif ($_->{container} == $self->{player}{tag}) {
1826 $INVR_LBL->set_text ("Player");
1827 $INV->set_items ($self->{container}{$self->{player}{tag}})
1828 } else {
1829 $OPENCONT = $_->{container};
1830 $INVR_LBL->set_text (CFClient::UI::InventoryItem::_item_to_desc ($self->{item}->{$OPENCONT}));
1831 $INVR->set_items ($self->{container}{$_->{container}});
1832 }
1833 }
1834}
1835
1836sub conn::item_update {
1837 my ($self, $item) = @_;
1838
1839 #d# print "item_update: $item->{tag} in $item->{container} ($self->{player}{tag}) ($OPENCONT)\n";
1840
1841 if ($item->{tag} == $OPENCONT && not ($item->{flags} & Crossfire::Protocol::F_OPEN)) {
1842 $OPENCONT = 0;
1843 $INVR_LBL->set_text ("Floor");
1844 $INVR->set_items ($self->{container}{0});
1845
1846 $item->{widget}->update_item
1847 if $item->{widget};
1848 } else {
1849 if ($item->{container} == 0) {
1850 update_floorbox;
1851 $OPENCONT = 0;
1852 $INVR_LBL->set_text ("Floor");
1853 $INVR->set_items ($self->{container}{0});
1854 } elsif ($item->{container} == $self->{player}{tag}) {
1855 $INV->set_items ($self->{container}{$item->{container}})
1856 }
1857 }
1858}
1859 1518
1860%SDL_CB = ( 1519%SDL_CB = (
1861 CFClient::SDL_QUIT => sub { 1520 CFClient::SDL_QUIT => sub {
1862 Event::unloop -1; 1521 Event::unloop -1;
1863 }, 1522 },
… …
1895############################################################################# 1554#############################################################################
1896 1555
1897$SIG{INT} = $SIG{TERM} = sub { exit }; 1556$SIG{INT} = $SIG{TERM} = sub { exit };
1898 1557
1899{ 1558{
1900 local $SIG{__DIE__} = sub { CFClient::fatal $_[0] }; 1559 local $SIG{__DIE__} = sub {
1560 return unless defined $^S && !$^S;
1561 Carp::confess $_[1];#d#TODO: remove when stable
1562 CFClient::fatal $_[0];
1563 };
1901 1564
1902 CFClient::read_cfg "$Crossfire::VARDIR/pclientrc"; 1565 CFClient::read_cfg "$Crossfire::VARDIR/cfplusrc";
1903 1566 CFClient::UI::set_layout ($::CFG->{layout});
1904 $TILECACHE = CFClient::db_table "tilecache";
1905 $FACEMAP = CFClient::db_table "facemap";
1906 1567
1907 my %DEF_CFG = ( 1568 my %DEF_CFG = (
1908 sdl_mode => 0, 1569 sdl_mode => 0,
1909 width => 640, 1570 width => 640,
1910 height => 480, 1571 height => 480,
… …
1987 1648
1988END { CFClient::SDL_Quit } 1649END { CFClient::SDL_Quit }
1989 1650
1990=head1 NAME 1651=head1 NAME
1991 1652
1992pclient - A Crossfire+ and Crossfire game client 1653cfplus - A Crossfire+ and Crossfire game client
1993 1654
1994=head1 SYNOPSIS 1655=head1 SYNOPSIS
1995 1656
1996Just run it - no commandline arguments are supported. 1657Just run it - no commandline arguments are supported.
1997 1658
1998=head1 USAGE 1659=head1 USAGE
1999 1660
2000Pclient utilises OpenGL for all UI elements and the game. It is supposed to be used 1661cfplus utilises OpenGL for all UI elements and the game. It is supposed to be used
2001fullscreen and interactively. 1662fullscreen and interactively.
2002 1663
1664=head1 DEBUGGING
1665
1666
1667CFPLUS_DEBUG - environment variable
1668
1669 1 draw borders around widgets
1670 2 add low-level widget info to tooltips
1671 4 show fps
1672 8 suppress tooltips
1673
2003=head1 AUTHOR 1674=head1 AUTHOR
2004 1675
2005Marc Lehmann <crossfire@schmorp.de>, Robin Redeker <elmex@ta-sa.org> 1676Marc Lehmann <crossfire@schmorp.de>, Robin Redeker <elmex@ta-sa.org>
2006 1677
2007 1678

Diff Legend

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