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

Comparing deliantra/Deliantra-Client/bin/pclient (file contents):
Revision 1.96 by root, Thu Apr 13 23:11:11 2006 UTC vs.
Revision 1.125 by elmex, Mon Apr 17 20:29:37 2006 UTC

…		…
13	use SDL::OpenGL;	13	use SDL::OpenGL;
14		14
15	use Crossfire;	15	use Crossfire;
16	use Crossfire::Protocol;	16	use Crossfire::Protocol;
17		17
		18	use Compress::LZF;
		19
18	use CFClient;	20	use CFClient;
19	use CFClient::UI;	21	use CFClient::UI;
20		22
21	our $VERSION = '0.1';	23	our $VERSION = '0.1';
22		24
23	my $MAX_FPS = 60;	25	my $MAX_FPS = 60;
24	my $MIN_FPS = 5; # unused as of yet	26	my $MIN_FPS = 5; # unused as of yet
25		27
		28	our $META_SERVER = "crossfire.real-time.com:13326";
		29
		30	our $FACEMAP;
		31	our $TILECACHE;
26	our $FACECACHE;	32	our $MAPCACHE;
27		33
28	our $LAST_REFRESH;	34	our $LAST_REFRESH;
29	our $NOW;	35	our $NOW;
30		36
31	our $CFG;	37	our $CFG;
…		…
34		40
35	our @SDL_MODES;	41	our @SDL_MODES;
36	our $WIDTH;	42	our $WIDTH;
37	our $HEIGHT;	43	our $HEIGHT;
38	our $FULLSCREEN;	44	our $FULLSCREEN;
		45	our $FONTSIZE;
39		46
40	our $MAP;	47	our $MAP;
41	our $MAPWIDGET;	48	our $MAPWIDGET;
42	our $FONTSIZE;	49	our $BUTTONBAR;
		50	our $LOGVIEW;
		51	our $CONSOLE;
		52	our $METASERVER;
		53
		54	our $GAUGES;
43		55
44	our $SDL_ACTIVE;	56	our $SDL_ACTIVE;
45	our $SDL_EV;	57	our $SDL_EV;
46	our %SDL_CB;	58	our %SDL_CB;
47		59
…		…
62	}	74	}
63		75
64	sub start_game {	76	sub start_game {
65	status "logging in...";	77	status "logging in...";
66		78
67	my $mapsize = List::Util::min 64, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32;	79	my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32;
		80
		81	$MAPCACHE = CFClient::db_table "mapcache_$CFG->{host}";
68		82
69	$MAP = new CFClient::Map $mapsize, $mapsize;	83	$MAP = new CFClient::Map $mapsize, $mapsize;
		84
		85	my ($host, $port) = split /:/, $CFG->{host};
70		86
71	$CONN = new conn	87	$CONN = new conn
72	host => $CFG->{host},	88	host => $host,
73	port => $CFG->{port},	89	port => $port \|\| 13327,
74	user => $CFG->{user},	90	user => $CFG->{user},
75	pass => $CFG->{password},	91	pass => $CFG->{password},
76	mapw => $mapsize,	92	mapw => $mapsize,
77	maph => $mapsize,	93	maph => $mapsize,
78	;	94	;
…		…
84		100
85	sub stop_game {	101	sub stop_game {
86	undef $CONN;	102	undef $CONN;
87	}	103	}
88		104
89	sub config_dialog {	105	sub client_setup {
90	my $dialog = new CFClient::UI::FancyFrame x => 300, y => 100,	106	my $dialog = new CFClient::UI::FancyFrame
91	child => (my $vbox = new CFClient::UI::VBox);	107	child => (my $vbox = new CFClient::UI::VBox);
92	$vbox->add (new CFClient::UI::Label align => 0, text => "Client Setup");	108	$vbox->add (new CFClient::UI::Label align => 0, text => "Client Setup");
93	$vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]);	109	$vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]);
94		110
95	$table->add (0, 0, new CFClient::UI::Label align => 1, text => "Video Mode");	111	$table->add (0, 0, new CFClient::UI::Label align => 1, text => "Video Mode");
…		…
117	my ($self, $value) = @_;	133	my ($self, $value) = @_;
118	$CFG->{fast} = $value;	134	$CFG->{fast} = $value;
119	});	135	});
120		136
121	$table->add (0, 3, new CFClient::UI::Label align => 1, text => "Fog of War");	137	$table->add (0, 3, new CFClient::UI::Label align => 1, text => "Fog of War");
		138	$table->add (1, 3, new CFClient::UI::CheckBox state => $CFG->{fow_enable}, connect_changed => sub {
		139	my ($self, $value) = @_;
		140	$CFG->{fow_enable} = $value;
		141	});
		142
		143	$table->add (0, 4, new CFClient::UI::Label align => 1, text => "FoW Intensity");
