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

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

Diff Legend

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

Comparing deliantra/Deliantra-Client/bin/pclient (file contents): Revision 1.57 by root, Sun Apr 9 23:11:16 2006 UTC vs. Revision 1.96 by root, Thu Apr 13 23:11:11 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/bin/pclient (file contents):
Revision 1.57 by root, Sun Apr 9 23:11:16 2006 UTC vs.
Revision 1.96 by root, Thu Apr 13 23:11:11 2006 UTC