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

Comparing deliantra/Deliantra-Client/bin/pclient (file contents):
Revision 1.86 by root, Wed Apr 12 18:09:22 2006 UTC vs.
Revision 1.118 by elmex, Sun Apr 16 17:43:17 2006 UTC

…		…
1	#!/opt/bin/perl	1	#!/opt/bin/perl
2		2
3	use strict;	3	use strict;
4	use utf8;	4	use utf8;
5		5
6	use Glib;	6	use Time::HiRes 'time';
7	use Gtk2 -init;	7	use Event;
8		8
9	use SDL;	9	use SDL;
10	use SDL::App;	10	use SDL::App;
11	use SDL::Event;	11	use SDL::Event;
12	use SDL::Surface;	12	use SDL::Surface;
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	26	my $MIN_FPS = 5; # unused as of yet
25	my $TICKS_PER_FRAME = int 1000 / $MAX_FPS - 1; # min ticks per frame
26		27
		28	our $META_SERVER = "crossfire.real-time.com:13326";
		29
		30	our $FACEMAP;
		31	our $TILECACHE;
27	our $FACECACHE;	32	our $MAPCACHE;
		33
		34	our $LAST_REFRESH;
		35	our $NOW;
28		36
29	our $CFG;	37	our $CFG;
30	our $CONN;	38	our $CONN;
31	our $FAST; # fast, low-quality mode, possibly useful for software-rendering	39	our $FAST; # fast, low-quality mode, possibly useful for software-rendering
32		40
33	our @SDL_MODES;	41	our @SDL_MODES;
34	our $WIDTH;	42	our $WIDTH;
35	our $HEIGHT;	43	our $HEIGHT;
36	our $FULLSCREEN;	44	our $FULLSCREEN;
		45	our $FONTSIZE;
37		46
38	our $NOW;	47	our $MAP;
39
40	our $MAPWIDGET;	48	our $MAPWIDGET;
41	our $FONTSIZE;	49	our $BUTTONBAR;
		50	our $LOGVIEW;
		51	our $CONSOLE;
		52	our $METASERVER;
42		53
43	our $SDL_TIMER;
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
52	my $last_refresh;
53	my %ANIMATE;
54	my $refresh_handler;
55		61
56	sub status {	62	sub status {
57	$STATUS_LINE->set_text ($_[0]);	63	$STATUS_LINE->set_text ($_[0]);
58	my ($w, $h) = $STATUS_LINE->size_request;	64	my ($w, $h) = $STATUS_LINE->size_request;
59	$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);
66	}	72	}
67		73
68	sub start_game {	74	sub start_game {
69	status "logging in...";	75	status "logging in...";
70		76
71	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;
72		78
		79	$MAPCACHE = CFClient::db_table "mapcache_$CFG->{host}";
		80
		81	$MAP = new CFClient::Map $mapsize, $mapsize;
		82
		83	my ($host, $port) = split /:/, $CFG->{host};
		84
73	$CONN = new conn	85	$CONN = new conn
74	host => $CFG->{host},	86	host => $host,
75	port => $CFG->{port},	87	port => $port \|\| 13327,
76	user => $CFG->{user},	88	user => $CFG->{user},
77	pass => $CFG->{password},	89	pass => $CFG->{password},
78	mapw => $mapsize,	90	mapw => $mapsize,
79	maph => $mapsize,	91	maph => $mapsize,
80	;	92	;
…		…
86		98
87	sub stop_game {	99	sub stop_game {
88	undef $CONN;	100	undef $CONN;
89	}	101	}
90		102
91	sub config_dialog {	103	sub client_setup {
92	my $dialog = new CFClient::UI::FancyFrame x => 300, y => 100,	104	my $dialog = new CFClient::UI::FancyFrame
93	child => (my $vbox = new CFClient::UI::VBox);	105	child => (my $vbox = new CFClient::UI::VBox);
94	$vbox->add (new CFClient::UI::Label align => 0, text => "Client Setup");	106	$vbox->add (new CFClient::UI::Label align => 0, text => "Client Setup");
95	$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]);
96		108
97	$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");
…		…
112	$table->add (1, 1, new CFClient::UI::CheckBox state => $CFG->{fullscreen}, connect_changed => sub {	124	$table->add (1, 1, new CFClient::UI::CheckBox state => $CFG->{fullscreen}, connect_changed => sub {
113	my ($self, $value) = @_;	125	my ($self, $value) = @_;
114	$CFG->{fullscreen} = $value;	126	$CFG->{fullscreen} = $value;
115	});	127	});
116		128
		129	$table->add (0, 2, new CFClient::UI::Label align => 1, text => "Fast & Ugly");
		130	$table->add (1, 2, new CFClient::UI::CheckBox state => $CFG->{fast}, connect_changed => sub {
		131	my ($self, $value) = @_;
		132	$CFG->{fast} = $value;
		133	});
		134
		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");
		142	$table->add (1, 4, new CFClient::UI::Slider range => [$CFG->{fow_intensity}, 0, 1 + 0.001, 0.001], connect_changed => sub {
		143	my ($self, $value) = @_;
		144	$CFG->{fow_intensity} = $value;
		145	});
		146
		147	$table->add (0, 5, new CFClient::UI::Label align => 1, text => "FoW Smooth");
		148	$table->add (1, 5, new CFClient::UI::CheckBox state => $CFG->{fow_smooth}, connect_changed => sub {
		149	my ($self, $value) = @_;
		150	$CFG->{fow_smooth} = $value;
		151	});
		152
		153	$table->add (0, 6, new CFClient::UI::Label align => 1, text => "Log Fontsize");
		154	$table->add (1, 6, new CFClient::UI::Slider range => [$CFG->{log_fontsize}, 8, 30, 1], connect_changed => sub {
		155	my ($self, $value) = @_;
		156	$LOGVIEW->set_fontsize ($CFG->{log_fontsize} = int $value);
		157	});
		158
117	$table->add (1, 2, 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 {
118	destroy_screen ();	160	destroy_screen ();
119	init_screen ();	161	init_screen ();
120	});	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);
121		245
122	$vbox->add (new CFClient::UI::Label align => 0, text => "Server");	246	$vbox->add (new CFClient::UI::Label align => 0, text => "Server Setup");
123	$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]);
124	$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");
125	$table->add (1, 2, my $host = new CFClient::UI::Entry text => $CFG->{host});	249
126		250	{
127	$table->add (0, 3, new CFClient::UI::Label align => 1, text => "Port");	251	$table->add (1, 2, my $vbox = new CFClient::UI::VBox);
128	$table->add (1, 3, my $port = new CFClient::UI::Entry text => $CFG->{port});	252
		253	$vbox->add (my $HOST = new CFClient::UI::Entry text => $CFG->{host}, connect_changed => sub {
		254	my ($self, $value) = @_;
		255	$CFG->{host} = $value;
		256	});
		257
		258	$METASERVER = metaserver_dialog;
		259
		260	$vbox->add (new CFClient::UI::Flopper text => "Metaserver", other => $METASERVER, connect_open => sub {
		261	update_metaserver $HOST;
		262	});
		263	}
129		264
130	$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");
131	$table->add (1, 4, my $user = new CFClient::UI::Entry text => $CFG->{user});	266	$table->add (1, 4, new CFClient::UI::Entry text => $CFG->{user}, connect_changed => sub {
		267	my ($self, $value) = @_;
		268	$CFG->{user} = $value;
		269	});
132		270
133	$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");
134	$table->add (1, 5, my $pass = new CFClient::UI::Entry text => $CFG->{password}, hidden => 1);	272	$table->add (1, 5, new CFClient::UI::Entry text => $CFG->{password}, hidden => 1, connect_changed => sub {
		273	my ($self, $value) = @_;
		274	$CFG->{password} = $value;
		275	});
135		276
		277	$table->add (0, 6, new CFClient::UI::Label align => 1, text => "Def. say cmd");
		278	$table->add (1, 6, my $saycmd = new CFClient::UI::Entry text => $CFG->{say_command}, connect_changed => sub {
		279	my ($self, $value) = @_;
		280	$CFG->{say_command} = $value;
		281	});
		282
136	$table->add (0, 6, new CFClient::UI::Label align => 1, text => "Map Size");	283	$table->add (0, 7, new CFClient::UI::Label align => 1, text => "Map Size");
137	$table->add (1, 6, new CFClient::UI::Slider	284	$table->add (1, 7, new CFClient::UI::Slider
138	req_w => 100,	285	req_w => 100,
139	range => [$CFG->{mapsize}, 10, 100 + 1, 1],	286	range => [$CFG->{mapsize}, 10, 100 + 1, 1],
140	connect_changed => sub {	287	connect_changed => sub {
141	my ($self, $value) = @_;	288	my ($self, $value) = @_;
142		289
143	$CFG->{mapsize} = $self->{range}[0] = $value = int $value;	290	$CFG->{mapsize} = $self->{range}[0] = $value = int $value;
144	},	291	},
145	);	292	);
146		293
147	$table->add (1, 7, 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 {
148	start_game;	295	start_game;
149	});	296	});
150		297
151	$vbox->add (my $hbox = new CFClient::UI::HBox);	298	$dialog
		299	}
152		300
153	$hbox->add (new CFClient::UI::Button expand => 1, align => 0, text => "Save", connect_activate => sub {	301	sub message_window {
154	CFClient::write_cfg "$Crossfire::VARDIR/pclientrc";	302	my $window = new CFClient::UI::FancyFrame
155	status "Configuration Saved";	303	border_bg => [1, 1, 1, 0.5],
		304	bg => [0.3, 0.3, 0.3, 0.8],
		305	user_w => $::WIDTH/4,
		306	user_h => $::HEIGHT,
		307	child => (my $vbox = new CFClient::UI::VBox);
		308
		309	$vbox->add ($LOGVIEW = new CFClient::UI::TextView
		310	expand => 1,
		311	fontsize => $::CFG->{log_fontsize},
156	});	312	);
157	$CFClient::UI::TOPLEVEL->add ($dialog);	313
		314	$vbox->add (my $input = new CFClient::UI::LineEntry
		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	},
		325	connect_activate => sub {
		326	my ($input, $text) = @_;
		327	$input->set_text ('');
		328
		329	if ($text =~ /^\/(.*)/) {
		330	$::CONN->user_send ("command $1");
		331	} else {
		332	my $say_cmd = $::CFG->{say_command} \|\| 'say';
		333	$::CONN->user_send ("command $say_cmd $text");
		334	}
		335	if ($input->{refocus_map}) {
		336	delete $input->{refocus_map};
		337	$MAPWIDGET->focus_in
		338	}
		339	},
		340	connect_escape => sub {
		341	$MAPWIDGET->focus_in
		342	},
		343	);
		344
		345	$CONSOLE = {
		346	window => $window,
		347	input => $input
		348	};
		349
		350	$window
		351	}
		352
		353	sub sdl_init {
		354	#SDL::Init SDL_INIT_AUDIO \| SDL_INIT_VIDEO \| SDL_INIT_NOPARACHUTE
		355	SDL::Init SDL_INIT_AUDIO \| SDL_INIT_VIDEO
		356	and die "SDL::Init failed!\n";
158	}	357	}
159		358
160	sub init_screen {	359	sub init_screen {
		360	sdl_init;
		361
161	($WIDTH, $HEIGHT) = @{ $SDL_MODES[$CFG->{sdl_mode}] };	362	($WIDTH, $HEIGHT) = @{ $SDL_MODES[$CFG->{sdl_mode}] };
162	$FULLSCREEN = $CFG->{fullscreen};	363	$FULLSCREEN = $CFG->{fullscreen};
163		364	$FAST = $CFG->{fast};
164	SDL::Init SDL_INIT_TIMER \| SDL_INIT_AUDIO \| SDL_INIT_VIDEO
165	and die "SDL::Init failed!\n";
166		365
167	SDL::GLSetAttribute SDL_GL_RED_SIZE, 5;	366	SDL::GLSetAttribute SDL_GL_RED_SIZE, 5;
168	SDL::GLSetAttribute SDL_GL_GREEN_SIZE, 5;	367	SDL::GLSetAttribute SDL_GL_GREEN_SIZE, 5;
169	SDL::GLSetAttribute SDL_GL_BLUE_SIZE, 5;	368	SDL::GLSetAttribute SDL_GL_BLUE_SIZE, 5;
170	SDL::GLSetAttribute SDL_GL_ALPHA_SIZE, 0;	369	SDL::GLSetAttribute SDL_GL_ALPHA_SIZE, 1;
171		370
172	SDL::GLSetAttribute SDL_GL_ACCUM_RED_SIZE, 0;	371	SDL::GLSetAttribute SDL_GL_ACCUM_RED_SIZE, 0;
173	SDL::GLSetAttribute SDL_GL_ACCUM_GREEN_SIZE, 0;	372	SDL::GLSetAttribute SDL_GL_ACCUM_GREEN_SIZE, 0;
174	SDL::GLSetAttribute SDL_GL_ACCUM_BLUE_SIZE, 0;	373	SDL::GLSetAttribute SDL_GL_ACCUM_BLUE_SIZE, 0;
175	SDL::GLSetAttribute SDL_GL_ACCUM_ALPHA_SIZE, 0;	374	SDL::GLSetAttribute SDL_GL_ACCUM_ALPHA_SIZE, 0;
…		…
188	$SDL_EV = new SDL::Event;	387	$SDL_EV = new SDL::Event;
189	$SDL_EV->set_unicode (1);	388	$SDL_EV->set_unicode (1);
190		389
191	$SDL_ACTIVE = 1;	390	$SDL_ACTIVE = 1;
192		391
193	$SDL_TIMER = add Glib::Timeout 1000 / $MAX_FPS, sub {	392	$LAST_REFRESH = time - 0.01;
194	($SDL_CB{$SDL_EV->type} \|\| sub { warn "unhandled event ", $SDL_EV->type })->()
195	while $SDL_EV->poll;
196
197	1
198	};
199
200	$last_refresh = SDL::GetTicks;
201		393
202	CFClient::gl_init;	394	CFClient::gl_init;
203		395
204	$FONTSIZE = int $HEIGHT / 40;	396	$FONTSIZE = int $HEIGHT / 40;
205		397
206	#############################################################################	398	#############################################################################
207		399
208	$DEBUG_STATUS = new CFClient::UI::Label padding => 0;	400	$DEBUG_STATUS = new CFClient::UI::Label padding => 0, z => 100;
209	$CFClient::UI::TOPLEVEL->add ($DEBUG_STATUS);	401	$CFClient::UI::ROOT->add ($DEBUG_STATUS);
210		402
211	$STATUS_LINE = new CFClient::UI::Label	403	$STATUS_LINE = new CFClient::UI::Label
212	padding => 0,	404	padding => 0,
213	y => $HEIGHT * 49 / 50 - $FONTSIZE;	405	y => $HEIGHT * 44 / 45 - $FONTSIZE;
214	$CFClient::UI::TOPLEVEL->add ($STATUS_LINE);	406	$CFClient::UI::ROOT->add ($STATUS_LINE);
215		407
216	$ALT_ENTER_MESSAGE = new CFClient::UI::Label	408	$ALT_ENTER_MESSAGE = new CFClient::UI::Label
217	padding => 0,	409	padding => 0,
218	y => $HEIGHT * 49 / 50,	410	y => $HEIGHT * 44 / 45,
219	height => $HEIGHT / 50,	411	height => $HEIGHT / 45,
220	text => "Use <b>Alt-Enter</b> to toggle fullscreen mode";	412	text => "Use <b>Alt-Enter</b> to toggle fullscreen mode";
221	$CFClient::UI::TOPLEVEL->add ($ALT_ENTER_MESSAGE);	413	$CFClient::UI::ROOT->add ($ALT_ENTER_MESSAGE);
222		414
223	$MAPWIDGET = new CFClient::UI::MapWidget;	415	$CFClient::UI::ROOT->add ($MAPWIDGET = new CFClient::UI::MapWidget);
224	$CFClient::UI::TOPLEVEL->add ($MAPWIDGET);
225	$MAPWIDGET->focus_in;	416	$MAPWIDGET->focus_in;
		417	$MAPWIDGET->connect (activate_console => sub {
		418	my ($mapwidget, $preset) = @_;
226		419
227	config_dialog;	420	if ($CONSOLE) {
		421	$CONSOLE->{input}->{auto_activated} = 1;
		422	$CONSOLE->{input}->focus_in;
		423
		424	if ($preset && $CONSOLE->{input}->get_text eq '') {
		425	$CONSOLE->{input}->set_text ($preset);
		426	}
		427	}
		428	});
		429
		430	$CFClient::UI::ROOT->add ($BUTTONBAR = new CFClient::UI::HBox);
		431
		432	$BUTTONBAR->add (new CFClient::UI::Flopper text => "Client Setup", other => client_setup);
		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}[0]->emit ("activate");
228	}	442	}
229		443
230	sub destroy_screen {	444	sub destroy_screen {
231	$CFClient::UI::TOPLEVEL->{children} = [];	445	$CFClient::UI::ROOT->{children} = [];
232	remove Glib::Source $SDL_TIMER;
233	remove Glib::Source $refresh_handler if $refresh_handler;
234	undef $refresh_handler;
235	undef $SDL_ACTIVE;	446	undef $SDL_ACTIVE;
236	undef $SDL_EV;	447	undef $SDL_EV;
237	SDL::Quit;	448	SDL::Quit;
238	}	449	}
239		450
		451	my %animate_object;
		452	my $animate_timer;
		453
		454	my $want_refresh;
		455	my $can_refresh;
		456
		457	my $fps = 9;
		458
240	sub force_refresh {	459	sub force_refresh {
241	glViewport 0, 0, $WIDTH, $HEIGHT;	460	$fps = $fps * 0.95 + 1 / ($NOW - $LAST_REFRESH) * 0.05;
		461	debug sprintf "%3.2f", $fps;
242		462
243	glMatrixMode GL_PROJECTION;	463	$want_refresh = 0;
244	glLoadIdentity;	464	$can_refresh = 0;
245	glOrtho 0, $WIDTH, $HEIGHT, 0, -10000 , 10000;
246	glMatrixMode GL_MODELVIEW;
247	glLoadIdentity;
248		465
249	glClear GL_COLOR_BUFFER_BIT;
250
251	$CFClient::UI::TOPLEVEL->draw;	466	$CFClient::UI::ROOT->draw;
252		467
253	SDL::GLSwapBuffers;	468	SDL::GLSwapBuffers;
254	}
255		469
256	my $FPS;	470	$LAST_REFRESH = $NOW;
		471	}
		472
		473	my $refresh_watcher = Event->timer (after => 0, hard => 1, interval => 1 / $MAX_FPS, cb => sub {
		474	$NOW = time;
		475
		476	($SDL_CB{$SDL_EV->type} \|\| sub { warn "unhandled event ", $SDL_EV->type })->()
		477	while $SDL_EV->poll;
		478
		479	if (%animate_object) {
		480	$_->animate ($LAST_REFRESH - $NOW) for values %animate_object;
		481	$want_refresh++;
		482	}
		483
		484	if ($want_refresh) {
		485	force_refresh;
		486	} else {
		487	$can_refresh = 1;
		488	}
		489	});
