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

Diff Legend

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