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.74 by root, Tue Apr 11 20:44:49 2006 UTC vs.
Revision 1.85 by root, Wed Apr 12 17:11:02 2006 UTC

… …
19use CFClient; 19use CFClient;
20use CFClient::UI; 20use CFClient::UI;
21 21
22our $VERSION = '0.1'; 22our $VERSION = '0.1';
23 23
24my $MAX_FPS = 30; 24my $MAX_FPS = 60;
25my $MIN_FPS = 5; # unused
25my $TICKS_PER_FRAME = int 1000 / $MAX_FPS - 1; # min ticks per frame 26my $TICKS_PER_FRAME = int 1000 / $MAX_FPS - 1; # min ticks per frame
26 27
27our $FACECACHE; 28our $FACECACHE;
28 29
29our $CFG; 30our $CFG;
30our $CONN; 31our $CONN;
32our $FAST; # fast, low-quality mode, possibly useful for software-rendering
31 33
34our @SDL_MODES;
32our $WIDTH; 35our $WIDTH;
33our $HEIGHT; 36our $HEIGHT;
34our $FULLSCREEN; 37our $FULLSCREEN;
35 38
36our $NOW; 39our $NOW;
… …
49 52
50my $last_refresh; 53my $last_refresh;
51my %ANIMATE; 54my %ANIMATE;
52my $refresh_handler; 55my $refresh_handler;
53 56
54our ($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}
55 160
56sub init_screen { 161sub init_screen {
162 ($WIDTH, $HEIGHT) = @{ $SDL_MODES[$CFG->{sdl_mode}] };
163 $FULLSCREEN = $CFG->{fullscreen};
164
57 $SDL_APP = new SDL::App 165 $SDL_APP = new SDL::App
58 -flags => SDL_ANYFORMAT | SDL_HWSURFACE, 166 -flags => SDL_ANYFORMAT | SDL_HWSURFACE,
59 -title => "Crossfire+ Client", 167 -title => "Crossfire+ Client",
60 -width => $WIDTH, 168 -width => $WIDTH,
61 -height => $HEIGHT, 169 -height => $HEIGHT,
… …
69 -resizeable => 0; 177 -resizeable => 0;
70 178
71 $SDL_EV = new SDL::Event; 179 $SDL_EV = new SDL::Event;
72 $SDL_EV->set_unicode (1); 180 $SDL_EV->set_unicode (1);
73 181
74 $SDL_TIMER = add Glib::Timeout 1000/50, sub { 182 $SDL_TIMER = add Glib::Timeout 1000 / $MAX_FPS, sub {
75 ($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 })->()
76 while $SDL_EV->poll; 184 while $SDL_EV->poll;
77 185
78 1 186 1
79 }; 187 };
80 188
81 $last_refresh = SDL::GetTicks; 189 $last_refresh = SDL::GetTicks;
82 190
83 CFClient::gl_init; 191 CFClient::gl_init;
84 192
85 $FONTSIZE = int $HEIGHT / 50; 193 $FONTSIZE = int $HEIGHT / 40;
86 194
87 ############################################################################# 195 #############################################################################
88 196
89 glClearColor 0.45, 0.45, 0.45, 1;
90
91 glEnable GL_TEXTURE_2D;
92 glEnable GL_COLOR_MATERIAL;
93 glShadeModel GL_FLAT;
94 glDisable GL_DEPTH_TEST;
95 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
96
97 #############################################################################
98
99 $DEBUG_STATUS = new CFClient::UI::Label; 197 $DEBUG_STATUS = new CFClient::UI::Label padding => 0;
100 $CFClient::UI::TOPLEVEL->add ($DEBUG_STATUS); 198 $CFClient::UI::TOPLEVEL->add ($DEBUG_STATUS);
101 199
102 $STATUS_LINE = new CFClient::UI::Label 200 $STATUS_LINE = new CFClient::UI::Label
201 padding => 0,
103 y => $HEIGHT * 59 / 60 - $FONTSIZE; 202 y => $HEIGHT * 49 / 50 - $FONTSIZE;
104 $CFClient::UI::TOPLEVEL->add ($STATUS_LINE); 203 $CFClient::UI::TOPLEVEL->add ($STATUS_LINE);
105 204
106 $ALT_ENTER_MESSAGE = new CFClient::UI::Label 205 $ALT_ENTER_MESSAGE = new CFClient::UI::Label
206 padding => 0,
107 y => $HEIGHT * 59 / 60, 207 y => $HEIGHT * 49 / 50,
108 height => $HEIGHT / 60, 208 height => $HEIGHT / 50,
109 text => "Use <b>Alt-Enter</b> to toggle fullscreen mode"; 209 text => "Use <b>Alt-Enter</b> to toggle fullscreen mode";
110 $CFClient::UI::TOPLEVEL->add ($ALT_ENTER_MESSAGE); 210 $CFClient::UI::TOPLEVEL->add ($ALT_ENTER_MESSAGE);
111 211
112 $MAPWIDGET = new CFClient::UI::MapWidget; 212 $MAPWIDGET = new CFClient::UI::MapWidget;
113 $CFClient::UI::TOPLEVEL->add ($MAPWIDGET); 213 $CFClient::UI::TOPLEVEL->add ($MAPWIDGET);
114 $MAPWIDGET->focus_in; 214 $MAPWIDGET->focus_in;
215
216 config_dialog;
115} 217}
116 218
117sub destroy_screen { 219sub destroy_screen {
220 $CFClient::UI::TOPLEVEL->{children} = [];
118 remove Glib::Source $SDL_TIMER; 221 remove Glib::Source $SDL_TIMER;
222 remove Glib::Source $refresh_handler if $refresh_handler;
223 undef $refresh_handler;
119 undef $SDL_APP; 224 undef $SDL_APP;
120 undef $SDL_EV; 225 undef $SDL_EV;
121 SDL::Quit; 226 SDL::Quit;
122}
123
124sub config_dialog {
125 my $dialog = new CFClient::UI::FancyFrame x => 300, y => 100,
126 child => (my $vbox = new CFClient::UI::VBox);
127 $vbox->add (new CFClient::UI::Label align => 0, text => "Setup");
128 $vbox->add (my $table = new CFClient::UI::Table);
129
130 $table->add (0, 0, new CFClient::UI::Label text => "Video Mode");
131 $table->add (0, 1, new CFClient::UI::Label text => "Host");
132 $table->add (0, 2, new CFClient::UI::Label text => "Port");
133 $table->add (0, 3, new CFClient::UI::Label text => "Username");
134 $table->add (0, 4, new CFClient::UI::Label text => "Password", hidden => 1);
135 $table->add (0, 5, new CFClient::UI::Label text => "Server Map Size");
136
137 $CFClient::UI::TOPLEVEL->add ($dialog);
138}
139
140sub start_game {
141 $WIDTH = $CFG->{width};
142 $HEIGHT = $CFG->{height};
143 $FULLSCREEN = 0;
144
145 init_screen;
146
147 config_dialog;
148
149 my $mapsize = List::Util::min 64, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32;
150
151 $CONN = new conn
152 host => $CFG->{host},
153 port => $CFG->{port},
154 user => $CFG->{user},
155 pass => $CFG->{password},
156 mapw => $mapsize,
157 maph => $mapsize,
158 ;
159
160 CFClient::lowdelay fileno $CONN->{fh};
161}
162
163sub stop_game {
164 remove Glib::Source $refresh_handler if $refresh_handler;
165 undef $refresh_handler;
166
167 undef $CONN;
168 destroy_screen;
169} 227}
170 228
171sub force_refresh { 229sub force_refresh {
172 glViewport 0, 0, $WIDTH, $HEIGHT; 230 glViewport 0, 0, $WIDTH, $HEIGHT;
173 231
… …
180 glClear GL_COLOR_BUFFER_BIT; 238 glClear GL_COLOR_BUFFER_BIT;
181 239
182 $CFClient::UI::TOPLEVEL->draw; 240 $CFClient::UI::TOPLEVEL->draw;
183 241
184 SDL::GLSwapBuffers; 242 SDL::GLSwapBuffers;
185}
186
187sub debug {
188 $DEBUG_STATUS->set_text ($_[0]);
189 $DEBUG_STATUS->size_allocate ($DEBUG_STATUS->size_request);
190 $DEBUG_STATUS->move ($WIDTH - $DEBUG_STATUS->{w}, 0);
191} 243}
192 244
193my $FPS; 245my $FPS;
194 246
195sub refresh { 247sub refresh {
… …
205 my $interval = ($NOW - $last_refresh) * 0.001; 257 my $interval = ($NOW - $last_refresh) * 0.001;
206 $last_refresh = $NOW; 258 $last_refresh = $NOW;
207 259
208 if ($interval) { 260 if ($interval) {
209 $FPS ||= 1 / $interval; 261 $FPS ||= 1 / $interval;
210 $FPS = $FPS * 0.96 + (1 / $interval) * 0.04; 262 $FPS = $FPS * 0.9 + (1 / $interval) * 0.1;
211 debug sprintf "%5.02f", $FPS; 263 debug sprintf "%5.02f", $FPS;
212 } 264 }
213 265
214 force_refresh; 266 force_refresh;
215 $_->animate ($interval) for grep $_, values %ANIMATE; 267 $_->animate ($interval) for grep $_, values %ANIMATE;
… …
251 }, 303 },
252 SDL_KEYDOWN() => sub { 304 SDL_KEYDOWN() => sub {
253 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) {
254 # alt-enter 306 # alt-enter
255 $FULLSCREEN = !$FULLSCREEN; 307 $FULLSCREEN = !$FULLSCREEN;
308 destroy_screen;
256 init_screen; 309 init_screen;
257 } else { 310 } else {
258 CFClient::UI::feed_sdl_key_down_event ($SDL_EV); 311 CFClient::UI::feed_sdl_key_down_event ($SDL_EV);
259 } 312 }
260 }, 313 },
… …
350 [qw/Password password/], 403 [qw/Password password/],
351 ); 404 );
352 405
353 my $cfg = {}; 406 my $cfg = {};
354 407
355 my $a = SDL::ListModes (0, SDL_FULLSCREEN|SDL_HWSURFACE);
356 my @modes = map { [SDL::RectW ($_), SDL::RectH ($_)] } @$a;
357
358 $w->add (my $vb = Gtk2::VBox->new); 408 $w->add (my $vb = Gtk2::VBox->new);
359 $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);
360 my $selmode = $::CFG->{width} . 'x' . $::CFG->{height}; 410 my $selmode = $::CFG->{width} . 'x' . $::CFG->{height};
361 $t->attach_defaults (Gtk2::Label->new ("Modes"), 0, 1, 0, 1); 411 $t->attach_defaults (Gtk2::Label->new ("Modes"), 0, 1, 0, 1);
362 $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);
363 my $i = 0; 413 my $i = 0;
364 my $act = 0; 414 my $act = 0;
365 for (map { "$_->[0]x$_->[1]" } reverse @modes) { 415 for (map { "$_->[0]x$_->[1]" } @SDL_MODES) {
366 if ($_ eq $selmode) { $act = $i } 416 if ($_ eq $selmode) { $act = $i }
367 $cb->append_text ($_); 417 $cb->append_text ($_);
368 $i++; 418 $i++;
369 } 419 }
370 $cb->set_active ($act); 420 $cb->set_active ($act);
… …
416 466
417############################################################################# 467#############################################################################
418 468
419SDL::Init SDL_INIT_EVERYTHING; 469SDL::Init SDL_INIT_EVERYTHING;
420 470
471@SDL_MODES = reverse map [SDL::RectW ($_), SDL::RectH ($_)],
472 @{ SDL::ListModes 0, SDL_FULLSCREEN|SDL_HWSURFACE };
473
421CFClient::read_cfg "$Crossfire::VARDIR/pclientrc"; 474CFClient::read_cfg "$Crossfire::VARDIR/pclientrc";
422 475
423$CFG ||= { 476$CFG ||= {
424 width => 640, 477 width => 640,
425 height => 480, 478 height => 480,
479 fullscreen => 0,
480 sdl_mode => 0,
426 mapsize => 100, 481 mapsize => 100,
427 fullscreen => 0,
428 host => "crossfire.schmorp.de", 482 host => "crossfire.schmorp.de",
429 port => 13327, 483 port => 13327,
430}; 484};
431 485
432{ 486{
… …
436 CFClient::set_font $fonts[0]; 490 CFClient::set_font $fonts[0];
437} 491}
438 492
439$FACECACHE = eval { Crossfire::load_ref "$Crossfire::VARDIR/pclient.faces" } || {}; 493$FACECACHE = eval { Crossfire::load_ref "$Crossfire::VARDIR/pclient.faces" } || {};
440 494
441run_config_dialog 495init_screen;
442 login => sub { start_game },
443 logout => sub { stop_game };
444 496
445main Gtk2; 497main Gtk2;
446 498
447Crossfire::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