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

Comparing deliantra/Deliantra-Client/bin/pclient (file contents):
Revision 1.85 by root, Wed Apr 12 17:11:02 2006 UTC vs.
Revision 1.114 by root, Sat Apr 15 21:16:51 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	use SDL::OpenGL::Constants;
15		14
16	use Crossfire;	15	use Crossfire;
17	use Crossfire::Protocol;	16	use Crossfire::Protocol;
18		17
19	use CFClient;	18	use CFClient;
20	use CFClient::UI;	19	use CFClient::UI;
21		20
22	our $VERSION = '0.1';	21	our $VERSION = '0.1';
23		22
24	my $MAX_FPS = 60;	23	my $MAX_FPS = 60;
25	my $MIN_FPS = 5; # unused	24	my $MIN_FPS = 5; # unused as of yet
26	my $TICKS_PER_FRAME = int 1000 / $MAX_FPS - 1; # min ticks per frame	25
		26	our $META_SERVER = "crossfire.real-time.com:13326";
27		27
28	our $FACECACHE;	28	our $FACECACHE;
		29
		30	our $LAST_REFRESH;
		31	our $NOW;
29		32
30	our $CFG;	33	our $CFG;
31	our $CONN;	34	our $CONN;
32	our $FAST; # fast, low-quality mode, possibly useful for software-rendering	35	our $FAST; # fast, low-quality mode, possibly useful for software-rendering
33		36
34	our @SDL_MODES;	37	our @SDL_MODES;
35	our $WIDTH;	38	our $WIDTH;
36	our $HEIGHT;	39	our $HEIGHT;
37	our $FULLSCREEN;	40	our $FULLSCREEN;
		41	our $FONTSIZE;
38		42
39	our $NOW;	43	our $MAP;
40
41	our $MAPWIDGET;	44	our $MAPWIDGET;
42	our $FONTSIZE;	45	our $BUTTONBAR;
		46	our $LOGVIEW;
		47	our $CONSOLE;
		48	our $METASERVER;
43		49
44	our $SDL_TIMER;	50	our $SDL_ACTIVE;
45	our $SDL_APP;
46	our $SDL_EV;	51	our $SDL_EV;
47	our %SDL_CB;	52	our %SDL_CB;
48		53
49	our $ALT_ENTER_MESSAGE;	54	our $ALT_ENTER_MESSAGE;
50	our $STATUS_LINE;	55	our $STATUS_LINE;
51	our $DEBUG_STATUS;	56	our $DEBUG_STATUS;
52
53	my $last_refresh;
54	my %ANIMATE;
55	my $refresh_handler;
56		57
57	sub status {	58	sub status {
58	$STATUS_LINE->set_text ($_[0]);	59	$STATUS_LINE->set_text ($_[0]);
59	my ($w, $h) = $STATUS_LINE->size_request;	60	my ($w, $h) = $STATUS_LINE->size_request;
60	$STATUS_LINE->size_allocate (0, $HEIGHT - $ALT_ENTER_MESSAGE->{h} - $h, $w, $h);	61	$STATUS_LINE->size_allocate (0, $HEIGHT - $ALT_ENTER_MESSAGE->{h} - $h, $w, $h);
67	}	68	}
68		69
69	sub start_game {	70	sub start_game {
70	status "logging in...";	71	status "logging in...";
71		72
72	my $mapsize = List::Util::min 64, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32;	73	my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32;
73		74
		75	$MAP = new CFClient::Map $mapsize, $mapsize;
		76
		77	my ($host, $port) = split /:/, $CFG->{host};
		78
74	$CONN = new conn	79	$CONN = new conn
75	host => $CFG->{host},	80	host => $host,
76	port => $CFG->{port},	81	port => $port \|\| 13327,
77	user => $CFG->{user},	82	user => $CFG->{user},
78	pass => $CFG->{password},	83	pass => $CFG->{password},
79	mapw => $mapsize,	84	mapw => $mapsize,
80	maph => $mapsize,	85	maph => $mapsize,
81	;	86	;
…		…
87		92
88	sub stop_game {	93	sub stop_game {
89	undef $CONN;	94	undef $CONN;
90	}	95	}
91		96
92	sub config_dialog {	97	sub client_setup {
93	my $dialog = new CFClient::UI::FancyFrame x => 300, y => 100,	98	my $dialog = new CFClient::UI::FancyFrame
94	child => (my $vbox = new CFClient::UI::VBox);	99	child => (my $vbox = new CFClient::UI::VBox);
95	$vbox->add (new CFClient::UI::Label align => 0, text => "Client Setup");	100	$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]);	101	$vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]);
97		102
98	$table->add (0, 0, new CFClient::UI::Label align => 1, text => "Video Mode");	103	$table->add (0, 0, new CFClient::UI::Label align => 1, text => "Video Mode");
…		…
113	$table->add (1, 1, new CFClient::UI::CheckBox state => $CFG->{fullscreen}, connect_changed => sub {	118	$table->add (1, 1, new CFClient::UI::CheckBox state => $CFG->{fullscreen}, connect_changed => sub {
114	my ($self, $value) = @_;	119	my ($self, $value) = @_;
115	$CFG->{fullscreen} = $value;	120	$CFG->{fullscreen} = $value;
116	});	121	});
117		122
		123	$table->add (0, 2, new CFClient::UI::Label align => 1, text => "Fast & Ugly");
		124	$table->add (1, 2, new CFClient::UI::CheckBox state => $CFG->{fast}, connect_changed => sub {
		125	my ($self, $value) = @_;
		126	$CFG->{fast} = $value;
		127	});
		128
		129	$table->add (0, 3, new CFClient::UI::Label align => 1, text => "Fog of War");
		130	$table->add (1, 3, new CFClient::UI::CheckBox state => $CFG->{fow_enable}, connect_changed => sub {
		131	my ($self, $value) = @_;
		132	$CFG->{fow_enable} = $value;
		133	});
		134
		135	$table->add (0, 4, new CFClient::UI::Label align => 1, text => "FoW Intensity");
		136	$table->add (1, 4, new CFClient::UI::Slider range => [$CFG->{fow_intensity}, 0, 1 + 0.001, 0.001], connect_changed => sub {
		137	my ($self, $value) = @_;
		138	$CFG->{fow_intensity} = $value;
		139	});
		140
		141	$table->add (0, 5, new CFClient::UI::Label align => 1, text => "FoW Smooth");
		142	$table->add (1, 5, new CFClient::UI::CheckBox state => $CFG->{fow_smooth}, connect_changed => sub {
		143	my ($self, $value) = @_;
		144	$CFG->{fow_smooth} = $value;
		145	});
		146
		147	$table->add (0, 6, new CFClient::UI::Label align => 1, text => "Log Fontsize");
		148	$table->add (1, 6, new CFClient::UI::Slider range => [$CFG->{log_fontsize}, 8, 30, 1], connect_changed => sub {
		149	my ($self, $value) = @_;
		150	$LOGVIEW->set_fontsize ($CFG->{log_fontsize} = int $value);
		151	});
		152
118	$table->add (1, 2, new CFClient::UI::Button expand => 1, align => 0, text => "Apply", connect_activate => sub {	153	$table->add (1, 7, new CFClient::UI::Button expand => 1, align => 0, text => "Apply", connect_activate => sub {
119	destroy_screen ();	154	destroy_screen ();
120	init_screen ();	155	init_screen ();
121	});	156	});
		157
		158	$dialog
		159	}
		160
		161	sub metaserver_dialog {
		162	my $dialog = new CFClient::UI::FancyFrame
		163	child => (my $vbox = new CFClient::UI::VBox);
		164
		165	$vbox->add ($dialog->{table} = new CFClient::UI::Table);
		166
		167	$dialog
		168	}
		169
		170	sub update_metaserver {
		171	my ($HOST) = @_;
		172
		173	status "fetching metaserver list...";
		174
		175	my $buf;
		176
		177	my $fh = new IO::Socket::INET PeerHost => $META_SERVER, Blocking => 0;
		178
		179	Event->io (fd => $fh, poll => 'r', cb => sub {
		180	my $res = sysread $fh, $buf, 8192, length $buf;
		181
		182	if (!defined $res) {
		183	$_[0]->w->cancel;
		184	status "metaserver: $!";
		185	} elsif ($res == 0) {
		186	$_[0]->w->cancel;
		187	status "server list retrieved";
		188
		189	my $table = $METASERVER->{table};
		190
		191	$table->clear;
		192
		193	my @col = qw(Use #Users Host Uptime Version Description);
		194	$table->add ($_, 0, new CFClient::UI::Label align => 0, fg => [1, 1, 0], text => $col[$_])
		195	for 0 .. $#col;
		196
		197	my @align = qw(1 0 1 1 -1);
		198
		199	my $y = 0;
		200	for my $m (sort { $b->[3] <=> $a->[3] } map [split /\\|/], split /\015?\012/, $buf) {
		201	my ($ip, $last, $host, $users, $version, $desc, $ibytes, $obytes, $uptime) = @$m;
		202
		203	for ($desc) {
		204	s/<br>/\n/gi;
		205	s/<li>/\n· /gi;
		206	s/<.*?>//sgi;
		207	s/&/&/g;
		208	s/</</g;
		209	s/>/>/g;
		210	}
		211
		212	$uptime = sprintf "%dd %02d:%02d:%02d",
		213	(int $m->[8] / 86400),
		214	(int $m->[8] / 3600) % 24,
		215	(int $m->[8] / 60) % 60,
		216	$m->[8] % 60;
		217
		218	$m = [$users, $host, $uptime, $version, $desc];
		219
		220	$y++;
		221
		222	$table->add (0, $y, new CFClient::UI::VBox children => [
		223	(new CFClient::UI::Button text => " ", connect_activate => sub {
		224	$HOST->set_text ($CFG->{host} = $host);
		225	}),
		226	(new CFClient::UI::Empty expand => 1),
		227	]);
		228
		229	$table->add ($_ + 1, $y, new CFClient::UI::Label align => $align[$_], text => $m->[$_], fontsize => $FONTSIZE * 0.8)
		230	for 0 .. $#$m;
		231	}
		232	}
		233	});
		234	}
		235
		236	sub server_setup {
		237	my $dialog = new CFClient::UI::FancyFrame
		238	child => (my $vbox = new CFClient::UI::VBox);
122		239
123	$vbox->add (new CFClient::UI::Label align => 0, text => "Server");	240	$vbox->add (new CFClient::UI::Label align => 0, text => "Server Setup");
124	$vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]);	241	$vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]);
125	$table->add (0, 2, new CFClient::UI::Label align => 1, text => "Host");	242	$table->add (0, 2, new CFClient::UI::Label align => 1, text => "Host:Port");
126	$table->add (1, 2, my $host = new CFClient::UI::Entry text => $CFG->{host});	243
127		244	{
128	$table->add (0, 3, new CFClient::UI::Label align => 1, text => "Port");	245	$table->add (1, 2, my $vbox = new CFClient::UI::VBox);
129	$table->add (1, 3, my $port = new CFClient::UI::Entry text => $CFG->{port});	246
		247	$vbox->add (my $HOST = new CFClient::UI::Entry text => $CFG->{host}, connect_changed => sub {
		248	my ($self, $value) = @_;
		249	$CFG->{host} = $value;
		250	});
		251
		252	$METASERVER = metaserver_dialog;
		253
		254	$vbox->add (new CFClient::UI::Flopper text => "Metaserver", other => $METASERVER, connect_open => sub {
		255	update_metaserver $HOST;
		256	});
		257	}
130		258
131	$table->add (0, 4, new CFClient::UI::Label align => 1, text => "Username");	259	$table->add (0, 4, new CFClient::UI::Label align => 1, text => "Username");
132	$table->add (1, 4, my $user = new CFClient::UI::Entry text => $CFG->{user});	260	$table->add (1, 4, new CFClient::UI::Entry text => $CFG->{user}, connect_changed => sub {
		261	my ($self, $value) = @_;
		262	$CFG->{user} = $value;
		263	});
133		264
134	$table->add (0, 5, new CFClient::UI::Label align => 1, text => "Password");	265	$table->add (0, 5, new CFClient::UI::Label align => 1, text => "Password");
135	$table->add (1, 5, my $pass = new CFClient::UI::Entry text => $CFG->{password}, hidden => 1);	266	$table->add (1, 5, new CFClient::UI::Entry text => $CFG->{password}, hidden => 1, connect_changed => sub {
		267	my ($self, $value) = @_;
		268	$CFG->{password} = $value;
		269	});
136		270
		271	$table->add (0, 6, new CFClient::UI::Label align => 1, text => "Def. say cmd");
		272	$table->add (1, 6, my $saycmd = new CFClient::UI::Entry text => $CFG->{say_command}, connect_changed => sub {
		273	my ($self, $value) = @_;
		274	$CFG->{say_command} = $value;
		275	});
		276
137	$table->add (0, 6, new CFClient::UI::Label align => 1, text => "Map Size");	277	$table->add (0, 7, new CFClient::UI::Label align => 1, text => "Map Size");
138	$table->add (1, 6, new CFClient::UI::Slider	278	$table->add (1, 7, new CFClient::UI::Slider
139	req_w => 100,	279	req_w => 100,
140	range => [$CFG->{mapsize}, 10, 100 + 1, 1],	280	range => [$CFG->{mapsize}, 10, 100 + 1, 1],
141	connect_changed => sub {	281	connect_changed => sub {
142	my ($self, $value) = @_;	282	my ($self, $value) = @_;
143		283
144	$CFG->{mapsize} = $self->{range}[0] = $value = int $value;	284	$CFG->{mapsize} = $self->{range}[0] = $value = int $value;
145	},	285	},
146	);	286	);
147		287
148	$table->add (1, 7, new CFClient::UI::Button expand => 1, align => 0, text => "Login", connect_activate => sub {	288	$table->add (1, 8, new CFClient::UI::Button expand => 1, align => 0, text => "Login", connect_activate => sub {
149	start_game;	289	start_game;
150	});	290	});
151		291
152	$vbox->add (my $hbox = new CFClient::UI::HBox);	292	$dialog
		293	}
153		294
154	$hbox->add (new CFClient::UI::Button expand => 1, align => 0, text => "Save", connect_activate => sub {	295	sub message_window {
155	CFClient::write_cfg "$Crossfire::VARDIR/pclientrc";	296	my $window = new CFClient::UI::FancyFrame
156	status "Configuration Saved";	297	border_bg => [1, 1, 1, 0.5],
		298	bg => [0.3, 0.3, 0.3, 0.8],
		299	user_w => $::WIDTH/4,
		300	user_h => $::HEIGHT,
		301	child => (my $vbox = new CFClient::UI::VBox);
		302
		303	$vbox->add ($LOGVIEW = new CFClient::UI::TextView
		304	expand => 1,
		305	fontsize => $::CFG->{log_fontsize},
157	});	306	);
158	$CFClient::UI::TOPLEVEL->add ($dialog);	307
		308	$vbox->add (my $input = new CFClient::UI::LineEntry);
		309	$input->connect (activate => sub {
		310	my ($input, $text) = @_;
		311	$input->set_text ('');
		312
		313	if ($text =~ /^\/(.*)/) {
		314	$::CONN->user_send ("command $1");
		315	} else {
		316	my $say_cmd = $::CFG->{say_command} \|\| 'say';
		317	$::CONN->user_send ("command $say_cmd $text");
		318	}
		319	1
		320	});
		321	$input->connect (escape => sub {
		322	$MAPWIDGET->focus_in
		323	});
		324	$input->focus_in;
		325
		326	$CONSOLE = {
		327	window => $window,
		328	input => $input
		329	};
		330
		331	$window
		332	}
		333
		334	sub sdl_init {
		335	#SDL::Init SDL_INIT_AUDIO \| SDL_INIT_VIDEO \| SDL_INIT_NOPARACHUTE
		336	SDL::Init SDL_INIT_AUDIO \| SDL_INIT_VIDEO
		337	and die "SDL::Init failed!\n";
159	}	338	}
160		339
161	sub init_screen {	340	sub init_screen {
		341	sdl_init;
		342
162	($WIDTH, $HEIGHT) = @{ $SDL_MODES[$CFG->{sdl_mode}] };	343	($WIDTH, $HEIGHT) = @{ $SDL_MODES[$CFG->{sdl_mode}] };
163	$FULLSCREEN = $CFG->{fullscreen};	344	$FULLSCREEN = $CFG->{fullscreen};
		345	$FAST = $CFG->{fast};
164		346
165	$SDL_APP = new SDL::App	347	SDL::GLSetAttribute SDL_GL_RED_SIZE, 5;
166	-flags => SDL_ANYFORMAT \| SDL_HWSURFACE,	348	SDL::GLSetAttribute SDL_GL_GREEN_SIZE, 5;
167	-title => "Crossfire+ Client",	349	SDL::GLSetAttribute SDL_GL_BLUE_SIZE, 5;
168	-width => $WIDTH,	350	SDL::GLSetAttribute SDL_GL_ALPHA_SIZE, 1;
169	-height => $HEIGHT,	351
170	-opengl => 1,	352	SDL::GLSetAttribute SDL_GL_ACCUM_RED_SIZE, 0;
171	-red_size => 5,	353	SDL::GLSetAttribute SDL_GL_ACCUM_GREEN_SIZE, 0;
172	-green_size => 5,	354	SDL::GLSetAttribute SDL_GL_ACCUM_BLUE_SIZE, 0;
173	-blue_size => 5,	355	SDL::GLSetAttribute SDL_GL_ACCUM_ALPHA_SIZE, 0;
174	-alpha_size => 0,	356
175	-double_buffer => 1,	357	SDL::GLSetAttribute SDL_GL_DOUBLEBUFFER, 1;
176	-fullscreen => $FULLSCREEN,	358	SDL::GLSetAttribute SDL_GL_BUFFER_SIZE, 15;
177	-resizeable => 0;	359	SDL::GLSetAttribute SDL_GL_DEPTH_SIZE, 0;
		360
		361	SDL::SetVideoMode $WIDTH, $HEIGHT, 0,
		362	SDL_HWSURFACE \| SDL_ANYFORMAT \| SDL_OPENGL \| SDL_DOUBLEBUF
		363	\| ($FULLSCREEN ? SDL_FULLSCREEN : 0)
		364	or die "SDL::SetVideoMode failed!\n";
		365
		366	SDL::WMSetCaption "Crossfire+ Client", "Crossfire+";
178		367
179	$SDL_EV = new SDL::Event;	368	$SDL_EV = new SDL::Event;
180	$SDL_EV->set_unicode (1);	369	$SDL_EV->set_unicode (1);
181		370
182	$SDL_TIMER = add Glib::Timeout 1000 / $MAX_FPS, sub {	371	$SDL_ACTIVE = 1;
183	($SDL_CB{$SDL_EV->type} \|\| sub { warn "unhandled event ", $SDL_EV->type })->()
184	while $SDL_EV->poll;
185		372
186	1	373	$LAST_REFRESH = time - 0.01;
187	};
188
189	$last_refresh = SDL::GetTicks;
190		374
191	CFClient::gl_init;	375	CFClient::gl_init;
192		376
193	$FONTSIZE = int $HEIGHT / 40;	377	$FONTSIZE = int $HEIGHT / 40;
194		378
195	#############################################################################	379	#############################################################################
196		380
197	$DEBUG_STATUS = new CFClient::UI::Label padding => 0;	381	$DEBUG_STATUS = new CFClient::UI::Label padding => 0, z => 100;
198	$CFClient::UI::TOPLEVEL->add ($DEBUG_STATUS);	382	$CFClient::UI::ROOT->add ($DEBUG_STATUS);
199		383
200	$STATUS_LINE = new CFClient::UI::Label	384	$STATUS_LINE = new CFClient::UI::Label
201	padding => 0,	385	padding => 0,
202	y => $HEIGHT * 49 / 50 - $FONTSIZE;	386	y => $HEIGHT * 44 / 45 - $FONTSIZE;
203	$CFClient::UI::TOPLEVEL->add ($STATUS_LINE);	387	$CFClient::UI::ROOT->add ($STATUS_LINE);
204		388
205	$ALT_ENTER_MESSAGE = new CFClient::UI::Label	389	$ALT_ENTER_MESSAGE = new CFClient::UI::Label
206	padding => 0,	390	padding => 0,
207	y => $HEIGHT * 49 / 50,	391	y => $HEIGHT * 44 / 45,
208	height => $HEIGHT / 50,	392	height => $HEIGHT / 45,
209	text => "Use <b>Alt-Enter</b> to toggle fullscreen mode";	393	text => "Use <b>Alt-Enter</b> to toggle fullscreen mode";
210	$CFClient::UI::TOPLEVEL->add ($ALT_ENTER_MESSAGE);	394	$CFClient::UI::ROOT->add ($ALT_ENTER_MESSAGE);
211		395
212	$MAPWIDGET = new CFClient::UI::MapWidget;	396	$CFClient::UI::ROOT->add ($MAPWIDGET = new CFClient::UI::MapWidget);
213	$CFClient::UI::TOPLEVEL->add ($MAPWIDGET);
214	$MAPWIDGET->focus_in;	397	$MAPWIDGET->focus_in;
		398	$MAPWIDGET->connect (activate_console => sub {
		399	my ($mapwidget, $preset) = @_;
215		400
216	config_dialog;	401	if ($CONSOLE) {
		402	$CONSOLE->{input}->focus_in;
		403
		404	if ($preset && $CONSOLE->{input}->get_text eq '') {
		405	$CONSOLE->{input}->set_text ($preset);
		406	}
		407	}
		408	});
		409
		410	$CFClient::UI::ROOT->add ($BUTTONBAR = new CFClient::UI::HBox);
		411
		412	$BUTTONBAR->add (new CFClient::UI::Flopper text => "Client Setup", other => client_setup);
		413	$BUTTONBAR->add (new CFClient::UI::Flopper text => "Server Setup", other => server_setup);
		414	$BUTTONBAR->add (new CFClient::UI::Flopper text => "Message Window", other => message_window);
		415
		416	$BUTTONBAR->add (new CFClient::UI::Button text => "Save Config", connect_activate => sub {
		417	CFClient::write_cfg "$Crossfire::VARDIR/pclientrc";
		418	status "Configuration Saved";
		419	});
		420
		421	$BUTTONBAR->{children}[0]->emit ("activate");
217	}	422	}
218		423
219	sub destroy_screen {	424	sub destroy_screen {
220	$CFClient::UI::TOPLEVEL->{children} = [];	425	$CFClient::UI::ROOT->{children} = [];
221	remove Glib::Source $SDL_TIMER;
222	remove Glib::Source $refresh_handler if $refresh_handler;
223	undef $refresh_handler;
224	undef $SDL_APP;	426	undef $SDL_ACTIVE;
225	undef $SDL_EV;	427	undef $SDL_EV;
226	SDL::Quit;	428	SDL::Quit;
227	}	429	}
228		430
		431	my %animate_object;
		432	my $animate_timer;
		433
		434	my $want_refresh;
		435	my $can_refresh;
		436
		437	my $fps = 9;
		438
229	sub force_refresh {	439	sub force_refresh {
230	glViewport 0, 0, $WIDTH, $HEIGHT;	440	$fps = $fps * 0.95 + 1 / ($NOW - $LAST_REFRESH) * 0.05;
		441	debug sprintf "%3.2f", $fps;
231		442
232	glMatrixMode GL_PROJECTION;	443	$want_refresh = 0;
233	glLoadIdentity;	444	$can_refresh = 0;
234	glOrtho 0, $WIDTH, $HEIGHT, 0, -10000 , 10000;
235	glMatrixMode GL_MODELVIEW;
236	glLoadIdentity;
237		445
238	glClear GL_COLOR_BUFFER_BIT;
239
240	$CFClient::UI::TOPLEVEL->draw;	446	$CFClient::UI::ROOT->draw;
241		447
242	SDL::GLSwapBuffers;	448	SDL::GLSwapBuffers;
243	}
244		449
245	my $FPS;	450	$LAST_REFRESH = $NOW;
		451	}
		452
		453	my $refresh_watcher = Event->timer (after => 0, hard => 1, interval => 1 / $MAX_FPS, cb => sub {
		454	$NOW = time;
		455
		456	($SDL_CB{$SDL_EV->type} \|\| sub { warn "unhandled event ", $SDL_EV->type })->()
		457	while $SDL_EV->poll;
		458
		459	if (%animate_object) {
		460	$_->animate ($LAST_REFRESH - $NOW) for values %animate_object;
		461	$want_refresh++;
		462	}
		463
		464	if ($want_refresh) {
		465	force_refresh;
		466	} else {
		467	$can_refresh = 1;
		468	}
		469	});
246		470
247	sub refresh {	471	sub refresh {
248	$refresh_handler \|\|= add Glib::Idle sub {	472	$want_refresh++;
249	if ($SDL_APP) {
250	$NOW = SDL::GetTicks;
251
252	if ($NOW - $last_refresh < $TICKS_PER_FRAME) {
253	SDL::Delay $TICKS_PER_FRAME - ($NOW - $last_refresh);
254	$NOW = SDL::GetTicks;
255	}
256
257	my $interval = ($NOW - $last_refresh) * 0.001;
258	$last_refresh = $NOW;
259
260	if ($interval) {
261	$FPS \|\|= 1 / $interval;
262	$FPS = $FPS * 0.9 + (1 / $interval) * 0.1;
263	debug sprintf "%5.02f", $FPS;
264	}
265
266	force_refresh;
267	$_->animate ($interval) for grep $_, values %ANIMATE;
268
269	if (%ANIMATE) {
270	1
271	} else {
272	undef $refresh_handler;
273	0
274	}
275	} else {
276	undef $refresh_handler;
277	0
278	}
279	};
280	}	473	}
281		474
282	sub animation_start {	475	sub animation_start {
283	my ($widget) = @_;	476	my ($widget) = @_;
284	$ANIMATE{$widget} = $widget;	477	$animate_object{$widget} = $widget;
285	Scalar::Util::weaken $ANIMATE{$widget};
286
287	refresh;
288	}	478	}
289		479
290	sub animation_stop {	480	sub animation_stop {
291	my ($widget) = @_;	481	my ($widget) = @_;
292	delete $ANIMATE{$widget};	482	delete $animate_object{$widget};
		483	}
		484
		485	@conn::ISA = Crossfire::Protocol::;
		486
		487	sub conn::user_send {
		488	my ($self, $command) = @_;
		489
		490	$self->send ($command);
		491	status $command;
		492	}
		493
		494	sub conn::feed_map1a {
		495	my ($self, $data) = @_;
		496
		497	# $self->Crossfire::Protocol::feed_map1a ($data);
		498
		499	$MAP->scroll (delete $self->{delayed_scroll_x}, delete $self->{delayed_scroll_y});
		500	$MAP->map1a_update ($data);
		501	$MAPWIDGET->update;
		502	}
		503
		504	#sub conn::map_update {
		505	# my ($self, $dirty) = @_;
		506	#
		507	# $MAPWIDGET->update;
		508	#}
		509
		510	sub conn::map_clear {
		511	my ($self) = @_;
		512
		513	$MAP->clear;
		514
		515	# refresh;
		516	}
		517
		518	sub conn::face_find {
		519	my ($self, $face) = @_;
		520
		521	my $data;
		522
		523	$FACECACHE->get ("$face->{chksum},$face->{name}")
		524	}
		525
		526	sub conn::face_update {
		527	my ($self, $facenum, $face) = @_;
		528
		529	$FACECACHE->put ("$face->{chksum},$face->{name}" => $face->{image});
		530
		531	my $tex = $face->{texture} =
		532	new_from_image CFClient::Texture
		533	delete $face->{image}, minify => 1;
		534
		535	$MAP->set_texture ($facenum, @$tex{qw(name w h s t)}, @{$tex->{minified}});
		536	$MAPWIDGET->update;
		537	}
		538
		539	sub conn::query {
		540	my ($self, $flags, $prompt) = @_;
		541
		542	#TODO
		543	warn "<<<<QUERY:$flags:$prompt>>>\n";#d#
		544	}
		545
		546	sub conn::drawinfo {
		547	my ($self, $color, $text) = @_;
		548
		549	my @color = (
		550	[1.00, 1.00, 1.00], #[0.00, 0.00, 0.00],
		551	[1.00, 1.00, 1.00],
		552	[0.00, 0.00, 0.55],
		553	[1.00, 0.00, 0.00],
		554	[1.00, 0.54, 0.00],
		555	[0.11, 0.56, 1.00],
		556	[0.93, 0.46, 0.00],
		557	[0.18, 0.54, 0.34],
		558	[0.56, 0.73, 0.56],
		559	[0.80, 0.80, 0.80],
		560	[0.55, 0.41, 0.13],
		561	[0.99, 0.77, 0.26],
		562	[0.74, 0.65, 0.41],
		563	);
		564
		565	$LOGVIEW->add_paragraph ($color[$color], $text);
293	}	566	}
294		567
295	%SDL_CB = (	568	%SDL_CB = (
296	SDL_QUIT() => sub {	569	SDL_QUIT() => sub {
297	main_quit Gtk2;	570	Event::unloop -1;
298	},	571	},
299	SDL_VIDEORESIZE() => sub {	572	SDL_VIDEORESIZE() => sub {
300	},	573	},
301	SDL_VIDEOEXPOSE() => sub {	574	SDL_VIDEOEXPOSE() => sub {
302	refresh;	575	refresh;
303	},	576	},
304	SDL_KEYDOWN() => sub {	577	SDL_KEYDOWN() => sub {
305	if ($SDL_EV->key_mod & KMOD_ALT && $SDL_EV->key_sym == SDLK_RETURN) {	578	if ($SDL_EV->key_mod & KMOD_ALT && $SDL_EV->key_sym == SDLK_RETURN) {
306	# alt-enter	579	# alt-enter
307	$FULLSCREEN = !$FULLSCREEN;
308	destroy_screen;	580	destroy_screen;
		581	$CFG->{fullscreen} = !$CFG->{fullscreen};
309	init_screen;	582	init_screen;
310	} else {	583	} else {
311	CFClient::UI::feed_sdl_key_down_event ($SDL_EV);	584	CFClient::UI::feed_sdl_key_down_event ($SDL_EV);
312	}	585	}
313	},	586	},
…		…
326	SDL_ACTIVEEVENT() => sub {	599	SDL_ACTIVEEVENT() => sub {
327	# printf "active %x %x\n", $SDL_EV->active_gain, $SDL_EV->active_state;#d#	600	# printf "active %x %x\n", $SDL_EV->active_gain, $SDL_EV->active_state;#d#
328	},	601	},
329	);	602	);
330		603
331	@conn::ISA = Crossfire::Protocol::;
332
333	sub conn::map_update {
334	my ($self, $dirty) = @_;
335
336	$MAPWIDGET->update;
337	}
338
339	sub conn::map_scroll {
340	my ($self, $dx, $dy) = @_;
341
342	# refresh;
343	}
344
345	sub conn::map_clear {
346	my ($self) = @_;
347
348	# refresh;
349	}
350
351	sub conn::face_find {
352	my ($self, $face) = @_;
353
354	$FACECACHE->{"$face->{chksum},$face->{name}"}
355	}
356
357	sub conn::face_update {
358	my ($self, $face) = @_;
359
360	$FACECACHE->{"$face->{chksum},$face->{name}"} = $face->{image};
361
362	$face->{texture} = new_from_image CFClient::Texture delete $face->{image};
363	}
364
365	sub conn::query {
366	my ($self, $flags, $prompt) = @_;
367
368	warn "<<<<QUERY:$flags:$prompt>>>\n";#d#
369	}
370
371	sub gtk_add_cfg_field {
372	my ($tbl, $cfg, $klbl, $key, $value) = @_;
373	my $i = $cfg->{_i}++;
374	$tbl->attach_defaults (my $lbl = Gtk2::Label->new ($klbl), 0, 1, $i, $i + 1);
375	$tbl->attach_defaults (my $ent = Gtk2::Entry->new, 1, 2, $i, $i + 1);
376	if ($key eq 'password') {
377	$ent->set_invisible_char ("*");
378	$ent->set (visibility => 0)
379	}
380	$ent->set_text ($value);
381	$ent->signal_connect (changed => sub {
382	my ($ent) = @_;
383	$cfg->{$key} = $ent->get_text;
384	# TODO: Mapsize should be a slider in the game gui
385	if ($key eq 'mapsize' and $cfg->{$key} > 100) {
386	$cfg->{$key} = 100;
387	} elsif ($key eq 'mapsize' and $cfg->{$key} < 50) {
388	$cfg->{$key} = 50;
389	}
390	});
391	}
392
393	sub run_config_dialog {
394	my (%events) = @_;
395
396	my $w = Gtk2::Window->new;
397
398	my @cfg = (
399	[qw/Host host/],
400	[qw/Port port/],
401	[qw/Mapsize% mapsize/],
402	[qw/Username user/],
403	[qw/Password password/],
404	);
405
406	my $cfg = {};
407
408	$w->add (my $vb = Gtk2::VBox->new);
409	$vb->pack_start (my $t = Gtk2::Table->new (2, scalar @cfg), 0, 0, 0);
410	my $selmode = $::CFG->{width} . 'x' . $::CFG->{height};
411	$t->attach_defaults (Gtk2::Label->new ("Modes"), 0, 1, 0, 1);
412	$t->attach_defaults (my $cb = Gtk2::ComboBox->new_text, 1, 2, 0, 1);
413	my $i = 0;
414	my $act = 0;
415	for (map { "$_->[0]x$_->[1]" } @SDL_MODES) {
416	if ($_ eq $selmode) { $act = $i }
417	$cb->append_text ($_);
418	$i++;
419	}
420	$cb->set_active ($act);
421	$cb->signal_connect (changed => sub {
422	my ($cb) = @_;
423	my $txt = $cb->get_active_text;
424	if ($txt =~ m/(\d+)x(\d+)/) {
425	$::CFG->{width} = $1;
426	$::CFG->{height} = $2;
427	}
428	});
429
430	$cfg->{_i} = 1;
431	for (@cfg) {
432	gtk_add_cfg_field ($t, $cfg, $_->[0], $_->[1], $::CFG->{$_->[1]});
433	}
434
435	$vb->pack_start (my $hb = Gtk2::HBox->new, 0, 0, 0);
436	$hb->pack_start (my $cb = Gtk2::Button->new ("save"), 1, 1, 5);
437	$cb->signal_connect (clicked => sub {
438	for (keys %$cfg) {
439	$::CFG->{$_} = $cfg->{$_}
440	if $_ ne '_i';
441	}
442	CFClient::write_cfg "$CFrossfire::VARDIR/pclientrc";
443	});
444	$hb->pack_start (my $cb = Gtk2::Button->new ("login"), 1, 1, 5);
445	$cb->signal_connect (clicked => sub {
446	for (keys %$cfg) {
447	$::CFG->{$_} = $cfg->{$_}
448	if $_ ne '_i';
449	}
450	my $cb = $events{login} \|\| sub {};
451	$cb->($::CFG->{user}, $::CFG->{password});
452	});
453	$hb->pack_start (my $cb = Gtk2::Button->new ("logout"), 1, 1, 5);
454	$cb->signal_connect (clicked => sub {
455	my $cb = $events{logout} \|\| sub {};
456	$cb->();
457	});
458	$hb->pack_start (my $cb = Gtk2::Button->new ("quit"), 1, 1, 5);
459	$cb->signal_connect (clicked => sub { $w->destroy });
460
461	$w->show_all;
462
463	$w->signal_connect (destroy => sub { Gtk2->main_quit });
464	}
465
466
467	#############################################################################	604	#############################################################################
468		605
469	SDL::Init SDL_INIT_EVERYTHING;	606	$FACECACHE = CFClient::db_table "facecache";
470
471	@SDL_MODES = reverse map [SDL::RectW ($_), SDL::RectH ($_)],
472	@{ SDL::ListModes 0, SDL_FULLSCREEN\|SDL_HWSURFACE };
473		607
474	CFClient::read_cfg "$Crossfire::VARDIR/pclientrc";	608	CFClient::read_cfg "$Crossfire::VARDIR/pclientrc";
475		609
476	$CFG \|\|= {	610	my %DEF_CFG = (
		611	sdl_mode => 0,
477	width => 640,	612	width => 640,
478	height => 480,	613	height => 480,
479	fullscreen => 0,	614	fullscreen => 0,
480	sdl_mode => 0,	615	fast => 0,
		616	fow_enable => 1,
		617	fow_intensity => 0.45,
		618	fow_smooth => 0,
		619	log_fontsize => 14,
481	mapsize => 100,	620	mapsize => 100,
482	host => "crossfire.schmorp.de",	621	host => "crossfire.schmorp.de",
483	port => 13327,	622	say_command => 'say',
484	};	623	);
		624
		625	while (my ($k, $v) = each %DEF_CFG) {
		626	$CFG->{$k} = $v unless exists $CFG->{$k};
		627	}
		628
		629	sdl_init;
		630
		631	@SDL_MODES = reverse
		632	grep $_->[0] >= 640 && $_->[1] >= 480,
		633	map [SDL::RectW ($_), SDL::RectH ($_)],
		634	@{ SDL::ListModes 0, SDL_FULLSCREEN \| SDL_HWSURFACE \| SDL_OPENGL };
		635
		636	@SDL_MODES or CFClient::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)";
		637
		638	$CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES;
		639
		640	init_screen;
