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

Comparing deliantra/Deliantra-Client/bin/pclient (file contents):
Revision 1.18 by root, Fri Apr 7 18:49:53 2006 UTC vs.
Revision 1.46 by elmex, Sun Apr 9 17:39:56 2006 UTC

…		…
1	#!/opt/bin/perl	1	#!/opt/bin/perl
		2
2	use strict;	3	use strict;
		4	use utf8;
3		5
4	use Glib;	6	use Glib;
5	use Gtk2 -init;	7	use Gtk2 -init;
6		8
7	use SDL;	9	use SDL;
13		15
14	use Crossfire;	16	use Crossfire;
15	use Crossfire::Client;	17	use Crossfire::Client;
16	use Crossfire::Protocol;	18	use Crossfire::Protocol;
17		19
18	use Client::Util;
19	use Client::Widget;	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
31	our @GL_INIT; # hooks called on every gl init	42	our @GL_INIT; # hooks called on every gl init
32		43
		44	our $ALT_ENTER_MESSAGE;
		45
		46	our $TOPLEVEL;
		47
		48	our $tw; # Test widget #d#
		49
		50	my $last_refresh;
		51
33	sub init_screen {	52	sub init_screen {
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	$_->() for @GL_INIT;	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	for (values %Client::Widget::ACTIVE_WIDGETS) {
89	$_->draw
90	}
91
92	SDL::GLSwapBuffers;
93	}	201	}
94		202
95	%SDL_CB = (	203	%SDL_CB = (
96	SDL_QUIT() => sub {	204	SDL_QUIT() => sub {
97	warn "sdl quit\n";#d#	205	main_quit Gtk2;
98	exit;
99	},	206	},
100	SDL_VIDEORESIZE() => sub {	207	SDL_VIDEORESIZE() => sub {
101	},	208	},
102	SDL_VIDEOEXPOSE() => sub {	209	SDL_VIDEOEXPOSE() => sub {
103	refresh;	210	refresh;
104	},	211	},
105	SDL_KEYDOWN() => sub {	212	SDL_KEYDOWN() => sub {
106	if ($SDL_EV->key_mod & KMOD_ALT && $SDL_EV->key_sym == SDLK_RETURN) {	213	if ($SDL_EV->key_mod & KMOD_ALT && $SDL_EV->key_sym == SDLK_RETURN) {
107	# alt-enter	214	# alt-enter
108	$CFG->{fullscreen} = !$CFG->{fullscreen};	215	$FULLSCREEN = !$FULLSCREEN;
109	init_screen;	216	init_screen;
110	} else {	217	} else {
111	Client::Widget::feed_sdl_key_down_event ($SDL_EV);	218	Crossfire::Client::Widget::feed_sdl_key_down_event ($SDL_EV);
112	}	219	}
113	},	220	},
114	SDL_KEYUP() => sub {	221	SDL_KEYUP() => sub {
115	Client::Widget::feed_sdl_key_up_event ($SDL_EV);	222	Crossfire::Client::Widget::feed_sdl_key_up_event ($SDL_EV);
116	},	223	},
117	SDL_MOUSEMOTION() => sub {	224	SDL_MOUSEMOTION() => sub {
118	warn "sdl motion\n";#d#	225	warn "sdl motion\n";#d#
119	},	226	},
120	SDL_MOUSEBUTTONDOWN() => sub {	227	SDL_MOUSEBUTTONDOWN() => sub {
121	Client::Widget::feed_sdl_button_down_event ($SDL_EV);	228	Crossfire::Client::Widget::feed_sdl_button_down_event ($SDL_EV);
122	},	229	},
123	SDL_MOUSEBUTTONUP() => sub {	230	SDL_MOUSEBUTTONUP() => sub {
124	Client::Widget::feed_sdl_button_up_event ($SDL_EV);	231	Crossfire::Client::Widget::feed_sdl_button_up_event ($SDL_EV);
125	},	232	},
126	SDL_ACTIVEEVENT() => sub {	233	SDL_ACTIVEEVENT() => sub {
127	warn "active\n";#d#	234	warn "active\n";#d#
128	},	235	},
129	);	236	);
…		…
137	}	244	}
138		245
139	sub conn::map_scroll {	246	sub conn::map_scroll {
140	my ($self, $dx, $dy) = @_;	247	my ($self, $dx, $dy) = @_;
141		248
142	refresh;	249	# refresh;
143	}	250	}
144		251
145	sub conn::map_clear {	252	sub conn::map_clear {
146	my ($self) = @_;	253	my ($self) = @_;
147		254
148	refresh;	255	# refresh;
		256	}
		257
		258	sub conn::face_find {
		259	my ($self, $face) = @_;
		260
		261	$FACECACHE->{"$face->{chksum},$face->{name}"}
149	}	262	}
150		263
151	sub conn::face_update {	264	sub conn::face_update {
152	my ($self, $num, $face) = @_;	265	my ($self, $face) = @_;
		266
		267	$FACECACHE->{"$face->{chksum},$face->{name}"} = $face->{image};
153		268
154	$face->{texture} = new_from_image Crossfire::Client::Texture delete $face->{image};	269	$face->{texture} = new_from_image Crossfire::Client::Texture delete $face->{image};
155	}	270	}
156		271
		272	sub conn::query {
		273	my ($self, $flags, $prompt) = @_;
		274
		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	});
		292	}
		293
		294	sub run_config_dialog {
		295	my (%events) = @_;
		296
		297	my $w = Gtk2::Window->new;
		298
		299	my @cfg = (
		300	[qw/Host host/],
		301	[qw/Port port/],
		302	[qw/Username user/],
		303	[qw/Password password/],
		304	);
		305
		306	my $cfg = {};
		307
		308	my $a = SDL::ListModes (0, SDL_FULLSCREEN\|SDL_HWSURFACE);
		309	my @modes = map { [SDL::RectW ($_), SDL::RectH ($_)] } @$a;
		310
		311	$w->add (my $vb = Gtk2::VBox->new);
		312	$vb->pack_start (my $t = Gtk2::Table->new (2, scalar @cfg), 0, 0, 0);
		313	my $selmode = $::CFG->{width} . 'x' . $::CFG->{height};
		314	$t->attach_defaults (Gtk2::Label->new ("Modes"), 0, 1, 0, 1);
		315	$t->attach_defaults (my $cb = Gtk2::ComboBox->new_text, 1, 2, 0, 1);
		316	my $i = 0;
		317	my $act = 0;
		318	for (map { "$_->[0]x$_->[1]" } reverse @modes) {
		319	if ($_ eq $selmode) { $act = $i }
		320	$cb->append_text ($_);
		321	$i++;
		322	}
		323	$cb->set_active ($act);
		324	$cb->signal_connect (changed => sub {
		325	my ($cb) = @_;
		326	my $txt = $cb->get_active_text;
		327	if ($txt =~ m/(\d+)x(\d+)/) {
		328	$::CFG->{width} = $1;
		329	$::CFG->{height} = $2;
		330	}
		331	});
		332
		333	$cfg->{_i} = 1;
		334	for (@cfg) {
		335	gtk_add_cfg_field ($t, $cfg, $_->[0], $_->[1], $::CFG->{$_->[1]});
		336	}
		337
		338	$vb->pack_start (my $hb = Gtk2::HBox->new, 0, 0, 0);
		339	$hb->pack_start (my $cb = Gtk2::Button->new ("save"), 1, 1, 5);
		340	$cb->signal_connect (clicked => sub {
		341	for (keys %$cfg) {
		342	$::CFG->{$_} = $cfg->{$_}
		343	if $_ ne '_i';
		344	}
		345	Crossfire::Client::write_cfg "$Crossfire::VARDIR/pclientrc";
		346	});
		347	$hb->pack_start (my $cb = Gtk2::Button->new ("login"), 1, 1, 5);
		348	$cb->signal_connect (clicked => sub {
		349	for (keys %$cfg) {
		350	$::CFG->{$_} = $cfg->{$_}
		351	if $_ ne '_i';
		352	}
		353	my $cb = $events{login} \|\| sub {};
		354	$cb->($::CFG->{user}, $::CFG->{password});
		355	});
		356	$hb->pack_start (my $cb = Gtk2::Button->new ("logout"), 1, 1, 5);
		357	$cb->signal_connect (clicked => sub {
		358	my $cb = $events{login} \|\| sub {};
		359	$cb->();
		360	});
		361	$hb->pack_start (my $cb = Gtk2::Button->new ("quit"), 1, 1, 5);
		362	$cb->signal_connect (clicked => sub { $w->destroy });
		363
		364	$w->show_all;
		365
		366	$w->signal_connect (destroy => sub { Gtk2->main_quit });
		367	}
		368
		369
