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.11 by elmex, Fri Apr 7 16:08:01 2006 UTC vs.
Revision 1.83 by root, Wed Apr 12 15:35:55 2006 UTC

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

Diff Legend

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