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

Comparing deliantra/Deliantra-Client/bin/pclient (file contents):
Revision 1.15 by elmex, Fri Apr 7 17:18:22 2006 UTC vs.
Revision 1.39 by root, Sun Apr 9 00:09:50 2006 UTC

…		…
1	#!/opt/bin/perl	1	#!/opt/bin/perl
2		2
3	use strict;	3	use strict;
		4	use utf8;
4		5
5	use Glib;	6	use Glib;
6	use Gtk2 -init;	7	use Gtk2 -init;
7		8
8	use SDL;	9	use SDL;
14		15
15	use Crossfire;	16	use Crossfire;
16	use Crossfire::Client;	17	use Crossfire::Client;
17	use Crossfire::Protocol;	18	use Crossfire::Protocol;
18		19
19	use Client::Util;
20	use Client::Widget;	20	use Crossfire::Client::Widget;
		21
		22	our $FACECACHE;
21		23
22	our $VERSION = '0.1';	24	our $VERSION = '0.1';
		25
		26	our %GL_EXT;
23		27
24	our $CFG;	28	our $CFG;
25	our $CONN;	29	our $CONN;
		30
		31	our $WIDTH;
		32	our $HEIGHT;
		33	our $FULLSCREEN;
		34
		35	our $FONTSIZE;
26		36
27	our $SDL_TIMER;	37	our $SDL_TIMER;
28	our $SDL_APP;	38	our $SDL_APP;
29	our $SDL_EV = new SDL::Event;	39	our $SDL_EV = new SDL::Event;
30	our %SDL_CB;	40	our %SDL_CB;
31		41
		42	our @GL_INIT; # hooks called on every gl init
		43
		44	our $ALT_ENTER_MESSAGE;
		45
		46	our $tw; # Test widget #d#
		47