157	#############################################################################	370	#############################################################################
158		371
		372	SDL::Init SDL_INIT_EVERYTHING;
		373
		374	$TOPLEVEL = Crossfire::Client::Widget::Toplevel->new;
		375
159	my $mapwidget = Client::MapWidget->new;	376	my $mapwidget = Crossfire::Client::Widget::MapWidget->new;
160		377
161	$mapwidget->activate;	378	$TOPLEVEL->add ($mapwidget);
162	$mapwidget->focus_in;	379	$mapwidget->focus_in;
163		380
164	Client::Util::read_cfg "$Crossfire::VARDIR/pclientrc";	381	Crossfire::Client::read_cfg "$Crossfire::VARDIR/pclientrc";
165		382
166	$CFG \|\|= {	383	$CFG \|\|= {
167	width => 640,	384	width => 640,
168	height => 480,	385	height => 480,
169	fullscreen => 0,	386	fullscreen => 0,
170	host => "crossfire.schmorp.de",	387	host => "crossfire.schmorp.de",
171	port => 13327,	388	port => 13327,
172	};	389	};
173		390
174	Client::Util::run_config_dialog	391	Crossfire::Client::set_font Crossfire::Client::find_rcfile "uifont.ttf";
		392
		393	$FACECACHE = eval { Crossfire::load_ref "$Crossfire::VARDIR/pclient.faces" } \|\| {};
		394
		395	run_config_dialog
175	login => sub { start_game },	396	login => sub { start_game },
176	logout => sub { stop_game };	397	logout => sub { stop_game };
177		398
178	main Gtk2;	399	main Gtk2;
		400
		401	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.18 by root, Fri Apr 7 18:49:53 2006 UTC vs. Revision 1.46 by elmex, Sun Apr 9 17:39:56 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/bin/pclient (file contents):
Revision 1.18 by root, Fri Apr 7 18:49:53 2006 UTC vs.
Revision 1.46 by elmex, Sun Apr 9 17:39:56 2006 UTC