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

Diff Legend

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