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

Comparing deliantra/Deliantra-Client/bin/pclient (file contents):
Revision 1.105 by root, Fri Apr 14 20:27:36 2006 UTC vs.
Revision 1.124 by root, Mon Apr 17 19:50:23 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;
…		…
38	our $FULLSCREEN;	44	our $FULLSCREEN;
39	our $FONTSIZE;	45	our $FONTSIZE;
40		46
41	our $MAP;	47	our $MAP;
42	our $MAPWIDGET;	48	our $MAPWIDGET;
		49	our $BUTTONBAR;
		50	our $LOGVIEW;
		51	our $CONSOLE;
		52	our $METASERVER;
43		53
44	our $SDL_ACTIVE;	54	our $SDL_ACTIVE;
45	our $SDL_EV;	55	our $SDL_EV;
46	our %SDL_CB;	56	our %SDL_CB;
47		57
48	our $ALT_ENTER_MESSAGE;	58	our $ALT_ENTER_MESSAGE;
49	our $STATUS_LINE;	59	our $STATUS_LINE;
50	our $DEBUG_STATUS;	60	our $DEBUG_STATUS;
51	our $BUTTONBAR;
52	our $LOGVIEW;
53	our $CONSOLE;
54		61
55	sub status {	62	sub status {
56	$STATUS_LINE->set_text ($_[0]);	63	$STATUS_LINE->set_text ($_[0]);
57	my ($w, $h) = $STATUS_LINE->size_request;	64	my ($w, $h) = $STATUS_LINE->size_request;
58	$STATUS_LINE->size_allocate (0, $HEIGHT - $ALT_ENTER_MESSAGE->{h} - $h, $w, $h);	65	$STATUS_LINE->size_allocate (0, $HEIGHT - $ALT_ENTER_MESSAGE->{h} - $h, $w, $h);
…		…
65	}	72	}
66		73
67	sub start_game {	74	sub start_game {
68	status "logging in...";	75	status "logging in...";
69		76
70	my $mapsize = List::Util::min 64, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32;	77	my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32;
		78
		79	$MAPCACHE = CFClient::db_table "mapcache_$CFG->{host}";
71		80
72	$MAP = new CFClient::Map $mapsize, $mapsize;	81	$MAP = new CFClient::Map $mapsize, $mapsize;
		82
		83	my ($host, $port) = split /:/, $CFG->{host};
73		84
74	$CONN = new conn	85	$CONN = new conn
75	host => $CFG->{host},	86	host => $host,
76	port => $CFG->{port},	87	port => $port \|\| 13327,
77	user => $CFG->{user},	88	user => $CFG->{user},
78	pass => $CFG->{password},	89	pass => $CFG->{password},
79	mapw => $mapsize,	90	mapw => $mapsize,
80	maph => $mapsize,	91	maph => $mapsize,
81	;	92	;
…		…
87		98
88	sub stop_game {	99	sub stop_game {
89	undef $CONN;	100	undef $CONN;
90	}	101	}
91		102
92	sub config_dialog {	103	sub client_setup {
93	my $dialog = new CFClient::UI::FancyFrame	104	my $dialog = new CFClient::UI::FancyFrame
94	child => (my $vbox = new CFClient::UI::VBox);	105	child => (my $vbox = new CFClient::UI::VBox);
95	$vbox->add (new CFClient::UI::Label align => 0, text => "Client Setup");	106	$vbox->add (new CFClient::UI::Label align => 0, text => "Client Setup");
96	$vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]);	107	$vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]);
97		108
…		…
137	$table->add (1, 5, new CFClient::UI::CheckBox state => $CFG->{fow_smooth}, connect_changed => sub {	148	$table->add (1, 5, new CFClient::UI::CheckBox state => $CFG->{fow_smooth}, connect_changed => sub {
138	my ($self, $value) = @_;	149	my ($self, $value) = @_;
139	$CFG->{fow_smooth} = $value;	150	$CFG->{fow_smooth} = $value;
140	});	151	});
141		152
142	$table->add (0, 5, new CFClient::UI::Label align => 1, text => "Log Fontsize");	153	$table->add (0, 6, 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 {	154	$table->add (1, 6, new CFClient::UI::Slider range => [$CFG->{log_fontsize}, 8, 30, 1], connect_changed => sub {
144	my ($self, $value) = @_;	155	my ($self, $value) = @_;
145	$LOGVIEW->set_fontsize ($CFG->{log_fontsize} = int $value);	156	$LOGVIEW->set_fontsize ($CFG->{log_fontsize} = int $value);
146	});	157	});
147		158
148	$table->add (1, 6, new CFClient::UI::Button expand => 1, align => 0, text => "Apply", connect_activate => sub {	159	$table->add (1, 7, new CFClient::UI::Button expand => 1, align => 0, text => "Apply", connect_activate => sub {
149	destroy_screen ();	160	destroy_screen ();
150	init_screen ();	161	init_screen ();
151	});	162	});
		163
		164	$dialog
		165	}
		166
		167	sub metaserver_dialog {
		168	my $dialog = new CFClient::UI::FancyFrame
		169	child => (my $vbox = new CFClient::UI::VBox);
		170
		171	$vbox->add ($dialog->{table} = new CFClient::UI::Table);
		172
		173	$dialog
		174	}
		175
		176	sub update_metaserver {
		177	my ($HOST) = @_;
		178
		179	status "fetching metaserver list...";
		180
		181	my $buf;
		182
		183	my $fh = new IO::Socket::INET PeerHost => $META_SERVER, Blocking => 0;
		184
		185	Event->io (fd => $fh, poll => 'r', cb => sub {
		186	my $res = sysread $fh, $buf, 8192, length $buf;
		187
		188	if (!defined $res) {
		189	$_[0]->w->cancel;
		190	status "metaserver: $!";
		191	} elsif ($res == 0) {
		192	$_[0]->w->cancel;
		193	status "server list retrieved";
		194
		195	my $table = $METASERVER->{table};
		196
		197	$table->clear;
		198
		199	my @col = qw(Use #Users Host Uptime Version Description);
		200	$table->add ($_, 0, new CFClient::UI::Label align => 0, fg => [1, 1, 0], text => $col[$_])
		201	for 0 .. $#col;
		202
		203	my @align = qw(1 0 1 1 -1);
		204
		205	my $y = 0;
		206	for my $m (sort { $b->[3] <=> $a->[3] } map [split /\\|/], split /\015?\012/, $buf) {
		207	my ($ip, $last, $host, $users, $version, $desc, $ibytes, $obytes, $uptime) = @$m;
		208
		209	for ($desc) {
		210	s/<br>/\n/gi;
		211	s/<li>/\n· /gi;
		212	s/<.*?>//sgi;
		213	s/&/&/g;
		214	s/</</g;
		215	s/>/>/g;
		216	}
		217
		218	$uptime = sprintf "%dd %02d:%02d:%02d",
		219	(int $m->[8] / 86400),
		220	(int $m->[8] / 3600) % 24,
		221	(int $m->[8] / 60) % 60,
		222	$m->[8] % 60;
		223
		224	$m = [$users, $host, $uptime, $version, $desc];
		225
		226	$y++;
		227
		228	$table->add (0, $y, new CFClient::UI::VBox children => [
		229	(new CFClient::UI::Button text => " ", connect_activate => sub {
		230	$HOST->set_text ($CFG->{host} = $host);
		231	}),
		232	(new CFClient::UI::Empty expand => 1),
		233	]);
		234
		235	$table->add ($_ + 1, $y, new CFClient::UI::Label align => $align[$_], text => $m->[$_], fontsize => $FONTSIZE * 0.8)
		236	for 0 .. $#$m;
		237	}
		238	}
		239	});
		240	}
		241
		242	sub server_setup {
		243	my $dialog = new CFClient::UI::FancyFrame
		244	child => (my $vbox = new CFClient::UI::VBox);
152		245
153	$vbox->add (new CFClient::UI::Label align => 0, text => "Server Setup");	246	$vbox->add (new CFClient::UI::Label align => 0, text => "Server Setup");
154	$vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]);	247	$vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]);
155	$table->add (0, 2, new CFClient::UI::Label align => 1, text => "Host");	248	$table->add (0, 2, new CFClient::UI::Label align => 1, text => "Host:Port");
		249
		250	{
		251	$table->add (1, 2, my $vbox = new CFClient::UI::VBox);
		252
156	$table->add (1, 2, my $host = new CFClient::UI::Entry text => $CFG->{host}, connect_changed => sub {	253	$vbox->add (my $HOST = new CFClient::UI::Entry text => $CFG->{host}, connect_changed => sub {
157	my ($self, $value) = @_;	254	my ($self, $value) = @_;
158	$CFG->{host} = $value;	255	$CFG->{host} = $value;
159	});	256	});
160		257
161	$table->add (0, 3, new CFClient::UI::Label align => 1, text => "Port");	258	$METASERVER = metaserver_dialog;
162	$table->add (1, 3, my $port = new CFClient::UI::Entry text => $CFG->{port}, connect_changed => sub {	259
163	my ($self, $value) = @_;	260	$vbox->add (new CFClient::UI::Flopper text => "Metaserver", other => $METASERVER, connect_open => sub {
164	$CFG->{port} = $value;	261	update_metaserver $HOST;
165	});	262	});
		263	}
166		264
167	$table->add (0, 4, new CFClient::UI::Label align => 1, text => "Username");	265	$table->add (0, 4, new CFClient::UI::Label align => 1, text => "Username");
168	$table->add (1, 4, my $user = new CFClient::UI::Entry text => $CFG->{user}, connect_changed => sub {	266	$table->add (1, 4, new CFClient::UI::Entry text => $CFG->{user}, connect_changed => sub {
169	my ($self, $value) = @_;	267	my ($self, $value) = @_;
170	$CFG->{user} = $value;	268	$CFG->{user} = $value;
171	});	269	});
172		270
173	$table->add (0, 5, new CFClient::UI::Label align => 1, text => "Password");	271	$table->add (0, 5, new CFClient::UI::Label align => 1, text => "Password");
174	$table->add (1, 5, my $pass = new CFClient::UI::Entry text => $CFG->{password}, hidden => 1, connect_changed => sub {	272	$table->add (1, 5, new CFClient::UI::Entry text => $CFG->{password}, hidden => 1, connect_changed => sub {
175	my ($self, $value) = @_;	273	my ($self, $value) = @_;
176	$CFG->{password} = $value;	274	$CFG->{password} = $value;
177	});	275	});
178		276
179	$table->add (0, 6, new CFClient::UI::Label align => 1, text => "Def. say cmd");	277	$table->add (0, 6, new CFClient::UI::Label align => 1, text => "Def. say cmd");
…		…
195		293
196	$table->add (1, 8, new CFClient::UI::Button expand => 1, align => 0, text => "Login", connect_activate => sub {	294	$table->add (1, 8, new CFClient::UI::Button expand => 1, align => 0, text => "Login", connect_activate => sub {
197	start_game;	295	start_game;
198	});	296	});
199		297
200	$vbox->add (my $hbox = new CFClient::UI::HBox);
201
202	$hbox->add (new CFClient::UI::Button expand => 1, align => 0, text => "Save", connect_activate => sub {
203	CFClient::write_cfg "$Crossfire::VARDIR/pclientrc";
204	status "Configuration Saved";
205	});
206
207	$dialog	298	$dialog
208	}	299	}
209		300
210	sub console_window {	301	sub message_window {
211	my $window = new CFClient::UI::FancyFrame	302	my $window = new CFClient::UI::FancyFrame
212	border_bg => [1, 1, 1, 0.5],	303	border_bg => [1, 1, 1, 0.5],
213	bg => [0.3, 0.3, 0.3, 0.8],	304	bg => [0.3, 0.3, 0.3, 0.8],
214	user_w => $::WIDTH/4,	305	user_w => int $::WIDTH / 3,
215	user_h => $::HEIGHT,	306	user_h => int $::HEIGHT / 5,
216	child => (my $vbox = new CFClient::UI::VBox);	307	child => (my $vbox = new CFClient::UI::VBox);
217		308
218	$vbox->add ($LOGVIEW = new CFClient::UI::TextView	309	$vbox->add ($LOGVIEW = new CFClient::UI::TextView
219	expand => 1,	310	expand => 1,
220	fontsize => $::CFG->{log_fontsize},	311	fontsize => $::CFG->{log_fontsize},
221	);	312	);
222		313
223	$vbox->add (my $input = new CFClient::UI::LineEntry);	314	$vbox->add (my $input = new CFClient::UI::Entry
		315	connect_focus_in => sub {
		316	my ($input, $prev_focus) = @_;
		317
		318	delete $input->{refocus_map};
		319
		320	if ($prev_focus == $MAPWIDGET && $input->{auto_activated}) {
		321	$input->{refocus_map} = 1;
		322	}
		323	delete $input->{auto_activated};
		324	},
224	$input->connect (activate => sub {	325	connect_activate => sub {
225	my ($input, $text) = @_;	326	my ($input, $text) = @_;
226	$input->set_text ('');	327	$input->set_text ('');
227		328
228	if ($text =~ /^\/(.*)/) {	329	if ($text =~ /^\/(.*)/) {
229	$::CONN->user_send ("command $1");	330	$::CONN->user_send ($1);
230	} else {	331	} else {
231	my $say_cmd = $::CFG->{say_command} \|\| 'say';	332	my $say_cmd = $::CFG->{say_command} \|\| 'say';
232	$::CONN->user_send ("command $say_cmd $text");	333	$::CONN->user_send ("$say_cmd $text");
233	}	334	}
		335	if ($input->{refocus_map}) {
		336	delete $input->{refocus_map};
		337	$MAPWIDGET->focus_in
234	1	338	}
235	});	339	},
236	$input->connect (escape => sub {	340	connect_escape => sub {
237	$MAPWIDGET->focus_in	341	$MAPWIDGET->focus_in
238	});	342	},
239	$input->focus_in;	343	);
240		344
241	$CONSOLE = {	345	$CONSOLE = {
242	window => $window,	346	window => $window,
243	input => $input	347	input => $input
244	};	348	};
245		349
246	$window	350	$window
247	}	351	}
248		352
249	sub sdl_init {	353	sub sdl_init {
		354	#SDL::Init SDL_INIT_AUDIO \| SDL_INIT_VIDEO \| SDL_INIT_NOPARACHUTE
250	SDL::Init SDL_INIT_AUDIO \| SDL_INIT_VIDEO	355	SDL::Init SDL_INIT_AUDIO \| SDL_INIT_VIDEO
251	and die "SDL::Init failed!\n";	356	and die "SDL::Init failed!\n";
252	}	357	}
253		358
254	sub init_screen {	359	sub init_screen {
…		…
259	$FAST = $CFG->{fast};	364	$FAST = $CFG->{fast};
260		365
261	SDL::GLSetAttribute SDL_GL_RED_SIZE, 5;	366	SDL::GLSetAttribute SDL_GL_RED_SIZE, 5;
262	SDL::GLSetAttribute SDL_GL_GREEN_SIZE, 5;	367	SDL::GLSetAttribute SDL_GL_GREEN_SIZE, 5;
263	SDL::GLSetAttribute SDL_GL_BLUE_SIZE, 5;	368	SDL::GLSetAttribute SDL_GL_BLUE_SIZE, 5;
264	SDL::GLSetAttribute SDL_GL_ALPHA_SIZE, 0;	369	SDL::GLSetAttribute SDL_GL_ALPHA_SIZE, 1;
265		370
266	SDL::GLSetAttribute SDL_GL_ACCUM_RED_SIZE, 0;	371	SDL::GLSetAttribute SDL_GL_ACCUM_RED_SIZE, 0;
267	SDL::GLSetAttribute SDL_GL_ACCUM_GREEN_SIZE, 0;	372	SDL::GLSetAttribute SDL_GL_ACCUM_GREEN_SIZE, 0;
268	SDL::GLSetAttribute SDL_GL_ACCUM_BLUE_SIZE, 0;	373	SDL::GLSetAttribute SDL_GL_ACCUM_BLUE_SIZE, 0;
269	SDL::GLSetAttribute SDL_GL_ACCUM_ALPHA_SIZE, 0;	374	SDL::GLSetAttribute SDL_GL_ACCUM_ALPHA_SIZE, 0;
…		…
291	$FONTSIZE = int $HEIGHT / 40;	396	$FONTSIZE = int $HEIGHT / 40;
292		397
293	#############################################################################	398	#############################################################################
294		399
295	$DEBUG_STATUS = new CFClient::UI::Label padding => 0, z => 100;	400	$DEBUG_STATUS = new CFClient::UI::Label padding => 0, z => 100;
296	$CFClient::UI::TOPLEVEL->add ($DEBUG_STATUS);	401	$CFClient::UI::ROOT->add ($DEBUG_STATUS);
297		402
298	$STATUS_LINE = new CFClient::UI::Label	403	$STATUS_LINE = new CFClient::UI::Label
299	padding => 0,	404	padding => 0,
300	y => $HEIGHT * 44 / 45 - $FONTSIZE;	405	y => $HEIGHT * 44 / 45 - $FONTSIZE;
301	$CFClient::UI::TOPLEVEL->add ($STATUS_LINE);	406	$CFClient::UI::ROOT->add ($STATUS_LINE);
302		407
303	$ALT_ENTER_MESSAGE = new CFClient::UI::Label	408	$ALT_ENTER_MESSAGE = new CFClient::UI::Label
304	padding => 0,	409	padding => 0,
305	y => $HEIGHT * 44 / 45,	410	y => $HEIGHT * 44 / 45,
306	height => $HEIGHT / 45,	411	fontsize => $HEIGHT / 45,
307	text => "Use <b>Alt-Enter</b> to toggle fullscreen mode";	412	markup => "Use <b>Alt-Enter</b> to toggle fullscreen mode";
308	$CFClient::UI::TOPLEVEL->add ($ALT_ENTER_MESSAGE);	413	$CFClient::UI::ROOT->add ($ALT_ENTER_MESSAGE);
309		414
310	$CFClient::UI::TOPLEVEL->add ($MAPWIDGET = new CFClient::UI::MapWidget);	415	$CFClient::UI::ROOT->add ($MAPWIDGET = new CFClient::UI::MapWidget);
311	$MAPWIDGET->focus_in;	416	$MAPWIDGET->focus_in;
312	$MAPWIDGET->connect (activate_console => sub {	417	$MAPWIDGET->connect (activate_console => sub {
313	my ($mapwidget, $preset) = @_;	418	my ($mapwidget, $preset) = @_;
314		419
315	if ($CONSOLE) {	420	if ($CONSOLE) {
		421	$CONSOLE->{input}->{auto_activated} = 1;
316	$CONSOLE->{input}->focus_in;	422	$CONSOLE->{input}->focus_in;
317		423
318	if ($preset && $CONSOLE->{input}->get_text eq '') {	424	if ($preset && $CONSOLE->{input}->get_text eq '') {
319	$CONSOLE->{input}->set_text ($preset);	425	$CONSOLE->{input}->set_text ($preset);
320	}	426	}
321	}	427	}
322	});	428	});
323		429
324	$CFClient::UI::TOPLEVEL->add ($BUTTONBAR = new CFClient::UI::HBox);	430	$CFClient::UI::ROOT->add ($BUTTONBAR = new CFClient::UI::HBox);
325		431
326	$BUTTONBAR->add (my $setup = new CFClient::UI::Flopper x => 0, y => 0, text => "Setup", other => config_dialog, state => 1);	432	$BUTTONBAR->add (new CFClient::UI::Flopper text => "Client Setup", other => client_setup);
327	$BUTTONBAR->add (my $setup = new CFClient::UI::Flopper x => 0, y => 0, text => "Console", other => console_window);	433	$BUTTONBAR->add (new CFClient::UI::Flopper text => "Server Setup", other => server_setup);
		434	$BUTTONBAR->add (new CFClient::UI::Flopper text => "Message Window", other => message_window);
		435
		436	$BUTTONBAR->add (new CFClient::UI::Button text => "Save Config", connect_activate => sub {
		437	CFClient::write_cfg "$Crossfire::VARDIR/pclientrc";
		438	status "Configuration Saved";
		439	});
		440
		441	$BUTTONBAR->{children}[1]->emit ("activate"); # pop up server setup
328	}	442	}
329		443
330	sub destroy_screen {	444	sub destroy_screen {
331	$CFClient::UI::TOPLEVEL->{children} = [];	445	$CFClient::UI::ROOT->{children} = [];
332	undef $SDL_ACTIVE;	446	undef $SDL_ACTIVE;
333	undef $SDL_EV;	447	undef $SDL_EV;
334	SDL::Quit;	448	SDL::Quit;
335	}	449	}
336		450
…		…
347	debug sprintf "%3.2f", $fps;	461	debug sprintf "%3.2f", $fps;
348		462
349	$want_refresh = 0;	463	$want_refresh = 0;
350	$can_refresh = 0;	464	$can_refresh = 0;
351		465
352	$CFClient::UI::TOPLEVEL->draw;	466	$CFClient::UI::ROOT->draw;
353		467
354	SDL::GLSwapBuffers;	468	SDL::GLSwapBuffers;
355		469
356	$LAST_REFRESH = $NOW;	470	$LAST_REFRESH = $NOW;
357	}	471	}
…		…
391	@conn::ISA = Crossfire::Protocol::;	505	@conn::ISA = Crossfire::Protocol::;
392		506
393	sub conn::user_send {	507	sub conn::user_send {
394	my ($self, $command) = @_;	508	my ($self, $command) = @_;
395		509
396	$self->send ($command);	510	$self->send_command ($command);
397	status $command;	511	status $command;
		512	}
		513
		514	sub conn::map_scroll {
		515	my ($self, $dx, $dy) = @_;
		516
		517	$MAP->scroll ($dx, $dy);
398	}	518	}
399		519
400	sub conn::feed_map1a {	520	sub conn::feed_map1a {
401	my ($self, $data) = @_;	521	my ($self, $data) = @_;
402		522
403	# $self->Crossfire::Protocol::feed_map1a ($data);	523	# $self->Crossfire::Protocol::feed_map1a ($data);
404		524
405	$MAP->scroll (delete $self->{delayed_scroll_x}, delete $self->{delayed_scroll_y});
406	$MAP->map1a_update ($data);	525	$MAP->map1a_update ($data);
407	$MAPWIDGET->update;	526	$MAPWIDGET->update;
408	}	527	}
409		528
410	#sub conn::map_update {	529	sub conn::flush_map {
411	# my ($self, $dirty) = @_;	530	my ($self) = @_;
412	#	531
413	# $MAPWIDGET->update;	532	my $map_info = delete $self->{map_info}
414	#}	533	or return;
		534
		535	my ($hash, $x, $y, $w, $h) = @$map_info;
		536
		537	my $data = $MAP->get_rect ($x, $y, $w, $h);
		538	$MAPCACHE->put ($hash => Compress::LZF::compress $data);
		539
		540	warn sprintf "SAVEmap[%s] length %d\n", $hash, length $data;#d#
		541
		542	}
