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.65 by root, Tue Apr 11 12:27:51 2006 UTC vs.
Revision 1.83 by root, Wed Apr 12 15:35:55 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;
31our $FAST; # fast, low-quality mode
31 32
33our @SDL_MODES;
32our $WIDTH; 34our $WIDTH;
33our $HEIGHT; 35our $HEIGHT;
34our $FULLSCREEN; 36our $FULLSCREEN;
35 37
38our $NOW;
39
40our $MAPWIDGET;
36our $FONTSIZE; 41our $FONTSIZE;
37 42
38our $SDL_TIMER; 43our $SDL_TIMER;
39our $SDL_APP; 44our $SDL_APP;
40our $SDL_EV; 45our $SDL_EV;
… …
46 51
47my $last_refresh; 52my $last_refresh;
48my %ANIMATE; 53my %ANIMATE;
49my $refresh_handler; 54my $refresh_handler;
50 55
51our ($tw, $te); # Test widget #d# 56sub status {
57 $STATUS_LINE->set_text ($_[0]);
58 my ($w, $h) = $STATUS_LINE->size_request;
59 $STATUS_LINE->size_allocate (0, $HEIGHT - $ALT_ENTER_MESSAGE->{h} - $h, $w, $h);
60}
61
62sub debug {
63 $DEBUG_STATUS->set_text ($_[0]);
64 my ($w, $h) = $DEBUG_STATUS->size_request;
65 $DEBUG_STATUS->size_allocate ($WIDTH - $w, 0, $w, $h);
66}
67
68sub config_dialog {
69 my $dialog = new CFClient::UI::FancyFrame x => 300, y => 100,
70 child => (my $vbox = new CFClient::UI::VBox);
71 $vbox->add (new CFClient::UI::Label align => 0, text => "Client Setup");
72 $vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]);
73
74 $table->add (0, 0, new CFClient::UI::Label align => 1, text => "Video Mode");
75 $table->add (1, 0, my $hbox = new CFClient::UI::HBox);
76
77 $hbox->add (my $mode_slider = new CFClient::UI::Slider expand => 1, req_w => 100, range => [$CFG->{sdl_mode}, 0, scalar @SDL_MODES, 1]);
78 $hbox->add (my $mode_label = new CFClient::UI::Label height => $FONTSIZE * 0.8);
79
80 $mode_slider->connect (changed => sub {
81 my ($self, $value) = @_;
82
83 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value;
84 $mode_label->set_text (sprintf "%dx%d", @{$SDL_MODES[$value]});
85 });
86 $mode_slider->emit (changed => $mode_slider->{range}[0]);
87
88 $table->add (1, 1, new CFClient::UI::Button expand => 1, align => 0, text => "Apply", connect_activate => sub {
89 destroy_screen ();
90 ($WIDTH, $HEIGHT) = @{ $SDL_MODES[$CFG->{sdl_mode}] };
91 $FULLSCREEN = $CFG->{fullscreen};
92 init_screen ();
93 });
94
95 $vbox->add (new CFClient::UI::Label align => 0, text => "Server");
96 $vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]);
97 $table->add (0, 2, new CFClient::UI::Label align => 1, text => "Host");
98 $table->add (1, 2, my $host = new CFClient::UI::Entry text => $CFG->{host});
99
100 $table->add (0, 3, new CFClient::UI::Label align => 1, text => "Port");
101 $table->add (1, 3, my $port = new CFClient::UI::Entry text => $CFG->{port});
102
103 $table->add (0, 4, new CFClient::UI::Label align => 1, text => "Username");
104 $table->add (1, 4, my $user = new CFClient::UI::Entry text => $CFG->{user});
105
106 $table->add (0, 5, new CFClient::UI::Label align => 1, text => "Password");
107 $table->add (1, 5, my $pass = new CFClient::UI::Entry text => $CFG->{password}, hidden => 1);
108
109 $table->add (0, 6, new CFClient::UI::Label align => 1, text => "Map Size");
110 $table->add (1, 6, new CFClient::UI::Slider
111 req_w => 100,
112 range => [$CFG->{mapsize}, 10, 100 + 1, 1],
113 connect_changed => sub {
114 my ($self, $value) = @_;
115
116 $CFG->{mapsize} = $self->{range}[0] = $value = int $value;
117 },
118 );
119
120 $table->add (1, 7, new CFClient::UI::Button expand => 1, align => 0, text => "Login", connect_activate => sub {
121 warn "login\n";
122 });
123
124 $vbox->add (my $hbox = new CFClient::UI::HBox);
125
126 $hbox->add (new CFClient::UI::Button expand => 1, align => 0, text => "Save", connect_activate => sub {
127 CFClient::write_cfg "$CFrossfire::VARDIR/pclientrc";
128 status "Configuration Saved";
129 });
130 $CFClient::UI::TOPLEVEL->add ($dialog);
131}
52 132
53sub init_screen { 133sub init_screen {
54 $SDL_APP = new SDL::App 134 $SDL_APP = new SDL::App
55 -flags => SDL_ANYFORMAT | SDL_HWSURFACE, 135 -flags => SDL_ANYFORMAT | SDL_HWSURFACE,
56 -title => "Crossfire+ Client", 136 -title => "Crossfire+ Client",
… …
66 -resizeable => 0; 146 -resizeable => 0;
67 147
68 $SDL_EV = new SDL::Event; 148 $SDL_EV = new SDL::Event;
69 $SDL_EV->set_unicode (1); 149 $SDL_EV->set_unicode (1);
70 150
71 $SDL_TIMER = add Glib::Timeout 1000/50, sub { 151 $SDL_TIMER = add Glib::Timeout 1000 / $MAX_FPS, sub {
72 ($SDL_CB{$SDL_EV->type} || sub { warn "unhandled event ", $SDL_EV->type })->() 152 ($SDL_CB{$SDL_EV->type} || sub { warn "unhandled event ", $SDL_EV->type })->()
73 while $SDL_EV->poll; 153 while $SDL_EV->poll;
74 154
75 1 155 1
76 }; 156 };
77 157
78 $last_refresh = SDL::GetTicks; 158 $last_refresh = SDL::GetTicks;
79 159
80 Crossfire::Client::gl_init; 160 CFClient::gl_init;
81 161
82 $FONTSIZE = int $HEIGHT / 50; 162 $FONTSIZE = int $HEIGHT / 40;
83 163
84 ############################################################################# 164 #############################################################################
85 165
86 glClearColor 0.45, 0.45, 0.45, 1; 166 $DEBUG_STATUS = new CFClient::UI::Label padding => 0;
87
88 glEnable GL_TEXTURE_2D;
89 glEnable GL_COLOR_MATERIAL;
90 glShadeModel GL_FLAT;
91 glDisable GL_DEPTH_TEST;
92 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
93
94 #############################################################################
95
96 $DEBUG_STATUS = new Crossfire::Client::Widget::Label 0, 0, 1, $FONTSIZE, "";
97 $Crossfire::Client::Widget::TOPLEVEL->add ($DEBUG_STATUS); 167 $CFClient::UI::TOPLEVEL->add ($DEBUG_STATUS);
98 168
99 $STATUS_LINE = new Crossfire::Client::Widget::Label 169 $STATUS_LINE = new CFClient::UI::Label
100 0, $HEIGHT * 59 / 60 - $FONTSIZE, 1, $FONTSIZE, 170 padding => 0,
101 ""; 171 y => $HEIGHT * 49 / 50 - $FONTSIZE;
102 $Crossfire::Client::Widget::TOPLEVEL->add ($STATUS_LINE); 172 $CFClient::UI::TOPLEVEL->add ($STATUS_LINE);
103 173
104 $ALT_ENTER_MESSAGE = new Crossfire::Client::Widget::Label 174 $ALT_ENTER_MESSAGE = new CFClient::UI::Label
105 0, $HEIGHT * 59 / 60, 1, $HEIGHT / 60, 175 padding => 0,
176 y => $HEIGHT * 49 / 50,
177 height => $HEIGHT / 50,
106 "Use <b>Alt-Enter</b> to toggle fullscreen mode"; 178 text => "Use <b>Alt-Enter</b> to toggle fullscreen mode";
107 $Crossfire::Client::Widget::TOPLEVEL->add ($ALT_ENTER_MESSAGE); 179 $CFClient::UI::TOPLEVEL->add ($ALT_ENTER_MESSAGE);
108 180
109 # Test code #d# 181 $MAPWIDGET = new CFClient::UI::MapWidget;
110 unless ($tw) { # haha... 182 $CFClient::UI::TOPLEVEL->add ($MAPWIDGET);
111 $te = new Crossfire::Client::Widget::FancyFrame; 183 $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 184
122 my $vb = new Crossfire::Client::Widget::VBox; 185 config_dialog;
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} 186}
141 187
142sub destroy_screen { 188sub destroy_screen {
189 $CFClient::UI::TOPLEVEL->{children} = [];
143 remove Glib::Source $SDL_TIMER; 190 remove Glib::Source $SDL_TIMER;
144 undef $SDL_APP; 191 undef $SDL_APP;
145 undef $SDL_EV; 192 undef $SDL_EV;
146 SDL::Quit; 193 SDL::Quit;
147} 194}
… …
162 pass => $CFG->{password}, 209 pass => $CFG->{password},
163 mapw => $mapsize, 210 mapw => $mapsize,
164 maph => $mapsize, 211 maph => $mapsize,
165 ; 212 ;
166 213
167 Crossfire::Client::lowdelay fileno $CONN->{fh}; 214 CFClient::lowdelay fileno $CONN->{fh};
168} 215}
169 216
170sub stop_game { 217sub stop_game {
171 remove Glib::Source $refresh_handler if $refresh_handler; 218 remove Glib::Source $refresh_handler if $refresh_handler;
172 undef $refresh_handler; 219 undef $refresh_handler;
… …
180 227
181 glMatrixMode GL_PROJECTION; 228 glMatrixMode GL_PROJECTION;
182 glLoadIdentity; 229 glLoadIdentity;
183 glOrtho 0, $WIDTH, $HEIGHT, 0, -10000 , 10000; 230 glOrtho 0, $WIDTH, $HEIGHT, 0, -10000 , 10000;
184 glMatrixMode GL_MODELVIEW; 231 glMatrixMode GL_MODELVIEW;
232 glLoadIdentity;
185 233
186 glClear GL_COLOR_BUFFER_BIT; 234 glClear GL_COLOR_BUFFER_BIT;
187 235
188 $Crossfire::Client::Widget::TOPLEVEL->draw; 236 $CFClient::UI::TOPLEVEL->draw;
189 237
190 SDL::GLSwapBuffers; 238 SDL::GLSwapBuffers;
191}
192
193sub debug {
194 $DEBUG_STATUS->set_text ($_[0]);
195 $DEBUG_STATUS->size_allocate ($DEBUG_STATUS->size_request);
196 $DEBUG_STATUS->move ($WIDTH - $DEBUG_STATUS->{w}, 0);
197} 239}
198 240
199my $FPS; 241my $FPS;
200 242
201sub refresh { 243sub refresh {
202 $refresh_handler ||= add Glib::Idle sub { 244 $refresh_handler ||= add Glib::Idle sub {
203 if ($SDL_APP) { 245 if ($SDL_APP) {
204 my $next_refresh = SDL::GetTicks; 246 $NOW = SDL::GetTicks;
205 247
206 if ($next_refresh - $last_refresh < $TICKS_PER_FRAME) { 248 if ($NOW - $last_refresh < $TICKS_PER_FRAME) {
207 SDL::Delay $TICKS_PER_FRAME - ($next_refresh - $last_refresh); 249 SDL::Delay $TICKS_PER_FRAME - ($NOW - $last_refresh);
208 $next_refresh = SDL::GetTicks; 250 $NOW = SDL::GetTicks;
209 } 251 }
210 252
211 my $interval = ($next_refresh - $last_refresh) * 0.001; 253 my $interval = ($NOW - $last_refresh) * 0.001;
212 $last_refresh = $next_refresh; 254 $last_refresh = $NOW;
213 255
214 if ($interval) { 256 if ($interval) {
215 $FPS ||= 1 / $interval; 257 $FPS ||= 1 / $interval;
216 $FPS = $FPS * 0.96 + (1 / $interval) * 0.04; 258 $FPS = $FPS * 0.9 + (1 / $interval) * 0.1;
217 debug sprintf "%5.02f\n", $FPS; 259 debug sprintf "%5.02f", $FPS;
218 } 260 }
219 261
220 force_refresh; 262 force_refresh;
221 $_->animate ($interval) for grep $_, values %ANIMATE; 263 $_->animate ($interval) for grep $_, values %ANIMATE;
222 264
… …
257 }, 299 },
258 SDL_KEYDOWN() => sub { 300 SDL_KEYDOWN() => sub {
259 if ($SDL_EV->key_mod & KMOD_ALT && $SDL_EV->key_sym == SDLK_RETURN) { 301 if ($SDL_EV->key_mod & KMOD_ALT && $SDL_EV->key_sym == SDLK_RETURN) {
260 # alt-enter 302 # alt-enter
261 $FULLSCREEN = !$FULLSCREEN; 303 $FULLSCREEN = !$FULLSCREEN;
304 destroy_screen;
262 init_screen; 305 init_screen;
263 } else { 306 } else {
264 Crossfire::Client::Widget::feed_sdl_key_down_event ($SDL_EV); 307 CFClient::UI::feed_sdl_key_down_event ($SDL_EV);
265 } 308 }
266 }, 309 },
267 SDL_KEYUP() => sub { 310 SDL_KEYUP() => sub {
268 Crossfire::Client::Widget::feed_sdl_key_up_event ($SDL_EV); 311 CFClient::UI::feed_sdl_key_up_event ($SDL_EV);
269 }, 312 },
270 SDL_MOUSEMOTION() => sub { 313 SDL_MOUSEMOTION() => sub {
271 Crossfire::Client::Widget::feed_sdl_motion_event ($SDL_EV); 314 CFClient::UI::feed_sdl_motion_event ($SDL_EV);
272 }, 315 },
273 SDL_MOUSEBUTTONDOWN() => sub { 316 SDL_MOUSEBUTTONDOWN() => sub {
274 Crossfire::Client::Widget::feed_sdl_button_down_event ($SDL_EV); 317 CFClient::UI::feed_sdl_button_down_event ($SDL_EV);
275 }, 318 },
276 SDL_MOUSEBUTTONUP() => sub { 319 SDL_MOUSEBUTTONUP() => sub {
277 Crossfire::Client::Widget::feed_sdl_button_up_event ($SDL_EV); 320 CFClient::UI::feed_sdl_button_up_event ($SDL_EV);
278 }, 321 },
279 SDL_ACTIVEEVENT() => sub { 322 SDL_ACTIVEEVENT() => sub {
280 printf "active %x %x\n", $SDL_EV->active_gain, $SDL_EV->active_state;#d# 323# printf "active %x %x\n", $SDL_EV->active_gain, $SDL_EV->active_state;#d#
281 }, 324 },
282); 325);
283 326
284@conn::ISA = Crossfire::Protocol::; 327@conn::ISA = Crossfire::Protocol::;
285 328
286sub conn::map_update { 329sub conn::map_update {
287 my ($self, $dirty) = @_; 330 my ($self, $dirty) = @_;
288 331
289 refresh; 332 $MAPWIDGET->update;
290} 333}
291 334
292sub conn::map_scroll { 335sub conn::map_scroll {
293 my ($self, $dx, $dy) = @_; 336 my ($self, $dx, $dy) = @_;
294 337
… …
310sub conn::face_update { 353sub conn::face_update {
311 my ($self, $face) = @_; 354 my ($self, $face) = @_;
312 355
313 $FACECACHE->{"$face->{chksum},$face->{name}"} = $face->{image}; 356 $FACECACHE->{"$face->{chksum},$face->{name}"} = $face->{image};
314 357
315 $face->{texture} = new_from_image Crossfire::Client::Texture delete $face->{image}; 358 $face->{texture} = new_from_image CFClient::Texture delete $face->{image};
316} 359}
317 360
318sub conn::query { 361sub conn::query {
319 my ($self, $flags, $prompt) = @_; 362 my ($self, $flags, $prompt) = @_;
320 363
… …
356 [qw/Password password/], 399 [qw/Password password/],
357 ); 400 );
358 401
359 my $cfg = {}; 402 my $cfg = {};
360 403
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); 404 $w->add (my $vb = Gtk2::VBox->new);
365 $vb->pack_start (my $t = Gtk2::Table->new (2, scalar @cfg), 0, 0, 0); 405 $vb->pack_start (my $t = Gtk2::Table->new (2, scalar @cfg), 0, 0, 0);
366 my $selmode = $::CFG->{width} . 'x' . $::CFG->{height}; 406 my $selmode = $::CFG->{width} . 'x' . $::CFG->{height};
367 $t->attach_defaults (Gtk2::Label->new ("Modes"), 0, 1, 0, 1); 407 $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); 408 $t->attach_defaults (my $cb = Gtk2::ComboBox->new_text, 1, 2, 0, 1);
369 my $i = 0; 409 my $i = 0;
370 my $act = 0; 410 my $act = 0;
371 for (map { "$_->[0]x$_->[1]" } reverse @modes) { 411 for (map { "$_->[0]x$_->[1]" } @SDL_MODES) {
372 if ($_ eq $selmode) { $act = $i } 412 if ($_ eq $selmode) { $act = $i }
373 $cb->append_text ($_); 413 $cb->append_text ($_);
374 $i++; 414 $i++;
375 } 415 }
376 $cb->set_active ($act); 416 $cb->set_active ($act);
… …
393 $cb->signal_connect (clicked => sub { 433 $cb->signal_connect (clicked => sub {
394 for (keys %$cfg) { 434 for (keys %$cfg) {
395 $::CFG->{$_} = $cfg->{$_} 435 $::CFG->{$_} = $cfg->{$_}
396 if $_ ne '_i'; 436 if $_ ne '_i';
397 } 437 }
398 Crossfire::Client::write_cfg "$Crossfire::VARDIR/pclientrc"; 438 CFClient::write_cfg "$CFrossfire::VARDIR/pclientrc";
399 }); 439 });
400 $hb->pack_start (my $cb = Gtk2::Button->new ("login"), 1, 1, 5); 440 $hb->pack_start (my $cb = Gtk2::Button->new ("login"), 1, 1, 5);
401 $cb->signal_connect (clicked => sub { 441 $cb->signal_connect (clicked => sub {
402 for (keys %$cfg) { 442 for (keys %$cfg) {
403 $::CFG->{$_} = $cfg->{$_} 443 $::CFG->{$_} = $cfg->{$_}
… …
422 462
423############################################################################# 463#############################################################################
424 464
425SDL::Init SDL_INIT_EVERYTHING; 465SDL::Init SDL_INIT_EVERYTHING;
426 466
427my $mapwidget = Crossfire::Client::Widget::MapWidget->new; 467@SDL_MODES = reverse map [SDL::RectW ($_), SDL::RectH ($_)],
468 @{ SDL::ListModes 0, SDL_FULLSCREEN|SDL_HWSURFACE };
428 469
429$Crossfire::Client::Widget::TOPLEVEL->add ($mapwidget);
430$mapwidget->focus_in;
431
432Crossfire::Client::read_cfg "$Crossfire::VARDIR/pclientrc"; 470CFClient::read_cfg "$Crossfire::VARDIR/pclientrc";
433 471
434$CFG ||= { 472$CFG ||= {
435 width => 640, 473 width => 640,
436 height => 480, 474 height => 480,
475 fullscreen => 0,
476 sdl_mode => 0,
437 mapsize => 100, 477 mapsize => 100,
438 fullscreen => 0,
439 host => "crossfire.schmorp.de", 478 host => "crossfire.schmorp.de",
440 port => 13327, 479 port => 13327,
441}; 480};
442 481
443{ 482{
444 my @fonts = map Crossfire::Client::find_rcfile $_, qw(uifont.ttf uifontb.ttf uifonti.ttf uifontbi.ttf); 483 my @fonts = map CFClient::find_rcfile $_, qw(uifont.ttf uifontb.ttf uifonti.ttf uifontbi.ttf);
445 484
446 Crossfire::Client::add_font $_ for @fonts; 485 CFClient::add_font $_ for @fonts;
447 Crossfire::Client::set_font $fonts[0]; 486 CFClient::set_font $fonts[0];
448} 487}
449 488
450$FACECACHE = eval { Crossfire::load_ref "$Crossfire::VARDIR/pclient.faces" } || {}; 489$FACECACHE = eval { Crossfire::load_ref "$Crossfire::VARDIR/pclient.faces" } || {};
451 490
452run_config_dialog 491run_config_dialog
… …
454 logout => sub { stop_game }; 493 logout => sub { stop_game };
455 494
456main Gtk2; 495main Gtk2;
457 496
458Crossfire::save_ref $FACECACHE, "$Crossfire::VARDIR/pclient.faces"; 497Crossfire::save_ref $FACECACHE, "$Crossfire::VARDIR/pclient.faces";
498

Diff Legend

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