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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines