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.61 by root, Mon Apr 10 11:57:17 2006 UTC vs.
Revision 1.75 by root, Tue Apr 11 21:24:10 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 $TICKS_PER_FRAME = int 1000 / $MAX_FPS - 1; # min ticks per frame
21 26
22our $FACECACHE; 27our $FACECACHE;
23
24our $VERSION = '0.1';
25
26our %GL_EXT;
27 28
28our $CFG; 29our $CFG;
29our $CONN; 30our $CONN;
30 31
32our @SDL_MODES;
31our $WIDTH; 33our $WIDTH;
32our $HEIGHT; 34our $HEIGHT;
33our $FULLSCREEN; 35our $FULLSCREEN;
34 36
37our $NOW;
38
39our $MAPWIDGET;
35our $FONTSIZE; 40our $FONTSIZE;
36 41
37our $SDL_TIMER; 42our $SDL_TIMER;
38our $SDL_APP; 43our $SDL_APP;
39our $SDL_EV; 44our $SDL_EV;
40our %SDL_CB; 45our %SDL_CB;
41 46
42our @GL_INIT; # hooks called on every gl init
43
44our $ALT_ENTER_MESSAGE; 47our $ALT_ENTER_MESSAGE;
45our $STATUS_LINE; 48our $STATUS_LINE;
49our $DEBUG_STATUS;
46 50
47my $last_refresh; 51my $last_refresh;
48my %ANIMATE; 52my %ANIMATE;
49my $refresh_handler; 53my $refresh_handler;
50 54
… …
66 -resizeable => 0; 70 -resizeable => 0;
67 71
68 $SDL_EV = new SDL::Event; 72 $SDL_EV = new SDL::Event;
69 $SDL_EV->set_unicode (1); 73 $SDL_EV->set_unicode (1);
70 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
71 $last_refresh = SDL::GetTicks; 82 $last_refresh = SDL::GetTicks;
72 83
73 %GL_EXT = map +($_ => 1), split /\s+/, Crossfire::Client::gl_extensions; 84 CFClient::gl_init;
74
75 $GL_EXT{GL_ARB_texture_non_power_of_two}
76 or warn "WARNING: non-power-of-two opengl extension required";
77 85
78 $FONTSIZE = int $HEIGHT / 50; 86 $FONTSIZE = int $HEIGHT / 50;
79 87
80 ############################################################################# 88 #############################################################################
81 89
82 glClearColor 0.7, 0.7, 0.7, 1; 90 glClearColor 0.45, 0.45, 0.45, 1;
83 91
84 glEnable GL_TEXTURE_2D; 92 glEnable GL_TEXTURE_2D;
85 glEnable GL_COLOR_MATERIAL; 93 glEnable GL_COLOR_MATERIAL;
86 glShadeModel GL_FLAT; 94 glShadeModel GL_FLAT;
87 glDisable GL_DEPTH_TEST; 95 glDisable GL_DEPTH_TEST;
88 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 96 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
89 97
90 $_->() for @GL_INIT;
91
92 ############################################################################# 98 #############################################################################
99
100 $DEBUG_STATUS = new CFClient::UI::Label;
101 $CFClient::UI::TOPLEVEL->add ($DEBUG_STATUS);
93 102
94 $STATUS_LINE = new Crossfire::Client::Widget::Label 103 $STATUS_LINE = new CFClient::UI::Label
95 0, $HEIGHT * 59 / 60 - $FONTSIZE, 1, $FONTSIZE, 104 y => $HEIGHT * 59 / 60 - $FONTSIZE;
96 "";
97 $Crossfire::Client::Widget::TOPLEVEL->add ($STATUS_LINE); 105 $CFClient::UI::TOPLEVEL->add ($STATUS_LINE);
98 106
99 $ALT_ENTER_MESSAGE = new Crossfire::Client::Widget::Label 107 $ALT_ENTER_MESSAGE = new CFClient::UI::Label
100 0, $HEIGHT * 59 / 60, 1, $HEIGHT / 60, 108 y => $HEIGHT * 59 / 60,
109 height => $HEIGHT / 60,
101 "Use <b>Alt-Enter</b> to toggle fullscreen mode"; 110 text => "Use <b>Alt-Enter</b> to toggle fullscreen mode";
102 $Crossfire::Client::Widget::TOPLEVEL->add ($ALT_ENTER_MESSAGE); 111 $CFClient::UI::TOPLEVEL->add ($ALT_ENTER_MESSAGE);
103 112
104 # Test code #d# 113 $MAPWIDGET = new CFClient::UI::MapWidget;
105 unless ($tw) { # haha... 114 $CFClient::UI::TOPLEVEL->add ($MAPWIDGET);
106 $te = new Crossfire::Client::Widget::FancyFrame; 115 $MAPWIDGET->focus_in;
107 $te->add (new Crossfire::Client::Widget::Entry); 116}
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
117 my $vb = new Crossfire::Client::Widget::VBox; 118sub destroy_screen {
118 my $f = new Crossfire::Client::Widget::FancyFrame; 119 remove Glib::Source $SDL_TIMER;
119 my $f2 = new Crossfire::Client::Widget::FancyFrame; 120 undef $SDL_APP;
120 $f->add ($lbl1); 121 undef $SDL_EV;
121 $f2->add ($lbl2); 122 SDL::Quit;
122 $vb->add ($f); 123}
123 $vb->add ($f2, 1);
124 124
125 $tw->add ($vb); 125sub config_dialog {
126 $tw->w (400); 126 my $dialog = new CFClient::UI::FancyFrame x => 300, y => 100,
127 $tw->h (300); 127 child => (my $vbox = new CFClient::UI::VBox);
128 $tw->move ($WIDTH - 200, 0); 128 $vbox->add (new CFClient::UI::Label align => 0, text => "Setup");
129 $tw->moveto (0, 0); 129 $vbox->add (my $table = new CFClient::UI::Table);
130 $Crossfire::Client::Widget::TOPLEVEL->add ($tw);
131 130
132# $f->move ($WIDTH - 200, 0); 131 $table->add (0, 0, new CFClient::UI::Label align => 1, text => "Video Mode");
133# $Crossfire::Client::Widget::TOPLEVEL->add ($f); 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]);
134 } 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);
135} 161}
136 162
137sub start_game { 163sub start_game {
138 $SDL_TIMER = add Glib::Timeout 1000/50, sub {
139 ($SDL_CB{$SDL_EV->type} || sub { warn "unhandled event ", $SDL_EV->type })->()
140 while $SDL_EV->poll;
141
142 1
143 };
144
145 $WIDTH = $CFG->{width}; 164 $WIDTH = $CFG->{width};
146 $HEIGHT = $CFG->{height}; 165 $HEIGHT = $CFG->{height};
147 $FULLSCREEN = 0; 166 $FULLSCREEN = 0;
148 167
149 init_screen; 168 init_screen;
169
170 config_dialog;
150 171
151 my $mapsize = List::Util::min 64, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32; 172 my $mapsize = List::Util::min 64, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32;
152 173
153 $CONN = new conn 174 $CONN = new conn
154 host => $CFG->{host}, 175 host => $CFG->{host},
… …
157 pass => $CFG->{password}, 178 pass => $CFG->{password},
158 mapw => $mapsize, 179 mapw => $mapsize,
159 maph => $mapsize, 180 maph => $mapsize,
160 ; 181 ;
161 182
162 Crossfire::Client::lowdelay fileno $CONN->{fh}; 183 CFClient::lowdelay fileno $CONN->{fh};
163} 184}
164 185
165sub stop_game { 186sub stop_game {
166 remove Glib::Source $SDL_TIMER;
167 remove Glib::Source $refresh_handler if $refresh_handler; 187 remove Glib::Source $refresh_handler if $refresh_handler;
168 undef $refresh_handler; 188 undef $refresh_handler;
169 189
170 undef $SDL_APP;
171 undef $CONN; 190 undef $CONN;
172 SDL::Quit; 191 destroy_screen;
173} 192}
174 193
175sub force_refresh { 194sub force_refresh {
176 glViewport 0, 0, $WIDTH, $HEIGHT; 195 glViewport 0, 0, $WIDTH, $HEIGHT;
177 196
178 glMatrixMode GL_PROJECTION; 197 glMatrixMode GL_PROJECTION;
179 glLoadIdentity; 198 glLoadIdentity;
180 glOrtho 0, $WIDTH, $HEIGHT, 0, -10000 , 10000; 199 glOrtho 0, $WIDTH, $HEIGHT, 0, -10000 , 10000;
181 glMatrixMode GL_MODELVIEW; 200 glMatrixMode GL_MODELVIEW;
201 glLoadIdentity;
182 202
183 glClear GL_COLOR_BUFFER_BIT; 203 glClear GL_COLOR_BUFFER_BIT;
184 204
185 $Crossfire::Client::Widget::TOPLEVEL->draw; 205 $CFClient::UI::TOPLEVEL->draw;
186 206
187 SDL::GLSwapBuffers; 207 SDL::GLSwapBuffers;
188} 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;
189 217
190sub refresh { 218sub refresh {
191 $refresh_handler ||= add Glib::Idle sub { 219 $refresh_handler ||= add Glib::Idle sub {
192 if ($SDL_APP) { 220 if ($SDL_APP) {
193 my $next_refresh = SDL::GetTicks; 221 $NOW = SDL::GetTicks;
222
223 if ($NOW - $last_refresh < $TICKS_PER_FRAME) {
224 SDL::Delay $TICKS_PER_FRAME - ($NOW - $last_refresh);
225 $NOW = SDL::GetTicks;
226 }
227
194 my $interval = ($next_refresh - $last_refresh) * 0.001; 228 my $interval = ($NOW - $last_refresh) * 0.001;
195 $last_refresh = $next_refresh; 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 }
196 236
197 force_refresh; 237 force_refresh;
198 $_->animate ($interval) for grep $_, values %ANIMATE; 238 $_->animate ($interval) for grep $_, values %ANIMATE;
199 239
200 if (%ANIMATE) { 240 if (%ANIMATE) {
… …
236 if ($SDL_EV->key_mod & KMOD_ALT && $SDL_EV->key_sym == SDLK_RETURN) { 276 if ($SDL_EV->key_mod & KMOD_ALT && $SDL_EV->key_sym == SDLK_RETURN) {
237 # alt-enter 277 # alt-enter
238 $FULLSCREEN = !$FULLSCREEN; 278 $FULLSCREEN = !$FULLSCREEN;
239 init_screen; 279 init_screen;
240 } else { 280 } else {
241 Crossfire::Client::Widget::feed_sdl_key_down_event ($SDL_EV); 281 CFClient::UI::feed_sdl_key_down_event ($SDL_EV);
242 } 282 }
243 }, 283 },
244 SDL_KEYUP() => sub { 284 SDL_KEYUP() => sub {
245 Crossfire::Client::Widget::feed_sdl_key_up_event ($SDL_EV); 285 CFClient::UI::feed_sdl_key_up_event ($SDL_EV);
246 }, 286 },
247 SDL_MOUSEMOTION() => sub { 287 SDL_MOUSEMOTION() => sub {
248 Crossfire::Client::Widget::feed_sdl_motion_event ($SDL_EV); 288 CFClient::UI::feed_sdl_motion_event ($SDL_EV);
249 }, 289 },
250 SDL_MOUSEBUTTONDOWN() => sub { 290 SDL_MOUSEBUTTONDOWN() => sub {
251 Crossfire::Client::Widget::feed_sdl_button_down_event ($SDL_EV); 291 CFClient::UI::feed_sdl_button_down_event ($SDL_EV);
252 }, 292 },
253 SDL_MOUSEBUTTONUP() => sub { 293 SDL_MOUSEBUTTONUP() => sub {
254 Crossfire::Client::Widget::feed_sdl_button_up_event ($SDL_EV); 294 CFClient::UI::feed_sdl_button_up_event ($SDL_EV);
255 }, 295 },
256 SDL_ACTIVEEVENT() => sub { 296 SDL_ACTIVEEVENT() => sub {
257 printf "active %x %x\n", $SDL_EV->active_gain, $SDL_EV->active_state;#d# 297# printf "active %x %x\n", $SDL_EV->active_gain, $SDL_EV->active_state;#d#
258 }, 298 },
259); 299);
260 300
261@conn::ISA = Crossfire::Protocol::; 301@conn::ISA = Crossfire::Protocol::;
262 302
263sub conn::map_update { 303sub conn::map_update {
264 my ($self, $dirty) = @_; 304 my ($self, $dirty) = @_;
265 305
266 refresh; 306 $MAPWIDGET->update;
267} 307}
268 308
269sub conn::map_scroll { 309sub conn::map_scroll {
270 my ($self, $dx, $dy) = @_; 310 my ($self, $dx, $dy) = @_;
271 311
… …
287sub conn::face_update { 327sub conn::face_update {
288 my ($self, $face) = @_; 328 my ($self, $face) = @_;
289 329
290 $FACECACHE->{"$face->{chksum},$face->{name}"} = $face->{image}; 330 $FACECACHE->{"$face->{chksum},$face->{name}"} = $face->{image};
291 331
292 $face->{texture} = new_from_image Crossfire::Client::Texture delete $face->{image}; 332 $face->{texture} = new_from_image CFClient::Texture delete $face->{image};
293} 333}
294 334
295sub conn::query { 335sub conn::query {
296 my ($self, $flags, $prompt) = @_; 336 my ($self, $flags, $prompt) = @_;
297 337
… …
333 [qw/Password password/], 373 [qw/Password password/],
334 ); 374 );
335 375
336 my $cfg = {}; 376 my $cfg = {};
337 377
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); 378 $w->add (my $vb = Gtk2::VBox->new);
342 $vb->pack_start (my $t = Gtk2::Table->new (2, scalar @cfg), 0, 0, 0); 379 $vb->pack_start (my $t = Gtk2::Table->new (2, scalar @cfg), 0, 0, 0);
343 my $selmode = $::CFG->{width} . 'x' . $::CFG->{height}; 380 my $selmode = $::CFG->{width} . 'x' . $::CFG->{height};
344 $t->attach_defaults (Gtk2::Label->new ("Modes"), 0, 1, 0, 1); 381 $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); 382 $t->attach_defaults (my $cb = Gtk2::ComboBox->new_text, 1, 2, 0, 1);
346 my $i = 0; 383 my $i = 0;
347 my $act = 0; 384 my $act = 0;
348 for (map { "$_->[0]x$_->[1]" } reverse @modes) { 385 for (map { "$_->[0]x$_->[1]" } @SDL_MODES) {
349 if ($_ eq $selmode) { $act = $i } 386 if ($_ eq $selmode) { $act = $i }
350 $cb->append_text ($_); 387 $cb->append_text ($_);
351 $i++; 388 $i++;
352 } 389 }
353 $cb->set_active ($act); 390 $cb->set_active ($act);
… …
370 $cb->signal_connect (clicked => sub { 407 $cb->signal_connect (clicked => sub {
371 for (keys %$cfg) { 408 for (keys %$cfg) {
372 $::CFG->{$_} = $cfg->{$_} 409 $::CFG->{$_} = $cfg->{$_}
373 if $_ ne '_i'; 410 if $_ ne '_i';
374 } 411 }
375 Crossfire::Client::write_cfg "$Crossfire::VARDIR/pclientrc"; 412 CFClient::write_cfg "$CFrossfire::VARDIR/pclientrc";
376 }); 413 });
377 $hb->pack_start (my $cb = Gtk2::Button->new ("login"), 1, 1, 5); 414 $hb->pack_start (my $cb = Gtk2::Button->new ("login"), 1, 1, 5);
378 $cb->signal_connect (clicked => sub { 415 $cb->signal_connect (clicked => sub {
379 for (keys %$cfg) { 416 for (keys %$cfg) {
380 $::CFG->{$_} = $cfg->{$_} 417 $::CFG->{$_} = $cfg->{$_}
… …
399 436
400############################################################################# 437#############################################################################
401 438
402SDL::Init SDL_INIT_EVERYTHING; 439SDL::Init SDL_INIT_EVERYTHING;
403 440
404my $mapwidget = Crossfire::Client::Widget::MapWidget->new; 441@SDL_MODES = reverse map [SDL::RectW ($_), SDL::RectH ($_)],
442 @{ SDL::ListModes 0, SDL_FULLSCREEN|SDL_HWSURFACE };
405 443
406$Crossfire::Client::Widget::TOPLEVEL->add ($mapwidget);
407$mapwidget->focus_in;
408
409Crossfire::Client::read_cfg "$Crossfire::VARDIR/pclientrc"; 444CFClient::read_cfg "$Crossfire::VARDIR/pclientrc";
410 445
411$CFG ||= { 446$CFG ||= {
412 width => 640, 447 width => 640,
413 height => 480, 448 height => 480,
414 mapsize => 100, 449 mapsize => 100,
415 fullscreen => 0, 450 fullscreen => 0,
416 host => "crossfire.schmorp.de", 451 host => "crossfire.schmorp.de",
417 port => 13327, 452 port => 13327,
418}; 453};
419 454
420Crossfire::Client::set_font Crossfire::Client::find_rcfile "uifont.ttf"; 455{
456 my @fonts = map CFClient::find_rcfile $_, qw(uifont.ttf uifontb.ttf uifonti.ttf uifontbi.ttf);
457
458 CFClient::add_font $_ for @fonts;
459 CFClient::set_font $fonts[0];
460}
421 461
422$FACECACHE = eval { Crossfire::load_ref "$Crossfire::VARDIR/pclient.faces" } || {}; 462$FACECACHE = eval { Crossfire::load_ref "$Crossfire::VARDIR/pclient.faces" } || {};
423 463
424run_config_dialog 464run_config_dialog
425 login => sub { start_game }, 465 login => sub { start_game },

Diff Legend

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