415		543
416	sub conn::map_clear {	544	sub conn::map_clear {
417	my ($self) = @_;	545	my ($self) = @_;
418		546
		547	$self->flush_map;
		548	delete $self->{neigh};
		549
419	$MAP->clear;	550	$MAP->clear;
		551	}
420		552
421	# refresh;	553
		554	sub conn::load_map($$$) {
		555	my ($self, $hash, $x, $y) = @_;
		556
		557	if (defined (my $data = $MAPCACHE->get ($hash))) {
		558	$data = Compress::LZF::decompress $data;
		559	warn sprintf "LOADmap[%s,%d,%d] length %d\n", $hash, $x, $y, length $data;#d#
		560	for my $id ($MAP->set_rect ($x, $y, $data)) {
		561	my $data = $TILECACHE->get ($id)
		562	or next;
		563
		564	$self->set_texture ($id => $data);
		565	}
		566	}
		567	}
		568
		569	sub conn::flood_fill {
		570	my ($self, $path, $hash, $flags, $x0, $y0, $x1, $y1) = @_;
		571
		572	# the server does not allow map paths > 6
		573	return if 6 <= length $path;
		574
		575	for my $tile (1..4) {
		576	next if $self->{neigh}{$hash}[$tile];
		577	next unless $flags & (1 << ($tile - 1));
		578
		579	my $neigh = $self->{neigh}{$hash} \|\|= [];
		580
		581	$self->send_mapinfo ("spatial $path$tile", sub {
		582	my ($mode, $flags, $x, $y, $w, $h, $hash) = @_;
		583
		584	#warn "map<$path>_$tile=<$mode,$x,$y,$w,$h,$hash>\n";#d#
		585	return if $mode ne "spatial";
		586
		587	$x += $MAP->ox;
		588	$y += $MAP->oy;
		589
		590	$self->load_map ($hash, $x, $y)
		591	unless $self->{neigh}{$hash}[5]++;#d#
		592
		593	$neigh->[$tile] = [$x, $y, $w, $h];
		594
		595	$self->flood_fill ("$path$tile", $hash, $flags, $x0, $y0, $x1, $y1)
		596	if $x >= $x0 && $x + $w < $x1 && $y >= $y0 && $y + $h < $y1;
		597	});
		598	}
		599	}
		600
		601	sub conn::map_change {
		602	my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_;
		603
		604	$self->flush_map;
		605
		606	my ($ox, $oy) = ($::MAP->ox, $::MAP->oy);
		607
		608	warn "$ox $oy map_info<$flags, $x, $y, $w, $h, $hash>\n";#d#
		609
		610	my $mapmapw = 250;
		611	my $mapmaph = 250;
		612
		613	$self->flood_fill ("", $hash, $flags,
		614	$ox - $mapmapw * 0.5, $oy - $mapmapw * 0.5,
		615	$ox + $mapmapw * 0.5, $oy + $mapmapw * 0.5);
		616
		617	$x += $ox;
		618	$y += $oy;
		619
		620	$self->{map_info} = [$hash, $x, $y, $w, $h];
		621
		622	$self->load_map ($hash, $x, $y);
422	}	623	}
423		624
424	sub conn::face_find {	625	sub conn::face_find {
425	my ($self, $face) = @_;	626	my ($self, $facenum, $face) = @_;
426		627
427	$FACECACHE->{"$face->{chksum},$face->{name}"}	628	my $hash = "$face->{chksum},$face->{name}";
		629
		630	my $id = $FACEMAP->get ($hash);
		631
		632	unless ($id) {
		633	# create new id for face
		634	# i love transactions
		635	for (1..100) {
		636	my $txn = $CFClient::DB_ENV->txn_begin;
		637	my $status = $FACEMAP->db_get (id => $id, BerkeleyDB::DB_RMW);
		638	if ($status == 0 \|\| $status == BerkeleyDB::DB_NOTFOUND) {
		639	$id++;
		640	if ($FACEMAP->put (id => $id) == 0
		641	&& $FACEMAP->put ($hash => $id) == 0) {
		642	$txn->txn_commit;
		643
		644	goto gotid;
		645	}
		646	}
		647	$txn->abort;
		648	}
		649
		650	CFClient::fatal "maximum number of transaction retries reached - database problems?";
		651	}
		652
		653	gotid:
		654	$face->{id} = $id;
		655	$MAP->set_face ($facenum => $id);
		656	$TILECACHE->get ($id)
428	}	657	}
429		658
430	sub conn::face_update {	659	sub conn::face_update {
431	my ($self, $facenum, $face) = @_;	660	my ($self, $facenum, $face) = @_;
432		661
433	$FACECACHE->{"$face->{chksum},$face->{name}"} = $face->{image};	662	$TILECACHE->put ($face->{id} => $face->{image}); #TODO: try to avoid duplicate writes
434		663
435	my $tex = $face->{texture} = new_from_image CFClient::Texture delete $face->{image};	664	$self->set_texture ($face->{id} => delete $face->{image});
		665	}
436		666
		667	sub conn::set_texture {
		668	my ($self, $id, $data) = @_;
		669
		670	$self->{texture}[$id] \|\|= do {
		671	my $tex =
		672	new_from_image CFClient::Texture
		673	$data, minify => 1;
		674
437	$MAP->set_texture ($facenum, @$tex{qw(name w h s t)});	675	$MAP->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}});
438	$MAPWIDGET->update;	676	$MAPWIDGET->update;
		677
		678	$tex
		679	};
