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

Comparing deliantra/Deliantra-Client/bin/pclient (file contents):
Revision 1.88 by root, Wed Apr 12 21:01:47 2006 UTC vs.
Revision 1.101 by elmex, Fri Apr 14 11:32:22 2006 UTC

…		…
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		25
26	our $FACECACHE;	26	our $FACECACHE;
27		27
28	our $LAST_REFRESH;	28	our $LAST_REFRESH;
29	our $NOW;	29	our $NOW;
…		…
34		34
35	our @SDL_MODES;	35	our @SDL_MODES;
36	our $WIDTH;	36	our $WIDTH;
37	our $HEIGHT;	37	our $HEIGHT;
38	our $FULLSCREEN;	38	our $FULLSCREEN;
		39	our $FONTSIZE;
39		40
		41	our $MAP;
40	our $MAPWIDGET;	42	our $MAPWIDGET;
41	our $FONTSIZE;
42		43
43	our $SDL_ACTIVE;	44	our $SDL_ACTIVE;
44	our $SDL_EV;	45	our $SDL_EV;
45	our %SDL_CB;	46	our %SDL_CB;
46		47
47	our $ALT_ENTER_MESSAGE;	48	our $ALT_ENTER_MESSAGE;
48	our $STATUS_LINE;	49	our $STATUS_LINE;
49	our $DEBUG_STATUS;	50	our $DEBUG_STATUS;
		51	our $BUTTONBAR;
		52	our $LOGVIEW;
50		53
51	sub status {	54	sub status {
52	$STATUS_LINE->set_text ($_[0]);	55	$STATUS_LINE->set_text ($_[0]);
53	my ($w, $h) = $STATUS_LINE->size_request;	56	my ($w, $h) = $STATUS_LINE->size_request;
54	$STATUS_LINE->size_allocate (0, $HEIGHT - $ALT_ENTER_MESSAGE->{h} - $h, $w, $h);	57	$STATUS_LINE->size_allocate (0, $HEIGHT - $ALT_ENTER_MESSAGE->{h} - $h, $w, $h);
…		…
63	sub start_game {	66	sub start_game {
64	status "logging in...";	67	status "logging in...";
65		68
66	my $mapsize = List::Util::min 64, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32;	69	my $mapsize = List::Util::min 64, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32;
67		70
		71	$MAP = new CFClient::Map $mapsize, $mapsize;
		72
68	$CONN = new conn	73	$CONN = new conn
69	host => $CFG->{host},	74	host => $CFG->{host},
70	port => $CFG->{port},	75	port => $CFG->{port},
71	user => $CFG->{user},	76	user => $CFG->{user},
72	pass => $CFG->{password},	77	pass => $CFG->{password},
…		…
82	sub stop_game {	87	sub stop_game {
83	undef $CONN;	88	undef $CONN;
84	}	89	}
85		90
86	sub config_dialog {	91	sub config_dialog {
87	my $dialog = new CFClient::UI::FancyFrame x => 300, y => 100,	92	my $dialog = new CFClient::UI::FancyFrame
88	child => (my $vbox = new CFClient::UI::VBox);	93	child => (my $vbox = new CFClient::UI::VBox);
89	$vbox->add (new CFClient::UI::Label align => 0, text => "Client Setup");	94	$vbox->add (new CFClient::UI::Label align => 0, text => "Client Setup");
90	$vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]);	95	$vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]);
91		96
92	$table->add (0, 0, new CFClient::UI::Label align => 1, text => "Video Mode");	97	$table->add (0, 0, new CFClient::UI::Label align => 1, text => "Video Mode");
…		…
107	$table->add (1, 1, new CFClient::UI::CheckBox state => $CFG->{fullscreen}, connect_changed => sub {	112	$table->add (1, 1, new CFClient::UI::CheckBox state => $CFG->{fullscreen}, connect_changed => sub {
108	my ($self, $value) = @_;	113	my ($self, $value) = @_;
109	$CFG->{fullscreen} = $value;	114	$CFG->{fullscreen} = $value;
110	});	115	});
111		116
		117	$table->add (0, 2, new CFClient::UI::Label align => 1, text => "Fast & Ugly");
		118	$table->add (1, 2, new CFClient::UI::CheckBox state => $CFG->{fast}, connect_changed => sub {
		119	my ($self, $value) = @_;
		120	$CFG->{fast} = $value;
		121	});
		122
		123	$table->add (0, 3, new CFClient::UI::Label align => 1, text => "Fog of War");
		124	$table->add (1, 3, new CFClient::UI::CheckBox state => $CFG->{fow_enable}, connect_changed => sub {
		125	my ($self, $value) = @_;
		126	$CFG->{fow_enable} = $value;
		127	});
		128
		129	$table->add (0, 4, new CFClient::UI::Label align => 1, text => "FoW Intensity");
		130	$table->add (1, 4, new CFClient::UI::Slider range => [$CFG->{fow_intensity}, 0, 1 + 0.001, 0.001], connect_changed => sub {
		131	my ($self, $value) = @_;
		132	$CFG->{fow_intensity} = $value;
		133	});
		134
		135	$table->add (0, 5, new CFClient::UI::Label align => 1, text => "FoW Smooth");
		136	$table->add (1, 5, new CFClient::UI::CheckBox state => $CFG->{fow_smooth}, connect_changed => sub {
		137	my ($self, $value) = @_;
		138	$CFG->{fow_smooth} = $value;
		139	});
		140
112	$table->add (1, 2, new CFClient::UI::Button expand => 1, align => 0, text => "Apply", connect_activate => sub {	141	$table->add (1, 6, new CFClient::UI::Button expand => 1, align => 0, text => "Apply", connect_activate => sub {
113	destroy_screen ();	142	destroy_screen ();
114	init_screen ();	143	init_screen ();
115	});	144	});
116		145
117	$vbox->add (new CFClient::UI::Label align => 0, text => "Server");	146	$vbox->add (new CFClient::UI::Label align => 0, text => "Server Setup");
118	$vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]);	147	$vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]);
119	$table->add (0, 2, new CFClient::UI::Label align => 1, text => "Host");	148	$table->add (0, 2, new CFClient::UI::Label align => 1, text => "Host");
120	$table->add (1, 2, my $host = new CFClient::UI::Entry text => $CFG->{host});	149	$table->add (1, 2, my $host = new CFClient::UI::Entry text => $CFG->{host}, connect_changed => sub {
121		150	my ($self, $value) = @_;
		151	$CFG->{host} = $value;
		152	});
		153
122	$table->add (0, 3, new CFClient::UI::Label align => 1, text => "Port");	154	$table->add (0, 3, new CFClient::UI::Label align => 1, text => "Port");
123	$table->add (1, 3, my $port = new CFClient::UI::Entry text => $CFG->{port});	155	$table->add (1, 3, my $port = new CFClient::UI::Entry text => $CFG->{port}, connect_changed => sub {
		156	my ($self, $value) = @_;
		157	$CFG->{port} = $value;
		158	});
124		159
125	$table->add (0, 4, new CFClient::UI::Label align => 1, text => "Username");	160	$table->add (0, 4, new CFClient::UI::Label align => 1, text => "Username");
126	$table->add (1, 4, my $user = new CFClient::UI::Entry text => $CFG->{user});	161	$table->add (1, 4, my $user = new CFClient::UI::Entry text => $CFG->{user}, connect_changed => sub {
		162	my ($self, $value) = @_;
		163	$CFG->{user} = $value;
		164	});
127		165
128	$table->add (0, 5, new CFClient::UI::Label align => 1, text => "Password");	166	$table->add (0, 5, new CFClient::UI::Label align => 1, text => "Password");
129	$table->add (1, 5, my $pass = new CFClient::UI::Entry text => $CFG->{password}, hidden => 1);	167	$table->add (1, 5, my $pass = new CFClient::UI::Entry text => $CFG->{password}, hidden => 1, connect_changed => sub {
		168	my ($self, $value) = @_;
		169	$CFG->{password} = $value;
		170	});
