[ViewVC] Diff of: cvs/deliantra/Deliantra-Client/DC/UI.pm

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.32 by elmex, Sun Apr 9 01:21:11 2006 UTC vs.
Revision 1.43 by root, Sun Apr 9 22:12:11 2006 UTC

…		…
5	use Scalar::Util;	5	use Scalar::Util;
6		6
7	use SDL::OpenGL;	7	use SDL::OpenGL;
8	use SDL::OpenGL::Constants;	8	use SDL::OpenGL::Constants;
9		9
		10	use Crossfire::Client;
		11
10	our $FOCUS; # the widget with current focus	12	our $FOCUS; # the widget with current focus
11	#our @ACTIVE_WIDGETS;
12		13
13	# class methods for events	14	# class methods for events
14	sub feed_sdl_key_down_event { $FOCUS->key_down ($_[0]) if $FOCUS }	15	sub feed_sdl_key_down_event { $FOCUS->key_down ($_[0]) if $FOCUS }
15	sub feed_sdl_key_up_event { $FOCUS->key_up ($_[0]) if $FOCUS }	16	sub feed_sdl_key_up_event { $FOCUS->key_up ($_[0]) if $FOCUS }
16	sub feed_sdl_button_down_event { }	17	sub feed_sdl_button_down_event { }
…		…
20	my $class = shift;	21	my $class = shift;
21		22
22	bless { @_ }, $class	23	bless { @_ }, $class
23	}	24	}
24		25
25	#sub activate {
26	# push @ACTIVE_WIDGETS, $_[0];
27	# Scalar::Util::weaken $ACTIVE_WIDGETS[-1];
28	#}
29
30	#sub deactivate {
31	# @ACTIVE_WIDGETS =
32	# sort { $a->{z} <=> $b->{z} }
33	# grep { $_ && $_ != $_[0] }
34	# @ACTIVE_WIDGETS;
35	#}
36
37	sub move {	26	sub move {
38	my ($self, $x, $y, $z) = @_;	27	my ($self, $x, $y, $z) = @_;
39	$self->{x} = $x;	28	$self->{x} = $x;
40	$self->{y} = $y;	29	$self->{y} = $y;
41	$self->{z} = $z if defined $z;	30	$self->{z} = $z if defined $z;
…		…
44	sub needs_redraw {	33	sub needs_redraw {
45	0	34	0
46	}	35	}
47		36
48	sub size_request {	37	sub size_request {
		38	require Carp;
49	die "size_request is abtract";	39	Carp::confess "size_request is abtract";
		40	}
		41
		42	sub size_allocate {
		43	my ($self, $w, $h) = @_;
		44
		45	$self->{w} = $w;
		46	$self->{h} = $h;
50	}	47	}
51		48
52	sub focus_in {	49	sub focus_in {
53	my ($widget) = @_;	50	my ($widget) = @_;
54	$FOCUS = $widget;	51	$FOCUS = $widget;
…		…
72		69
73	sub button_up {	70	sub button_up {
74	my ($widget, $sdlev) = @_;	71	my ($widget, $sdlev) = @_;
75	}	72	}
76		73
77	sub w { $_[0]->{w} }	74	sub w { $_[0]->{w} = $_[1] if $_[1]; $_[0]->{w} }
78	sub h { $_[0]->{h} }	75	sub h { $_[0]->{h} = $_[1] if $_[1]; $_[0]->{h} }
79	sub x { $_[0]->{x} = $_[1] if $_[1]; $_[0]->{x} }	76	sub x { $_[0]->{x} = $_[1] if $_[1]; $_[0]->{x} }
80	sub y { $_[0]->{y} = $_[1] if $_[1]; $_[0]->{y} }	77	sub y { $_[0]->{y} = $_[1] if $_[1]; $_[0]->{y} }
81	sub z { $_[0]->{z} = $_[1] if $_[1]; $_[0]->{z} }	78	sub z { $_[0]->{z} = $_[1] if $_[1]; $_[0]->{z} }
82		79
83	sub draw {	80	sub draw {
…		…
88	$self->_draw;	85	$self->_draw;
89	glPopMatrix;	86	glPopMatrix;
90	}	87	}
91		88
92	sub _draw {	89	sub _draw {
93	my ($widget) = @_;	90	my ($self) = @_;
		91
		92	warn "no draw defined for $self\n";
94	}	93	}
95		94
96	sub bbox {	95	sub bbox {
97	my ($self) = @_;	96	my ($self) = @_;
98	my ($w, $h) = $self->size_request;	97	my ($w, $h) = $self->size_request;
…		…
102	$self->{x} = $w,	101	$self->{x} = $w,
103	$self->{y} = $h	102	$self->{y} = $h
104	)	103	)
105	}	104	}
106		105
		106	sub find_widget {
		107	my ($self, $x, $y) = @_;
		108
		109	return $self
		110	if $x >= $self->{x} && $x < $self->{x} + $self->{w}
		111	&& $y >= $self->{y} && $y < $self->{y} + $self->{h};
		112
		113	()
		114	}
		115
107	sub del_parent { $_[0]->{parent} = undef }	116	sub del_parent { $_[0]->{parent} = undef }
108		117
109	sub set_parent {	118	sub set_parent {
110	my ($self, $par) = @_;	119	my ($self, $par) = @_;
111		120
…		…
128	my ($self) = @_;	137	my ($self) = @_;
129		138
130	#$self->deactivate;	139	#$self->deactivate;
131	}	140	}
132		141
		142	#############################################################################
		143
133	package Crossfire::Client::Widget::Container;	144	package Crossfire::Client::Widget::Container;
134		145
135	our @ISA = Crossfire::Client::Widget::;	146	our @ISA = Crossfire::Client::Widget::;
136		147
		148	sub new {
		149	my ($class, @widgets) = @_;
		150
		151	my $self = $class->SUPER::new (children => []);
		152	$self->add ($_) for @widgets;
		153
		154	$self
		155	}
		156
		157	sub add {
		158	my ($self, $chld, $expand) = @_;
		159
		160	$chld->{expand} = $expand;
		161	$chld->set_parent ($self);
		162
		163	@{$self->{children}} =
		164	sort { $a->{z} <=> $b->{z} }
		165	@{$self->{children}}, $chld;
		166
		167	$self->size_allocate ($self->{w}, $self->{h})
		168	if $self->{w}; #TODO: check for "realised state"
		169	}
		170
		171	sub remove {
		172	my ($self, $widget) = @_;
		173
		174	$self->{children} = [ grep $_ != $widget, @{ $self->{children} } ];
		175
		176	$self->size_allocate ($self->{w}, $self->{h});
		177	}
		178
		179	sub find_widget {
		180	my ($self, $x, $y) = @_;
		181
		182	my $res;
		183
		184	for (@{ $self->{children} }) {
		185	$res = $_->find_widget ($x, $y)
		186	and return $res;
		187	}
		188
		189	()
		190	}
		191
		192	sub _draw {
		193	my ($self) = @_;
		194
		195	$_->draw for @{$self->{children}};
		196	}
		197
		198	#############################################################################
		199
		200	package Crossfire::Client::Widget::Bin;
		201
		202	our @ISA = Crossfire::Client::Widget::Container::;
		203
		204	sub child { $_[0]->{children}[0] }
		205
		206	sub size_request {
		207	$_[0]{children}[0]->size_request if $_[0]{children}[0];
		208	}
		209
		210	sub size_allocate {
		211	my ($self, $w, $h) = @_;
		212
		213	$self->SUPER::size_allocate ($w, $h);
		214	$self->{children}[0]->size_allocate ($w, $h)
		215	if $self->{children}[0]
		216	}
		217
		218	#############################################################################
		219
		220	package Crossfire::Client::Widget::Toplevel;
		221
		222	our @ISA = Crossfire::Client::Widget::Container::;
		223
		224	sub update {
		225	my ($self) = @_;
		226
		227	::refresh ();
		228	}
		229
		230	sub add {
		231	my ($self, $widget) = @_;
		232
		233	$self->SUPER::add ($widget);
		234
		235	$widget->size_allocate ($widget->size_request);
		236	}
		237
		238	#############################################################################
		239
		240	package Crossfire::Client::Widget::Window;
		241
		242	our @ISA = Crossfire::Client::Widget::Bin::;
		243
137	use SDL::OpenGL;	244	use SDL::OpenGL;
138		245
139	sub add { $_[0]->{child} = $_[1]; $_[1]->set_parent ($_[0]); $_[1]->update }	246	sub new {
140	sub get { $_[0]->{child} }	247	my ($class, $x, $y, $z, $w, $h) = @_;
141	sub remove {
142	my ($self, $chld) = @_;
143	delete $self->{child}
144	if $self->{child} == $chld;
145	}
146		248
147	sub size_request { $_[0]->{child}->size_request if $_[0]->{child} }	249	my $self = $class->SUPER::new;
148		250
149	sub _draw { die "Containers can't be drawn!" }	251	@$self{qw(x y z w h)} = ($x, $y, $z, $w, $h);
150
151	package Crossfire::Client::Widget::Toplevel;
152
153	our @ISA = Crossfire::Client::Widget::;
154
155	use SDL::OpenGL;
156
157	sub add {
158	my ($self, $chld) = @_;
159
160	push @{$self->{childs}}, $chld;
161	@{$self->{childs}} =
162	sort { $a->{z} <=> $b->{z} }
163	@{$self->{childs}};
164
165	$chld->set_parent ($self);
166	}
167
168	sub remove {
169	my ($self, $chld) = @_;
170	@{$self->{childs}} =
171	sort { $a->{z} <=> $b->{z} }
172	grep { $_ && $_ != $_[0] }
173	@{$self->{childs}}
174	}	252	}
175		253
176	sub update {	254	sub update {
177	my ($self) = @_;	255	my ($self) = @_;
178	::refresh ();
179	}
180		256
181	sub _draw {
182	my ($self) = @_;
183
184	$_->draw for @{$self->{childs}};
185	}
186
187	package Crossfire::Client::Widget::Window;
188
189	our @ISA = Crossfire::Client::Widget::Container::;
190
191	use SDL::OpenGL;
192
193	sub add {
194	my ($self, $chld) = @_;
195	$self->SUPER::add ($chld);
196	$chld->set_parent ($self);
197	$self->update; #TODO: Move this to the size_request event propably?
198	}
199
200	sub remove {
201	my ($self) = @_;
202	# TODO FIXME: removing a child from a window will crash, see render_chld
203	$self->update;
204	}
205
206	sub update {
207	my ($self) = @_;
208	$self->render_chld;	257	$self->render_chld;
		258	$self->SUPER::update;
209	}	259	}
210		260
211	sub render_chld {	261	sub render_chld {
212	my ($self) = @_;	262	my ($self) = @_;
213	my $chld = $self->get;
214	my ($w, $h) = $self->size_request;
215		263
216	$self->{texture} =	264	$self->{texture} =
217	Crossfire::Client::Texture->new_from_opengl (	265	Crossfire::Client::Texture->new_from_opengl (
218	$w, $h, sub { $chld->draw }	266	$self->{w}, $self->{h}, sub { $self->child->draw }
219	);	267	);
220	$self->{texture}->upload;
221	}	268	}
222		269
223	sub size_request {	270	sub size_allocate {
224	my ($self) = @_;	271	my ($self, $w, $h) = @_;
225	my $chld = $self->get	272
226	or return (0, 0);	273	$self->{w} = $w;
227	$chld->size_request	274	$self->{h} = $h;
		275
		276	$self->child->size_allocate ($w, $h);
		277
		278	$self->render_chld;
228	}	279	}
229		280
230	sub _draw {	281	sub _draw {
231	my ($self) = @_;	282	my ($self) = @_;
232		283
233	my ($w, $h) = $self->size_request;#TODO# use width/height of texture	284	my ($w, $h) = ($self->w, $self->h);
234		285
235	my $tex = $self->{texture}	286	my $tex = $self->{texture}
236	or return;	287	or return;
237		288
238	glEnable GL_BLEND;	289	glEnable GL_BLEND;
239	glEnable GL_TEXTURE_2D;	290	glEnable GL_TEXTURE_2D;
240	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	291	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
241	glBindTexture GL_TEXTURE_2D, $tex->{name};	292	glBindTexture GL_TEXTURE_2D, $tex->{name};
242
243	glColor 1, 0, 1;
244		293
245	glBegin GL_QUADS;	294	glBegin GL_QUADS;
246	glTexCoord 0, 0; glVertex 0, 0;	295	glTexCoord 0, 0; glVertex 0, 0;
247	glTexCoord 0, 1; glVertex 0, $h;	296	glTexCoord 0, 1; glVertex 0, $h;
248	glTexCoord 1, 1; glVertex $w, $h;	297	glTexCoord 1, 1; glVertex $w, $h;
…		…
251		300
252	glDisable GL_BLEND;	301	glDisable GL_BLEND;
253	glDisable GL_TEXTURE_2D;	302	glDisable GL_TEXTURE_2D;
254	}	303	}
255		304
		305	#############################################################################
		306
256	package Crossfire::Client::Widget::Frame;	307	package Crossfire::Client::Widget::Frame;
257		308
258	our @ISA = Crossfire::Client::Widget::Container::;	309	our @ISA = Crossfire::Client::Widget::Bin::;
259		310
260	use SDL::OpenGL;	311	use SDL::OpenGL;
261		312
262	sub size_request {	313	sub size_request {
263	my ($self) = @_;	314	my ($self) = @_;
264	my $chld = $self->get	315	my $chld = $self->child
265	or return (0, 0);	316	or return (0, 0);
266		317
267	$chld->move (2, 2);	318	$chld->move (2, 2);
268		319
269	map { $_ + 4 } $chld->size_request;	320	map { $_ + 4 } $chld->size_request;
270	}	321	}
271		322
		323	sub size_allocate {
		324	my ($self, $w, $h) = @_;
		325
		326	$self->{w} = $w;
		327	$self->{h} = $h;
		328
		329	$self->child->size_allocate ($w - 4, $h - 4);
		330	$self->child->move (2, 2);
		331	}
		332
272	sub _draw {	333	sub _draw {
273	my ($self) = @_;	334	my ($self) = @_;
274		335
275	my $chld = $self->get;	336	my $chld = $self->child;
276		337
277	my ($w, $h) = $chld->size_request;	338	my ($w, $h) = $chld->size_request;
278		339
279	glBegin GL_QUADS;	340	glBegin GL_QUADS;
280	glColor 0, 0, 0;	341	glColor 0, 0, 0;
…		…
285	glEnd;	346	glEnd;
286		347
287	$chld->draw;	348	$chld->draw;
288	}	349	}
289		350
		351	#############################################################################
		352
290	package Crossfire::Client::Widget::FancyFrame;	353	package Crossfire::Client::Widget::FancyFrame;
291		354
292	our @ISA = Crossfire::Client::Widget::Frame::;	355	our @ISA = Crossfire::Client::Widget::Bin::;
293		356
294	use SDL::OpenGL;	357	use SDL::OpenGL;
295		358
296	#TODO: implement themed frame	359	my @tex =
		360	map { new_from_file Crossfire::Client::Texture Crossfire::Client::find_rcfile $_ }
		361	qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
		362
		363	sub size_request {
		364	my ($self) = @_;
		365
		366	my ($w, $h) = $self->SUPER::size_request;
		367
		368	$h += $tex[1]->{height};
		369	$h += $tex[4]->{height};
		370	$w += $tex[2]->{width};
		371	$w += $tex[3]->{width};
		372
		373	($w, $h)
		374	}
		375
		376	sub size_allocate {
		377	my ($self, $w, $h) = @_;
		378
		379	$self->SUPER::size_allocate ($w, $h);
		380
		381	$h -= $tex[1]->{height};
		382	$h -= $tex[4]->{height};
		383	$w -= $tex[2]->{width};
		384	$w -= $tex[3]->{width};
		385
		386	$h = $h < 0 ? 0 : $h;
		387	$w = $w < 0 ? 0 : $w;
		388
		389	$self->child->size_allocate ($w, $h);
		390	$self->child->move ($tex[3]->{width}, $tex[1]->{height});
		391	}
		392
		393	sub _draw {
		394	my ($self) = @_;
		395
		396	my ($w, $h) = ($self->{w}, $self->{h});
		397	my ($cw, $ch) = ($self->child->{w}, $self->child->{h});
		398
		399	glEnable GL_BLEND;
		400	glEnable GL_TEXTURE_2D;
		401	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
		402	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
		403
		404	my $top = $tex[1];
		405	glBindTexture GL_TEXTURE_2D, $top->{name};
		406
		407	glBegin GL_QUADS;
		408	glTexCoord 0, 0; glVertex 0 , 0;
		409	glTexCoord 0, 1; glVertex 0 , $top->{height};
		410	glTexCoord 1, 1; glVertex $w , $top->{height};
		411	glTexCoord 1, 0; glVertex $w , 0;
		412	glEnd;
		413
		414	my $left = $tex[3];
		415	glBindTexture GL_TEXTURE_2D, $left->{name};
		416
		417	glBegin GL_QUADS;
		418	glTexCoord 0, 0; glVertex 0 , $top->{height};
		419	glTexCoord 0, 1; glVertex 0 , $top->{height} + $ch;
		420	glTexCoord 1, 1; glVertex $left->{width}, $top->{height} + $ch;
		421	glTexCoord 1, 0; glVertex $left->{width}, $top->{height};
		422	glEnd;
		423
		424	my $right = $tex[2];
		425	glBindTexture GL_TEXTURE_2D, $right->{name};
		426
		427	glBegin GL_QUADS;
		428	glTexCoord 0, 0; glVertex $w - $right->{width}, $top->{height};
		429	glTexCoord 0, 1; glVertex $w - $right->{width}, $top->{height} + $ch;
		430	glTexCoord 1, 1; glVertex $w , $top->{height} + $ch;
		431	glTexCoord 1, 0; glVertex $w , $top->{height};
		432	glEnd;
		433
		434	my $bottom = $tex[4];
		435	glBindTexture GL_TEXTURE_2D, $bottom->{name};
		436
		437	glBegin GL_QUADS;
		438	glTexCoord 0, 0; glVertex 0 , $h - $bottom->{height};
		439	glTexCoord 0, 1; glVertex 0 , $h;
		440	glTexCoord 1, 1; glVertex $w , $h;
		441	glTexCoord 1, 0; glVertex $w , $h - $bottom->{height};
		442	glEnd;
		443
		444	my $bg = $tex[0];
		445	glBindTexture GL_TEXTURE_2D, $bg->{name};
		446	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
		447	glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT;
		448	glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT;
		449
		450	my $rep_x = $cw / $bg->{width};
		451	my $rep_y = $ch / $bg->{height};
		452
		453	glBegin GL_QUADS;
		454	glTexCoord 0, 0; glVertex $left->{width}, $top->{height};
		455	glTexCoord 0, $rep_y; glVertex $left->{width}, $top->{height} + $ch;
		456	glTexCoord $rep_x, $rep_y; glVertex $left->{width} + $cw , $top->{height} + $ch;
		457	glTexCoord $rep_x, 0; glVertex $left->{width} + $cw , $top->{height};
		458	glEnd;
		459
		460	glDisable GL_BLEND;
		461	glDisable GL_TEXTURE_2D;
		462
		463	$self->child->draw;
		464
		465	}
		466
		467	#############################################################################
297		468
298	package Crossfire::Client::Widget::Table;	469	package Crossfire::Client::Widget::Table;
299		470
300	our @ISA = Crossfire::Client::Widget::Container::;	471	our @ISA = Crossfire::Client::Widget::Bin::;
301		472
302	use SDL::OpenGL;	473	use SDL::OpenGL;
303		474
304	sub add {	475	sub add {
305	my ($self, $x, $y, $chld) = @_;	476	my ($self, $x, $y, $chld) = @_;
306	my $old_chld = $self->{childs}[$y][$x];	477	my $old_chld = $self->{children}[$y][$x];
307		478
308	$self->{childs}[$y][$x] = $chld;	479	$self->{children}[$y][$x] = $chld;
309	$chld->set_parent ($self);	480	$chld->set_parent ($self);
310	$self->update;	481	$self->update;
311	}	482	}
312		483
313	sub max_row_height {	484	sub max_row_height {
314	my ($self, $row) = @_;	485	my ($self, $row) = @_;
315		486
316	my $hs = 0;	487	my $hs = 0;
317	for (my $xi = 0; $xi <= $#{$self->{childs}->[$row] \|\| []}; $xi++) {	488	for (my $xi = 0; $xi <= $#{$self->{children}->[$row] \|\| []}; $xi++) {
318	my $c = $self->{childs}->[$row]->[$xi];	489	my $c = $self->{children}->[$row]->[$xi];
319	if ($c) {	490	if ($c) {
320	my ($w, $h) = $c->size_request;	491	my ($w, $h) = $c->size_request;
321	if ($hs < $h) { $hs = $h }	492	if ($hs < $h) { $hs = $h }
322	}	493	}
323	}	494	}
…		…
326		497
327	sub max_col_width {	498	sub max_col_width {
328	my ($self, $col) = @_;	499	my ($self, $col) = @_;
329		500
330	my $ws = 0;	501	my $ws = 0;
331	for (my $yi = 0; $yi <= $#{$self->{childs} \|\| []}; $yi++) {	502	for (my $yi = 0; $yi <= $#{$self->{children} \|\| []}; $yi++) {
332	my $c = ($self->{childs}->[$yi] \|\| [])->[$col];	503	my $c = ($self->{children}->[$yi] \|\| [])->[$col];
333	if ($c) {	504	if ($c) {
334	my ($w, $h) = $c->size_request;	505	my ($w, $h) = $c->size_request;
335	if ($ws < $w) { $ws = $w }	506	if ($ws < $w) { $ws = $w }
336	}	507	}
337	}	508	}
…		…
341	sub size_request {	512	sub size_request {
342	my ($self) = @_;	513	my ($self) = @_;
343		514
344	my ($hs, $ws) = (0, 0);	515	my ($hs, $ws) = (0, 0);
345		516
346	for (my $yi = 0; $yi <= $#{$self->{childs}}; $yi++) {	517	for (my $yi = 0; $yi <= $#{$self->{children}}; $yi++) {
347	$hs += $self->max_row_height ($yi);	518	$hs += $self->max_row_height ($yi);
348	}	519	}
349		520
350	for (my $yi = 0; $yi <= $#{$self->{childs}}; $yi++) {	521	for (my $yi = 0; $yi <= $#{$self->{children}}; $yi++) {
351	my $wm = 0;	522	my $wm = 0;
352	for (my $xi = 0; $xi <= $#{$self->{childs}->[$yi]}; $xi++) {	523	for (my $xi = 0; $xi <= $#{$self->{children}->[$yi]}; $xi++) {
353	$wm += $self->max_col_width ($xi)	524	$wm += $self->max_col_width ($xi)
354	}	525	}
355	if ($ws < $wm) { $ws = $wm }	526	if ($ws < $wm) { $ws = $wm }
356	}	527	}
357		528
…		…
360		531
361	sub _draw {	532	sub _draw {
362	my ($self) = @_;	533	my ($self) = @_;
363		534
364	my $y = 0;	535	my $y = 0;
365	for (my $yi = 0; $yi <= $#{$self->{childs}}; $yi++) {	536	for (my $yi = 0; $yi <= $#{$self->{children}}; $yi++) {
366	my $x = 0;	537	my $x = 0;
367		538
368	for (my $xi = 0; $xi <= $#{$self->{childs}->[$yi]}; $xi++) {	539	for (my $xi = 0; $xi <= $#{$self->{children}->[$yi]}; $xi++) {
369		540
370	my $c = $self->{childs}->[$yi]->[$xi];	541	my $c = $self->{children}->[$yi]->[$xi];
371	if ($c) {	542	if ($c) {
372	$c->move ($x, $y, 0); #TODO: Move to size_request	543	$c->move ($x, $y, 0); #TODO: Move to size_request
373	$c->draw if $c;	544	$c->draw if $c;
374	}	545	}
375		546
…		…
378		549
379	$y += $self->max_row_height ($yi);	550	$y += $self->max_row_height ($yi);
380	}	551	}
381	}	552	}
382		553
		554	#############################################################################
		555
383	package Crossfire::Client::Widget::VBox;	556	package Crossfire::Client::Widget::VBox;
384		557
385	our @ISA = Crossfire::Client::Widget::Container::;	558	our @ISA = Crossfire::Client::Widget::Container::;
386		559
387	use SDL::OpenGL;	560	use SDL::OpenGL;
388		561
389	sub add {
390	my ($self, $chld) = @_;
391	push @{$self->{childs}}, $chld;
392	$chld->set_parent ($self);
393	$self->update;
394	}
395
396	sub size_request {	562	sub size_request {
397	my ($self) = @_;	563	my ($self) = @_;
398		564
399	my ($hs, $ws) = (0, 0);	565	my @alloc = map [$_->size_request], @{$self->{children}};
		566
		567	(
		568	(List::Util::max map $_->[0], @alloc),
		569	(List::Util::sum map $_->[1], @alloc),
		570	)
		571	}
		572
		573	sub size_allocate {
		574	my ($self, $w, $h) = @_;
		575
		576	$self->w ($w);
		577	$self->h ($h);
		578
		579	my $exp;
		580	my @oth;
		581	# find expand widget
400	for (@{$self->{childs} \|\| []}) {	582	for (@{$self->{children}}) {
		583	if ($_->{expand}) {
		584	$exp = $_;
		585	last;
		586	}
		587	push @oth, $_;
		588	}
		589
		590	my ($ow, $oh);
		591
		592	# get sizes of other widgets
		593	for (@oth) {
401	my ($w, $h) = $_->size_request;	594	my ($w, $h) = $_->size_request;
402	$hs += $h;	595	$oh += $h;
403	if ($ws < $w) { $ws = $w }	596	if ($ow < $w) { $ow = $w }
404	}	597	}
405		598
406	return ($ws, $hs);	599	my $y = 0;
407	}
408
409	sub _draw {
410	my ($self) = @_;
411
412	my ($x, $y);
413	for (@{$self->{childs} \|\| []}) {	600	for (@{$self->{children}}) {
414	$_->move (0, $y, 0); #TODO: move to size_request	601	$_->move (0, $y);
415	$_->draw;	602
		603	if ($_ == $exp) {
		604	$_->size_allocate ($w, $h - $oh);
		605	$y += $h - $oh;
		606	} else {
416	my ($w, $h) = $_->size_request;	607	my ($cw, $h) = $_->size_request;
		608	$_->size_allocate ($w, $h);
417	$y += $h;	609	$y += $h;
		610	}
418	}	611	}
419	}	612	}
		613
		614	#############################################################################
420		615
421	package Crossfire::Client::Widget::Label;	616	package Crossfire::Client::Widget::Label;
422		617
423	our @ISA = Crossfire::Client::Widget::;	618	our @ISA = Crossfire::Client::Widget::;
424		619
425	use SDL::OpenGL;	620	use SDL::OpenGL;
426		621
427	sub new {	622	sub new {
428	my ($class, $x, $y, $z, $height, $text) = @_;	623	my ($class, $x, $y, $z, $height, $text) = @_;
429		624
		625	# TODO: color, and make height, xyz etc. optional
430	my $self = $class->SUPER::new (x => $x, y => $y, z => $z, height => $height);	626	my $self = $class->SUPER::new (x => $x, y => $y, z => $z, height => $height);
431		627
432	$self->set_text ($text);	628	$self->set_text ($text);
433		629
434	$self	630	$self
…		…
467	glEnable GL_TEXTURE_2D;	663	glEnable GL_TEXTURE_2D;
468	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	664	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
469	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	665	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
470	glBindTexture GL_TEXTURE_2D, $tex->{name};	666	glBindTexture GL_TEXTURE_2D, $tex->{name};
471		667
472	glColor 1, 1, 1, 0.8;	668	glColor 1, 0, 0, 1; # TODO color
473		669
474	glBegin GL_QUADS;	670	glBegin GL_QUADS;
475	glTexCoord 0, 0; glVertex 0 , 0;	671	glTexCoord 0, 0; glVertex 0 , 0;
476	glTexCoord 0, 1; glVertex 0 , $tex->{height};	672	glTexCoord 0, 1; glVertex 0 , $tex->{height};
477	glTexCoord 1, 1; glVertex $tex->{width}, $tex->{height};	673	glTexCoord 1, 1; glVertex $tex->{width}, $tex->{height};
…		…
480		676
481	glDisable GL_BLEND;	677	glDisable GL_BLEND;
482	glDisable GL_TEXTURE_2D;	678	glDisable GL_TEXTURE_2D;
483	}	679	}
484		680
		681	#############################################################################
		682
485	package Crossfire::Client::Widget::TextEntry;	683	package Crossfire::Client::Widget::TextEntry;
486		684
487	our @ISA = Crossfire::Client::Widget::Label::;	685	our @ISA = Crossfire::Client::Widget::Label::;
488		686
489	use SDL;	687	use SDL;
…		…
507	$text .= chr $uni;	705	$text .= chr $uni;
508	}	706	}
509	$self->set_text ($text);	707	$self->set_text ($text);
510	}	708	}
511		709
512		710	#############################################################################
513	# XXX: TextView isn't neccessary with pango multiline text rendering
514	package Crossfire::Client::Widget::TextView;
515
516	use strict;
517
518	our @ISA = qw/Crossfire::Client::Widget/;
519
520	use SDL::OpenGL;
521	use SDL::OpenGL::Constants;
522
523	sub new {
524	my ($class, $text, $h) = @_;
525	my $self = $class->SUPER::new ();
526
527	$self->{txt_height} = $h;
528	@{$self->{lines}} = split /\r?\n/, $text;
529
530	for (split /\r?\n/, $text) {
531	$self->add_line ($_);
532	}
533	$self
534	}
535
536	#sub render_lines {
537	# my ($self) = @_;
538	#
539	# $self->{txt_lines} = [];
540	#
541	# for (@{$self->{lines}}) {
542	# push @{$self->{txt_lines}},
543	# new_from_ttf Crossfire::Client::Texture $self->{ttf}, $_;
544	# }
545	#}
546
547	sub add_line {
548	my ($self, $line) = @_;
549	push @{$self->{lines}}, $line;
550
551	push @{$self->{txt_lines}},
552	new_from_text Crossfire::Client::Texture $line, $self->{txt_height};
553	}
554
555	sub size_request {
556	my ($self) = @_;
557
558	my $w = 0;
559	my $h = 0;
560
561	for (@{$self->{txt_lines}}) {
562	if ($w < $_->{width}) { $w = $_->{width} }
563	$h += $_->{height};
564	}
565
566	return ($w, $h);
567	}
568
569	sub draw_line {
570	my ($self, $tex, $y) = @_;
571
572	glBindTexture GL_TEXTURE_2D, $tex->{name};
573
574	glColor 1, 0, 1;
575
576	glBegin GL_QUADS;
577	glTexCoord 0, 0; glVertex 0 , $y;
578	glTexCoord 0, 1; glVertex 0 , $y + $tex->{height};
579	glTexCoord 1, 1; glVertex $tex->{width}, $y + $tex->{height};
580	glTexCoord 1, 0; glVertex $tex->{width}, $y;
581	glEnd;
582	}
583
584	sub _draw {
585	my ($self) = @_;
586
587	glEnable GL_BLEND;
588	glEnable GL_TEXTURE_2D;
589	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;#DECAL;
590
591	my $l = 0;
592	for (@{$self->{txt_lines}}) {
593	$self->draw_line ($_, $l);
594	$l += $_->{height};
595	}
596
597	glDisable GL_BLEND;
598	glDisable GL_TEXTURE_2D;
599	}
600		711
601	package Crossfire::Client::Widget::MapWidget;	712	package Crossfire::Client::Widget::MapWidget;
602		713
603	use strict;	714	use strict;
604		715
…		…
613	sub key_down {	724	sub key_down {
614	print "MAPKEYDOWN\n";	725	print "MAPKEYDOWN\n";
615	}	726	}
616		727
617	sub key_up {	728	sub key_up {
		729	}
		730
		731	sub size_request {
		732
		733	}
		734
		735	sub size_allocate {
618	}	736	}
619		737
620	sub _draw {	738	sub _draw {
621	my ($self) = @_;	739	my ($self) = @_;
622		740
…		…
642	$yofs = $self->{yofs} = min $my, max $my + $::CONN->{maph} - $sh + 1, $self->{yofs};	760	$yofs = $self->{yofs} = min $my, max $my + $::CONN->{maph} - $sh + 1, $self->{yofs};
643	}	761	}
644		762
645	glEnable GL_TEXTURE_2D;	763	glEnable GL_TEXTURE_2D;
646	glEnable GL_BLEND;	764	glEnable GL_BLEND;
647	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	765	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
		766
		767	my $sw4 = ($sw + 3) & ~3;
		768	my $lighting = "\x00" x ($sw4 * $sh);
648		769
649	for my $x (0 .. $sw - 1) {	770	for my $x (0 .. $sw - 1) {
650	for my $y (0 .. $sh - 1) {	771	for my $y (0 .. $sh - 1) {
651		772
652	my $cell = $map->[$x + $xofs][$y + $yofs]	773	my $cell = $map->[$x + $xofs][$y + $yofs]
653	or next;	774	or next;
654		775
655	my $darkness = $cell->[0] * (1 / 255);	776	my $darkness = $cell->[0] * (1 / 255);
656	if ($darkness < 0) {	777	if ($darkness < 0) {
657	glColor 0.3, 0.3, 0.3;	778	$darkness = 0.15;
658	} else {
659	glColor $darkness, $darkness, $darkness;
660	}	779	}
		780	substr $lighting, $y * $sw4 + $x, 1, chr 255 - $darkness * 255;
661		781
662	for my $num (grep $_, @$cell[1,2,3]) {	782	for my $num (grep $_, @$cell[1,2,3]) {
663	my $tex = $::CONN->{face}[$num]{texture} \|\| next;	783	my $tex = $::CONN->{face}[$num]{texture} \|\| next;
664		784
665	glBindTexture GL_TEXTURE_2D, $tex->{name};	785	glBindTexture GL_TEXTURE_2D, $tex->{name};
…		…
677	glTexCoord 1, 0; glVertex $px + $w, $py;	797	glTexCoord 1, 0; glVertex $px + $w, $py;
678	glEnd;	798	glEnd;
679	}	799	}
680	}	800	}
681	}	801	}
		802
		803	# if (1) { # higher quality darkness
		804	# $lighting =~ s/(.)/$1$1$1/gs;
		805	# my $pb = new_from_data Gtk2::Gdk::Pixbuf $lighting, "rgb", 0, 8, $sw4, $sh, $sw4 * 3;
		806	#
		807	# $pb = $pb->scale_simple ($sw4 * 0.5, $sh * 0.5, "bilinear");
		808	#
		809	# $lighting = $pb->get_pixels;
		810	# $lighting =~ s/(.)../$1/gs;
		811	# }
		812
		813	$lighting = new Crossfire::Client::Texture
		814	width => $sw4,
		815	height => $sh,
		816	data => $lighting,
		817	internalformat => GL_ALPHA4,
		818	format => GL_ALPHA;
		819
		820	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
		821	glColor 0, 0, 0, 0.75;
		822	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
		823	glBindTexture GL_TEXTURE_2D, $lighting->{name};
		824	glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR;
		825	glBegin GL_QUADS;
		826	glTexCoord 0, 0; glVertex 0 , 0;
		827	glTexCoord 0, 1; glVertex 0 , $sh * 32;
		828	glTexCoord 1, 1; glVertex $sw4 * 32, $sh * 32;
		829	glTexCoord 1, 0; glVertex $sw4 * 32, 0;
		830	glEnd;
682		831
683	glDisable GL_TEXTURE_2D;	832	glDisable GL_TEXTURE_2D;
684	glDisable GL_BLEND;	833	glDisable GL_BLEND;
685	}	834	}
686		835
…		…
733	if (!($mod & KMOD_CTRL ) && delete $self->{ctrl}) {	882	if (!($mod & KMOD_CTRL ) && delete $self->{ctrl}) {
734	$::CONN->send ("command run_stop");	883	$::CONN->send ("command run_stop");
735	}	884	}
736	}	885	}
737		886
		887	#############################################################################
		888
		889	package Crossfire::Client::Widget::Animator;
		890
		891	use SDL::OpenGL;
		892
		893	our @ISA = Crossfire::Client::Widget::Bin::;
		894
		895	sub moveto {
		896	my ($self, $x, $y) = @_;
		897
		898	$self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
		899	$self->{speed} = 0.2;
		900	$self->{time} = 1;
		901
		902	::animation_start $self;
		903	}
		904
		905	sub animate {
		906	my ($self, $interval) = @_;
		907
		908	$self->{time} -= $interval * $self->{speed};
		909	if ($self->{time} <= 0) {
		910	$self->{time} = 0;
		911	::animation_stop $self;
		912	}
		913
		914	my ($x0, $y0, $x1, $y1) = @{$self->{moveto}};
		915
		916	$self->{x} = $x0 * $self->{time} + $x1 * (1 - $self->{time});
		917	$self->{y} = $y0 * $self->{time} + $y1 * (1 - $self->{time});
		918	}
		919
		920	sub _draw {
		921	my ($self) = @_;
		922
		923	glPushMatrix;
		924	glRotate $self->{time} * 10000, 0, 1, 0;
		925	$self->{children}[0]->draw;
		926	glPopMatrix;
		927	}
		928
738	1;	929	1;
739		930

Diff Legend

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

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents): Revision 1.32 by elmex, Sun Apr 9 01:21:11 2006 UTC vs. Revision 1.43 by root, Sun Apr 9 22:12:11 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.32 by elmex, Sun Apr 9 01:21:11 2006 UTC vs.
Revision 1.43 by root, Sun Apr 9 22:12:11 2006 UTC