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

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.29 by root, Sun Apr 9 00:09:50 2006 UTC vs.
Revision 1.39 by root, Sun Apr 9 21:39:08 2006 UTC

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

Diff Legend

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

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents): Revision 1.29 by root, Sun Apr 9 00:09:50 2006 UTC vs. Revision 1.39 by root, Sun Apr 9 21:39:08 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.29 by root, Sun Apr 9 00:09:50 2006 UTC vs.
Revision 1.39 by root, Sun Apr 9 21:39:08 2006 UTC