122	$table->add (1, 3, new CFClient::UI::Slider range => [$CFG->{fow_intensity}, 0, 1 + 0.001, 0.001], connect_changed => sub {	144	$table->add (1, 4, new CFClient::UI::Slider range => [$CFG->{fow_intensity}, 0, 1 + 0.001, 0.001], connect_changed => sub {
123	my ($self, $value) = @_;	145	my ($self, $value) = @_;
124	$CFG->{fow_intensity} = $value;	146	$CFG->{fow_intensity} = $value;
125	});	147	});
126		148
127	$table->add (0, 4, new CFClient::UI::Label align => 1, text => "Smooth FoW");	149	$table->add (0, 5, new CFClient::UI::Label align => 1, text => "FoW Smooth");
128	$table->add (1, 4, new CFClient::UI::CheckBox state => $CFG->{fow_smooth}, connect_changed => sub {	150	$table->add (1, 5, new CFClient::UI::CheckBox state => $CFG->{fow_smooth}, connect_changed => sub {
129	my ($self, $value) = @_;	151	my ($self, $value) = @_;
130	$CFG->{fow_smooth} = $value;	152	$CFG->{fow_smooth} = $value;
131	});	153	});
132		154
		155	$table->add (0, 6, new CFClient::UI::Label align => 1, text => "Log Fontsize");
		156	$table->add (1, 6, new CFClient::UI::Slider range => [$CFG->{log_fontsize}, 8, 30, 1], connect_changed => sub {
		157	my ($self, $value) = @_;
		158	$LOGVIEW->set_fontsize ($CFG->{log_fontsize} = int $value);
		159	});
		160
133	$table->add (1, 5, new CFClient::UI::Button expand => 1, align => 0, text => "Apply", connect_activate => sub {	161	$table->add (1, 7, new CFClient::UI::Button expand => 1, align => 0, text => "Apply", connect_activate => sub {
134	destroy_screen ();	162	destroy_screen ();
135	init_screen ();	163	init_screen ();
136	});	164	});
		165
		166	$dialog
		167	}
		168
		169	sub metaserver_dialog {
		170	my $dialog = new CFClient::UI::FancyFrame
		171	child => (my $vbox = new CFClient::UI::VBox);
		172
		173	$vbox->add ($dialog->{table} = new CFClient::UI::Table);
		174
		175	$dialog
		176	}
		177
		178	sub update_metaserver {
		179	my ($HOST) = @_;
		180
		181	status "fetching metaserver list...";
		182
		183	my $buf;
		184
		185	my $fh = new IO::Socket::INET PeerHost => $META_SERVER, Blocking => 0;
		186
		187	Event->io (fd => $fh, poll => 'r', cb => sub {
		188	my $res = sysread $fh, $buf, 8192, length $buf;
		189
		190	if (!defined $res) {
		191	$_[0]->w->cancel;
		192	status "metaserver: $!";
		193	} elsif ($res == 0) {
		194	$_[0]->w->cancel;
		195	status "server list retrieved";
		196
		197	my $table = $METASERVER->{table};
		198
		199	$table->clear;
		200
		201	my @col = qw(Use #Users Host Uptime Version Description);
		202	$table->add ($_, 0, new CFClient::UI::Label align => 0, fg => [1, 1, 0], text => $col[$_])
		203	for 0 .. $#col;
		204
		205	my @align = qw(1 0 1 1 -1);
		206
		207	my $y = 0;
		208	for my $m (sort { $b->[3] <=> $a->[3] } map [split /\\|/], split /\015?\012/, $buf) {
		209	my ($ip, $last, $host, $users, $version, $desc, $ibytes, $obytes, $uptime) = @$m;
		210
		211	for ($desc) {
		212	s/<br>/\n/gi;
		213	s/<li>/\n· /gi;
		214	s/<.*?>//sgi;
		215	s/&/&/g;
		216	s/</</g;
		217	s/>/>/g;
		218	}
		219
		220	$uptime = sprintf "%dd %02d:%02d:%02d",
		221	(int $m->[8] / 86400),
		222	(int $m->[8] / 3600) % 24,
		223	(int $m->[8] / 60) % 60,
		224	$m->[8] % 60;
		225
		226	$m = [$users, $host, $uptime, $version, $desc];
		227
		228	$y++;
		229
		230	$table->add (0, $y, new CFClient::UI::VBox children => [
		231	(new CFClient::UI::Button text => " ", connect_activate => sub {
		232	$HOST->set_text ($CFG->{host} = $host);
		233	}),
		234	(new CFClient::UI::Empty expand => 1),
		235	]);
		236
		237	$table->add ($_ + 1, $y, new CFClient::UI::Label align => $align[$_], text => $m->[$_], fontsize => $FONTSIZE * 0.8)
		238	for 0 .. $#$m;
		239	}
		240	}
		241	});
		242	}
		243
		244	sub server_setup {
		245	my $dialog = new CFClient::UI::FancyFrame
		246	child => (my $vbox = new CFClient::UI::VBox);
137		247
138	$vbox->add (new CFClient::UI::Label align => 0, text => "Server Setup");	248	$vbox->add (new CFClient::UI::Label align => 0, text => "Server Setup");
139	$vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]);	249	$vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]);
140	$table->add (0, 2, new CFClient::UI::Label align => 1, text => "Host");	250	$table->add (0, 2, new CFClient::UI::Label align => 1, text => "Host:Port");
141	$table->add (1, 2, my $host = new CFClient::UI::Entry text => $CFG->{host});	251
142		252	{
143	$table->add (0, 3, new CFClient::UI::Label align => 1, text => "Port");	253	$table->add (1, 2, my $vbox = new CFClient::UI::VBox);
144	$table->add (1, 3, my $port = new CFClient::UI::Entry text => $CFG->{port});	254
		255	$vbox->add (my $HOST = new CFClient::UI::Entry text => $CFG->{host}, connect_changed => sub {
		256	my ($self, $value) = @_;
		257	$CFG->{host} = $value;
		258	});
		259
		260	$METASERVER = metaserver_dialog;
		261
		262	$vbox->add (new CFClient::UI::Flopper text => "Metaserver", other => $METASERVER, connect_open => sub {
		263	update_metaserver $HOST;
		264	});
		265	}
145		266
146	$table->add (0, 4, new CFClient::UI::Label align => 1, text => "Username");	267	$table->add (0, 4, new CFClient::UI::Label align => 1, text => "Username");
147	$table->add (1, 4, my $user = new CFClient::UI::Entry text => $CFG->{user});	268	$table->add (1, 4, new CFClient::UI::Entry text => $CFG->{user}, connect_changed => sub {
		269	my ($self, $value) = @_;
		270	$CFG->{user} = $value;
		271	});
148		272
149	$table->add (0, 5, new CFClient::UI::Label align => 1, text => "Password");	273	$table->add (0, 5, new CFClient::UI::Label align => 1, text => "Password");
150	$table->add (1, 5, my $pass = new CFClient::UI::Entry text => $CFG->{password}, hidden => 1);	274	$table->add (1, 5, new CFClient::UI::Entry text => $CFG->{password}, hidden => 1, connect_changed => sub {
		275	my ($self, $value) = @_;
		276	$CFG->{password} = $value;
		277	});
151		278
		279	$table->add (0, 6, new CFClient::UI::Label align => 1, text => "Def. say cmd");
		280	$table->add (1, 6, my $saycmd = new CFClient::UI::Entry text => $CFG->{say_command}, connect_changed => sub {
		281	my ($self, $value) = @_;
		282	$CFG->{say_command} = $value;
		283	});
		284
152	$table->add (0, 6, new CFClient::UI::Label align => 1, text => "Map Size");	285	$table->add (0, 7, new CFClient::UI::Label align => 1, text => "Map Size");
153	$table->add (1, 6, new CFClient::UI::Slider	286	$table->add (1, 7, new CFClient::UI::Slider
154	req_w => 100,	287	req_w => 100,
155	range => [$CFG->{mapsize}, 10, 100 + 1, 1],	288	range => [$CFG->{mapsize}, 10, 100 + 1, 1],
156	connect_changed => sub {	289	connect_changed => sub {
157	my ($self, $value) = @_;	290	my ($self, $value) = @_;
158		291
159	$CFG->{mapsize} = $self->{range}[0] = $value = int $value;	292	$CFG->{mapsize} = $self->{range}[0] = $value = int $value;
160	},	293	},
161	);	294	);
162		295
163	$table->add (1, 7, new CFClient::UI::Button expand => 1, align => 0, text => "Login", connect_activate => sub {	296	$table->add (1, 8, new CFClient::UI::Button expand => 1, align => 0, text => "Login", connect_activate => sub {
164	start_game;	297	start_game;
165	});	298	});
166		299
167	$vbox->add (my $hbox = new CFClient::UI::HBox);	300	$dialog
		301	}
168		302
169	$hbox->add (new CFClient::UI::Button expand => 1, align => 0, text => "Save", connect_activate => sub {	303	sub message_window {
170	CFClient::write_cfg "$Crossfire::VARDIR/pclientrc";	304	my $window = new CFClient::UI::FancyFrame
171	status "Configuration Saved";	305	border_bg => [1, 1, 1, 0.5],
		306	bg => [0.3, 0.3, 0.3, 0.8],
		307	user_w => int $::WIDTH / 3,
		308	user_h => int $::HEIGHT / 5,
		309	child => (my $vbox = new CFClient::UI::VBox);
		310
		311	$vbox->add ($LOGVIEW = new CFClient::UI::TextView
		312	expand => 1,
		313	fontsize => $::CFG->{log_fontsize},
172	});	314	);
173	$CFClient::UI::TOPLEVEL->add ($dialog);	315
		316	$vbox->add (my $input = new CFClient::UI::Entry
		317	connect_focus_in => sub {
		318	my ($input, $prev_focus) = @_;
		319
		320	delete $input->{refocus_map};
		321
		322	if ($prev_focus == $MAPWIDGET && $input->{auto_activated}) {
		323	$input->{refocus_map} = 1;
		324	}
		325	delete $input->{auto_activated};
		326	},
		327	connect_activate => sub {
		328	my ($input, $text) = @_;
		329	$input->set_text ('');
		330
		331	if ($text =~ /^\/(.*)/) {
		332	$::CONN->user_send ($1);
		333	} else {
		334	my $say_cmd = $::CFG->{say_command} \|\| 'say';
		335	$::CONN->user_send ("$say_cmd $text");
		336	}
		337	if ($input->{refocus_map}) {
		338	delete $input->{refocus_map};
		339	$MAPWIDGET->focus_in
		340	}
		341	},
		342	connect_escape => sub {
		343	$MAPWIDGET->focus_in
		344	},
		345	);
		346
		347	$CONSOLE = {
		348	window => $window,
		349	input => $input
		350	};
		351
		352	$window
174	}	353	}
175		354
176	sub sdl_init {	355	sub sdl_init {
177	SDL::Init SDL_INIT_AUDIO \| SDL_INIT_VIDEO \| SDL_INIT_NOPARACHUTE	356	#SDL::Init SDL_INIT_AUDIO \| SDL_INIT_VIDEO \| SDL_INIT_NOPARACHUTE
		357	SDL::Init SDL_INIT_AUDIO \| SDL_INIT_VIDEO
178	and die "SDL::Init failed!\n";	358	and die "SDL::Init failed!\n";
179	}	359	}
180		360
181	sub init_screen {	361	sub init_screen {
182	sdl_init;	362	sdl_init;
…		…
186	$FAST = $CFG->{fast};	366	$FAST = $CFG->{fast};
187		367
188	SDL::GLSetAttribute SDL_GL_RED_SIZE, 5;	368	SDL::GLSetAttribute SDL_GL_RED_SIZE, 5;
189	SDL::GLSetAttribute SDL_GL_GREEN_SIZE, 5;	369	SDL::GLSetAttribute SDL_GL_GREEN_SIZE, 5;
190	SDL::GLSetAttribute SDL_GL_BLUE_SIZE, 5;	370	SDL::GLSetAttribute SDL_GL_BLUE_SIZE, 5;
191	SDL::GLSetAttribute SDL_GL_ALPHA_SIZE, 0;	371	SDL::GLSetAttribute SDL_GL_ALPHA_SIZE, 1;
192		372
193	SDL::GLSetAttribute SDL_GL_ACCUM_RED_SIZE, 0;	373	SDL::GLSetAttribute SDL_GL_ACCUM_RED_SIZE, 0;
194	SDL::GLSetAttribute SDL_GL_ACCUM_GREEN_SIZE, 0;	374	SDL::GLSetAttribute SDL_GL_ACCUM_GREEN_SIZE, 0;
195	SDL::GLSetAttribute SDL_GL_ACCUM_BLUE_SIZE, 0;	375	SDL::GLSetAttribute SDL_GL_ACCUM_BLUE_SIZE, 0;
196	SDL::GLSetAttribute SDL_GL_ACCUM_ALPHA_SIZE, 0;	376	SDL::GLSetAttribute SDL_GL_ACCUM_ALPHA_SIZE, 0;
…		…
217		397
218	$FONTSIZE = int $HEIGHT / 40;	398	$FONTSIZE = int $HEIGHT / 40;
219		399
220	#############################################################################	400	#############################################################################
221		401
222	$DEBUG_STATUS = new CFClient::UI::Label padding => 0;	402	$DEBUG_STATUS = new CFClient::UI::Label padding => 0, z => 100;
223	$CFClient::UI::TOPLEVEL->add ($DEBUG_STATUS);	403	$CFClient::UI::ROOT->add ($DEBUG_STATUS);
224		404
225	$STATUS_LINE = new CFClient::UI::Label	405	$STATUS_LINE = new CFClient::UI::Label
226	padding => 0,	406	padding => 0,
227	y => $HEIGHT * 49 / 50 - $FONTSIZE;	407	y => $HEIGHT * 44 / 45 - $FONTSIZE;
228	$CFClient::UI::TOPLEVEL->add ($STATUS_LINE);	408	$CFClient::UI::ROOT->add ($STATUS_LINE);
229		409
230	$ALT_ENTER_MESSAGE = new CFClient::UI::Label	410	$ALT_ENTER_MESSAGE = new CFClient::UI::Label
231	padding => 0,	411	padding => 0,
232	y => $HEIGHT * 49 / 50,	412	y => $HEIGHT * 44 / 45,
233	height => $HEIGHT / 50,	413	fontsize => $HEIGHT / 45,
234	text => "Use <b>Alt-Enter</b> to toggle fullscreen mode";	414	markup => "Use <b>Alt-Enter</b> to toggle fullscreen mode";
235	$CFClient::UI::TOPLEVEL->add ($ALT_ENTER_MESSAGE);	415	$CFClient::UI::ROOT->add ($ALT_ENTER_MESSAGE);
236		416
237	$MAPWIDGET = new CFClient::UI::MapWidget;	417	$CFClient::UI::ROOT->add ($MAPWIDGET = new CFClient::UI::MapWidget);
238	$CFClient::UI::TOPLEVEL->add ($MAPWIDGET);
239	$MAPWIDGET->focus_in;	418	$MAPWIDGET->focus_in;
		419	$MAPWIDGET->connect (activate_console => sub {
		420	my ($mapwidget, $preset) = @_;
240		421
241	config_dialog;	422	if ($CONSOLE) {
		423	$CONSOLE->{input}->{auto_activated} = 1;
		424	$CONSOLE->{input}->focus_in;
		425
		426	if ($preset && $CONSOLE->{input}->get_text eq '') {
		427	$CONSOLE->{input}->set_text ($preset);
		428	}
		429	}
		430	});
		431
		432	$CFClient::UI::ROOT->add ($BUTTONBAR = new CFClient::UI::HBox);
		433
		434	$BUTTONBAR->add (new CFClient::UI::Flopper text => "Client Setup", other => client_setup);
		435	$BUTTONBAR->add (new CFClient::UI::Flopper text => "Server Setup", other => server_setup);
		436	$BUTTONBAR->add (new CFClient::UI::Flopper text => "Message Window", other => message_window);
		437
		438	$BUTTONBAR->add (new CFClient::UI::Button text => "Save Config", connect_activate => sub {
		439	CFClient::write_cfg "$Crossfire::VARDIR/pclientrc";
		440	status "Configuration Saved";
		441	});
		442
		443	$BUTTONBAR->{children}[1]->emit ("activate"); # pop up server setup
		444
		445	my $tgw = new CFClient::UI::FancyFrame (x => $WIDTH - 150, y => 0);
		446	$tgw->add (my $hb = new CFClient::UI::HBox (req_w => 60, req_h => 150));
		447	$hb->add (my $fg = new CFClient::UI::VGauge (w => 30, h => 150, gauge => 'food', expand => 1));
		448	$hb->add (my $mg = new CFClient::UI::VGauge (w => 30, h => 150, gauge => 'mana', expand => 1));
		449	$hb->add (my $hg = new CFClient::UI::VGauge (w => 30, h => 150, gauge => 'hp', expand => 1));
		450	$hb->add (my $gg = new CFClient::UI::VGauge (w => 30, h => 150, gauge => 'grace', expand => 1));
		451
		452	$GAUGES = { food => $fg, mana => $mg, hp => $hg, grace => $gg };
		453	$CFClient::UI::ROOT->add ($tgw);
242	}	454	}
243		455
244	sub destroy_screen {	456	sub destroy_screen {
245	$CFClient::UI::TOPLEVEL->{children} = [];	457	$CFClient::UI::ROOT->{children} = [];
246	undef $SDL_ACTIVE;	458	undef $SDL_ACTIVE;
247	undef $SDL_EV;	459	undef $SDL_EV;
248	SDL::Quit;	460	SDL::Quit;
249	}	461	}
250		462
…		…
261	debug sprintf "%3.2f", $fps;	473	debug sprintf "%3.2f", $fps;
262		474
263	$want_refresh = 0;	475	$want_refresh = 0;
264	$can_refresh = 0;	476	$can_refresh = 0;
265		477
266	glViewport 0, 0, $WIDTH, $HEIGHT;
267
268	glMatrixMode GL_PROJECTION;
269	glLoadIdentity;
270	glOrtho 0, $WIDTH, $HEIGHT, 0, -10000 , 10000;
271	glMatrixMode GL_MODELVIEW;
272	glLoadIdentity;
273
274	glClearColor +($CFG->{fow_intensity}) x 3, 1;
275	glClear GL_COLOR_BUFFER_BIT;
276
277	$CFClient::UI::TOPLEVEL->draw;	478	$CFClient::UI::ROOT->draw;
278		479
279	SDL::GLSwapBuffers;	480	SDL::GLSwapBuffers;
280		481
281	$LAST_REFRESH = $NOW;	482	$LAST_REFRESH = $NOW;
282	}	483	}
…		…
313	delete $animate_object{$widget};	514	delete $animate_object{$widget};
314	}	515	}
315		516
316	@conn::ISA = Crossfire::Protocol::;	517	@conn::ISA = Crossfire::Protocol::;
317		518
		519	sub conn::stats_update {
		520	my ($self, $stats) = @_;
		521
		522	# i love text protocols!!!
		523	# FIXME: the stats are somehow weird
		524	my $hp = $stats->{1};
		525	my $hp_m = $stats->{2};
		526	my $sp = $stats->{3};
		527	my $sp_m = $stats->{4};
		528	my $fo = $stats->{18};
		529	my $fo_m = 1000;
		530	my $gr = $stats->{23};
		531	my $gr_m = $stats->{24};
		532
		533	#d# warn "DATA $hp $hp_m $sp $sp_m $fo $fo_m $gr $gr_m\n";
		534	$GAUGES->{hp}->set_value ($hp, $hp_m);
		535	$GAUGES->{mana}->set_value ($sp, $sp_m);
		536	$GAUGES->{food}->set_value ($fo, $fo_m);
		537	$GAUGES->{grace}->set_value ($gr, $gr_m);
		538	}
		539
318	sub conn::user_send {	540	sub conn::user_send {
319	my ($self, $command) = @_;	541	my ($self, $command) = @_;
320		542
321	$self->send ($command);	543	$self->send_command ($command);
322	status $command;	544	status $command;
		545	}
		546
		547	sub conn::map_scroll {
		548	my ($self, $dx, $dy) = @_;
		549
		550	$MAP->scroll ($dx, $dy);
323	}	551	}
324		552
325	sub conn::feed_map1a {	553	sub conn::feed_map1a {
326	my ($self, $data) = @_;	554	my ($self, $data) = @_;
327		555
328	# $self->Crossfire::Protocol::feed_map1a ($data);	556	# $self->Crossfire::Protocol::feed_map1a ($data);
329		557
330	$MAP->scroll (delete $self->{delayed_scroll_x}, delete $self->{delayed_scroll_y});
331	$MAP->map1a_update ($data);	558	$MAP->map1a_update ($data);
332	$MAPWIDGET->update;	559	$MAPWIDGET->update;
333	}	560	}
334		561
335	#sub conn::map_update {	562	sub conn::flush_map {
336	# my ($self, $dirty) = @_;	563	my ($self) = @_;
337	#	564
338	# $MAPWIDGET->update;	565	my $map_info = delete $self->{map_info}
339	#}	566	or return;
		567
		568	my ($hash, $x, $y, $w, $h) = @$map_info;
		569
		570	my $data = $MAP->get_rect ($x, $y, $w, $h);
		571	$MAPCACHE->put ($hash => Compress::LZF::compress $data);
		572
		573	warn sprintf "SAVEmap[%s] length %d\n", $hash, length $data;#d#
		574
		575	}
