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

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.194 by root, Thu May 11 23:41:47 2006 UTC vs.
Revision 1.205 by root, Mon May 15 00:15:08 2006 UTC

…		…
11	our ($FOCUS, $HOVER, $GRAB); # various widgets	11	our ($FOCUS, $HOVER, $GRAB); # various widgets
12		12
13	our $ROOT;	13	our $ROOT;
14	our $TOOLTIP;	14	our $TOOLTIP;
15	our $BUTTON_STATE;	15	our $BUTTON_STATE;
		16
		17	our %WIDGET; # all widgets, weak-referenced
16		18
17	sub check_tooltip {	19	sub check_tooltip {
18	if (!$GRAB) {	20	if (!$GRAB) {
19	for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {	21	for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
20	if (length $widget->{tooltip}) {	22	if (length $widget->{tooltip}) {
…		…
24		26
25	my $tip = $widget->{tooltip};	27	my $tip = $widget->{tooltip};
26		28
27	$tip = $tip->($widget) if CODE:: eq ref $tip;	29	$tip = $tip->($widget) if CODE:: eq ref $tip;
28		30
29	$TOOLTIP->set_markup ($widget->{tooltip});	31	$TOOLTIP->set_tooltip_from ($widget);
30
31	$TOOLTIP->show;	32	$TOOLTIP->show;
32		33
33	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);	34	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
34		35
35	if ($x + $TOOLTIP->{w} > $::WIDTH) {
36	($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0);	36	($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0)
37	}	37	if $x + $TOOLTIP->{w} > $::WIDTH;
38		38
39	$TOOLTIP->move ($x, $y);	39	$TOOLTIP->move ($x, $y);
		40	$TOOLTIP->check_size;
		41	$TOOLTIP->update;
40	}	42	}
41		43
42	return;	44	return;
43	}	45	}
44	}	46	}
…		…
131		133
132	for (@$vals) {	134	for (@$vals) {
133	my $i = int $_ + $rem;	135	my $i = int $_ + $rem;
134	$rem += $_ - $i;	136	$rem += $_ - $i;
135	$_ = $i;	137	$_ = $i;
		138	}
		139	}
		140
		141	# call when resolution changes etc.
		142	sub rescale_widgets {
		143	my ($sx, $sy) = @_;
		144
		145	for my $widget (values %WIDGET) {
		146	if ($widget->{toplevel}) {
		147	$widget->{x} = int 0.5 + $widget->{x} * $sx if exists $widget->{x};
		148	$widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};
		149	$widget->{req_w} = int 0.5 + $widget->{req_w} * $sx if exists $widget->{req_w};
		150	$widget->{user_w} = int 0.5 + $widget->{user_w} * $sx if exists $widget->{user_w};
		151	$widget->{y} = int 0.5 + $widget->{y} * $sy if exists $widget->{y};
		152	$widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};
		153	$widget->{req_h} = int 0.5 + $widget->{req_h} * $sy if exists $widget->{req_h};
		154	$widget->{user_h} = int 0.5 + $widget->{user_h} * $sy if exists $widget->{user_h};
		155	}
		156
		157	$widget->reconfigure;
136	}	158	}
137	}	159	}
138		160
139	#############################################################################	161	#############################################################################
140		162
…		…
159	if (/^connect_(.*)$/) {	181	if (/^connect_(.*)$/) {
160	$self->connect ($1 => delete $self->{$_});	182	$self->connect ($1 => delete $self->{$_});
161	}	183	}
162	}	184	}
163		185
		186	Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
		187
164	$self	188	$self
165	}	189	}
166		190
167	sub destroy {	191	sub destroy {
168	my ($self) = @_;	192	my ($self) = @_;
…		…
241		265
242	sub size_allocate {	266	sub size_allocate {
243	# nothing to be done	267	# nothing to be done
244	}	268	}
245		269
		270	sub reconfigure {
		271	my ($self) = @_;
		272
		273	$self->check_size (1);
		274	$self->update;
		275	}
		276
246	sub children {	277	sub children {
247	}
248
249	# call when resolution changes etc.
250	sub reconfigure {
251	my ($self) = @_;
252
253	$_->reconfigure
254	for $self->children;
255
256	$self->check_size;
257	$CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $self->{w}, $self->{h}];
258	$self->update;
259	}	278	}
260		279
261	sub set_max_size {	280	sub set_max_size {
262	my ($self, $w, $h) = @_;	281	my ($self, $w, $h) = @_;
263		282
…		…
356	glVertex $self->{w}, 0;	375	glVertex $self->{w}, 0;
357	glVertex $self->{w}, $self->{h};	376	glVertex $self->{w}, $self->{h};
358	glVertex 0 , $self->{h};	377	glVertex 0 , $self->{h};
359	glEnd;	378	glEnd;
360	glPopMatrix;	379	glPopMatrix;
361	CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;	380	#CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
362	}	381	}
363	}	382	}
364		383
365	sub _draw {	384	sub _draw {
366	my ($self) = @_;	385	my ($self) = @_;
…		…
383	sub set_parent {	402	sub set_parent {
384	my ($self, $parent) = @_;	403	my ($self, $parent) = @_;
385		404
386	Scalar::Util::weaken ($self->{parent} = $parent);	405	Scalar::Util::weaken ($self->{parent} = $parent);
387		406
		407	# TODO: req_w _does_change after ->reconfigure
388	$self->check_size	408	$self->check_size
389	unless exists $self->{req_w};	409	unless exists $self->{req_w};
390	}	410	}
391		411
392	sub check_size {	412	sub check_size {
393	my ($self) = @_;	413	my ($self, $forced) = @_;
394		414
		415	$self->{force_alloc} = 1 if $forced;
395	$CFClient::UI::ROOT->{check_size}{$self} = $self;	416	$CFClient::UI::ROOT->{check_size}{$self} = $self;
396	}	417	}
397		418
398	sub update {	419	sub update {
399	my ($self) = @_;	420	my ($self) = @_;
…		…
415	}	436	}
416		437
417	sub DESTROY {	438	sub DESTROY {
418	my ($self) = @_;	439	my ($self) = @_;
419		440
		441	delete $WIDGET{$self+0};
420	#$self->deactivate;	442	#$self->deactivate;
421	}	443	}
422		444
423	#############################################################################	445	#############################################################################
424		446
…		…
509	$self->{children} = [	531	$self->{children} = [
510	sort { $a->{z} <=> $b->{z} }	532	sort { $a->{z} <=> $b->{z} }
511	@{$self->{children}}, @widgets	533	@{$self->{children}}, @widgets
512	];	534	];
513		535
514	$self->check_size;	536	$self->check_size (1);
515	$self->update;	537	$self->update;
516	}	538	}
517		539
518	sub children {	540	sub children {
519	@{ $_[0]{children} }	541	@{ $_[0]{children} }
…		…
626	}	648	}
627		649
628	sub update {	650	sub update {
629	my ($self) = @_;	651	my ($self) = @_;
630		652
631	$ROOT->on_refresh ($self => sub { $self->render_child });	653	$ROOT->on_post_alloc ($self => sub { $self->render_child });
632	$self->SUPER::update;	654	$self->SUPER::update;
633	}	655	}
634		656
635	sub size_allocate {	657	sub size_allocate {
636	my ($self, $w, $h) = @_;	658	my ($self, $w, $h) = @_;
…		…
774	$self->add ($self->{slider});	796	$self->add ($self->{slider});
775		797
776	$self	798	$self
777	}	799	}
778		800
779	#TODO# update range on size_allocate depeneing on child	801	#TODO# update range on size_allocate depending on child
780	# update viewport offset on scroll	802	# update viewport offset on scroll
781		803
782	#############################################################################	804	#############################################################################
783		805
784	package CFClient::UI::Frame;	806	package CFClient::UI::Frame;
…		…
788	use CFClient::OpenGL;	810	use CFClient::OpenGL;
789		811
790	sub new {	812	sub new {
791	my $class = shift;	813	my $class = shift;
792		814
793	my $self = $class->SUPER::new (	815	$class->SUPER::new (
794	bg => [1, 1, 1, 1],	816	bg => undef,
795	border_bg => [1, 1, 1, 1],
796	border => 0.8,
797	@_	817	@_,
798	);	818	)
799
800	$self
801	}	819	}
802		820
803	sub _draw {	821	sub _draw {
804	my ($self) = @_;	822	my ($self) = @_;
805		823
806	my ($w, $h) = ($self->{w}, $self->{h});	824	if ($self->{bg}) {
		825	my ($w, $h) = @$self{qw(w h)};
807		826
808	glEnable GL_BLEND;	827	glEnable GL_BLEND;
809	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	828	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
810	glEnable GL_TEXTURE_2D;	829	glColor @{ $self->{bg} };
811	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
812		830
813	# glBegin GL_QUADS;	831	glBegin GL_QUADS;
814	# glColor 0, 0, 0, 0;
815	# glVertex 0 , 0;	832	glVertex 0 , 0;
816	# glVertex 0 , $h;	833	glVertex 0 , $h;
817	# glVertex $w, $h;	834	glVertex $w, $h;
818	# glVertex $w, 0;	835	glVertex $w, 0;
819	# glEnd;	836	glEnd;
820		837
821
822	$self->child->draw;
823	glDisable GL_BLEND;	838	glDisable GL_BLEND;
824	glDisable GL_TEXTURE_2D;	839	}
		840
		841	$self->SUPER::_draw;
825	}	842	}
826		843
827	#############################################################################	844	#############################################################################
828		845
829	package CFClient::UI::FancyFrame;	846	package CFClient::UI::FancyFrame;
…		…
843		860
844	my $self = $class->SUPER::new (	861	my $self = $class->SUPER::new (
845	bg => [1, 1, 1, 1],	862	bg => [1, 1, 1, 1],
846	border_bg => [1, 1, 1, 1],	863	border_bg => [1, 1, 1, 1],
847	border => 0.6,	864	border => 0.6,
		865	toplevel => 1,
848	can_events => 1,	866	can_events => 1,
849	@_	867	@_
850	);	868	);
851		869
852	$self->{title} &&= new CFClient::UI::Label	870	$self->{title} &&= new CFClient::UI::Label
…		…
945	my ($self) = @_;	963	my ($self) = @_;
946		964
947	my ($w, $h ) = ($self->{w}, $self->{h});	965	my ($w, $h ) = ($self->{w}, $self->{h});
948	my ($cw, $ch) = ($self->child->{w}, $self->child->{h});	966	my ($cw, $ch) = ($self->child->{w}, $self->child->{h});
949		967
950	glEnable GL_BLEND;
951	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
952	glEnable GL_TEXTURE_2D;	968	glEnable GL_TEXTURE_2D;
953	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	969	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
954		970
955	my $border = $self->border;	971	my $border = $self->border;
956		972
957	glColor @{ $self->{border_bg} };	973	glColor @{ $self->{border_bg} };
958	$tex[1]->draw_quad (0, 0, $w, $border);	974	$tex[1]->draw_quad_alpha (0, 0, $w, $border);
959	$tex[3]->draw_quad (0, $border, $border, $ch);	975	$tex[3]->draw_quad_alpha (0, $border, $border, $ch);
960	$tex[2]->draw_quad ($w - $border, $border, $border, $ch);	976	$tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
961	$tex[4]->draw_quad (0, $h - $border, $w, $border);	977	$tex[4]->draw_quad_alpha (0, $h - $border, $w, $border);
962		978
963	if (@{$self->{bg}} < 4 \|\| $self->{bg}[3]) {	979	if (@{$self->{bg}} < 4 \|\| $self->{bg}[3]) {
964	my $bg = $tex[0];	980	my $bg = $tex[0];
965		981
966	# TODO: repeat texture not scale	982	# TODO: repeat texture not scale
…		…
970	glColor @{ $self->{bg} };	986	glColor @{ $self->{bg} };
971		987
972	$bg->{s} = $rep_x;	988	$bg->{s} = $rep_x;
973	$bg->{t} = $rep_y;	989	$bg->{t} = $rep_y;
974	$bg->{wrap_mode} = 1;	990	$bg->{wrap_mode} = 1;
975	$bg->draw_quad ($border, $border, $cw, $ch);	991	$bg->draw_quad_alpha ($border, $border, $cw, $ch);
		992	}
976		993
977	glDisable GL_TEXTURE_2D;	994	glDisable GL_TEXTURE_2D;
978	glDisable GL_BLEND;
979	}
980		995
981	$self->{title}->draw if $self->{title};	996	$self->{title}->draw if $self->{title};
982		997
983	$self->child->draw;	998	$self->child->draw;
984	}	999	}
…		…
1486	my $sym = $ev->{sym};	1501	my $sym = $ev->{sym};
1487	my $uni = $ev->{unicode};	1502	my $uni = $ev->{unicode};
1488		1503
1489	my $text = $self->get_text;	1504	my $text = $self->get_text;
1490		1505
1491	if ($sym == 8) {	1506	if ($uni == 8) {
1492	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};	1507	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1493	} elsif ($sym == 127) {	1508	} elsif ($uni == 127) {
1494	substr $text, $self->{cursor}, 1, "";	1509	substr $text, $self->{cursor}, 1, "";
1495	} elsif ($sym == CFClient::SDLK_LEFT) {	1510	} elsif ($sym == CFClient::SDLK_LEFT) {
1496	--$self->{cursor} if $self->{cursor};	1511	--$self->{cursor} if $self->{cursor};
1497	} elsif ($sym == CFClient::SDLK_RIGHT) {	1512	} elsif ($sym == CFClient::SDLK_RIGHT) {
1498	++$self->{cursor} if $self->{cursor} < length $self->{text};	1513	++$self->{cursor} if $self->{cursor} < length $self->{text};
1499	} elsif ($sym == CFClient::SDLK_HOME) {	1514	} elsif ($sym == CFClient::SDLK_HOME) {
1500	$self->{cursor} = 0;	1515	$self->{cursor} = 0;
1501	} elsif ($sym == CFClient::SDLK_END) {	1516	} elsif ($sym == CFClient::SDLK_END) {
1502	$self->{cursor} = length $text;	1517	$self->{cursor} = length $text;
1503	} elsif ($sym == 27) {	1518	} elsif ($uni == 27) {
1504	$self->emit ('escape');	1519	$self->emit ('escape');
1505	} elsif ($uni) {	1520	} elsif ($uni) {
1506	substr $text, $self->{cursor}++, 0, chr $uni;	1521	substr $text, $self->{cursor}++, 0, chr $uni;
1507	}	1522	}
1508		1523
…		…
1672		1687
1673	if ($GRAB == $self) {	1688	if ($GRAB == $self) {
1674	$self->{fg} = $self->{active_fg};	1689	$self->{fg} = $self->{active_fg};
1675	}	1690	}
1676		1691
1677	glEnable GL_BLEND;
1678	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1679	glEnable GL_TEXTURE_2D;	1692	glEnable GL_TEXTURE_2D;
1680	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	1693	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1681	glColor 0, 0, 0, 1;	1694	glColor 0, 0, 0, 1;
1682		1695
1683	$tex[0]->draw_quad (0, 0, $self->{w}, $self->{h});	1696	$tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1684		1697
1685	glDisable GL_TEXTURE_2D;	1698	glDisable GL_TEXTURE_2D;
1686	glDisable GL_BLEND;
1687		1699
1688	$self->SUPER::_draw;	1700	$self->SUPER::_draw;
1689	}	1701	}
1690		1702
1691	#############################################################################	1703	#############################################################################
…		…
1738		1750
1739	my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2;	1751	my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2;
1740		1752
1741	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };	1753	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1742		1754
1743	glEnable GL_BLEND;	1755	my $tex = $self->{state} ? $tex[1] : $tex[0];
		1756
1744	glEnable GL_TEXTURE_2D;	1757	glEnable GL_TEXTURE_2D;
1745	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1746
1747	my $tex = $self->{state} ? $tex[1] : $tex[0];
1748
1749	$tex->draw_quad (0, 0, $s, $s);	1758	$tex->draw_quad_alpha (0, 0, $s, $s);
1750
1751	glDisable GL_TEXTURE_2D;	1759	glDisable GL_TEXTURE_2D;
1752	glDisable GL_BLEND;
1753	}	1760	}
1754		1761
1755	#############################################################################	1762	#############################################################################
1756		1763
1757	package CFClient::UI::Image;	1764	package CFClient::UI::Image;
…		…
1800	glTranslate 0, -$self->{w}, 0;	1807	glTranslate 0, -$self->{w}, 0;
1801		1808
1802	($w, $h) = ($h, $w);	1809	($w, $h) = ($h, $w);
1803	}	1810	}
1804		1811
1805	glEnable GL_BLEND;
1806	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1807	glEnable GL_TEXTURE_2D;	1812	glEnable GL_TEXTURE_2D;
1808	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	1813	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1809		1814
1810	$tex->draw_quad (0, 0, $w, $h);	1815	$tex->draw_quad_alpha (0, 0, $w, $h);
1811		1816
1812	glDisable GL_BLEND;
1813	glDisable GL_TEXTURE_2D;	1817	glDisable GL_TEXTURE_2D;
1814	}	1818	}
1815		1819
1816	#############################################################################	1820	#############################################################################
1817		1821
…		…
2109	$page \|\|= 2;	2113	$page \|\|= 2;
2110		2114
2111	my $knob_a = $inner_pad_px + ($value - $page * 0.5);	2115	my $knob_a = $inner_pad_px + ($value - $page * 0.5);
2112	my $knob_b = $inner_pad_px + ($value + $page * 0.5);	2116	my $knob_b = $inner_pad_px + ($value + $page * 0.5);
2113		2117
2114	glEnable GL_BLEND;
2115	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2116	glEnable GL_TEXTURE_2D;	2118	glEnable GL_TEXTURE_2D;
2117	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2119	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2118		2120
2119	# draw background	2121	# draw background
2120	$tex[1]->draw_quad (0, 0, $w, $h);	2122	$tex[1]->draw_quad_alpha (0, 0, $w, $h);
2121		2123
2122	# draw handle	2124	# draw handle
2123	$tex[0]->draw_quad ($knob_a, 0, $knob_b - $knob_a, $h);	2125	$tex[0]->draw_quad_alpha ($knob_a, 0, $knob_b - $knob_a, $h);
2124		2126
2125	glDisable GL_BLEND;
2126	glDisable GL_TEXTURE_2D;	2127	glDisable GL_TEXTURE_2D;
2127	}	2128	}
2128		2129
2129	#############################################################################	2130	#############################################################################
2130		2131
…		…
2141	fontsize => 1,	2142	fontsize => 1,
2142	can_events => 0,	2143	can_events => 0,
2143	#font => default_font	2144	#font => default_font
2144	@_,	2145	@_,
2145		2146
2146	layout => (new CFClient::Layout),	2147	layout => (new CFClient::Layout 1),
2147	par => [],	2148	par => [],
2148	height => 0,	2149	height => 0,
2149	children => [	2150	children => [
2150	(new CFClient::UI::Empty expand => 1),	2151	(new CFClient::UI::Empty expand => 1),
2151	(new CFClient::UI::Slider vertical => 1),	2152	(new CFClient::UI::Slider vertical => 1),
…		…
2169		2170
2170	my $layout = $self->{layout};	2171	my $layout = $self->{layout};
2171		2172
2172	$layout->set_height ($self->{fontsize} * $::FONTSIZE);	2173	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
2173	$layout->set_width ($self->{children}[0]{w});	2174	$layout->set_width ($self->{children}[0]{w});
2174	$layout->set_text ($text);	2175	$layout->set_markup ($text);
2175		2176
2176	($layout->size)[1]	2177	($layout->size)[1]
2177	}	2178	}
2178		2179
2179	sub reflow {	2180	sub reflow {
…		…
2217		2218
2218	return unless $self->{h} > 0;	2219	return unless $self->{h} > 0;
2219		2220
2220	delete $self->{texture};	2221	delete $self->{texture};
2221		2222
2222	$ROOT->on_refresh ($self, sub {	2223	$ROOT->on_post_alloc ($self, sub {
2223	if (delete $self->{need_reflow}) {	2224	if (delete $self->{need_reflow}) {
2224	my $height = 0;	2225	my $height = 0;
2225		2226
2226	$height += $_->[0] = $self->text_height ($_->[2])	2227	$height += $_->[0] = $self->text_height ($_->[2])
2227	for @{$self->{par}};	2228	for @{$self->{par}};
…		…
2235		2236
2236	$self->{texture} \|\|= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub {	2237	$self->{texture} \|\|= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub {
2237	glClearColor 0, 0, 0, 0;	2238	glClearColor 0, 0, 0, 0;
2238	glClear GL_COLOR_BUFFER_BIT;	2239	glClear GL_COLOR_BUFFER_BIT;
2239		2240
2240	glEnable GL_BLEND;
2241	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2242	glEnable GL_TEXTURE_2D;	2241	glEnable GL_TEXTURE_2D;
2243	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2242	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2244		2243
2245	my $top = int $self->{children}[1]{range}[0];	2244	my $top = int $self->{children}[1]{range}[0];
2246		2245
…		…
2255		2254
2256	for my $par (@{$self->{par}}) {	2255	for my $par (@{$self->{par}}) {
2257	my $h = $par->[0];	2256	my $h = $par->[0];
2258		2257
2259	if ($y0 < $y + $h && $y < $y1) {	2258	if ($y0 < $y + $h && $y < $y1) {
		2259	$layout->set_foreground (@{ $par->[1] });
2260	$layout->set_text ($par->[2]);	2260	$layout->set_markup ($par->[2]);
2261		2261
2262	glColor @{ $par->[1] };
2263	my ($W, $H) = $layout->size;	2262	my ($W, $H) = $layout->size;
2264	CFClient::Texture->new_from_layout ($layout)->draw_quad (0, $y - $y0);	2263	CFClient::Texture->new_from_layout ($layout)->draw_quad_alpha_premultiplied (0, $y - $y0);
2265	}	2264	}
2266		2265
2267	$y += $h;	2266	$y += $h;
2268	}	2267	}
2269		2268
2270	glDisable GL_TEXTURE_2D;	2269	glDisable GL_TEXTURE_2D;
2271	glDisable GL_BLEND;
2272	};	2270	};
2273	});	2271	});
2274	}	2272	}
2275		2273
2276	sub _draw {	2274	sub _draw {
2277	my ($self) = @_;	2275	my ($self) = @_;
2278		2276
2279	glEnable GL_BLEND;
2280	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2281	glEnable GL_TEXTURE_2D;	2277	glEnable GL_TEXTURE_2D;
2282	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2278	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2283	glColor 1, 1, 1, 1;	2279	glColor 1, 1, 1, 1;
2284	$self->{texture}->draw_quad (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});	2280	$self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2285	glDisable GL_TEXTURE_2D;	2281	glDisable GL_TEXTURE_2D;
2286	glDisable GL_BLEND;
2287		2282
2288	$self->{children}[1]->draw;	2283	$self->{children}[1]->draw;
2289		2284
2290	}	2285	}
2291		2286
…		…
2385	@_,	2380	@_,
2386	can_events => 0,	2381	can_events => 0,
2387	)	2382	)
2388	}	2383	}
2389		2384
2390	sub set_markup {	2385	sub set_tooltip_from {
2391	my ($self, $text) = @_;	2386	my ($self, $widget) = @_;
2392		2387
2393	$self->{label} \|\|= new CFClient::UI::Label fontsize => 0.8, fg => [0, 0, 0];	2388	$self->add (new CFClient::UI::Label
2394	$self->{label}->set_markup ($text);	2389	markup => $widget->{tooltip},
2395	$self->add ($self->{label});	2390	max_w => ($widget->{tooltip_width} \|\| 0.25) * $::WIDTH,
		2391	fontsize => 0.8,
		2392	fg => [0, 0, 0, 1],
		2393	font => ($widget->{tooltip_font} \|\| $::FONT_PROP),
		2394	);
2396	}	2395	}
2397		2396
2398	sub size_request {	2397	sub size_request {
2399	my ($self) = @_;	2398	my ($self) = @_;
2400
2401	$self->child->set_max_size ($::WIDTH * 0.3);
2402		2399
2403	my ($w, $h) = @{$self->child}{qw(req_w req_h)};	2400	my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2404		2401
2405	($w + 4, $h + 4)	2402	($w + 4, $h + 4)
2406	}	2403	}
…		…
2412	}	2409	}
2413		2410
2414	sub _draw {	2411	sub _draw {
2415	my ($self) = @_;	2412	my ($self) = @_;
2416		2413
2417	glPushMatrix;
2418	glTranslate 0.375, 0.375;	2414	glTranslate 0.375, 0.375;
2419		2415
2420	my ($w, $h) = @$self{qw(w h)};	2416	my ($w, $h) = @$self{qw(w h)};
2421		2417
2422	glColor 1, 0.8, 0.4;	2418	glColor 1, 0.8, 0.4;
…		…
2433	glVertex 0 , $h;	2429	glVertex 0 , $h;
2434	glVertex $w, $h;	2430	glVertex $w, $h;
2435	glVertex $w, 0;	2431	glVertex $w, 0;
2436	glEnd;	2432	glEnd;
2437		2433
2438	glPopMatrix;	2434	glTranslate 2 - 0.375, 2 - 0.375;
2439
2440	glTranslate 2, 2;
2441	$self->SUPER::_draw;	2435	$self->SUPER::_draw;
2442	}	2436	}
2443		2437
2444	#############################################################################	2438	#############################################################################
2445		2439
…		…
2468	return unless $::CONN;#d# manage and cache textures differently	2462	return unless $::CONN;#d# manage and cache textures differently
2469	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]];	2463	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]];
2470		2464
2471	# TODO animation	2465	# TODO animation
2472	if ($tex) {	2466	if ($tex) {
2473	glEnable GL_BLEND;
2474	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2475	glEnable GL_TEXTURE_2D;	2467	glEnable GL_TEXTURE_2D;
2476	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2468	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2477	glColor 1, 1, 1, 1;	2469	glColor 1, 1, 1, 1;
2478	$tex->draw_quad (0, 0, $self->{w}, $self->{h});	2470	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2479	glDisable GL_TEXTURE_2D;	2471	glDisable GL_TEXTURE_2D;
2480	glDisable GL_BLEND;
2481	}	2472	}
2482	}	2473	}
2483		2474
2484	#############################################################################	2475	#############################################################################
2485		2476
…		…
2568	my ($self, $items) = @_;	2559	my ($self, $items) = @_;
2569		2560
2570	$self->{scrolled}->clear;	2561	$self->{scrolled}->clear;
2571	return unless $items;	2562	return unless $items;
2572		2563
2573	my @items = sort { $a->{type} <=> $b->{type} } @$items;	2564	my @items = sort {
		2565	($a->{type} <=> $b->{type})
		2566	or ($a->{name} cmp $b->{name})
		2567	} @$items;
2574		2568
2575	$self->{real_items} = \@items;	2569	$self->{real_items} = \@items;
2576		2570
2577	for my $item (@items) {	2571	for my $item (@items) {
2578	my $desc = $item->{nrof} < 2	2572	my $desc = $item->{nrof} < 2
2579	? $item->{name}	2573	? $item->{name}
2580	: "$item->{nrof} $item->{name_pl}";	2574	: "$item->{nrof} $item->{name_pl}";
2581		2575
2582	$self->{scrolled}->add ($item->{widget} \|\|= new CFClient::UI::InventoryItem item => $item);	2576	$item = $item->{widget} \|\|= new CFClient::UI::InventoryItem item => $item;
2583	}	2577	}
		2578
		2579	$self->{scrolled}->add (@items);
2584		2580
2585	# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];	2581	# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2586	}	2582	}
2587		2583
2588	sub size_request {	2584	sub size_request {
…		…
2675	while (my ($k, $v) = each %{ $self->{item} }) {	2671	while (my ($k, $v) = each %{ $self->{item} }) {
2676	delete $self->{item}{$k} if $v->{timeout} < $NOW;	2672	delete $self->{item}{$k} if $v->{timeout} < $NOW;
2677	}	2673	}
2678		2674
2679	my @widgets;	2675	my @widgets;
2680	my @items = sort { $a->{time} <=> $b->{time} } values %{ $self->{item} };	2676
		2677	my @items = sort {
		2678	$a->{pri} <=> $b->{pri}
		2679	or $b->{id} <=> $a->{id}
		2680	} values %{ $self->{item} };
		2681
2681	my $count = 10 + 1;	2682	my $count = 10 + 1;
2682	for my $item (@items) {	2683	for my $item (@items) {
2683	last unless --$count;	2684	last unless --$count;
2684		2685
2685	push @widgets, $item->{label} \|\|= do {	2686	push @widgets, $item->{label} \|\|= do {
2686	# TODO: doesn't handle markup well (read as: at all)	2687	# TODO: doesn't handle markup well (read as: at all)
2687	my $short = delete $item->{text};	2688	my $short = $item->{count} > 1
		2689	? "<b>$item->{count} ×</b> $item->{text}"
		2690	: $item->{text};
		2691
2688	for ($short) {	2692	for ($short) {
2689	s/^\s+//;	2693	s/^\s+//;
2690	s/\012.*//s;	2694	s/\s+/ /g;
2691	my $len = int 30 / $item->{fontsize};	2695	my $len = int 40 / $item->{fontsize};
2692	substr $_, $len, length, "…" if $len < length;	2696	substr $_, $len, length, "…" if $len < length;
2693	}	2697	}
2694		2698
2695	new CFClient::UI::Label	2699	new CFClient::UI::Label
2696	markup => $short,	2700	markup => $short,
2697	tooltip => delete $item->{tooltip},	2701	tooltip => $item->{tooltip},
		2702	tooltip_font => $::FONT_PROP,
		2703	tooltip_width => 0.67,
2698	fontsize => delete $item->{fontsize},	2704	fontsize => $item->{fontsize},
2699	color => delete $item->{color},	2705	fg => $item->{fg},
2700	can_events => 1,	2706	can_events => 1,
2701	can_hover => 1,	2707	can_hover => 1
2702	};	2708	};
2703	}	2709	}
2704		2710
2705	$self->clear;	2711	$self->clear;
2706	$self->SUPER::add (@widgets);	2712	$self->SUPER::add (reverse @widgets);
2707	}	2713	}
2708		2714
2709	sub add {	2715	sub add {
2710	my ($self, $text, %arg) = @_;	2716	my ($self, $text, %arg) = @_;
2711		2717
2712	my $item = {	2718	$text =~ s/^\s+//;
2713	time => time,	2719	$text =~ s/\s+$//;
		2720
		2721	my $timeout = time + ((delete $arg{timeout}) \|\| 60);
		2722
		2723	my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
		2724
		2725	if (my $item = $self->{item}{$group}) {
		2726	if ($item->{text} eq $text) {
		2727	$item->{count}++;
		2728	} else {
		2729	$item->{count} = 1;
		2730	$item->{text} = $item->{tooltip} = $text;
		2731	}
		2732	$item->{id} = ++$self->{id};
		2733	$item->{timeout} = $timeout;
		2734	delete $item->{label};
		2735	} else {
		2736	$self->{item}{$group} = {
		2737	id => ++$self->{id},
2714	text => $text,	2738	text => $text,
2715	timeout => 60,	2739	timeout => $timeout,
2716	tooltip => $text,	2740	tooltip => $text,
2717	fontsize => 0.8,	2741	fontsize => 0.8,
2718	color => [0.8, 0.8, 0.8, 0.8],	2742	fg => [0.8, 0.8, 0.8, 0.8],
		2743	pri => 0,
		2744	count => 1,
2719	%arg,	2745	%arg,
		2746	};
2720	};	2747	}
2721
2722	$item->{timeout} += time;
2723	$item->{group} \|\|= $item+0;
2724
2725	$item = $self->{item}{$item->{group}} \|\|= $item;
2726		2748
2727	$self->reorder;	2749	$self->reorder;
2728	}	2750	}
2729		2751
2730	#############################################################################	2752	#############################################################################
…		…
2764	}	2786	}
2765		2787
2766	sub size_allocate {	2788	sub size_allocate {
2767	my ($self, $w, $h) = @_;	2789	my ($self, $w, $h) = @_;
2768		2790
2769	my $old_w = $self->{old_w};	2791	my $old_w = $self->{old_w}; $self->{old_w} = $w;
2770	my $old_h = $self->{old_h};	2792	my $old_h = $self->{old_h}; $self->{old_h} = $h;
2771		2793
2772	if ($old_w && $old_h) {	2794	CFClient::UI::rescale_widgets $w / $old_w, $h / $old_h
2773	for my $child ($self->children) {	2795	if $old_w && $old_h && ($old_w != $w \|\| $old_h != $h);
2774	$child->{x} = int 0.5 + $child->{x} * $w / $old_w;
2775	$child->{w} = int 0.5 + $child->{w} * $w / $old_w;
2776	$child->{req_w} = int 0.5 + $child->{req_w} * $w / $old_w if exists $child->{req_w};
2777	$child->{user_w} = int 0.5 + $child->{user_w} * $w / $old_w if exists $child->{user_w};
2778	$child->{y} = int 0.5 + $child->{y} * $h / $old_h;
2779	$child->{h} = int 0.5 + $child->{h} * $h / $old_h;
2780	$child->{req_h} = int 0.5 + $child->{req_h} * $h / $old_h if exists $child->{req_h};
2781	$child->{user_h} = int 0.5 + $child->{user_h} * $h / $old_h if exists $child->{user_h};
2782	}
2783	}
2784		2796
2785	for my $child ($self->children) {	2797	for my $child ($self->children) {
2786	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};	2798	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2787		2799
		2800	$X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1
		2801	if exists $child->{req_x};
		2802
		2803	$Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1
		2804	if exists $child->{req_y};
		2805
2788	$X = List::Util::max 0, List::Util::min $w - $W, $X;	2806	$X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
2789	$Y = List::Util::max 0, List::Util::min $h - $H, $Y;	2807	$Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
		2808
2790	$child->configure ($X, $Y, $W, $H);	2809	$child->configure ($X, $Y, $W, $H);
2791	}	2810	}
2792
2793	$self->{old_w} = $w;
2794	$self->{old_h} = $h;
2795	}	2811	}
2796		2812
2797	sub coord2local {	2813	sub coord2local {
2798	my ($self, $x, $y) = @_;	2814	my ($self, $x, $y) = @_;
2799		2815
…		…
2812	$self->check_size;	2828	$self->check_size;
2813	$::WANT_REFRESH++;	2829	$::WANT_REFRESH++;
2814	}	2830	}
2815		2831
2816	sub add {	2832	sub add {
2817	my ($self, $child) = @_;	2833	my ($self, @children) = @_;
2818		2834
		2835	for my $child (@children) {
		2836	$child->{toplevel} = 1;
		2837
2819	# integerise window positions	2838	# integerise window positions
2820	$child->{x} = int $child->{x};	2839	$child->{x} = int $child->{x};
2821	$child->{y} = int $child->{y};	2840	$child->{y} = int $child->{y};
		2841	}
2822		2842
2823	$self->SUPER::add ($child);	2843	$self->SUPER::add (@children);
2824	}	2844	}
2825		2845
2826	sub on_refresh {	2846	sub on_refresh {
2827	my ($self, $id, $cb) = @_;	2847	my ($self, $id, $cb) = @_;
2828		2848
2829	$self->{refresh_hook}{$id} = $cb;	2849	$self->{refresh_hook}{$id} = $cb;
2830	}	2850	}
2831		2851
		2852	sub on_post_alloc {
		2853	my ($self, $id, $cb) = @_;
		2854
		2855	$self->{post_alloc_hook}{$id} = $cb;
		2856	}
		2857