130		171
		172	$table->add (0, 6, new CFClient::UI::Label align => 1, text => "Def. say cmd");
		173	$table->add (1, 6, my $saycmd = new CFClient::UI::Entry text => $CFG->{say_command}, connect_changed => sub {
		174	my ($self, $value) = @_;
		175	$CFG->{say_command} = $value;
		176	});
		177
131	$table->add (0, 6, new CFClient::UI::Label align => 1, text => "Map Size");	178	$table->add (0, 7, new CFClient::UI::Label align => 1, text => "Map Size");
132	$table->add (1, 6, new CFClient::UI::Slider	179	$table->add (1, 7, new CFClient::UI::Slider
133	req_w => 100,	180	req_w => 100,
134	range => [$CFG->{mapsize}, 10, 100 + 1, 1],	181	range => [$CFG->{mapsize}, 10, 100 + 1, 1],
135	connect_changed => sub {	182	connect_changed => sub {
136	my ($self, $value) = @_;	183	my ($self, $value) = @_;
137		184
138	$CFG->{mapsize} = $self->{range}[0] = $value = int $value;	185	$CFG->{mapsize} = $self->{range}[0] = $value = int $value;
139	},	186	},
140	);	187	);
141		188
142	$table->add (1, 7, new CFClient::UI::Button expand => 1, align => 0, text => "Login", connect_activate => sub {	189	$table->add (1, 8, new CFClient::UI::Button expand => 1, align => 0, text => "Login", connect_activate => sub {
143	start_game;	190	start_game;
144	});	191	});
145		192
146	$vbox->add (my $hbox = new CFClient::UI::HBox);	193	$vbox->add (my $hbox = new CFClient::UI::HBox);
147		194
148	$hbox->add (new CFClient::UI::Button expand => 1, align => 0, text => "Save", connect_activate => sub {	195	$hbox->add (new CFClient::UI::Button expand => 1, align => 0, text => "Save", connect_activate => sub {
149	CFClient::write_cfg "$Crossfire::VARDIR/pclientrc";	196	CFClient::write_cfg "$Crossfire::VARDIR/pclientrc";
150	status "Configuration Saved";	197	status "Configuration Saved";
151	});	198	});
152	$CFClient::UI::TOPLEVEL->add ($dialog);	199
		200	$dialog
		201	}
		202
		203	sub console_window {
		204	my $window = new CFClient::UI::FancyFrame
		205	border_bg => [1, 1, 1, 0.5],
		206	bg => [0.3, 0.3, 0.3, 0.8],
		207	child => (my $vbox = new CFClient::UI::VBox);
		208
		209	$vbox->add ($LOGVIEW = new CFClient::UI::TextView expand => 1);
		210	$vbox->add (my $input = new CFClient::UI::LineEntry);
		211	$input->connect (activate => sub {
		212	my ($input, $text) = @_;
		213	$input->set_text ('');
		214
		215	if ($text =~ /^\/(.*)/) {
		216	$::CONN->user_send ("command $1");
		217	} else {
		218	my $say_cmd = $::CFG->{say_command} \|\| 'say';
		219	$::CONN->user_send ("command $say_cmd $text");
		220	}
		221	1
		222	});
		223
		224	$window
		225	}
		226
		227	sub sdl_init {
		228	SDL::Init SDL_INIT_AUDIO \| SDL_INIT_VIDEO
		229	and die "SDL::Init failed!\n";
153	}	230	}
154		231
155	sub init_screen {	232	sub init_screen {
		233	sdl_init;
		234
156	($WIDTH, $HEIGHT) = @{ $SDL_MODES[$CFG->{sdl_mode}] };	235	($WIDTH, $HEIGHT) = @{ $SDL_MODES[$CFG->{sdl_mode}] };
157	$FULLSCREEN = $CFG->{fullscreen};	236	$FULLSCREEN = $CFG->{fullscreen};
		237	$FAST = $CFG->{fast};
158		238
159	SDL::GLSetAttribute SDL_GL_RED_SIZE, 5;	239	SDL::GLSetAttribute SDL_GL_RED_SIZE, 5;
160	SDL::GLSetAttribute SDL_GL_GREEN_SIZE, 5;	240	SDL::GLSetAttribute SDL_GL_GREEN_SIZE, 5;
161	SDL::GLSetAttribute SDL_GL_BLUE_SIZE, 5;	241	SDL::GLSetAttribute SDL_GL_BLUE_SIZE, 5;
162	SDL::GLSetAttribute SDL_GL_ALPHA_SIZE, 0;	242	SDL::GLSetAttribute SDL_GL_ALPHA_SIZE, 0;
…		…
188		268
189	$FONTSIZE = int $HEIGHT / 40;	269	$FONTSIZE = int $HEIGHT / 40;
190		270
191	#############################################################################	271	#############################################################################
192		272
193	$DEBUG_STATUS = new CFClient::UI::Label padding => 0;	273	$DEBUG_STATUS = new CFClient::UI::Label padding => 0, z => 100;
194	$CFClient::UI::TOPLEVEL->add ($DEBUG_STATUS);	274	$CFClient::UI::TOPLEVEL->add ($DEBUG_STATUS);
195		275
196	$STATUS_LINE = new CFClient::UI::Label	276	$STATUS_LINE = new CFClient::UI::Label
197	padding => 0,	277	padding => 0,
198	y => $HEIGHT * 49 / 50 - $FONTSIZE;	278	y => $HEIGHT * 44 / 45 - $FONTSIZE;
199	$CFClient::UI::TOPLEVEL->add ($STATUS_LINE);	279	$CFClient::UI::TOPLEVEL->add ($STATUS_LINE);
200		280
201	$ALT_ENTER_MESSAGE = new CFClient::UI::Label	281	$ALT_ENTER_MESSAGE = new CFClient::UI::Label
202	padding => 0,	282	padding => 0,
203	y => $HEIGHT * 49 / 50,	283	y => $HEIGHT * 44 / 45,
204	height => $HEIGHT / 50,	284	height => $HEIGHT / 45,
205	text => "Use <b>Alt-Enter</b> to toggle fullscreen mode";	285	text => "Use <b>Alt-Enter</b> to toggle fullscreen mode";
206	$CFClient::UI::TOPLEVEL->add ($ALT_ENTER_MESSAGE);	286	$CFClient::UI::TOPLEVEL->add ($ALT_ENTER_MESSAGE);
207		287
208	$MAPWIDGET = new CFClient::UI::MapWidget;
209	$CFClient::UI::TOPLEVEL->add ($MAPWIDGET);	288	$CFClient::UI::TOPLEVEL->add ($MAPWIDGET = new CFClient::UI::MapWidget);
210	$MAPWIDGET->focus_in;	289	$MAPWIDGET->focus_in;
211		290
212	config_dialog;	291	$CFClient::UI::TOPLEVEL->add ($BUTTONBAR = new CFClient::UI::HBox);
		292
		293	$BUTTONBAR->add (my $setup = new CFClient::UI::Flopper x => 0, y => 0, text => "Setup", other => config_dialog, state => 1);
		294	$BUTTONBAR->add (my $setup = new CFClient::UI::Flopper x => 0, y => 0, text => "Console", other => console_window);
213	}	295	}
214		296
215	sub destroy_screen {	297	sub destroy_screen {
216	$CFClient::UI::TOPLEVEL->{children} = [];	298	$CFClient::UI::TOPLEVEL->{children} = [];
217	undef $SDL_ACTIVE;	299	undef $SDL_ACTIVE;
…		…
240	glLoadIdentity;	322	glLoadIdentity;
241	glOrtho 0, $WIDTH, $HEIGHT, 0, -10000 , 10000;	323	glOrtho 0, $WIDTH, $HEIGHT, 0, -10000 , 10000;
242	glMatrixMode GL_MODELVIEW;	324	glMatrixMode GL_MODELVIEW;
243	glLoadIdentity;	325	glLoadIdentity;
244		326
		327	glClearColor +($CFG->{fow_intensity}) x 3, 1;
245	glClear GL_COLOR_BUFFER_BIT;	328	glClear GL_COLOR_BUFFER_BIT;
246		329
247	$CFClient::UI::TOPLEVEL->draw;	330	$CFClient::UI::TOPLEVEL->draw;
248		331
249	SDL::GLSwapBuffers;	332	SDL::GLSwapBuffers;
…		…
283	delete $animate_object{$widget};	366	delete $animate_object{$widget};
284	}	367	}
285		368
286	@conn::ISA = Crossfire::Protocol::;	369	@conn::ISA = Crossfire::Protocol::;
287		370
288	sub conn::send {	371	sub conn::user_send {
289	my ($self, $command) = @_;	372	my ($self, $command) = @_;
290		373
291	$self->Crossfire::Protocol::send ($command);	374	$self->send ($command);
292	status $command;	375	status $command;
293	}	376	}
294		377
295	sub conn::map_update {	378	sub conn::feed_map1a {
296	my ($self, $dirty) = @_;	379	my ($self, $data) = @_;
297		380
		381	# $self->Crossfire::Protocol::feed_map1a ($data);
		382
		383	$MAP->scroll (delete $self->{delayed_scroll_x}, delete $self->{delayed_scroll_y});
		384	$MAP->map1a_update ($data);
298	$MAPWIDGET->update;	385	$MAPWIDGET->update;
299	}	386	}
300		387
301	sub conn::map_scroll {	388	#sub conn::map_update {
302	my ($self, $dx, $dy) = @_;	389	# my ($self, $dirty) = @_;
303		390	#
304	# refresh;	391	# $MAPWIDGET->update;
305	}	392	#}
306		393
307	sub conn::map_clear {	394	sub conn::map_clear {
308	my ($self) = @_;	395	my ($self) = @_;
309		396
		397	$MAP->clear;
		398
310	# refresh;	399	# refresh;
311	}	400	}
312		401
313	sub conn::face_find {	402	sub conn::face_find {
314	my ($self, $face) = @_;	403	my ($self, $face) = @_;
315		404
316	$FACECACHE->{"$face->{chksum},$face->{name}"}	405	$FACECACHE->{"$face->{chksum},$face->{name}"}
317	}	406	}
318		407
319	sub conn::face_update {	408	sub conn::face_update {
320	my ($self, $face) = @_;	409	my ($self, $facenum, $face) = @_;
321		410
322	$FACECACHE->{"$face->{chksum},$face->{name}"} = $face->{image};	411	$FACECACHE->{"$face->{chksum},$face->{name}"} = $face->{image};
323		412
324	$face->{texture} = new_from_image CFClient::Texture delete $face->{image};	413	my $tex = $face->{texture} = new_from_image CFClient::Texture delete $face->{image};
		414
		415	$MAP->set_texture ($facenum, @$tex{qw(name w h s t)});
		416	$MAPWIDGET->update;
325	}	417	}
326		418
327	sub conn::query {	419	sub conn::query {
328	my ($self, $flags, $prompt) = @_;	420	my ($self, $flags, $prompt) = @_;
329		421
		422	#TODO
330	warn "<<<<QUERY:$flags:$prompt>>>\n";#d#	423	warn "<<<<QUERY:$flags:$prompt>>>\n";#d#
		424	}
		425
		426	sub conn::drawinfo {
		427	my ($self, $color, $text) = @_;
		428
		429	my @color = (
		430	[1.00, 1.00, 1.00], #[0.00, 0.00, 0.00],
		431	[1.00, 1.00, 1.00],
		432	[0.00, 0.00, 0.55],
		433	[1.00, 0.00, 0.00],
		434	[1.00, 0.54, 0.00],
		435	[0.11, 0.56, 1.00],
		436	[0.93, 0.46, 0.00],
		437	[0.18, 0.54, 0.34],
		438	[0.56, 0.73, 0.56],
		439	[0.80, 0.80, 0.80],
		440	[0.55, 0.41, 0.13],
		441	[0.99, 0.77, 0.26],
		442	[0.74, 0.65, 0.41],
		443	);
		444
		445	$LOGVIEW->add_paragraph ($color[$color], $text);
331	}	446	}
332		447
333	%SDL_CB = (	448	%SDL_CB = (
334	SDL_QUIT() => sub {	449	SDL_QUIT() => sub {
335	Event::unloop -1;	450	Event::unloop -1;
…		…
340	refresh;	455	refresh;
341	},	456	},
342	SDL_KEYDOWN() => sub {	457	SDL_KEYDOWN() => sub {
343	if ($SDL_EV->key_mod & KMOD_ALT && $SDL_EV->key_sym == SDLK_RETURN) {	458	if ($SDL_EV->key_mod & KMOD_ALT && $SDL_EV->key_sym == SDLK_RETURN) {
344	# alt-enter	459	# alt-enter
345	$FULLSCREEN = !$FULLSCREEN;
346	destroy_screen;	460	destroy_screen;
		461	$CFG->{fullscreen} = !$CFG->{fullscreen};
347	init_screen;	462	init_screen;
348	} else {	463	} else {
349	CFClient::UI::feed_sdl_key_down_event ($SDL_EV);	464	CFClient::UI::feed_sdl_key_down_event ($SDL_EV);
350	}	465	}
351	},	466	},
…		…
368		483
369	#############################################################################	484	#############################################################################
370		485
371	CFClient::read_cfg "$Crossfire::VARDIR/pclientrc";	486	CFClient::read_cfg "$Crossfire::VARDIR/pclientrc";
372		487
373	$CFG \|\|= {	488	my %DEF_CFG = (
374	width => 640,	489	width => 640,
375	height => 480,	490	height => 480,
		491	fast => 0,
		492	fow_enable => 1,
		493	fow_intensity => 0.45,
		494	fow_smooth => 0,
376	fullscreen => 0,	495	fullscreen => 0,
377	sdl_mode => 0,	496	sdl_mode => 0,
378	mapsize => 100,	497	mapsize => 100,
379	host => "crossfire.schmorp.de",	498	host => "crossfire.schmorp.de",
380	port => 13327,	499	port => 13327,
381	};	500	say_command => 'say',
		501	);
382		502
383	SDL::Init SDL_INIT_TIMER \| SDL_INIT_AUDIO \| SDL_INIT_VIDEO	503	while (my ($k, $v) = each %DEF_CFG) {
384	and die "SDL::Init failed!\n";	504	$CFG->{$k} = $v unless exists $CFG->{$k};
		505	}
385		506
386	@SDL_MODES = reverse map [SDL::RectW ($_), SDL::RectH ($_)],	507	sdl_init;
		508
		509	@SDL_MODES = reverse
		510	grep $_->[0] >= 640 && $_->[1] >= 480,
		511	map [SDL::RectW ($_), SDL::RectH ($_)],
387	@{ SDL::ListModes 0, SDL_FULLSCREEN \| SDL_HWSURFACE \| SDL_OPENGL };	512	@{ SDL::ListModes 0, SDL_FULLSCREEN \| SDL_HWSURFACE \| SDL_OPENGL };
		513
		514	@SDL_MODES or CFClient::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)";
		515
		516	$CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES;
388		517
389	init_screen;	518	init_screen;
390		519
391	{	520	{
392	my @fonts = map CFClient::find_rcfile $_, qw(uifont.ttf uifontb.ttf uifonti.ttf uifontbi.ttf);	521	my @fonts = map CFClient::find_rcfile $_, qw(uifont.ttf uifontb.ttf uifonti.ttf uifontbi.ttf);

Diff Legend

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

Comparing deliantra/Deliantra-Client/bin/pclient (file contents): Revision 1.88 by root, Wed Apr 12 21:01:47 2006 UTC vs. Revision 1.101 by elmex, Fri Apr 14 11:32:22 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/bin/pclient (file contents):
Revision 1.88 by root, Wed Apr 12 21:01:47 2006 UTC vs.
Revision 1.101 by elmex, Fri Apr 14 11:32:22 2006 UTC