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

Comparing deliantra/Deliantra-Client/bin/pclient (file contents):
Revision 1.90 by root, Wed Apr 12 21:35:11 2006 UTC vs.
Revision 1.108 by root, Sat Apr 15 01:13:47 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
		41	our $MAP;
40	our $MAPWIDGET;	42	our $MAPWIDGET;
41	our $FONTSIZE;
42		43
43	our $SDL_ACTIVE;	44	our $SDL_ACTIVE;
44	our $SDL_EV;	45	our $SDL_EV;
45	our %SDL_CB;	46	our %SDL_CB;
46		47
47	our $ALT_ENTER_MESSAGE;	48	our $ALT_ENTER_MESSAGE;
48	our $STATUS_LINE;	49	our $STATUS_LINE;
49	our $DEBUG_STATUS;	50	our $DEBUG_STATUS;
		51	our $BUTTONBAR;
		52	our $LOGVIEW;
		53	our $CONSOLE;
50		54
51	sub status {	55	sub status {
52	$STATUS_LINE->set_text ($_[0]);	56	$STATUS_LINE->set_text ($_[0]);
53	my ($w, $h) = $STATUS_LINE->size_request;	57	my ($w, $h) = $STATUS_LINE->size_request;
54	$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);
…		…
61	}	65	}
62		66
63	sub start_game {	67	sub start_game {
64	status "logging in...";	68	status "logging in...";
65		69
66	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;
67		71
		72	$MAP = new CFClient::Map $mapsize, $mapsize;
		73
68	$CONN = new conn	74	$CONN = new conn
69	host => $CFG->{host},	75	host => $CFG->{host},
70	port => $CFG->{port},	76	port => $CFG->{port},
71	user => $CFG->{user},	77	user => $CFG->{user},
72	pass => $CFG->{password},	78	pass => $CFG->{password},
…		…
82	sub stop_game {	88	sub stop_game {
83	undef $CONN;	89	undef $CONN;
84	}	90	}
85		91
86	sub config_dialog {	92	sub config_dialog {
87	my $dialog = new CFClient::UI::FancyFrame x => 300, y => 100,	93	my $dialog = new CFClient::UI::FancyFrame
88	child => (my $vbox = new CFClient::UI::VBox);	94	child => (my $vbox = new CFClient::UI::VBox);
89	$vbox->add (new CFClient::UI::Label align => 0, text => "Client Setup");	95	$vbox->add (new CFClient::UI::Label align => 0, text => "Client Setup");
90	$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]);
91		97
92	$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");
…		…
113	$table->add (1, 2, new CFClient::UI::CheckBox state => $CFG->{fast}, connect_changed => sub {	119	$table->add (1, 2, new CFClient::UI::CheckBox state => $CFG->{fast}, connect_changed => sub {
114	my ($self, $value) = @_;	120	my ($self, $value) = @_;
115	$CFG->{fast} = $value;	121	$CFG->{fast} = $value;
116	});	122	});
117		123
118	$table->add (0, 2, new CFClient::UI::Label align => 1, text => "Fog of War");	124	$table->add (0, 3, new CFClient::UI::Label align => 1, text => "Fog of War");
		125	$table->add (1, 3, new CFClient::UI::CheckBox state => $CFG->{fow_enable}, connect_changed => sub {
		126	my ($self, $value) = @_;
		127	$CFG->{fow_enable} = $value;
		128	});
		129
		130	$table->add (0, 4, new CFClient::UI::Label align => 1, text => "FoW Intensity");
119	$table->add (1, 2, new CFClient::UI::Slider range => [$CFG->{fow_intensity}, 0, 1 + 0.001, 0.001], connect_changed => sub {	131	$table->add (1, 4, new CFClient::UI::Slider range => [$CFG->{fow_intensity}, 0, 1 + 0.001, 0.001], connect_changed => sub {
120	my ($self, $value) = @_;	132	my ($self, $value) = @_;
121	$CFG->{fow_intensity} = $value;	133	$CFG->{fow_intensity} = $value;
122	});	134	});
123		135
		136	$table->add (0, 5, new CFClient::UI::Label align => 1, text => "FoW Smooth");
		137	$table->add (1, 5, new CFClient::UI::CheckBox state => $CFG->{fow_smooth}, connect_changed => sub {
		138	my ($self, $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);
		146	});
		147
124	$table->add (1, 4, 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 {
125	destroy_screen ();	149	destroy_screen ();
126	init_screen ();	150	init_screen ();
127	});	151	});
128		152
129	$vbox->add (new CFClient::UI::Label align => 0, text => "Server Setup");	153	$vbox->add (new CFClient::UI::Label align => 0, text => "Server Setup");
130	$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]);
131	$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");
132	$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 {
133		157	my ($self, $value) = @_;
		158	$CFG->{host} = $value;
		159	});
		160
134	$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");
135	$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	});
136		166
137	$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");
138	$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	});
139		172
140	$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");
141	$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	});
142		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
143	$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");
144	$table->add (1, 6, new CFClient::UI::Slider	186	$table->add (1, 7, new CFClient::UI::Slider
145	req_w => 100,	187	req_w => 100,
146	range => [$CFG->{mapsize}, 10, 100 + 1, 1],	188	range => [$CFG->{mapsize}, 10, 100 + 1, 1],
147	connect_changed => sub {	189	connect_changed => sub {
148	my ($self, $value) = @_;	190	my ($self, $value) = @_;
149		191
150	$CFG->{mapsize} = $self->{range}[0] = $value = int $value;	192	$CFG->{mapsize} = $self->{range}[0] = $value = int $value;
151	},	193	},
152	);	194	);
153		195
154	$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 {
155	start_game;	197	start_game;
156	});	198	});
157		199
158	$vbox->add (my $hbox = new CFClient::UI::HBox);	200	$vbox->add (my $hbox = new CFClient::UI::HBox);
159		201
160	$hbox->add (new CFClient::UI::Button expand => 1, align => 0, text => "Save", connect_activate => sub {	202	$hbox->add (new CFClient::UI::Button expand => 1, align => 0, text => "Save", connect_activate => sub {
161	CFClient::write_cfg "$Crossfire::VARDIR/pclientrc";	203	CFClient::write_cfg "$Crossfire::VARDIR/pclientrc";
162	status "Configuration Saved";	204	status "Configuration Saved";
163	});	205	});
164	$CFClient::UI::TOPLEVEL->add ($dialog);	206
		207	$dialog
		208	}
		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
165	}	247	}
166		248
167	sub sdl_init {	249	sub sdl_init {
		250	SDL::Init SDL_INIT_AUDIO \| SDL_INIT_VIDEO \| SDL_INIT_NOPARACHUTE
168	SDL::Init SDL_INIT_TIMER \| SDL_INIT_AUDIO \| SDL_INIT_VIDEO	251	#SDL::Init SDL_INIT_AUDIO \| SDL_INIT_VIDEO
169	and die "SDL::Init failed!\n";	252	and die "SDL::Init failed!\n";
170	}	253	}
171		254
172	sub init_screen {	255	sub init_screen {
173	sdl_init;	256	sdl_init;
…		…
208		291
209	$FONTSIZE = int $HEIGHT / 40;	292	$FONTSIZE = int $HEIGHT / 40;
210		293
211	#############################################################################	294	#############################################################################
212		295
213	$DEBUG_STATUS = new CFClient::UI::Label padding => 0;	296	$DEBUG_STATUS = new CFClient::UI::Label padding => 0, z => 100;
214	$CFClient::UI::TOPLEVEL->add ($DEBUG_STATUS);	297	$CFClient::UI::TOPLEVEL->add ($DEBUG_STATUS);
215		298
216	$STATUS_LINE = new CFClient::UI::Label	299	$STATUS_LINE = new CFClient::UI::Label
217	padding => 0,	300	padding => 0,
218	y => $HEIGHT * 49 / 50 - $FONTSIZE;	301	y => $HEIGHT * 44 / 45 - $FONTSIZE;
219	$CFClient::UI::TOPLEVEL->add ($STATUS_LINE);	302	$CFClient::UI::TOPLEVEL->add ($STATUS_LINE);
220		303
221	$ALT_ENTER_MESSAGE = new CFClient::UI::Label	304	$ALT_ENTER_MESSAGE = new CFClient::UI::Label
222	padding => 0,	305	padding => 0,
223	y => $HEIGHT * 49 / 50,	306	y => $HEIGHT * 44 / 45,
224	height => $HEIGHT / 50,	307	height => $HEIGHT / 45,
225	text => "Use <b>Alt-Enter</b> to toggle fullscreen mode";	308	text => "Use <b>Alt-Enter</b> to toggle fullscreen mode";
226	$CFClient::UI::TOPLEVEL->add ($ALT_ENTER_MESSAGE);	309	$CFClient::UI::TOPLEVEL->add ($ALT_ENTER_MESSAGE);
227		310
228	$MAPWIDGET = new CFClient::UI::MapWidget;
229	$CFClient::UI::TOPLEVEL->add ($MAPWIDGET);	311	$CFClient::UI::TOPLEVEL->add ($MAPWIDGET = new CFClient::UI::MapWidget);
230	$MAPWIDGET->focus_in;	312	$MAPWIDGET->focus_in;
		313	$MAPWIDGET->connect (activate_console => sub {
		314	my ($mapwidget, $preset) = @_;
231		315
232	config_dialog;	316	if ($CONSOLE) {
		317	$CONSOLE->{input}->focus_in;
		318
		319	if ($preset && $CONSOLE->{input}->get_text eq '') {
		320	$CONSOLE->{input}->set_text ($preset);
		321	}
		322	}
		323	});
		324
		325	$CFClient::UI::TOPLEVEL->add ($BUTTONBAR = new CFClient::UI::HBox);
		326
		327	$BUTTONBAR->add (my $setup = new CFClient::UI::Flopper x => 0, y => 0, text => "Setup", other => config_dialog, state => 1);
		328	$BUTTONBAR->add (my $setup = new CFClient::UI::Flopper x => 0, y => 0, text => "Console", other => console_window);
233	}	329	}
234		330
235	sub destroy_screen {	331	sub destroy_screen {
236	$CFClient::UI::TOPLEVEL->{children} = [];	332	$CFClient::UI::TOPLEVEL->{children} = [];
237	undef $SDL_ACTIVE;	333	undef $SDL_ACTIVE;
…		…
251	$fps = $fps * 0.95 + 1 / ($NOW - $LAST_REFRESH) * 0.05;	347	$fps = $fps * 0.95 + 1 / ($NOW - $LAST_REFRESH) * 0.05;
252	debug sprintf "%3.2f", $fps;	348	debug sprintf "%3.2f", $fps;
253		349
254	$want_refresh = 0;	350	$want_refresh = 0;
255	$can_refresh = 0;	351	$can_refresh = 0;
256
257	glViewport 0, 0, $WIDTH, $HEIGHT;
258
259	glMatrixMode GL_PROJECTION;
260	glLoadIdentity;
261	glOrtho 0, $WIDTH, $HEIGHT, 0, -10000 , 10000;
262	glMatrixMode GL_MODELVIEW;
263	glLoadIdentity;
264
265	glClearColor +($CFG->{fow_intensity}) x 3, 1;
266	glClear GL_COLOR_BUFFER_BIT;
267		352
268	$CFClient::UI::TOPLEVEL->draw;	353	$CFClient::UI::TOPLEVEL->draw;
269		354
270	SDL::GLSwapBuffers;	355	SDL::GLSwapBuffers;
271		356
…		…
311		396
312	$self->send ($command);	397	$self->send ($command);
313	status $command;	398	status $command;
314	}	399	}
315		400
316	sub conn::map_update {	401	sub conn::feed_map1a {
317	my ($self, $dirty) = @_;	402	my ($self, $data) = @_;
318		403
		404	# $self->Crossfire::Protocol::feed_map1a ($data);
		405
		406	$MAP->scroll (delete $self->{delayed_scroll_x}, delete $self->{delayed_scroll_y});
		407	$MAP->map1a_update ($data);
319	$MAPWIDGET->update;	408	$MAPWIDGET->update;
320	}	409	}
321		410
322	sub conn::map_scroll {	411	#sub conn::map_update {
323	my ($self, $dx, $dy) = @_;	412	# my ($self, $dirty) = @_;
324		413	#
325	# refresh;	414	# $MAPWIDGET->update;
326	}	415	#}
327		416
328	sub conn::map_clear {	417	sub conn::map_clear {
329	my ($self) = @_;	418	my ($self) = @_;
330		419
		420	$MAP->clear;
		421
331	# refresh;	422	# refresh;
332	}	423	}
333		424
334	sub conn::face_find {	425	sub conn::face_find {
335	my ($self, $face) = @_;	426	my ($self, $face) = @_;
336		427
337	$FACECACHE->{"$face->{chksum},$face->{name}"}	428	$FACECACHE->{"$face->{chksum},$face->{name}"}
338	}	429	}
339		430
340	sub conn::face_update {	431	sub conn::face_update {
341	my ($self, $face) = @_;	432	my ($self, $facenum, $face) = @_;
342		433
343	$FACECACHE->{"$face->{chksum},$face->{name}"} = $face->{image};	434	$FACECACHE->{"$face->{chksum},$face->{name}"} = $face->{image};
344		435
345	$face->{texture} = new_from_image CFClient::Texture delete $face->{image};	436	my $tex = $face->{texture} =
		437	new_from_image CFClient::Texture
		438	delete $face->{image}, minify => 1;
		439
		440	$MAP->set_texture ($facenum, @$tex{qw(name w h s t)}, @{$tex->{minified}});
		441	$MAPWIDGET->update;
346	}	442	}
347		443
348	sub conn::query {	444	sub conn::query {
349	my ($self, $flags, $prompt) = @_;	445	my ($self, $flags, $prompt) = @_;
350		446
		447	#TODO
351	warn "<<<<QUERY:$flags:$prompt>>>\n";#d#	448	warn "<<<<QUERY:$flags:$prompt>>>\n";#d#
		449	}
		450
		451	sub conn::drawinfo {
		452	my ($self, $color, $text) = @_;
		453
		454	my @color = (
		455	[1.00, 1.00, 1.00], #[0.00, 0.00, 0.00],
		456	[1.00, 1.00, 1.00],
		457	[0.00, 0.00, 0.55],
		458	[1.00, 0.00, 0.00],
		459	[1.00, 0.54, 0.00],
		460	[0.11, 0.56, 1.00],
		461	[0.93, 0.46, 0.00],
		462	[0.18, 0.54, 0.34],
		463	[0.56, 0.73, 0.56],
		464	[0.80, 0.80, 0.80],
		465	[0.55, 0.41, 0.13],
		466	[0.99, 0.77, 0.26],
		467	[0.74, 0.65, 0.41],
		468	);
		469
		470	$LOGVIEW->add_paragraph ($color[$color], $text);
352	}	471	}
353		472
354	%SDL_CB = (	473	%SDL_CB = (
355	SDL_QUIT() => sub {	474	SDL_QUIT() => sub {
356	Event::unloop -1;	475	Event::unloop -1;
…		…
361	refresh;	480	refresh;
362	},	481	},
363	SDL_KEYDOWN() => sub {	482	SDL_KEYDOWN() => sub {
364	if ($SDL_EV->key_mod & KMOD_ALT && $SDL_EV->key_sym == SDLK_RETURN) {	483	if ($SDL_EV->key_mod & KMOD_ALT && $SDL_EV->key_sym == SDLK_RETURN) {
365	# alt-enter	484	# alt-enter
366	$FULLSCREEN = !$FULLSCREEN;
367	destroy_screen;	485	destroy_screen;
		486	$CFG->{fullscreen} = !$CFG->{fullscreen};
368	init_screen;	487	init_screen;
369	} else {	488	} else {
370	CFClient::UI::feed_sdl_key_down_event ($SDL_EV);	489	CFClient::UI::feed_sdl_key_down_event ($SDL_EV);
371	}	490	}
372	},	491	},
…		…
390	#############################################################################	509	#############################################################################
391		510
392	CFClient::read_cfg "$Crossfire::VARDIR/pclientrc";	511	CFClient::read_cfg "$Crossfire::VARDIR/pclientrc";
393		512
394	my %DEF_CFG = (	513	my %DEF_CFG = (
		514	sdl_mode => 0,
395	width => 640,	515	width => 640,
396	height => 480,	516	height => 480,
		517	fullscreen => 0,
397	fast => 0,	518	fast => 0,
		519	fow_enable => 1,
398	fow_intensity => 0.45,	520	fow_intensity => 0.45,
399	fullscreen => 0,	521	fow_smooth => 0,
400	sdl_mode => 0,	522	log_fontsize => 14,
401	mapsize => 100,	523	mapsize => 100,
402	host => "crossfire.schmorp.de",	524	host => "crossfire.schmorp.de",
403	port => 13327,	525	port => 13327,
		526	say_command => 'say',
404	);	527	);
405		528
406	while (my ($k, $v) = each %DEF_CFG) {	529	while (my ($k, $v) = each %DEF_CFG) {
407	$CFG->{$k} = $v unless exists $CFG->{$k};	530	$CFG->{$k} = $v unless exists $CFG->{$k};
408	}	531	}
409		532
410	sdl_init;	533	sdl_init;
411		534
412	@SDL_MODES = reverse map [SDL::RectW ($_), SDL::RectH ($_)],	535	@SDL_MODES = reverse
		536	grep $_->[0] >= 640 && $_->[1] >= 480,
		537	map [SDL::RectW ($_), SDL::RectH ($_)],
413	@{ SDL::ListModes 0, SDL_FULLSCREEN \| SDL_HWSURFACE \| SDL_OPENGL };	538	@{ SDL::ListModes 0, SDL_FULLSCREEN \| SDL_HWSURFACE \| SDL_OPENGL };
414		539
415	@SDL_MODES or CFClient::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)";	540	@SDL_MODES or CFClient::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)";
416		541
417	$CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES;	542	$CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES;
418		543

Diff Legend

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

Comparing deliantra/Deliantra-Client/bin/pclient (file contents): Revision 1.90 by root, Wed Apr 12 21:35:11 2006 UTC vs. Revision 1.108 by root, Sat Apr 15 01:13:47 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/bin/pclient (file contents):
Revision 1.90 by root, Wed Apr 12 21:35:11 2006 UTC vs.
Revision 1.108 by root, Sat Apr 15 01:13:47 2006 UTC