340		576
341	sub conn::map_clear {	577	sub conn::map_clear {
342	my ($self) = @_;	578	my ($self) = @_;
343		579
		580	$self->flush_map;
		581	delete $self->{neigh};
		582
344	$MAP->clear;	583	$MAP->clear;
		584	}
345		585
346	# refresh;	586
		587	sub conn::load_map($$$) {
		588	my ($self, $hash, $x, $y) = @_;
		589
		590	if (defined (my $data = $MAPCACHE->get ($hash))) {
		591	$data = Compress::LZF::decompress $data;
		592	warn sprintf "LOADmap[%s,%d,%d] length %d\n", $hash, $x, $y, length $data;#d#
		593	for my $id ($MAP->set_rect ($x, $y, $data)) {
		594	my $data = $TILECACHE->get ($id)
		595	or next;
		596
		597	$self->set_texture ($id => $data);
		598	}
		599	}
		600	}
		601
		602	sub conn::flood_fill {
		603	my ($self, $path, $hash, $flags, $x0, $y0, $x1, $y1) = @_;
		604
		605	# the server does not allow map paths > 6
		606	return if 6 <= length $path;
		607
		608	for my $tile (1..4) {
		609	next if $self->{neigh}{$hash}[$tile];
		610	next unless $flags & (1 << ($tile - 1));
		611
		612	my $neigh = $self->{neigh}{$hash} \|\|= [];
		613
		614	$self->send_mapinfo ("spatial $path$tile", sub {
		615	my ($mode, $flags, $x, $y, $w, $h, $hash) = @_;
		616
		617	#warn "map<$path>_$tile=<$mode,$x,$y,$w,$h,$hash>\n";#d#
		618	return if $mode ne "spatial";
		619
		620	$x += $MAP->ox;
		621	$y += $MAP->oy;
		622
		623	$self->load_map ($hash, $x, $y)
		624	unless $self->{neigh}{$hash}[5]++;#d#
		625
		626	$neigh->[$tile] = [$x, $y, $w, $h];
		627
		628	$self->flood_fill ("$path$tile", $hash, $flags, $x0, $y0, $x1, $y1)
		629	if $x >= $x0 && $x + $w < $x1 && $y >= $y0 && $y + $h < $y1;
		630	});
		631	}
		632	}
		633
		634	sub conn::map_change {
		635	my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_;
		636
		637	$self->flush_map;
		638
		639	my ($ox, $oy) = ($::MAP->ox, $::MAP->oy);
		640
		641	warn "$ox $oy map_info<$flags, $x, $y, $w, $h, $hash>\n";#d#
		642
		643	my $mapmapw = 250;
		644	my $mapmaph = 250;
		645
		646	$self->flood_fill ("", $hash, $flags,
		647	$ox - $mapmapw * 0.5, $oy - $mapmapw * 0.5,
		648	$ox + $mapmapw * 0.5, $oy + $mapmapw * 0.5);
		649
		650	$x += $ox;
		651	$y += $oy;
		652
		653	$self->{map_info} = [$hash, $x, $y, $w, $h];
		654
		655	$self->load_map ($hash, $x, $y);
347	}	656	}
348		657
349	sub conn::face_find {	658	sub conn::face_find {
350	my ($self, $face) = @_;	659	my ($self, $facenum, $face) = @_;
351		660
352	$FACECACHE->{"$face->{chksum},$face->{name}"}	661	my $hash = "$face->{chksum},$face->{name}";
		662
		663	my $id = $FACEMAP->get ($hash);
		664
		665	unless ($id) {
		666	# create new id for face
		667	# i love transactions
		668	for (1..100) {
		669	my $txn = $CFClient::DB_ENV->txn_begin;
		670	my $status = $FACEMAP->db_get (id => $id, BerkeleyDB::DB_RMW);
		671	if ($status == 0 \|\| $status == BerkeleyDB::DB_NOTFOUND) {
		672	$id++;
		673	if ($FACEMAP->put (id => $id) == 0
		674	&& $FACEMAP->put ($hash => $id) == 0) {
		675	$txn->txn_commit;
		676
		677	goto gotid;
		678	}
		679	}
		680	$txn->abort;
		681	}
		682
		683	CFClient::fatal "maximum number of transaction retries reached - database problems?";
		684	}
		685
		686	gotid:
		687	$face->{id} = $id;
		688	$MAP->set_face ($facenum => $id);
		689	$TILECACHE->get ($id)
353	}	690	}
354		691
355	sub conn::face_update {	692	sub conn::face_update {
356	my ($self, $facenum, $face) = @_;	693	my ($self, $facenum, $face) = @_;
357		694
358	$FACECACHE->{"$face->{chksum},$face->{name}"} = $face->{image};	695	$TILECACHE->put ($face->{id} => $face->{image}); #TODO: try to avoid duplicate writes
359		696
360	my $tex = $face->{texture} = new_from_image CFClient::Texture delete $face->{image};	697	$self->set_texture ($face->{id} => delete $face->{image});
		698	}
361		699
		700	sub conn::set_texture {
		701	my ($self, $id, $data) = @_;
		702
		703	$self->{texture}[$id] \|\|= do {
		704	my $tex =
		705	new_from_image CFClient::Texture
		706	$data, minify => 1;
		707
362	$MAP->set_texture ($facenum, @$tex{qw(name w h s t)});	708	$MAP->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}});
363	$MAPWIDGET->update;	709	$MAPWIDGET->update;
		710
		711	$tex
		712	};
