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

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

Diff Legend

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

Comparing deliantra/Deliantra-Client/bin/pclient (file contents): Revision 1.51 by root, Sun Apr 9 21:34:49 2006 UTC vs. Revision 1.100 by elmex, Fri Apr 14 10:57:36 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/bin/pclient (file contents):
Revision 1.51 by root, Sun Apr 9 21:34:49 2006 UTC vs.
Revision 1.100 by elmex, Fri Apr 14 10:57:36 2006 UTC