[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.102 by elmex, Fri Apr 14 11:43: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;
19	use CFClient::UI;	19	use CFClient::UI;
20		20
21	our $VERSION = '0.1';	21	our $VERSION = '0.1';
22		22
23	my $MAX_FPS = 60;	23	my $MAX_FPS = 60;
24	my $MIN_FPS = 5; # unused	24	my $MIN_FPS = 5; # unused as of yet
25	my $TICKS_PER_FRAME = int 1000 / $MAX_FPS - 1; # min ticks per frame
26		25
27	our $FACECACHE;	26	our $FACECACHE;
		27
		28	our $LAST_REFRESH;
		29	our $NOW;
28		30
29	our $CFG;	31	our $CFG;
30	our $CONN;	32	our $CONN;
31	our $FAST; # fast, low-quality mode, possibly useful for software-rendering	33	our $FAST; # fast, low-quality mode, possibly useful for software-rendering
32		34
33	our @SDL_MODES;	35	our @SDL_MODES;
34	our $WIDTH;	36	our $WIDTH;
35	our $HEIGHT;	37	our $HEIGHT;
36	our $FULLSCREEN;	38	our $FULLSCREEN;
		39	our $FONTSIZE;
37		40
38	our $NOW;	41	our $MAP;
39
40	our $MAPWIDGET;	42	our $MAPWIDGET;
41	our $FONTSIZE;
42		43
43	our $SDL_TIMER;
44	our $SDL_ACTIVE;	44	our $SDL_ACTIVE;
45	our $SDL_EV;	45	our $SDL_EV;
46	our %SDL_CB;	46	our %SDL_CB;
47		47
48	our $ALT_ENTER_MESSAGE;	48	our $ALT_ENTER_MESSAGE;
49	our $STATUS_LINE;	49	our $STATUS_LINE;
50	our $DEBUG_STATUS;	50	our $DEBUG_STATUS;
51		51	our $BUTTONBAR;
52	my $last_refresh;	52	our $LOGVIEW;
53	my %ANIMATE;	53	our $CONSOLE;
54	my $refresh_handler;
55		54
56	sub status {	55	sub status {
57	$STATUS_LINE->set_text ($_[0]);	56	$STATUS_LINE->set_text ($_[0]);
58	my ($w, $h) = $STATUS_LINE->size_request;	57	my ($w, $h) = $STATUS_LINE->size_request;
59	$STATUS_LINE->size_allocate (0, $HEIGHT - $ALT_ENTER_MESSAGE->{h} - $h, $w, $h);	58	$STATUS_LINE->size_allocate (0, $HEIGHT - $ALT_ENTER_MESSAGE->{h} - $h, $w, $h);
…		…
68	sub start_game {	67	sub start_game {
69	status "logging in...";	68	status "logging in...";
70		69
71	my $mapsize = List::Util::min 64, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32;	70	my $mapsize = List::Util::min 64, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32;
72		71
		72	$MAP = new CFClient::Map $mapsize, $mapsize;
		73
73	$CONN = new conn	74	$CONN = new conn
74	host => $CFG->{host},	75	host => $CFG->{host},
75	port => $CFG->{port},	76	port => $CFG->{port},
76	user => $CFG->{user},	77	user => $CFG->{user},
77	pass => $CFG->{password},	78	pass => $CFG->{password},
…		…
87	sub stop_game {	88	sub stop_game {
88	undef $CONN;	89	undef $CONN;
89	}	90	}
90		91
91	sub config_dialog {	92	sub config_dialog {
92	my $dialog = new CFClient::UI::FancyFrame x => 300, y => 100,	93	my $dialog = new CFClient::UI::FancyFrame
93	child => (my $vbox = new CFClient::UI::VBox);	94	child => (my $vbox = new CFClient::UI::VBox);
94	$vbox->add (new CFClient::UI::Label align => 0, text => "Client Setup");	95	$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]);	96	$vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]);
96		97
97	$table->add (0, 0, new CFClient::UI::Label align => 1, text => "Video Mode");	98	$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 {	113	$table->add (1, 1, new CFClient::UI::CheckBox state => $CFG->{fullscreen}, connect_changed => sub {
113	my ($self, $value) = @_;	114	my ($self, $value) = @_;
114	$CFG->{fullscreen} = $value;	115	$CFG->{fullscreen} = $value;
115	});	116	});
116		117
		118	$table->add (0, 2, new CFClient::UI::Label align => 1, text => "Fast & Ugly");
		119	$table->add (1, 2, new CFClient::UI::CheckBox state => $CFG->{fast}, connect_changed => sub {
		120	my ($self, $value) = @_;
		121	$CFG->{fast} = $value;
		122	});
		123
		124	$table->add (0, 3, new CFClient::UI::Label align => 1, text => "Fog of War");
		125	$table->add (1, 3, new CFClient::UI::CheckBox state => $CFG->{fow_enable}, connect_changed => sub {
		126	my ($self, $value) = @_;
		127	$CFG->{fow_enable} = $value;
		128	});
		129
		130	$table->add (0, 4, new CFClient::UI::Label align => 1, text => "FoW Intensity");
		131	$table->add (1, 4, new CFClient::UI::Slider range => [$CFG->{fow_intensity}, 0, 1 + 0.001, 0.001], connect_changed => sub {
		132	my ($self, $value) = @_;
		133	$CFG->{fow_intensity} = $value;
		134	});
		135
		136	$table->add (0, 5, new CFClient::UI::Label align => 1, text => "FoW Smooth");
		137	$table->add (1, 5, new CFClient::UI::CheckBox state => $CFG->{fow_smooth}, connect_changed => sub {
		138	my ($self, $value) = @_;
		139	$CFG->{fow_smooth} = $value;
		140	});
		141
117	$table->add (1, 2, new CFClient::UI::Button expand => 1, align => 0, text => "Apply", connect_activate => sub {	142	$table->add (1, 6, new CFClient::UI::Button expand => 1, align => 0, text => "Apply", connect_activate => sub {
118	destroy_screen ();	143	destroy_screen ();
119	init_screen ();	144	init_screen ();
120	});	145	});
121		146
122	$vbox->add (new CFClient::UI::Label align => 0, text => "Server");	147	$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]);	148	$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");	149	$table->add (0, 2, new CFClient::UI::Label align => 1, text => "Host");
125	$table->add (1, 2, my $host = new CFClient::UI::Entry text => $CFG->{host});	150	$table->add (1, 2, my $host = new CFClient::UI::Entry text => $CFG->{host}, connect_changed => sub {
126		151	my ($self, $value) = @_;
		152	$CFG->{host} = $value;
		153	});
		154
