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

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.273 by root, Sat Jun 3 02:32:35 2006 UTC vs.
Revision 1.282 by root, Mon Jun 5 02:25:10 2006 UTC

…		…
381	}	381	}
382		382
383	sub set_max_size {	383	sub set_max_size {
384	my ($self, $w, $h) = @_;	384	my ($self, $w, $h) = @_;
385		385
386	delete $self->{max_w}; $self->{max_w} = $w if $w;	386	$self->{max_w} = int $w if defined $w;
387	delete $self->{max_h}; $self->{max_h} = $h if $h;	387	$self->{max_h} = int $h if defined $h;
		388
		389	$self->realloc;
388	}	390	}
389		391
390	sub set_tooltip {	392	sub set_tooltip {
391	my ($self, $tooltip) = @_;	393	my ($self, $tooltip) = @_;
392		394
…		…
548	return if ($draw_x + $self->{w} < 0) \|\| ($draw_x >= $draw_w)	550	return if ($draw_x + $self->{w} < 0) \|\| ($draw_x >= $draw_w)
549	\|\| ($draw_y + $self->{h} < 0) \|\| ($draw_y >= $draw_h);	551	\|\| ($draw_y + $self->{h} < 0) \|\| ($draw_y >= $draw_h);
550		552
551	glPushMatrix;	553	glPushMatrix;
552	glTranslate $self->{x}, $self->{y}, 0;	554	glTranslate $self->{x}, $self->{y}, 0;
553	$self->_draw;
554	glPopMatrix;
555		555
556	if ($self == $HOVER && $self->{can_hover}) {	556	if ($self == $HOVER && $self->{can_hover}) {
557	my ($x, $y) = @$self{qw(x y)};
558
559	glColor 1, 0.8, 0.5, 0.2;	557	glColor 10.2, 0.80.2, 0.5*0.2, 0.2;
560	glEnable GL_BLEND;	558	glEnable GL_BLEND;
561	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	559	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
562	glBegin GL_QUADS;	560	glBegin GL_QUADS;
563	glVertex $x , $y;	561	glVertex 0 , 0;
564	glVertex $x + $self->{w}, $y;	562	glVertex $self->{w}, 0;
565	glVertex $x + $self->{w}, $y + $self->{h};	563	glVertex $self->{w}, $self->{h};
566	glVertex $x , $y + $self->{h};	564	glVertex 0 , $self->{h};
567	glEnd;	565	glEnd;
568	glDisable GL_BLEND;	566	glDisable GL_BLEND;
569	}	567	}
570		568
571	if ($ENV{CFPLUS_DEBUG} & 1) {	569	if ($ENV{CFPLUS_DEBUG} & 1) {
572	glPushMatrix;	570	glPushMatrix;
573	glColor 1, 1, 0, 1;	571	glColor 1, 1, 0, 1;
574	glTranslate $self->{x} + 0.375, $self->{y} + 0.375;	572	glTranslate 0.375, 0.375;
575	glBegin GL_LINE_LOOP;	573	glBegin GL_LINE_LOOP;
576	glVertex 0 , 0;	574	glVertex 0 , 0;
577	glVertex $self->{w} - 1, 0;	575	glVertex $self->{w} - 1, 0;
578	glVertex $self->{w} - 1, $self->{h} - 1;	576	glVertex $self->{w} - 1, $self->{h} - 1;
579	glVertex 0 , $self->{h} - 1;	577	glVertex 0 , $self->{h} - 1;
580	glEnd;	578	glEnd;
581	glPopMatrix;	579	glPopMatrix;
582	#CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;	580	#CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
583	}	581	}
		582
		583	$self->_draw;
		584	glPopMatrix;
584	}	585	}
585		586
586	sub _draw {	587	sub _draw {
587	my ($self) = @_;	588	my ($self) = @_;
588		589
…		…
626		627
627	if ($color && (@$color < 4 \|\| $color->[3])) {	628	if ($color && (@$color < 4 \|\| $color->[3])) {
628	my ($w, $h) = @$self{qw(w h)};	629	my ($w, $h) = @$self{qw(w h)};
629		630
630	glEnable GL_BLEND;	631	glEnable GL_BLEND;
631	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	632	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
632	glColor @$color;	633	glColor_premultiply @$color;
633		634
634	glBegin GL_QUADS;	635	glBegin GL_QUADS;
635	glVertex 0 , 0;	636	glVertex 0 , 0;
636	glVertex 0 , $h;	637	glVertex 0 , $h;
637	glVertex $w, $h;	638	glVertex $w, $h;
…		…
794	$self->{children}[0]->configure (0, 0, $w, $h);	795	$self->{children}[0]->configure (0, 0, $w, $h);
795	}	796	}
796		797
797	#############################################################################	798	#############################################################################
798		799
		800	# back-buffered drawing area
		801
799	package CFClient::UI::Window;	802	package CFClient::UI::Window;
800		803
801	our @ISA = CFClient::UI::Bin::;	804	our @ISA = CFClient::UI::Bin::;
802		805
803	use CFClient::OpenGL;	806	use CFClient::OpenGL;
…		…
854	my $tex = $self->{texture}	857	my $tex = $self->{texture}
855	or return;	858	or return;
856		859
857	glEnable GL_TEXTURE_2D;	860	glEnable GL_TEXTURE_2D;
858	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	861	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
859	glColor 1, 1, 1, 1;	862	glColor 0, 0, 0, 1;
860		863
861	$tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);	864	$tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
862		865
863	glDisable GL_TEXTURE_2D;	866	glDisable GL_TEXTURE_2D;
864	}	867	}
…		…
1033		1036
1034	if ($self->{bg}) {	1037	if ($self->{bg}) {
1035	my ($w, $h) = @$self{qw(w h)};	1038	my ($w, $h) = @$self{qw(w h)};
1036		1039
1037	glEnable GL_BLEND;	1040	glEnable GL_BLEND;
1038	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	1041	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1039	glColor @{ $self->{bg} };	1042	glColor_premultiply @{ $self->{bg} };
1040		1043
1041	glBegin GL_QUADS;	1044	glBegin GL_QUADS;
1042	glVertex 0 , 0;	1045	glVertex 0 , 0;
1043	glVertex 0 , $h;	1046	glVertex 0 , $h;
1044	glVertex $w, $h;	1047	glVertex $w, $h;
…		…
1158	my $dy = $ev->{y} - $oy;	1161	my $dy = $ev->{y} - $oy;
1159		1162
1160	$self->{force_w} = $bw + $dx * ($mx ? -1 : 1);	1163	$self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
1161	$self->{force_h} = $bh + $dy * ($my ? -1 : 1);	1164	$self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1162		1165
		1166	$self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1163	$self->realloc;	1167	$self->realloc;
1164	$self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1165	};	1168	};
1166		1169
1167	} elsif ($lr ^ $td) {	1170	} elsif ($lr ^ $td) {
1168	my ($ox, $oy) = ($ev->{x}, $ev->{y});	1171	my ($ox, $oy) = ($ev->{x}, $ev->{y});
1169	my ($bx, $by) = ($self->{x}, $self->{y});	1172	my ($bx, $by) = ($self->{x}, $self->{y});
…		…
1172	my ($ev, $x, $y) = @_;	1175	my ($ev, $x, $y) = @_;
1173		1176
1174	($x, $y) = ($ev->{x}, $ev->{y});	1177	($x, $y) = ($ev->{x}, $ev->{y});
1175		1178
1176	$self->move_abs ($bx + $x - $ox, $by + $y - $oy);	1179	$self->move_abs ($bx + $x - $ox, $by + $y - $oy);
		1180	# HACK: the next line is required to enforce placement
		1181	$self->{parent}->size_allocate ($self->{parent}{w}, $self->{parent}{h});
1177	};	1182	};
1178	} else {	1183	} else {
1179	return 0;	1184	return 0;
1180	}	1185	}
1181		1186
…		…
1533		1538
1534	delete $self->{texture};	1539	delete $self->{texture};
1535	$self->SUPER::update;	1540	$self->SUPER::update;
1536	}	1541	}
1537		1542
		1543	sub realloc {
		1544	my ($self) = @_;
		1545
		1546	delete $self->{ox};
		1547	delete $self->{req_h};
		1548	$self->SUPER::realloc;
		1549	}
		1550
1538	sub set_text {	1551	sub set_text {
1539	my ($self, $text) = @_;	1552	my ($self, $text) = @_;
1540		1553
1541	return if $self->{text} eq "T$text";	1554	return if $self->{text} eq "T$text";
1542	$self->{text} = "T$text";	1555	$self->{text} = "T$text";
…		…
1564	}	1577	}
1565		1578
1566	sub size_request {	1579	sub size_request {
1567	my ($self) = @_;	1580	my ($self) = @_;
1568		1581
		1582	if (exists $self->{req_h}) {
		1583	@$self{qw(req_w req_h)}
		1584	} else {
1569	$self->{layout}->set_font ($self->{font}) if $self->{font};	1585	$self->{layout}->set_font ($self->{font}) if $self->{font};
1570	$self->{layout}->set_width ($self->{max_w} \|\| -1);	1586	$self->{layout}->set_width ($self->{max_w} \|\| -1);
1571	$self->{layout}->set_ellipsise ($self->{ellipsise});	1587	$self->{layout}->set_ellipsise ($self->{ellipsise});
1572	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});	1588	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1573	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	1589	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1574		1590
1575	my ($w, $h) = $self->{layout}->size;	1591	my ($w, $h) = $self->{layout}->size;
1576		1592
1577	if (exists $self->{template}) {	1593	if (exists $self->{template}) {
1578	$self->{template}->set_font ($self->{font}) if $self->{font};	1594	$self->{template}->set_font ($self->{font}) if $self->{font};
1579	$self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);	1595	$self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1580		1596
1581	my ($w2, $h2) = $self->{template}->size;	1597	my ($w2, $h2) = $self->{template}->size;
1582		1598
1583	$w = List::Util::max $w, $w2;	1599	$w = List::Util::max $w, $w2;
1584	$h = List::Util::max $h, $h2;	1600	$h = List::Util::max $h, $h2;
1585	}	1601	}
1586		1602
1587	($w, $h)	1603	($w, $h)
		1604	}