439	}	680	}
440		681
441	sub conn::query {	682	sub conn::query {
442	my ($self, $flags, $prompt) = @_;	683	my ($self, $flags, $prompt) = @_;
443		684
…		…
449	my ($self, $color, $text) = @_;	690	my ($self, $color, $text) = @_;
450		691
451	my @color = (	692	my @color = (
452	[1.00, 1.00, 1.00], #[0.00, 0.00, 0.00],	693	[1.00, 1.00, 1.00], #[0.00, 0.00, 0.00],
453	[1.00, 1.00, 1.00],	694	[1.00, 1.00, 1.00],
454	[0.00, 0.00, 0.55],	695	[0.50, 0.50, 1.00], #[0.00, 0.00, 0.55]
455	[1.00, 0.00, 0.00],	696	[1.00, 0.00, 0.00],
456	[1.00, 0.54, 0.00],	697	[1.00, 0.54, 0.00],
457	[0.11, 0.56, 1.00],	698	[0.11, 0.56, 1.00],
458	[0.93, 0.46, 0.00],	699	[0.93, 0.46, 0.00],
459	[0.18, 0.54, 0.34],	700	[0.18, 0.54, 0.34],
…		…
502	# printf "active %x %x\n", $SDL_EV->active_gain, $SDL_EV->active_state;#d#	743	# printf "active %x %x\n", $SDL_EV->active_gain, $SDL_EV->active_state;#d#
503	},	744	},
504	);	745	);
505		746
506	#############################################################################	747	#############################################################################
		748
		749	$TILECACHE = CFClient::db_table "tilecache";
		750	$FACEMAP = CFClient::db_table "facemap";
507		751
508	CFClient::read_cfg "$Crossfire::VARDIR/pclientrc";	752	CFClient::read_cfg "$Crossfire::VARDIR/pclientrc";
509		753
510	my %DEF_CFG = (	754	my %DEF_CFG = (
511	sdl_mode => 0,	755	sdl_mode => 0,
…		…
517	fow_intensity => 0.45,	761	fow_intensity => 0.45,
518	fow_smooth => 0,	762	fow_smooth => 0,
519	log_fontsize => 14,	763	log_fontsize => 14,
520	mapsize => 100,	764	mapsize => 100,
521	host => "crossfire.schmorp.de",	765	host => "crossfire.schmorp.de",
522	port => 13327,
523	say_command => 'say',	766	say_command => 'say',
524	);	767	);
525		768
526	while (my ($k, $v) = each %DEF_CFG) {	769	while (my ($k, $v) = each %DEF_CFG) {
527	$CFG->{$k} = $v unless exists $CFG->{$k};	770	$CFG->{$k} = $v unless exists $CFG->{$k};
…		…
536		779
537	@SDL_MODES or CFClient::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)";	780	@SDL_MODES or CFClient::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)";
538		781
539	$CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES;	782	$CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES;
540		783
541	init_screen;
542
543	{	784	{
544	my @fonts = map CFClient::find_rcfile $_, qw(uifont.ttf uifontb.ttf uifonti.ttf uifontbi.ttf);	785	my @fonts = map CFClient::find_rcfile $_, qw(uifont.ttf uifontb.ttf uifonti.ttf uifontbi.ttf);
545		786
546	CFClient::add_font $_ for @fonts;	787	CFClient::add_font $_ for @fonts;
547	CFClient::set_font $fonts[0];	788	CFClient::set_font $fonts[0];
548	}	789	}
549		790
550	$FACECACHE = eval { Crossfire::load_ref "$Crossfire::VARDIR/pclient.faces" } \|\| {};	791	init_screen;
551		792
552	Event::loop;	793	Event::loop;
553		794
554	Crossfire::save_ref $FACECACHE, "$Crossfire::VARDIR/pclient.faces";
555		795

Diff Legend

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

Comparing deliantra/Deliantra-Client/bin/pclient (file contents): Revision 1.105 by root, Fri Apr 14 20:27:36 2006 UTC vs. Revision 1.124 by root, Mon Apr 17 19:50:23 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/bin/pclient (file contents):
Revision 1.105 by root, Fri Apr 14 20:27:36 2006 UTC vs.
Revision 1.124 by root, Mon Apr 17 19:50:23 2006 UTC