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

Comparing deliantra/Deliantra-Client/bin/pclient (file contents):
Revision 1.18 by root, Fri Apr 7 18:49:53 2006 UTC vs.
Revision 1.90 by root, Wed Apr 12 21:35:11 2006 UTC

1	#!/opt/bin/perl	1	#!/opt/bin/perl
		2
2	use strict;	3	use strict;
		4	use utf8;
3		5
4	use Glib;	6	use Time::HiRes 'time';
5	use Gtk2 -init;	7	use Event;
6		8
7	use SDL;	9	use SDL;
8	use SDL::App;	10	use SDL::App;
9	use SDL::Event;	11	use SDL::Event;
10	use SDL::Surface;	12	use SDL::Surface;
11	use SDL::OpenGL;	13	use SDL::OpenGL;
12	use SDL::OpenGL::Constants;
13		14
14	use Crossfire;	15	use Crossfire;
15	use Crossfire::Client;
16	use Crossfire::Protocol;	16	use Crossfire::Protocol;
17		17
		18	use CFClient;
18	use Client::Util;	19	use CFClient::UI;
19	use Client::Widget;
20		20
21	our $VERSION = '0.1';	21	our $VERSION = '0.1';
		22
		23	my $MAX_FPS = 60;
		24	my $MIN_FPS = 5; # unused as of yet
		25
		26	our $FACECACHE;
		27
		28	our $LAST_REFRESH;
		29	our $NOW;
22		30
23	our $CFG;	31	our $CFG;
24	our $CONN;	32	our $CONN;
		33	our $FAST; # fast, low-quality mode, possibly useful for software-rendering
25		34
		35	our @SDL_MODES;
		36	our $WIDTH;
		37	our $HEIGHT;
		38	our $FULLSCREEN;
		39
		40	our $MAPWIDGET;
		41	our $FONTSIZE;
		42
26	our $SDL_TIMER;	43	our $SDL_ACTIVE;
27	our $SDL_APP;	44	our $SDL_EV;
28	our $SDL_EV = new SDL::Event;
29	our %SDL_CB;	45	our %SDL_CB;
30		46
31	our @GL_INIT; # hooks called on every gl init	47	our $ALT_ENTER_MESSAGE;
		48	our $STATUS_LINE;
		49	our $DEBUG_STATUS;
		50
		51	sub status {
		52	$STATUS_LINE->set_text ($_[0]);
		53	my ($w, $h) = $STATUS_LINE->size_request;
		54	$STATUS_LINE->size_allocate (0, $HEIGHT - $ALT_ENTER_MESSAGE->{h} - $h, $w, $h);
		55	}
		56
		57	sub debug {
		58	$DEBUG_STATUS->set_text ($_[0]);
		59	my ($w, $h) = $DEBUG_STATUS->size_request;
		60	$DEBUG_STATUS->size_allocate ($WIDTH - $w, 0, $w, $h);
		61	}
		62
		63	sub start_game {
		64	status "logging in...";
		65
		66	my $mapsize = List::Util::min 64, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32;
		67
		68	$CONN = new conn
		69	host => $CFG->{host},
		70	port => $CFG->{port},
		71	user => $CFG->{user},
		72	pass => $CFG->{password},
		73	mapw => $mapsize,
		74	maph => $mapsize,
		75	;
		76
		77	status "login successful";
		78
		79	CFClient::lowdelay fileno $CONN->{fh};
		80	}
		81
		82	sub stop_game {
		83	undef $CONN;
		84	}
		85
		86	sub config_dialog {
		87	my $dialog = new CFClient::UI::FancyFrame x => 300, y => 100,
		88	child => (my $vbox = new CFClient::UI::VBox);
		89	$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]);
		91
		92	$table->add (0, 0, new CFClient::UI::Label align => 1, text => "Video Mode");
		93	$table->add (1, 0, my $hbox = new CFClient::UI::HBox);
		94
		95	$hbox->add (my $mode_slider = new CFClient::UI::Slider expand => 1, req_w => 100, range => [$CFG->{sdl_mode}, 0, scalar @SDL_MODES, 1]);
		96	$hbox->add (my $mode_label = new CFClient::UI::Label height => $FONTSIZE * 0.8);
		97
		98	$mode_slider->connect (changed => sub {
		99	my ($self, $value) = @_;
		100
		101	$CFG->{sdl_mode} = $self->{range}[0] = $value = int $value;
		102	$mode_label->set_text (sprintf "%dx%d", @{$SDL_MODES[$value]});
		103	});
		104	$mode_slider->emit (changed => $mode_slider->{range}[0]);
		105
		106	$table->add (0, 1, new CFClient::UI::Label align => 1, text => "Fullscreen");
		107	$table->add (1, 1, new CFClient::UI::CheckBox state => $CFG->{fullscreen}, connect_changed => sub {
		108	my ($self, $value) = @_;
		109	$CFG->{fullscreen} = $value;
		110	});
		111
		112	$table->add (0, 2, new CFClient::UI::Label align => 1, text => "Fast & Ugly");
		113	$table->add (1, 2, new CFClient::UI::CheckBox state => $CFG->{fast}, connect_changed => sub {
		114	my ($self, $value) = @_;
		115	$CFG->{fast} = $value;
		116	});
		117
		118	$table->add (0, 2, new CFClient::UI::Label align => 1, text => "Fog of War");
		119	$table->add (1, 2, new CFClient::UI::Slider range => [$CFG->{fow_intensity}, 0, 1 + 0.001, 0.001], connect_changed => sub {
		120	my ($self, $value) = @_;
		121	$CFG->{fow_intensity} = $value;
		122	});
		123
		124	$table->add (1, 4, new CFClient::UI::Button expand => 1, align => 0, text => "Apply", connect_activate => sub {
		125	destroy_screen ();
		126	init_screen ();
		127	});
		128
		129	$vbox->add (new CFClient::UI::Label align => 0, text => "Server Setup");
		130	$vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]);
		131	$table->add (0, 2, new CFClient::UI::Label align => 1, text => "Host");
		132	$table->add (1, 2, my $host = new CFClient::UI::Entry text => $CFG->{host});
		133
		134	$table->add (0, 3, new CFClient::UI::Label align => 1, text => "Port");
		135	$table->add (1, 3, my $port = new CFClient::UI::Entry text => $CFG->{port});
		136
		137	$table->add (0, 4, new CFClient::UI::Label align => 1, text => "Username");
		138	$table->add (1, 4, my $user = new CFClient::UI::Entry text => $CFG->{user});
		139
		140	$table->add (0, 5, new CFClient::UI::Label align => 1, text => "Password");
		141	$table->add (1, 5, my $pass = new CFClient::UI::Entry text => $CFG->{password}, hidden => 1);
		142
		143	$table->add (0, 6, new CFClient::UI::Label align => 1, text => "Map Size");
		144	$table->add (1, 6, new CFClient::UI::Slider
		145	req_w => 100,
		146	range => [$CFG->{mapsize}, 10, 100 + 1, 1],
		147	connect_changed => sub {
		148	my ($self, $value) = @_;
		149
		150	$CFG->{mapsize} = $self->{range}[0] = $value = int $value;
		151	},
		152	);
		153
		154	$table->add (1, 7, new CFClient::UI::Button expand => 1, align => 0, text => "Login", connect_activate => sub {
		155	start_game;
		156	});
		157
		158	$vbox->add (my $hbox = new CFClient::UI::HBox);
		159
		160	$hbox->add (new CFClient::UI::Button expand => 1, align => 0, text => "Save", connect_activate => sub {
		161	CFClient::write_cfg "$Crossfire::VARDIR/pclientrc";
		162	status "Configuration Saved";
		163	});
		164	$CFClient::UI::TOPLEVEL->add ($dialog);
		165	}
		166
		167	sub sdl_init {
		168	SDL::Init SDL_INIT_TIMER \| SDL_INIT_AUDIO \| SDL_INIT_VIDEO
		169	and die "SDL::Init failed!\n";
		170	}
32		171
33	sub init_screen {	172	sub init_screen {
34	$SDL_APP = new SDL::App	173	sdl_init;
35	-flags => SDL_ANYFORMAT \| SDL_HWSURFACE,
36	-title => "Crossfire+ Client",
37	-width => $CFG->{width},
38	-height => $CFG->{height},
39	-opengl => 1,
40	-red_size => 8,
41	-green_size => 8,
42	-blue_size => 8,
43	-double_buffer => 1,
44	-fullscreen => $CFG->{fullscreen},
45	-resizeable => 0;
46		174
47	glEnable GL_TEXTURE_2D;	175	($WIDTH, $HEIGHT) = @{ $SDL_MODES[$CFG->{sdl_mode}] };
48	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	176	$FULLSCREEN = $CFG->{fullscreen};
49	glShadeModel GL_FLAT;	177	$FAST = $CFG->{fast};
50	glDisable GL_DEPTH_TEST;	178
51	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	179	SDL::GLSetAttribute SDL_GL_RED_SIZE, 5;
52	glEnable GL_BLEND;	180	SDL::GLSetAttribute SDL_GL_GREEN_SIZE, 5;
		181	SDL::GLSetAttribute SDL_GL_BLUE_SIZE, 5;
		182	SDL::GLSetAttribute SDL_GL_ALPHA_SIZE, 0;
		183
		184	SDL::GLSetAttribute SDL_GL_ACCUM_RED_SIZE, 0;
		185	SDL::GLSetAttribute SDL_GL_ACCUM_GREEN_SIZE, 0;
		186	SDL::GLSetAttribute SDL_GL_ACCUM_BLUE_SIZE, 0;
		187	SDL::GLSetAttribute SDL_GL_ACCUM_ALPHA_SIZE, 0;
		188
		189	SDL::GLSetAttribute SDL_GL_DOUBLEBUFFER, 1;
		190	SDL::GLSetAttribute SDL_GL_BUFFER_SIZE, 15;
		191	SDL::GLSetAttribute SDL_GL_DEPTH_SIZE, 0;
		192
		193	SDL::SetVideoMode $WIDTH, $HEIGHT, 0,
		194	SDL_HWSURFACE \| SDL_ANYFORMAT \| SDL_OPENGL \| SDL_DOUBLEBUF
		195	\| ($FULLSCREEN ? SDL_FULLSCREEN : 0)
		196	or die "SDL::SetVideoMode failed!\n";
		197
		198	SDL::WMSetCaption "Crossfire+ Client", "Crossfire+";
		199
		200	$SDL_EV = new SDL::Event;
		201	$SDL_EV->set_unicode (1);
		202
		203	$SDL_ACTIVE = 1;
		204
		205	$LAST_REFRESH = time - 0.01;
		206
		207	CFClient::gl_init;
		208
		209	$FONTSIZE = int $HEIGHT / 40;
		210
		211	#############################################################################
		212
		213	$DEBUG_STATUS = new CFClient::UI::Label padding => 0;
		214	$CFClient::UI::TOPLEVEL->add ($DEBUG_STATUS);
		215
		216	$STATUS_LINE = new CFClient::UI::Label
		217	padding => 0,
		218	y => $HEIGHT * 49 / 50 - $FONTSIZE;
		219	$CFClient::UI::TOPLEVEL->add ($STATUS_LINE);
		220
		221	$ALT_ENTER_MESSAGE = new CFClient::UI::Label
		222	padding => 0,
		223	y => $HEIGHT * 49 / 50,
		224	height => $HEIGHT / 50,
		225	text => "Use <b>Alt-Enter</b> to toggle fullscreen mode";
		226	$CFClient::UI::TOPLEVEL->add ($ALT_ENTER_MESSAGE);
		227
		228	$MAPWIDGET = new CFClient::UI::MapWidget;
		229	$CFClient::UI::TOPLEVEL->add ($MAPWIDGET);
		230	$MAPWIDGET->focus_in;
		231
		232	config_dialog;
		233	}
		234
		235	sub destroy_screen {
		236	$CFClient::UI::TOPLEVEL->{children} = [];
		237	undef $SDL_ACTIVE;
		238	undef $SDL_EV;
		239	SDL::Quit;
		240	}
		241
		242	my %animate_object;
		243	my $animate_timer;
		244
		245	my $want_refresh;
		246	my $can_refresh;
		247
		248	my $fps = 9;
		249
		250	sub force_refresh {
		251	$fps = $fps * 0.95 + 1 / ($NOW - $LAST_REFRESH) * 0.05;
		252	debug sprintf "%3.2f", $fps;
		253
		254	$want_refresh = 0;
		255	$can_refresh = 0;
		256
		257	glViewport 0, 0, $WIDTH, $HEIGHT;
53		258
54	glMatrixMode GL_PROJECTION;	259	glMatrixMode GL_PROJECTION;
55	glLoadIdentity;	260	glLoadIdentity;
56	glOrtho 0, $CFG->{width} / 32, $CFG->{height} / 32, 0, -1 , 1;	261	glOrtho 0, $WIDTH, $HEIGHT, 0, -10000 , 10000;
		262	glMatrixMode GL_MODELVIEW;
		263	glLoadIdentity;
57		264
58	$_->() for @GL_INIT;	265	glClearColor +($CFG->{fow_intensity}) x 3, 1;
59	}	266	glClear GL_COLOR_BUFFER_BIT;
60		267
61	sub start_game {	268	$CFClient::UI::TOPLEVEL->draw;
62	$SDL_TIMER = add Glib::Timeout 1000/20, sub {	269
63	while ($SDL_EV->poll) {	270	SDL::GLSwapBuffers;
		271
		272	$LAST_REFRESH = $NOW;
		273	}
		274
		275	my $refresh_watcher = Event->timer (after => 0, hard => 1, interval => 1 / $MAX_FPS, cb => sub {
		276	$NOW = time;
		277
64	($SDL_CB{$SDL_EV->type} \|\| sub { warn "unhandled event ", $SDL_EV->type })->();	278	($SDL_CB{$SDL_EV->type} \|\| sub { warn "unhandled event ", $SDL_EV->type })->()
65	}	279	while $SDL_EV->poll;
66		280
67	1	281	if (%animate_object) {
		282	$_->animate ($LAST_REFRESH - $NOW) for values %animate_object;
		283	$want_refresh++;
68	};	284	}
69		285
70	init_screen;	286	if ($want_refresh) {
71		287	force_refresh;
72	$CONN = new conn	288	} else {
73	host => $CFG->{host},	289	$can_refresh = 1;
74	port => $CFG->{port};	290	}
75	}	291	});
76
77	sub stop_game {
78	remove Glib::Source $SDL_TIMER;
79
80	undef $SDL_APP;
81	SDL::Quit;
82	}
83		292
84	sub refresh {	293	sub refresh {
85	glClearColor 0, 0, 0, 0;	294	$want_refresh++;
86	glClear GL_COLOR_BUFFER_BIT;	295	}
87		296
88	for (values %Client::Widget::ACTIVE_WIDGETS) {	297	sub animation_start {
89	$_->draw	298	my ($widget) = @_;
90	}	299	$animate_object{$widget} = $widget;
		300	}
91		301
92	SDL::GLSwapBuffers;	302	sub animation_stop {
		303	my ($widget) = @_;
		304	delete $animate_object{$widget};
		305	}
		306
		307	@conn::ISA = Crossfire::Protocol::;
		308
		309	sub conn::user_send {
		310	my ($self, $command) = @_;
		311
		312	$self->send ($command);
		313	status $command;
		314	}
		315
		316	sub conn::map_update {
		317	my ($self, $dirty) = @_;
		318
		319	$MAPWIDGET->update;
		320	}
		321
		322	sub conn::map_scroll {
		323	my ($self, $dx, $dy) = @_;
		324
		325	# refresh;
		326	}
		327
		328	sub conn::map_clear {
		329	my ($self) = @_;
		330
		331	# refresh;
		332	}
		333
		334	sub conn::face_find {
		335	my ($self, $face) = @_;
		336
		337	$FACECACHE->{"$face->{chksum},$face->{name}"}
		338	}
		339
		340	sub conn::face_update {
		341	my ($self, $face) = @_;
		342
		343	$FACECACHE->{"$face->{chksum},$face->{name}"} = $face->{image};
		344
		345	$face->{texture} = new_from_image CFClient::Texture delete $face->{image};
		346	}
		347
		348	sub conn::query {
		349	my ($self, $flags, $prompt) = @_;
		350
		351	warn "<<<<QUERY:$flags:$prompt>>>\n";#d#
93	}	352	}
94		353
95	%SDL_CB = (	354	%SDL_CB = (
96	SDL_QUIT() => sub {	355	SDL_QUIT() => sub {
97	warn "sdl quit\n";#d#	356	Event::unloop -1;
98	exit;
99	},	357	},
100	SDL_VIDEORESIZE() => sub {	358	SDL_VIDEORESIZE() => sub {
101	},	359	},
102	SDL_VIDEOEXPOSE() => sub {	360	SDL_VIDEOEXPOSE() => sub {
103	refresh;	361	refresh;
104	},	362	},
105	SDL_KEYDOWN() => sub {	363	SDL_KEYDOWN() => sub {
106	if ($SDL_EV->key_mod & KMOD_ALT && $SDL_EV->key_sym == SDLK_RETURN) {	364	if ($SDL_EV->key_mod & KMOD_ALT && $SDL_EV->key_sym == SDLK_RETURN) {
107	# alt-enter	365	# alt-enter
108	$CFG->{fullscreen} = !$CFG->{fullscreen};	366	$FULLSCREEN = !$FULLSCREEN;
		367	destroy_screen;
109	init_screen;	368	init_screen;
110	} else {	369	} else {
111	Client::Widget::feed_sdl_key_down_event ($SDL_EV);	370	CFClient::UI::feed_sdl_key_down_event ($SDL_EV);
112	}	371	}
113	},	372	},
114	SDL_KEYUP() => sub {	373	SDL_KEYUP() => sub {
115	Client::Widget::feed_sdl_key_up_event ($SDL_EV);	374	CFClient::UI::feed_sdl_key_up_event ($SDL_EV);
116	},	375	},
117	SDL_MOUSEMOTION() => sub {	376	SDL_MOUSEMOTION() => sub {
118	warn "sdl motion\n";#d#	377	CFClient::UI::feed_sdl_motion_event ($SDL_EV);
119	},	378	},
120	SDL_MOUSEBUTTONDOWN() => sub {	379	SDL_MOUSEBUTTONDOWN() => sub {
121	Client::Widget::feed_sdl_button_down_event ($SDL_EV);	380	CFClient::UI::feed_sdl_button_down_event ($SDL_EV);
122	},	381	},
123	SDL_MOUSEBUTTONUP() => sub {	382	SDL_MOUSEBUTTONUP() => sub {
124	Client::Widget::feed_sdl_button_up_event ($SDL_EV);	383	CFClient::UI::feed_sdl_button_up_event ($SDL_EV);
125	},	384	},
126	SDL_ACTIVEEVENT() => sub {	385	SDL_ACTIVEEVENT() => sub {
127	warn "active\n";#d#	386	# printf "active %x %x\n", $SDL_EV->active_gain, $SDL_EV->active_state;#d#
128	},	387	},
129	);	388	);
130		389
131	@conn::ISA = Crossfire::Protocol::;
132
133	sub conn::map_update {
134	my ($self, $dirty) = @_;
135
136	refresh;
137	}
138
139	sub conn::map_scroll {
140	my ($self, $dx, $dy) = @_;
141
142	refresh;
143	}
144
145	sub conn::map_clear {
146	my ($self) = @_;
147
148	refresh;
149	}
150
151	sub conn::face_update {
152	my ($self, $num, $face) = @_;
153
154	$face->{texture} = new_from_image Crossfire::Client::Texture delete $face->{image};
155	}
156
157	#############################################################################	390	#############################################################################
158		391
159	my $mapwidget = Client::MapWidget->new;
160
161	$mapwidget->activate;
162	$mapwidget->focus_in;
163
164	Client::Util::read_cfg "$Crossfire::VARDIR/pclientrc";	392	CFClient::read_cfg "$Crossfire::VARDIR/pclientrc";
165		393
166	$CFG \|\|= {	394	my %DEF_CFG = (
167	width => 640,	395	width => 640,
168	height => 480,	396	height => 480,
		397	fast => 0,
		398	fow_intensity => 0.45,
169	fullscreen => 0,	399	fullscreen => 0,
		400	sdl_mode => 0,
		401	mapsize => 100,
170	host => "crossfire.schmorp.de",	402	host => "crossfire.schmorp.de",
171	port => 13327,	403	port => 13327,
172	};	404	);
173		405
174	Client::Util::run_config_dialog	406	while (my ($k, $v) = each %DEF_CFG) {
175	login => sub { start_game },	407	$CFG->{$k} = $v unless exists $CFG->{$k};
176	logout => sub { stop_game };	408	}
177		409
178	main Gtk2;	410	sdl_init;
		411
		412	@SDL_MODES = reverse map [SDL::RectW ($_), SDL::RectH ($_)],
		413	@{ SDL::ListModes 0, SDL_FULLSCREEN \| SDL_HWSURFACE \| SDL_OPENGL };
		414
		415	@SDL_MODES or CFClient::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)";
		416
		417	$CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES;
		418
		419	init_screen;
		420
		421	{
		422	my @fonts = map CFClient::find_rcfile $_, qw(uifont.ttf uifontb.ttf uifonti.ttf uifontbi.ttf);
		423
		424	CFClient::add_font $_ for @fonts;
		425	CFClient::set_font $fonts[0];
		426	}
		427
		428	$FACECACHE = eval { Crossfire::load_ref "$Crossfire::VARDIR/pclient.faces" } \|\| {};
		429
		430	Event::loop;
		431
		432	Crossfire::save_ref $FACECACHE, "$Crossfire::VARDIR/pclient.faces";
		433

Diff Legend

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

Comparing deliantra/Deliantra-Client/bin/pclient (file contents): Revision 1.18 by root, Fri Apr 7 18:49:53 2006 UTC vs. Revision 1.90 by root, Wed Apr 12 21:35:11 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/bin/pclient (file contents):
Revision 1.18 by root, Fri Apr 7 18:49:53 2006 UTC vs.
Revision 1.90 by root, Wed Apr 12 21:35:11 2006 UTC