485		641
486	{	642	{
487	my @fonts = map CFClient::find_rcfile $_, qw(uifont.ttf uifontb.ttf uifonti.ttf uifontbi.ttf);	643	my @fonts = map CFClient::find_rcfile $_, qw(uifont.ttf uifontb.ttf uifonti.ttf uifontbi.ttf);
488		644
489	CFClient::add_font $_ for @fonts;	645	CFClient::add_font $_ for @fonts;
490	CFClient::set_font $fonts[0];	646	CFClient::set_font $fonts[0];
491	}	647	}
492		648
493	$FACECACHE = eval { Crossfire::load_ref "$Crossfire::VARDIR/pclient.faces" } \|\| {};	649	Event::loop;
494		650
495	init_screen;
496		651
497	main Gtk2;
498
499	Crossfire::save_ref $FACECACHE, "$Crossfire::VARDIR/pclient.faces";
500

Diff Legend

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

Comparing deliantra/Deliantra-Client/bin/pclient (file contents): Revision 1.85 by root, Wed Apr 12 17:11:02 2006 UTC vs. Revision 1.114 by root, Sat Apr 15 21:16:51 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/bin/pclient (file contents):
Revision 1.85 by root, Wed Apr 12 17:11:02 2006 UTC vs.
Revision 1.114 by root, Sat Apr 15 21:16:51 2006 UTC