32	sub init_screen {	48	sub init_screen {
33	# nuke all gl context data
34
35	$SDL_APP = new SDL::App	49	$SDL_APP = new SDL::App
36	-flags => SDL_ANYFORMAT \| SDL_HWSURFACE,	50	-flags => SDL_ANYFORMAT \| SDL_HWSURFACE,
37	-title => "Crossfire+ Client",	51	-title => "Crossfire+ Client",
38	-width => $CFG->{width},	52	-width => $WIDTH,
39	-height => $CFG->{height},	53	-height => $HEIGHT,
40	-opengl => 1,	54	-opengl => 1,
41	-red_size => 8,	55	-red_size => 8,
42	-green_size => 8,	56	-green_size => 8,
43	-blue_size => 8,	57	-blue_size => 8,
44	-double_buffer => 1,	58	-double_buffer => 1,
45	-fullscreen => $CFG->{fullscreen},	59	-fullscreen => $FULLSCREEN,
46	-resizeable => 0;	60	-resizeable => 0;
47		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	$FONTSIZE = int $HEIGHT / 40;
		68
		69	$ALT_ENTER_MESSAGE = new Crossfire::Client::Widget::Label 0, $FONTSIZE, $HEIGHT - $FONTSIZE, $FONTSIZE, "Alt-Enter toggles fullscreen mode";
		70	$ALT_ENTER_MESSAGE->move (0, $HEIGHT - ($ALT_ENTER_MESSAGE->size_request)[1]);
		71	$ALT_ENTER_MESSAGE->activate;
		72
		73	# Test code #d#
		74	{
		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, $FONTSIZE, "Foo in the garden!");
		78	$tw->add ($frm);
		79
		80	$tw->move (0, $HEIGHT - 120);
		81	$tw->activate;
		82	}
		83
		84	glClearColor 0, 0, 0, 0;
		85
48	glEnable GL_TEXTURE_2D;	86	glEnable GL_TEXTURE_2D;
49	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	87	glEnable GL_COLOR_MATERIAL;
50	glShadeModel GL_FLAT;	88	glShadeModel GL_FLAT;
51	glDisable GL_DEPTH_TEST;	89	glDisable GL_DEPTH_TEST;
52	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	90	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
53	glEnable GL_BLEND;	91
		92	$_->() for @GL_INIT;
		93	}
		94
		95	sub start_game {
		96	$SDL_TIMER = add Glib::Timeout 1000/100, sub {
		97	($SDL_CB{$SDL_EV->type} \|\| sub { warn "unhandled event ", $SDL_EV->type })->()
		98	while $SDL_EV->poll;
		99
		100	1
		101	};
		102
		103	$WIDTH = $CFG->{width};
		104	$HEIGHT = $CFG->{height};
		105	$FULLSCREEN = 0;
		106
		107	init_screen;
		108
		109	$CONN = new conn
		110	host => $CFG->{host},
		111	port => $CFG->{port},
		112	user => $CFG->{user},
		113	pass => $CFG->{password},
		114	mapw => 50,
		115	maph => 37,
		116	;
		117	}
		118
		119	sub stop_game {
		120	remove Glib::Source $SDL_TIMER;
		121
		122	undef $SDL_APP;
		123	SDL::Quit;
		124	}
		125
		126
		127	sub force_refresh {
		128	glViewport 0, 0, $WIDTH, $HEIGHT;
54		129
55	glMatrixMode GL_PROJECTION;	130	glMatrixMode GL_PROJECTION;
56	glLoadIdentity;	131	glLoadIdentity;
57	glOrtho 0, $CFG->{width} / 32, $CFG->{height} / 32, 0, -1 , 1;	132	glOrtho 0, $WIDTH, $HEIGHT, 0, -100 , 100;
		133	glMatrixMode GL_MODELVIEW;
58		134
59	# re-bind all textures	135	glClear GL_COLOR_BUFFER_BIT;
60	}
61		136
62	sub start_game {	137	$_->draw for @Crossfire::Client::Widget::ACTIVE_WIDGETS;
63	$SDL_TIMER = add Glib::Timeout 1000/20, sub {	138
64	while ($SDL_EV->poll) {	139	SDL::GLSwapBuffers;
65	($SDL_CB{$SDL_EV->type} \|\| sub { warn "unhandled event ", $SDL_EV->type })->();	140	}
		141
		142	my $refresh_handler;
		143
		144	sub refresh {
		145	$refresh_handler \|\|= add Glib::Idle sub {
		146	force_refresh;
		147	undef $refresh_handler;
66	}	148	0
67
68	1
69	};	149	};
70
71	init_screen;
72
73	$CONN = new conn
74	host => $CFG->{host},
75	port => $CFG->{port};
76	}
77
78	sub stop_game {
79	remove Glib::Source $SDL_TIMER;
80
81	undef $SDL_APP;
82	SDL::Quit;
83	}
84
85	sub refresh {
86	glClearColor 0, 0, 0, 0;
87	glClear GL_COLOR_BUFFER_BIT;
88
89	my $map = $CONN->{map};
90
91	for my $x (0 .. $CONN->{mapw} - 1) {
92	for my $y (0 .. $CONN->{maph} - 1) {
93
94	my $cell = $map->[$x][$y]
95	or next;
96
97	my $darkness = $cell->[3] * (1 / 255);
98	glColor $darkness, $darkness, $darkness;
99
100	for my $num (grep $_, $cell->[0], $cell->[1], $cell->[2]) {
101	my $tex = $CONN->{face}[$num]{texture} \|\| 0;
102
103	glBindTexture GL_TEXTURE_2D, $tex;
104
105	glBegin GL_QUADS;
106	glTexCoord 0, 0; glVertex $x, $y;
107	glTexCoord 0, 1; glVertex $x, $y + 1;
108	glTexCoord 1, 1; glVertex $x + 1, $y + 1;
109	glTexCoord 1, 0; glVertex $x + 1, $y;
110	glEnd;
111	}
112	}
113	}
114
115	SDL::GLSwapBuffers;
116	}	150	}
117		151
118	%SDL_CB = (	152	%SDL_CB = (
119	SDL_QUIT() => sub {	153	SDL_QUIT() => sub {
120	warn "sdl quit\n";#d#	154	main_quit Gtk2;
121	exit;
122	},	155	},
123	SDL_VIDEORESIZE() => sub {	156	SDL_VIDEORESIZE() => sub {
124	},	157	},
125	SDL_VIDEOEXPOSE() => sub {	158	SDL_VIDEOEXPOSE() => sub {
126	refresh;	159	refresh;
127	},	160	},
128	SDL_KEYDOWN() => sub {	161	SDL_KEYDOWN() => sub {
		162	if ($SDL_EV->key_mod & KMOD_ALT && $SDL_EV->key_sym == SDLK_RETURN) {
		163	# alt-enter
		164	$FULLSCREEN = !$FULLSCREEN;
		165	init_screen;
		166	} else {
129	# Client::Widget::feed_sdl_key_down_event ($SDL_EV);	167	Crossfire::Client::Widget::feed_sdl_key_down_event ($SDL_EV);
		168	}
130	},	169	},
131	SDL_KEYUP() => sub {	170	SDL_KEYUP() => sub {
132	# Client::Widget::feed_sdl_key_up_event ($SDL_EV);	171	Crossfire::Client::Widget::feed_sdl_key_up_event ($SDL_EV);
133	},	172	},
134	SDL_MOUSEMOTION() => sub {	173	SDL_MOUSEMOTION() => sub {
135	warn "sdl motion\n";#d#	174	warn "sdl motion\n";#d#
136	},	175	},
137	SDL_MOUSEBUTTONDOWN() => sub {	176	SDL_MOUSEBUTTONDOWN() => sub {
138	# Client::Widget::feed_sdl_button_down_event ($SDL_EV);	177	Crossfire::Client::Widget::feed_sdl_button_down_event ($SDL_EV);
139	},	178	},
140	SDL_MOUSEBUTTONUP() => sub {	179	SDL_MOUSEBUTTONUP() => sub {
141	# Client::Widget::feed_sdl_button_up_event ($SDL_EV);	180	Crossfire::Client::Widget::feed_sdl_button_up_event ($SDL_EV);
142	},	181	},
143	SDL_ACTIVEEVENT() => sub {	182	SDL_ACTIVEEVENT() => sub {
144	warn "active\n";#d#	183	warn "active\n";#d#
145	},	184	},
146	);	185	);
…		…
163	my ($self) = @_;	202	my ($self) = @_;
164		203
165	refresh;	204	refresh;
166	}	205	}
167		206
		207	sub conn::face_find {
		208	my ($self, $face) = @_;
		209
		210	$FACECACHE->{"$face->{chksum},$face->{name}"}
		211	}
		212
168	sub conn::face_update {	213	sub conn::face_update {
169	my ($self, $num, $face) = @_;	214	my ($self, $face) = @_;
170		215
171	my $pb = new Gtk2::Gdk::PixbufLoader;	216	$FACECACHE->{"$face->{chksum},$face->{name}"} = $face->{image};
172	$pb->write ($face->{image});
173	$pb->close;
174		217
175	$pb = $pb->get_pixbuf;	218	$face->{texture} = new_from_image Crossfire::Client::Texture delete $face->{image};
176	$pb = $pb->add_alpha (0, 0, 0, 0);	219	}
177		220
178	glGetError();	221	sub conn::query {
179	my ($tex) = @{glGenTextures 1};	222	my ($self, $flags, $prompt) = @_;
180		223
181	$face->{texture} = $tex;	224	warn "<<<<QUERY:$flags:$prompt>>>\n";#d#
		225	}
		226
		227	sub gtk_add_cfg_field {
		228	my ($tbl, $cfg, $klbl, $key, $value) = @_;
		229	my $i = $cfg->{_i}++;
		230	$tbl->attach_defaults (my $lbl = Gtk2::Label->new ($klbl), 0, 1, $i, $i + 1);
		231	$tbl->attach_defaults (my $ent = Gtk2::Entry->new, 1, 2, $i, $i + 1);
		232	if ($key eq 'password') {
		233	$ent->set_invisible_char ("*");
		234	$ent->set (visibility => 0)
		235	}
		236	$ent->set_text ($value);
		237	$ent->signal_connect (changed => sub {
		238	my ($ent) = @_;
		239	$cfg->{$key} = $ent->get_text;
		240	});
		241	}
		242
		243	sub run_config_dialog {
		244	my (%events) = @_;
		245
		246	my $w = Gtk2::Window->new;
		247
		248	my @cfg = (
		249	[qw/Host host/],
		250	[qw/Port port/],
		251	[qw/Username user/],
		252	[qw/Password password/],
182		253	);
183	glBindTexture GL_TEXTURE_2D, $tex;	254
184	my $glerr=glGetError(); die "a: ".gluErrorString($glerr)."\n" if $glerr;	255	my $cfg = {};
		256
		257	my $a = SDL::ListModes (0, SDL_FULLSCREEN\|SDL_HWSURFACE);
		258	my @modes = map { [SDL::RectW ($_), SDL::RectH ($_)] } @$a;
		259
		260	$w->add (my $vb = Gtk2::VBox->new);
		261	$vb->pack_start (my $t = Gtk2::Table->new (2, scalar @cfg), 0, 0, 0);
		262	my $selmode = $::CFG->{width} . 'x' . $::CFG->{height};
		263	$t->attach_defaults (Gtk2::Label->new ("Modes"), 0, 1, 0, 1);
		264	$t->attach_defaults (my $cb = Gtk2::ComboBox->new_text, 1, 2, 0, 1);
		265	my $i = 0;
		266	my $act = 0;
		267	for (map { "$_->[0]x$_->[1]" } reverse @modes) {
		268	if ($_ eq $selmode) { $act = $i }
		269	$cb->append_text ($_);
		270	$i++;
		271	}
		272	$cb->set_active ($act);
		273	$cb->signal_connect (changed => sub {
		274	my ($cb) = @_;
		275	my $txt = $cb->get_active_text;
		276	if ($txt =~ m/(\d+)x(\d+)/) {
		277	$::CFG->{width} = $1;
		278	$::CFG->{height} = $2;
185		279	}
186	glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR;	280	});
187	glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR;#_MIPMAP_LINEAR;	281
188	glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP;	282	$cfg->{_i} = 1;
189	glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP;	283	for (@cfg) {
190		284	gtk_add_cfg_field ($t, $cfg, $_->[0], $_->[1], $::CFG->{$_->[1]});
191	glTexImage2D GL_TEXTURE_2D, 0,	285	}
192	GL_RGBA8,	286
193	$pb->get_width, $pb->get_height,	287	$vb->pack_start (my $hb = Gtk2::HBox->new, 0, 0, 0);
		288	$hb->pack_start (my $cb = Gtk2::Button->new ("save"), 1, 1, 5);
		289	$cb->signal_connect (clicked => sub {
		290	for (keys %$cfg) {
		291	$::CFG->{$_} = $cfg->{$_}
		292	if $_ ne '_i';
194	0,	293	}
		294	Crossfire::Client::write_cfg "$Crossfire::VARDIR/pclientrc";
		295	});
		296	$hb->pack_start (my $cb = Gtk2::Button->new ("login"), 1, 1, 5);
		297	$cb->signal_connect (clicked => sub {
		298	for (keys %$cfg) {
		299	$::CFG->{$_} = $cfg->{$_}
		300	if $_ ne '_i';
195	GL_RGBA,	301	}
196	GL_UNSIGNED_BYTE,	302	my $cb = $events{login} \|\| sub {};
197	$pb->get_pixels;	303	$cb->($::CFG->{user}, $::CFG->{password});
198	my $glerr=glGetError(); die "Problem setting up 2d Texture (dimensions not a power of 2?)):".gluErrorString($glerr)."\n" if $glerr;	304	});
		305	$hb->pack_start (my $cb = Gtk2::Button->new ("logout"), 1, 1, 5);
		306	$cb->signal_connect (clicked => sub {
		307	my $cb = $events{login} \|\| sub {};
		308	$cb->();
		309	});
		310	$hb->pack_start (my $cb = Gtk2::Button->new ("quit"), 1, 1, 5);
		311	$cb->signal_connect (clicked => sub { $w->destroy });
		312
		313	$w->show_all;
		314
		315	$w->signal_connect (destroy => sub { Gtk2->main_quit });
199	}	316	}
		317
