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.6 by elmex, Thu May 25 21:24:40 2006 UTC vs.
Revision 1.42 by root, Fri Jun 2 06:22:55 2006 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines