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.59 by root, Mon Apr 10 11:55:16 2006 UTC vs.
Revision 1.85 by root, Wed Apr 12 17:11:02 2006 UTC

14use SDL::OpenGL::Constants; 14use SDL::OpenGL::Constants;
15 15
16use Crossfire; 16use Crossfire;
17use Crossfire::Protocol; 17use Crossfire::Protocol;
18 18
19use Crossfire::Client; 19use CFClient;
20use Crossfire::Client::Widget; 20use CFClient::UI;
21
22our $VERSION = '0.1';
23
24my $MAX_FPS = 60;
25my $MIN_FPS = 5; # unused
26my $TICKS_PER_FRAME = int 1000 / $MAX_FPS - 1; # min ticks per frame
21 27
22our $FACECACHE; 28our $FACECACHE;
23
24our $VERSION = '0.1';
25
26our %GL_EXT;
27 29
28our $CFG; 30our $CFG;
29our $CONN; 31our $CONN;
32our $FAST; # fast, low-quality mode, possibly useful for software-rendering
30 33
34our @SDL_MODES;
31our $WIDTH; 35our $WIDTH;
32our $HEIGHT; 36our $HEIGHT;
33our $FULLSCREEN; 37our $FULLSCREEN;
34 38
39our $NOW;
40
41our $MAPWIDGET;
35our $FONTSIZE; 42our $FONTSIZE;
36 43
37our $SDL_TIMER; 44our $SDL_TIMER;
38our $SDL_APP; 45our $SDL_APP;
39our $SDL_EV; 46our $SDL_EV;
40our %SDL_CB; 47our %SDL_CB;
41 48
42our @GL_INIT; # hooks called on every gl init
43
44our $ALT_ENTER_MESSAGE; 49our $ALT_ENTER_MESSAGE;
45our $STATUS_LINE; 50our $STATUS_LINE;
51our $DEBUG_STATUS;
46 52
47my $last_refresh; 53my $last_refresh;
48my %ANIMATE; 54my %ANIMATE;
49my $refresh_handler; 55my $refresh_handler;
50 56
51our ($tw, $te); # Test widget #d# 57sub status {
58 $STATUS_LINE->set_text ($_[0]);
59 my ($w, $h) = $STATUS_LINE->size_request;
60 $STATUS_LINE->size_allocate (0, $HEIGHT - $ALT_ENTER_MESSAGE->{h} - $h, $w, $h);
61}
62
63sub debug {
64 $DEBUG_STATUS->set_text ($_[0]);
65 my ($w, $h) = $DEBUG_STATUS->size_request;
66 $DEBUG_STATUS->size_allocate ($WIDTH - $w, 0, $w, $h);
67}
68
69sub start_game {
70 status "logging in...";
71
72 my $mapsize = List::Util::min 64, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32;
73
74 $CONN = new conn
75 host => $CFG->{host},
76 port => $CFG->{port},
77 user => $CFG->{user},
78 pass => $CFG->{password},
79 mapw => $mapsize,
80 maph => $mapsize,
81 ;
82
83 status "login successful";
84
85 CFClient::lowdelay fileno $CONN->{fh};
86}
87
88sub stop_game {
89 undef $CONN;
90}
91
92sub config_dialog {
93 my $dialog = new CFClient::UI::FancyFrame x => 300, y => 100,
94 child => (my $vbox = new CFClient::UI::VBox);
95 $vbox->add (new CFClient::UI::Label align => 0, text => "Client Setup");
96 $vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]);
97
98 $table->add (0, 0, new CFClient::UI::Label align => 1, text => "Video Mode");
99 $table->add (1, 0, my $hbox = new CFClient::UI::HBox);
100
101 $hbox->add (my $mode_slider = new CFClient::UI::Slider expand => 1, req_w => 100, range => [$CFG->{sdl_mode}, 0, scalar @SDL_MODES, 1]);
102 $hbox->add (my $mode_label = new CFClient::UI::Label height => $FONTSIZE * 0.8);
103
104 $mode_slider->connect (changed => sub {
105 my ($self, $value) = @_;
106
107 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value;
108 $mode_label->set_text (sprintf "%dx%d", @{$SDL_MODES[$value]});
109 });
110 $mode_slider->emit (changed => $mode_slider->{range}[0]);
111
112 $table->add (0, 1, new CFClient::UI::Label align => 1, text => "Fullscreen");
113 $table->add (1, 1, new CFClient::UI::CheckBox state => $CFG->{fullscreen}, connect_changed => sub {
114 my ($self, $value) = @_;
115 $CFG->{fullscreen} = $value;
116 });
117
118 $table->add (1, 2, new CFClient::UI::Button expand => 1, align => 0, text => "Apply", connect_activate => sub {
119 destroy_screen ();
120 init_screen ();
121 });
122
123 $vbox->add (new CFClient::UI::Label align => 0, text => "Server");
124 $vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]);
125 $table->add (0, 2, new CFClient::UI::Label align => 1, text => "Host");
126 $table->add (1, 2, my $host = new CFClient::UI::Entry text => $CFG->{host});
127
128 $table->add (0, 3, new CFClient::UI::Label align => 1, text => "Port");
129 $table->add (1, 3, my $port = new CFClient::UI::Entry text => $CFG->{port});
130
131 $table->add (0, 4, new CFClient::UI::Label align => 1, text => "Username");
132 $table->add (1, 4, my $user = new CFClient::UI::Entry text => $CFG->{user});
133
134 $table->add (0, 5, new CFClient::UI::Label align => 1, text => "Password");
135 $table->add (1, 5, my $pass = new CFClient::UI::Entry text => $CFG->{password}, hidden => 1);
136
137 $table->add (0, 6, new CFClient::UI::Label align => 1, text => "Map Size");
138 $table->add (1, 6, new CFClient::UI::Slider
139 req_w => 100,
140 range => [$CFG->{mapsize}, 10, 100 + 1, 1],
141 connect_changed => sub {
142 my ($self, $value) = @_;
143
144 $CFG->{mapsize} = $self->{range}[0] = $value = int $value;
145 },
146 );
147
148 $table->add (1, 7, new CFClient::UI::Button expand => 1, align => 0, text => "Login", connect_activate => sub {
149 start_game;
150 });
151
152 $vbox->add (my $hbox = new CFClient::UI::HBox);
153
154 $hbox->add (new CFClient::UI::Button expand => 1, align => 0, text => "Save", connect_activate => sub {
155 CFClient::write_cfg "$Crossfire::VARDIR/pclientrc";
156 status "Configuration Saved";
157 });
158 $CFClient::UI::TOPLEVEL->add ($dialog);
159}
52 160
53sub init_screen { 161sub init_screen {
162 ($WIDTH, $HEIGHT) = @{ $SDL_MODES[$CFG->{sdl_mode}] };
163 $FULLSCREEN = $CFG->{fullscreen};
164
54 $SDL_APP = new SDL::App 165 $SDL_APP = new SDL::App
55 -flags => SDL_ANYFORMAT | SDL_HWSURFACE, 166 -flags => SDL_ANYFORMAT | SDL_HWSURFACE,
56 -title => "Crossfire+ Client", 167 -title => "Crossfire+ Client",
57 -width => $WIDTH, 168 -width => $WIDTH,
58 -height => $HEIGHT, 169 -height => $HEIGHT,
66 -resizeable => 0; 177 -resizeable => 0;
67 178
68 $SDL_EV = new SDL::Event; 179 $SDL_EV = new SDL::Event;
69 $SDL_EV->set_unicode (1); 180 $SDL_EV->set_unicode (1);
70 181
71 $last_refresh = SDL::GetTicks;
72
73 %GL_EXT = map +($_ => 1), split /\s+/, Crossfire::Client::gl_extensions;
74
75 $GL_EXT{GL_ARB_texture_non_power_of_two}
76 or warn "WARNING: non-power-of-two opengl extension required";
77
78 $FONTSIZE = int $HEIGHT / 50;
79
80 #############################################################################
81
82 glClearColor 1, 1, 1, 1;
83
84 glEnable GL_TEXTURE_2D;
85 glEnable GL_COLOR_MATERIAL;
86 glShadeModel GL_FLAT;
87 glDisable GL_DEPTH_TEST;
88 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
89
90 $_->() for @GL_INIT;
91
92 #############################################################################
93
94 $STATUS_LINE = new Crossfire::Client::Widget::Label
95 0, $HEIGHT * 59 / 60 - $FONTSIZE, 1, $FONTSIZE,
96 "";
97 $Crossfire::Client::Widget::TOPLEVEL->add ($STATUS_LINE);
98
99 $ALT_ENTER_MESSAGE = new Crossfire::Client::Widget::Label
100 0, $HEIGHT * 59 / 60, 1, $HEIGHT / 60,
101 "Use <b>Alt-Enter</b> to toggle fullscreen mode";
102 $Crossfire::Client::Widget::TOPLEVEL->add ($ALT_ENTER_MESSAGE);
103
104 # Test code #d#
105 unless ($tw) { # haha...
106 $te = new Crossfire::Client::Widget::FancyFrame;
107 $te->add (new Crossfire::Client::Widget::Entry);
108 $te->move (300, 0, 2);
109 $Crossfire::Client::Widget::TOPLEVEL->add ($te);
110
111 $tw = new Crossfire::Client::Widget::Animator;
112 my $lbl1 = new Crossfire::Client::Widget::Label
113 0, 0, 10, $FONTSIZE, "<i>This</i> is a\n<u>TEST</u>!\nOf a themed\nFrame!";
114 my $lbl2 = new Crossfire::Client::Widget::Label
115 0, 0, 10, $FONTSIZE, "LBL2";
116
117 my $vb = new Crossfire::Client::Widget::VBox;
118 my $f = new Crossfire::Client::Widget::FancyFrame;
119 my $f2 = new Crossfire::Client::Widget::FancyFrame;
120 $f->add ($lbl1);
121 $f2->add ($lbl2);
122 $vb->add ($f);
123 $vb->add ($f2, 1);
124
125 $tw->add ($vb);
126 $tw->w (400);
127 $tw->h (300);
128 $tw->move ($WIDTH - 200, 0);
129 $tw->moveto (0, 0);
130 $Crossfire::Client::Widget::TOPLEVEL->add ($tw);
131
132# $f->move ($WIDTH - 200, 0);
133# $Crossfire::Client::Widget::TOPLEVEL->add ($f);
134 }
135}
136
137sub start_game {
138 $SDL_TIMER = add Glib::Timeout 1000/50, sub { 182 $SDL_TIMER = add Glib::Timeout 1000 / $MAX_FPS, sub {
139 ($SDL_CB{$SDL_EV->type} || sub { warn "unhandled event ", $SDL_EV->type })->() 183 ($SDL_CB{$SDL_EV->type} || sub { warn "unhandled event ", $SDL_EV->type })->()
140 while $SDL_EV->poll; 184 while $SDL_EV->poll;
141 185
142 1 186 1
143 }; 187 };
144 188
145 $WIDTH = $CFG->{width}; 189 $last_refresh = SDL::GetTicks;
146 $HEIGHT = $CFG->{height};
147 $FULLSCREEN = 0;
148 190
149 init_screen; 191 CFClient::gl_init;
150 192
151 my $mapsize = List::Util::min 64, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32; 193 $FONTSIZE = int $HEIGHT / 40;
152 194
153 $CONN = new conn 195 #############################################################################
154 host => $CFG->{host}, 196
155 port => $CFG->{port}, 197 $DEBUG_STATUS = new CFClient::UI::Label padding => 0;
156 user => $CFG->{user}, 198 $CFClient::UI::TOPLEVEL->add ($DEBUG_STATUS);
157 pass => $CFG->{password},
158 mapw => $mapsize,
159 maph => $mapsize,
160 ; 199
200 $STATUS_LINE = new CFClient::UI::Label
201 padding => 0,
202 y => $HEIGHT * 49 / 50 - $FONTSIZE;
203 $CFClient::UI::TOPLEVEL->add ($STATUS_LINE);
161 204
162 Crossfire::Client::lowdelay fileno $CONN->{fh}; 205 $ALT_ENTER_MESSAGE = new CFClient::UI::Label
163} 206 padding => 0,
207 y => $HEIGHT * 49 / 50,
208 height => $HEIGHT / 50,
209 text => "Use <b>Alt-Enter</b> to toggle fullscreen mode";
210 $CFClient::UI::TOPLEVEL->add ($ALT_ENTER_MESSAGE);
164 211
165sub stop_game { 212 $MAPWIDGET = new CFClient::UI::MapWidget;
213 $CFClient::UI::TOPLEVEL->add ($MAPWIDGET);
214 $MAPWIDGET->focus_in;
215
216 config_dialog;
217}
218
219sub destroy_screen {
220 $CFClient::UI::TOPLEVEL->{children} = [];
166 remove Glib::Source $SDL_TIMER; 221 remove Glib::Source $SDL_TIMER;
167 remove Glib::Source $refresh_handler if $refresh_handler; 222 remove Glib::Source $refresh_handler if $refresh_handler;
168 undef $refresh_handler; 223 undef $refresh_handler;
169
170 undef $SDL_APP; 224 undef $SDL_APP;
171 undef $CONN; 225 undef $SDL_EV;
172 SDL::Quit; 226 SDL::Quit;
173} 227}
174 228
175sub force_refresh { 229sub force_refresh {
176 glViewport 0, 0, $WIDTH, $HEIGHT; 230 glViewport 0, 0, $WIDTH, $HEIGHT;
177 231
178 glMatrixMode GL_PROJECTION; 232 glMatrixMode GL_PROJECTION;
179 glLoadIdentity; 233 glLoadIdentity;
180 glOrtho 0, $WIDTH, $HEIGHT, 0, -10000 , 10000; 234 glOrtho 0, $WIDTH, $HEIGHT, 0, -10000 , 10000;
181 glMatrixMode GL_MODELVIEW; 235 glMatrixMode GL_MODELVIEW;
236 glLoadIdentity;
182 237
183 glClear GL_COLOR_BUFFER_BIT; 238 glClear GL_COLOR_BUFFER_BIT;
184 239
185 $Crossfire::Client::Widget::TOPLEVEL->draw; 240 $CFClient::UI::TOPLEVEL->draw;
186 241
187 SDL::GLSwapBuffers; 242 SDL::GLSwapBuffers;
188} 243}
244
245my $FPS;
189 246
190sub refresh { 247sub refresh {
191 $refresh_handler ||= add Glib::Idle sub { 248 $refresh_handler ||= add Glib::Idle sub {
192 if ($SDL_APP) { 249 if ($SDL_APP) {
193 my $next_refresh = SDL::GetTicks; 250 $NOW = SDL::GetTicks;
251
252 if ($NOW - $last_refresh < $TICKS_PER_FRAME) {
253 SDL::Delay $TICKS_PER_FRAME - ($NOW - $last_refresh);
254 $NOW = SDL::GetTicks;
255 }
256
194 my $interval = ($next_refresh - $last_refresh) * 0.001; 257 my $interval = ($NOW - $last_refresh) * 0.001;
195 $last_refresh = $next_refresh; 258 $last_refresh = $NOW;
259
260 if ($interval) {
261 $FPS ||= 1 / $interval;
262 $FPS = $FPS * 0.9 + (1 / $interval) * 0.1;
263 debug sprintf "%5.02f", $FPS;
264 }
196 265
197 force_refresh; 266 force_refresh;
198 $_->animate ($interval) for grep $_, values %ANIMATE; 267 $_->animate ($interval) for grep $_, values %ANIMATE;
199 268
200 if (%ANIMATE) { 269 if (%ANIMATE) {
234 }, 303 },
235 SDL_KEYDOWN() => sub { 304 SDL_KEYDOWN() => sub {
236 if ($SDL_EV->key_mod & KMOD_ALT && $SDL_EV->key_sym == SDLK_RETURN) { 305 if ($SDL_EV->key_mod & KMOD_ALT && $SDL_EV->key_sym == SDLK_RETURN) {
237 # alt-enter 306 # alt-enter
238 $FULLSCREEN = !$FULLSCREEN; 307 $FULLSCREEN = !$FULLSCREEN;
308 destroy_screen;
239 init_screen; 309 init_screen;
240 } else { 310 } else {
241 Crossfire::Client::Widget::feed_sdl_key_down_event ($SDL_EV); 311 CFClient::UI::feed_sdl_key_down_event ($SDL_EV);
242 } 312 }
243 }, 313 },
244 SDL_KEYUP() => sub { 314 SDL_KEYUP() => sub {
245 Crossfire::Client::Widget::feed_sdl_key_up_event ($SDL_EV); 315 CFClient::UI::feed_sdl_key_up_event ($SDL_EV);
246 }, 316 },
247 SDL_MOUSEMOTION() => sub { 317 SDL_MOUSEMOTION() => sub {
248 Crossfire::Client::Widget::feed_sdl_motion_event ($SDL_EV); 318 CFClient::UI::feed_sdl_motion_event ($SDL_EV);
249 }, 319 },
250 SDL_MOUSEBUTTONDOWN() => sub { 320 SDL_MOUSEBUTTONDOWN() => sub {
251 Crossfire::Client::Widget::feed_sdl_button_down_event ($SDL_EV); 321 CFClient::UI::feed_sdl_button_down_event ($SDL_EV);
252 }, 322 },
253 SDL_MOUSEBUTTONUP() => sub { 323 SDL_MOUSEBUTTONUP() => sub {
254 Crossfire::Client::Widget::feed_sdl_button_up_event ($SDL_EV); 324 CFClient::UI::feed_sdl_button_up_event ($SDL_EV);
255 }, 325 },
256 SDL_ACTIVEEVENT() => sub { 326 SDL_ACTIVEEVENT() => sub {
257 printf "active %x %x\n", $SDL_EV->active_gain, $SDL_EV->active_state;#d# 327# printf "active %x %x\n", $SDL_EV->active_gain, $SDL_EV->active_state;#d#
258 }, 328 },
259); 329);
260 330
261@conn::ISA = Crossfire::Protocol::; 331@conn::ISA = Crossfire::Protocol::;
262 332
263sub conn::map_update { 333sub conn::map_update {
264 my ($self, $dirty) = @_; 334 my ($self, $dirty) = @_;
265 335
266 refresh; 336 $MAPWIDGET->update;
267} 337}
268 338
269sub conn::map_scroll { 339sub conn::map_scroll {
270 my ($self, $dx, $dy) = @_; 340 my ($self, $dx, $dy) = @_;
271 341
287sub conn::face_update { 357sub conn::face_update {
288 my ($self, $face) = @_; 358 my ($self, $face) = @_;
289 359
290 $FACECACHE->{"$face->{chksum},$face->{name}"} = $face->{image}; 360 $FACECACHE->{"$face->{chksum},$face->{name}"} = $face->{image};
291 361
292 $face->{texture} = new_from_image Crossfire::Client::Texture delete $face->{image}; 362 $face->{texture} = new_from_image CFClient::Texture delete $face->{image};
293} 363}
294 364
295sub conn::query { 365sub conn::query {
296 my ($self, $flags, $prompt) = @_; 366 my ($self, $flags, $prompt) = @_;
297 367
333 [qw/Password password/], 403 [qw/Password password/],
334 ); 404 );
335 405
336 my $cfg = {}; 406 my $cfg = {};
337 407
338 my $a = SDL::ListModes (0, SDL_FULLSCREEN|SDL_HWSURFACE);
339 my @modes = map { [SDL::RectW ($_), SDL::RectH ($_)] } @$a;
340
341 $w->add (my $vb = Gtk2::VBox->new); 408 $w->add (my $vb = Gtk2::VBox->new);
342 $vb->pack_start (my $t = Gtk2::Table->new (2, scalar @cfg), 0, 0, 0); 409 $vb->pack_start (my $t = Gtk2::Table->new (2, scalar @cfg), 0, 0, 0);
343 my $selmode = $::CFG->{width} . 'x' . $::CFG->{height}; 410 my $selmode = $::CFG->{width} . 'x' . $::CFG->{height};
344 $t->attach_defaults (Gtk2::Label->new ("Modes"), 0, 1, 0, 1); 411 $t->attach_defaults (Gtk2::Label->new ("Modes"), 0, 1, 0, 1);
345 $t->attach_defaults (my $cb = Gtk2::ComboBox->new_text, 1, 2, 0, 1); 412 $t->attach_defaults (my $cb = Gtk2::ComboBox->new_text, 1, 2, 0, 1);
346 my $i = 0; 413 my $i = 0;
347 my $act = 0; 414 my $act = 0;
348 for (map { "$_->[0]x$_->[1]" } reverse @modes) { 415 for (map { "$_->[0]x$_->[1]" } @SDL_MODES) {
349 if ($_ eq $selmode) { $act = $i } 416 if ($_ eq $selmode) { $act = $i }
350 $cb->append_text ($_); 417 $cb->append_text ($_);
351 $i++; 418 $i++;
352 } 419 }
353 $cb->set_active ($act); 420 $cb->set_active ($act);
370 $cb->signal_connect (clicked => sub { 437 $cb->signal_connect (clicked => sub {
371 for (keys %$cfg) { 438 for (keys %$cfg) {
372 $::CFG->{$_} = $cfg->{$_} 439 $::CFG->{$_} = $cfg->{$_}
373 if $_ ne '_i'; 440 if $_ ne '_i';
374 } 441 }
375 Crossfire::Client::write_cfg "$Crossfire::VARDIR/pclientrc"; 442 CFClient::write_cfg "$CFrossfire::VARDIR/pclientrc";
376 }); 443 });
377 $hb->pack_start (my $cb = Gtk2::Button->new ("login"), 1, 1, 5); 444 $hb->pack_start (my $cb = Gtk2::Button->new ("login"), 1, 1, 5);
378 $cb->signal_connect (clicked => sub { 445 $cb->signal_connect (clicked => sub {
379 for (keys %$cfg) { 446 for (keys %$cfg) {
380 $::CFG->{$_} = $cfg->{$_} 447 $::CFG->{$_} = $cfg->{$_}
399 466
400############################################################################# 467#############################################################################
401 468
402SDL::Init SDL_INIT_EVERYTHING; 469SDL::Init SDL_INIT_EVERYTHING;
403 470
404my $mapwidget = Crossfire::Client::Widget::MapWidget->new; 471@SDL_MODES = reverse map [SDL::RectW ($_), SDL::RectH ($_)],
472 @{ SDL::ListModes 0, SDL_FULLSCREEN|SDL_HWSURFACE };
405 473
406$Crossfire::Client::Widget::TOPLEVEL->add ($mapwidget);
407$mapwidget->focus_in;
408
409Crossfire::Client::read_cfg "$Crossfire::VARDIR/pclientrc"; 474CFClient::read_cfg "$Crossfire::VARDIR/pclientrc";
410 475
411$CFG ||= { 476$CFG ||= {
412 width => 640, 477 width => 640,
413 height => 480, 478 height => 480,
479 fullscreen => 0,
480 sdl_mode => 0,
414 mapsize => 100, 481 mapsize => 100,
415 fullscreen => 0,
416 host => "crossfire.schmorp.de", 482 host => "crossfire.schmorp.de",
417 port => 13327, 483 port => 13327,
418}; 484};
419 485
420Crossfire::Client::set_font Crossfire::Client::find_rcfile "uifont.ttf"; 486{
487 my @fonts = map CFClient::find_rcfile $_, qw(uifont.ttf uifontb.ttf uifonti.ttf uifontbi.ttf);
488
489 CFClient::add_font $_ for @fonts;
490 CFClient::set_font $fonts[0];
491}
421 492
422$FACECACHE = eval { Crossfire::load_ref "$Crossfire::VARDIR/pclient.faces" } || {}; 493$FACECACHE = eval { Crossfire::load_ref "$Crossfire::VARDIR/pclient.faces" } || {};
423 494
424run_config_dialog 495init_screen;
425 login => sub { start_game },
426 logout => sub { stop_game };
427 496
428main Gtk2; 497main Gtk2;
429 498
430Crossfire::save_ref $FACECACHE, "$Crossfire::VARDIR/pclient.faces"; 499Crossfire::save_ref $FACECACHE, "$Crossfire::VARDIR/pclient.faces";
500

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines