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

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.28 by root, Sun Apr 9 00:06:10 2006 UTC vs.
Revision 1.31 by elmex, Sun Apr 9 00:43:11 2006 UTC

…		…
148	}	148	}
149		149
150	sub _draw {	150	sub _draw {
151	my ($self) = @_;	151	my ($self) = @_;
152		152
153	my ($w, $h) = $self->size_request;#TODO# use widht/height of texture	153	my ($w, $h) = $self->size_request;#TODO# use width/height of texture
		154
154	my $tex = $self->{texture}	155	my $tex = $self->{texture}
155	or return;	156	or return;
156		157
157	glEnable GL_BLEND;	158	glEnable GL_BLEND;
158	glEnable GL_TEXTURE_2D;	159	glEnable GL_TEXTURE_2D;
159	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	160	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
160	glBindTexture GL_TEXTURE_2D, $tex->{name};	161	glBindTexture GL_TEXTURE_2D, $tex->{name};
161		162
162	glColor 1, 1, 1;	163	glColor 1, 0, 1;
163		164
164	glBegin GL_QUADS;	165	glBegin GL_QUADS;
165	glTexCoord 0, 0; glVertex 0, 0;	166	glTexCoord 0, 0; glVertex 0, 0;
166	glTexCoord 0, 1; glVertex 0, $h;	167	glTexCoord 0, 1; glVertex 0, $h;
167	glTexCoord 1, 1; glVertex $w, $h;	168	glTexCoord 1, 1; glVertex $w, $h;
…		…
180		181
181	sub size_request {	182	sub size_request {
182	my ($self) = @_;	183	my ($self) = @_;
183	my $chld = $self->get	184	my $chld = $self->get
184	or return (0, 0);	185	or return (0, 0);
		186
		187	$chld->move (2, 2);
		188
185	map { $_ + 4 } $chld->size_request;	189	map { $_ + 4 } $chld->size_request;
186	}	190	}
187		191
188	sub _draw {	192	sub _draw {
189	my ($self) = @_;	193	my ($self) = @_;
190		194
191	my $chld = $self->get;	195	my $chld = $self->get;
192		196
193	$chld->move (2, 2, 0); #TODO:move to size_request
194
195	my ($w, $h) = $chld->size_request;	197	my ($w, $h) = $chld->size_request;
196		198
197	glColor 1, 0, 0;
198	glBegin GL_QUADS;	199	glBegin GL_QUADS;
		200	glColor 0, 0, 0;
199	glTexCoord 0, 0; glVertex 0 , 0;	201	glTexCoord 0, 0; glVertex 0 , 0;
200	glTexCoord 0, 1; glVertex 0 , $h + 4;	202	glTexCoord 0, 1; glVertex 0 , $h + 4;
201	glTexCoord 1, 1; glVertex $w + 4 , $h + 4;	203	glTexCoord 1, 1; glVertex $w + 4 , $h + 4;
202	glTexCoord 1, 0; glVertex $w + 4 , 0;	204	glTexCoord 1, 0; glVertex $w + 4 , 0;
203	glEnd;	205	glEnd;
204		206
205	$chld->draw;	207	$chld->draw;
206	}	208	}
		209
		210	package Crossfire::Client::Widget::FancyFrame;
		211
		212	our @ISA = Crossfire::Client::Widget::Frame::;
		213
		214	use SDL::OpenGL;
		215
		216	#TODO: implement themed frame
207		217
208	package Crossfire::Client::Widget::Table;	218	package Crossfire::Client::Widget::Table;
209		219
210	our @ISA = Crossfire::Client::Widget::Container::;	220	our @ISA = Crossfire::Client::Widget::Container::;
211		221
…		…
366		376
367	my $tex = $self->{texture};	377	my $tex = $self->{texture};
368		378
369	glEnable GL_BLEND;	379	glEnable GL_BLEND;
370	glEnable GL_TEXTURE_2D;	380	glEnable GL_TEXTURE_2D;
		381	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
371	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	382	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
372	glBindTexture GL_TEXTURE_2D, $tex->{name};	383	glBindTexture GL_TEXTURE_2D, $tex->{name};
373		384
374	glColor 1, 0, 1;	385	glColor 1, 1, 1, 0.8;
375		386
376	glBegin GL_QUADS;	387	glBegin GL_QUADS;
377	glTexCoord 0, 0; glVertex 0 , 0;	388	glTexCoord 0, 0; glVertex 0 , 0;
378	glTexCoord 0, 1; glVertex 0 , $tex->{height};	389	glTexCoord 0, 1; glVertex 0 , $tex->{height};
379	glTexCoord 1, 1; glVertex $tex->{width}, $tex->{height};	390	glTexCoord 1, 1; glVertex $tex->{width}, $tex->{height};
…		…
382		393
383	glDisable GL_BLEND;	394	glDisable GL_BLEND;
384	glDisable GL_TEXTURE_2D;	395	glDisable GL_TEXTURE_2D;
385	}	396	}
386		397
		398	package Crossfire::Client::Widget::TextEntry;
		399
		400	our @ISA = Crossfire::Client::Widget::Label::;
		401
		402	use SDL;
		403	use SDL::OpenGL;
		404
		405	sub key_down {
		406	my ($self, $ev) = @_;
		407
		408	my $mod = $ev->key_mod;
		409	my $sym = $ev->key_sym;
		410
		411	$ev->set_unicode (1);
		412	my $uni = $ev->key_unicode;
		413
		414	my $text = $self->get_text;
		415
		416	if ($sym == SDLK_BACKSPACE) {
		417	substr $text, -1, 1, '';
		418
		419	} elsif ($uni) {
		420	$text .= chr $uni;
		421	}
		422	$self->set_text ($text);
		423	}
		424
		425
		426	# XXX: TextView isn't neccessary with pango multiline text rendering
387	package Crossfire::Client::Widget::TextView;	427	package Crossfire::Client::Widget::TextView;
388		428
389	use strict;	429	use strict;
390		430
391	our @ISA = qw/Crossfire::Client::Widget/;	431	our @ISA = qw/Crossfire::Client::Widget/;
392		432
393	use SDL::OpenGL;	433	use SDL::OpenGL;
394	use SDL::OpenGL::Constants;	434	use SDL::OpenGL::Constants;
		435
		436	sub new {
		437	my ($class, $text, $h) = @_;
		438	my $self = $class->SUPER::new ();
		439
		440	$self->{txt_height} = $h;
		441	@{$self->{lines}} = split /\r?\n/, $text;
		442
		443	for (split /\r?\n/, $text) {
		444	$self->add_line ($_);
		445	}
		446	$self
		447	}
		448
		449	#sub render_lines {
		450	# my ($self) = @_;
		451	#
		452	# $self->{txt_lines} = [];
		453	#
		454	# for (@{$self->{lines}}) {
		455	# push @{$self->{txt_lines}},
		456	# new_from_ttf Crossfire::Client::Texture $self->{ttf}, $_;
		457	# }
		458	#}
395		459
396	sub add_line {	460	sub add_line {
397	my ($self, $line) = @_;	461	my ($self, $line) = @_;
398	push @{$self->{lines}}, $line;	462	push @{$self->{lines}}, $line;
399	}
400		463
		464	push @{$self->{txt_lines}},
		465	new_from_text Crossfire::Client::Texture $line, $self->{txt_height};
		466	}
		467
		468	sub size_request {
		469	my ($self) = @_;
		470
		471	my $w = 0;
		472	my $h = 0;
		473
		474	for (@{$self->{txt_lines}}) {
		475	if ($w < $_->{width}) { $w = $_->{width} }
		476	$h += $_->{height};
		477	}
		478
		479	return ($w, $h);
		480	}
		481
401	sub _draw {	482	sub draw_line {
402	my ($self) = @_;	483	my ($self, $tex, $y) = @_;
403		484
		485	glBindTexture GL_TEXTURE_2D, $tex->{name};
		486
		487	glColor 1, 0, 1;
		488
		489	glBegin GL_QUADS;
		490	glTexCoord 0, 0; glVertex 0 , $y;
		491	glTexCoord 0, 1; glVertex 0 , $y + $tex->{height};
		492	glTexCoord 1, 1; glVertex $tex->{width}, $y + $tex->{height};
		493	glTexCoord 1, 0; glVertex $tex->{width}, $y;
		494	glEnd;
		495	}
		496
		497	sub _draw {
		498	my ($self) = @_;
		499
		500	glEnable GL_BLEND;
		501	glEnable GL_TEXTURE_2D;
		502	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;#DECAL;
		503
		504	my $l = 0;
		505	for (@{$self->{txt_lines}}) {
		506	$self->draw_line ($_, $l);
		507	$l += $_->{height};
		508	}
		509
		510	glDisable GL_BLEND;
		511	glDisable GL_TEXTURE_2D;
404	}	512	}
405		513
406	package Crossfire::Client::Widget::MapWidget;	514	package Crossfire::Client::Widget::MapWidget;
407		515
408	use strict;	516	use strict;

Diff Legend

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

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents): Revision 1.28 by root, Sun Apr 9 00:06:10 2006 UTC vs. Revision 1.31 by elmex, Sun Apr 9 00:43:11 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.28 by root, Sun Apr 9 00:06:10 2006 UTC vs.
Revision 1.31 by elmex, Sun Apr 9 00:43:11 2006 UTC