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

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

Diff Legend

Comparing deliantra/Deliantra-Client/bin/pclient (file contents):
Revision 1.4 by root, Thu Apr 6 20:34:15 2006 UTC vs.
Revision 1.32 by elmex, Sat Apr 8 17:21:01 2006 UTC