127	$table->add (0, 3, new CFClient::UI::Label align => 1, text => "Port");	155	$table->add (0, 3, new CFClient::UI::Label align => 1, text => "Port");
128	$table->add (1, 3, my $port = new CFClient::UI::Entry text => $CFG->{port});	156	$table->add (1, 3, my $port = new CFClient::UI::Entry text => $CFG->{port}, connect_changed => sub {
		157	my ($self, $value) = @_;
		158	$CFG->{port} = $value;
		159	});
129		160
130	$table->add (0, 4, new CFClient::UI::Label align => 1, text => "Username");	161	$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});	162	$table->add (1, 4, my $user = new CFClient::UI::Entry text => $CFG->{user}, connect_changed => sub {
		163	my ($self, $value) = @_;
		164	$CFG->{user} = $value;
		165	});
132		166
133	$table->add (0, 5, new CFClient::UI::Label align => 1, text => "Password");	167	$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);	168	$table->add (1, 5, my $pass = new CFClient::UI::Entry text => $CFG->{password}, hidden => 1, connect_changed => sub {
		169	my ($self, $value) = @_;
		170	$CFG->{password} = $value;
		171	});
135		172
		173	$table->add (0, 6, new CFClient::UI::Label align => 1, text => "Def. say cmd");
		174	$table->add (1, 6, my $saycmd = new CFClient::UI::Entry text => $CFG->{say_command}, connect_changed => sub {
		175	my ($self, $value) = @_;
		176	$CFG->{say_command} = $value;
		177	});
		178
136	$table->add (0, 6, new CFClient::UI::Label align => 1, text => "Map Size");	179	$table->add (0, 7, new CFClient::UI::Label align => 1, text => "Map Size");
137	$table->add (1, 6, new CFClient::UI::Slider	180	$table->add (1, 7, new CFClient::UI::Slider
138	req_w => 100,	181	req_w => 100,
139	range => [$CFG->{mapsize}, 10, 100 + 1, 1],	182	range => [$CFG->{mapsize}, 10, 100 + 1, 1],
140	connect_changed => sub {	183	connect_changed => sub {
141	my ($self, $value) = @_;	184	my ($self, $value) = @_;
142		185
143	$CFG->{mapsize} = $self->{range}[0] = $value = int $value;	186	$CFG->{mapsize} = $self->{range}[0] = $value = int $value;
144	},	187	},
145	);	188	);
146		189
147	$table->add (1, 7, new CFClient::UI::Button expand => 1, align => 0, text => "Login", connect_activate => sub {	190	$table->add (1, 8, new CFClient::UI::Button expand => 1, align => 0, text => "Login", connect_activate => sub {
148	start_game;	191	start_game;
149	});	192	});
150		193
151	$vbox->add (my $hbox = new CFClient::UI::HBox);	194	$vbox->add (my $hbox = new CFClient::UI::HBox);
152		195
153	$hbox->add (new CFClient::UI::Button expand => 1, align => 0, text => "Save", connect_activate => sub {	196	$hbox->add (new CFClient::UI::Button expand => 1, align => 0, text => "Save", connect_activate => sub {
154	CFClient::write_cfg "$Crossfire::VARDIR/pclientrc";	197	CFClient::write_cfg "$Crossfire::VARDIR/pclientrc";
155	status "Configuration Saved";	198	status "Configuration Saved";
156	});	199	});
157	$CFClient::UI::TOPLEVEL->add ($dialog);	200
		201	$dialog
		202	}
		203
		204	sub console_window {
		205	my $window = new CFClient::UI::FancyFrame
		206	border_bg => [1, 1, 1, 0.5],
		207	bg => [0.3, 0.3, 0.3, 0.8],
		208	child => (my $vbox = new CFClient::UI::VBox);
		209
		210	$vbox->add ($LOGVIEW = new CFClient::UI::TextView expand => 1);
		211	$vbox->add (my $input = new CFClient::UI::LineEntry);
		212	$input->connect (activate => sub {
		213	my ($input, $text) = @_;
		214	$input->set_text ('');
		215
		216	if ($text =~ /^\/(.*)/) {
		217	$::CONN->user_send ("command $1");
		218	} else {
		219	my $say_cmd = $::CFG->{say_command} \|\| 'say';
		220	$::CONN->user_send ("command $say_cmd $text");
		221	}
		222	1
		223	});
		224	$input->connect (escape => sub {
		225	$MAPWIDGET->focus_in
		226	});
		227	$input->focus_in;
		228
		229	$CONSOLE = {
		230	window => $window,
		231	input => $input
		232	};
		233
		234	$window
		235	}
		236
		237	sub sdl_init {
		238	SDL::Init SDL_INIT_AUDIO \| SDL_INIT_VIDEO
		239	and die "SDL::Init failed!\n";
158	}	240	}
159		241
160	sub init_screen {	242	sub init_screen {
		243	sdl_init;
		244
161	($WIDTH, $HEIGHT) = @{ $SDL_MODES[$CFG->{sdl_mode}] };	245	($WIDTH, $HEIGHT) = @{ $SDL_MODES[$CFG->{sdl_mode}] };
162	$FULLSCREEN = $CFG->{fullscreen};	246	$FULLSCREEN = $CFG->{fullscreen};
163		247	$FAST = $CFG->{fast};
164	SDL::Init SDL_INIT_TIMER \| SDL_INIT_AUDIO \| SDL_INIT_VIDEO
165	and die "SDL::Init failed!\n";
166		248
167	SDL::GLSetAttribute SDL_GL_RED_SIZE, 5;	249	SDL::GLSetAttribute SDL_GL_RED_SIZE, 5;
168	SDL::GLSetAttribute SDL_GL_GREEN_SIZE, 5;	250	SDL::GLSetAttribute SDL_GL_GREEN_SIZE, 5;
169	SDL::GLSetAttribute SDL_GL_BLUE_SIZE, 5;	251	SDL::GLSetAttribute SDL_GL_BLUE_SIZE, 5;
170	SDL::GLSetAttribute SDL_GL_ALPHA_SIZE, 0;	252	SDL::GLSetAttribute SDL_GL_ALPHA_SIZE, 0;
…		…
188	$SDL_EV = new SDL::Event;	270	$SDL_EV = new SDL::Event;
189	$SDL_EV->set_unicode (1);	271	$SDL_EV->set_unicode (1);
190		272
191	$SDL_ACTIVE = 1;	273	$SDL_ACTIVE = 1;
192		274
193	$SDL_TIMER = add Glib::Timeout 1000 / $MAX_FPS, sub {	275	$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		276
202	CFClient::gl_init;	277	CFClient::gl_init;
203		278
204	$FONTSIZE = int $HEIGHT / 40;	279	$FONTSIZE = int $HEIGHT / 40;
205		280
206	#############################################################################	281	#############################################################################
207		282
208	$DEBUG_STATUS = new CFClient::UI::Label padding => 0;	283	$DEBUG_STATUS = new CFClient::UI::Label padding => 0, z => 100;
209	$CFClient::UI::TOPLEVEL->add ($DEBUG_STATUS);	284	$CFClient::UI::TOPLEVEL->add ($DEBUG_STATUS);
210		285
211	$STATUS_LINE = new CFClient::UI::Label	286	$STATUS_LINE = new CFClient::UI::Label
212	padding => 0,	287	padding => 0,
213	y => $HEIGHT * 49 / 50 - $FONTSIZE;	288	y => $HEIGHT * 44 / 45 - $FONTSIZE;
214	$CFClient::UI::TOPLEVEL->add ($STATUS_LINE);	289	$CFClient::UI::TOPLEVEL->add ($STATUS_LINE);
215		290
216	$ALT_ENTER_MESSAGE = new CFClient::UI::Label	291	$ALT_ENTER_MESSAGE = new CFClient::UI::Label
217	padding => 0,	292	padding => 0,
218	y => $HEIGHT * 49 / 50,	293	y => $HEIGHT * 44 / 45,
219	height => $HEIGHT / 50,	294	height => $HEIGHT / 45,
220	text => "Use <b>Alt-Enter</b> to toggle fullscreen mode";	295	text => "Use <b>Alt-Enter</b> to toggle fullscreen mode";
221	$CFClient::UI::TOPLEVEL->add ($ALT_ENTER_MESSAGE);	296	$CFClient::UI::TOPLEVEL->add ($ALT_ENTER_MESSAGE);
222		297
223	$MAPWIDGET = new CFClient::UI::MapWidget;
224	$CFClient::UI::TOPLEVEL->add ($MAPWIDGET);	298	$CFClient::UI::TOPLEVEL->add ($MAPWIDGET = new CFClient::UI::MapWidget);
225	$MAPWIDGET->focus_in;	299	$MAPWIDGET->focus_in;
		300	$MAPWIDGET->connect (activate_console => sub {
		301	if ($CONSOLE) {
		302	$CONSOLE->{input}->focus_in;
		303	}
		304	});
226		305
227	config_dialog;	306	$CFClient::UI::TOPLEVEL->add ($BUTTONBAR = new CFClient::UI::HBox);
		307
		308	$BUTTONBAR->add (my $setup = new CFClient::UI::Flopper x => 0, y => 0, text => "Setup", other => config_dialog, state => 1);
		309	$BUTTONBAR->add (my $setup = new CFClient::UI::Flopper x => 0, y => 0, text => "Console", other => console_window);
228	}	310	}
229		311
230	sub destroy_screen {	312	sub destroy_screen {
231	$CFClient::UI::TOPLEVEL->{children} = [];	313	$CFClient::UI::TOPLEVEL->{children} = [];
232	remove Glib::Source $SDL_TIMER;
233	remove Glib::Source $refresh_handler if $refresh_handler;
234	undef $refresh_handler;
235	undef $SDL_ACTIVE;	314	undef $SDL_ACTIVE;
236	undef $SDL_EV;	315	undef $SDL_EV;
237	SDL::Quit;	316	SDL::Quit;
238	}	317	}
239		318
		319	my %animate_object;
		320	my $animate_timer;
		321
		322	my $want_refresh;
		323	my $can_refresh;
		324
		325	my $fps = 9;
		326
240	sub force_refresh {	327	sub force_refresh {
		328	$fps = $fps * 0.95 + 1 / ($NOW - $LAST_REFRESH) * 0.05;
		329	debug sprintf "%3.2f", $fps;
		330
		331	$want_refresh = 0;
		332	$can_refresh = 0;
		333
241	glViewport 0, 0, $WIDTH, $HEIGHT;	334	glViewport 0, 0, $WIDTH, $HEIGHT;
242		335
243	glMatrixMode GL_PROJECTION;	336	glMatrixMode GL_PROJECTION;
244	glLoadIdentity;	337	glLoadIdentity;
245	glOrtho 0, $WIDTH, $HEIGHT, 0, -10000 , 10000;	338	glOrtho 0, $WIDTH, $HEIGHT, 0, -10000 , 10000;
246	glMatrixMode GL_MODELVIEW;	339	glMatrixMode GL_MODELVIEW;
247	glLoadIdentity;	340	glLoadIdentity;
248		341
		342	glClearColor +($CFG->{fow_intensity}) x 3, 1;
249	glClear GL_COLOR_BUFFER_BIT;	343	glClear GL_COLOR_BUFFER_BIT;
250		344
251	$CFClient::UI::TOPLEVEL->draw;	345	$CFClient::UI::TOPLEVEL->draw;
252		346
253	SDL::GLSwapBuffers;	347	SDL::GLSwapBuffers;
254	}
255		348
256	my $FPS;	349	$LAST_REFRESH = $NOW;
		350	}
		351
		352	my $refresh_watcher = Event->timer (after => 0, hard => 1, interval => 1 / $MAX_FPS, cb => sub {
		353	$NOW = time;
		354
		355	($SDL_CB{$SDL_EV->type} \|\| sub { warn "unhandled event ", $SDL_EV->type })->()
		356	while $SDL_EV->poll;
		357
		358	if (%animate_object) {
		359	$_->animate ($LAST_REFRESH - $NOW) for values %animate_object;
		360	$want_refresh++;
		361	}
		362
		363	if ($want_refresh) {
		364	force_refresh;
		365	} else {
		366	$can_refresh = 1;
		367	}
		368	});
257		369
258	sub refresh {	370	sub refresh {
259	$refresh_handler \|\|= add Glib::Idle sub {	371	$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	}	372	}
292		373
293	sub animation_start {	374	sub animation_start {
294	my ($widget) = @_;	375	my ($widget) = @_;
295	$ANIMATE{$widget} = $widget;	376	$animate_object{$widget} = $widget;
296	Scalar::Util::weaken $ANIMATE{$widget};
297
298	refresh;
299	}	377	}
300		378
301	sub animation_stop {	379	sub animation_stop {
302	my ($widget) = @_;	380	my ($widget) = @_;
303	delete $ANIMATE{$widget};	381	delete $animate_object{$widget};
		382	}
		383
		384	@conn::ISA = Crossfire::Protocol::;
		385
		386	sub conn::user_send {
		387	my ($self, $command) = @_;
		388
		389	$self->send ($command);
		390	status $command;
		391	}
		392
		393	sub conn::feed_map1a {
		394	my ($self, $data) = @_;
		395
		396	# $self->Crossfire::Protocol::feed_map1a ($data);
		397
		398	$MAP->scroll (delete $self->{delayed_scroll_x}, delete $self->{delayed_scroll_y});
		399	$MAP->map1a_update ($data);
		400	$MAPWIDGET->update;
		401	}
		402
		403	#sub conn::map_update {
		404	# my ($self, $dirty) = @_;
		405	#
		406	# $MAPWIDGET->update;
		407	#}
		408
		409	sub conn::map_clear {
		410	my ($self) = @_;
		411
		412	$MAP->clear;
		413
		414	# refresh;
		415	}
		416
		417	sub conn::face_find {
		418	my ($self, $face) = @_;
		419
		420	$FACECACHE->{"$face->{chksum},$face->{name}"}
		421	}
		422
		423	sub conn::face_update {
		424	my ($self, $facenum, $face) = @_;
		425
		426	$FACECACHE->{"$face->{chksum},$face->{name}"} = $face->{image};
		427
		428	my $tex = $face->{texture} = new_from_image CFClient::Texture delete $face->{image};
		429
		430	$MAP->set_texture ($facenum, @$tex{qw(name w h s t)});
		431	$MAPWIDGET->update;
		432	}
		433
		434	sub conn::query {
		435	my ($self, $flags, $prompt) = @_;
		436
		437	#TODO
		438	warn "<<<<QUERY:$flags:$prompt>>>\n";#d#
		439	}
		440
		441	sub conn::drawinfo {
		442	my ($self, $color, $text) = @_;
		443
		444	my @color = (
		445	[1.00, 1.00, 1.00], #[0.00, 0.00, 0.00],
		446	[1.00, 1.00, 1.00],
		447	[0.00, 0.00, 0.55],
		448	[1.00, 0.00, 0.00],
		449	[1.00, 0.54, 0.00],
		450	[0.11, 0.56, 1.00],
		451	[0.93, 0.46, 0.00],
		452	[0.18, 0.54, 0.34],
		453	[0.56, 0.73, 0.56],
		454	[0.80, 0.80, 0.80],
		455	[0.55, 0.41, 0.13],
		456	[0.99, 0.77, 0.26],
		457	[0.74, 0.65, 0.41],
		458	);
		459
		460	$LOGVIEW->add_paragraph ($color[$color], $text);
304	}	461	}
305		462
306	%SDL_CB = (	463	%SDL_CB = (
307	SDL_QUIT() => sub {	464	SDL_QUIT() => sub {
308	main_quit Gtk2;	465	Event::unloop -1;
309	},	466	},
310	SDL_VIDEORESIZE() => sub {	467	SDL_VIDEORESIZE() => sub {
311	},	468	},
312	SDL_VIDEOEXPOSE() => sub {	469	SDL_VIDEOEXPOSE() => sub {
313	refresh;	470	refresh;
314	},	471	},
315	SDL_KEYDOWN() => sub {	472	SDL_KEYDOWN() => sub {
316	if ($SDL_EV->key_mod & KMOD_ALT && $SDL_EV->key_sym == SDLK_RETURN) {	473	if ($SDL_EV->key_mod & KMOD_ALT && $SDL_EV->key_sym == SDLK_RETURN) {
317	# alt-enter	474	# alt-enter
318	$FULLSCREEN = !$FULLSCREEN;
319	destroy_screen;	475	destroy_screen;
		476	$CFG->{fullscreen} = !$CFG->{fullscreen};
320	init_screen;	477	init_screen;
321	} else {	478	} else {
322	CFClient::UI::feed_sdl_key_down_event ($SDL_EV);	479	CFClient::UI::feed_sdl_key_down_event ($SDL_EV);
323	}	480	}
324	},	481	},
…		…
337	SDL_ACTIVEEVENT() => sub {	494	SDL_ACTIVEEVENT() => sub {
338	# printf "active %x %x\n", $SDL_EV->active_gain, $SDL_EV->active_state;#d#	495	# printf "active %x %x\n", $SDL_EV->active_gain, $SDL_EV->active_state;#d#
339	},	496	},
340	);	497	);
341		498
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	#############################################################################	499	#############################################################################
479		500
480	SDL::Init SDL_INIT_EVERYTHING;
481
482	@SDL_MODES = reverse map [SDL::RectW ($_), SDL::RectH ($_)],
483	@{ SDL::ListModes 0, SDL_FULLSCREEN\|SDL_HWSURFACE };
484
485	CFClient::read_cfg "$Crossfire::VARDIR/pclientrc";	501	CFClient::read_cfg "$Crossfire::VARDIR/pclientrc";
486		502
487	$CFG \|\|= {	503	my %DEF_CFG = (
488	width => 640,	504	width => 640,
489	height => 480,	505	height => 480,
		506	fast => 0,
		507	fow_enable => 1,
		508	fow_intensity => 0.45,
		509	fow_smooth => 0,
490	fullscreen => 0,	510	fullscreen => 0,
491	sdl_mode => 0,	511	sdl_mode => 0,
492	mapsize => 100,	512	mapsize => 100,
493	host => "crossfire.schmorp.de",	513	host => "crossfire.schmorp.de",
494	port => 13327,	514	port => 13327,
495	};	515	say_command => 'say',
		516	);
		517
		518	while (my ($k, $v) = each %DEF_CFG) {
		519	$CFG->{$k} = $v unless exists $CFG->{$k};
		520	}
		521
		522	sdl_init;
		523
		524	@SDL_MODES = reverse
		525	grep $_->[0] >= 640 && $_->[1] >= 480,
		526	map [SDL::RectW ($_), SDL::RectH ($_)],
		527	@{ SDL::ListModes 0, SDL_FULLSCREEN \| SDL_HWSURFACE \| SDL_OPENGL };
		528
		529	@SDL_MODES or CFClient::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)";
		530
		531	$CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES;
		532
		533	init_screen;
496		534
497	{	535	{
498	my @fonts = map CFClient::find_rcfile $_, qw(uifont.ttf uifontb.ttf uifonti.ttf uifontbi.ttf);	536	my @fonts = map CFClient::find_rcfile $_, qw(uifont.ttf uifontb.ttf uifonti.ttf uifontbi.ttf);
499		537
500	CFClient::add_font $_ for @fonts;	538	CFClient::add_font $_ for @fonts;
501	CFClient::set_font $fonts[0];	539	CFClient::set_font $fonts[0];
502	}	540	}
503		541
504	$FACECACHE = eval { Crossfire::load_ref "$Crossfire::VARDIR/pclient.faces" } \|\| {};	542	$FACECACHE = eval { Crossfire::load_ref "$Crossfire::VARDIR/pclient.faces" } \|\| {};
505		543
506	init_screen;	544	Event::loop;
507
508	main Gtk2;
509		545
510	Crossfire::save_ref $FACECACHE, "$Crossfire::VARDIR/pclient.faces";	546	Crossfire::save_ref $FACECACHE, "$Crossfire::VARDIR/pclient.faces";
511		547

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.102 by elmex, Fri Apr 14 11:43:51 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.102 by elmex, Fri Apr 14 11:43:51 2006 UTC