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

Diff Legend

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