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

Diff Legend

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