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.15 by root, Sat May 27 19:49:07 2006 UTC vs.
Revision 1.38 by elmex, Wed May 31 13:44:26 2006 UTC

… …
81our $LOGVIEW; 81our $LOGVIEW;
82our $CONSOLE; 82our $CONSOLE;
83our $METASERVER; 83our $METASERVER;
84our $LOGIN_BUTTON; 84our $LOGIN_BUTTON;
85our $QUIT_DIALOG; 85our $QUIT_DIALOG;
86our $SERVER_SETUP;
86 87
87our $FLOORBOX; 88our $FLOORBOX;
88our $GAUGES; 89our $GAUGES;
89our $STATWIDS; 90our $STATWIDS;
90 91
… …
97 98
98our $ALT_ENTER_MESSAGE; 99our $ALT_ENTER_MESSAGE;
99our $STATUSBOX; 100our $STATUSBOX;
100our $DEBUG_STATUS; 101our $DEBUG_STATUS;
101 102
103our $INV_WINDOW;
102our $INV; 104our $INV;
103our $INVR; 105our $INVR;
104our $INVR_LBL; 106our $INV_RIGHT_HB;
107
108our $BIND_WINDOW;
109our $BIND_EDITOR;
110
111our $SPELL_LIST;
105 112
106sub status { 113sub status {
107 $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]);
108} 115}
109 116
110sub debug { 117sub debug {
111 $DEBUG_STATUS->set_text ($_[0]); 118 $DEBUG_STATUS->set_text ($_[0]);
112 my ($w, $h) = $DEBUG_STATUS->size_request;
113 $DEBUG_STATUS->move ($WIDTH - $w, 0);
114} 119}
115 120
116sub start_game { 121sub start_game {
117 status "logging in..."; 122 status "logging in...";
123
124 $LOGIN_BUTTON->set_text ("Logout");
125 $SERVER_SETUP->hide;
118 126
119 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;
120 128
121 my ($host, $port) = split /:/, $CFG->{host}; 129 my ($host, $port) = split /:/, $CFG->{host};
122 130
… …
151 }; 159 };
152 160
153 if ($CONN) { 161 if ($CONN) {
154 CFClient::lowdelay fileno $CONN->{fh}; 162 CFClient::lowdelay fileno $CONN->{fh};
155 163
156 $LOGIN_BUTTON->set_text ("Logout");
157 status "login successful"; 164 status "login successful";
158
159 $BUTTONBAR->{children}[1]->emit ("activate")
160 if $BUTTONBAR->{children}[1]->{state};
161
162 } else { 165 } else {
163 status "unable to connect"; 166 status "unable to connect";
164 stop_game(); 167 stop_game();
165 } 168 }
166} 169}
167 170
168sub stop_game { 171sub stop_game {
172 $LOGIN_BUTTON->set_text ("Login");
173 $SERVER_SETUP->show;
174 $INV_WINDOW->hide;
175 $LOGVIEW->hide;
176
169 return unless $CONN; 177 return unless $CONN;
170 178
171 status "connection closed"; 179 status "connection closed";
172 $LOGIN_BUTTON->set_text ("Login"); 180
173 $CONN->destroy; 181 $CONN->destroy;
174 $CONN = 0; # false, does not autovivify 182 $CONN = 0; # false, does not autovivify
175
176 $BUTTONBAR->{children}[1]->emit ("activate")
177 unless $BUTTONBAR->{children}[1]->{state};
178} 183}
179 184
180sub client_setup { 185sub client_setup {
181 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",
182 title => "Client Setup", 190 title => "Client Setup",
183 child => (my $vbox = new CFClient::UI::VBox); 191 child => (my $vbox = new CFClient::UI::VBox);
192
184 $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]);
185 194
186 $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");
187 $table->add (1, 0, my $hbox = new CFClient::UI::HBox); 196 $table->add (1, 0, my $hbox = new CFClient::UI::HBox);
188 197
189 $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]);
190 $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");
191 200
192 $mode_slider->connect (changed => sub { 201 $mode_slider->connect (changed => sub {
193 my ($self, $value) = @_; 202 my ($self, $value) = @_;
194 203
… …
201 210
202 $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");
203 $table->add (1, $row++, new CFClient::UI::CheckBox 212 $table->add (1, $row++, new CFClient::UI::CheckBox
204 state => $CFG->{fullscreen}, 213 state => $CFG->{fullscreen},
205 tooltip => "Bring the client into fullscreen mode.", 214 tooltip => "Bring the client into fullscreen mode.",
206 connect_changed => sub { 215 on_changed => sub {
207 my ($self, $value) = @_; 216 my ($self, $value) = @_;
208 $CFG->{fullscreen} = $value; 217 $CFG->{fullscreen} = $value;
209 } 218 }
210 ); 219 );
211 220
212 $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");
213 $table->add (1, $row++, new CFClient::UI::CheckBox 222 $table->add (1, $row++, new CFClient::UI::CheckBox
214 state => $CFG->{fast}, 223 state => $CFG->{fast},
215 tooltip => "Lower the visual quality considerably to speed up rendering.", 224 tooltip => "Lower the visual quality considerably to speed up rendering.",
216 connect_changed => sub { 225 on_changed => sub {
217 my ($self, $value) = @_; 226 my ($self, $value) = @_;
218 $CFG->{fast} = $value; 227 $CFG->{fast} = $value;
219 } 228 }
220 ); 229 );
221 230
222 $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");
223 $table->add (1, $row++, new CFClient::UI::Slider 232 $table->add (1, $row++, new CFClient::UI::Slider
224 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1], 233 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1],
225 tooltip => "Enlarge or shrink the displayed map. Changes are instant.", 234 tooltip => "Enlarge or shrink the displayed map. Changes are instant.",
226 connect_changed => sub { 235 on_changed => sub {
227 my ($self, $value) = @_; 236 my ($self, $value) = @_;
228 $CFG->{map_scale} = 2 ** $value; 237 $CFG->{map_scale} = 2 ** $value;
229 } 238 }
230 ); 239 );
231 240
232 $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");
233 $table->add (1, $row++, new CFClient::UI::CheckBox 242 $table->add (1, $row++, new CFClient::UI::CheckBox
234 state => $CFG->{fow_enable}, 243 state => $CFG->{fow_enable},
235 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.",
236 connect_changed => sub { 245 on_changed => sub {
237 my ($self, $value) = @_; 246 my ($self, $value) = @_;
238 $CFG->{fow_enable} = $value; 247 $CFG->{fow_enable} = $value;
239 } 248 }
240 ); 249 );
241 250
242 $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");
243 $table->add (1, $row++, new CFClient::UI::Slider 252 $table->add (1, $row++, new CFClient::UI::Slider
244 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256], 253 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256],
245 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.",
246 connect_changed => sub { 255 on_changed => sub {
247 my ($self, $value) = @_; 256 my ($self, $value) = @_;
248 $CFG->{fow_intensity} = $value; 257 $CFG->{fow_intensity} = $value;
249 } 258 }
250 ); 259 );
251 260
252 $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");
253 $table->add (1, $row++, new CFClient::UI::CheckBox 262 $table->add (1, $row++, new CFClient::UI::CheckBox
254 state => $CFG->{fow_smooth}, 263 state => $CFG->{fow_smooth},
255 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.",
256 connect_changed => sub { 265 on_changed => sub {
257 my ($self, $value) = @_; 266 my ($self, $value) = @_;
258 $CFG->{fow_smooth} = $value; 267 $CFG->{fow_smooth} = $value;
259 status "Fog of War smoothing requires OpenGL 1.2 or higher" if $CFClient::OpenGL::GL_VERSION < 1.2; 268 status "Fog of War smoothing requires OpenGL 1.2 or higher" if $CFClient::OpenGL::GL_VERSION < 1.2;
260 } 269 }
261 ); 270 );
262 271
263 $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");
264 $table->add (1, $row++, new CFClient::UI::Slider 273 $table->add (1, $row++, new CFClient::UI::Slider
265 range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1], 274 range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1],
266 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.",
267 connect_changed => sub { $CFG->{gui_fontsize} = $_[1] }, 276 on_changed => sub { $CFG->{gui_fontsize} = $_[1] },
268 ); 277 );
269 278
270 $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");
271 $table->add (1, $row++, new CFClient::UI::Slider 280 $table->add (1, $row++, new CFClient::UI::Slider
272 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1], 281 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1],
273 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.",
274 connect_changed => sub { $LOGVIEW->set_fontsize ($CFG->{log_fontsize} = $_[1]) }, 283 on_changed => sub { $LOGVIEW->set_fontsize ($CFG->{log_fontsize} = $_[1]) },
275 ); 284 );
276 285
277 $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");
278 287
279 $table->add (1, $row++, new CFClient::UI::Slider 288 $table->add (1, $row++, new CFClient::UI::Slider
280 range => [$CFG->{stat_fontsize}, 0.5, 2, 0, 0.1], 289 range => [$CFG->{stat_fontsize}, 0.5, 2, 0, 0.1],
281 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.",
282 connect_changed => sub { 291 on_changed => sub {
283 $CFG->{stat_fontsize} = $_[1]; 292 $CFG->{stat_fontsize} = $_[1];
284 &set_stats_window_fontsize; 293 &set_stats_window_fontsize;
285 } 294 }
286 ); 295 );
287 296
288 $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");
289 $table->add (1, $row++, new CFClient::UI::Slider 298 $table->add (1, $row++, new CFClient::UI::Slider
290 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1], 299 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1],
291 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.",
292 connect_changed => sub { 301 on_changed => sub {
293 $CFG->{gauge_fontsize} = $_[1]; 302 $CFG->{gauge_fontsize} = $_[1];
294 &set_gauge_window_fontsize; 303 &set_gauge_window_fontsize;
295 } 304 }
296 ); 305 );
297 306
298 $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");
299 $table->add (1, $row++, new CFClient::UI::Slider 308 $table->add (1, $row++, new CFClient::UI::Slider
300 range => [$CFG->{gauge_size}, 0.2, 0.8], 309 range => [$CFG->{gauge_size}, 0.2, 0.8],
301 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.",
302 connect_changed => sub { 311 on_changed => sub {
303 $CFG->{gauge_size} = $_[1]; 312 $CFG->{gauge_size} = $_[1];
304 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size}); 313 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size});
305 } 314 }
306 ); 315 );
307 316
308 $table->add (1, $row++, new CFClient::UI::Button 317 $table->add (1, $row++, new CFClient::UI::Button
309 expand => 1, align => 0, text => "Apply", 318 expand => 1, align => 0, text => "Apply",
310 tooltip => "Apply the video settings", 319 tooltip => "Apply the video settings",
311 connect_activate => sub { 320 on_activate => sub {
312 video_shutdown (); 321 video_shutdown ();
313 video_init (); 322 video_init ();
314 } 323 }
315 ); 324 );
316 325
317 $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");
318 $table->add (1, $row++, new CFClient::UI::CheckBox 327 $table->add (1, $row++, new CFClient::UI::CheckBox
319 state => $CFG->{audio_enable}, 328 state => $CFG->{audio_enable},
320 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.",
321 connect_changed => sub { 330 on_changed => sub {
322 $CFG->{audio_enable} = $_[1]; 331 $CFG->{audio_enable} = $_[1];
323 } 332 }
324 ); 333 );
325# $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");
326# $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 {
327# $CFG->{effects_volume} = $_[1]; 336# $CFG->{effects_volume} = $_[1];
328# }); 337# });
329 $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");
330 $table->add (1, $row++, my $hbox = new CFClient::UI::HBox); 339 $table->add (1, $row++, my $hbox = new CFClient::UI::HBox);
331 $hbox->add (new CFClient::UI::CheckBox 340 $hbox->add (new CFClient::UI::CheckBox
332 expand => 1, state => $CFG->{bgm_enable}, 341 expand => 1, state => $CFG->{bgm_enable},
333 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.",
334 connect_changed => sub { 343 on_changed => sub {
335 $CFG->{bgm_enable} = $_[1]; 344 $CFG->{bgm_enable} = $_[1];
336 } 345 }
337 ); 346 );
338 $hbox->add (new CFClient::UI::Slider 347 $hbox->add (new CFClient::UI::Slider
339 expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128], 348 expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128],
340 tooltip => "The volume of the background music. Changes are instant.", 349 tooltip => "The volume of the background music. Changes are instant.",
341 connect_changed => sub { 350 on_changed => sub {
342 $CFG->{bgm_volume} = $_[1]; 351 $CFG->{bgm_volume} = $_[1];
343 CFClient::MixMusic::volume $_[1] * 128; 352 CFClient::MixMusic::volume $_[1] * 128;
344 } 353 }
345 ); 354 );
346 355
347 $table->add (1, $row++, new CFClient::UI::Button 356 $table->add (1, $row++, new CFClient::UI::Button
348 expand => 1, align => 0, text => "Apply", 357 expand => 1, align => 0, text => "Apply",
349 tooltip => "Apply the audio settings", 358 tooltip => "Apply the audio settings",
350 connect_activate => sub { 359 on_activate => sub {
351 audio_shutdown (); 360 audio_shutdown ();
352 audio_init (); 361 audio_init ();
353 } 362 }
354 ); 363 );
355 364
… …
357 $table->add (1, $row++, my $saycmd = new CFClient::UI::Entry 366 $table->add (1, $row++, my $saycmd = new CFClient::UI::Entry
358 text => $CFG->{say_command}, 367 text => $CFG->{say_command},
359 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. "
360 . "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. "
361 . "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.",
362 connect_changed => sub { 371 on_changed => sub {
363 my ($self, $value) = @_; 372 my ($self, $value) = @_;
364 $CFG->{say_command} = $value; 373 $CFG->{say_command} = $value;
365 } 374 }
366 ); 375 );
367 376
… …
382 391
383sub make_gauge_window { 392sub make_gauge_window {
384 my $gh = int $HEIGHT * $CFG->{gauge_size}; 393 my $gh = int $HEIGHT * $CFG->{gauge_size};
385 394
386 my $win = new CFClient::UI::Frame ( 395 my $win = new CFClient::UI::Frame (
387 req_y => -1, 396 force_x => 0,
397 force_y => "max",
388 user_w => $WIDTH, 398 force_w => $WIDTH,
389 user_h => $gh, 399 force_h => $gh,
390 ); 400 );
391 401
392 $win->add (my $hbox = new CFClient::UI::HBox 402 $win->add (my $hbox = new CFClient::UI::HBox
393 children => [ 403 children => [
394 (new CFClient::UI::HBox expand => 1), 404 (new CFClient::UI::HBox expand => 1),
… …
430 &set_gauge_window_fontsize; 440 &set_gauge_window_fontsize;
431 441
432 $win 442 $win
433} 443}
434 444
445
435sub make_stats_window { 446sub make_stats_window {
436 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";
437 452
438 $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);
439 $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,
440 can_hover => 1, can_events => 1, 455 can_hover => 1, can_events => 1,
441 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.");
… …
688 $m = [$users, $host, $uptime, $version, $desc]; 703 $m = [$users, $host, $uptime, $version, $desc];
689 704
690 $y++; 705 $y++;
691 706
692 $table->add (0, $y, new CFClient::UI::VBox children => [ 707 $table->add (0, $y, new CFClient::UI::VBox children => [
693 (new CFClient::UI::Button text => "Use", connect_activate => sub { 708 (new CFClient::UI::Button text => "Use", on_activate => sub {
694 $HOST->set_text ($CFG->{host} = $host); 709 $HOST->set_text ($CFG->{host} = $host);
695 }), 710 }),
696 (new CFClient::UI::Empty expand => 1), 711 (new CFClient::UI::Empty expand => 1),
697 ]); 712 ]);
698 713
… …
703 } 718 }
704 }); 719 });
705} 720}
706 721
707sub server_setup { 722sub server_setup {
708 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",
709 title => "Server Setup", 727 title => "Server Setup",
710 child => (my $vbox = new CFClient::UI::VBox); 728 child => (my $vbox = new CFClient::UI::VBox),
711 729 ;
730
712 $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]);
713 $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");
714 733
715 { 734 {
716 $table->add (1, 2, my $vbox = new CFClient::UI::VBox); 735 $table->add (1, 2, my $vbox = new CFClient::UI::VBox);
… …
718 $vbox->add ( 737 $vbox->add (
719 my $HOST = new CFClient::UI::Entry 738 my $HOST = new CFClient::UI::Entry
720 expand => 1, 739 expand => 1,
721 text => $CFG->{host}, 740 text => $CFG->{host},
722 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",
723 connect_changed => sub { 742 on_changed => sub {
724 my ($self, $value) = @_; 743 my ($self, $value) = @_;
725 $CFG->{host} = $value; 744 $CFG->{host} = $value;
726 } 745 }
727 ); 746 );
728 747
… …
731 $vbox->add (new CFClient::UI::Flopper 750 $vbox->add (new CFClient::UI::Flopper
732 expand => 1, 751 expand => 1,
733 text => "Server List", 752 text => "Server List",
734 other => $METASERVER, 753 other => $METASERVER,
735 tooltip => "Show a list of available crossfire servers", 754 tooltip => "Show a list of available crossfire servers",
736 connect_open => sub { 755 on_open => sub {
737 update_metaserver $HOST; 756 update_metaserver $HOST;
738 } 757 }
739 ); 758 );
740 } 759 }
741 760
742 $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");
743 $table->add (1, 4, new CFClient::UI::Entry 762 $table->add (1, 4, new CFClient::UI::Entry
744 text => $CFG->{user}, 763 text => $CFG->{user},
745 tooltip => "The name of your character on the server", 764 tooltip => "The name of your character on the server",
746 connect_changed => sub { 765 on_changed => sub {
747 my ($self, $value) = @_; 766 my ($self, $value) = @_;
748 $CFG->{user} = $value; 767 $CFG->{user} = $value;
749 } 768 }
750 ); 769 );
751 770
752 $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");
753 $table->add (1, 5, new CFClient::UI::Entry 772 $table->add (1, 5, new CFClient::UI::Entry
754 text => $CFG->{password}, 773 text => $CFG->{password},
755 hidden => 1, 774 hidden => 1,
756 tooltip => "The password for your character", 775 tooltip => "The password for your character",
757 connect_changed => sub { 776 on_changed => sub {
758 my ($self, $value) = @_; 777 my ($self, $value) = @_;
759 $CFG->{password} = $value; 778 $CFG->{password} = $value;
760 } 779 }
761 ); 780 );
762 781
763 $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");
764 $table->add (1, 7, new CFClient::UI::Slider 783 $table->add (1, 7, new CFClient::UI::Slider
765 req_w => 100, 784 force_w => 100,
766 range => [$CFG->{mapsize}, 10, 100, 0, 1], 785 range => [$CFG->{mapsize}, 10, 100, 0, 1],
767 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. "
768 . "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, "
769 . "but you also increase bandwidth requirements and latency. " 788 . "but you also increase bandwidth requirements and latency. "
770 . "This option is only used once at log-in.", 789 . "This option is only used once at log-in.",
771 connect_changed => sub { 790 on_changed => sub {
772 my ($self, $value) = @_; 791 my ($self, $value) = @_;
773 792
774 $CFG->{mapsize} = $self->{range}[0] = $value = int $value; 793 $CFG->{mapsize} = $self->{range}[0] = $value = int $value;
775 }, 794 },
776 ); 795 );
… …
783 . "This might increase or create lag, but increases the chances " 802 . "This might increase or create lag, but increases the chances "
784 . "of faces being ready for display when you encounter them. " 803 . "of faces being ready for display when you encounter them. "
785 . "It also uses up server bandwidth on every connect, " 804 . "It also uses up server bandwidth on every connect, "
786 . "so only set it if you really need to prefetch images. " 805 . "so only set it if you really need to prefetch images. "
787 . "This option can be set and unset any time.", 806 . "This option can be set and unset any time.",
788 connect_changed => sub { $CFG->{face_prefetch} = $_[1] }, 807 on_changed => sub { $CFG->{face_prefetch} = $_[1] },
789 ); 808 );
790 809
791 $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");
792 $table->add (1, 9, new CFClient::UI::Entry 811 $table->add (1, 9, new CFClient::UI::Entry
793 text => $CFG->{output_count}, 812 text => $CFG->{output_count},
794 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.",
795 connect_changed => sub { $CFG->{output_count} = $_[1] }, 814 on_changed => sub { $CFG->{output_count} = $_[1] },
796 ); 815 );
797 816
798 $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");
799 $table->add (1, 10, new CFClient::UI::Entry 818 $table->add (1, 10, new CFClient::UI::Entry
800 text => $CFG->{output_sync}, 819 text => $CFG->{output_sync},
801 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.",
802 connect_changed => sub { $CFG->{output_sync} = $_[1] }, 821 on_changed => sub { $CFG->{output_sync} = $_[1] },
803 ); 822 );
804 823
805 $table->add (1, 11, $LOGIN_BUTTON = new CFClient::UI::Button 824 $table->add (1, 11, $LOGIN_BUTTON = new CFClient::UI::Button
806 expand => 1, 825 expand => 1,
807 align => 0, 826 align => 0,
808 text => "Login", 827 text => "Login",
809 connect_activate => sub { 828 on_activate => sub {
810 $CONN ? stop_game 829 $CONN ? stop_game
811 : start_game; 830 : start_game;
812 }, 831 },
813 ); 832 );
814 833
815 $dialog 834 $dialog
816} 835}
817 836
818sub message_window { 837sub message_window {
819 my $window = new CFClient::UI::FancyFrame 838 my $window = new CFClient::UI::FancyFrame
839 name => "message_window",
820 title => "Messages", 840 title => "Messages",
821 border_bg => [1, 1, 1, 1], 841 border_bg => [1, 1, 1, 1],
822 bg => [0, 0, 0, 0.75], 842 bg => [0, 0, 0, 0.75],
843 x => "max",
844 y => 0,
823 user_w => int $::WIDTH / 3, 845 force_w => $::WIDTH / 3,
824 user_h => int $::HEIGHT / 5, 846 force_h => $::HEIGHT / 5,
825 child => (my $vbox = new CFClient::UI::VBox); 847 child => (my $vbox = new CFClient::UI::VBox);
826 848
827 $vbox->add ($LOGVIEW); 849 $vbox->add ($LOGVIEW);
828 850
829 $vbox->add (my $input = new CFClient::UI::Entry 851 $vbox->add (my $input = new CFClient::UI::Entry
830 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> "
831 . "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>...). "
832 . "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). "
833 . "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.",
834 connect_focus_in => sub { 856 on_focus_in => sub {
835 my ($input, $prev_focus) = @_; 857 my ($input, $prev_focus) = @_;
836 858
837 delete $input->{refocus_map}; 859 delete $input->{refocus_map};
838 860
839 if ($prev_focus == $MAPWIDGET && $input->{auto_activated}) { 861 if ($prev_focus == $MAPWIDGET && $input->{auto_activated}) {
840 $input->{refocus_map} = 1; 862 $input->{refocus_map} = 1;
841 } 863 }
842 delete $input->{auto_activated}; 864 delete $input->{auto_activated};
843 }, 865 },
844 connect_activate => sub { 866 on_activate => sub {
845 my ($input, $text) = @_; 867 my ($input, $text) = @_;
846 $input->set_text (''); 868 $input->set_text ('');
847 869
870 if ($text =~ /^\/bind\s+(.*)$/) {
871 CFClient::Binder::open_binding_dialog (sub {
872 my ($mod, $sym) = @_;
873 $::CFG->{bindings}->{$mod}->{$sym} = [$1];
874 });
848 if ($text =~ /^\/(.*)/) { 875 } elsif ($text =~ /^\/(.*)/) {
849 $::CONN->user_send ($1); 876 $::CONN->user_send ($1);
850 } else { 877 } else {
851 my $say_cmd = $::CFG->{say_command} || 'say'; 878 my $say_cmd = $::CFG->{say_command} || 'say';
852 $::CONN->user_send ("$say_cmd $text"); 879 $::CONN->user_send ("$say_cmd $text");
853 } 880 }
854 if ($input->{refocus_map}) { 881 if ($input->{refocus_map}) {
855 delete $input->{refocus_map}; 882 delete $input->{refocus_map};
856 $MAPWIDGET->focus_in 883 $MAPWIDGET->focus_in
857 } 884 }
858 }, 885 },
859 connect_escape => sub { 886 on_escape => sub {
860 $MAPWIDGET->focus_in 887 $MAPWIDGET->focus_in
861 }, 888 },
862 ); 889 );
863 890
864 $CONSOLE = { 891 $CONSOLE = {
865 window => $window, 892 window => $window,
866 input => $input 893 input => $input,
867 }; 894 };
868 895
869 $window 896 $window
870} 897}
871 898
872sub open_quit_dialog { 899sub open_quit_dialog {
873 unless ($QUIT_DIALOG) { 900 unless ($QUIT_DIALOG) {
874
875 $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 ;
876 906
877 $QUIT_DIALOG->add (my $vb = new CFClient::UI::VBox expand => 1); 907 $QUIT_DIALOG->add (my $vb = new CFClient::UI::VBox expand => 1);
878 908
879 $vb->add (new CFClient::UI::Label 909 $vb->add (new CFClient::UI::Label
880 text => "You should find a savebed and apply it first!", 910 text => "You should find a savebed and apply it first!",
… …
883 ); 913 );
884 $vb->add (my $hb = new CFClient::UI::HBox expand => 1); 914 $vb->add (my $hb = new CFClient::UI::HBox expand => 1);
885 $hb->add (new CFClient::UI::Button 915 $hb->add (new CFClient::UI::Button
886 text => "Ok", 916 text => "Ok",
887 expand => 1, 917 expand => 1,
888 connect_activate => sub { $QUIT_DIALOG->hide }, 918 on_activate => sub { $QUIT_DIALOG->hide },
889 ); 919 );
890 $hb->add (new CFClient::UI::Button 920 $hb->add (new CFClient::UI::Button
891 text => "Quit anyway", 921 text => "Quit anyway",
892 expand => 1, 922 expand => 1,
893 connect_activate => sub { exit }, 923 on_activate => sub { exit },
894 ); 924 );
925 }
895 926
896 $QUIT_DIALOG->show_centered; 927 $QUIT_DIALOG->show;
897 } else {
898 $QUIT_DIALOG->show_centered;
899 }
900} 928}
901 929
902sub make_inventory_window { 930sub make_inventory_window {
903 my $invwin = new CFClient::UI::FancyFrame 931 my $invwin = $INV_WINDOW = new CFClient::UI::FancyFrame
904 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 ;
905 938
906 $invwin->add (my $hb = new CFClient::UI::HBox expand => 1); 939 $invwin->add (my $hb = new CFClient::UI::HBox homogeneous => 1);
907 940
908 $hb->add (my $vb1 = new CFClient::UI::VBox expand => 1); 941 $hb->add (my $vb1 = new CFClient::UI::VBox);
909 $vb1->add (my $lbl = new CFClient::UI::Label align => 0); 942 $vb1->add (new CFClient::UI::Label align => 0, text => "Player");
910 $lbl->set_text ("Player");
911 $vb1->add ($INV = new CFClient::UI::Inventory expand => 1); 943 $vb1->add ($INV = new CFClient::UI::Inventory expand => 1);
912 944
913 $hb->add (my $vb2 = new CFClient::UI::VBox expand => 1); 945 $hb->add (my $vb2 = new CFClient::UI::VBox);
946
947 $vb2->add ($INV_RIGHT_HB = new CFClient::UI::HBox);
948
949 $vb2->add ($INVR = new CFClient::UI::Inventory expand => 1);
950
951 # XXX: Call after $INVR = ... because set_opencont sets the items
952 CFClient::Protocol::set_opencont ($::CONN, 0, "Floor");
953
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);
914 $vb2->add (my $hb2 = new CFClient::UI::HBox); 1026 $vb->add (my $hb = new CFClient::UI::HBox);
915 $hb2->add (new CFClient::UI::Button 1027 $hb->add (new CFClient::UI::Button
916 text => "Close", 1028 text => "record new",
917 tooltip => "Close the currently open container (if one is open)", 1029 expand => 1,
1030 tooltip => "This button opens the binding editor with an empty binding.",
918 connect_activate => sub { 1031 on_activate => sub {
919 $CONN->send ("apply $CONN->{open_container}") 1032 $::BIND_EDITOR->set_binding (undef, undef, [],
920 if $CONN->{open_container} != 0; 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;
921 }, 1044 },
922 ); 1045 );
923 $hb2->add ($INVR_LBL = new CFClient::UI::Label align => 0); 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 );
924 1054
925 $INVR_LBL->set_text ("Floor"); 1055 $refresh->();
926 $vb2->add ($INVR = new CFClient::UI::Inventory expand => 1); 1056 $BIND_WINDOW
927
928 $invwin
929} 1057}
930 1058
931sub make_help_window { 1059sub make_help_window {
932 my $win = new CFClient::UI::FancyFrame 1060 my $win = new CFClient::UI::FancyFrame
933 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";
934 1064
935 $win->add (my $vbox = new CFClient::UI::VBox); 1065 $win->add (my $vbox = new CFClient::UI::VBox);
936 1066
937 $vbox->add (my $buttons = new CFClient::UI::HBox); 1067 $vbox->add (my $buttons = new CFClient::UI::HBox);
938 $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);
… …
945 ) { 1075 ) {
946 my ($pod, $label) = @$_; 1076 my ($pod, $label) = @$_;
947 1077
948 $buttons->add (new CFClient::UI::Button 1078 $buttons->add (new CFClient::UI::Button
949 text => $label, 1079 text => $label,
950 connect_activate => sub { 1080 on_activate => sub {
951 my $parser = new Pod::POM; 1081 my $parser = new Pod::POM;
952 my $pom = $parser->parse_file (CFClient::find_rcfile "pod/$pod.pod"); 1082 my $pom = $parser->parse_file (CFClient::find_rcfile "pod/$pod.pod");
953 1083
954 $viewer->clear; 1084 $viewer->clear;
955 1085
… …
999 if ($DEBUG_STATUS) { 1129 if ($DEBUG_STATUS) {
1000 CFClient::UI::rescale_widgets $WIDTH / $old_w, $HEIGHT / $old_h; 1130 CFClient::UI::rescale_widgets $WIDTH / $old_w, $HEIGHT / $old_h;
1001 } else { 1131 } else {
1002 # create the widgets 1132 # create the widgets
1003 1133
1004 $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;
1005 $DEBUG_STATUS->show; 1139 $DEBUG_STATUS->show;
1006 1140
1141 $BIND_EDITOR = new CFClient::UI::BindEditor (x => "max", y => 0);
1142
1007 $STATUSBOX = new CFClient::UI::Statusbox; 1143 $STATUSBOX = new CFClient::UI::Statusbox;
1008 $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]);
1009 1145
1010 (new CFClient::UI::Frame 1146 (new CFClient::UI::Frame
1011 bg => [0, 0, 0, 0.4], 1147 bg => [0, 0, 0, 0.4],
1012 req_y => -1, 1148 force_x => 0,
1149 force_y => "max",
1013 child => $STATUSBOX, 1150 child => $STATUSBOX,
1014 )->show; 1151 )->show;
1015 1152
1016 CFClient::UI::FancyFrame->new ( 1153 CFClient::UI::FancyFrame->new (
1154 x => 0,
1155 y => $FONTSIZE + 8,
1017 border_bg => [1, 1, 1, 192/255], 1156 border_bg => [1, 1, 1, 192/255],
1018 bg => [1, 1, 1, 0], 1157 bg => [1, 1, 1, 0],
1019 child => ($MAPMAP = new CFClient::MapWidget::MapMap 1158 child => ($MAPMAP = new CFClient::MapWidget::MapMap
1020 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.",
1021 ), 1160 ),
… …
1044 can_hover => 1, 1183 can_hover => 1,
1045 can_events => 1, 1184 can_events => 1,
1046 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.",
1047 ; 1186 ;
1048 1187
1049 $BUTTONBAR = new CFClient::UI::HBox; 1188 $BUTTONBAR = new CFClient::UI::HBox x => 0, y => 0;
1050 1189
1051 $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,
1052 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.");
1053 $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,
1054 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.");
… …
1058 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
1059 1198
1060 $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,
1061 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.");
1062 $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,
1063 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.");
1064 1204
1065 $BUTTONBAR->add (new CFClient::UI::Button 1205 $BUTTONBAR->add (new CFClient::UI::Button
1066 text => "Save Config", 1206 text => "Save Config",
1067 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.",
1068 connect_activate => sub { 1208 on_activate => sub {
1209 $::CFG->{layout} = CFClient::UI::get_layout;
1069 CFClient::write_cfg "$Crossfire::VARDIR/pclientrc"; 1210 CFClient::write_cfg "$Crossfire::VARDIR/cfplusrc";
1070 status "Configuration Saved"; 1211 status "Configuration Saved";
1071 }, 1212 },
1072 ); 1213 );
1073 1214
1074 $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,
1075 tooltip => "View Documentation"); 1216 tooltip => "View Documentation");
1076 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
1077 $BUTTONBAR->add (new CFClient::UI::Button 1234 $BUTTONBAR->add (new CFClient::UI::Button
1078 text => "Quit", 1235 text => "Quit",
1079 tooltip => "Terminates the program", 1236 tooltip => "Terminates the program",
1080 connect_activate => sub { 1237 on_activate => sub {
1081 if ($CONN) { 1238 if ($CONN) {
1082 open_quit_dialog; 1239 open_quit_dialog;
1083 } else { 1240 } else {
1084 exit; 1241 exit;
1085 } 1242 }
1086 }, 1243 },
1087 ); 1244 );
1088 1245
1089 $BUTTONBAR->show; 1246 $BUTTONBAR->show;
1247 $SERVER_SETUP->show;
1090 1248
1091 $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]);
1092
1093 # delay till geometry is constant
1094 $CFClient::UI::ROOT->on_post_alloc (startup => sub {
1095 $BUTTONBAR->{children}[1]->emit ("activate"); # pop up server setup
1096 my $widget = $GAUGES->{win};
1097 $widget->move (0, $HEIGHT - $widget->{h});#d# to in toplevel
1098 });
1099 force_refresh ();
1100 } 1250 }
1101} 1251}
1102 1252
1103sub video_shutdown { 1253sub video_shutdown {
1104 undef $SDL_ACTIVE; 1254 undef $SDL_ACTIVE;
… …
1172 1322
1173my %demo;#d# 1323my %demo;#d#
1174 1324
1175sub force_refresh { 1325sub force_refresh {
1176 $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;
1177 debug sprintf "%3.2f", $fps; 1327 debug sprintf "%3.2f", $fps if $ENV{CFPLUS_DEBUG} & 4;
1178 1328
1179 $CFClient::UI::ROOT->draw; 1329 $CFClient::UI::ROOT->draw;
1180 1330
1181 $WANT_REFRESH = 0; 1331 $WANT_REFRESH = 0;
1182 $CAN_REFRESH = 0; 1332 $CAN_REFRESH = 0;
… …
1314############################################################################# 1464#############################################################################
1315 1465
1316$SIG{INT} = $SIG{TERM} = sub { exit }; 1466$SIG{INT} = $SIG{TERM} = sub { exit };
1317 1467
1318{ 1468{
1319 local $SIG{__DIE__} = sub { CFClient::fatal $_[0] }; 1469 local $SIG{__DIE__} = sub { CFClient::fatal $_[0] if defined $^S && !$^S };
1320 1470
1321 CFClient::read_cfg "$Crossfire::VARDIR/pclientrc"; 1471 CFClient::read_cfg "$Crossfire::VARDIR/cfplusrc";
1472 CFClient::UI::set_layout ($::CFG->{layout});
1322 1473
1323 my %DEF_CFG = ( 1474 my %DEF_CFG = (
1324 sdl_mode => 0, 1475 sdl_mode => 0,
1325 width => 640, 1476 width => 640,
1326 height => 480, 1477 height => 480,
… …
1403 1554
1404END { CFClient::SDL_Quit } 1555END { CFClient::SDL_Quit }
1405 1556
1406=head1 NAME 1557=head1 NAME
1407 1558
1408pclient - A Crossfire+ and Crossfire game client 1559cfplus - A Crossfire+ and Crossfire game client
1409 1560
1410=head1 SYNOPSIS 1561=head1 SYNOPSIS
1411 1562
1412Just run it - no commandline arguments are supported. 1563Just run it - no commandline arguments are supported.
1413 1564
1414=head1 USAGE 1565=head1 USAGE
1415 1566
1416Pclient 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
1417fullscreen and interactively. 1568fullscreen and interactively.
1418 1569
1419=head1 AUTHOR 1570=head1 AUTHOR
1420 1571
1421Marc 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