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

Diff Legend

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