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

Comparing deliantra/Deliantra-Client/bin/pclient (file contents):
Revision 1.14 by elmex, Fri Apr 7 16:36:44 2006 UTC vs.
Revision 1.48 by elmex, Sun Apr 9 18:30:03 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 Crossfire::Client::Widget;
		21
		22	our $FACECACHE;
20		23
21	our $VERSION = '0.1';	24	our $VERSION = '0.1';
		25
		26	our %GL_EXT;
22		27
23	our $CFG;	28	our $CFG;
24	our $CONN;	29	our $CONN;
		30
		31	our $WIDTH;
		32	our $HEIGHT;
		33	our $FULLSCREEN;
		34
		35	our $FONTSIZE;
25		36
26	our $SDL_TIMER;	37	our $SDL_TIMER;
27	our $SDL_APP;	38	our $SDL_APP;
28	our $SDL_EV = new SDL::Event;	39	our $SDL_EV = new SDL::Event;
29	our %SDL_CB;	40	our %SDL_CB;
30		41
		42	our @GL_INIT; # hooks called on every gl init
		43
		44	our $ALT_ENTER_MESSAGE;
		45
		46	our $TOPLEVEL;
		47
		48	our $tw; # Test widget #d#
		49
		50	my $last_refresh;
		51
31	sub init_screen {	52	sub init_screen {
32	# nuke all gl context data
33
34	$SDL_APP = new SDL::App	53	$SDL_APP = new SDL::App
35	-flags => SDL_ANYFORMAT \| SDL_HWSURFACE,	54	-flags => SDL_ANYFORMAT \| SDL_HWSURFACE,
36	-title => "Crossfire+ Client",	55	-title => "Crossfire+ Client",
37	-width => $CFG->{width},	56	-width => $WIDTH,
38	-height => $CFG->{height},	57	-height => $HEIGHT,
39	-opengl => 1,	58	-opengl => 1,
40	-red_size => 8,	59	-red_size => 8,
41	-green_size => 8,	60	-green_size => 8,
42	-blue_size => 8,	61	-blue_size => 8,
43	-double_buffer => 1,	62	-double_buffer => 1,
44	-fullscreen => $CFG->{fullscreen},	63	-fullscreen => $FULLSCREEN,
45	-resizeable => 0;	64	-resizeable => 0;
46		65
		66	$last_refresh = SDL::GetTicks;
		67
		68	%GL_EXT = map +($_ => 1), split /\s+/, Crossfire::Client::gl_extensions;
		69
		70	$GL_EXT{GL_ARB_texture_non_power_of_two}
		71	or warn "WARNING: non-power-of-two opengl extension required";
		72
		73	$FONTSIZE = int $HEIGHT / 50;
		74
		75	$ALT_ENTER_MESSAGE = new Crossfire::Client::Widget::Label
		76	0, $FONTSIZE, $HEIGHT - $FONTSIZE, $FONTSIZE,
		77	"Use <b>Alt-Enter</b> to toggle fullscreen mode";
		78	$ALT_ENTER_MESSAGE->move (0, $HEIGHT - ($ALT_ENTER_MESSAGE->size_request)[1]);
		79	$TOPLEVEL->add ($ALT_ENTER_MESSAGE);
		80
		81	# Test code #d#
		82	unless ($tw) { # haha...
		83	$tw = new Crossfire::Client::Widget::Animator;
		84	my $lbl1 = new Crossfire::Client::Widget::Label
		85	0, 0, 10, $FONTSIZE, "<i>This</i> is a\n<u>TEST</u>!\nOf a themed\nFrame!";
		86	my $lbl2 = new Crossfire::Client::Widget::Label
		87	0, 0, 10, $FONTSIZE, "LBL2";
		88
		89	my $vb = new Crossfire::Client::Widget::VBox;
		90	my $f = new Crossfire::Client::Widget::FancyFrame;
		91	my $f2 = new Crossfire::Client::Widget::FancyFrame;
		92	$f->add ($lbl1);
		93	$f2->add ($lbl2);
		94	$vb->add ($f);
		95	$vb->add ($f2, 1);
		96
		97	$tw->add ($vb);
		98	$tw->w (400);
		99	$tw->h (300);
		100	$tw->move ($WIDTH - 200, 0);
		101	$tw->moveto (0, 0);
		102	$TOPLEVEL->add ($tw);
		103
		104	# $f->move ($WIDTH - 200, 0);
		105	# $TOPLEVEL->add ($f);
		106	}
		107
		108	glClearColor 0, 0, 0, 0;
		109
47	glEnable GL_TEXTURE_2D;	110	glEnable GL_TEXTURE_2D;
48	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	111	glEnable GL_COLOR_MATERIAL;
49	glShadeModel GL_FLAT;	112	glShadeModel GL_FLAT;
50	glDisable GL_DEPTH_TEST;	113	glDisable GL_DEPTH_TEST;
51	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	114	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
52	glEnable GL_BLEND;	115
		116	$_->() for @GL_INIT;
		117	}
		118
		119	sub start_game {
		120	$SDL_TIMER = add Glib::Timeout 1000/100, sub {
		121	($SDL_CB{$SDL_EV->type} \|\| sub { warn "unhandled event ", $SDL_EV->type })->()
		122	while $SDL_EV->poll;
		123
		124	1
		125	};
		126
		127	$WIDTH = $CFG->{width};
		128	$HEIGHT = $CFG->{height};
		129	$FULLSCREEN = 0;
		130
		131	init_screen;
		132
		133	$CONN = new conn
		134	host => $CFG->{host},
		135	port => $CFG->{port},
		136	user => $CFG->{user},
		137	pass => $CFG->{password},
		138	mapw => 50,
		139	maph => 37,
		140	;
		141
		142	Crossfire::Client::lowdelay fileno $CONN->{fh};
		143	}
		144
		145	sub stop_game {
		146	remove Glib::Source $SDL_TIMER;
		147
		148	undef $SDL_APP;
		149	SDL::Quit;
		150	}
		151
		152
		153	sub force_refresh {
		154	glViewport 0, 0, $WIDTH, $HEIGHT;
53		155
54	glMatrixMode GL_PROJECTION;	156	glMatrixMode GL_PROJECTION;
55	glLoadIdentity;	157	glLoadIdentity;
56	glOrtho 0, $CFG->{width} / 32, $CFG->{height} / 32, 0, -1 , 1;	158	glOrtho 0, $WIDTH, $HEIGHT, 0, -6000 , 6000;
		159	glMatrixMode GL_MODELVIEW;
57		160
58	# re-bind all textures	161	glClear GL_COLOR_BUFFER_BIT;
59	}
60		162
61	sub start_game {	163	$TOPLEVEL->draw;
62	$SDL_TIMER = add Glib::Timeout 1000/20, sub {	164
63	while ($SDL_EV->poll) {	165	SDL::GLSwapBuffers;
64	($SDL_CB{$SDL_EV->type} \|\| sub { warn "unhandled event ", $SDL_EV->type })->();	166	}
		167
		168	my %ANIMATE;
		169
		170	my $refresh_handler;
		171
		172	sub refresh {
		173	$refresh_handler \|\|= add Glib::Idle sub {
		174	my $next_refresh = SDL::GetTicks;
		175	my $interval = ($next_refresh - $last_refresh) * 0.001;
		176	$last_refresh = $next_refresh;
		177
		178	force_refresh;
		179	$_->animate ($interval) for grep $_, values %ANIMATE;
		180
		181	if (%ANIMATE) {
		182	1
		183	} else {
		184	undef $refresh_handler;
		185	0
65	}	186	}
66
67	1
68	};	187	};
69
70	init_screen;
71
72	$CONN = new conn
73	host => $CFG->{host},
74	port => $CFG->{port};
75	}	188	}
76		189
77	sub stop_game {	190	sub animation_start {
78	remove Glib::Source $SDL_TIMER;	191	my ($widget) = @_;
		192	$ANIMATE{$widget} = $widget;
		193	Scalar::Util::weaken $ANIMATE{$widget};
79		194
80	undef $SDL_APP;	195	refresh;
81	SDL::Quit;
82	}	196	}
83		197
84	sub refresh {	198	sub animation_stop {
85	glClearColor 0, 0, 0, 0;	199	my ($widget) = @_;
86	glClear GL_COLOR_BUFFER_BIT;	200	delete $ANIMATE{$widget};
87
88	my $map = $CONN->{map};
89
90	for my $x (0 .. $CONN->{mapw} - 1) {
91	for my $y (0 .. $CONN->{maph} - 1) {
92
93	my $cell = $map->[$x][$y]
94	or next;
95
96	my $darkness = $cell->[3] * (1 / 255);
97	glColor $darkness, $darkness, $darkness;
98
99	for my $num (grep $_, $cell->[0], $cell->[1], $cell->[2]) {
100	my $tex = $CONN->{face}[$num]{texture} \|\| 0;
101
102	glBindTexture GL_TEXTURE_2D, $tex;
103
104	glBegin GL_QUADS;
105	glTexCoord 0, 0; glVertex $x, $y;
106	glTexCoord 0, 1; glVertex $x, $y + 1;
107	glTexCoord 1, 1; glVertex $x + 1, $y + 1;
108	glTexCoord 1, 0; glVertex $x + 1, $y;
109	glEnd;
110	}
111	}
112	}
113
114	SDL::GLSwapBuffers;
115	}	201	}
116		202
117	%SDL_CB = (	203	%SDL_CB = (
118	SDL_QUIT() => sub {	204	SDL_QUIT() => sub {
119	warn "sdl quit\n";#d#	205	main_quit Gtk2;
120	exit;
121	},	206	},
122	SDL_VIDEORESIZE() => sub {	207	SDL_VIDEORESIZE() => sub {
123	},	208	},
124	SDL_VIDEOEXPOSE() => sub {	209	SDL_VIDEOEXPOSE() => sub {
125	refresh;	210	refresh;
126	},	211	},
127	SDL_KEYDOWN() => sub {	212	SDL_KEYDOWN() => sub {
		213	if ($SDL_EV->key_mod & KMOD_ALT && $SDL_EV->key_sym == SDLK_RETURN) {
		214	# alt-enter
		215	$FULLSCREEN = !$FULLSCREEN;
		216	init_screen;
		217	} else {
		218	Crossfire::Client::Widget::feed_sdl_key_down_event ($SDL_EV);
		219	}
128	},	220	},
129	SDL_KEYUP() => sub {	221	SDL_KEYUP() => sub {
		222	Crossfire::Client::Widget::feed_sdl_key_up_event ($SDL_EV);
130	},	223	},
131	SDL_MOUSEMOTION() => sub {	224	SDL_MOUSEMOTION() => sub {
132	warn "sdl motion\n";#d#	225	warn "sdl motion\n";#d#
133	},	226	},
134	SDL_MOUSEBUTTONDOWN() => sub {	227	SDL_MOUSEBUTTONDOWN() => sub {
		228	Crossfire::Client::Widget::feed_sdl_button_down_event ($SDL_EV);
135	},	229	},
136	SDL_MOUSEBUTTONUP() => sub {	230	SDL_MOUSEBUTTONUP() => sub {
		231	Crossfire::Client::Widget::feed_sdl_button_up_event ($SDL_EV);
137	},	232	},
138	SDL_ACTIVEEVENT() => sub {	233	SDL_ACTIVEEVENT() => sub {
139	warn "active\n";#d#	234	warn "active\n";#d#
140	},	235	},
141	);	236	);
…		…
149	}	244	}
150		245
151	sub conn::map_scroll {	246	sub conn::map_scroll {
152	my ($self, $dx, $dy) = @_;	247	my ($self, $dx, $dy) = @_;
153		248
154	refresh;	249	# refresh;
155	}	250	}
156		251
157	sub conn::map_clear {	252	sub conn::map_clear {
158	my ($self) = @_;	253	my ($self) = @_;
159		254
160	refresh;	255	# refresh;
		256	}
		257
		258	sub conn::face_find {
		259	my ($self, $face) = @_;
		260
		261	$FACECACHE->{"$face->{chksum},$face->{name}"}
161	}	262	}
162		263
163	sub conn::face_update {	264	sub conn::face_update {
164	my ($self, $num, $face) = @_;	265	my ($self, $face) = @_;
165		266
166	my $pb = new Gtk2::Gdk::PixbufLoader;	267	$FACECACHE->{"$face->{chksum},$face->{name}"} = $face->{image};
167	$pb->write ($face->{image});
168	$pb->close;
169		268
170	$pb = $pb->get_pixbuf;	269	$face->{texture} = new_from_image Crossfire::Client::Texture delete $face->{image};
171	$pb = $pb->add_alpha (0, 0, 0, 0);	270	}
172		271
173	glGetError();	272	sub conn::query {
174	my ($tex) = @{glGenTextures 1};	273	my ($self, $flags, $prompt) = @_;
175		274
176	$face->{texture} = $tex;	275	warn "<<<<QUERY:$flags:$prompt>>>\n";#d#
		276	}
		277
		278	sub gtk_add_cfg_field {
		279	my ($tbl, $cfg, $klbl, $key, $value) = @_;
		280	my $i = $cfg->{_i}++;
		281	$tbl->attach_defaults (my $lbl = Gtk2::Label->new ($klbl), 0, 1, $i, $i + 1);
		282	$tbl->attach_defaults (my $ent = Gtk2::Entry->new, 1, 2, $i, $i + 1);
		283	if ($key eq 'password') {
		284	$ent->set_invisible_char ("*");
		285	$ent->set (visibility => 0)
		286	}
		287	$ent->set_text ($value);
		288	$ent->signal_connect (changed => sub {
		289	my ($ent) = @_;
		290	$cfg->{$key} = $ent->get_text;
		291	if ($key eq 'mapsize' and $cfg->{$key} > 100) {
		292	$cfg->{$key} = 100;
		293	$ent->set_text ('100');
		294	} elsif ($key eq 'mapsize' and $cfg->{$key} < 50) {
		295	$cfg->{$key} = 50;
		296	$ent->set_text ('50');
		297	}
		298	});
		299	}
		300
		301	sub run_config_dialog {
		302	my (%events) = @_;
		303
		304	my $w = Gtk2::Window->new;
		305
		306	my @cfg = (
		307	[qw/Host host/],
		308	[qw/Port port/],
		309	[qw/Mapsize% mapsize/],
		310	[qw/Username user/],
		311	[qw/Password password/],
177		312	);
178	glBindTexture GL_TEXTURE_2D, $tex;	313
179	my $glerr=glGetError(); die "a: ".gluErrorString($glerr)."\n" if $glerr;	314	my $cfg = {};
		315
		316	my $a = SDL::ListModes (0, SDL_FULLSCREEN\|SDL_HWSURFACE);
		317	my @modes = map { [SDL::RectW ($_), SDL::RectH ($_)] } @$a;
		318
		319	$w->add (my $vb = Gtk2::VBox->new);
		320	$vb->pack_start (my $t = Gtk2::Table->new (2, scalar @cfg), 0, 0, 0);
		321	my $selmode = $::CFG->{width} . 'x' . $::CFG->{height};
		322	$t->attach_defaults (Gtk2::Label->new ("Modes"), 0, 1, 0, 1);
		323	$t->attach_defaults (my $cb = Gtk2::ComboBox->new_text, 1, 2, 0, 1);
		324	my $i = 0;
		325	my $act = 0;
		326	for (map { "$_->[0]x$_->[1]" } reverse @modes) {
		327	if ($_ eq $selmode) { $act = $i }
		328	$cb->append_text ($_);
		329	$i++;
		330	}
		331	$cb->set_active ($act);
		332	$cb->signal_connect (changed => sub {
		333	my ($cb) = @_;
		334	my $txt = $cb->get_active_text;
		335	if ($txt =~ m/(\d+)x(\d+)/) {
		336	$::CFG->{width} = $1;
		337	$::CFG->{height} = $2;
180		338	}
181	glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR;	339	});
182	glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR;#_MIPMAP_LINEAR;	340
183	glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP;	341	$cfg->{_i} = 1;
184	glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP;	342	for (@cfg) {
185		343	gtk_add_cfg_field ($t, $cfg, $_->[0], $_->[1], $::CFG->{$_->[1]});
186	glTexImage2D GL_TEXTURE_2D, 0,	344	}
187	GL_RGBA8,	345
188	$pb->get_width, $pb->get_height,	346	$vb->pack_start (my $hb = Gtk2::HBox->new, 0, 0, 0);
		347	$hb->pack_start (my $cb = Gtk2::Button->new ("save"), 1, 1, 5);
		348	$cb->signal_connect (clicked => sub {
		349	for (keys %$cfg) {
		350	$::CFG->{$_} = $cfg->{$_}
		351	if $_ ne '_i';
189	0,	352	}
		353	Crossfire::Client::write_cfg "$Crossfire::VARDIR/pclientrc";
		354	});
		355	$hb->pack_start (my $cb = Gtk2::Button->new ("login"), 1, 1, 5);
		356	$cb->signal_connect (clicked => sub {
		357	for (keys %$cfg) {
		358	$::CFG->{$_} = $cfg->{$_}
		359	if $_ ne '_i';
190	GL_RGBA,	360	}
191	GL_UNSIGNED_BYTE,	361	my $cb = $events{login} \|\| sub {};
192	$pb->get_pixels;	362	$cb->($::CFG->{user}, $::CFG->{password});
193	my $glerr=glGetError(); die "Problem setting up 2d Texture (dimensions not a power of 2?)):".gluErrorString($glerr)."\n" if $glerr;	363	});
		364	$hb->pack_start (my $cb = Gtk2::Button->new ("logout"), 1, 1, 5);
		365	$cb->signal_connect (clicked => sub {
		366	my $cb = $events{login} \|\| sub {};
		367	$cb->();
		368	});
		369	$hb->pack_start (my $cb = Gtk2::Button->new ("quit"), 1, 1, 5);
		370	$cb->signal_connect (clicked => sub { $w->destroy });
		371
		372	$w->show_all;
		373
		374	$w->signal_connect (destroy => sub { Gtk2->main_quit });
194	}	375	}
		376
