… | |
… | |
34 | |
34 | |
35 | our @SDL_MODES; |
35 | our @SDL_MODES; |
36 | our $WIDTH; |
36 | our $WIDTH; |
37 | our $HEIGHT; |
37 | our $HEIGHT; |
38 | our $FULLSCREEN; |
38 | our $FULLSCREEN; |
|
|
39 | our $FONTSIZE; |
39 | |
40 | |
|
|
41 | our $MAP; |
40 | our $MAPWIDGET; |
42 | our $MAPWIDGET; |
41 | our $FONTSIZE; |
|
|
42 | |
43 | |
43 | our $SDL_ACTIVE; |
44 | our $SDL_ACTIVE; |
44 | our $SDL_EV; |
45 | our $SDL_EV; |
45 | our %SDL_CB; |
46 | our %SDL_CB; |
46 | |
47 | |
47 | our $ALT_ENTER_MESSAGE; |
48 | our $ALT_ENTER_MESSAGE; |
48 | our $STATUS_LINE; |
49 | our $STATUS_LINE; |
49 | our $DEBUG_STATUS; |
50 | our $DEBUG_STATUS; |
|
|
51 | our $BUTTONBAR; |
|
|
52 | our $LOGVIEW; |
|
|
53 | our $CONSOLE; |
50 | |
54 | |
51 | sub status { |
55 | sub status { |
52 | $STATUS_LINE->set_text ($_[0]); |
56 | $STATUS_LINE->set_text ($_[0]); |
53 | my ($w, $h) = $STATUS_LINE->size_request; |
57 | my ($w, $h) = $STATUS_LINE->size_request; |
54 | $STATUS_LINE->size_allocate (0, $HEIGHT - $ALT_ENTER_MESSAGE->{h} - $h, $w, $h); |
58 | $STATUS_LINE->size_allocate (0, $HEIGHT - $ALT_ENTER_MESSAGE->{h} - $h, $w, $h); |
… | |
… | |
61 | } |
65 | } |
62 | |
66 | |
63 | sub start_game { |
67 | sub start_game { |
64 | status "logging in..."; |
68 | status "logging in..."; |
65 | |
69 | |
66 | my $mapsize = List::Util::min 64, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32; |
70 | my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32; |
67 | |
71 | |
|
|
72 | $MAP = new CFClient::Map $mapsize, $mapsize; |
|
|
73 | |
68 | $CONN = new conn |
74 | $CONN = new conn |
69 | host => $CFG->{host}, |
75 | host => $CFG->{host}, |
70 | port => $CFG->{port}, |
76 | port => $CFG->{port}, |
71 | user => $CFG->{user}, |
77 | user => $CFG->{user}, |
72 | pass => $CFG->{password}, |
78 | pass => $CFG->{password}, |
… | |
… | |
82 | sub stop_game { |
88 | sub stop_game { |
83 | undef $CONN; |
89 | undef $CONN; |
84 | } |
90 | } |
85 | |
91 | |
86 | sub config_dialog { |
92 | sub config_dialog { |
87 | my $dialog = new CFClient::UI::FancyFrame x => 300, y => 100, |
93 | my $dialog = new CFClient::UI::FancyFrame |
88 | child => (my $vbox = new CFClient::UI::VBox); |
94 | child => (my $vbox = new CFClient::UI::VBox); |
89 | $vbox->add (new CFClient::UI::Label align => 0, text => "Client Setup"); |
95 | $vbox->add (new CFClient::UI::Label align => 0, text => "Client Setup"); |
90 | $vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]); |
96 | $vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]); |
91 | |
97 | |
92 | $table->add (0, 0, new CFClient::UI::Label align => 1, text => "Video Mode"); |
98 | $table->add (0, 0, new CFClient::UI::Label align => 1, text => "Video Mode"); |
… | |
… | |
113 | $table->add (1, 2, new CFClient::UI::CheckBox state => $CFG->{fast}, connect_changed => sub { |
119 | $table->add (1, 2, new CFClient::UI::CheckBox state => $CFG->{fast}, connect_changed => sub { |
114 | my ($self, $value) = @_; |
120 | my ($self, $value) = @_; |
115 | $CFG->{fast} = $value; |
121 | $CFG->{fast} = $value; |
116 | }); |
122 | }); |
117 | |
123 | |
118 | $table->add (0, 2, new CFClient::UI::Label align => 1, text => "Fog of War"); |
124 | $table->add (0, 3, new CFClient::UI::Label align => 1, text => "Fog of War"); |
|
|
125 | $table->add (1, 3, new CFClient::UI::CheckBox state => $CFG->{fow_enable}, connect_changed => sub { |
|
|
126 | my ($self, $value) = @_; |
|
|
127 | $CFG->{fow_enable} = $value; |
|
|
128 | }); |
|
|
129 | |
|
|
130 | $table->add (0, 4, new CFClient::UI::Label align => 1, text => "FoW Intensity"); |
119 | $table->add (1, 2, new CFClient::UI::Slider range => [$CFG->{fow_intensity}, 0, 1 + 0.001, 0.001], connect_changed => sub { |
131 | $table->add (1, 4, new CFClient::UI::Slider range => [$CFG->{fow_intensity}, 0, 1 + 0.001, 0.001], connect_changed => sub { |
120 | my ($self, $value) = @_; |
132 | my ($self, $value) = @_; |
121 | $CFG->{fow_intensity} = $value; |
133 | $CFG->{fow_intensity} = $value; |
122 | }); |
134 | }); |
123 | |
135 | |
|
|
136 | $table->add (0, 5, new CFClient::UI::Label align => 1, text => "FoW Smooth"); |
|
|
137 | $table->add (1, 5, new CFClient::UI::CheckBox state => $CFG->{fow_smooth}, connect_changed => sub { |
|
|
138 | my ($self, $value) = @_; |
|
|
139 | $CFG->{fow_smooth} = $value; |
|
|
140 | }); |
|
|
141 | |
|
|
142 | $table->add (0, 5, new CFClient::UI::Label align => 1, text => "Log Fontsize"); |
|
|
143 | $table->add (1, 5, new CFClient::UI::Slider range => [$CFG->{log_fontsize}, 8, 30, 1], connect_changed => sub { |
|
|
144 | my ($self, $value) = @_; |
|
|
145 | $LOGVIEW->set_fontsize ($CFG->{log_fontsize} = int $value); |
|
|
146 | }); |
|
|
147 | |
124 | $table->add (1, 4, new CFClient::UI::Button expand => 1, align => 0, text => "Apply", connect_activate => sub { |
148 | $table->add (1, 6, new CFClient::UI::Button expand => 1, align => 0, text => "Apply", connect_activate => sub { |
125 | destroy_screen (); |
149 | destroy_screen (); |
126 | init_screen (); |
150 | init_screen (); |
127 | }); |
151 | }); |
128 | |
152 | |
129 | $vbox->add (new CFClient::UI::Label align => 0, text => "Server Setup"); |
153 | $vbox->add (new CFClient::UI::Label align => 0, text => "Server Setup"); |
130 | $vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]); |
154 | $vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]); |
131 | $table->add (0, 2, new CFClient::UI::Label align => 1, text => "Host"); |
155 | $table->add (0, 2, new CFClient::UI::Label align => 1, text => "Host"); |
132 | $table->add (1, 2, my $host = new CFClient::UI::Entry text => $CFG->{host}); |
156 | $table->add (1, 2, my $host = new CFClient::UI::Entry text => $CFG->{host}, connect_changed => sub { |
133 | |
157 | my ($self, $value) = @_; |
|
|
158 | $CFG->{host} = $value; |
|
|
159 | }); |
|
|
160 | |
134 | $table->add (0, 3, new CFClient::UI::Label align => 1, text => "Port"); |
161 | $table->add (0, 3, new CFClient::UI::Label align => 1, text => "Port"); |
135 | $table->add (1, 3, my $port = new CFClient::UI::Entry text => $CFG->{port}); |
162 | $table->add (1, 3, my $port = new CFClient::UI::Entry text => $CFG->{port}, connect_changed => sub { |
|
|
163 | my ($self, $value) = @_; |
|
|
164 | $CFG->{port} = $value; |
|
|
165 | }); |
136 | |
166 | |
137 | $table->add (0, 4, new CFClient::UI::Label align => 1, text => "Username"); |
167 | $table->add (0, 4, new CFClient::UI::Label align => 1, text => "Username"); |
138 | $table->add (1, 4, my $user = new CFClient::UI::Entry text => $CFG->{user}); |
168 | $table->add (1, 4, my $user = new CFClient::UI::Entry text => $CFG->{user}, connect_changed => sub { |
|
|
169 | my ($self, $value) = @_; |
|
|
170 | $CFG->{user} = $value; |
|
|
171 | }); |
139 | |
172 | |
140 | $table->add (0, 5, new CFClient::UI::Label align => 1, text => "Password"); |
173 | $table->add (0, 5, new CFClient::UI::Label align => 1, text => "Password"); |
141 | $table->add (1, 5, my $pass = new CFClient::UI::Entry text => $CFG->{password}, hidden => 1); |
174 | $table->add (1, 5, my $pass = new CFClient::UI::Entry text => $CFG->{password}, hidden => 1, connect_changed => sub { |
|
|
175 | my ($self, $value) = @_; |
|
|
176 | $CFG->{password} = $value; |
|
|
177 | }); |
142 | |
178 | |
|
|
179 | $table->add (0, 6, new CFClient::UI::Label align => 1, text => "Def. say cmd"); |
|
|
180 | $table->add (1, 6, my $saycmd = new CFClient::UI::Entry text => $CFG->{say_command}, connect_changed => sub { |
|
|
181 | my ($self, $value) = @_; |
|
|
182 | $CFG->{say_command} = $value; |
|
|
183 | }); |
|
|
184 | |
143 | $table->add (0, 6, new CFClient::UI::Label align => 1, text => "Map Size"); |
185 | $table->add (0, 7, new CFClient::UI::Label align => 1, text => "Map Size"); |
144 | $table->add (1, 6, new CFClient::UI::Slider |
186 | $table->add (1, 7, new CFClient::UI::Slider |
145 | req_w => 100, |
187 | req_w => 100, |
146 | range => [$CFG->{mapsize}, 10, 100 + 1, 1], |
188 | range => [$CFG->{mapsize}, 10, 100 + 1, 1], |
147 | connect_changed => sub { |
189 | connect_changed => sub { |
148 | my ($self, $value) = @_; |
190 | my ($self, $value) = @_; |
149 | |
191 | |
150 | $CFG->{mapsize} = $self->{range}[0] = $value = int $value; |
192 | $CFG->{mapsize} = $self->{range}[0] = $value = int $value; |
151 | }, |
193 | }, |
152 | ); |
194 | ); |
153 | |
195 | |
154 | $table->add (1, 7, new CFClient::UI::Button expand => 1, align => 0, text => "Login", connect_activate => sub { |
196 | $table->add (1, 8, new CFClient::UI::Button expand => 1, align => 0, text => "Login", connect_activate => sub { |
155 | start_game; |
197 | start_game; |
156 | }); |
198 | }); |
157 | |
199 | |
158 | $vbox->add (my $hbox = new CFClient::UI::HBox); |
200 | $vbox->add (my $hbox = new CFClient::UI::HBox); |
159 | |
201 | |
160 | $hbox->add (new CFClient::UI::Button expand => 1, align => 0, text => "Save", connect_activate => sub { |
202 | $hbox->add (new CFClient::UI::Button expand => 1, align => 0, text => "Save", connect_activate => sub { |
161 | CFClient::write_cfg "$Crossfire::VARDIR/pclientrc"; |
203 | CFClient::write_cfg "$Crossfire::VARDIR/pclientrc"; |
162 | status "Configuration Saved"; |
204 | status "Configuration Saved"; |
163 | }); |
205 | }); |
164 | $CFClient::UI::TOPLEVEL->add ($dialog); |
206 | |
|
|
207 | $dialog |
|
|
208 | } |
|
|
209 | |
|
|
210 | sub console_window { |
|
|
211 | my $window = new CFClient::UI::FancyFrame |
|
|
212 | border_bg => [1, 1, 1, 0.5], |
|
|
213 | bg => [0.3, 0.3, 0.3, 0.8], |
|
|
214 | user_w => $::WIDTH/4, |
|
|
215 | user_h => $::HEIGHT, |
|
|
216 | child => (my $vbox = new CFClient::UI::VBox); |
|
|
217 | |
|
|
218 | $vbox->add ($LOGVIEW = new CFClient::UI::TextView |
|
|
219 | expand => 1, |
|
|
220 | fontsize => $::CFG->{log_fontsize}, |
|
|
221 | ); |
|
|
222 | |
|
|
223 | $vbox->add (my $input = new CFClient::UI::LineEntry); |
|
|
224 | $input->connect (activate => sub { |
|
|
225 | my ($input, $text) = @_; |
|
|
226 | $input->set_text (''); |
|
|
227 | |
|
|
228 | if ($text =~ /^\/(.*)/) { |
|
|
229 | $::CONN->user_send ("command $1"); |
|
|
230 | } else { |
|
|
231 | my $say_cmd = $::CFG->{say_command} || 'say'; |
|
|
232 | $::CONN->user_send ("command $say_cmd $text"); |
|
|
233 | } |
|
|
234 | 1 |
|
|
235 | }); |
|
|
236 | $input->connect (escape => sub { |
|
|
237 | $MAPWIDGET->focus_in |
|
|
238 | }); |
|
|
239 | $input->focus_in; |
|
|
240 | |
|
|
241 | $CONSOLE = { |
|
|
242 | window => $window, |
|
|
243 | input => $input |
|
|
244 | }; |
|
|
245 | |
|
|
246 | $window |
165 | } |
247 | } |
166 | |
248 | |
167 | sub sdl_init { |
249 | sub sdl_init { |
|
|
250 | #SDL::Init SDL_INIT_AUDIO | SDL_INIT_VIDEO | SDL_INIT_NOPARACHUTE |
168 | SDL::Init SDL_INIT_TIMER | SDL_INIT_AUDIO | SDL_INIT_VIDEO |
251 | SDL::Init SDL_INIT_AUDIO | SDL_INIT_VIDEO |
169 | and die "SDL::Init failed!\n"; |
252 | and die "SDL::Init failed!\n"; |
170 | } |
253 | } |
171 | |
254 | |
172 | sub init_screen { |
255 | sub init_screen { |
173 | sdl_init; |
256 | sdl_init; |
… | |
… | |
208 | |
291 | |
209 | $FONTSIZE = int $HEIGHT / 40; |
292 | $FONTSIZE = int $HEIGHT / 40; |
210 | |
293 | |
211 | ############################################################################# |
294 | ############################################################################# |
212 | |
295 | |
213 | $DEBUG_STATUS = new CFClient::UI::Label padding => 0; |
296 | $DEBUG_STATUS = new CFClient::UI::Label padding => 0, z => 100; |
214 | $CFClient::UI::TOPLEVEL->add ($DEBUG_STATUS); |
297 | $CFClient::UI::TOPLEVEL->add ($DEBUG_STATUS); |
215 | |
298 | |
216 | $STATUS_LINE = new CFClient::UI::Label |
299 | $STATUS_LINE = new CFClient::UI::Label |
217 | padding => 0, |
300 | padding => 0, |
218 | y => $HEIGHT * 49 / 50 - $FONTSIZE; |
301 | y => $HEIGHT * 44 / 45 - $FONTSIZE; |
219 | $CFClient::UI::TOPLEVEL->add ($STATUS_LINE); |
302 | $CFClient::UI::TOPLEVEL->add ($STATUS_LINE); |
220 | |
303 | |
221 | $ALT_ENTER_MESSAGE = new CFClient::UI::Label |
304 | $ALT_ENTER_MESSAGE = new CFClient::UI::Label |
222 | padding => 0, |
305 | padding => 0, |
223 | y => $HEIGHT * 49 / 50, |
306 | y => $HEIGHT * 44 / 45, |
224 | height => $HEIGHT / 50, |
307 | height => $HEIGHT / 45, |
225 | text => "Use <b>Alt-Enter</b> to toggle fullscreen mode"; |
308 | text => "Use <b>Alt-Enter</b> to toggle fullscreen mode"; |
226 | $CFClient::UI::TOPLEVEL->add ($ALT_ENTER_MESSAGE); |
309 | $CFClient::UI::TOPLEVEL->add ($ALT_ENTER_MESSAGE); |
227 | |
310 | |
228 | $MAPWIDGET = new CFClient::UI::MapWidget; |
|
|
229 | $CFClient::UI::TOPLEVEL->add ($MAPWIDGET); |
311 | $CFClient::UI::TOPLEVEL->add ($MAPWIDGET = new CFClient::UI::MapWidget); |
230 | $MAPWIDGET->focus_in; |
312 | $MAPWIDGET->focus_in; |
|
|
313 | $MAPWIDGET->connect (activate_console => sub { |
|
|
314 | my ($mapwidget, $preset) = @_; |
231 | |
315 | |
232 | config_dialog; |
316 | if ($CONSOLE) { |
|
|
317 | $CONSOLE->{input}->focus_in; |
|
|
318 | |
|
|
319 | if ($preset && $CONSOLE->{input}->get_text eq '') { |
|
|
320 | $CONSOLE->{input}->set_text ($preset); |
|
|
321 | } |
|
|
322 | } |
|
|
323 | }); |
|
|
324 | |
|
|
325 | $CFClient::UI::TOPLEVEL->add ($BUTTONBAR = new CFClient::UI::HBox); |
|
|
326 | |
|
|
327 | $BUTTONBAR->add (my $setup = new CFClient::UI::Flopper text => "Client Setup", other => config_dialog, state => 1); |
|
|
328 | $BUTTONBAR->add (my $setup = new CFClient::UI::Flopper text => "Server", other => config_dialog, state => 1); |
|
|
329 | $BUTTONBAR->add (my $setup = new CFClient::UI::Flopper text => "Console", other => console_window); |
|
|
330 | $BUTTONBAR->add (my $setup = new CFClient::UI::Button text => "Save Config", other => console_window); |
233 | } |
331 | } |
234 | |
332 | |
235 | sub destroy_screen { |
333 | sub destroy_screen { |
236 | $CFClient::UI::TOPLEVEL->{children} = []; |
334 | $CFClient::UI::TOPLEVEL->{children} = []; |
237 | undef $SDL_ACTIVE; |
335 | undef $SDL_ACTIVE; |
… | |
… | |
251 | $fps = $fps * 0.95 + 1 / ($NOW - $LAST_REFRESH) * 0.05; |
349 | $fps = $fps * 0.95 + 1 / ($NOW - $LAST_REFRESH) * 0.05; |
252 | debug sprintf "%3.2f", $fps; |
350 | debug sprintf "%3.2f", $fps; |
253 | |
351 | |
254 | $want_refresh = 0; |
352 | $want_refresh = 0; |
255 | $can_refresh = 0; |
353 | $can_refresh = 0; |
256 | |
|
|
257 | glViewport 0, 0, $WIDTH, $HEIGHT; |
|
|
258 | |
|
|
259 | glMatrixMode GL_PROJECTION; |
|
|
260 | glLoadIdentity; |
|
|
261 | glOrtho 0, $WIDTH, $HEIGHT, 0, -10000 , 10000; |
|
|
262 | glMatrixMode GL_MODELVIEW; |
|
|
263 | glLoadIdentity; |
|
|
264 | |
|
|
265 | glClearColor +($CFG->{fow_intensity}) x 3, 1; |
|
|
266 | glClear GL_COLOR_BUFFER_BIT; |
|
|
267 | |
354 | |
268 | $CFClient::UI::TOPLEVEL->draw; |
355 | $CFClient::UI::TOPLEVEL->draw; |
269 | |
356 | |
270 | SDL::GLSwapBuffers; |
357 | SDL::GLSwapBuffers; |
271 | |
358 | |
… | |
… | |
311 | |
398 | |
312 | $self->send ($command); |
399 | $self->send ($command); |
313 | status $command; |
400 | status $command; |
314 | } |
401 | } |
315 | |
402 | |
316 | sub conn::map_update { |
403 | sub conn::feed_map1a { |
317 | my ($self, $dirty) = @_; |
404 | my ($self, $data) = @_; |
318 | |
405 | |
|
|
406 | # $self->Crossfire::Protocol::feed_map1a ($data); |
|
|
407 | |
|
|
408 | $MAP->scroll (delete $self->{delayed_scroll_x}, delete $self->{delayed_scroll_y}); |
|
|
409 | $MAP->map1a_update ($data); |
319 | $MAPWIDGET->update; |
410 | $MAPWIDGET->update; |
320 | } |
411 | } |
321 | |
412 | |
322 | sub conn::map_scroll { |
413 | #sub conn::map_update { |
323 | my ($self, $dx, $dy) = @_; |
414 | # my ($self, $dirty) = @_; |
324 | |
415 | # |
325 | # refresh; |
416 | # $MAPWIDGET->update; |
326 | } |
417 | #} |
327 | |
418 | |
328 | sub conn::map_clear { |
419 | sub conn::map_clear { |
329 | my ($self) = @_; |
420 | my ($self) = @_; |
330 | |
421 | |
|
|
422 | $MAP->clear; |
|
|
423 | |
331 | # refresh; |
424 | # refresh; |
332 | } |
425 | } |
333 | |
426 | |
334 | sub conn::face_find { |
427 | sub conn::face_find { |
335 | my ($self, $face) = @_; |
428 | my ($self, $face) = @_; |
336 | |
429 | |
337 | $FACECACHE->{"$face->{chksum},$face->{name}"} |
430 | $FACECACHE->{"$face->{chksum},$face->{name}"} |
338 | } |
431 | } |
339 | |
432 | |
340 | sub conn::face_update { |
433 | sub conn::face_update { |
341 | my ($self, $face) = @_; |
434 | my ($self, $facenum, $face) = @_; |
342 | |
435 | |
343 | $FACECACHE->{"$face->{chksum},$face->{name}"} = $face->{image}; |
436 | $FACECACHE->{"$face->{chksum},$face->{name}"} = $face->{image}; |
344 | |
437 | |
345 | $face->{texture} = new_from_image CFClient::Texture delete $face->{image}; |
438 | my $tex = $face->{texture} = |
|
|
439 | new_from_image CFClient::Texture |
|
|
440 | delete $face->{image}, minify => 1; |
|
|
441 | |
|
|
442 | $MAP->set_texture ($facenum, @$tex{qw(name w h s t)}, @{$tex->{minified}}); |
|
|
443 | $MAPWIDGET->update; |
346 | } |
444 | } |
347 | |
445 | |
348 | sub conn::query { |
446 | sub conn::query { |
349 | my ($self, $flags, $prompt) = @_; |
447 | my ($self, $flags, $prompt) = @_; |
350 | |
448 | |
|
|
449 | #TODO |
351 | warn "<<<<QUERY:$flags:$prompt>>>\n";#d# |
450 | warn "<<<<QUERY:$flags:$prompt>>>\n";#d# |
|
|
451 | } |
|
|
452 | |
|
|
453 | sub conn::drawinfo { |
|
|
454 | my ($self, $color, $text) = @_; |
|
|
455 | |
|
|
456 | my @color = ( |
|
|
457 | [1.00, 1.00, 1.00], #[0.00, 0.00, 0.00], |
|
|
458 | [1.00, 1.00, 1.00], |
|
|
459 | [0.00, 0.00, 0.55], |
|
|
460 | [1.00, 0.00, 0.00], |
|
|
461 | [1.00, 0.54, 0.00], |
|
|
462 | [0.11, 0.56, 1.00], |
|
|
463 | [0.93, 0.46, 0.00], |
|
|
464 | [0.18, 0.54, 0.34], |
|
|
465 | [0.56, 0.73, 0.56], |
|
|
466 | [0.80, 0.80, 0.80], |
|
|
467 | [0.55, 0.41, 0.13], |
|
|
468 | [0.99, 0.77, 0.26], |
|
|
469 | [0.74, 0.65, 0.41], |
|
|
470 | ); |
|
|
471 | |
|
|
472 | $LOGVIEW->add_paragraph ($color[$color], $text); |
352 | } |
473 | } |
353 | |
474 | |
354 | %SDL_CB = ( |
475 | %SDL_CB = ( |
355 | SDL_QUIT() => sub { |
476 | SDL_QUIT() => sub { |
356 | Event::unloop -1; |
477 | Event::unloop -1; |
… | |
… | |
361 | refresh; |
482 | refresh; |
362 | }, |
483 | }, |
363 | SDL_KEYDOWN() => sub { |
484 | SDL_KEYDOWN() => sub { |
364 | if ($SDL_EV->key_mod & KMOD_ALT && $SDL_EV->key_sym == SDLK_RETURN) { |
485 | if ($SDL_EV->key_mod & KMOD_ALT && $SDL_EV->key_sym == SDLK_RETURN) { |
365 | # alt-enter |
486 | # alt-enter |
366 | $FULLSCREEN = !$FULLSCREEN; |
|
|
367 | destroy_screen; |
487 | destroy_screen; |
|
|
488 | $CFG->{fullscreen} = !$CFG->{fullscreen}; |
368 | init_screen; |
489 | init_screen; |
369 | } else { |
490 | } else { |
370 | CFClient::UI::feed_sdl_key_down_event ($SDL_EV); |
491 | CFClient::UI::feed_sdl_key_down_event ($SDL_EV); |
371 | } |
492 | } |
372 | }, |
493 | }, |
… | |
… | |
390 | ############################################################################# |
511 | ############################################################################# |
391 | |
512 | |
392 | CFClient::read_cfg "$Crossfire::VARDIR/pclientrc"; |
513 | CFClient::read_cfg "$Crossfire::VARDIR/pclientrc"; |
393 | |
514 | |
394 | my %DEF_CFG = ( |
515 | my %DEF_CFG = ( |
|
|
516 | sdl_mode => 0, |
395 | width => 640, |
517 | width => 640, |
396 | height => 480, |
518 | height => 480, |
|
|
519 | fullscreen => 0, |
397 | fast => 0, |
520 | fast => 0, |
|
|
521 | fow_enable => 1, |
398 | fow_intensity => 0.45, |
522 | fow_intensity => 0.45, |
399 | fullscreen => 0, |
523 | fow_smooth => 0, |
400 | sdl_mode => 0, |
524 | log_fontsize => 14, |
401 | mapsize => 100, |
525 | mapsize => 100, |
402 | host => "crossfire.schmorp.de", |
526 | host => "crossfire.schmorp.de", |
403 | port => 13327, |
527 | port => 13327, |
|
|
528 | say_command => 'say', |
404 | ); |
529 | ); |
405 | |
530 | |
406 | while (my ($k, $v) = each %DEF_CFG) { |
531 | while (my ($k, $v) = each %DEF_CFG) { |
407 | $CFG->{$k} = $v unless exists $CFG->{$k}; |
532 | $CFG->{$k} = $v unless exists $CFG->{$k}; |
408 | } |
533 | } |
409 | |
534 | |
410 | sdl_init; |
535 | sdl_init; |
411 | |
536 | |
412 | @SDL_MODES = reverse map [SDL::RectW ($_), SDL::RectH ($_)], |
537 | @SDL_MODES = reverse |
|
|
538 | grep $_->[0] >= 640 && $_->[1] >= 480, |
|
|
539 | map [SDL::RectW ($_), SDL::RectH ($_)], |
413 | @{ SDL::ListModes 0, SDL_FULLSCREEN | SDL_HWSURFACE | SDL_OPENGL }; |
540 | @{ SDL::ListModes 0, SDL_FULLSCREEN | SDL_HWSURFACE | SDL_OPENGL }; |
414 | |
541 | |
415 | @SDL_MODES or CFClient::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)"; |
542 | @SDL_MODES or CFClient::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)"; |
416 | |
543 | |
417 | $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES; |
544 | $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES; |
418 | |
545 | |