257		490
258	sub refresh {	491	sub refresh {
259	$refresh_handler \|\|= add Glib::Idle sub {	492	$want_refresh++;
260	if ($SDL_ACTIVE) {
261	$NOW = SDL::GetTicks;
262
263	if ($NOW - $last_refresh < $TICKS_PER_FRAME) {
264	SDL::Delay $TICKS_PER_FRAME - ($NOW - $last_refresh);
265	$NOW = SDL::GetTicks;
266	}
267
268	my $interval = ($NOW - $last_refresh) * 0.001;
269	$last_refresh = $NOW;
270
271	if ($interval) {
272	$FPS \|\|= 1 / $interval;
273	$FPS = $FPS * 0.9 + (1 / $interval) * 0.1;
274	debug sprintf "%5.02f", $FPS;
275	}
276
277	force_refresh;
278	$_->animate ($interval) for grep $_, values %ANIMATE;
279
280	if (%ANIMATE) {
281	1
282	} else {
283	undef $refresh_handler;
284	0
285	}
286	} else {
287	undef $refresh_handler;
288	0
289	}
290	};
291	}	493	}
292		494
293	sub animation_start {	495	sub animation_start {
294	my ($widget) = @_;	496	my ($widget) = @_;
295	$ANIMATE{$widget} = $widget;	497	$animate_object{$widget} = $widget;
296	Scalar::Util::weaken $ANIMATE{$widget};
297
298	refresh;
299	}	498	}
300		499
301	sub animation_stop {	500	sub animation_stop {
302	my ($widget) = @_;	501	my ($widget) = @_;
303	delete $ANIMATE{$widget};	502	delete $animate_object{$widget};
		503	}
		504
		505	@conn::ISA = Crossfire::Protocol::;
		506
		507	sub conn::user_send {
		508	my ($self, $command) = @_;
		509
		510	$self->send ($command);
		511	status $command;
		512	}
		513
		514	sub conn::feed_map1a {
		515	my ($self, $data) = @_;
		516
		517	# $self->Crossfire::Protocol::feed_map1a ($data);
		518
		519	$MAP->scroll (delete $self->{delayed_scroll_x}, delete $self->{delayed_scroll_y});
		520	$MAP->map1a_update ($data);
		521	$MAPWIDGET->update;
		522	}
		523
		524	sub conn::flush_map {
		525	my ($self) = @_;
		526
		527	my $map_info = delete $self->{map_info}
		528	or return;
		529
		530	my ($hash, $x, $y, $w, $h) = @$map_info;
		531
		532	my $data = $MAP->get_rect ($x, $y, $w, $h);
		533	$MAPCACHE->put ($hash => Compress::LZF::compress $data);
		534
		535	warn sprintf "SAVEmap[%s] length %d\n", $hash, length $data;#d#
		536
		537	}
		538
		539	sub conn::map_clear {
		540	my ($self) = @_;
		541
		542	$self->flush_map;
		543
		544	$MAP->clear;
		545	}
		546
		547	sub conn::map_info {
		548	my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_;
		549
		550	$self->flush_map;
		551
		552	$x = $::MAP->ox - $x;
		553	$y = $::MAP->oy - $y;
		554
		555	$self->{map_info} = [$hash, $x, $y, $w, $h];
		556
		557	if (defined (my $data = $MAPCACHE->get ($hash))) {
		558	$data = Compress::LZF::decompress $data;
		559	warn sprintf "LOADmap[%s] length %d\n", $hash, 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::face_find {
		570	my ($self, $facenum, $face) = @_;
		571
		572	my $hash = "$face->{chksum},$face->{name}";
		573
		574	my $id = $FACEMAP->get ($hash);
		575
		576	unless ($id) {
		577	# create new id for face
		578	# i love transactions
		579	for (1..100) {
		580	my $txn = $CFClient::DB_ENV->txn_begin;
		581	my $status = $FACEMAP->db_get (id => $id, BerkeleyDB::DB_RMW);
		582	if ($status == 0 \|\| $status == BerkeleyDB::DB_NOTFOUND) {
		583	$id++;
		584	if ($FACEMAP->put (id => $id) == 0
		585	&& $FACEMAP->put ($hash => $id) == 0) {
		586	$txn->txn_commit;
		587
		588	goto gotid;
		589	}
		590	}
		591	$txn->abort;
		592	}
		593
		594	CFClient::fatal "maximum number of transaction retries reached - database problems?";
		595	}
		596
		597	gotid:
		598	$face->{id} = $id;
		599	$MAP->set_face ($facenum => $id);
		600	$TILECACHE->get ($id)
		601	}
		602
		603	sub conn::face_update {
		604	my ($self, $facenum, $face) = @_;
		605
		606	$TILECACHE->put ($face->{id} => $face->{image}); #TODO: try to avoid duplicate writes
		607
		608	$self->set_texture ($face->{id} => delete $face->{image});
		609	}
		610
		611	sub conn::set_texture {
		612	my ($self, $id, $data) = @_;
		613
		614	$self->{texture}[$id] \|\|= do {
		615	my $tex =
		616	new_from_image CFClient::Texture
		617	$data, minify => 1;
		618
		619	$MAP->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}});
		620	$MAPWIDGET->update;
		621
		622	$tex
		623	};
		624	}
		625
		626	sub conn::query {
		627	my ($self, $flags, $prompt) = @_;
		628
		629	#TODO
		630	warn "<<<<QUERY:$flags:$prompt>>>\n";#d#
		631	}
		632
		633	sub conn::drawinfo {
		634	my ($self, $color, $text) = @_;
		635
		636	my @color = (
		637	[1.00, 1.00, 1.00], #[0.00, 0.00, 0.00],
		638	[1.00, 1.00, 1.00],
		639	[0.50, 0.50, 1.00], #[0.00, 0.00, 0.55]
		640	[1.00, 0.00, 0.00],
		641	[1.00, 0.54, 0.00],
		642	[0.11, 0.56, 1.00],
		643	[0.93, 0.46, 0.00],
		644	[0.18, 0.54, 0.34],
		645	[0.56, 0.73, 0.56],
		646	[0.80, 0.80, 0.80],
		647	[0.55, 0.41, 0.13],
		648	[0.99, 0.77, 0.26],
		649	[0.74, 0.65, 0.41],
		650	);
		651
		652	$LOGVIEW->add_paragraph ($color[$color], $text);
304	}	653	}
305		654
306	%SDL_CB = (	655	%SDL_CB = (
307	SDL_QUIT() => sub {	656	SDL_QUIT() => sub {
308	main_quit Gtk2;	657	Event::unloop -1;
309	},	658	},
310	SDL_VIDEORESIZE() => sub {	659	SDL_VIDEORESIZE() => sub {
311	},	660	},
312	SDL_VIDEOEXPOSE() => sub {	661	SDL_VIDEOEXPOSE() => sub {
313	refresh;	662	refresh;
314	},	663	},
315	SDL_KEYDOWN() => sub {	664	SDL_KEYDOWN() => sub {
316	if ($SDL_EV->key_mod & KMOD_ALT && $SDL_EV->key_sym == SDLK_RETURN) {	665	if ($SDL_EV->key_mod & KMOD_ALT && $SDL_EV->key_sym == SDLK_RETURN) {
317	# alt-enter	666	# alt-enter
318	$FULLSCREEN = !$FULLSCREEN;
319	destroy_screen;	667	destroy_screen;
		668	$CFG->{fullscreen} = !$CFG->{fullscreen};
320	init_screen;	669	init_screen;
321	} else {	670	} else {
322	CFClient::UI::feed_sdl_key_down_event ($SDL_EV);	671	CFClient::UI::feed_sdl_key_down_event ($SDL_EV);
323	}	672	}
324	},	673	},
…		…
337	SDL_ACTIVEEVENT() => sub {	686	SDL_ACTIVEEVENT() => sub {
338	# printf "active %x %x\n", $SDL_EV->active_gain, $SDL_EV->active_state;#d#	687	# printf "active %x %x\n", $SDL_EV->active_gain, $SDL_EV->active_state;#d#
339	},	688	},
340	);	689	);
341		690
342	@conn::ISA = Crossfire::Protocol::;
343
344	sub conn::map_update {
345	my ($self, $dirty) = @_;
346
347	$MAPWIDGET->update;
348	}
349
350	sub conn::map_scroll {
351	my ($self, $dx, $dy) = @_;
352
353	# refresh;
354	}
355
356	sub conn::map_clear {
357	my ($self) = @_;
358
359	# refresh;
360	}
361
362	sub conn::face_find {
363	my ($self, $face) = @_;
364
365	$FACECACHE->{"$face->{chksum},$face->{name}"}
366	}
367
368	sub conn::face_update {
369	my ($self, $face) = @_;
370
371	$FACECACHE->{"$face->{chksum},$face->{name}"} = $face->{image};
372
373	$face->{texture} = new_from_image CFClient::Texture delete $face->{image};
374	}
375
376	sub conn::query {
377	my ($self, $flags, $prompt) = @_;
378
379	warn "<<<<QUERY:$flags:$prompt>>>\n";#d#
380	}
381
382	sub gtk_add_cfg_field {
383	my ($tbl, $cfg, $klbl, $key, $value) = @_;
384	my $i = $cfg->{_i}++;
385	$tbl->attach_defaults (my $lbl = Gtk2::Label->new ($klbl), 0, 1, $i, $i + 1);
386	$tbl->attach_defaults (my $ent = Gtk2::Entry->new, 1, 2, $i, $i + 1);
387	if ($key eq 'password') {
388	$ent->set_invisible_char ("*");
389	$ent->set (visibility => 0)
390	}
391	$ent->set_text ($value);
392	$ent->signal_connect (changed => sub {
393	my ($ent) = @_;
394	$cfg->{$key} = $ent->get_text;
395	# TODO: Mapsize should be a slider in the game gui
396	if ($key eq 'mapsize' and $cfg->{$key} > 100) {
397	$cfg->{$key} = 100;
398	} elsif ($key eq 'mapsize' and $cfg->{$key} < 50) {
399	$cfg->{$key} = 50;
400	}
401	});
402	}
403
404	sub run_config_dialog {
405	my (%events) = @_;
406
407	my $w = Gtk2::Window->new;
408
409	my @cfg = (
410	[qw/Host host/],
411	[qw/Port port/],
412	[qw/Mapsize% mapsize/],
413	[qw/Username user/],
414	[qw/Password password/],
415	);
416
417	my $cfg = {};
418
419	$w->add (my $vb = Gtk2::VBox->new);
420	$vb->pack_start (my $t = Gtk2::Table->new (2, scalar @cfg), 0, 0, 0);
421	my $selmode = $::CFG->{width} . 'x' . $::CFG->{height};
422	$t->attach_defaults (Gtk2::Label->new ("Modes"), 0, 1, 0, 1);
423	$t->attach_defaults (my $cb = Gtk2::ComboBox->new_text, 1, 2, 0, 1);
424	my $i = 0;
425	my $act = 0;
426	for (map { "$_->[0]x$_->[1]" } @SDL_MODES) {
427	if ($_ eq $selmode) { $act = $i }
428	$cb->append_text ($_);
429	$i++;
430	}
431	$cb->set_active ($act);
432	$cb->signal_connect (changed => sub {
433	my ($cb) = @_;
434	my $txt = $cb->get_active_text;
435	if ($txt =~ m/(\d+)x(\d+)/) {
436	$::CFG->{width} = $1;
437	$::CFG->{height} = $2;
438	}
439	});
440
441	$cfg->{_i} = 1;
442	for (@cfg) {
443	gtk_add_cfg_field ($t, $cfg, $_->[0], $_->[1], $::CFG->{$_->[1]});
444	}
445
446	$vb->pack_start (my $hb = Gtk2::HBox->new, 0, 0, 0);
447	$hb->pack_start (my $cb = Gtk2::Button->new ("save"), 1, 1, 5);
448	$cb->signal_connect (clicked => sub {
449	for (keys %$cfg) {
450	$::CFG->{$_} = $cfg->{$_}
451	if $_ ne '_i';
452	}
453	CFClient::write_cfg "$CFrossfire::VARDIR/pclientrc";
454	});
455	$hb->pack_start (my $cb = Gtk2::Button->new ("login"), 1, 1, 5);
456	$cb->signal_connect (clicked => sub {
457	for (keys %$cfg) {
458	$::CFG->{$_} = $cfg->{$_}
459	if $_ ne '_i';
460	}
461	my $cb = $events{login} \|\| sub {};
462	$cb->($::CFG->{user}, $::CFG->{password});
463	});
464	$hb->pack_start (my $cb = Gtk2::Button->new ("logout"), 1, 1, 5);
465	$cb->signal_connect (clicked => sub {
466	my $cb = $events{logout} \|\| sub {};
467	$cb->();
468	});
469	$hb->pack_start (my $cb = Gtk2::Button->new ("quit"), 1, 1, 5);
470	$cb->signal_connect (clicked => sub { $w->destroy });
471
472	$w->show_all;
473
474	$w->signal_connect (destroy => sub { Gtk2->main_quit });
475	}
476
477
478	#############################################################################	691	#############################################################################
479		692
480	SDL::Init SDL_INIT_EVERYTHING;	693	$TILECACHE = CFClient::db_table "tilecache";
481		694	$FACEMAP = CFClient::db_table "facemap";
482	@SDL_MODES = reverse map [SDL::RectW ($_), SDL::RectH ($_)],
483	@{ SDL::ListModes 0, SDL_FULLSCREEN\|SDL_HWSURFACE };
484		695
485	CFClient::read_cfg "$Crossfire::VARDIR/pclientrc";	696	CFClient::read_cfg "$Crossfire::VARDIR/pclientrc";
486		697
487	$CFG \|\|= {	698	my %DEF_CFG = (
		699	sdl_mode => 0,
488	width => 640,	700	width => 640,
489	height => 480,	701	height => 480,
490	fullscreen => 0,	702	fullscreen => 0,
491	sdl_mode => 0,	703	fast => 0,
		704	fow_enable => 1,
		705	fow_intensity => 0.45,
		706	fow_smooth => 0,
		707	log_fontsize => 14,
492	mapsize => 100,	708	mapsize => 100,
493	host => "crossfire.schmorp.de",	709	host => "crossfire.schmorp.de",
494	port => 13327,	710	say_command => 'say',
495	};	711	);
		712
		713	while (my ($k, $v) = each %DEF_CFG) {
		714	$CFG->{$k} = $v unless exists $CFG->{$k};
		715	}
		716
		717	sdl_init;
		718
		719	@SDL_MODES = reverse
		720	grep $_->[0] >= 640 && $_->[1] >= 480,
		721	map [SDL::RectW ($_), SDL::RectH ($_)],
		722	@{ SDL::ListModes 0, SDL_FULLSCREEN \| SDL_HWSURFACE \| SDL_OPENGL };
		723
		724	@SDL_MODES or CFClient::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)";
		725
		726	$CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES;
		727
		728	init_screen;