2832	sub draw {	2858	sub draw {
2833	my ($self) = @_;	2859	my ($self) = @_;
		2860
		2861	while ($self->{refresh_hook}) {
		2862	$_->()
		2863	for values %{delete $self->{refresh_hook}};
		2864	}
2834		2865
2835	if ($self->{check_size}) {	2866	if ($self->{check_size}) {
2836	my @queue = ([], []);	2867	my @queue = ([], []);
2837		2868
2838	for (;;) {	2869	for (;;) {
…		…
2846		2877
2847	my ($w, $h) = $widget->{user_w} && $widget->{user_h}	2878	my ($w, $h) = $widget->{user_w} && $widget->{user_h}
2848	? @$widget{qw(user_w user_h)}	2879	? @$widget{qw(user_w user_h)}
2849	: $widget->size_request;	2880	: $widget->size_request;
2850		2881
		2882	if (delete $widget->{force_alloc}
2851	if ($w != $widget->{req_w} \|\| $h != $widget->{req_h}) {	2883	or $w != $widget->{req_w} or $h != $widget->{req_h}) {
2852	Carp::confess "$widget: size_request is negative" if $w < 0 \|\| $h < 0;#d#	2884	Carp::confess "$widget: size_request is negative" if $w < 0 \|\| $h < 0;#d#
2853		2885
2854	$widget->{req_w} = $w;	2886	$widget->{req_w} = $w;
2855	$widget->{req_h} = $h;	2887	$widget->{req_h} = $h;
2856		2888
2857	$self->{size_alloc}{$widget} = [$widget, $widget->{w}, $widget->{h}];	2889	$self->{size_alloc}{$widget} = [$widget, $widget->{w} \|\| $w, $widget->{h} \|\| $h];
2858		2890
2859	$widget->{parent}->check_size	2891	$widget->{parent}->check_size
2860	if $widget->{parent};	2892	if $widget->{parent};
2861	}	2893	}
2862	}	2894	}
…		…
2874	$widget->size_allocate ($w, $h);	2906	$widget->size_allocate ($w, $h);
2875	$widget->emit (size_allocate => $w, $h);	2907	$widget->emit (size_allocate => $w, $h);
2876	}	2908	}
2877	}	2909	}
2878		2910
2879	while ($self->{refresh_hook}) {	2911	while ($self->{post_alloc_hook}) {
2880	$_->()	2912	$_->()
2881	for values %{delete $self->{refresh_hook}};	2913	for values %{delete $self->{post_alloc_hook}};
2882	}	2914	}
2883		2915
2884	glViewport 0, 0, $::WIDTH, $::HEIGHT;	2916	glViewport 0, 0, $::WIDTH, $::HEIGHT;
2885	glClearColor +($::CFG->{fow_intensity}) x 3, 1;	2917	glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2886	glClear GL_COLOR_BUFFER_BIT;	2918	glClear GL_COLOR_BUFFER_BIT;

Diff Legend

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

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents): Revision 1.194 by root, Thu May 11 23:41:47 2006 UTC vs. Revision 1.205 by root, Mon May 15 00:15:08 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.194 by root, Thu May 11 23:41:47 2006 UTC vs.
Revision 1.205 by root, Mon May 15 00:15:08 2006 UTC