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.99 by root, Fri Apr 14 02:03:11 2006 UTC vs.
Revision 1.106 by root, Fri Apr 14 22:26:28 2006 UTC

… …
48our $ALT_ENTER_MESSAGE; 48our $ALT_ENTER_MESSAGE;
49our $STATUS_LINE; 49our $STATUS_LINE;
50our $DEBUG_STATUS; 50our $DEBUG_STATUS;
51our $BUTTONBAR; 51our $BUTTONBAR;
52our $LOGVIEW; 52our $LOGVIEW;
53our $CONSOLE;
53 54
54sub status { 55sub status {
55 $STATUS_LINE->set_text ($_[0]); 56 $STATUS_LINE->set_text ($_[0]);
56 my ($w, $h) = $STATUS_LINE->size_request; 57 my ($w, $h) = $STATUS_LINE->size_request;
57 $STATUS_LINE->size_allocate (0, $HEIGHT - $ALT_ENTER_MESSAGE->{h} - $h, $w, $h); 58 $STATUS_LINE->size_allocate (0, $HEIGHT - $ALT_ENTER_MESSAGE->{h} - $h, $w, $h);
… …
64} 65}
65 66
66sub start_game { 67sub start_game {
67 status "logging in..."; 68 status "logging in...";
68 69
69 my $mapsize = List::Util::min 64, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32; 70 my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32;
70 71
71 $MAP = new CFClient::Map $mapsize, $mapsize; 72 $MAP = new CFClient::Map $mapsize, $mapsize;
72 73
73 $CONN = new conn 74 $CONN = new conn
74 host => $CFG->{host}, 75 host => $CFG->{host},
… …
136 $table->add (1, 5, new CFClient::UI::CheckBox state => $CFG->{fow_smooth}, connect_changed => sub { 137 $table->add (1, 5, new CFClient::UI::CheckBox state => $CFG->{fow_smooth}, connect_changed => sub {
137 my ($self, $value) = @_; 138 my ($self, $value) = @_;
138 $CFG->{fow_smooth} = $value; 139 $CFG->{fow_smooth} = $value;
139 }); 140 });
140 141
142 $table->add (0, 5, new CFClient::UI::Label align => 1, text => "Log Fontsize");
143 $table->add (1, 5, new CFClient::UI::Slider range => [$CFG->{log_fontsize}, 8, 30, 1], connect_changed => sub {
144 my ($self, $value) = @_;
145 $LOGVIEW->set_fontsize ($CFG->{log_fontsize} = int $value);
146 });
147
141 $table->add (1, 6, new CFClient::UI::Button expand => 1, align => 0, text => "Apply", connect_activate => sub { 148 $table->add (1, 6, new CFClient::UI::Button expand => 1, align => 0, text => "Apply", connect_activate => sub {
142 destroy_screen (); 149 destroy_screen ();
143 init_screen (); 150 init_screen ();
144 }); 151 });
145 152
146 $vbox->add (new CFClient::UI::Label align => 0, text => "Server Setup"); 153 $vbox->add (new CFClient::UI::Label align => 0, text => "Server Setup");
147 $vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]); 154 $vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]);
148 $table->add (0, 2, new CFClient::UI::Label align => 1, text => "Host"); 155 $table->add (0, 2, new CFClient::UI::Label align => 1, text => "Host");
149 $table->add (1, 2, my $host = new CFClient::UI::Entry text => $CFG->{host}); 156 $table->add (1, 2, my $host = new CFClient::UI::Entry text => $CFG->{host}, connect_changed => sub {
150 157 my ($self, $value) = @_;
158 $CFG->{host} = $value;
159 });
160
151 $table->add (0, 3, new CFClient::UI::Label align => 1, text => "Port"); 161 $table->add (0, 3, new CFClient::UI::Label align => 1, text => "Port");
152 $table->add (1, 3, my $port = new CFClient::UI::Entry text => $CFG->{port}); 162 $table->add (1, 3, my $port = new CFClient::UI::Entry text => $CFG->{port}, connect_changed => sub {
163 my ($self, $value) = @_;
164 $CFG->{port} = $value;
165 });
153 166
154 $table->add (0, 4, new CFClient::UI::Label align => 1, text => "Username"); 167 $table->add (0, 4, new CFClient::UI::Label align => 1, text => "Username");
155 $table->add (1, 4, my $user = new CFClient::UI::Entry text => $CFG->{user}); 168 $table->add (1, 4, my $user = new CFClient::UI::Entry text => $CFG->{user}, connect_changed => sub {
169 my ($self, $value) = @_;
170 $CFG->{user} = $value;
171 });
156 172
157 $table->add (0, 5, new CFClient::UI::Label align => 1, text => "Password"); 173 $table->add (0, 5, new CFClient::UI::Label align => 1, text => "Password");
158 $table->add (1, 5, my $pass = new CFClient::UI::Entry text => $CFG->{password}, hidden => 1); 174 $table->add (1, 5, my $pass = new CFClient::UI::Entry text => $CFG->{password}, hidden => 1, connect_changed => sub {
175 my ($self, $value) = @_;
176 $CFG->{password} = $value;
177 });
159 178
179 $table->add (0, 6, new CFClient::UI::Label align => 1, text => "Def. say cmd");
180 $table->add (1, 6, my $saycmd = new CFClient::UI::Entry text => $CFG->{say_command}, connect_changed => sub {
181 my ($self, $value) = @_;
182 $CFG->{say_command} = $value;
183 });
184
160 $table->add (0, 6, new CFClient::UI::Label align => 1, text => "Map Size"); 185 $table->add (0, 7, new CFClient::UI::Label align => 1, text => "Map Size");
161 $table->add (1, 6, new CFClient::UI::Slider 186 $table->add (1, 7, new CFClient::UI::Slider
162 req_w => 100, 187 req_w => 100,
163 range => [$CFG->{mapsize}, 10, 100 + 1, 1], 188 range => [$CFG->{mapsize}, 10, 100 + 1, 1],
164 connect_changed => sub { 189 connect_changed => sub {
165 my ($self, $value) = @_; 190 my ($self, $value) = @_;
166 191
167 $CFG->{mapsize} = $self->{range}[0] = $value = int $value; 192 $CFG->{mapsize} = $self->{range}[0] = $value = int $value;
168 }, 193 },
169 ); 194 );
170 195
171 $table->add (1, 7, new CFClient::UI::Button expand => 1, align => 0, text => "Login", connect_activate => sub { 196 $table->add (1, 8, new CFClient::UI::Button expand => 1, align => 0, text => "Login", connect_activate => sub {
172 start_game; 197 start_game;
173 }); 198 });
174 199
175 $vbox->add (my $hbox = new CFClient::UI::HBox); 200 $vbox->add (my $hbox = new CFClient::UI::HBox);
176 201
… …
184 209
185sub console_window { 210sub console_window {
186 my $window = new CFClient::UI::FancyFrame 211 my $window = new CFClient::UI::FancyFrame
187 border_bg => [1, 1, 1, 0.5], 212 border_bg => [1, 1, 1, 0.5],
188 bg => [0.3, 0.3, 0.3, 0.8], 213 bg => [0.3, 0.3, 0.3, 0.8],
214 user_w => $::WIDTH/4,
215 user_h => $::HEIGHT,
189 child => (my $vbox = new CFClient::UI::VBox); 216 child => (my $vbox = new CFClient::UI::VBox);
190 217
191 $vbox->add ($LOGVIEW = new CFClient::UI::TextView expand => 1); 218 $vbox->add ($LOGVIEW = new CFClient::UI::TextView
219 expand => 1,
220 fontsize => $::CFG->{log_fontsize},
221 );
222
192 $vbox->add (my $input = new CFClient::UI::Entry); 223 $vbox->add (my $input = new CFClient::UI::LineEntry);
224 $input->connect (activate => sub {
225 my ($input, $text) = @_;
226 $input->set_text ('');
227
228 if ($text =~ /^\/(.*)/) {
229 $::CONN->user_send ("command $1");
230 } else {
231 my $say_cmd = $::CFG->{say_command} || 'say';
232 $::CONN->user_send ("command $say_cmd $text");
233 }
234 1
235 });
236 $input->connect (escape => sub {
237 $MAPWIDGET->focus_in
238 });
239 $input->focus_in;
240
241 $CONSOLE = {
242 window => $window,
243 input => $input
244 };
193 245
194 $window 246 $window
195} 247}
196 248
197sub sdl_init { 249sub sdl_init {
… …
255 text => "Use <b>Alt-Enter</b> to toggle fullscreen mode"; 307 text => "Use <b>Alt-Enter</b> to toggle fullscreen mode";
256 $CFClient::UI::TOPLEVEL->add ($ALT_ENTER_MESSAGE); 308 $CFClient::UI::TOPLEVEL->add ($ALT_ENTER_MESSAGE);
257 309
258 $CFClient::UI::TOPLEVEL->add ($MAPWIDGET = new CFClient::UI::MapWidget); 310 $CFClient::UI::TOPLEVEL->add ($MAPWIDGET = new CFClient::UI::MapWidget);
259 $MAPWIDGET->focus_in; 311 $MAPWIDGET->focus_in;
312 $MAPWIDGET->connect (activate_console => sub {
313 my ($mapwidget, $preset) = @_;
314
315 if ($CONSOLE) {
316 $CONSOLE->{input}->focus_in;
317
318 if ($preset && $CONSOLE->{input}->get_text eq '') {
319 $CONSOLE->{input}->set_text ($preset);
320 }
321 }
322 });
260 323
261 $CFClient::UI::TOPLEVEL->add ($BUTTONBAR = new CFClient::UI::HBox); 324 $CFClient::UI::TOPLEVEL->add ($BUTTONBAR = new CFClient::UI::HBox);
262 325
263 $BUTTONBAR->add (my $setup = new CFClient::UI::Flopper x => 0, y => 0, text => "Setup", other => config_dialog, state => 1); 326 $BUTTONBAR->add (my $setup = new CFClient::UI::Flopper x => 0, y => 0, text => "Setup", other => config_dialog, state => 1);
264 $BUTTONBAR->add (my $setup = new CFClient::UI::Flopper x => 0, y => 0, text => "Console", other => console_window); 327 $BUTTONBAR->add (my $setup = new CFClient::UI::Flopper x => 0, y => 0, text => "Console", other => console_window);
… …
283 $fps = $fps * 0.95 + 1 / ($NOW - $LAST_REFRESH) * 0.05; 346 $fps = $fps * 0.95 + 1 / ($NOW - $LAST_REFRESH) * 0.05;
284 debug sprintf "%3.2f", $fps; 347 debug sprintf "%3.2f", $fps;
285 348
286 $want_refresh = 0; 349 $want_refresh = 0;
287 $can_refresh = 0; 350 $can_refresh = 0;
288
289 glViewport 0, 0, $WIDTH, $HEIGHT;
290
291 glMatrixMode GL_PROJECTION;
292 glLoadIdentity;
293 glOrtho 0, $WIDTH, $HEIGHT, 0, -10000 , 10000;
294 glMatrixMode GL_MODELVIEW;
295 glLoadIdentity;
296
297 glClearColor +($CFG->{fow_intensity}) x 3, 1;
298 glClear GL_COLOR_BUFFER_BIT;
299 351
300 $CFClient::UI::TOPLEVEL->draw; 352 $CFClient::UI::TOPLEVEL->draw;
301 353
302 SDL::GLSwapBuffers; 354 SDL::GLSwapBuffers;
303 355
… …
454############################################################################# 506#############################################################################
455 507
456CFClient::read_cfg "$Crossfire::VARDIR/pclientrc"; 508CFClient::read_cfg "$Crossfire::VARDIR/pclientrc";
457 509
458my %DEF_CFG = ( 510my %DEF_CFG = (
511 sdl_mode => 0,
459 width => 640, 512 width => 640,
460 height => 480, 513 height => 480,
514 fullscreen => 0,
461 fast => 0, 515 fast => 0,
462 fow_enable => 1, 516 fow_enable => 1,
463 fow_intensity => 0.45, 517 fow_intensity => 0.45,
464 fow_smooth => 0, 518 fow_smooth => 0,
465 fullscreen => 0, 519 log_fontsize => 14,
466 sdl_mode => 0,
467 mapsize => 100, 520 mapsize => 100,
468 host => "crossfire.schmorp.de", 521 host => "crossfire.schmorp.de",
469 port => 13327, 522 port => 13327,
523 say_command => 'say',
470); 524);
471 525
472while (my ($k, $v) = each %DEF_CFG) { 526while (my ($k, $v) = each %DEF_CFG) {
473 $CFG->{$k} = $v unless exists $CFG->{$k}; 527 $CFG->{$k} = $v unless exists $CFG->{$k};
474} 528}

Diff Legend

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