[ViewVC] Diff of: cvs/deliantra/Deliantra-Client/bin/pclient

Comparing deliantra/Deliantra-Client/bin/pclient (file contents):
Revision 1.98 by root, Fri Apr 14 00:15:52 2006 UTC vs.
Revision 1.105 by root, Fri Apr 14 20:27:36 2006 UTC

…		…
34		34
35	our @SDL_MODES;	35	our @SDL_MODES;
36	our $WIDTH;	36	our $WIDTH;
37	our $HEIGHT;	37	our $HEIGHT;
38	our $FULLSCREEN;	38	our $FULLSCREEN;
		39	our $FONTSIZE;
39		40
40	our $MAP;	41	our $MAP;
41	our $MAPWIDGET;	42	our $MAPWIDGET;
42	our $FONTSIZE;
43		43
44	our $SDL_ACTIVE;	44	our $SDL_ACTIVE;
45	our $SDL_EV;	45	our $SDL_EV;
46	our %SDL_CB;	46	our %SDL_CB;
47		47
48	our $ALT_ENTER_MESSAGE;	48	our $ALT_ENTER_MESSAGE;
49	our $STATUS_LINE;	49	our $STATUS_LINE;
50	our $DEBUG_STATUS;	50	our $DEBUG_STATUS;
51	our $BUTTONBAR;	51	our $BUTTONBAR;
		52	our $LOGVIEW;
		53	our $CONSOLE;
52		54
53	sub status {	55	sub status {
54	$STATUS_LINE->set_text ($_[0]);	56	$STATUS_LINE->set_text ($_[0]);
55	my ($w, $h) = $STATUS_LINE->size_request;	57	my ($w, $h) = $STATUS_LINE->size_request;
56	$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);
…		…
86	sub stop_game {	88	sub stop_game {
87	undef $CONN;	89	undef $CONN;
88	}	90	}
89		91
90	sub config_dialog {	92	sub config_dialog {
91	my $dialog = new CFClient::UI::FancyFrame x => 300, y => 100,	93	my $dialog = new CFClient::UI::FancyFrame
92	child => (my $vbox = new CFClient::UI::VBox);	94	child => (my $vbox = new CFClient::UI::VBox);
93	$vbox->add (new CFClient::UI::Label align => 0, text => "Client Setup");	95	$vbox->add (new CFClient::UI::Label align => 0, text => "Client Setup");
94	$vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]);	96	$vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]);
95		97
96	$table->add (0, 0, new CFClient::UI::Label align => 1, text => "Video Mode");	98	$table->add (0, 0, new CFClient::UI::Label align => 1, text => "Video Mode");
…		…
133		135
134	$table->add (0, 5, new CFClient::UI::Label align => 1, text => "FoW Smooth");	136	$table->add (0, 5, new CFClient::UI::Label align => 1, text => "FoW Smooth");
135	$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 {
136	my ($self, $value) = @_;	138	my ($self, $value) = @_;
137	$CFG->{fow_smooth} = $value;	139	$CFG->{fow_smooth} = $value;
		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);
138	});	146	});
139		147
140	$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 {
141	destroy_screen ();	149	destroy_screen ();
142	init_screen ();	150	init_screen ();
143	});	151	});
144		152
145	$vbox->add (new CFClient::UI::Label align => 0, text => "Server Setup");	153	$vbox->add (new CFClient::UI::Label align => 0, text => "Server Setup");
146	$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]);
147	$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");
148	$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 {
149		157	my ($self, $value) = @_;
		158	$CFG->{host} = $value;
		159	});
		160
150	$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");
151	$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	});
152		166
153	$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");
154	$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	});
155		172
156	$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");
157	$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	});
158		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
159	$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");
160	$table->add (1, 6, new CFClient::UI::Slider	186	$table->add (1, 7, new CFClient::UI::Slider
161	req_w => 100,	187	req_w => 100,
162	range => [$CFG->{mapsize}, 10, 100 + 1, 1],	188	range => [$CFG->{mapsize}, 10, 100 + 1, 1],
163	connect_changed => sub {	189	connect_changed => sub {
164	my ($self, $value) = @_;	190	my ($self, $value) = @_;
165		191
166	$CFG->{mapsize} = $self->{range}[0] = $value = int $value;	192	$CFG->{mapsize} = $self->{range}[0] = $value = int $value;
167	},	193	},
168	);	194	);
169		195
170	$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 {
171	start_game;	197	start_game;
172	});	198	});
173		199
174	$vbox->add (my $hbox = new CFClient::UI::HBox);	200	$vbox->add (my $hbox = new CFClient::UI::HBox);
175		201
…		…
179	});	205	});
180		206
181	$dialog	207	$dialog
182	}	208	}
183		209
		210	sub console_window {
		211	my $window = new CFClient::UI::FancyFrame
		212	border_bg => [1, 1, 1, 0.5],
		213	bg => [0.3, 0.3, 0.3, 0.8],
		214	user_w => $::WIDTH/4,
		215	user_h => $::HEIGHT,
		216	child => (my $vbox = new CFClient::UI::VBox);
		217
		218	$vbox->add ($LOGVIEW = new CFClient::UI::TextView
		219	expand => 1,
		220	fontsize => $::CFG->{log_fontsize},
		221	);
		222
		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	};
		245
		246	$window
		247	}
		248
