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.26 by elmex, Fri Apr 7 20:57:29 2006 UTC vs.
Revision 1.84 by root, Wed Apr 12 15:46:14 2006 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines