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.13 by root, Fri Apr 7 16:30:23 2006 UTC vs.
Revision 1.82 by root, Wed Apr 12 12:16:59 2006 UTC

1#!/opt/bin/perl 1#!/opt/bin/perl
2 2
3use strict; 3use strict;
4use utf8;
4 5
5use Glib; 6use Glib;
6use Gtk2 -init; 7use Gtk2 -init;
7 8
8use SDL; 9use SDL;
11use SDL::Surface; 12use SDL::Surface;
12use SDL::OpenGL; 13use SDL::OpenGL;
13use SDL::OpenGL::Constants; 14use SDL::OpenGL::Constants;
14 15
15use Crossfire; 16use Crossfire;
16use Crossfire::Client;
17use Crossfire::Protocol; 17use Crossfire::Protocol;
18 18
19use CFClient;
19use Client::Util; 20use CFClient::UI;
20 21
21our $VERSION = '0.1'; 22our $VERSION = '0.1';
23
24my $MAX_FPS = 60;
25my $TICKS_PER_FRAME = int 1000 / $MAX_FPS - 1; # min ticks per frame
26
27our $FACECACHE;
22 28
23our $CFG; 29our $CFG;
24our $CONN; 30our $CONN;
31our $FAST; # fast, low-quality mode
32
33our @SDL_MODES;
34our $WIDTH;
35our $HEIGHT;
36our $FULLSCREEN;
37
38our $NOW;
39
40our $MAPWIDGET;
41our $FONTSIZE;
25 42
26our $SDL_TIMER; 43our $SDL_TIMER;
27our $SDL_APP; 44our $SDL_APP;
28our $SDL_EV = new SDL::Event; 45our $SDL_EV;
29our %SDL_CB; 46our %SDL_CB;
30 47
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 config_dialog {
69 my $dialog = new CFClient::UI::FancyFrame x => 300, y => 100,
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
74 $table->add (0, 0, new CFClient::UI::Label align => 1, text => "Video Mode");
75 $table->add (1, 0, my $hbox = new CFClient::UI::HBox);
76
77 $hbox->add (my $mode_slider = new CFClient::UI::Slider expand => 1, req_w => 100, range => [$CFG->{sdl_mode}, 0, scalar @SDL_MODES, 1]);
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
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
31sub init_screen { 130sub init_screen {
32 # nuke all gl context data
33
34 $SDL_APP = new SDL::App 131 $SDL_APP = new SDL::App
35 -flags => SDL_ANYFORMAT | SDL_HWSURFACE, 132 -flags => SDL_ANYFORMAT | SDL_HWSURFACE,
36 -title => "Crossfire+ Client", 133 -title => "Crossfire+ Client",
37 -width => $CFG->{width}, 134 -width => $WIDTH,
38 -height => $CFG->{height}, 135 -height => $HEIGHT,
39 -opengl => 1, 136 -opengl => 1,
40 -red_size => 8, 137 -red_size => 5,
41 -green_size => 8, 138 -green_size => 5,
42 -blue_size => 8, 139 -blue_size => 5,
140 -alpha_size => 0,
43 -double_buffer => 1, 141 -double_buffer => 1,
44 -fullscreen => $CFG->{fullscreen}, 142 -fullscreen => $FULLSCREEN,
45 -resizeable => 0; 143 -resizeable => 0;
46 144
47 glEnable GL_TEXTURE_2D; 145 $SDL_EV = new SDL::Event;
48 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 146 $SDL_EV->set_unicode (1);
49 glShadeModel GL_FLAT; 147
50 glDisable GL_DEPTH_TEST; 148 $SDL_TIMER = add Glib::Timeout 1000 / $MAX_FPS, sub {
51 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 149 ($SDL_CB{$SDL_EV->type} || sub { warn "unhandled event ", $SDL_EV->type })->()
52 glEnable GL_BLEND; 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
203 host => $CFG->{host},
204 port => $CFG->{port},
205 user => $CFG->{user},
206 pass => $CFG->{password},
207 mapw => $mapsize,
208 maph => $mapsize,
209 ;
210
211 CFClient::lowdelay fileno $CONN->{fh};
212}
213
214sub stop_game {
215 remove Glib::Source $refresh_handler if $refresh_handler;
216 undef $refresh_handler;
217
218 undef $CONN;
219 destroy_screen;
220}
221
222sub force_refresh {
223 glViewport 0, 0, $WIDTH, $HEIGHT;
53 224
54 glMatrixMode GL_PROJECTION; 225 glMatrixMode GL_PROJECTION;
55 glLoadIdentity; 226 glLoadIdentity;
56 glOrtho 0, $CFG->{width} / 32, $CFG->{height} / 32, 0, -1 , 1; 227 glOrtho 0, $WIDTH, $HEIGHT, 0, -10000 , 10000;
228 glMatrixMode GL_MODELVIEW;
229 glLoadIdentity;
57 230
58 # re-bind all textures 231 glClear GL_COLOR_BUFFER_BIT;
59}
60 232
61sub start_game { 233 $CFClient::UI::TOPLEVEL->draw;
62 $SDL_TIMER = add Glib::Timeout 1000/20, sub { 234
63 while ($SDL_EV->poll) { 235 SDL::GLSwapBuffers;
64 ($SDL_CB{$SDL_EV->type} || sub { warn "unhandled event ", $SDL_EV->type })->(); 236}
237
238my $FPS;
239
240sub refresh {
241 $refresh_handler ||= add Glib::Idle sub {
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
65 } 271 }
66
67 1
68 }; 272 };
69
70 init_screen;
71
72 $CONN = new conn
73 host => $CFG->{host},
74 port => $CFG->{port};
75} 273}
76 274
77sub stop_game { 275sub animation_start {
78 remove Glib::Source $SDL_TIMER; 276 my ($widget) = @_;
277 $ANIMATE{$widget} = $widget;
278 Scalar::Util::weaken $ANIMATE{$widget};
79 279
80 undef $SDL_APP; 280 refresh;
81 SDL::Quit;
82} 281}
83 282
84sub refresh { 283sub animation_stop {
85 glClearColor 0, 0, 0, 0; 284 my ($widget) = @_;
86 glClear GL_COLOR_BUFFER_BIT; 285 delete $ANIMATE{$widget};
87
88 my $map = $CONN->{map};
89
90 for my $x (0 .. $CONN->{mapw} - 1) {
91 for my $y (0 .. $CONN->{maph} - 1) {
92
93 my $cell = $map->[$x][$y]
94 or next;
95
96 my $darkness = $cell->[3] * (1 / 255);
97 glColor $darkness, $darkness, $darkness;
98
99 for my $num (grep $_, $cell->[0], $cell->[1], $cell->[2]) {
100 my $tex = $CONN->{face}[$num]{texture} || 0;
101
102 glBindTexture GL_TEXTURE_2D, $tex;
103
104 glBegin GL_QUADS;
105 glTexCoord 0, 0; glVertex $x, $y;
106 glTexCoord 0, 1; glVertex $x, $y + 1;
107 glTexCoord 1, 1; glVertex $x + 1, $y + 1;
108 glTexCoord 1, 0; glVertex $x + 1, $y;
109 glEnd;
110 }
111 }
112 }
113
114 SDL::GLSwapBuffers;
115} 286}
116 287
117%SDL_CB = ( 288%SDL_CB = (
118 SDL_QUIT() => sub { 289 SDL_QUIT() => sub {
119 warn "sdl quit\n";#d# 290 main_quit Gtk2;
120 exit;
121 }, 291 },
122 SDL_VIDEORESIZE() => sub { 292 SDL_VIDEORESIZE() => sub {
123 }, 293 },
124 SDL_VIDEOEXPOSE() => sub { 294 SDL_VIDEOEXPOSE() => sub {
125 refresh; 295 refresh;
126 }, 296 },
127 SDL_KEYDOWN() => sub { 297 SDL_KEYDOWN() => sub {
298 if ($SDL_EV->key_mod & KMOD_ALT && $SDL_EV->key_sym == SDLK_RETURN) {
299 # alt-enter
300 $FULLSCREEN = !$FULLSCREEN;
301 destroy_screen;
302 init_screen;
303 } else {
304 CFClient::UI::feed_sdl_key_down_event ($SDL_EV);
305 }
128 }, 306 },
129 SDL_KEYUP() => sub { 307 SDL_KEYUP() => sub {
308 CFClient::UI::feed_sdl_key_up_event ($SDL_EV);
130 }, 309 },
131 SDL_MOUSEMOTION() => sub { 310 SDL_MOUSEMOTION() => sub {
132 warn "sdl motion\n";#d# 311 CFClient::UI::feed_sdl_motion_event ($SDL_EV);
133 }, 312 },
134 SDL_MOUSEBUTTONDOWN() => sub { 313 SDL_MOUSEBUTTONDOWN() => sub {
314 CFClient::UI::feed_sdl_button_down_event ($SDL_EV);
135 }, 315 },
136 SDL_MOUSEBUTTONUP() => sub { 316 SDL_MOUSEBUTTONUP() => sub {
317 CFClient::UI::feed_sdl_button_up_event ($SDL_EV);
137 }, 318 },
138 SDL_ACTIVEEVENT() => sub { 319 SDL_ACTIVEEVENT() => sub {
139 warn "active\n";#d# 320# printf "active %x %x\n", $SDL_EV->active_gain, $SDL_EV->active_state;#d#
140 }, 321 },
141); 322);
142 323
143@conn::ISA = Crossfire::Protocol::; 324@conn::ISA = Crossfire::Protocol::;
144 325
145sub conn::map_update { 326sub conn::map_update {
146 my ($self, $dirty) = @_; 327 my ($self, $dirty) = @_;
147 328
148 refresh; 329 $MAPWIDGET->update;
149} 330}
150 331
151sub conn::map_scroll { 332sub conn::map_scroll {
152 my ($self, $dx, $dy) = @_; 333 my ($self, $dx, $dy) = @_;
153 334
154 refresh; 335# refresh;
155} 336}
156 337
157sub conn::map_clear { 338sub conn::map_clear {
158 my ($self) = @_; 339 my ($self) = @_;
159 340
160 refresh; 341# refresh;
342}
343
344sub conn::face_find {
345 my ($self, $face) = @_;
346
347 $FACECACHE->{"$face->{chksum},$face->{name}"}
161} 348}
162 349
163sub conn::face_update { 350sub conn::face_update {
164 my ($self, $num, $face) = @_; 351 my ($self, $face) = @_;
165 352
166 my $pb = new Gtk2::Gdk::PixbufLoader; 353 $FACECACHE->{"$face->{chksum},$face->{name}"} = $face->{image};
167 $pb->write ($face->{image});
168 $pb->close;
169 354
170 $pb = $pb->get_pixbuf; 355 $face->{texture} = new_from_image CFClient::Texture delete $face->{image};
171 $pb = $pb->add_alpha (0, 0, 0, 0); 356}
172 357
173 glGetError(); 358sub conn::query {
174 my ($tex) = @{glGenTextures 1}; 359 my ($self, $flags, $prompt) = @_;
175 360
176 $face->{texture} = $tex; 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/],
177 397 );
178 glBindTexture GL_TEXTURE_2D, $tex; 398
179 my $glerr=glGetError(); die "a: ".gluErrorString($glerr)."\n" if $glerr; 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;
180 420 }
181 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR; 421 });
182 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR;#_MIPMAP_LINEAR; 422
183 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP; 423 $cfg->{_i} = 1;
184 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP; 424 for (@cfg) {
185 425 gtk_add_cfg_field ($t, $cfg, $_->[0], $_->[1], $::CFG->{$_->[1]});
186 glTexImage2D GL_TEXTURE_2D, 0, 426 }
187 GL_RGBA8, 427
188 $pb->get_width, $pb->get_height, 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';
189 0, 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';
190 GL_RGBA, 442 }
191 GL_UNSIGNED_BYTE, 443 my $cb = $events{login} || sub {};
192 $pb->get_pixels; 444 $cb->($::CFG->{user}, $::CFG->{password});
193 my $glerr=glGetError(); die "Problem setting up 2d Texture (dimensions not a power of 2?)):".gluErrorString($glerr)."\n" if $glerr; 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 });
194} 457}
458
195 459
196############################################################################# 460#############################################################################
197 461
462SDL::Init SDL_INIT_EVERYTHING;
463
464@SDL_MODES = reverse map [SDL::RectW ($_), SDL::RectH ($_)],
465 @{ SDL::ListModes 0, SDL_FULLSCREEN|SDL_HWSURFACE };
466
198Client::Util::read_cfg "$Crossfire::VARDIR/pclientrc"; 467CFClient::read_cfg "$Crossfire::VARDIR/pclientrc";
199 468
200$CFG ||= { 469$CFG ||= {
201 width => 640, 470 width => 640,
202 height => 480, 471 height => 480,
203 fullscreen => 0, 472 fullscreen => 0,
473 sdl_mode => 0,
474 mapsize => 100,
204 host => "crossfire.schmorp.de", 475 host => "crossfire.schmorp.de",
205 port => 13327, 476 port => 13327,
206}; 477};
207 478
208Client::Util::run_config_dialog; 479{
480 my @fonts = map CFClient::find_rcfile $_, qw(uifont.ttf uifontb.ttf uifonti.ttf uifontbi.ttf);
481
482 CFClient::add_font $_ for @fonts;
483 CFClient::set_font $fonts[0];
484}
485
486$FACECACHE = eval { Crossfire::load_ref "$Crossfire::VARDIR/pclient.faces" } || {};
487
488run_config_dialog
489 login => sub { start_game },
490 logout => sub { stop_game };
209 491
210main Gtk2; 492main Gtk2;
211 493
494Crossfire::save_ref $FACECACHE, "$Crossfire::VARDIR/pclient.faces";
495

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines