[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.132 by root, Tue Apr 18 02:07: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
…		…
49	our $STATUS_LINE;	61	our $STATUS_LINE;
50	our $DEBUG_STATUS;	62	our $DEBUG_STATUS;
51		63
52	sub status {	64	sub status {
53	$STATUS_LINE->set_text ($_[0]);	65	$STATUS_LINE->set_text ($_[0]);
54	my ($w, $h) = $STATUS_LINE->size_request;
55	$STATUS_LINE->size_allocate (0, $HEIGHT - $ALT_ENTER_MESSAGE->{h} - $h, $w, $h);	66	$STATUS_LINE->move (0, $HEIGHT - $ALT_ENTER_MESSAGE->{h} - $STATUS_LINE->{h});
56	}	67	}
57		68
58	sub debug {	69	sub debug {
59	$DEBUG_STATUS->set_text ($_[0]);	70	$DEBUG_STATUS->set_text ($_[0]);
60	my ($w, $h) = $DEBUG_STATUS->size_request;	71	$DEBUG_STATUS->move ($WIDTH - $DEBUG_STATUS->{w}, 0, $DEBUG_STATUS->{w}, $DEBUG_STATUS->{h});
61	$DEBUG_STATUS->size_allocate ($WIDTH - $w, 0, $w, $h);
62	}	72	}
63		73
64	sub start_game {	74	sub start_game {
65	status "logging in...";	75	status "logging in...";
66		76
67	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}";
68		80
69	$MAP = new CFClient::Map $mapsize, $mapsize;	81	$MAP = new CFClient::Map $mapsize, $mapsize;
		82
		83	my ($host, $port) = split /:/, $CFG->{host};
70		84
71	$CONN = new conn	85	$CONN = new conn
72	host => $CFG->{host},	86	host => $host,
73	port => $CFG->{port},	87	port => $port \|\| 13327,
74	user => $CFG->{user},	88	user => $CFG->{user},
75	pass => $CFG->{password},	89	pass => $CFG->{password},
76	mapw => $mapsize,	90	mapw => $mapsize,
77	maph => $mapsize,	91	maph => $mapsize,
78	;	92	;
…		…
84		98
85	sub stop_game {	99	sub stop_game {
86	undef $CONN;	100	undef $CONN;
87	}	101	}
88		102
89	sub config_dialog {	103	sub client_setup {
90	my $dialog = new CFClient::UI::FancyFrame x => 300, y => 100,	104	my $dialog = new CFClient::UI::FancyFrame
91	child => (my $vbox = new CFClient::UI::VBox);	105	child => (my $vbox = new CFClient::UI::VBox);
92	$vbox->add (new CFClient::UI::Label align => 0, text => "Client Setup");	106	$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]);	107	$vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]);
94		108
95	$table->add (0, 0, new CFClient::UI::Label align => 1, text => "Video Mode");	109	$table->add (0, 0, new CFClient::UI::Label align => 1, text => "Video Mode");
…		…
117	my ($self, $value) = @_;	131	my ($self, $value) = @_;
118	$CFG->{fast} = $value;	132	$CFG->{fast} = $value;
119	});	133	});
120		134
121	$table->add (0, 3, new CFClient::UI::Label align => 1, text => "Fog of War");	135	$table->add (0, 3, new CFClient::UI::Label align => 1, text => "Fog of War");
		136	$table->add (1, 3, new CFClient::UI::CheckBox state => $CFG->{fow_enable}, connect_changed => sub {
		137	my ($self, $value) = @_;
		138	$CFG->{fow_enable} = $value;
		139	});
		140
		141	$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 {	142	$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) = @_;	143	my ($self, $value) = @_;
124	$CFG->{fow_intensity} = $value;	144	$CFG->{fow_intensity} = $value;
125	});	145	});
126		146
127	$table->add (0, 4, new CFClient::UI::Label align => 1, text => "Smooth FoW");	147	$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 {	148	$table->add (1, 5, new CFClient::UI::CheckBox state => $CFG->{fow_smooth}, connect_changed => sub {
129	my ($self, $value) = @_;	149	my ($self, $value) = @_;
130	$CFG->{fow_smooth} = $value;	150	$CFG->{fow_smooth} = $value;
		151	status "Fog of War smoothing requires OpenGL 1.2 or higher" if $CFClient::GL_VERSION < 1.2;
131	});	152	});
132		153
		154	$table->add (0, 6, new CFClient::UI::Label align => 1, text => "Log Fontsize");
		155	$table->add (1, 6, new CFClient::UI::Slider range => [$CFG->{log_fontsize}, 8, 30, 1], connect_changed => sub {
		156	my ($self, $value) = @_;
		157	$LOGVIEW->set_fontsize ($CFG->{log_fontsize} = int $value);
		158	});
		159
133	$table->add (1, 5, new CFClient::UI::Button expand => 1, align => 0, text => "Apply", connect_activate => sub {	160	$table->add (1, 7, new CFClient::UI::Button expand => 1, align => 0, text => "Apply", connect_activate => sub {
134	destroy_screen ();	161	destroy_screen ();
135	init_screen ();	162	init_screen ();
136	});	163	});
		164
		165	$dialog
		166	}
		167
		168	sub metaserver_dialog {
		169	my $dialog = new CFClient::UI::FancyFrame
		170	child => (my $vbox = new CFClient::UI::VBox);
		171
		172	$vbox->add ($dialog->{table} = new CFClient::UI::Table);
		173
		174	$dialog
		175	}
		176
		177	sub update_metaserver {
		178	my ($HOST) = @_;
		179
		180	status "fetching metaserver list...";
		181
		182	my $buf;
		183
		184	my $fh = new IO::Socket::INET PeerHost => $META_SERVER, Blocking => 0;
		185
		186	Event->io (fd => $fh, poll => 'r', cb => sub {
		187	my $res = sysread $fh, $buf, 8192, length $buf;
		188
		189	if (!defined $res) {
		190	$_[0]->w->cancel;
		191	status "metaserver: $!";
		192	} elsif ($res == 0) {
		193	$_[0]->w->cancel;
		194	status "server list retrieved";
		195
		196	my $table = $METASERVER->{table};
		197
		198	$table->clear;
		199
		200	my @col = qw(Use #Users Host Uptime Version Description);
		201	$table->add ($_, 0, new CFClient::UI::Label align => 0, fg => [1, 1, 0], text => $col[$_])
		202	for 0 .. $#col;
		203
		204	my @align = qw(1 0 1 1 -1);
		205
		206	my $y = 0;
		207	for my $m (sort { $b->[3] <=> $a->[3] } map [split /\\|/], split /\015?\012/, $buf) {
		208	my ($ip, $last, $host, $users, $version, $desc, $ibytes, $obytes, $uptime) = @$m;
		209
		210	for ($desc) {
		211	s/<br>/\n/gi;
		212	s/<li>/\n· /gi;
		213	s/<.*?>//sgi;
		214	s/&/&/g;
		215	s/</</g;
		216	s/>/>/g;
		217	}
		218
		219	$uptime = sprintf "%dd %02d:%02d:%02d",
		220	(int $m->[8] / 86400),
		221	(int $m->[8] / 3600) % 24,
		222	(int $m->[8] / 60) % 60,
		223	$m->[8] % 60;
		224
		225	$m = [$users, $host, $uptime, $version, $desc];
		226
		227	$y++;
		228
		229	$table->add (0, $y, new CFClient::UI::VBox children => [
		230	(new CFClient::UI::Button text => " ", connect_activate => sub {
		231	$HOST->set_text ($CFG->{host} = $host);
		232	}),
		233	(new CFClient::UI::Empty expand => 1),
		234	]);
		235
		236	$table->add ($_ + 1, $y, new CFClient::UI::Label align => $align[$_], text => $m->[$_], fontsize => $FONTSIZE * 0.8)
		237	for 0 .. $#$m;
		238	}
		239	}
		240	});
		241	}
		242
		243	sub server_setup {
		244	my $dialog = new CFClient::UI::FancyFrame
		245	child => (my $vbox = new CFClient::UI::VBox);
137		246
138	$vbox->add (new CFClient::UI::Label align => 0, text => "Server Setup");	247	$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]);	248	$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");	249	$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});	250
142		251	{
143	$table->add (0, 3, new CFClient::UI::Label align => 1, text => "Port");	252	$table->add (1, 2, my $vbox = new CFClient::UI::VBox);
144	$table->add (1, 3, my $port = new CFClient::UI::Entry text => $CFG->{port});	253
		254	$vbox->add (my $HOST = new CFClient::UI::Entry text => $CFG->{host}, connect_changed => sub {
		255	my ($self, $value) = @_;
		256	$CFG->{host} = $value;
		257	});
		258
		259	$METASERVER = metaserver_dialog;
		260
		261	$vbox->add (new CFClient::UI::Flopper text => "Metaserver", other => $METASERVER, connect_open => sub {
		262	update_metaserver $HOST;
		263	});
		264	}
145		265
146	$table->add (0, 4, new CFClient::UI::Label align => 1, text => "Username");	266	$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});	267	$table->add (1, 4, new CFClient::UI::Entry text => $CFG->{user}, connect_changed => sub {
		268	my ($self, $value) = @_;
		269	$CFG->{user} = $value;
		270	});
148		271
149	$table->add (0, 5, new CFClient::UI::Label align => 1, text => "Password");	272	$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);	273	$table->add (1, 5, new CFClient::UI::Entry text => $CFG->{password}, hidden => 1, connect_changed => sub {
		274	my ($self, $value) = @_;
		275	$CFG->{password} = $value;
		276	});
151		277
		278	$table->add (0, 6, new CFClient::UI::Label align => 1, text => "Def. say cmd");
		279	$table->add (1, 6, my $saycmd = new CFClient::UI::Entry text => $CFG->{say_command}, connect_changed => sub {
		280	my ($self, $value) = @_;
		281	$CFG->{say_command} = $value;
		282	});
		283
152	$table->add (0, 6, new CFClient::UI::Label align => 1, text => "Map Size");	284	$table->add (0, 7, new CFClient::UI::Label align => 1, text => "Map Size");
153	$table->add (1, 6, new CFClient::UI::Slider	285	$table->add (1, 7, new CFClient::UI::Slider
154	req_w => 100,	286	req_w => 100,
155	range => [$CFG->{mapsize}, 10, 100 + 1, 1],	287	range => [$CFG->{mapsize}, 10, 100 + 1, 1],
156	connect_changed => sub {	288	connect_changed => sub {
157	my ($self, $value) = @_;	289	my ($self, $value) = @_;
158		290
159	$CFG->{mapsize} = $self->{range}[0] = $value = int $value;	291	$CFG->{mapsize} = $self->{range}[0] = $value = int $value;
160	},	292	},
161	);	293	);
162		294
163	$table->add (1, 7, new CFClient::UI::Button expand => 1, align => 0, text => "Login", connect_activate => sub {	295	$table->add (1, 8, new CFClient::UI::Button expand => 1, align => 0, text => "Login", connect_activate => sub {
164	start_game;	296	start_game;
165	});	297	});
166		298
167	$vbox->add (my $hbox = new CFClient::UI::HBox);	299	$dialog
		300	}
168		301
169	$hbox->add (new CFClient::UI::Button expand => 1, align => 0, text => "Save", connect_activate => sub {	302	sub message_window {
170	CFClient::write_cfg "$Crossfire::VARDIR/pclientrc";	303	my $window = new CFClient::UI::FancyFrame
171	status "Configuration Saved";	304	border_bg => [1, 1, 1, 0.5],
		305	bg => [0.3, 0.3, 0.3, 0.8],
		306	user_w => int $::WIDTH / 3,
		307	user_h => int $::HEIGHT / 5,
		308	child => (my $vbox = new CFClient::UI::VBox);
		309
		310	$vbox->add ($LOGVIEW = new CFClient::UI::TextView
		311	expand => 1,
		312	fontsize => $::CFG->{log_fontsize},
172	});	313	);
173	$CFClient::UI::TOPLEVEL->add ($dialog);	314
		315	$vbox->add (my $input = new CFClient::UI::Entry
		316	connect_focus_in => sub {
		317	my ($input, $prev_focus) = @_;
		318
		319	delete $input->{refocus_map};
		320
		321	if ($prev_focus == $MAPWIDGET && $input->{auto_activated}) {
		322	$input->{refocus_map} = 1;
		323	}
		324	delete $input->{auto_activated};
		325	},
		326	connect_activate => sub {
		327	my ($input, $text) = @_;
		328	$input->set_text ('');
		329
		330	if ($text =~ /^\/(.*)/) {
		331	$::CONN->user_send ($1);
		332	} else {
		333	my $say_cmd = $::CFG->{say_command} \|\| 'say';
		334	$::CONN->user_send ("$say_cmd $text");
		335	}
		336	if ($input->{refocus_map}) {
		337	delete $input->{refocus_map};
		338	$MAPWIDGET->focus_in
		339	}
		340	},
		341	connect_escape => sub {
		342	$MAPWIDGET->focus_in
		343	},
		344	);
		345
		346	$CONSOLE = {
		347	window => $window,
		348	input => $input
		349	};
		350
		351	$window
174	}	352	}
175		353
176	sub sdl_init {	354	sub sdl_init {
177	SDL::Init SDL_INIT_AUDIO \| SDL_INIT_VIDEO \| SDL_INIT_NOPARACHUTE	355	SDL::Init SDL_INIT_AUDIO \| SDL_INIT_VIDEO \| SDL_INIT_NOPARACHUTE
		356	#SDL::Init SDL_INIT_AUDIO \| SDL_INIT_VIDEO
178	and die "SDL::Init failed!\n";	357	and die "SDL::Init failed!\n";
179	}	358	}
180		359
181	sub init_screen {	360	sub init_screen {
182	sdl_init;	361	sdl_init;
…		…
186	$FAST = $CFG->{fast};	365	$FAST = $CFG->{fast};
187		366
188	SDL::GLSetAttribute SDL_GL_RED_SIZE, 5;	367	SDL::GLSetAttribute SDL_GL_RED_SIZE, 5;
189	SDL::GLSetAttribute SDL_GL_GREEN_SIZE, 5;	368	SDL::GLSetAttribute SDL_GL_GREEN_SIZE, 5;
190	SDL::GLSetAttribute SDL_GL_BLUE_SIZE, 5;	369	SDL::GLSetAttribute SDL_GL_BLUE_SIZE, 5;
191	SDL::GLSetAttribute SDL_GL_ALPHA_SIZE, 0;	370	SDL::GLSetAttribute SDL_GL_ALPHA_SIZE, 1;
192		371
193	SDL::GLSetAttribute SDL_GL_ACCUM_RED_SIZE, 0;	372	SDL::GLSetAttribute SDL_GL_ACCUM_RED_SIZE, 0;
194	SDL::GLSetAttribute SDL_GL_ACCUM_GREEN_SIZE, 0;	373	SDL::GLSetAttribute SDL_GL_ACCUM_GREEN_SIZE, 0;
195	SDL::GLSetAttribute SDL_GL_ACCUM_BLUE_SIZE, 0;	374	SDL::GLSetAttribute SDL_GL_ACCUM_BLUE_SIZE, 0;
196	SDL::GLSetAttribute SDL_GL_ACCUM_ALPHA_SIZE, 0;	375	SDL::GLSetAttribute SDL_GL_ACCUM_ALPHA_SIZE, 0;
…		…
217		396
218	$FONTSIZE = int $HEIGHT / 40;	397	$FONTSIZE = int $HEIGHT / 40;
219		398
220	#############################################################################	399	#############################################################################
221		400
222	$DEBUG_STATUS = new CFClient::UI::Label padding => 0;	401	$DEBUG_STATUS = new CFClient::UI::Label padding => 0, z => 100;
223	$CFClient::UI::TOPLEVEL->add ($DEBUG_STATUS);	402	$CFClient::UI::ROOT->add ($DEBUG_STATUS);
224		403
225	$STATUS_LINE = new CFClient::UI::Label	404	$STATUS_LINE = new CFClient::UI::Label
226	padding => 0,	405	padding => 0,
227	y => $HEIGHT * 49 / 50 - $FONTSIZE;	406	y => $HEIGHT * 44 / 45 - $FONTSIZE;
228	$CFClient::UI::TOPLEVEL->add ($STATUS_LINE);	407	$CFClient::UI::ROOT->add ($STATUS_LINE);
229		408
230	$ALT_ENTER_MESSAGE = new CFClient::UI::Label	409	$ALT_ENTER_MESSAGE = new CFClient::UI::Label
231	padding => 0,	410	padding => 0,
232	y => $HEIGHT * 49 / 50,	411	y => $HEIGHT * 44 / 45,
233	height => $HEIGHT / 50,	412	fontsize => $HEIGHT / 45,
234	text => "Use <b>Alt-Enter</b> to toggle fullscreen mode";	413	markup => "Use <b>Alt-Enter</b> to toggle fullscreen mode";
235	$CFClient::UI::TOPLEVEL->add ($ALT_ENTER_MESSAGE);	414	$CFClient::UI::ROOT->add ($ALT_ENTER_MESSAGE);
236		415
237	$MAPWIDGET = new CFClient::UI::MapWidget;	416	$CFClient::UI::ROOT->add ($MAPWIDGET = new CFClient::UI::MapWidget);
238	$CFClient::UI::TOPLEVEL->add ($MAPWIDGET);
239	$MAPWIDGET->focus_in;	417	$MAPWIDGET->focus_in;
		418	$MAPWIDGET->connect (activate_console => sub {
		419	my ($mapwidget, $preset) = @_;
240		420
241	config_dialog;	421	if ($CONSOLE) {
		422	$CONSOLE->{input}->{auto_activated} = 1;
		423	$CONSOLE->{input}->focus_in;
		424
		425	if ($preset && $CONSOLE->{input}->get_text eq '') {
		426	$CONSOLE->{input}->set_text ($preset);
		427	}
		428	}
		429	});
		430
		431	$CFClient::UI::ROOT->add ($BUTTONBAR = new CFClient::UI::HBox);
		432
		433	$BUTTONBAR->add (new CFClient::UI::Flopper text => "Client Setup", other => client_setup);
		434	$BUTTONBAR->add (new CFClient::UI::Flopper text => "Server Setup", other => server_setup);
		435	$BUTTONBAR->add (new CFClient::UI::Flopper text => "Message Window", other => message_window);
		436
		437	$BUTTONBAR->add (new CFClient::UI::Button text => "Save Config", connect_activate => sub {
		438	CFClient::write_cfg "$Crossfire::VARDIR/pclientrc";
		439	status "Configuration Saved";
		440	});
		441
		442	$BUTTONBAR->{children}[1]->emit ("activate"); # pop up server setup
		443
		444	my $tgw = new CFClient::UI::FancyFrame (x => $WIDTH - 300, y => 0);
		445	$tgw->add (my $hbox = new CFClient::UI::HBox ());
		446
		447	$hbox->add (my $hg = new CFClient::UI::VGauge (gauge => 'hp'));
		448	$hbox->add (my $mg = new CFClient::UI::VGauge (gauge => 'mana'));
		449	$hbox->add (my $gg = new CFClient::UI::VGauge (gauge => 'grace'));
		450	$hbox->add (my $fg = new CFClient::UI::VGauge (gauge => 'food'));
		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	my $mapmapw = 250;
		642	my $mapmaph = 250;
		643
		644	$self->flood_fill ("", $hash, $flags,
		645	$ox - $mapmapw * 0.5, $oy - $mapmapw * 0.5,
		646	$ox + $mapmapw * 0.5, $oy + $mapmapw * 0.5);
		647
		648	$x += $ox;
		649	$y += $oy;
		650
		651	$self->{map_info} = [$hash, $x, $y, $w, $h];
		652
		653	$self->load_map ($hash, $x, $y);
347	}	654	}
348		655
349	sub conn::face_find {	656	sub conn::face_find {
350	my ($self, $face) = @_;	657	my ($self, $facenum, $face) = @_;
351		658
352	$FACECACHE->{"$face->{chksum},$face->{name}"}	659	my $hash = "$face->{chksum},$face->{name}";
		660
		661	my $id = $FACEMAP->get ($hash);
		662
		663	unless ($id) {
		664	# create new id for face
		665	# i love transactions
		666	for (1..100) {
		667	my $txn = $CFClient::DB_ENV->txn_begin;
		668	my $status = $FACEMAP->db_get (id => $id, BerkeleyDB::DB_RMW);
		669	if ($status == 0 \|\| $status == BerkeleyDB::DB_NOTFOUND) {
		670	$id++;
		671	if ($FACEMAP->put (id => $id) == 0
		672	&& $FACEMAP->put ($hash => $id) == 0) {
		673	$txn->txn_commit;
		674
		675	goto gotid;
		676	}
		677	}
		678	$txn->abort;
		679	}
		680
		681	CFClient::fatal "maximum number of transaction retries reached - database problems?";
		682	}
		683
		684	gotid:
		685	$face->{id} = $id;
		686	$MAP->set_face ($facenum => $id);
		687	$TILECACHE->get ($id)
353	}	688	}
354		689
355	sub conn::face_update {	690	sub conn::face_update {
356	my ($self, $facenum, $face) = @_;	691	my ($self, $facenum, $face) = @_;
357		692
358	$FACECACHE->{"$face->{chksum},$face->{name}"} = $face->{image};	693	$TILECACHE->put ($face->{id} => $face->{image}); #TODO: try to avoid duplicate writes
359		694
360	my $tex = $face->{texture} = new_from_image CFClient::Texture delete $face->{image};	695	$self->set_texture ($face->{id} => delete $face->{image});
		696	}
361		697
		698	sub conn::set_texture {
		699	my ($self, $id, $data) = @_;
		700
		701	$self->{texture}[$id] \|\|= do {
		702	my $tex =
		703	new_from_image CFClient::Texture
		704	$data, minify => 1;
		705
362	$MAP->set_texture ($facenum, @$tex{qw(name w h s t)});	706	$MAP->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}});
363	$MAPWIDGET->update;	707	$MAPWIDGET->update;
		708
		709	$tex
		710	};
364	}	711	}
365		712
366	sub conn::query {	713	sub conn::query {
367	my ($self, $flags, $prompt) = @_;	714	my ($self, $flags, $prompt) = @_;
368		715
		716	#TODO
369	warn "<<<<QUERY:$flags:$prompt>>>\n";#d#	717	warn "<<<<QUERY:$flags:$prompt>>>\n";#d#
		718	}
		719
		720	sub conn::drawinfo {
		721	my ($self, $color, $text) = @_;
		722
		723	my @color = (
		724	[1.00, 1.00, 1.00], #[0.00, 0.00, 0.00],
		725	[1.00, 1.00, 1.00],
		726	[0.50, 0.50, 1.00], #[0.00, 0.00, 0.55]
		727	[1.00, 0.00, 0.00],
		728	[1.00, 0.54, 0.00],
		729	[0.11, 0.56, 1.00],
		730	[0.93, 0.46, 0.00],
		731	[0.18, 0.54, 0.34],
		732	[0.56, 0.73, 0.56],
		733	[0.80, 0.80, 0.80],
		734	[0.55, 0.41, 0.13],
		735	[0.99, 0.77, 0.26],
		736	[0.74, 0.65, 0.41],
		737	);
		738
		739	$LOGVIEW->add_paragraph ($color[$color], $text);
370	}	740	}
371		741
372	%SDL_CB = (	742	%SDL_CB = (
373	SDL_QUIT() => sub {	743	SDL_QUIT() => sub {
374	Event::unloop -1;	744	Event::unloop -1;
…		…
379	refresh;	749	refresh;
380	},	750	},
381	SDL_KEYDOWN() => sub {	751	SDL_KEYDOWN() => sub {
382	if ($SDL_EV->key_mod & KMOD_ALT && $SDL_EV->key_sym == SDLK_RETURN) {	752	if ($SDL_EV->key_mod & KMOD_ALT && $SDL_EV->key_sym == SDLK_RETURN) {
383	# alt-enter	753	# alt-enter
384	$FULLSCREEN = !$FULLSCREEN;
385	destroy_screen;	754	destroy_screen;
		755	$CFG->{fullscreen} = !$CFG->{fullscreen};
386	init_screen;	756	init_screen;
387	} else {	757	} else {
388	CFClient::UI::feed_sdl_key_down_event ($SDL_EV);	758	CFClient::UI::feed_sdl_key_down_event ($SDL_EV);
389	}	759	}
390	},	760	},
…		…
405	},	775	},
406	);	776	);
407		777
408	#############################################################################	778	#############################################################################
409		779
		780	$SIG{INT} = $SIG{TERM} = sub { exit };
		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";	828	END { SDL::Quit }
454		829
		830

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.132 by root, Tue Apr 18 02:07: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.132 by root, Tue Apr 18 02:07:37 2006 UTC