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.64 by root, Tue Apr 11 12:21:30 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 21
22our $VERSION = '0.1'; 22our $VERSION = '0.1';
23 23
24my $MAX_FPS = 30; 24my $MAX_FPS = 60;
25my $TICKS_PER_FRAME = int 1000 / $MAX_FPS - 1; # min ticks per frame 25my $TICKS_PER_FRAME = int 1000 / $MAX_FPS - 1; # min ticks per frame
26 26
27our $FACECACHE; 27our $FACECACHE;
28 28
29our $CFG; 29our $CFG;
30our $CONN; 30our $CONN;
31 31
32our @SDL_MODES;
32our $WIDTH; 33our $WIDTH;
33our $HEIGHT; 34our $HEIGHT;
34our $FULLSCREEN; 35our $FULLSCREEN;
35 36
37our $NOW;
38
39our $MAPWIDGET;
36our $FONTSIZE; 40our $FONTSIZE;
37 41
38our $SDL_TIMER; 42our $SDL_TIMER;
39our $SDL_APP; 43our $SDL_APP;
40our $SDL_EV; 44our $SDL_EV;
… …
75 1 79 1
76 }; 80 };
77 81
78 $last_refresh = SDL::GetTicks; 82 $last_refresh = SDL::GetTicks;
79 83
80 Crossfire::Client::gl_init; 84 CFClient::gl_init;
81 85
82 $FONTSIZE = int $HEIGHT / 50; 86 $FONTSIZE = int $HEIGHT / 50;
83 87
84 ############################################################################# 88 #############################################################################
85 89
… …
91 glDisable GL_DEPTH_TEST; 95 glDisable GL_DEPTH_TEST;
92 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 96 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
93 97
94 ############################################################################# 98 #############################################################################
95 99
96 $DEBUG_STATUS = new Crossfire::Client::Widget::Label 0, 0, 1, $FONTSIZE, ""; 100 $DEBUG_STATUS = new CFClient::UI::Label;
97 $Crossfire::Client::Widget::TOPLEVEL->add ($DEBUG_STATUS); 101 $CFClient::UI::TOPLEVEL->add ($DEBUG_STATUS);
98 102
99 $STATUS_LINE = new Crossfire::Client::Widget::Label 103 $STATUS_LINE = new CFClient::UI::Label
100 0, $HEIGHT * 59 / 60 - $FONTSIZE, 1, $FONTSIZE, 104 y => $HEIGHT * 59 / 60 - $FONTSIZE;
101 "";
102 $Crossfire::Client::Widget::TOPLEVEL->add ($STATUS_LINE); 105 $CFClient::UI::TOPLEVEL->add ($STATUS_LINE);
103 106
104 $ALT_ENTER_MESSAGE = new Crossfire::Client::Widget::Label 107 $ALT_ENTER_MESSAGE = new CFClient::UI::Label
105 0, $HEIGHT * 59 / 60, 1, $HEIGHT / 60, 108 y => $HEIGHT * 59 / 60,
109 height => $HEIGHT / 60,
106 "Use <b>Alt-Enter</b> to toggle fullscreen mode"; 110 text => "Use <b>Alt-Enter</b> to toggle fullscreen mode";
107 $Crossfire::Client::Widget::TOPLEVEL->add ($ALT_ENTER_MESSAGE); 111 $CFClient::UI::TOPLEVEL->add ($ALT_ENTER_MESSAGE);
108 112
109 # Test code #d# 113 $MAPWIDGET = new CFClient::UI::MapWidget;
110 unless ($tw) { # haha... 114 $CFClient::UI::TOPLEVEL->add ($MAPWIDGET);
111 $te = new Crossfire::Client::Widget::FancyFrame; 115 $MAPWIDGET->focus_in;
112 $te->add (new Crossfire::Client::Widget::Entry);
113 $te->move (300, 0, 2);
114 $Crossfire::Client::Widget::TOPLEVEL->add ($te);
115
116 $tw = new Crossfire::Client::Widget::Animator;
117 my $lbl1 = new Crossfire::Client::Widget::Label
118 0, 0, 10, $FONTSIZE, "<i>This</i> is a\n<u>TEST</u>!\nOf a themed\nFrame!";
119 my $lbl2 = new Crossfire::Client::Widget::Label
120 0, 0, 10, $FONTSIZE, "LBL2";
121
122 my $vb = new Crossfire::Client::Widget::VBox;
123 my $f = new Crossfire::Client::Widget::FancyFrame;
124 my $f2 = new Crossfire::Client::Widget::FancyFrame;
125 $f->add ($lbl1);
126 $f2->add ($lbl2);
127 $vb->add ($f);
128 $vb->add ($f2, 1);
129
130 $tw->add ($vb);
131 $tw->w (400);
132 $tw->h (300);
133 $tw->move ($WIDTH - 200, 0);
134 $tw->moveto (0, 0);
135 $Crossfire::Client::Widget::TOPLEVEL->add ($tw);
136
137# $f->move ($WIDTH - 200, 0);
138# $Crossfire::Client::Widget::TOPLEVEL->add ($f);
139 }
140} 116}
141 117
142sub destroy_screen { 118sub destroy_screen {
143 remove Glib::Source $SDL_TIMER; 119 remove Glib::Source $SDL_TIMER;
144 undef $SDL_APP; 120 undef $SDL_APP;
145 undef $SDL_EV; 121 undef $SDL_EV;
146 SDL::Quit; 122 SDL::Quit;
147} 123}
148 124
125sub config_dialog {
126 my $dialog = new CFClient::UI::FancyFrame x => 300, y => 100,
127 child => (my $vbox = new CFClient::UI::VBox);
128 $vbox->add (new CFClient::UI::Label align => 0, text => "Setup");
129 $vbox->add (my $table = new CFClient::UI::Table);
130
131 $table->add (0, 0, new CFClient::UI::Label align => 1, text => "Video Mode");
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]);
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);
161}
162
149sub start_game { 163sub start_game {
150 $WIDTH = $CFG->{width}; 164 $WIDTH = $CFG->{width};
151 $HEIGHT = $CFG->{height}; 165 $HEIGHT = $CFG->{height};
152 $FULLSCREEN = 0; 166 $FULLSCREEN = 0;
153 167
154 init_screen; 168 init_screen;
169
170 config_dialog;
155 171
156 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;
157 173
158 $CONN = new conn 174 $CONN = new conn
159 host => $CFG->{host}, 175 host => $CFG->{host},
… …
162 pass => $CFG->{password}, 178 pass => $CFG->{password},
163 mapw => $mapsize, 179 mapw => $mapsize,
164 maph => $mapsize, 180 maph => $mapsize,
165 ; 181 ;
166 182
167 Crossfire::Client::lowdelay fileno $CONN->{fh}; 183 CFClient::lowdelay fileno $CONN->{fh};
168} 184}
169 185
170sub stop_game { 186sub stop_game {
171 remove Glib::Source $refresh_handler if $refresh_handler; 187 remove Glib::Source $refresh_handler if $refresh_handler;
172 undef $refresh_handler; 188 undef $refresh_handler;
… …
180 196
181 glMatrixMode GL_PROJECTION; 197 glMatrixMode GL_PROJECTION;
182 glLoadIdentity; 198 glLoadIdentity;
183 glOrtho 0, $WIDTH, $HEIGHT, 0, -10000 , 10000; 199 glOrtho 0, $WIDTH, $HEIGHT, 0, -10000 , 10000;
184 glMatrixMode GL_MODELVIEW; 200 glMatrixMode GL_MODELVIEW;
201 glLoadIdentity;
185 202
186 glClear GL_COLOR_BUFFER_BIT; 203 glClear GL_COLOR_BUFFER_BIT;
187 204
188 $Crossfire::Client::Widget::TOPLEVEL->draw; 205 $CFClient::UI::TOPLEVEL->draw;
189 206
190 SDL::GLSwapBuffers; 207 SDL::GLSwapBuffers;
191} 208}
192 209
193sub debug { 210sub debug {
194 $DEBUG_STATUS->set_text ($_[0]); 211 $DEBUG_STATUS->set_text ($_[0]);
195 $DEBUG_STATUS->size_allocate ($DEBUG_STATUS->size_request); 212 my ($w, $h) = $DEBUG_STATUS->size_request;
196 $DEBUG_STATUS->move ($WIDTH - $DEBUG_STATUS->{w}, 0); 213 $DEBUG_STATUS->size_allocate ($WIDTH - $w, 0, $w, $h);
197} 214}
198 215
199my $FPS; 216my $FPS;
200 217
201sub refresh { 218sub refresh {
202 $refresh_handler ||= add Glib::Idle sub { 219 $refresh_handler ||= add Glib::Idle sub {
203 if ($SDL_APP) { 220 if ($SDL_APP) {
204 my $next_refresh = SDL::GetTicks; 221 $NOW = SDL::GetTicks;
205 222
206 if ($next_refresh - $last_refresh < $TICKS_PER_FRAME) { 223 if ($NOW - $last_refresh < $TICKS_PER_FRAME) {
207 SDL::Delay $TICKS_PER_FRAME - ($next_refresh - $last_refresh); 224 SDL::Delay $TICKS_PER_FRAME - ($NOW - $last_refresh);
208 $next_refresh = SDL::GetTicks; 225 $NOW = SDL::GetTicks;
209 } 226 }
210 227
211 my $interval = ($next_refresh - $last_refresh) * 0.001; 228 my $interval = ($NOW - $last_refresh) * 0.001;
212 $last_refresh = $next_refresh; 229 $last_refresh = $NOW;
213 230
214 if ($interval) { 231 if ($interval) {
215 $FPS ||= 1 / $interval; 232 $FPS ||= 1 / $interval;
216 $FPS = $FPS * 0.96 + (1 / $interval) * 0.04; 233 $FPS = $FPS * 0.96 + (1 / $interval) * 0.04;
217 debug sprintf "%5.02f\n", $FPS; 234 debug sprintf "%5.02f", $FPS;
218 } 235 }
219 236
220 force_refresh; 237 force_refresh;
221 $_->animate ($interval) for grep $_, values %ANIMATE; 238 $_->animate ($interval) for grep $_, values %ANIMATE;
222 239
… …
259 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) {
260 # alt-enter 277 # alt-enter
261 $FULLSCREEN = !$FULLSCREEN; 278 $FULLSCREEN = !$FULLSCREEN;
262 init_screen; 279 init_screen;
263 } else { 280 } else {
264 Crossfire::Client::Widget::feed_sdl_key_down_event ($SDL_EV); 281 CFClient::UI::feed_sdl_key_down_event ($SDL_EV);
265 } 282 }
266 }, 283 },
267 SDL_KEYUP() => sub { 284 SDL_KEYUP() => sub {
268 Crossfire::Client::Widget::feed_sdl_key_up_event ($SDL_EV); 285 CFClient::UI::feed_sdl_key_up_event ($SDL_EV);
269 }, 286 },
270 SDL_MOUSEMOTION() => sub { 287 SDL_MOUSEMOTION() => sub {
271 Crossfire::Client::Widget::feed_sdl_motion_event ($SDL_EV); 288 CFClient::UI::feed_sdl_motion_event ($SDL_EV);
272 }, 289 },
273 SDL_MOUSEBUTTONDOWN() => sub { 290 SDL_MOUSEBUTTONDOWN() => sub {
274 Crossfire::Client::Widget::feed_sdl_button_down_event ($SDL_EV); 291 CFClient::UI::feed_sdl_button_down_event ($SDL_EV);
275 }, 292 },
276 SDL_MOUSEBUTTONUP() => sub { 293 SDL_MOUSEBUTTONUP() => sub {
277 Crossfire::Client::Widget::feed_sdl_button_up_event ($SDL_EV); 294 CFClient::UI::feed_sdl_button_up_event ($SDL_EV);
278 }, 295 },
279 SDL_ACTIVEEVENT() => sub { 296 SDL_ACTIVEEVENT() => sub {
280 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#
281 }, 298 },
282); 299);
283 300
284@conn::ISA = Crossfire::Protocol::; 301@conn::ISA = Crossfire::Protocol::;
285 302
286sub conn::map_update { 303sub conn::map_update {
287 my ($self, $dirty) = @_; 304 my ($self, $dirty) = @_;
288 305
289 refresh; 306 $MAPWIDGET->update;
290} 307}
291 308
292sub conn::map_scroll { 309sub conn::map_scroll {
293 my ($self, $dx, $dy) = @_; 310 my ($self, $dx, $dy) = @_;
294 311
… …
310sub conn::face_update { 327sub conn::face_update {
311 my ($self, $face) = @_; 328 my ($self, $face) = @_;
312 329
313 $FACECACHE->{"$face->{chksum},$face->{name}"} = $face->{image}; 330 $FACECACHE->{"$face->{chksum},$face->{name}"} = $face->{image};
314 331
315 $face->{texture} = new_from_image Crossfire::Client::Texture delete $face->{image}; 332 $face->{texture} = new_from_image CFClient::Texture delete $face->{image};
316} 333}
317 334
318sub conn::query { 335sub conn::query {
319 my ($self, $flags, $prompt) = @_; 336 my ($self, $flags, $prompt) = @_;
320 337
… …
356 [qw/Password password/], 373 [qw/Password password/],
357 ); 374 );
358 375
359 my $cfg = {}; 376 my $cfg = {};
360 377
361 my $a = SDL::ListModes (0, SDL_FULLSCREEN|SDL_HWSURFACE);
362 my @modes = map { [SDL::RectW ($_), SDL::RectH ($_)] } @$a;
363
364 $w->add (my $vb = Gtk2::VBox->new); 378 $w->add (my $vb = Gtk2::VBox->new);
365 $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);
366 my $selmode = $::CFG->{width} . 'x' . $::CFG->{height}; 380 my $selmode = $::CFG->{width} . 'x' . $::CFG->{height};
367 $t->attach_defaults (Gtk2::Label->new ("Modes"), 0, 1, 0, 1); 381 $t->attach_defaults (Gtk2::Label->new ("Modes"), 0, 1, 0, 1);
368 $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);
369 my $i = 0; 383 my $i = 0;
370 my $act = 0; 384 my $act = 0;
371 for (map { "$_->[0]x$_->[1]" } reverse @modes) { 385 for (map { "$_->[0]x$_->[1]" } @SDL_MODES) {
372 if ($_ eq $selmode) { $act = $i } 386 if ($_ eq $selmode) { $act = $i }
373 $cb->append_text ($_); 387 $cb->append_text ($_);
374 $i++; 388 $i++;
375 } 389 }
376 $cb->set_active ($act); 390 $cb->set_active ($act);
… …
393 $cb->signal_connect (clicked => sub { 407 $cb->signal_connect (clicked => sub {
394 for (keys %$cfg) { 408 for (keys %$cfg) {
395 $::CFG->{$_} = $cfg->{$_} 409 $::CFG->{$_} = $cfg->{$_}
396 if $_ ne '_i'; 410 if $_ ne '_i';
397 } 411 }
398 Crossfire::Client::write_cfg "$Crossfire::VARDIR/pclientrc"; 412 CFClient::write_cfg "$CFrossfire::VARDIR/pclientrc";
399 }); 413 });
400 $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);
401 $cb->signal_connect (clicked => sub { 415 $cb->signal_connect (clicked => sub {
402 for (keys %$cfg) { 416 for (keys %$cfg) {
403 $::CFG->{$_} = $cfg->{$_} 417 $::CFG->{$_} = $cfg->{$_}
… …
422 436
423############################################################################# 437#############################################################################
424 438
425SDL::Init SDL_INIT_EVERYTHING; 439SDL::Init SDL_INIT_EVERYTHING;
426 440
427my $mapwidget = Crossfire::Client::Widget::MapWidget->new; 441@SDL_MODES = reverse map [SDL::RectW ($_), SDL::RectH ($_)],
442 @{ SDL::ListModes 0, SDL_FULLSCREEN|SDL_HWSURFACE };
428 443
429$Crossfire::Client::Widget::TOPLEVEL->add ($mapwidget);
430$mapwidget->focus_in;
431
432Crossfire::Client::read_cfg "$Crossfire::VARDIR/pclientrc"; 444CFClient::read_cfg "$Crossfire::VARDIR/pclientrc";
433 445
434$CFG ||= { 446$CFG ||= {
435 width => 640, 447 width => 640,
436 height => 480, 448 height => 480,
437 mapsize => 100, 449 mapsize => 100,
438 fullscreen => 0, 450 fullscreen => 0,
439 host => "crossfire.schmorp.de", 451 host => "crossfire.schmorp.de",
440 port => 13327, 452 port => 13327,
441}; 453};
442 454
443Crossfire::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}
444 461
445$FACECACHE = eval { Crossfire::load_ref "$Crossfire::VARDIR/pclient.faces" } || {}; 462$FACECACHE = eval { Crossfire::load_ref "$Crossfire::VARDIR/pclient.faces" } || {};
446 463
447run_config_dialog 464run_config_dialog
448 login => sub { start_game }, 465 login => sub { start_game },

Diff Legend

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