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

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

Diff Legend

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

Comparing deliantra/Deliantra-Client/bin/pclient (file contents): Revision 1.36 by elmex, Sat Apr 8 22:23:57 2006 UTC vs. Revision 1.89 by root, Wed Apr 12 21:20:42 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/bin/pclient (file contents):
Revision 1.36 by elmex, Sat Apr 8 22:23:57 2006 UTC vs.
Revision 1.89 by root, Wed Apr 12 21:20:42 2006 UTC