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

Diff Legend

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