496		729
497	{	730	{
498	my @fonts = map CFClient::find_rcfile $_, qw(uifont.ttf uifontb.ttf uifonti.ttf uifontbi.ttf);	731	my @fonts = map CFClient::find_rcfile $_, qw(uifont.ttf uifontb.ttf uifonti.ttf uifontbi.ttf);
499		732
500	CFClient::add_font $_ for @fonts;	733	CFClient::add_font $_ for @fonts;
501	CFClient::set_font $fonts[0];	734	CFClient::set_font $fonts[0];
502	}	735	}
503		736
504	$FACECACHE = eval { Crossfire::load_ref "$Crossfire::VARDIR/pclient.faces" } \|\| {};	737	Event::loop;
505		738
506	init_screen;
507		739
508	main Gtk2;
509
510	Crossfire::save_ref $FACECACHE, "$Crossfire::VARDIR/pclient.faces";
511

Diff Legend

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

Comparing deliantra/Deliantra-Client/bin/pclient (file contents): Revision 1.86 by root, Wed Apr 12 18:09:22 2006 UTC vs. Revision 1.118 by elmex, Sun Apr 16 17:43:17 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/bin/pclient (file contents):
Revision 1.86 by root, Wed Apr 12 18:09:22 2006 UTC vs.
Revision 1.118 by elmex, Sun Apr 16 17:43:17 2006 UTC