184	sub sdl_init {	249	sub sdl_init {
185	SDL::Init SDL_INIT_AUDIO \| SDL_INIT_VIDEO \| SDL_INIT_NOPARACHUTE	250	SDL::Init SDL_INIT_AUDIO \| SDL_INIT_VIDEO
186	and die "SDL::Init failed!\n";	251	and die "SDL::Init failed!\n";
187	}	252	}
188		253
189	sub init_screen {	254	sub init_screen {
190	sdl_init;	255	sdl_init;
…		…
225		290
226	$FONTSIZE = int $HEIGHT / 40;	291	$FONTSIZE = int $HEIGHT / 40;
227		292
228	#############################################################################	293	#############################################################################
229		294
230	$DEBUG_STATUS = new CFClient::UI::Label padding => 0;	295	$DEBUG_STATUS = new CFClient::UI::Label padding => 0, z => 100;
231	$CFClient::UI::TOPLEVEL->add ($DEBUG_STATUS);	296	$CFClient::UI::TOPLEVEL->add ($DEBUG_STATUS);
232		297
233	$STATUS_LINE = new CFClient::UI::Label	298	$STATUS_LINE = new CFClient::UI::Label
234	padding => 0,	299	padding => 0,
235	y => $HEIGHT * 49 / 50 - $FONTSIZE;	300	y => $HEIGHT * 44 / 45 - $FONTSIZE;
236	$CFClient::UI::TOPLEVEL->add ($STATUS_LINE);	301	$CFClient::UI::TOPLEVEL->add ($STATUS_LINE);
237		302
238	$ALT_ENTER_MESSAGE = new CFClient::UI::Label	303	$ALT_ENTER_MESSAGE = new CFClient::UI::Label
239	padding => 0,	304	padding => 0,
240	y => $HEIGHT * 49 / 50,	305	y => $HEIGHT * 44 / 45,
241	height => $HEIGHT / 50,	306	height => $HEIGHT / 45,
242	text => "Use <b>Alt-Enter</b> to toggle fullscreen mode";	307	text => "Use <b>Alt-Enter</b> to toggle fullscreen mode";
243	$CFClient::UI::TOPLEVEL->add ($ALT_ENTER_MESSAGE);	308	$CFClient::UI::TOPLEVEL->add ($ALT_ENTER_MESSAGE);
244		309
245	$CFClient::UI::TOPLEVEL->add ($MAPWIDGET = new CFClient::UI::MapWidget);	310	$CFClient::UI::TOPLEVEL->add ($MAPWIDGET = new CFClient::UI::MapWidget);
246	$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	});
247		323
248	$CFClient::UI::TOPLEVEL->add ($BUTTONBAR = new CFClient::UI::HBox);	324	$CFClient::UI::TOPLEVEL->add ($BUTTONBAR = new CFClient::UI::HBox);
249		325
250	$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);
		327	$BUTTONBAR->add (my $setup = new CFClient::UI::Flopper x => 0, y => 0, text => "Console", other => console_window);
