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.10 by elmex, Fri Apr 7 16:04:03 2006 UTC vs.
Revision 1.75 by root, Tue Apr 11 21:24:10 2006 UTC

1#!/opt/bin/perl 1#!/opt/bin/perl
2 2
3use strict; 3use strict;
4use utf8;
4 5
5use Crossfire::Client; 6use Glib;
6use Crossfire::Protocol; 7use Gtk2 -init;
7
8use Client::Util;
9
10package Crossfire::Client; # uh, yeah
11
12use strict;
13
14our $CFG;
15our $VERSION = '0.1';
16 8
17use SDL; 9use SDL;
18use SDL::App; 10use SDL::App;
19use SDL::Event; 11use SDL::Event;
20use SDL::Surface; 12use SDL::Surface;
21use SDL::OpenGL; 13use SDL::OpenGL;
22use SDL::OpenGL::Constants; 14use SDL::OpenGL::Constants;
23 15
24my $conn; 16use Crossfire;
25my $app; 17use Crossfire::Protocol;
26 18
27my $WIDTH = 640; 19use CFClient;
28my $HEIGHT = 480; 20use CFClient::UI;
29 21
30sub glinit { 22our $VERSION = '0.1';
31 # nuke all gl context data 23
32 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;
31
32our @SDL_MODES;
33our $WIDTH;
34our $HEIGHT;
35our $FULLSCREEN;
36
37our $NOW;
38
39our $MAPWIDGET;
40our $FONTSIZE;
41
42our $SDL_TIMER;
43our $SDL_APP;
44our $SDL_EV;
45our %SDL_CB;
46
47our $ALT_ENTER_MESSAGE;
48our $STATUS_LINE;
49our $DEBUG_STATUS;
50
51my $last_refresh;
52my %ANIMATE;
53my $refresh_handler;
54
55our ($tw, $te); # Test widget #d#
56
57sub init_screen {
33 $app = new SDL::App 58 $SDL_APP = new SDL::App
34 -flags => SDL_ANYFORMAT | SDL_HWSURFACE, 59 -flags => SDL_ANYFORMAT | SDL_HWSURFACE,
35 -title => "Crossfire+ Client", 60 -title => "Crossfire+ Client",
36 -width => $WIDTH, 61 -width => $WIDTH,
37 -height => $HEIGHT, 62 -height => $HEIGHT,
38 -opengl => 1, 63 -opengl => 1,
39 -red_size => 8, 64 -red_size => 5,
40 -green_size => 8, 65 -green_size => 5,
41 -blue_size => 8, 66 -blue_size => 5,
67 -alpha_size => 0,
42 -double_buffer => 1, 68 -double_buffer => 1,
69 -fullscreen => $FULLSCREEN,
43 -resizeable => 0; 70 -resizeable => 0;
44 71
72 $SDL_EV = new SDL::Event;
73 $SDL_EV->set_unicode (1);
74
75 $SDL_TIMER = add Glib::Timeout 1000/50, sub {
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
45 glEnable GL_TEXTURE_2D; 92 glEnable GL_TEXTURE_2D;
46 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 93 glEnable GL_COLOR_MATERIAL;
47 glShadeModel GL_FLAT; 94 glShadeModel GL_FLAT;
48 glDisable GL_DEPTH_TEST; 95 glDisable GL_DEPTH_TEST;
49 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 96 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
50 glEnable GL_BLEND; 97
98 #############################################################################
99
100 $DEBUG_STATUS = new CFClient::UI::Label;
101 $CFClient::UI::TOPLEVEL->add ($DEBUG_STATUS);
102
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);
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
175 host => $CFG->{host},
176 port => $CFG->{port},
177 user => $CFG->{user},
178 pass => $CFG->{password},
179 mapw => $mapsize,
180 maph => $mapsize,
181 ;
182
183 CFClient::lowdelay fileno $CONN->{fh};
184}
185
186sub stop_game {
187 remove Glib::Source $refresh_handler if $refresh_handler;
188 undef $refresh_handler;
189
190 undef $CONN;
191 destroy_screen;
192}
193
194sub force_refresh {
195 glViewport 0, 0, $WIDTH, $HEIGHT;
51 196
52 glMatrixMode GL_PROJECTION; 197 glMatrixMode GL_PROJECTION;
53 glLoadIdentity; 198 glLoadIdentity;
54 glOrtho 0, $WIDTH / 32, $HEIGHT / 32, 0, -1 , 1; 199 glOrtho 0, $WIDTH, $HEIGHT, 0, -10000 , 10000;
200 glMatrixMode GL_MODELVIEW;
201 glLoadIdentity;
55 202
56 # re-bind all textures 203 glClear GL_COLOR_BUFFER_BIT;
204
205 $CFClient::UI::TOPLEVEL->draw;
206
207 SDL::GLSwapBuffers;
57} 208}
209
210sub debug {
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}
215
216my $FPS;
58 217
59sub refresh { 218sub refresh {
60 glClearColor 0, 0, 0, 0; 219 $refresh_handler ||= add Glib::Idle sub {
61 glClear GL_COLOR_BUFFER_BIT; 220 if ($SDL_APP) {
221 $NOW = SDL::GetTicks;
62 222
63 my $map = $conn->{map}; 223 if ($NOW - $last_refresh < $TICKS_PER_FRAME) {
64 224 SDL::Delay $TICKS_PER_FRAME - ($NOW - $last_refresh);
65 for my $x (0 .. $conn->{mapw} - 1) { 225 $NOW = SDL::GetTicks;
66 for my $y (0 .. $conn->{maph} - 1) {
67
68 my $cell = $map->[$x][$y]
69 or next;
70
71 my $darkness = $cell->[3] * (1 / 255);
72 my $darkness = 0.8 + 0.2*rand;
73 glColor $darkness, $darkness, $darkness;
74
75 for my $num (grep $_, $cell->[0], $cell->[1], $cell->[2]) {
76 my $tex = $conn->{face}[$num]{texture} || 0;
77
78 glBindTexture GL_TEXTURE_2D, $tex;
79
80 glBegin GL_QUADS;
81 glTexCoord 0, 0; glVertex $x, $y;
82 glTexCoord 0, 1; glVertex $x, $y + 1;
83 glTexCoord 1, 1; glVertex $x + 1, $y + 1;
84 glTexCoord 1, 0; glVertex $x + 1, $y;
85 glEnd;
86 } 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
87 } 249 }
88 } 250 };
89
90 SDL::GLSwapBuffers;
91} 251}
92 252
93my $ev = new SDL::Event; 253sub animation_start {
94my %ev_cb; 254 my ($widget) = @_;
255 $ANIMATE{$widget} = $widget;
256 Scalar::Util::weaken $ANIMATE{$widget};
95 257
96sub event(&$) {
97 $ev_cb{$_[0]->()} = $_[1];
98}
99
100sub does(&) { shift }
101
102event {SDL_QUIT} does {
103 exit;
104};
105
106event {SDL_VIDEORESIZE} does {
107 print "resize\n";
108};
109
110event {SDL_VIDEOEXPOSE} does {
111 refresh; 258 refresh;
112}; 259}
113 260
114event {SDL_KEYDOWN} does { 261sub animation_stop {
115 print "keypress\n"; 262 my ($widget) = @_;
116}; 263 delete $ANIMATE{$widget};
264}
117 265
118event {SDL_KEYUP} does { 266%SDL_CB = (
119 print "keyup\n";#d# 267 SDL_QUIT() => sub {
120}; 268 main_quit Gtk2;
121 269 },
122event {SDL_MOUSEMOTION} does { 270 SDL_VIDEORESIZE() => sub {
123 print "motion\n"; 271 },
124}; 272 SDL_VIDEOEXPOSE() => sub {
125 273 refresh;
126event {SDL_MOUSEBUTTONDOWN} does { 274 },
127 print "button\n"; 275 SDL_KEYDOWN() => sub {
128}; 276 if ($SDL_EV->key_mod & KMOD_ALT && $SDL_EV->key_sym == SDLK_RETURN) {
129 277 # alt-enter
130event {SDL_MOUSEBUTTONUP} does { 278 $FULLSCREEN = !$FULLSCREEN;
131 print "buttup\n"; 279 init_screen;
132}; 280 } else {
133 281 CFClient::UI::feed_sdl_key_down_event ($SDL_EV);
134event {SDL_ACTIVEEVENT} does { 282 }
135 print "active\n"; 283 },
136}; 284 SDL_KEYUP() => sub {
137 285 CFClient::UI::feed_sdl_key_up_event ($SDL_EV);
138package Crossfire::Client; 286 },
287 SDL_MOUSEMOTION() => sub {
288 CFClient::UI::feed_sdl_motion_event ($SDL_EV);
289 },
290 SDL_MOUSEBUTTONDOWN() => sub {
291 CFClient::UI::feed_sdl_button_down_event ($SDL_EV);
292 },
293 SDL_MOUSEBUTTONUP() => sub {
294 CFClient::UI::feed_sdl_button_up_event ($SDL_EV);
295 },
296 SDL_ACTIVEEVENT() => sub {
297# printf "active %x %x\n", $SDL_EV->active_gain, $SDL_EV->active_state;#d#
298 },
299);
139 300
140@conn::ISA = Crossfire::Protocol::; 301@conn::ISA = Crossfire::Protocol::;
141 302
142sub conn::map_update { 303sub conn::map_update {
143 my ($self, $dirty) = @_; 304 my ($self, $dirty) = @_;
144 305
145 refresh; 306 $MAPWIDGET->update;
146} 307}
147 308
148sub conn::map_scroll { 309sub conn::map_scroll {
149 my ($self, $dx, $dy) = @_; 310 my ($self, $dx, $dy) = @_;
150 311
151 refresh; 312# refresh;
152} 313}
153 314
154sub conn::map_clear { 315sub conn::map_clear {
155 my ($self) = @_; 316 my ($self) = @_;
156 317
157 refresh; 318# refresh;
319}
320
321sub conn::face_find {
322 my ($self, $face) = @_;
323
324 $FACECACHE->{"$face->{chksum},$face->{name}"}
158} 325}
159 326
160sub conn::face_update { 327sub conn::face_update {
161 my ($self, $num, $face) = @_; 328 my ($self, $face) = @_;
162 329
163 warn "up face $self,$num,$face\n";#d# 330 $FACECACHE->{"$face->{chksum},$face->{name}"} = $face->{image};
164 use Gtk2;
165 331
166 my $pb = new Gtk2::Gdk::PixbufLoader; 332 $face->{texture} = new_from_image CFClient::Texture delete $face->{image};
167 $pb->write ($face->{image}); 333}
168 $pb->close;
169 334
170 $pb = $pb->get_pixbuf; 335sub conn::query {
171 $pb = $pb->add_alpha (0, 0, 0, 0); 336 my ($self, $flags, $prompt) = @_;
172 337
173 glGetError(); 338 warn "<<<<QUERY:$flags:$prompt>>>\n";#d#
174 my ($tex) = @{glGenTextures 1}; 339}
175 340
176 $face->{texture} = $tex; 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/],
177 374 );
178 glBindTexture GL_TEXTURE_2D, $tex; 375
179 my $glerr=glGetError(); die "a: ".gluErrorString($glerr)."\n" if $glerr; 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;
180 397 }
181 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR; 398 });
182 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR;#_MIPMAP_LINEAR; 399
183 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP; 400 $cfg->{_i} = 1;
184 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP; 401 for (@cfg) {
185 402 gtk_add_cfg_field ($t, $cfg, $_->[0], $_->[1], $::CFG->{$_->[1]});
186 glTexImage2D GL_TEXTURE_2D, 0, 403 }
187 GL_RGBA8, 404
188 $pb->get_width, $pb->get_height, 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';
189 0, 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';
190 GL_RGBA, 419 }
191 GL_UNSIGNED_BYTE, 420 my $cb = $events{login} || sub {};
192 $pb->get_pixels; 421 $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; 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 });
194} 434}
435
195 436
196############################################################################# 437#############################################################################
197 438
198use Event; 439SDL::Init SDL_INIT_EVERYTHING;
199 440
441@SDL_MODES = reverse map [SDL::RectW ($_), SDL::RectH ($_)],
442 @{ SDL::ListModes 0, SDL_FULLSCREEN|SDL_HWSURFACE };
443
200Client::Util::read_cfg "$Crossfire::VARDIR/pclient"; 444CFClient::read_cfg "$Crossfire::VARDIR/pclientrc";
201 445
202glinit; 446$CFG ||= {
203 447 width => 640,
204$conn = new conn 448 height => 480,
449 mapsize => 100,
450 fullscreen => 0,
205 host => "cf.schmorp.de", 451 host => "crossfire.schmorp.de",
206 port => 13327; 452 port => 13327,
207
208Event->timer (after => 0, interval => 1/20, hard => 1, cb => sub {
209 while ($ev->poll) {
210 ($ev_cb{$ev->type} || sub { warn "unhandled event ", $ev->type })->();
211 }
212}); 453};
213 454
214Event::loop; 455{
456 my @fonts = map CFClient::find_rcfile $_, qw(uifont.ttf uifontb.ttf uifonti.ttf uifontbi.ttf);
215 457
458 CFClient::add_font $_ for @fonts;
459 CFClient::set_font $fonts[0];
460}
461
462$FACECACHE = eval { Crossfire::load_ref "$Crossfire::VARDIR/pclient.faces" } || {};
463
464run_config_dialog
465 login => sub { start_game },
466 logout => sub { stop_game };
467
468main Gtk2;
469
470Crossfire::save_ref $FACECACHE, "$Crossfire::VARDIR/pclient.faces";

Diff Legend

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