1588	}	1605	}
1589		1606
1590	sub size_allocate {	1607	sub size_allocate {
1591	my ($self, $w, $h) = @_;	1608	my ($self, $w, $h) = @_;
1592		1609
…		…
1632	};	1649	};
1633		1650
1634	glEnable GL_TEXTURE_2D;	1651	glEnable GL_TEXTURE_2D;
1635	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	1652	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1636		1653
		1654	glColor_premultiply @{$self->{fg}}
1637	if ($tex->{format} == GL_ALPHA) {	1655	if $tex->{format} == GL_ALPHA;
1638	glColor @{$self->{fg}};	1656
1639	$tex->draw_quad_alpha ($self->{ox}, $self->{oy});
1640	} else {
1641	$tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});	1657	$tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1642	}
1643		1658
1644	glDisable GL_TEXTURE_2D;	1659	glDisable GL_TEXTURE_2D;
1645	}	1660	}
1646		1661
1647	#############################################################################	1662	#############################################################################
…		…
1674		1689
1675	delete $self->{cur_h};	1690	delete $self->{cur_h};
1676		1691
1677	return if $self->{text} eq $text;	1692	return if $self->{text} eq $text;
1678		1693
1679	delete $self->{texture};
1680
1681	$self->{last_activity} = $::NOW;	1694	$self->{last_activity} = $::NOW;
1682	$self->{text} = $text;	1695	$self->{text} = $text;
1683		1696
1684	$text =~ s/./*/g if $self->{hidden};	1697	$text =~ s/./*/g if $self->{hidden};
1685	$self->{layout}->set_text ("$text ");	1698	$self->{layout}->set_text ("$text ");
1686		1699
1687	$self->_emit (changed => $self->{text});	1700	$self->_emit (changed => $self->{text});
		1701	$self->update;