200		318
201	#############################################################################	319	#############################################################################
202		320
		321	SDL::Init SDL_INIT_EVERYTHING;
		322
		323	my $mapwidget = Crossfire::Client::Widget::MapWidget->new;
		324
		325	$mapwidget->activate;
		326	$mapwidget->focus_in;
		327
203	Client::Util::read_cfg "$Crossfire::VARDIR/pclientrc";	328	Crossfire::Client::read_cfg "$Crossfire::VARDIR/pclientrc";
204		329
205	$CFG \|\|= {	330	$CFG \|\|= {
206	width => 640,	331	width => 640,
207	height => 480,	332	height => 480,
208	fullscreen => 0,	333	fullscreen => 0,
209	host => "crossfire.schmorp.de",	334	host => "crossfire.schmorp.de",
210	port => 13327,	335	port => 13327,
211	};	336	};
212		337
213	Client::Util::run_config_dialog	338	$FACECACHE = eval { Crossfire::load_ref "$Crossfire::VARDIR/pclient.faces" } \|\| {};
		339
		340	run_config_dialog
214	login => sub { start_game },	341	login => sub { start_game },
215	logout => sub { stop_game },	342	logout => sub { stop_game };
216		343
217	main Gtk2;	344	main Gtk2;
		345
		346	Crossfire::save_ref $FACECACHE, "$Crossfire::VARDIR/pclient.faces";

Diff Legend

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

Comparing deliantra/Deliantra-Client/bin/pclient (file contents): Revision 1.15 by elmex, Fri Apr 7 17:18:22 2006 UTC vs. Revision 1.39 by root, Sun Apr 9 00:09:50 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/bin/pclient (file contents):
Revision 1.15 by elmex, Fri Apr 7 17:18:22 2006 UTC vs.
Revision 1.39 by root, Sun Apr 9 00:09:50 2006 UTC