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

Diff Legend

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