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

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.33 by root, Sun Apr 9 01:37:58 2006 UTC vs.
Revision 1.46 by root, Sun Apr 9 22:21:02 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	$x -= $self->{x};
		183	$y -= $self->{y};
		184
		185	my $res;
		186
		187	for (reverse @{ $self->{children} }) {
		188	$res = $_->find_widget ($x, $y)
		189	and return $res;
		190	}
		191
		192	$self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
		193	}
		194
		195	sub _draw {
		196	my ($self) = @_;
		197
		198	$_->draw for @{$self->{children}};
		199	}
		200
		201	#############################################################################
		202
		203	package Crossfire::Client::Widget::Bin;
		204
		205	our @ISA = Crossfire::Client::Widget::Container::;
		206
		207	sub child { $_[0]->{children}[0] }
		208
		209	sub size_request {
		210	$_[0]{children}[0]->size_request if $_[0]{children}[0];
		211	}
		212
		213	sub size_allocate {
		214	my ($self, $w, $h) = @_;
		215
		216	$self->SUPER::size_allocate ($w, $h);
		217	$self->{children}[0]->size_allocate ($w, $h)
		218	if $self->{children}[0]
		219	}
		220
		221	#############################################################################
		222
		223	package Crossfire::Client::Widget::Toplevel;
		224
		225	our @ISA = Crossfire::Client::Widget::Container::;
		226
		227	sub update {
		228	my ($self) = @_;
		229
		230	::refresh ();
		231	}
		232
		233	sub add {
		234	my ($self, $widget) = @_;
		235
		236	$self->SUPER::add ($widget);
		237
		238	$widget->size_allocate ($widget->size_request);
		239	}
		240
		241	#############################################################################
		242
		243	package Crossfire::Client::Widget::Window;
		244
		245	our @ISA = Crossfire::Client::Widget::Bin::;
		246
137	use SDL::OpenGL;	247	use SDL::OpenGL;
138		248
139	sub add { $_[0]->{child} = $_[1]; $_[1]->set_parent ($_[0]); $_[1]->update }	249	sub new {
140	sub get { $_[0]->{child} }	250	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		251
147	sub size_request { $_[0]->{child}->size_request if $_[0]->{child} }	252	my $self = $class->SUPER::new;
148		253
149	sub _draw { die "Containers can't be drawn!" }	254	@$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	}	255	}
175		256
176	sub update {	257	sub update {
177	my ($self) = @_;	258	my ($self) = @_;
178	::refresh ();
179	}
180		259
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;	260	$self->render_chld;
		261	$self->SUPER::update;
209	}	262	}
210		263
211	sub render_chld {	264	sub render_chld {
212	my ($self) = @_;	265	my ($self) = @_;
213	my $chld = $self->get;
214	my ($w, $h) = $self->size_request;
215		266
216	$self->{texture} =	267	$self->{texture} =
217	Crossfire::Client::Texture->new_from_opengl (	268	Crossfire::Client::Texture->new_from_opengl (
218	$w, $h, sub { $chld->draw }	269	$self->{w}, $self->{h}, sub { $self->child->draw }
219	);	270	);
220	$self->{texture}->upload;
221	}	271	}
222		272
223	sub size_request {	273	sub size_allocate {
224	my ($self) = @_;	274	my ($self, $w, $h) = @_;
225	my $chld = $self->get	275
226	or return (0, 0);	276	$self->{w} = $w;
227	$chld->size_request	277	$self->{h} = $h;
		278
		279	$self->child->size_allocate ($w, $h);
		280
		281	$self->render_chld;
228	}	282	}
229		283
230	sub _draw {	284	sub _draw {
231	my ($self) = @_;	285	my ($self) = @_;
232		286
233	my ($w, $h) = $self->size_request;#TODO# use width/height of texture	287	my ($w, $h) = ($self->w, $self->h);
234		288
235	my $tex = $self->{texture}	289	my $tex = $self->{texture}
236	or return;	290	or return;
237		291
238	glEnable GL_BLEND;	292	glEnable GL_BLEND;
239	glEnable GL_TEXTURE_2D;	293	glEnable GL_TEXTURE_2D;
240	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	294	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
241	glBindTexture GL_TEXTURE_2D, $tex->{name};	295	glBindTexture GL_TEXTURE_2D, $tex->{name};
242
243	glColor 1, 0, 1;
244		296
245	glBegin GL_QUADS;	297	glBegin GL_QUADS;
246	glTexCoord 0, 0; glVertex 0, 0;	298	glTexCoord 0, 0; glVertex 0, 0;
247	glTexCoord 0, 1; glVertex 0, $h;	299	glTexCoord 0, 1; glVertex 0, $h;
248	glTexCoord 1, 1; glVertex $w, $h;	300	glTexCoord 1, 1; glVertex $w, $h;
…		…
251		303
252	glDisable GL_BLEND;	304	glDisable GL_BLEND;
253	glDisable GL_TEXTURE_2D;	305	glDisable GL_TEXTURE_2D;
254	}	306	}
255		307
		308	#############################################################################
		309
256	package Crossfire::Client::Widget::Frame;	310	package Crossfire::Client::Widget::Frame;
257		311
258	our @ISA = Crossfire::Client::Widget::Container::;	312	our @ISA = Crossfire::Client::Widget::Bin::;
259		313
260	use SDL::OpenGL;	314	use SDL::OpenGL;
261		315
262	sub size_request {	316	sub size_request {
263	my ($self) = @_;	317	my ($self) = @_;
264	my $chld = $self->get	318	my $chld = $self->child
265	or return (0, 0);	319	or return (0, 0);
266		320
267	$chld->move (2, 2);	321	$chld->move (2, 2);
268		322
269	map { $_ + 4 } $chld->size_request;	323	map { $_ + 4 } $chld->size_request;
270	}	324	}
271		325
		326	sub size_allocate {
		327	my ($self, $w, $h) = @_;
		328
		329	$self->{w} = $w;
		330	$self->{h} = $h;
		331
		332	$self->child->size_allocate ($w - 4, $h - 4);
		333	$self->child->move (2, 2);
		334	}
		335
272	sub _draw {	336	sub _draw {
273	my ($self) = @_;	337	my ($self) = @_;
274		338
275	my $chld = $self->get;	339	my $chld = $self->child;
276		340
277	my ($w, $h) = $chld->size_request;	341	my ($w, $h) = $chld->size_request;
278		342
279	glBegin GL_QUADS;	343	glBegin GL_QUADS;
280	glColor 0, 0, 0;	344	glColor 0, 0, 0;
…		…
285	glEnd;	349	glEnd;
286		350
287	$chld->draw;	351	$chld->draw;
288	}	352	}
289		353
		354	#############################################################################
		355
290	package Crossfire::Client::Widget::FancyFrame;	356	package Crossfire::Client::Widget::FancyFrame;
291		357
292	our @ISA = Crossfire::Client::Widget::Frame::;	358	our @ISA = Crossfire::Client::Widget::Bin::;
293		359
294	use SDL::OpenGL;	360	use SDL::OpenGL;
295		361
296	#TODO: implement themed frame	362	my @tex =
		363	map { new_from_file Crossfire::Client::Texture Crossfire::Client::find_rcfile $_ }
		364	qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
		365
		366	sub size_request {
		367	my ($self) = @_;
		368
		369	my ($w, $h) = $self->SUPER::size_request;
		370
		371	$h += $tex[1]->{height};
		372	$h += $tex[4]->{height};
		373	$w += $tex[2]->{width};
		374	$w += $tex[3]->{width};
		375
		376	($w, $h)
		377	}
		378
		379	sub size_allocate {
		380	my ($self, $w, $h) = @_;
		381
		382	$self->SUPER::size_allocate ($w, $h);
		383
		384	$h -= $tex[1]->{height};
		385	$h -= $tex[4]->{height};
		386	$w -= $tex[2]->{width};
		387	$w -= $tex[3]->{width};
		388
		389	$h = $h < 0 ? 0 : $h;
		390	$w = $w < 0 ? 0 : $w;
		391
		392	$self->child->size_allocate ($w, $h);
		393	$self->child->move ($tex[3]->{width}, $tex[1]->{height});
		394	}
		395
		396	sub _draw {
		397	my ($self) = @_;
		398
		399	my ($w, $h) = ($self->{w}, $self->{h});
		400	my ($cw, $ch) = ($self->child->{w}, $self->child->{h});
		401
		402	glEnable GL_BLEND;
		403	glEnable GL_TEXTURE_2D;
		404	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
		405	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
		406
		407	my $top = $tex[1];
		408	glBindTexture GL_TEXTURE_2D, $top->{name};
		409
		410	glBegin GL_QUADS;
		411	glTexCoord 0, 0; glVertex 0 , 0;
		412	glTexCoord 0, 1; glVertex 0 , $top->{height};
		413	glTexCoord 1, 1; glVertex $w , $top->{height};
		414	glTexCoord 1, 0; glVertex $w , 0;
		415	glEnd;
		416
		417	my $left = $tex[3];
		418	glBindTexture GL_TEXTURE_2D, $left->{name};
		419
		420	glBegin GL_QUADS;
		421	glTexCoord 0, 0; glVertex 0 , $top->{height};
		422	glTexCoord 0, 1; glVertex 0 , $top->{height} + $ch;
		423	glTexCoord 1, 1; glVertex $left->{width}, $top->{height} + $ch;
		424	glTexCoord 1, 0; glVertex $left->{width}, $top->{height};
		425	glEnd;
		426
		427	my $right = $tex[2];
		428	glBindTexture GL_TEXTURE_2D, $right->{name};
		429
		430	glBegin GL_QUADS;
		431	glTexCoord 0, 0; glVertex $w - $right->{width}, $top->{height};
		432	glTexCoord 0, 1; glVertex $w - $right->{width}, $top->{height} + $ch;
		433	glTexCoord 1, 1; glVertex $w , $top->{height} + $ch;
		434	glTexCoord 1, 0; glVertex $w , $top->{height};
		435	glEnd;
		436
		437	my $bottom = $tex[4];
		438	glBindTexture GL_TEXTURE_2D, $bottom->{name};
		439
		440	glBegin GL_QUADS;
		441	glTexCoord 0, 0; glVertex 0 , $h - $bottom->{height};
		442	glTexCoord 0, 1; glVertex 0 , $h;
		443	glTexCoord 1, 1; glVertex $w , $h;
		444	glTexCoord 1, 0; glVertex $w , $h - $bottom->{height};
		445	glEnd;
		446
		447	my $bg = $tex[0];
		448	glBindTexture GL_TEXTURE_2D, $bg->{name};
		449	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
		450	glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT;
		451	glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT;
		452
		453	my $rep_x = $cw / $bg->{width};
		454	my $rep_y = $ch / $bg->{height};
		455
		456	glBegin GL_QUADS;
		457	glTexCoord 0, 0; glVertex $left->{width}, $top->{height};
		458	glTexCoord 0, $rep_y; glVertex $left->{width}, $top->{height} + $ch;
		459	glTexCoord $rep_x, $rep_y; glVertex $left->{width} + $cw , $top->{height} + $ch;
		460	glTexCoord $rep_x, 0; glVertex $left->{width} + $cw , $top->{height};
		461	glEnd;
		462
		463	glDisable GL_BLEND;
		464	glDisable GL_TEXTURE_2D;
		465
		466	$self->child->draw;
		467
		468	}
		469
		470	#############################################################################
297		471
298	package Crossfire::Client::Widget::Table;	472	package Crossfire::Client::Widget::Table;
299		473
300	our @ISA = Crossfire::Client::Widget::Container::;	474	our @ISA = Crossfire::Client::Widget::Bin::;
301		475
302	use SDL::OpenGL;	476	use SDL::OpenGL;
303		477
304	sub add {	478	sub add {
305	my ($self, $x, $y, $chld) = @_;	479	my ($self, $x, $y, $chld) = @_;
306	my $old_chld = $self->{childs}[$y][$x];	480	my $old_chld = $self->{children}[$y][$x];
307		481
308	$self->{childs}[$y][$x] = $chld;	482	$self->{children}[$y][$x] = $chld;
309	$chld->set_parent ($self);	483	$chld->set_parent ($self);
310	$self->update;	484	$self->update;
311	}	485	}
312		486
313	sub max_row_height {	487	sub max_row_height {
314	my ($self, $row) = @_;	488	my ($self, $row) = @_;
315		489
316	my $hs = 0;	490	my $hs = 0;
317	for (my $xi = 0; $xi <= $#{$self->{childs}->[$row] \|\| []}; $xi++) {	491	for (my $xi = 0; $xi <= $#{$self->{children}->[$row] \|\| []}; $xi++) {
318	my $c = $self->{childs}->[$row]->[$xi];	492	my $c = $self->{children}->[$row]->[$xi];
319	if ($c) {	493	if ($c) {
320	my ($w, $h) = $c->size_request;	494	my ($w, $h) = $c->size_request;
321	if ($hs < $h) { $hs = $h }	495	if ($hs < $h) { $hs = $h }
322	}	496	}
323	}	497	}
…		…
326		500
327	sub max_col_width {	501	sub max_col_width {
328	my ($self, $col) = @_;	502	my ($self, $col) = @_;
329		503
330	my $ws = 0;	504	my $ws = 0;
331	for (my $yi = 0; $yi <= $#{$self->{childs} \|\| []}; $yi++) {	505	for (my $yi = 0; $yi <= $#{$self->{children} \|\| []}; $yi++) {
332	my $c = ($self->{childs}->[$yi] \|\| [])->[$col];	506	my $c = ($self->{children}->[$yi] \|\| [])->[$col];
333	if ($c) {	507	if ($c) {
334	my ($w, $h) = $c->size_request;	508	my ($w, $h) = $c->size_request;
335	if ($ws < $w) { $ws = $w }	509	if ($ws < $w) { $ws = $w }
336	}	510	}
337	}	511	}
…		…
341	sub size_request {	515	sub size_request {
342	my ($self) = @_;	516	my ($self) = @_;
343		517
344	my ($hs, $ws) = (0, 0);	518	my ($hs, $ws) = (0, 0);
345		519
346	for (my $yi = 0; $yi <= $#{$self->{childs}}; $yi++) {	520	for (my $yi = 0; $yi <= $#{$self->{children}}; $yi++) {
347	$hs += $self->max_row_height ($yi);	521	$hs += $self->max_row_height ($yi);
348	}	522	}
349		523
350	for (my $yi = 0; $yi <= $#{$self->{childs}}; $yi++) {	524	for (my $yi = 0; $yi <= $#{$self->{children}}; $yi++) {
351	my $wm = 0;	525	my $wm = 0;
352	for (my $xi = 0; $xi <= $#{$self->{childs}->[$yi]}; $xi++) {	526	for (my $xi = 0; $xi <= $#{$self->{children}->[$yi]}; $xi++) {
353	$wm += $self->max_col_width ($xi)	527	$wm += $self->max_col_width ($xi)
354	}	528	}
355	if ($ws < $wm) { $ws = $wm }	529	if ($ws < $wm) { $ws = $wm }
356	}	530	}
357		531
…		…
360		534
361	sub _draw {	535	sub _draw {
362	my ($self) = @_;	536	my ($self) = @_;
363		537
364	my $y = 0;	538	my $y = 0;
365	for (my $yi = 0; $yi <= $#{$self->{childs}}; $yi++) {	539	for (my $yi = 0; $yi <= $#{$self->{children}}; $yi++) {
366	my $x = 0;	540	my $x = 0;
367		541
368	for (my $xi = 0; $xi <= $#{$self->{childs}->[$yi]}; $xi++) {	542	for (my $xi = 0; $xi <= $#{$self->{children}->[$yi]}; $xi++) {
369		543
370	my $c = $self->{childs}->[$yi]->[$xi];	544	my $c = $self->{children}->[$yi]->[$xi];
371	if ($c) {	545	if ($c) {
372	$c->move ($x, $y, 0); #TODO: Move to size_request	546	$c->move ($x, $y, 0); #TODO: Move to size_request
373	$c->draw if $c;	547	$c->draw if $c;
374	}	548	}
375		549
…		…
378		552
379	$y += $self->max_row_height ($yi);	553	$y += $self->max_row_height ($yi);
380	}	554	}
381	}	555	}
382		556
		557	#############################################################################
		558
383	package Crossfire::Client::Widget::VBox;	559	package Crossfire::Client::Widget::VBox;
384		560
385	our @ISA = Crossfire::Client::Widget::Container::;	561	our @ISA = Crossfire::Client::Widget::Container::;
386		562
387	use SDL::OpenGL;	563	use SDL::OpenGL;
388		564
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 {	565	sub size_request {
397	my ($self) = @_;	566	my ($self) = @_;
398		567
399	my ($hs, $ws) = (0, 0);	568	my @alloc = map [$_->size_request], @{$self->{children}};
		569
		570	(
		571	(List::Util::max map $_->[0], @alloc),
		572	(List::Util::sum map $_->[1], @alloc),
		573	)
		574	}
		575
		576	sub size_allocate {
		577	my ($self, $w, $h) = @_;
		578
		579	$self->w ($w);
		580	$self->h ($h);
		581
		582	my $exp;
		583	my @oth;
		584	# find expand widget
400	for (@{$self->{childs} \|\| []}) {	585	for (@{$self->{children}}) {
		586	if ($_->{expand}) {
		587	$exp = $_;
		588	last;
		589	}
		590	push @oth, $_;
		591	}
		592
		593	my ($ow, $oh);
		594
		595	# get sizes of other widgets
		596	for (@oth) {
401	my ($w, $h) = $_->size_request;	597	my ($w, $h) = $_->size_request;
402	$hs += $h;	598	$oh += $h;
403	if ($ws < $w) { $ws = $w }	599	if ($ow < $w) { $ow = $w }
404	}	600	}
405		601
406	return ($ws, $hs);	602	my $y = 0;
407	}
408
409	sub _draw {
410	my ($self) = @_;
411
412	my ($x, $y);
413	for (@{$self->{childs} \|\| []}) {	603	for (@{$self->{children}}) {
414	$_->move (0, $y, 0); #TODO: move to size_request	604	$_->move (0, $y);
415	$_->draw;	605
		606	if ($_ == $exp) {
		607	$_->size_allocate ($w, $h - $oh);
		608	$y += $h - $oh;
		609	} else {
416	my ($w, $h) = $_->size_request;	610	my ($cw, $h) = $_->size_request;
		611	$_->size_allocate ($w, $h);
417	$y += $h;	612	$y += $h;
		613	}
418	}	614	}
419	}	615	}
		616
		617	#############################################################################
420		618
421	package Crossfire::Client::Widget::Label;	619	package Crossfire::Client::Widget::Label;
422		620
423	our @ISA = Crossfire::Client::Widget::;	621	our @ISA = Crossfire::Client::Widget::;
424		622
…		…
468	glEnable GL_TEXTURE_2D;	666	glEnable GL_TEXTURE_2D;
469	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	667	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
470	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	668	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
471	glBindTexture GL_TEXTURE_2D, $tex->{name};	669	glBindTexture GL_TEXTURE_2D, $tex->{name};
472		670
473	glColor 1, 1, 1, 0.6; # TODO color	671	glColor 1, 0, 0, 1; # TODO color
474		672
475	glBegin GL_QUADS;	673	glBegin GL_QUADS;
476	glTexCoord 0, 0; glVertex 0 , 0;	674	glTexCoord 0, 0; glVertex 0 , 0;
477	glTexCoord 0, 1; glVertex 0 , $tex->{height};	675	glTexCoord 0, 1; glVertex 0 , $tex->{height};
478	glTexCoord 1, 1; glVertex $tex->{width}, $tex->{height};	676	glTexCoord 1, 1; glVertex $tex->{width}, $tex->{height};
…		…
481		679
482	glDisable GL_BLEND;	680	glDisable GL_BLEND;
483	glDisable GL_TEXTURE_2D;	681	glDisable GL_TEXTURE_2D;
484	}	682	}
485		683
		684	#############################################################################
		685
486	package Crossfire::Client::Widget::TextEntry;	686	package Crossfire::Client::Widget::TextEntry;
487		687
488	our @ISA = Crossfire::Client::Widget::Label::;	688	our @ISA = Crossfire::Client::Widget::Label::;
489		689
490	use SDL;	690	use SDL;
…		…
508	$text .= chr $uni;	708	$text .= chr $uni;
509	}	709	}
510	$self->set_text ($text);	710	$self->set_text ($text);
511	}	711	}
512		712
513		713	#############################################################################
514	# XXX: TextView isn't neccessary with pango multiline text rendering
515	package Crossfire::Client::Widget::TextView;
516
517	use strict;
518
519	our @ISA = qw/Crossfire::Client::Widget/;
520
521	use SDL::OpenGL;
522	use SDL::OpenGL::Constants;
523
524	sub new {
525	my ($class, $text, $h) = @_;
526	my $self = $class->SUPER::new ();
527
528	$self->{txt_height} = $h;
529	@{$self->{lines}} = split /\r?\n/, $text;
530
531	for (split /\r?\n/, $text) {
532	$self->add_line ($_);
533	}
534	$self
535	}
536
537	#sub render_lines {
538	# my ($self) = @_;
539	#
540	# $self->{txt_lines} = [];
541	#
542	# for (@{$self->{lines}}) {
543	# push @{$self->{txt_lines}},
544	# new_from_ttf Crossfire::Client::Texture $self->{ttf}, $_;
545	# }
546	#}
547
548	sub add_line {
549	my ($self, $line) = @_;
550	push @{$self->{lines}}, $line;
551
552	push @{$self->{txt_lines}},
553	new_from_text Crossfire::Client::Texture $line, $self->{txt_height};
554	}
555
556	sub size_request {
557	my ($self) = @_;
558
559	my $w = 0;
560	my $h = 0;
561
562	for (@{$self->{txt_lines}}) {
563	if ($w < $_->{width}) { $w = $_->{width} }
564	$h += $_->{height};
565	}
566
567	return ($w, $h);
568	}
569
570	sub draw_line {
571	my ($self, $tex, $y) = @_;
572
573	glBindTexture GL_TEXTURE_2D, $tex->{name};
574
575	glColor 1, 0, 1;
576
577	glBegin GL_QUADS;
578	glTexCoord 0, 0; glVertex 0 , $y;
579	glTexCoord 0, 1; glVertex 0 , $y + $tex->{height};
580	glTexCoord 1, 1; glVertex $tex->{width}, $y + $tex->{height};
581	glTexCoord 1, 0; glVertex $tex->{width}, $y;
582	glEnd;
583	}
584
585	sub _draw {
586	my ($self) = @_;
587
588	glEnable GL_BLEND;
589	glEnable GL_TEXTURE_2D;
590	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;#DECAL;
591
592	my $l = 0;
593	for (@{$self->{txt_lines}}) {
594	$self->draw_line ($_, $l);
595	$l += $_->{height};
596	}
597
598	glDisable GL_BLEND;
599	glDisable GL_TEXTURE_2D;
600	}
601		714
602	package Crossfire::Client::Widget::MapWidget;	715	package Crossfire::Client::Widget::MapWidget;
603		716
604	use strict;	717	use strict;
605		718
…		…
614	sub key_down {	727	sub key_down {
615	print "MAPKEYDOWN\n";	728	print "MAPKEYDOWN\n";
616	}	729	}
617		730
618	sub key_up {	731	sub key_up {
		732	}
		733
		734	sub size_request {
		735
		736	}
		737
		738	sub size_allocate {
619	}	739	}
620		740
621	sub _draw {	741	sub _draw {
622	my ($self) = @_;	742	my ($self) = @_;
623		743
…		…
643	$yofs = $self->{yofs} = min $my, max $my + $::CONN->{maph} - $sh + 1, $self->{yofs};	763	$yofs = $self->{yofs} = min $my, max $my + $::CONN->{maph} - $sh + 1, $self->{yofs};
644	}	764	}
645		765
646	glEnable GL_TEXTURE_2D;	766	glEnable GL_TEXTURE_2D;
647	glEnable GL_BLEND;	767	glEnable GL_BLEND;
648	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	768	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
		769
		770	my $sw4 = ($sw + 3) & ~3;
		771	my $lighting = "\x00" x ($sw4 * $sh);
649		772
650	for my $x (0 .. $sw - 1) {	773	for my $x (0 .. $sw - 1) {
651	for my $y (0 .. $sh - 1) {	774	for my $y (0 .. $sh - 1) {
652		775
653	my $cell = $map->[$x + $xofs][$y + $yofs]	776	my $cell = $map->[$x + $xofs][$y + $yofs]
654	or next;	777	or next;
655		778
656	my $darkness = $cell->[0] * (1 / 255);	779	my $darkness = $cell->[0] * (1 / 255);
657	if ($darkness < 0) {	780	if ($darkness < 0) {
658	glColor 0.3, 0.3, 0.3;	781	$darkness = 0.15;
659	} else {
660	glColor $darkness, $darkness, $darkness;
661	}	782	}
		783	substr $lighting, $y * $sw4 + $x, 1, chr 255 - $darkness * 255;
662		784
663	for my $num (grep $_, @$cell[1,2,3]) {	785	for my $num (grep $_, @$cell[1,2,3]) {
664	my $tex = $::CONN->{face}[$num]{texture} \|\| next;	786	my $tex = $::CONN->{face}[$num]{texture} \|\| next;
665		787
666	glBindTexture GL_TEXTURE_2D, $tex->{name};	788	glBindTexture GL_TEXTURE_2D, $tex->{name};
…		…
678	glTexCoord 1, 0; glVertex $px + $w, $py;	800	glTexCoord 1, 0; glVertex $px + $w, $py;
679	glEnd;	801	glEnd;
680	}	802	}
681	}	803	}
682	}	804	}
		805
		806	# if (1) { # higher quality darkness
		807	# $lighting =~ s/(.)/$1$1$1/gs;
		808	# my $pb = new_from_data Gtk2::Gdk::Pixbuf $lighting, "rgb", 0, 8, $sw4, $sh, $sw4 * 3;
		809	#
		810	# $pb = $pb->scale_simple ($sw4 * 0.5, $sh * 0.5, "bilinear");
		811	#
		812	# $lighting = $pb->get_pixels;
		813	# $lighting =~ s/(.)../$1/gs;
		814	# }
		815
		816	$lighting = new Crossfire::Client::Texture
		817	width => $sw4,
		818	height => $sh,
		819	data => $lighting,
		820	internalformat => GL_ALPHA4,
		821	format => GL_ALPHA;
		822
		823	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
		824	glColor 0, 0, 0, 0.75;
		825	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
		826	glBindTexture GL_TEXTURE_2D, $lighting->{name};
		827	glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR;
		828	glBegin GL_QUADS;
		829	glTexCoord 0, 0; glVertex 0 , 0;
		830	glTexCoord 0, 1; glVertex 0 , $sh * 32;
		831	glTexCoord 1, 1; glVertex $sw4 * 32, $sh * 32;
		832	glTexCoord 1, 0; glVertex $sw4 * 32, 0;
		833	glEnd;
683		834
684	glDisable GL_TEXTURE_2D;	835	glDisable GL_TEXTURE_2D;
685	glDisable GL_BLEND;	836	glDisable GL_BLEND;
686	}	837	}
687		838
…		…
734	if (!($mod & KMOD_CTRL ) && delete $self->{ctrl}) {	885	if (!($mod & KMOD_CTRL ) && delete $self->{ctrl}) {
735	$::CONN->send ("command run_stop");	886	$::CONN->send ("command run_stop");
736	}	887	}
737	}	888	}
738		889
		890	#############################################################################
		891
		892	package Crossfire::Client::Widget::Animator;
		893
		894	use SDL::OpenGL;
		895
		896	our @ISA = Crossfire::Client::Widget::Bin::;
		897
		898	sub moveto {
		899	my ($self, $x, $y) = @_;
		900
		901	$self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
		902	$self->{speed} = 0.2;
		903	$self->{time} = 1;
		904
		905	::animation_start $self;
		906	}
		907
		908	sub animate {
		909	my ($self, $interval) = @_;
		910
		911	$self->{time} -= $interval * $self->{speed};
		912	if ($self->{time} <= 0) {
		913	$self->{time} = 0;
		914	::animation_stop $self;
		915	}
		916
		917	my ($x0, $y0, $x1, $y1) = @{$self->{moveto}};
		918
		919	$self->{x} = $x0 * $self->{time} + $x1 * (1 - $self->{time});
		920	$self->{y} = $y0 * $self->{time} + $y1 * (1 - $self->{time});
		921	}
		922
		923	sub _draw {
		924	my ($self) = @_;
		925
		926	glPushMatrix;
		927	glRotate $self->{time} * 10000, 0, 1, 0;
		928	$self->{children}[0]->draw;
		929	glPopMatrix;
		930	}
		931
739	1;	932	1;
740		933

Diff Legend

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

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents): Revision 1.33 by root, Sun Apr 9 01:37:58 2006 UTC vs. Revision 1.46 by root, Sun Apr 9 22:21:02 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.33 by root, Sun Apr 9 01:37:58 2006 UTC vs.
Revision 1.46 by root, Sun Apr 9 22:21:02 2006 UTC