364	}	713	}
365		714
366	sub conn::query {	715	sub conn::query {
367	my ($self, $flags, $prompt) = @_;	716	my ($self, $flags, $prompt) = @_;
368		717
		718	#TODO
369	warn "<<<<QUERY:$flags:$prompt>>>\n";#d#	719	warn "<<<<QUERY:$flags:$prompt>>>\n";#d#
		720	}
		721
		722	sub conn::drawinfo {
		723	my ($self, $color, $text) = @_;
		724
		725	my @color = (
		726	[1.00, 1.00, 1.00], #[0.00, 0.00, 0.00],
		727	[1.00, 1.00, 1.00],
		728	[0.50, 0.50, 1.00], #[0.00, 0.00, 0.55]
		729	[1.00, 0.00, 0.00],
		730	[1.00, 0.54, 0.00],
		731	[0.11, 0.56, 1.00],
		732	[0.93, 0.46, 0.00],
		733	[0.18, 0.54, 0.34],
		734	[0.56, 0.73, 0.56],
		735	[0.80, 0.80, 0.80],
		736	[0.55, 0.41, 0.13],
		737	[0.99, 0.77, 0.26],
		738	[0.74, 0.65, 0.41],
		739	);
		740
		741	$LOGVIEW->add_paragraph ($color[$color], $text);
370	}	742	}
371		743
372	%SDL_CB = (	744	%SDL_CB = (
373	SDL_QUIT() => sub {	745	SDL_QUIT() => sub {
374	Event::unloop -1;	746	Event::unloop -1;
…		…
379	refresh;	751	refresh;
380	},	752	},
381	SDL_KEYDOWN() => sub {	753	SDL_KEYDOWN() => sub {
382	if ($SDL_EV->key_mod & KMOD_ALT && $SDL_EV->key_sym == SDLK_RETURN) {	754	if ($SDL_EV->key_mod & KMOD_ALT && $SDL_EV->key_sym == SDLK_RETURN) {
383	# alt-enter	755	# alt-enter
384	$FULLSCREEN = !$FULLSCREEN;
385	destroy_screen;	756	destroy_screen;
		757	$CFG->{fullscreen} = !$CFG->{fullscreen};
386	init_screen;	758	init_screen;
387	} else {	759	} else {
388	CFClient::UI::feed_sdl_key_down_event ($SDL_EV);	760	CFClient::UI::feed_sdl_key_down_event ($SDL_EV);
389	}	761	}
390	},	762	},
…		…
405	},	777	},
406	);	778	);
407		779
408	#############################################################################	780	#############################################################################
409		781
		782	$TILECACHE = CFClient::db_table "tilecache";
		783	$FACEMAP = CFClient::db_table "facemap";
		784