195		377
196	#############################################################################	378	#############################################################################
197		379
		380	SDL::Init SDL_INIT_EVERYTHING;
		381
		382	$TOPLEVEL = Crossfire::Client::Widget::Toplevel->new;
		383
		384	my $mapwidget = Crossfire::Client::Widget::MapWidget->new;
		385
		386	$TOPLEVEL->add ($mapwidget);
		387	$mapwidget->focus_in;
		388
198	Client::Util::read_cfg "$Crossfire::VARDIR/pclientrc";	389	Crossfire::Client::read_cfg "$Crossfire::VARDIR/pclientrc";
199		390
200	$CFG \|\|= {	391	$CFG \|\|= {
201	width => 640,	392	width => 640,
202	height => 480,	393	height => 480,
		394	mapsize => 100,
203	fullscreen => 0,	395	fullscreen => 0,
204	host => "crossfire.schmorp.de",	396	host => "crossfire.schmorp.de",
205	port => 13327,	397	port => 13327,
206	};	398	};
207		399
208	Client::Util::run_config_dialog	400	Crossfire::Client::set_font Crossfire::Client::find_rcfile "uifont.ttf";
209	login => sub { print "Login $_[0] with $_[1]\n" },	401
210	logout => sub { print "Logout" };	402	$FACECACHE = eval { Crossfire::load_ref "$Crossfire::VARDIR/pclient.faces" } \|\| {};
		403
		404	run_config_dialog
		405	login => sub { start_game },
		406	logout => sub { stop_game };
211		407
212	main Gtk2;	408	main Gtk2;
213		409
		410	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.14 by elmex, Fri Apr 7 16:36:44 2006 UTC vs. Revision 1.48 by elmex, Sun Apr 9 18:30:03 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/bin/pclient (file contents):
Revision 1.14 by elmex, Fri Apr 7 16:36:44 2006 UTC vs.
Revision 1.48 by elmex, Sun Apr 9 18:30:03 2006 UTC