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

Diff Legend

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