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.71 by root, Tue Apr 11 17:02:36 2006 UTC vs.
Revision 1.78 by root, Wed Apr 12 00:26:50 2006 UTC

… …
15 15
16use Crossfire; 16use Crossfire;
17use Crossfire::Protocol; 17use Crossfire::Protocol;
18 18
19use CFClient; 19use CFClient;
20use CFClient::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
36our $NOW; 37our $NOW;
… …
69 -resizeable => 0; 70 -resizeable => 0;
70 71
71 $SDL_EV = new SDL::Event; 72 $SDL_EV = new SDL::Event;
72 $SDL_EV->set_unicode (1); 73 $SDL_EV->set_unicode (1);
73 74
74 $SDL_TIMER = add Glib::Timeout 1000/50, sub { 75 $SDL_TIMER = add Glib::Timeout 1000 / $MAX_FPS, sub {
75 ($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 })->()
76 while $SDL_EV->poll; 77 while $SDL_EV->poll;
77 78
78 1 79 1
79 }; 80 };
80 81
81 $last_refresh = SDL::GetTicks; 82 $last_refresh = SDL::GetTicks;
82 83
83 CFClient::gl_init; 84 CFClient::gl_init;
84 85
85 $FONTSIZE = int $HEIGHT / 50; 86 $FONTSIZE = int $HEIGHT / 40;
86 87
87 ############################################################################# 88 #############################################################################
88 89
89 glClearColor 0.45, 0.45, 0.45, 1; 90 glClearColor 0.45, 0.45, 0.45, 1;
90 91
… …
94 glDisable GL_DEPTH_TEST; 95 glDisable GL_DEPTH_TEST;
95 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 96 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
96 97
97 ############################################################################# 98 #############################################################################
98 99
99 $DEBUG_STATUS = new CFClient::Widget::Label; 100 $DEBUG_STATUS = new CFClient::UI::Label padding => 0;
100 $CFClient::Widget::TOPLEVEL->add ($DEBUG_STATUS); 101 $CFClient::UI::TOPLEVEL->add ($DEBUG_STATUS);
101 102
102 $STATUS_LINE = new CFClient::Widget::Label 103 $STATUS_LINE = new CFClient::UI::Label
104 padding => 0,
103 y => $HEIGHT * 59 / 60 - $FONTSIZE; 105 y => $HEIGHT * 49 / 50 - $FONTSIZE;
104 $CFClient::Widget::TOPLEVEL->add ($STATUS_LINE); 106 $CFClient::UI::TOPLEVEL->add ($STATUS_LINE);
105 107
106 $ALT_ENTER_MESSAGE = new CFClient::Widget::Label 108 $ALT_ENTER_MESSAGE = new CFClient::UI::Label
109 padding => 0,
107 y => $HEIGHT * 59 / 60, 110 y => $HEIGHT * 49 / 50,
108 height => $HEIGHT / 60, 111 height => $HEIGHT / 50,
109 text => "Use <b>Alt-Enter</b> to toggle fullscreen mode"; 112 text => "Use <b>Alt-Enter</b> to toggle fullscreen mode";
110 $CFClient::Widget::TOPLEVEL->add ($ALT_ENTER_MESSAGE); 113 $CFClient::UI::TOPLEVEL->add ($ALT_ENTER_MESSAGE);
111 114
112 $MAPWIDGET = new CFClient::Widget::MapWidget; 115 $MAPWIDGET = new CFClient::UI::MapWidget;
113 $CFClient::Widget::TOPLEVEL->add ($MAPWIDGET); 116 $CFClient::UI::TOPLEVEL->add ($MAPWIDGET);
114 $MAPWIDGET->focus_in; 117 $MAPWIDGET->focus_in;
115
116 # Test code #d#
117 unless ($tw) { # haha...
118 my $w = new CFClient::Widget::Window
119 w => 300, h => 300,
120 child => (my $frame = new CFClient::Widget::FancyFrame);
121 $CFClient::Widget::TOPLEVEL->add ($w);
122
123 $frame->add (my $vbox = new CFClient::Widget::VBox);
124
125 $vbox->add (new CFClient::Widget::Entry text => "hallo");
126 $vbox->add (new CFClient::Widget::Slider);
127
128 $tw = new CFClient::Widget::Animator x => $WIDTH - 200, w => 600, h => 300;
129 my $lbl1 = new CFClient::Widget::Label text => "<i>This</i> is a\n<u>TEST</u>!\nOf a themed\nFrame!";
130 my $lbl2 = new CFClient::Widget::Label text => "LBL2";
131 my $vb = new CFClient::Widget::VBox;
132 my $f = new CFClient::Widget::FancyFrame;
133 my $f2 = new CFClient::Widget::FancyFrame;
134 $f->add ($lbl1);
135 $f2->add ($lbl2);
136 $vb->add ($f);
137 $vb->add ($f2, 1);
138
139 $tw->add ($vb);
140 $tw->moveto (0, 0);
141 $CFClient::Widget::TOPLEVEL->add ($tw);
142
143# $f->move ($WIDTH - 200, 0);
144# $CFClient::Widget::TOPLEVEL->add ($f);
145 }
146} 118}
147 119
148sub destroy_screen { 120sub destroy_screen {
149 remove Glib::Source $SDL_TIMER; 121 remove Glib::Source $SDL_TIMER;
150 undef $SDL_APP; 122 undef $SDL_APP;
151 undef $SDL_EV; 123 undef $SDL_EV;
152 SDL::Quit; 124 SDL::Quit;
153} 125}
154 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 height => $FONTSIZE * 0.8);
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 $vbox->add (my $hbox = new CFClient::UI::HBox);
163 $hbox->add (new CFClient::UI::Button expand => 1, align => 0, text => "Save", connect_activate => sub {
164 warn "save\n";
165 });
166 $hbox->add (new CFClient::UI::Button expand => 1, align => 0, text => "Login", connect_activate => sub {
167 warn "login\n";
168 });
169 $hbox->add (new CFClient::UI::Button expand => 1, align => 0, text => "Apply", connect_activate => sub {
170 warn "apply\n";
171 });
172
173 $CFClient::UI::TOPLEVEL->add ($dialog);
174}
175
155sub start_game { 176sub start_game {
156 $WIDTH = $CFG->{width}; 177 $WIDTH = $CFG->{width};
157 $HEIGHT = $CFG->{height}; 178 $HEIGHT = $CFG->{height};
158 $FULLSCREEN = 0; 179 $FULLSCREEN = 0;
159 180
160 init_screen; 181 init_screen;
182
183 config_dialog;
161 184
162 my $mapsize = List::Util::min 64, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32; 185 my $mapsize = List::Util::min 64, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32;
163 186
164 $CONN = new conn 187 $CONN = new conn
165 host => $CFG->{host}, 188 host => $CFG->{host},
… …
186 209
187 glMatrixMode GL_PROJECTION; 210 glMatrixMode GL_PROJECTION;
188 glLoadIdentity; 211 glLoadIdentity;
189 glOrtho 0, $WIDTH, $HEIGHT, 0, -10000 , 10000; 212 glOrtho 0, $WIDTH, $HEIGHT, 0, -10000 , 10000;
190 glMatrixMode GL_MODELVIEW; 213 glMatrixMode GL_MODELVIEW;
214 glLoadIdentity;
191 215
192 glClear GL_COLOR_BUFFER_BIT; 216 glClear GL_COLOR_BUFFER_BIT;
193 217
194 $CFClient::Widget::TOPLEVEL->draw; 218 $CFClient::UI::TOPLEVEL->draw;
195 219
196 SDL::GLSwapBuffers; 220 SDL::GLSwapBuffers;
197} 221}
198 222
199sub debug { 223sub debug {
200 $DEBUG_STATUS->set_text ($_[0]); 224 $DEBUG_STATUS->set_text ($_[0]);
201 $DEBUG_STATUS->size_allocate ($DEBUG_STATUS->size_request); 225 my ($w, $h) = $DEBUG_STATUS->size_request;
202 $DEBUG_STATUS->move ($WIDTH - $DEBUG_STATUS->{w}, 0); 226 $DEBUG_STATUS->size_allocate ($WIDTH - $w, 0, $w, $h);
203} 227}
204 228
205my $FPS; 229my $FPS;
206 230
207sub refresh { 231sub refresh {
… …
217 my $interval = ($NOW - $last_refresh) * 0.001; 241 my $interval = ($NOW - $last_refresh) * 0.001;
218 $last_refresh = $NOW; 242 $last_refresh = $NOW;
219 243
220 if ($interval) { 244 if ($interval) {
221 $FPS ||= 1 / $interval; 245 $FPS ||= 1 / $interval;
222 $FPS = $FPS * 0.96 + (1 / $interval) * 0.04; 246 $FPS = $FPS * 0.9 + (1 / $interval) * 0.1;
223 debug sprintf "%5.02f", $FPS; 247 debug sprintf "%5.02f", $FPS;
224 } 248 }
225 249
226 force_refresh; 250 force_refresh;
227 $_->animate ($interval) for grep $_, values %ANIMATE; 251 $_->animate ($interval) for grep $_, values %ANIMATE;
… …
265 if ($SDL_EV->key_mod & KMOD_ALT && $SDL_EV->key_sym == SDLK_RETURN) { 289 if ($SDL_EV->key_mod & KMOD_ALT && $SDL_EV->key_sym == SDLK_RETURN) {
266 # alt-enter 290 # alt-enter
267 $FULLSCREEN = !$FULLSCREEN; 291 $FULLSCREEN = !$FULLSCREEN;
268 init_screen; 292 init_screen;
269 } else { 293 } else {
270 CFClient::Widget::feed_sdl_key_down_event ($SDL_EV); 294 CFClient::UI::feed_sdl_key_down_event ($SDL_EV);
271 } 295 }
272 }, 296 },
273 SDL_KEYUP() => sub { 297 SDL_KEYUP() => sub {
274 CFClient::Widget::feed_sdl_key_up_event ($SDL_EV); 298 CFClient::UI::feed_sdl_key_up_event ($SDL_EV);
275 }, 299 },
276 SDL_MOUSEMOTION() => sub { 300 SDL_MOUSEMOTION() => sub {
277 CFClient::Widget::feed_sdl_motion_event ($SDL_EV); 301 CFClient::UI::feed_sdl_motion_event ($SDL_EV);
278 }, 302 },
279 SDL_MOUSEBUTTONDOWN() => sub { 303 SDL_MOUSEBUTTONDOWN() => sub {
280 CFClient::Widget::feed_sdl_button_down_event ($SDL_EV); 304 CFClient::UI::feed_sdl_button_down_event ($SDL_EV);
281 }, 305 },
282 SDL_MOUSEBUTTONUP() => sub { 306 SDL_MOUSEBUTTONUP() => sub {
283 CFClient::Widget::feed_sdl_button_up_event ($SDL_EV); 307 CFClient::UI::feed_sdl_button_up_event ($SDL_EV);
284 }, 308 },
285 SDL_ACTIVEEVENT() => sub { 309 SDL_ACTIVEEVENT() => sub {
286# printf "active %x %x\n", $SDL_EV->active_gain, $SDL_EV->active_state;#d# 310# printf "active %x %x\n", $SDL_EV->active_gain, $SDL_EV->active_state;#d#
287 }, 311 },
288); 312);
… …
362 [qw/Password password/], 386 [qw/Password password/],
363 ); 387 );
364 388
365 my $cfg = {}; 389 my $cfg = {};
366 390
367 my $a = SDL::ListModes (0, SDL_FULLSCREEN|SDL_HWSURFACE);
368 my @modes = map { [SDL::RectW ($_), SDL::RectH ($_)] } @$a;
369
370 $w->add (my $vb = Gtk2::VBox->new); 391 $w->add (my $vb = Gtk2::VBox->new);
371 $vb->pack_start (my $t = Gtk2::Table->new (2, scalar @cfg), 0, 0, 0); 392 $vb->pack_start (my $t = Gtk2::Table->new (2, scalar @cfg), 0, 0, 0);
372 my $selmode = $::CFG->{width} . 'x' . $::CFG->{height}; 393 my $selmode = $::CFG->{width} . 'x' . $::CFG->{height};
373 $t->attach_defaults (Gtk2::Label->new ("Modes"), 0, 1, 0, 1); 394 $t->attach_defaults (Gtk2::Label->new ("Modes"), 0, 1, 0, 1);
374 $t->attach_defaults (my $cb = Gtk2::ComboBox->new_text, 1, 2, 0, 1); 395 $t->attach_defaults (my $cb = Gtk2::ComboBox->new_text, 1, 2, 0, 1);
375 my $i = 0; 396 my $i = 0;
376 my $act = 0; 397 my $act = 0;
377 for (map { "$_->[0]x$_->[1]" } reverse @modes) { 398 for (map { "$_->[0]x$_->[1]" } @SDL_MODES) {
378 if ($_ eq $selmode) { $act = $i } 399 if ($_ eq $selmode) { $act = $i }
379 $cb->append_text ($_); 400 $cb->append_text ($_);
380 $i++; 401 $i++;
381 } 402 }
382 $cb->set_active ($act); 403 $cb->set_active ($act);
… …
428 449
429############################################################################# 450#############################################################################
430 451
431SDL::Init SDL_INIT_EVERYTHING; 452SDL::Init SDL_INIT_EVERYTHING;
432 453
454@SDL_MODES = reverse map [SDL::RectW ($_), SDL::RectH ($_)],
455 @{ SDL::ListModes 0, SDL_FULLSCREEN|SDL_HWSURFACE };
456
433CFClient::read_cfg "$Crossfire::VARDIR/pclientrc"; 457CFClient::read_cfg "$Crossfire::VARDIR/pclientrc";
434 458
435$CFG ||= { 459$CFG ||= {
436 width => 640, 460 width => 640,
437 height => 480, 461 height => 480,

Diff Legend

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