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

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

Diff Legend

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

Comparing deliantra/Deliantra-Client/bin/pclient (file contents): Revision 1.74 by root, Tue Apr 11 20:44:49 2006 UTC vs. Revision 1.112 by root, Sat Apr 15 13:56:26 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/bin/pclient (file contents):
Revision 1.74 by root, Tue Apr 11 20:44:49 2006 UTC vs.
Revision 1.112 by root, Sat Apr 15 13:56:26 2006 UTC