251	}	328	}
252		329
253	sub destroy_screen {	330	sub destroy_screen {
254	$CFClient::UI::TOPLEVEL->{children} = [];	331	$CFClient::UI::TOPLEVEL->{children} = [];
255	undef $SDL_ACTIVE;	332	undef $SDL_ACTIVE;
…		…
269	$fps = $fps * 0.95 + 1 / ($NOW - $LAST_REFRESH) * 0.05;	346	$fps = $fps * 0.95 + 1 / ($NOW - $LAST_REFRESH) * 0.05;
270	debug sprintf "%3.2f", $fps;	347	debug sprintf "%3.2f", $fps;
271		348
272	$want_refresh = 0;	349	$want_refresh = 0;
273	$can_refresh = 0;	350	$can_refresh = 0;
274
275	glViewport 0, 0, $WIDTH, $HEIGHT;
276
277	glMatrixMode GL_PROJECTION;
278	glLoadIdentity;
279	glOrtho 0, $WIDTH, $HEIGHT, 0, -10000 , 10000;
280	glMatrixMode GL_MODELVIEW;
281	glLoadIdentity;
282
283	glClearColor +($CFG->{fow_intensity}) x 3, 1;
284	glClear GL_COLOR_BUFFER_BIT;
285		351
286	$CFClient::UI::TOPLEVEL->draw;	352	$CFClient::UI::TOPLEVEL->draw;
287		353
288	SDL::GLSwapBuffers;	354	SDL::GLSwapBuffers;
289		355
…		…
373	}	439	}
374		440
375	sub conn::query {	441	sub conn::query {
376	my ($self, $flags, $prompt) = @_;	442	my ($self, $flags, $prompt) = @_;
377		443
		444	#TODO
378	warn "<<<<QUERY:$flags:$prompt>>>\n";#d#	445	warn "<<<<QUERY:$flags:$prompt>>>\n";#d#
		446	}
		447
		448	sub conn::drawinfo {
		449	my ($self, $color, $text) = @_;
		450
		451	my @color = (
		452	[1.00, 1.00, 1.00], #[0.00, 0.00, 0.00],
		453	[1.00, 1.00, 1.00],
		454	[0.00, 0.00, 0.55],
		455	[1.00, 0.00, 0.00],
		456	[1.00, 0.54, 0.00],
		457	[0.11, 0.56, 1.00],
		458	[0.93, 0.46, 0.00],
		459	[0.18, 0.54, 0.34],
		460	[0.56, 0.73, 0.56],
		461	[0.80, 0.80, 0.80],
		462	[0.55, 0.41, 0.13],
		463	[0.99, 0.77, 0.26],
		464	[0.74, 0.65, 0.41],
		465	);
		466
		467	$LOGVIEW->add_paragraph ($color[$color], $text);
379	}	468	}
380		469
381	%SDL_CB = (	470	%SDL_CB = (
382	SDL_QUIT() => sub {	471	SDL_QUIT() => sub {
383	Event::unloop -1;	472	Event::unloop -1;
…		…
388	refresh;	477	refresh;
389	},	478	},
390	SDL_KEYDOWN() => sub {	479	SDL_KEYDOWN() => sub {
391	if ($SDL_EV->key_mod & KMOD_ALT && $SDL_EV->key_sym == SDLK_RETURN) {	480	if ($SDL_EV->key_mod & KMOD_ALT && $SDL_EV->key_sym == SDLK_RETURN) {
392	# alt-enter	481	# alt-enter
393	$FULLSCREEN = !$FULLSCREEN;
394	destroy_screen;	482	destroy_screen;
		483	$CFG->{fullscreen} = !$CFG->{fullscreen};
395	init_screen;	484	init_screen;
396	} else {	485	} else {
397	CFClient::UI::feed_sdl_key_down_event ($SDL_EV);	486	CFClient::UI::feed_sdl_key_down_event ($SDL_EV);
398	}	487	}
399	},	488	},
…		…
417	#############################################################################	506	#############################################################################
418		507
419	CFClient::read_cfg "$Crossfire::VARDIR/pclientrc";	508	CFClient::read_cfg "$Crossfire::VARDIR/pclientrc";
420		509
421	my %DEF_CFG = (	510	my %DEF_CFG = (
		511	sdl_mode => 0,
422	width => 640,	512	width => 640,
423	height => 480,	513	height => 480,
		514	fullscreen => 0,
424	fast => 0,	515	fast => 0,
425	fow_enable => 1,	516	fow_enable => 1,
426	fow_intensity => 0.45,	517	fow_intensity => 0.45,
427	fow_smooth => 0,	518	fow_smooth => 0,
428	fullscreen => 0,	519	log_fontsize => 14,
429	sdl_mode => 0,
430	mapsize => 100,	520	mapsize => 100,
431	host => "crossfire.schmorp.de",	521	host => "crossfire.schmorp.de",
432	port => 13327,	522	port => 13327,
		523	say_command => 'say',
433	);	524	);
434		525
435	while (my ($k, $v) = each %DEF_CFG) {	526	while (my ($k, $v) = each %DEF_CFG) {
436	$CFG->{$k} = $v unless exists $CFG->{$k};	527	$CFG->{$k} = $v unless exists $CFG->{$k};
437	}	528	}

Diff Legend

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

Comparing deliantra/Deliantra-Client/bin/pclient (file contents): Revision 1.98 by root, Fri Apr 14 00:15:52 2006 UTC vs. Revision 1.105 by root, Fri Apr 14 20:27:36 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/bin/pclient (file contents):
Revision 1.98 by root, Fri Apr 14 00:15:52 2006 UTC vs.
Revision 1.105 by root, Fri Apr 14 20:27:36 2006 UTC