1688	}	1702	}
1689		1703
1690	sub set_text {	1704	sub set_text {
1691	my ($self, $text) = @_;	1705	my ($self, $text) = @_;
1692		1706
…		…
1781	my ($self) = @_;	1795	my ($self) = @_;
1782		1796
1783	local $self->{fg} = $self->{fg};	1797	local $self->{fg} = $self->{fg};
1784		1798
1785	if ($FOCUS == $self) {	1799	if ($FOCUS == $self) {
1786	glColor @{$self->{active_bg}};	1800	glColor_premultiply @{$self->{active_bg}};
1787	$self->{fg} = $self->{active_fg};	1801	$self->{fg} = $self->{active_fg};
1788	} else {	1802	} else {
1789	glColor @{$self->{bg}};	1803	glColor_premultiply @{$self->{bg}};
1790	}	1804	}
1791		1805
1792	glEnable GL_BLEND;	1806	glEnable GL_BLEND;
1793	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	1807	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1794	glBegin GL_QUADS;	1808	glBegin GL_QUADS;
1795	glVertex 0 , 0;	1809	glVertex 0 , 0;
1796	glVertex 0 , $self->{h};	1810	glVertex 0 , $self->{h};
1797	glVertex $self->{w}, $self->{h};	1811	glVertex $self->{w}, $self->{h};
1798	glVertex $self->{w}, 0;	1812	glVertex $self->{w}, 0;
…		…
1908	}	1922	}
1909		1923
1910	sub _draw {	1924	sub _draw {
1911	my ($self) = @_;	1925	my ($self) = @_;
1912		1926
1913	local $self->{fg} = $self->{fg};	1927	local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1914
1915	if ($GRAB == $self) {
1916	$self->{fg} = $self->{active_fg};
1917	}
1918		1928
1919	glEnable GL_TEXTURE_2D;	1929	glEnable GL_TEXTURE_2D;
1920	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	1930	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1921	glColor 0, 0, 0, 1;	1931	glColor 0, 0, 0, 1;
1922		1932
…		…
2147		2157
2148	my $h1 = $self->{h} * (1 - $ycut1);	2158	my $h1 = $self->{h} * (1 - $ycut1);
2149	my $h2 = $self->{h} * (1 - $ycut2);	2159	my $h2 = $self->{h} * (1 - $ycut2);
2150		2160
2151	glEnable GL_BLEND;	2161	glEnable GL_BLEND;
2152	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	2162	glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
		2163	GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2153	glEnable GL_TEXTURE_2D;	2164	glEnable GL_TEXTURE_2D;
2154	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2165	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2155		2166
2156	glBindTexture GL_TEXTURE_2D, $t1->{name};	2167	glBindTexture GL_TEXTURE_2D, $t1->{name};
2157	glBegin GL_QUADS;	2168	glBegin GL_QUADS;
…		…
2342	}	2353	}
2343		2354
2344	sub update {	2355	sub update {
2345	my ($self) = @_;	2356	my ($self) = @_;
2346		2357
2347	$CFClient::UI::ROOT->on_post_alloc ($self => sub {	2358	delete $self->{knob_w};
		2359	$self->SUPER::update;
		2360	}
		2361
		2362	sub _draw {
		2363	my ($self) = @_;
		2364
		2365	unless ($self->{knob_w}) {
2348	$self->set_value ($self->{range}[0]);	2366	$self->set_value ($self->{range}[0]);
2349		2367
2350	my ($value, $lo, $hi, $page) = @{$self->{range}};	2368	my ($value, $lo, $hi, $page) = @{$self->{range}};
2351	my $range = ($hi - $page - $lo) \|\| 1e-100;	2369	my $range = ($hi - $page - $lo) \|\| 1e-100;
2352		2370
…		…
2358	$value = ($value - $lo) / $range;	2376	$value = ($value - $lo) / $range;
2359	$value = $value * $self->{scale} + $self->{offset};	2377	$value = $value * $self->{scale} + $self->{offset};
2360		2378
2361	$self->{knob_x} = $value - $knob_w * 0.5;	2379	$self->{knob_x} = $value - $knob_w * 0.5;
2362	$self->{knob_w} = $knob_w;	2380	$self->{knob_w} = $knob_w;
2363	});	2381	}
2364
2365	$self->SUPER::update;
2366	}
2367
2368	sub _draw {
2369	my ($self) = @_;
2370		2382
2371	$self->SUPER::_draw ();	2383	$self->SUPER::_draw ();
2372		2384
2373	glScale $self->{w}, $self->{h};	2385	glScale $self->{w}, $self->{h};
2374		2386
…		…
2568		2580
2569	delete $self->{texture};	2581	delete $self->{texture};
2570	}	2582	}
2571		2583
2572	$self->{texture} \|\|= new_from_opengl CFClient::Texture $W, $H, sub {	2584	$self->{texture} \|\|= new_from_opengl CFClient::Texture $W, $H, sub {
2573	glClearColor 0.5, 0.5, 0.5, 0;	2585	glClearColor 0, 0, 0, 0;
2574	glClear GL_COLOR_BUFFER_BIT;	2586	glClear GL_COLOR_BUFFER_BIT;
2575		2587
2576	my $top = int $self->{children}[1]{range}[0];	2588	my $top = int $self->{children}[1]{range}[0];
2577		2589
2578	my $y0 = $top;	2590	my $y0 = $top;
…		…
2613	sub _draw {	2625	sub _draw {
2614	my ($self) = @_;	2626	my ($self) = @_;
2615		2627
2616	glEnable GL_TEXTURE_2D;	2628	glEnable GL_TEXTURE_2D;
2617	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2629	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2618	glColor 1, 1, 1, 1;	2630	glColor 0, 0, 0, 1;
2619	$self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});	2631	$self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2620	glDisable GL_TEXTURE_2D;	2632	glDisable GL_TEXTURE_2D;
2621		2633
2622	$self->{children}[1]->draw;	2634	$self->{children}[1]->draw;
2623		2635
2624	}	2636	}
…		…
2851	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face \|\| $self->{face}]];	2863	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face \|\| $self->{face}]];
2852		2864
2853	if ($tex) {	2865	if ($tex) {
2854	glEnable GL_TEXTURE_2D;	2866	glEnable GL_TEXTURE_2D;
2855	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2867	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2856	glColor 1, 1, 1, 1;	2868	glColor 0, 0, 0, 1;
2857	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});	2869	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2858	glDisable GL_TEXTURE_2D;	2870	glDisable GL_TEXTURE_2D;
2859	}	2871	}
2860	}	2872	}
2861		2873
…		…
3069	our @ISA = CFClient::UI::VBox::;	3081	our @ISA = CFClient::UI::VBox::;
3070		3082
3071	sub new {	3083	sub new {
3072	my $class = shift;	3084	my $class = shift;
3073		3085
3074	$class->SUPER::new (	3086	my $self = $class->SUPER::new (
3075	fontsize => 0.8,	3087	fontsize => 0.8,
3076	@_,	3088	@_,
3077	)	3089	);
		3090
		3091	Scalar::Util::weaken (my $this = $self);
		3092
		3093	$self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
		3094
		3095	$self
3078	}	3096	}
3079		3097
3080	sub reorder {	3098	sub reorder {
3081	my ($self) = @_;	3099	my ($self) = @_;
3082	my $NOW = time;	3100	my $NOW = Time::HiRes::time;
		3101
		3102	# freeze display when hovering over any label
		3103	return if $CFClient::UI::TOOLTIP->{owner}
		3104	&& grep $CFClient::UI::TOOLTIP->{owner} == $_->{label},
		3105	values %{ $self->{item} };
3083		3106
3084	while (my ($k, $v) = each %{ $self->{item} }) {	3107	while (my ($k, $v) = each %{ $self->{item} }) {
3085	delete $self->{item}{$k} if $v->{timeout} < $NOW;	3108	delete $self->{item}{$k} if $v->{timeout} < $NOW;
3086	}	3109	}
3087		3110
…		…
3090	my @items = sort {	3113	my @items = sort {
3091	$a->{pri} <=> $b->{pri}	3114	$a->{pri} <=> $b->{pri}
3092	or $b->{id} <=> $a->{id}	3115	or $b->{id} <=> $a->{id}
3093	} values %{ $self->{item} };	3116	} values %{ $self->{item} };
3094		3117
		3118	$self->{timer}->interval (1);
		3119
3095	my $count = 10 + 1;	3120	my $count = 10 + 1;
3096	for my $item (@items) {	3121	for my $item (@items) {
3097	last unless --$count;	3122	last unless --$count;
3098		3123
3099	push @widgets, $item->{label} \|\|= do {	3124	my $label = $item->{label} \|\|= do {
3100	# TODO: doesn't handle markup well (read as: at all)	3125	# TODO: doesn't handle markup well (read as: at all)
3101	my $short = $item->{count} > 1	3126	my $short = $item->{count} > 1
3102	? "<b>$item->{count} ×</b> $item->{text}"	3127	? "<b>$item->{count} ×</b> $item->{text}"
3103	: $item->{text};	3128	: $item->{text};
3104		3129
…		…
3112	tooltip => $item->{tooltip},	3137	tooltip => $item->{tooltip},
3113	tooltip_font => $::FONT_PROP,	3138	tooltip_font => $::FONT_PROP,
3114	tooltip_width => 0.67,	3139	tooltip_width => 0.67,
3115	fontsize => $item->{fontsize} \|\| $self->{fontsize},	3140	fontsize => $item->{fontsize} \|\| $self->{fontsize},
3116	max_w => $::WIDTH * 0.44,	3141	max_w => $::WIDTH * 0.44,
3117	fg => $item->{fg},	3142	fg => [@{ $item->{fg} }],
3118	can_events => 1,	3143	can_events => 1,
3119	can_hover => 1	3144	can_hover => 1
3120	};	3145	};
		3146
		3147	if ((my $diff = $item->{timeout} - $NOW) < 2) {
		3148	$label->{fg}[3] = ($item->{fg}[3] \|\| 1) * $diff / 2;
		3149	$label->update;
		3150	$label->set_max_size (undef, $label->{req_h} * $diff)
		3151	if $diff < 1;
		3152	$self->{timer}->interval (1/30);
		3153	} else {
		3154	$label->{fg}[3] = $item->{fg}[3] \|\| 1;
		3155	}
		3156
		3157	push @widgets, $label;
3121	}	3158	}
3122		3159
3123	$self->clear;	3160	$self->clear;
3124	$self->SUPER::add (reverse @widgets);	3161	$self->SUPER::add (reverse @widgets);
3125	}	3162	}
…		…
3130	$text =~ s/^\s+//;	3167	$text =~ s/^\s+//;
3131	$text =~ s/\s+$//;	3168	$text =~ s/\s+$//;
3132		3169
3133	return unless $text;	3170	return unless $text;
3134		3171
3135	my $timeout = time + ((delete $arg{timeout}) \|\| 60);	3172	my $timeout = (int time) + ((delete $arg{timeout}) \|\| 60);
3136		3173
3137	my $group = exists $arg{group} ? $arg{group} : ++$self->{id};	3174	my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
3138		3175
3139	if (my $item = $self->{item}{$group}) {	3176	if (my $item = $self->{item}{$group}) {
3140	if ($item->{text} eq $text) {	3177	if ($item->{text} eq $text) {
…		…
3170		3207
3171	$self->reorder;	3208	$self->reorder;
3172	$self->SUPER::reconfigure;	3209	$self->SUPER::reconfigure;
3173	}	3210	}
3174		3211
		3212	sub DESTROY {
		3213	my ($self) = @_;
		3214
		3215	$self->{timer}->cancel;
		3216
		3217	$self->SUPER::DESTROY;
		3218	}
		3219
3175	#############################################################################	3220	#############################################################################
3176		3221
3177	package CFClient::UI::Inventory;	3222	package CFClient::UI::Inventory;
3178		3223
3179	our @ISA = CFClient::UI::ScrolledWindow::;	3224	our @ISA = CFClient::UI::ScrolledWindow::;
…		…
3471		3516
3472	package CFClient::UI::Root;	3517	package CFClient::UI::Root;
3473		3518
3474	our @ISA = CFClient::UI::Container::;	3519	our @ISA = CFClient::UI::Container::;
3475		3520
		3521	use List::Util qw(min max);
		3522
3476	use CFClient::OpenGL;	3523	use CFClient::OpenGL;
3477		3524
3478	sub new {	3525	sub new {
3479	my $class = shift;	3526	my $class = shift;
3480		3527
…		…
3614		3661
3615	delete $queue{$widget+0};	3662	delete $queue{$widget+0};
3616		3663
3617	my ($w, $h) = $widget->size_request;	3664	my ($w, $h) = $widget->size_request;
3618		3665
3619	$w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2;	3666	$w = max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3620	$h = List::Util::max $widget->{min_h}, $h + $widget->{padding_y} * 2;	3667	$h = max $widget->{min_h}, $h + $widget->{padding_y} * 2;
		3668
		3669	$w = min $widget->{max_w}, $w if exists $widget->{max_w};
		3670	$h = min $widget->{max_h}, $h if exists $widget->{max_h};
3621		3671
3622	$w = $widget->{force_w} if exists $widget->{force_w};	3672	$w = $widget->{force_w} if exists $widget->{force_w};
3623	$h = $widget->{force_h} if exists $widget->{force_h};	3673	$h = $widget->{force_h} if exists $widget->{force_h};
3624		3674
3625	if ($widget->{req_w} != $w \|\| $widget->{req_h} != $h	3675	if ($widget->{req_w} != $w \|\| $widget->{req_h} != $h

Diff Legend

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

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents): Revision 1.273 by root, Sat Jun 3 02:32:35 2006 UTC vs. Revision 1.282 by root, Mon Jun 5 02:25:10 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.273 by root, Sat Jun 3 02:32:35 2006 UTC vs.
Revision 1.282 by root, Mon Jun 5 02:25:10 2006 UTC