410	CFClient::read_cfg "$Crossfire::VARDIR/pclientrc";	785	CFClient::read_cfg "$Crossfire::VARDIR/pclientrc";
411		786
412	my %DEF_CFG = (	787	my %DEF_CFG = (
		788	sdl_mode => 0,
413	width => 640,	789	width => 640,
414	height => 480,	790	height => 480,
		791	fullscreen => 0,
415	fast => 0,	792	fast => 0,
		793	fow_enable => 1,
416	fow_intensity => 0.45,	794	fow_intensity => 0.45,
417	fow_smooth => 0,	795	fow_smooth => 0,
418	fullscreen => 0,	796	log_fontsize => 14,
419	sdl_mode => 0,
420	mapsize => 100,	797	mapsize => 100,
421	host => "crossfire.schmorp.de",	798	host => "crossfire.schmorp.de",
422	port => 13327,	799	say_command => 'say',
423	);	800	);
424		801
425	while (my ($k, $v) = each %DEF_CFG) {	802	while (my ($k, $v) = each %DEF_CFG) {
426	$CFG->{$k} = $v unless exists $CFG->{$k};	803	$CFG->{$k} = $v unless exists $CFG->{$k};
427	}	804	}
…		…
435		812
436	@SDL_MODES or CFClient::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)";	813	@SDL_MODES or CFClient::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)";
437		814
438	$CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES;	815	$CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES;
439		816
440	init_screen;
441
442	{	817	{
443	my @fonts = map CFClient::find_rcfile $_, qw(uifont.ttf uifontb.ttf uifonti.ttf uifontbi.ttf);	818	my @fonts = map CFClient::find_rcfile $_, qw(uifont.ttf uifontb.ttf uifonti.ttf uifontbi.ttf);
444		819
445	CFClient::add_font $_ for @fonts;	820	CFClient::add_font $_ for @fonts;
446	CFClient::set_font $fonts[0];	821	CFClient::set_font $fonts[0];
447	}	822	}
448		823
449	$FACECACHE = eval { Crossfire::load_ref "$Crossfire::VARDIR/pclient.faces" } \|\| {};	824	init_screen;
450		825
451	Event::loop;	826	Event::loop;
452		827
453	Crossfire::save_ref $FACECACHE, "$Crossfire::VARDIR/pclient.faces";
454		828

Diff Legend

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

Comparing deliantra/Deliantra-Client/bin/pclient (file contents): Revision 1.96 by root, Thu Apr 13 23:11:11 2006 UTC vs. Revision 1.125 by elmex, Mon Apr 17 20:29:37 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/bin/pclient (file contents):
Revision 1.96 by root, Thu Apr 13 23:11:11 2006 UTC vs.
Revision 1.125 by elmex, Mon Apr 17 20:29:37 2006 UTC