ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/bin/pclient
(Generate patch)

Comparing deliantra/Deliantra-Client/bin/pclient (file contents):
Revision 1.74 by root, Tue Apr 11 20:44:49 2006 UTC vs.
Revision 1.101 by elmex, Fri Apr 14 11:32:22 2006 UTC

1#!/opt/bin/perl 1#!/opt/bin/perl
2 2
3use strict; 3use strict;
4use utf8; 4use utf8;
5 5
6use Glib; 6use Time::HiRes 'time';
7use Gtk2 -init; 7use Event;
8 8
9use SDL; 9use SDL;
10use SDL::App; 10use SDL::App;
11use SDL::Event; 11use SDL::Event;
12use SDL::Surface; 12use SDL::Surface;
13use SDL::OpenGL; 13use SDL::OpenGL;
14use SDL::OpenGL::Constants;
15 14
16use Crossfire; 15use Crossfire;
17use Crossfire::Protocol; 16use Crossfire::Protocol;
18 17
19use CFClient; 18use CFClient;
20use CFClient::UI; 19use CFClient::UI;
21 20
22our $VERSION = '0.1'; 21our $VERSION = '0.1';
23 22
24my $MAX_FPS = 30; 23my $MAX_FPS = 60;
25my $TICKS_PER_FRAME = int 1000 / $MAX_FPS - 1; # min ticks per frame 24my $MIN_FPS = 5; # unused as of yet
26 25
27our $FACECACHE; 26our $FACECACHE;
27
28our $LAST_REFRESH;
29our $NOW;
28 30
29our $CFG; 31our $CFG;
30our $CONN; 32our $CONN;
33our $FAST; # fast, low-quality mode, possibly useful for software-rendering
31 34
35our @SDL_MODES;
32our $WIDTH; 36our $WIDTH;
33our $HEIGHT; 37our $HEIGHT;
34our $FULLSCREEN; 38our $FULLSCREEN;
39our $FONTSIZE;
35 40
36our $NOW; 41our $MAP;
37
38our $MAPWIDGET; 42our $MAPWIDGET;
39our $FONTSIZE;
40 43
41our $SDL_TIMER; 44our $SDL_ACTIVE;
42our $SDL_APP;
43our $SDL_EV; 45our $SDL_EV;
44our %SDL_CB; 46our %SDL_CB;
45 47
46our $ALT_ENTER_MESSAGE; 48our $ALT_ENTER_MESSAGE;
47our $STATUS_LINE; 49our $STATUS_LINE;
48our $DEBUG_STATUS; 50our $DEBUG_STATUS;
51our $BUTTONBAR;
52our $LOGVIEW;
49 53
50my $last_refresh; 54sub status {
51my %ANIMATE; 55 $STATUS_LINE->set_text ($_[0]);
52my $refresh_handler; 56 my ($w, $h) = $STATUS_LINE->size_request;
57 $STATUS_LINE->size_allocate (0, $HEIGHT - $ALT_ENTER_MESSAGE->{h} - $h, $w, $h);
58}
53 59
54our ($tw, $te); # Test widget #d# 60sub debug {
61 $DEBUG_STATUS->set_text ($_[0]);
62 my ($w, $h) = $DEBUG_STATUS->size_request;
63 $DEBUG_STATUS->size_allocate ($WIDTH - $w, 0, $w, $h);
64}
55 65
56sub init_screen { 66sub start_game {
57 $SDL_APP = new SDL::App 67 status "logging in...";
58 -flags => SDL_ANYFORMAT | SDL_HWSURFACE,
59 -title => "Crossfire+ Client",
60 -width => $WIDTH,
61 -height => $HEIGHT,
62 -opengl => 1,
63 -red_size => 5,
64 -green_size => 5,
65 -blue_size => 5,
66 -alpha_size => 0,
67 -double_buffer => 1,
68 -fullscreen => $FULLSCREEN,
69 -resizeable => 0;
70 68
71 $SDL_EV = new SDL::Event; 69 my $mapsize = List::Util::min 64, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32;
72 $SDL_EV->set_unicode (1);
73 70
74 $SDL_TIMER = add Glib::Timeout 1000/50, sub { 71 $MAP = new CFClient::Map $mapsize, $mapsize;
75 ($SDL_CB{$SDL_EV->type} || sub { warn "unhandled event ", $SDL_EV->type })->()
76 while $SDL_EV->poll;
77
78 1
79 };
80
81 $last_refresh = SDL::GetTicks;
82
83 CFClient::gl_init;
84
85 $FONTSIZE = int $HEIGHT / 50;
86
87 #############################################################################
88
89 glClearColor 0.45, 0.45, 0.45, 1;
90
91 glEnable GL_TEXTURE_2D;
92 glEnable GL_COLOR_MATERIAL;
93 glShadeModel GL_FLAT;
94 glDisable GL_DEPTH_TEST;
95 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
96
97 #############################################################################
98
99 $DEBUG_STATUS = new CFClient::UI::Label;
100 $CFClient::UI::TOPLEVEL->add ($DEBUG_STATUS);
101 72
102 $STATUS_LINE = new CFClient::UI::Label
103 y => $HEIGHT * 59 / 60 - $FONTSIZE;
104 $CFClient::UI::TOPLEVEL->add ($STATUS_LINE);
105
106 $ALT_ENTER_MESSAGE = new CFClient::UI::Label
107 y => $HEIGHT * 59 / 60,
108 height => $HEIGHT / 60,
109 text => "Use <b>Alt-Enter</b> to toggle fullscreen mode";
110 $CFClient::UI::TOPLEVEL->add ($ALT_ENTER_MESSAGE);
111
112 $MAPWIDGET = new CFClient::UI::MapWidget;
113 $CFClient::UI::TOPLEVEL->add ($MAPWIDGET);
114 $MAPWIDGET->focus_in;
115}
116
117sub destroy_screen {
118 remove Glib::Source $SDL_TIMER;
119 undef $SDL_APP;
120 undef $SDL_EV;
121 SDL::Quit;
122}
123
124sub config_dialog {
125 my $dialog = new CFClient::UI::FancyFrame x => 300, y => 100,
126 child => (my $vbox = new CFClient::UI::VBox);
127 $vbox->add (new CFClient::UI::Label align => 0, text => "Setup");
128 $vbox->add (my $table = new CFClient::UI::Table);
129
130 $table->add (0, 0, new CFClient::UI::Label text => "Video Mode");
131 $table->add (0, 1, new CFClient::UI::Label text => "Host");
132 $table->add (0, 2, new CFClient::UI::Label text => "Port");
133 $table->add (0, 3, new CFClient::UI::Label text => "Username");
134 $table->add (0, 4, new CFClient::UI::Label text => "Password", hidden => 1);
135 $table->add (0, 5, new CFClient::UI::Label text => "Server Map Size");
136
137 $CFClient::UI::TOPLEVEL->add ($dialog);
138}
139
140sub start_game {
141 $WIDTH = $CFG->{width};
142 $HEIGHT = $CFG->{height};
143 $FULLSCREEN = 0;
144
145 init_screen;
146
147 config_dialog;
148
149 my $mapsize = List::Util::min 64, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32;
150
151 $CONN = new conn 73 $CONN = new conn
152 host => $CFG->{host}, 74 host => $CFG->{host},
153 port => $CFG->{port}, 75 port => $CFG->{port},
154 user => $CFG->{user}, 76 user => $CFG->{user},
155 pass => $CFG->{password}, 77 pass => $CFG->{password},
156 mapw => $mapsize, 78 mapw => $mapsize,
157 maph => $mapsize, 79 maph => $mapsize,
158 ; 80 ;
159 81
82 status "login successful";
83
160 CFClient::lowdelay fileno $CONN->{fh}; 84 CFClient::lowdelay fileno $CONN->{fh};
161} 85}
162 86
163sub stop_game { 87sub stop_game {
164 remove Glib::Source $refresh_handler if $refresh_handler;
165 undef $refresh_handler;
166
167 undef $CONN; 88 undef $CONN;
89}
90
91sub config_dialog {
92 my $dialog = new CFClient::UI::FancyFrame
93 child => (my $vbox = new CFClient::UI::VBox);
94 $vbox->add (new CFClient::UI::Label align => 0, text => "Client Setup");
95 $vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]);
96
97 $table->add (0, 0, new CFClient::UI::Label align => 1, text => "Video Mode");
98 $table->add (1, 0, my $hbox = new CFClient::UI::HBox);
99
100 $hbox->add (my $mode_slider = new CFClient::UI::Slider expand => 1, req_w => 100, range => [$CFG->{sdl_mode}, 0, scalar @SDL_MODES, 1]);
101 $hbox->add (my $mode_label = new CFClient::UI::Label height => $FONTSIZE * 0.8);
102
103 $mode_slider->connect (changed => sub {
104 my ($self, $value) = @_;
105
106 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value;
107 $mode_label->set_text (sprintf "%dx%d", @{$SDL_MODES[$value]});
108 });
109 $mode_slider->emit (changed => $mode_slider->{range}[0]);
110
111 $table->add (0, 1, new CFClient::UI::Label align => 1, text => "Fullscreen");
112 $table->add (1, 1, new CFClient::UI::CheckBox state => $CFG->{fullscreen}, connect_changed => sub {
113 my ($self, $value) = @_;
114 $CFG->{fullscreen} = $value;
115 });
116
117 $table->add (0, 2, new CFClient::UI::Label align => 1, text => "Fast &amp; Ugly");
118 $table->add (1, 2, new CFClient::UI::CheckBox state => $CFG->{fast}, connect_changed => sub {
119 my ($self, $value) = @_;
120 $CFG->{fast} = $value;
121 });
122
123 $table->add (0, 3, new CFClient::UI::Label align => 1, text => "Fog of War");
124 $table->add (1, 3, new CFClient::UI::CheckBox state => $CFG->{fow_enable}, connect_changed => sub {
125 my ($self, $value) = @_;
126 $CFG->{fow_enable} = $value;
127 });
128
129 $table->add (0, 4, new CFClient::UI::Label align => 1, text => "FoW Intensity");
130 $table->add (1, 4, new CFClient::UI::Slider range => [$CFG->{fow_intensity}, 0, 1 + 0.001, 0.001], connect_changed => sub {
131 my ($self, $value) = @_;
132 $CFG->{fow_intensity} = $value;
133 });
134
135 $table->add (0, 5, new CFClient::UI::Label align => 1, text => "FoW Smooth");
136 $table->add (1, 5, new CFClient::UI::CheckBox state => $CFG->{fow_smooth}, connect_changed => sub {
137 my ($self, $value) = @_;
138 $CFG->{fow_smooth} = $value;
139 });
140
141 $table->add (1, 6, new CFClient::UI::Button expand => 1, align => 0, text => "Apply", connect_activate => sub {
168 destroy_screen; 142 destroy_screen ();
143 init_screen ();
144 });
145
146 $vbox->add (new CFClient::UI::Label align => 0, text => "Server Setup");
147 $vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]);
148 $table->add (0, 2, new CFClient::UI::Label align => 1, text => "Host");
149 $table->add (1, 2, my $host = new CFClient::UI::Entry text => $CFG->{host}, connect_changed => sub {
150 my ($self, $value) = @_;
151 $CFG->{host} = $value;
152 });
153
154 $table->add (0, 3, new CFClient::UI::Label align => 1, text => "Port");
155 $table->add (1, 3, my $port = new CFClient::UI::Entry text => $CFG->{port}, connect_changed => sub {
156 my ($self, $value) = @_;
157 $CFG->{port} = $value;
158 });
159
160 $table->add (0, 4, new CFClient::UI::Label align => 1, text => "Username");
161 $table->add (1, 4, my $user = new CFClient::UI::Entry text => $CFG->{user}, connect_changed => sub {
162 my ($self, $value) = @_;
163 $CFG->{user} = $value;
164 });
165
166 $table->add (0, 5, new CFClient::UI::Label align => 1, text => "Password");
167 $table->add (1, 5, my $pass = new CFClient::UI::Entry text => $CFG->{password}, hidden => 1, connect_changed => sub {
168 my ($self, $value) = @_;
169 $CFG->{password} = $value;
170 });
171
172 $table->add (0, 6, new CFClient::UI::Label align => 1, text => "Def. say cmd");
173 $table->add (1, 6, my $saycmd = new CFClient::UI::Entry text => $CFG->{say_command}, connect_changed => sub {
174 my ($self, $value) = @_;
175 $CFG->{say_command} = $value;
176 });
177
178 $table->add (0, 7, new CFClient::UI::Label align => 1, text => "Map Size");
179 $table->add (1, 7, new CFClient::UI::Slider
180 req_w => 100,
181 range => [$CFG->{mapsize}, 10, 100 + 1, 1],
182 connect_changed => sub {
183 my ($self, $value) = @_;
184
185 $CFG->{mapsize} = $self->{range}[0] = $value = int $value;
186 },
187 );
188
189 $table->add (1, 8, new CFClient::UI::Button expand => 1, align => 0, text => "Login", connect_activate => sub {
190 start_game;
191 });
192
193 $vbox->add (my $hbox = new CFClient::UI::HBox);
194
195 $hbox->add (new CFClient::UI::Button expand => 1, align => 0, text => "Save", connect_activate => sub {
196 CFClient::write_cfg "$Crossfire::VARDIR/pclientrc";
197 status "Configuration Saved";
198 });
199
200 $dialog
169} 201}
202
203sub console_window {
204 my $window = new CFClient::UI::FancyFrame
205 border_bg => [1, 1, 1, 0.5],
206 bg => [0.3, 0.3, 0.3, 0.8],
207 child => (my $vbox = new CFClient::UI::VBox);
208
209 $vbox->add ($LOGVIEW = new CFClient::UI::TextView expand => 1);
210 $vbox->add (my $input = new CFClient::UI::LineEntry);
211 $input->connect (activate => sub {
212 my ($input, $text) = @_;
213 $input->set_text ('');
214
215 if ($text =~ /^\/(.*)/) {
216 $::CONN->user_send ("command $1");
217 } else {
218 my $say_cmd = $::CFG->{say_command} || 'say';
219 $::CONN->user_send ("command $say_cmd $text");
220 }
221 1
222 });
223
224 $window
225}
226
227sub sdl_init {
228 SDL::Init SDL_INIT_AUDIO | SDL_INIT_VIDEO
229 and die "SDL::Init failed!\n";
230}
231
232sub init_screen {
233 sdl_init;
234
235 ($WIDTH, $HEIGHT) = @{ $SDL_MODES[$CFG->{sdl_mode}] };
236 $FULLSCREEN = $CFG->{fullscreen};
237 $FAST = $CFG->{fast};
238
239 SDL::GLSetAttribute SDL_GL_RED_SIZE, 5;
240 SDL::GLSetAttribute SDL_GL_GREEN_SIZE, 5;
241 SDL::GLSetAttribute SDL_GL_BLUE_SIZE, 5;
242 SDL::GLSetAttribute SDL_GL_ALPHA_SIZE, 0;
243
244 SDL::GLSetAttribute SDL_GL_ACCUM_RED_SIZE, 0;
245 SDL::GLSetAttribute SDL_GL_ACCUM_GREEN_SIZE, 0;
246 SDL::GLSetAttribute SDL_GL_ACCUM_BLUE_SIZE, 0;
247 SDL::GLSetAttribute SDL_GL_ACCUM_ALPHA_SIZE, 0;
248
249 SDL::GLSetAttribute SDL_GL_DOUBLEBUFFER, 1;
250 SDL::GLSetAttribute SDL_GL_BUFFER_SIZE, 15;
251 SDL::GLSetAttribute SDL_GL_DEPTH_SIZE, 0;
252
253 SDL::SetVideoMode $WIDTH, $HEIGHT, 0,
254 SDL_HWSURFACE | SDL_ANYFORMAT | SDL_OPENGL | SDL_DOUBLEBUF
255 | ($FULLSCREEN ? SDL_FULLSCREEN : 0)
256 or die "SDL::SetVideoMode failed!\n";
257
258 SDL::WMSetCaption "Crossfire+ Client", "Crossfire+";
259
260 $SDL_EV = new SDL::Event;
261 $SDL_EV->set_unicode (1);
262
263 $SDL_ACTIVE = 1;
264
265 $LAST_REFRESH = time - 0.01;
266
267 CFClient::gl_init;
268
269 $FONTSIZE = int $HEIGHT / 40;
270
271 #############################################################################
272
273 $DEBUG_STATUS = new CFClient::UI::Label padding => 0, z => 100;
274 $CFClient::UI::TOPLEVEL->add ($DEBUG_STATUS);
275
276 $STATUS_LINE = new CFClient::UI::Label
277 padding => 0,
278 y => $HEIGHT * 44 / 45 - $FONTSIZE;
279 $CFClient::UI::TOPLEVEL->add ($STATUS_LINE);
280
281 $ALT_ENTER_MESSAGE = new CFClient::UI::Label
282 padding => 0,
283 y => $HEIGHT * 44 / 45,
284 height => $HEIGHT / 45,
285 text => "Use <b>Alt-Enter</b> to toggle fullscreen mode";
286 $CFClient::UI::TOPLEVEL->add ($ALT_ENTER_MESSAGE);
287
288 $CFClient::UI::TOPLEVEL->add ($MAPWIDGET = new CFClient::UI::MapWidget);
289 $MAPWIDGET->focus_in;
290
291 $CFClient::UI::TOPLEVEL->add ($BUTTONBAR = new CFClient::UI::HBox);
292
293 $BUTTONBAR->add (my $setup = new CFClient::UI::Flopper x => 0, y => 0, text => "Setup", other => config_dialog, state => 1);
294 $BUTTONBAR->add (my $setup = new CFClient::UI::Flopper x => 0, y => 0, text => "Console", other => console_window);
295}
296
297sub destroy_screen {
298 $CFClient::UI::TOPLEVEL->{children} = [];
299 undef $SDL_ACTIVE;
300 undef $SDL_EV;
301 SDL::Quit;
302}
303
304my %animate_object;
305my $animate_timer;
306
307my $want_refresh;
308my $can_refresh;
309
310my $fps = 9;
170 311
171sub force_refresh { 312sub force_refresh {
313 $fps = $fps * 0.95 + 1 / ($NOW - $LAST_REFRESH) * 0.05;
314 debug sprintf "%3.2f", $fps;
315
316 $want_refresh = 0;
317 $can_refresh = 0;
318
172 glViewport 0, 0, $WIDTH, $HEIGHT; 319 glViewport 0, 0, $WIDTH, $HEIGHT;
173 320
174 glMatrixMode GL_PROJECTION; 321 glMatrixMode GL_PROJECTION;
175 glLoadIdentity; 322 glLoadIdentity;
176 glOrtho 0, $WIDTH, $HEIGHT, 0, -10000 , 10000; 323 glOrtho 0, $WIDTH, $HEIGHT, 0, -10000 , 10000;
177 glMatrixMode GL_MODELVIEW; 324 glMatrixMode GL_MODELVIEW;
178 glLoadIdentity; 325 glLoadIdentity;
179 326
327 glClearColor +($CFG->{fow_intensity}) x 3, 1;
180 glClear GL_COLOR_BUFFER_BIT; 328 glClear GL_COLOR_BUFFER_BIT;
181 329
182 $CFClient::UI::TOPLEVEL->draw; 330 $CFClient::UI::TOPLEVEL->draw;
183 331
184 SDL::GLSwapBuffers; 332 SDL::GLSwapBuffers;
185}
186 333
187sub debug { 334 $LAST_REFRESH = $NOW;
188 $DEBUG_STATUS->set_text ($_[0]);
189 $DEBUG_STATUS->size_allocate ($DEBUG_STATUS->size_request);
190 $DEBUG_STATUS->move ($WIDTH - $DEBUG_STATUS->{w}, 0);
191} 335}
192 336
193my $FPS; 337my $refresh_watcher = Event->timer (after => 0, hard => 1, interval => 1 / $MAX_FPS, cb => sub {
338 $NOW = time;
339
340 ($SDL_CB{$SDL_EV->type} || sub { warn "unhandled event ", $SDL_EV->type })->()
341 while $SDL_EV->poll;
342
343 if (%animate_object) {
344 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object;
345 $want_refresh++;
346 }
347
348 if ($want_refresh) {
349 force_refresh;
350 } else {
351 $can_refresh = 1;
352 }
353});
194 354
195sub refresh { 355sub refresh {
196 $refresh_handler ||= add Glib::Idle sub { 356 $want_refresh++;
197 if ($SDL_APP) {
198 $NOW = SDL::GetTicks;
199
200 if ($NOW - $last_refresh < $TICKS_PER_FRAME) {
201 SDL::Delay $TICKS_PER_FRAME - ($NOW - $last_refresh);
202 $NOW = SDL::GetTicks;
203 }
204
205 my $interval = ($NOW - $last_refresh) * 0.001;
206 $last_refresh = $NOW;
207
208 if ($interval) {
209 $FPS ||= 1 / $interval;
210 $FPS = $FPS * 0.96 + (1 / $interval) * 0.04;
211 debug sprintf "%5.02f", $FPS;
212 }
213
214 force_refresh;
215 $_->animate ($interval) for grep $_, values %ANIMATE;
216
217 if (%ANIMATE) {
218 1
219 } else {
220 undef $refresh_handler;
221 0
222 }
223 } else {
224 undef $refresh_handler;
225 0
226 }
227 };
228} 357}
229 358
230sub animation_start { 359sub animation_start {
231 my ($widget) = @_; 360 my ($widget) = @_;
232 $ANIMATE{$widget} = $widget; 361 $animate_object{$widget} = $widget;
233 Scalar::Util::weaken $ANIMATE{$widget};
234
235 refresh;
236} 362}
237 363
238sub animation_stop { 364sub animation_stop {
239 my ($widget) = @_; 365 my ($widget) = @_;
240 delete $ANIMATE{$widget}; 366 delete $animate_object{$widget};
367}
368
369@conn::ISA = Crossfire::Protocol::;
370
371sub conn::user_send {
372 my ($self, $command) = @_;
373
374 $self->send ($command);
375 status $command;
376}
377
378sub conn::feed_map1a {
379 my ($self, $data) = @_;
380
381# $self->Crossfire::Protocol::feed_map1a ($data);
382
383 $MAP->scroll (delete $self->{delayed_scroll_x}, delete $self->{delayed_scroll_y});
384 $MAP->map1a_update ($data);
385 $MAPWIDGET->update;
386}
387
388#sub conn::map_update {
389# my ($self, $dirty) = @_;
390#
391# $MAPWIDGET->update;
392#}
393
394sub conn::map_clear {
395 my ($self) = @_;
396
397 $MAP->clear;
398
399# refresh;
400}
401
402sub conn::face_find {
403 my ($self, $face) = @_;
404
405 $FACECACHE->{"$face->{chksum},$face->{name}"}
406}
407
408sub conn::face_update {
409 my ($self, $facenum, $face) = @_;
410
411 $FACECACHE->{"$face->{chksum},$face->{name}"} = $face->{image};
412
413 my $tex = $face->{texture} = new_from_image CFClient::Texture delete $face->{image};
414
415 $MAP->set_texture ($facenum, @$tex{qw(name w h s t)});
416 $MAPWIDGET->update;
417}
418
419sub conn::query {
420 my ($self, $flags, $prompt) = @_;
421
422 #TODO
423 warn "<<<<QUERY:$flags:$prompt>>>\n";#d#
424}
425
426sub conn::drawinfo {
427 my ($self, $color, $text) = @_;
428
429 my @color = (
430 [1.00, 1.00, 1.00], #[0.00, 0.00, 0.00],
431 [1.00, 1.00, 1.00],
432 [0.00, 0.00, 0.55],
433 [1.00, 0.00, 0.00],
434 [1.00, 0.54, 0.00],
435 [0.11, 0.56, 1.00],
436 [0.93, 0.46, 0.00],
437 [0.18, 0.54, 0.34],
438 [0.56, 0.73, 0.56],
439 [0.80, 0.80, 0.80],
440 [0.55, 0.41, 0.13],
441 [0.99, 0.77, 0.26],
442 [0.74, 0.65, 0.41],
443 );
444
445 $LOGVIEW->add_paragraph ($color[$color], $text);
241} 446}
242 447
243%SDL_CB = ( 448%SDL_CB = (
244 SDL_QUIT() => sub { 449 SDL_QUIT() => sub {
245 main_quit Gtk2; 450 Event::unloop -1;
246 }, 451 },
247 SDL_VIDEORESIZE() => sub { 452 SDL_VIDEORESIZE() => sub {
248 }, 453 },
249 SDL_VIDEOEXPOSE() => sub { 454 SDL_VIDEOEXPOSE() => sub {
250 refresh; 455 refresh;
251 }, 456 },
252 SDL_KEYDOWN() => sub { 457 SDL_KEYDOWN() => sub {
253 if ($SDL_EV->key_mod & KMOD_ALT && $SDL_EV->key_sym == SDLK_RETURN) { 458 if ($SDL_EV->key_mod & KMOD_ALT && $SDL_EV->key_sym == SDLK_RETURN) {
254 # alt-enter 459 # alt-enter
255 $FULLSCREEN = !$FULLSCREEN; 460 destroy_screen;
461 $CFG->{fullscreen} = !$CFG->{fullscreen};
256 init_screen; 462 init_screen;
257 } else { 463 } else {
258 CFClient::UI::feed_sdl_key_down_event ($SDL_EV); 464 CFClient::UI::feed_sdl_key_down_event ($SDL_EV);
259 } 465 }
260 }, 466 },
… …
273 SDL_ACTIVEEVENT() => sub { 479 SDL_ACTIVEEVENT() => sub {
274# printf "active %x %x\n", $SDL_EV->active_gain, $SDL_EV->active_state;#d# 480# printf "active %x %x\n", $SDL_EV->active_gain, $SDL_EV->active_state;#d#
275 }, 481 },
276); 482);
277 483
278@conn::ISA = Crossfire::Protocol::;
279
280sub conn::map_update {
281 my ($self, $dirty) = @_;
282
283 $MAPWIDGET->update;
284}
285
286sub conn::map_scroll {
287 my ($self, $dx, $dy) = @_;
288
289# refresh;
290}
291
292sub conn::map_clear {
293 my ($self) = @_;
294
295# refresh;
296}
297
298sub conn::face_find {
299 my ($self, $face) = @_;
300
301 $FACECACHE->{"$face->{chksum},$face->{name}"}
302}
303
304sub conn::face_update {
305 my ($self, $face) = @_;
306
307 $FACECACHE->{"$face->{chksum},$face->{name}"} = $face->{image};
308
309 $face->{texture} = new_from_image CFClient::Texture delete $face->{image};
310}
311
312sub conn::query {
313 my ($self, $flags, $prompt) = @_;
314
315 warn "<<<<QUERY:$flags:$prompt>>>\n";#d#
316}
317
318sub gtk_add_cfg_field {
319 my ($tbl, $cfg, $klbl, $key, $value) = @_;
320 my $i = $cfg->{_i}++;
321 $tbl->attach_defaults (my $lbl = Gtk2::Label->new ($klbl), 0, 1, $i, $i + 1);
322 $tbl->attach_defaults (my $ent = Gtk2::Entry->new, 1, 2, $i, $i + 1);
323 if ($key eq 'password') {
324 $ent->set_invisible_char ("*");
325 $ent->set (visibility => 0)
326 }
327 $ent->set_text ($value);
328 $ent->signal_connect (changed => sub {
329 my ($ent) = @_;
330 $cfg->{$key} = $ent->get_text;
331 # TODO: Mapsize should be a slider in the game gui
332 if ($key eq 'mapsize' and $cfg->{$key} > 100) {
333 $cfg->{$key} = 100;
334 } elsif ($key eq 'mapsize' and $cfg->{$key} < 50) {
335 $cfg->{$key} = 50;
336 }
337 });
338}
339
340sub run_config_dialog {
341 my (%events) = @_;
342
343 my $w = Gtk2::Window->new;
344
345 my @cfg = (
346 [qw/Host host/],
347 [qw/Port port/],
348 [qw/Mapsize% mapsize/],
349 [qw/Username user/],
350 [qw/Password password/],
351 );
352
353 my $cfg = {};
354
355 my $a = SDL::ListModes (0, SDL_FULLSCREEN|SDL_HWSURFACE);
356 my @modes = map { [SDL::RectW ($_), SDL::RectH ($_)] } @$a;
357
358 $w->add (my $vb = Gtk2::VBox->new);
359 $vb->pack_start (my $t = Gtk2::Table->new (2, scalar @cfg), 0, 0, 0);
360 my $selmode = $::CFG->{width} . 'x' . $::CFG->{height};
361 $t->attach_defaults (Gtk2::Label->new ("Modes"), 0, 1, 0, 1);
362 $t->attach_defaults (my $cb = Gtk2::ComboBox->new_text, 1, 2, 0, 1);
363 my $i = 0;
364 my $act = 0;
365 for (map { "$_->[0]x$_->[1]" } reverse @modes) {
366 if ($_ eq $selmode) { $act = $i }
367 $cb->append_text ($_);
368 $i++;
369 }
370 $cb->set_active ($act);
371 $cb->signal_connect (changed => sub {
372 my ($cb) = @_;
373 my $txt = $cb->get_active_text;
374 if ($txt =~ m/(\d+)x(\d+)/) {
375 $::CFG->{width} = $1;
376 $::CFG->{height} = $2;
377 }
378 });
379
380 $cfg->{_i} = 1;
381 for (@cfg) {
382 gtk_add_cfg_field ($t, $cfg, $_->[0], $_->[1], $::CFG->{$_->[1]});
383 }
384
385 $vb->pack_start (my $hb = Gtk2::HBox->new, 0, 0, 0);
386 $hb->pack_start (my $cb = Gtk2::Button->new ("save"), 1, 1, 5);
387 $cb->signal_connect (clicked => sub {
388 for (keys %$cfg) {
389 $::CFG->{$_} = $cfg->{$_}
390 if $_ ne '_i';
391 }
392 CFClient::write_cfg "$CFrossfire::VARDIR/pclientrc";
393 });
394 $hb->pack_start (my $cb = Gtk2::Button->new ("login"), 1, 1, 5);
395 $cb->signal_connect (clicked => sub {
396 for (keys %$cfg) {
397 $::CFG->{$_} = $cfg->{$_}
398 if $_ ne '_i';
399 }
400 my $cb = $events{login} || sub {};
401 $cb->($::CFG->{user}, $::CFG->{password});
402 });
403 $hb->pack_start (my $cb = Gtk2::Button->new ("logout"), 1, 1, 5);
404 $cb->signal_connect (clicked => sub {
405 my $cb = $events{logout} || sub {};
406 $cb->();
407 });
408 $hb->pack_start (my $cb = Gtk2::Button->new ("quit"), 1, 1, 5);
409 $cb->signal_connect (clicked => sub { $w->destroy });
410
411 $w->show_all;
412
413 $w->signal_connect (destroy => sub { Gtk2->main_quit });
414}
415
416
417############################################################################# 484#############################################################################
418 485
419SDL::Init SDL_INIT_EVERYTHING;
420
421CFClient::read_cfg "$Crossfire::VARDIR/pclientrc"; 486CFClient::read_cfg "$Crossfire::VARDIR/pclientrc";
422 487
423$CFG ||= { 488my %DEF_CFG = (
424 width => 640, 489 width => 640,
425 height => 480, 490 height => 480,
491 fast => 0,
492 fow_enable => 1,
493 fow_intensity => 0.45,
494 fow_smooth => 0,
495 fullscreen => 0,
496 sdl_mode => 0,
426 mapsize => 100, 497 mapsize => 100,
427 fullscreen => 0,
428 host => "crossfire.schmorp.de", 498 host => "crossfire.schmorp.de",
429 port => 13327, 499 port => 13327,
430}; 500 say_command => 'say',
501);
502
503while (my ($k, $v) = each %DEF_CFG) {
504 $CFG->{$k} = $v unless exists $CFG->{$k};
505}
506
507sdl_init;
508
509@SDL_MODES = reverse
510 grep $_->[0] >= 640 && $_->[1] >= 480,
511 map [SDL::RectW ($_), SDL::RectH ($_)],
512 @{ SDL::ListModes 0, SDL_FULLSCREEN | SDL_HWSURFACE | SDL_OPENGL };
513
514@SDL_MODES or CFClient::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)";
515
516$CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES;
517
518init_screen;
431 519
432{ 520{
433 my @fonts = map CFClient::find_rcfile $_, qw(uifont.ttf uifontb.ttf uifonti.ttf uifontbi.ttf); 521 my @fonts = map CFClient::find_rcfile $_, qw(uifont.ttf uifontb.ttf uifonti.ttf uifontbi.ttf);
434 522
435 CFClient::add_font $_ for @fonts; 523 CFClient::add_font $_ for @fonts;
436 CFClient::set_font $fonts[0]; 524 CFClient::set_font $fonts[0];
437} 525}
438 526
439$FACECACHE = eval { Crossfire::load_ref "$Crossfire::VARDIR/pclient.faces" } || {}; 527$FACECACHE = eval { Crossfire::load_ref "$Crossfire::VARDIR/pclient.faces" } || {};
440 528
441run_config_dialog 529Event::loop;
442 login => sub { start_game },
443 logout => sub { stop_game };
444
445main Gtk2;
446 530
447Crossfire::save_ref $FACECACHE, "$Crossfire::VARDIR/pclient.faces"; 531Crossfire::save_ref $FACECACHE, "$Crossfire::VARDIR/pclient.faces";
532

Diff Legend

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