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

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.277 by root, Sun Jun 4 00:21:52 2006 UTC vs.
Revision 1.296 by root, Wed Jun 7 05:48:53 2006 UTC

…		…
3	use utf8;	3	use utf8;
4	use strict;	4	use strict;
5		5
6	use Scalar::Util ();	6	use Scalar::Util ();
7	use List::Util ();	7	use List::Util ();
		8	use Event;
8		9
9	use CFClient;	10	use CFClient;
10	use CFClient::Texture;	11	use CFClient::Texture;
11		12
12	our ($FOCUS, $HOVER, $GRAB); # various widgets	13	our ($FOCUS, $HOVER, $GRAB); # various widgets
…		…
15	our $ROOT;	16	our $ROOT;
16	our $TOOLTIP;	17	our $TOOLTIP;
17	our $BUTTON_STATE;	18	our $BUTTON_STATE;
18		19
19	our %WIDGET; # all widgets, weak-referenced	20	our %WIDGET; # all widgets, weak-referenced
		21
		22	our $TOOLTIP_WATCHER = Event->idle (min => 1/60, cb => sub {
		23	if (!$GRAB) {
		24	for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
		25	if (length $widget->{tooltip}) {
		26	if ($TOOLTIP->{owner} != $widget) {
		27	$TOOLTIP->hide;
		28
		29	$TOOLTIP->{owner} = $widget;
		30
		31	return if $ENV{CFPLUS_DEBUG} & 8;
		32
		33	my $tip = $widget->{tooltip};
		34
		35	$tip = $tip->($widget) if CODE:: eq ref $tip;
		36
		37	$TOOLTIP->set_tooltip_from ($widget);
		38	$TOOLTIP->show;
		39	}
		40
		41	return;
		42	}
		43	}
		44	}
		45
		46	$TOOLTIP->hide;
		47	delete $TOOLTIP->{owner};
		48	});
20		49
21	sub get_layout {	50	sub get_layout {
22	my $layout;	51	my $layout;
23		52
24	for (grep { $_->{name} } values %WIDGET) {	53	for (grep { $_->{name} } values %WIDGET) {
…		…
39	my ($layout) = @_;	68	my ($layout) = @_;
40		69
41	$LAYOUT = $layout;	70	$LAYOUT = $layout;
42	}	71	}
43		72
44	sub check_tooltip {
45	return if $ENV{CFPLUS_DEBUG} & 8;
46
47	if (!$GRAB) {
48	for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
49	if (length $widget->{tooltip}) {
50	if ($TOOLTIP->{owner} != $widget) {
51	$TOOLTIP->hide;
52
53	$TOOLTIP->{owner} = $widget;
54
55	my $tip = $widget->{tooltip};
56
57	$tip = $tip->($widget) if CODE:: eq ref $tip;
58
59	$TOOLTIP->set_tooltip_from ($widget);
60	$TOOLTIP->show;
61	}
62
63	return;
64	}
65	}
66	}
67
68	$TOOLTIP->hide;
69	delete $TOOLTIP->{owner};
70	}
71
72	# class methods for events	73	# class methods for events
73	sub feed_sdl_key_down_event {	74	sub feed_sdl_key_down_event {
74	$FOCUS->emit (key_down => $_[0])	75	$FOCUS->emit (key_down => $_[0])
75	if $FOCUS;	76	if $FOCUS;
76	}	77	}
…		…
88	my $widget = $ROOT->find_widget ($x, $y);	89	my $widget = $ROOT->find_widget ($x, $y);
89		90
90	$GRAB = $widget;	91	$GRAB = $widget;
91	$GRAB->update if $GRAB;	92	$GRAB->update if $GRAB;
92		93
93	check_tooltip;	94	$TOOLTIP_WATCHER->cb->();
94	}	95	}
95		96
96	$BUTTON_STATE \|= 1 << ($ev->{button} - 1);	97	$BUTTON_STATE \|= 1 << ($ev->{button} - 1);
97		98
98	$GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y))	99	$GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y))
…		…
113	if (!$BUTTON_STATE) {	114	if (!$BUTTON_STATE) {
114	my $grab = $GRAB; undef $GRAB;	115	my $grab = $GRAB; undef $GRAB;
115	$grab->update if $grab;	116	$grab->update if $grab;
116	$GRAB->update if $GRAB;	117	$GRAB->update if $GRAB;
117		118
118	check_tooltip;	119	$TOOLTIP_WATCHER->cb->();
119	}	120	}
120	}	121	}
121		122
122	sub feed_sdl_motion_event {	123	sub feed_sdl_motion_event {
123	my ($ev) = @_;	124	my ($ev) = @_;
…		…
129	my $hover = $HOVER; $HOVER = $widget;	130	my $hover = $HOVER; $HOVER = $widget;
130		131
131	$hover->update if $hover && $hover->{can_hover};	132	$hover->update if $hover && $hover->{can_hover};
132	$HOVER->update if $HOVER && $HOVER->{can_hover};	133	$HOVER->update if $HOVER && $HOVER->{can_hover};
133		134
134	check_tooltip;	135	$TOOLTIP_WATCHER->start;
135	}	136	}
136		137
137	$HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))	138	$HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
138	if $HOVER;	139	if $HOVER;
139	}	140	}
…		…
277	delete $self->{visible};	278	delete $self->{visible};
278		279
279	undef $GRAB if $GRAB == $self;	280	undef $GRAB if $GRAB == $self;
280	undef $HOVER if $HOVER == $self;	281	undef $HOVER if $HOVER == $self;
281		282
282	CFClient::UI::check_tooltip	283	$CFClient::UI::TOOLTIP_WATCHER->cb->()
283	if $TOOLTIP->{owner} == $self;	284	if $TOOLTIP->{owner} == $self;
284		285
285	$self->focus_out;	286	$self->focus_out;
286		287
287	$self->emit (visibility_change => 0);	288	$self->emit (visibility_change => 0);
…		…
314	}	315	}
315		316
316	sub move_abs {	317	sub move_abs {
317	my ($self, $x, $y, $z) = @_;	318	my ($self, $x, $y, $z) = @_;
318		319
319	$self->{x} = List::Util::max 0, int $x;	320	$self->{x} = List::Util::max 0, List::Util::min $self->{root}{w} - $self->{w}, int $x;
320	$self->{y} = List::Util::max 0, int $y;	321	$self->{y} = List::Util::max 0, List::Util::min $self->{root}{h} - $self->{h}, int $y;
321	$self->{z} = $z if defined $z;	322	$self->{z} = $z if defined $z;
322		323
323	$self->update;	324	$self->update;
324	}	325	}
325		326
…		…
381	}	382	}
382		383
383	sub set_max_size {	384	sub set_max_size {
384	my ($self, $w, $h) = @_;	385	my ($self, $w, $h) = @_;
385		386
386	delete $self->{max_w}; $self->{max_w} = $w if $w;	387	$self->{max_w} = int $w if defined $w;
387	delete $self->{max_h}; $self->{max_h} = $h if $h;	388	$self->{max_h} = int $h if defined $h;
		389
		390	$self->realloc;
388	}	391	}
389		392
390	sub set_tooltip {	393	sub set_tooltip {
391	my ($self, $tooltip) = @_;	394	my ($self, $tooltip) = @_;
392		395
…		…
397		400
398	$self->{tooltip} = $tooltip;	401	$self->{tooltip} = $tooltip;
399		402
400	if ($CFClient::UI::TOOLTIP->{owner} == $self) {	403	if ($CFClient::UI::TOOLTIP->{owner} == $self) {
401	delete $CFClient::UI::TOOLTIP->{owner};	404	delete $CFClient::UI::TOOLTIP->{owner};
402	CFClient::UI::check_tooltip;	405	$CFClient::UI::TOOLTIP_WATCHER->cb->();
403	}	406	}
404	}	407	}
405		408
406	# translate global coordinates to local coordinate system	409	# translate global coordinates to local coordinate system
407	sub coord2local {	410	sub coord2local {
…		…
548	return if ($draw_x + $self->{w} < 0) \|\| ($draw_x >= $draw_w)	551	return if ($draw_x + $self->{w} < 0) \|\| ($draw_x >= $draw_w)
549	\|\| ($draw_y + $self->{h} < 0) \|\| ($draw_y >= $draw_h);	552	\|\| ($draw_y + $self->{h} < 0) \|\| ($draw_y >= $draw_h);
550		553
551	glPushMatrix;	554	glPushMatrix;
552	glTranslate $self->{x}, $self->{y}, 0;	555	glTranslate $self->{x}, $self->{y}, 0;
553	$self->_draw;
554	glPopMatrix;
555		556
556	if ($self == $HOVER && $self->{can_hover}) {	557	if ($self == $HOVER && $self->{can_hover}) {
557	my ($x, $y) = @$self{qw(x y)};
558
559	glColor 1, 0.8, 0.5, 0.2;	558	glColor 10.2, 0.80.2, 0.5*0.2, 0.2;
560	glEnable GL_BLEND;	559	glEnable GL_BLEND;
561	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	560	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
562	glBegin GL_QUADS;	561	glBegin GL_QUADS;
563	glVertex $x , $y;	562	glVertex 0 , 0;
564	glVertex $x + $self->{w}, $y;	563	glVertex $self->{w}, 0;
565	glVertex $x + $self->{w}, $y + $self->{h};	564	glVertex $self->{w}, $self->{h};
566	glVertex $x , $y + $self->{h};	565	glVertex 0 , $self->{h};
567	glEnd;	566	glEnd;
568	glDisable GL_BLEND;	567	glDisable GL_BLEND;
569	}	568	}
570		569
571	if ($ENV{CFPLUS_DEBUG} & 1) {	570	if ($ENV{CFPLUS_DEBUG} & 1) {
572	glPushMatrix;	571	glPushMatrix;
573	glColor 1, 1, 0, 1;	572	glColor 1, 1, 0, 1;
574	glTranslate $self->{x} + 0.375, $self->{y} + 0.375;	573	glTranslate 0.375, 0.375;
575	glBegin GL_LINE_LOOP;	574	glBegin GL_LINE_LOOP;
576	glVertex 0 , 0;	575	glVertex 0 , 0;
577	glVertex $self->{w} - 1, 0;	576	glVertex $self->{w} - 1, 0;
578	glVertex $self->{w} - 1, $self->{h} - 1;	577	glVertex $self->{w} - 1, $self->{h} - 1;
579	glVertex 0 , $self->{h} - 1;	578	glVertex 0 , $self->{h} - 1;
580	glEnd;	579	glEnd;
581	glPopMatrix;	580	glPopMatrix;
582	#CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;	581	#CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
583	}	582	}
		583
		584	$self->_draw;
		585	glPopMatrix;
584	}	586	}
585		587
586	sub _draw {	588	sub _draw {
587	my ($self) = @_;	589	my ($self) = @_;
588		590
…		…
626		628
627	if ($color && (@$color < 4 \|\| $color->[3])) {	629	if ($color && (@$color < 4 \|\| $color->[3])) {
628	my ($w, $h) = @$self{qw(w h)};	630	my ($w, $h) = @$self{qw(w h)};
629		631
630	glEnable GL_BLEND;	632	glEnable GL_BLEND;
631	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	633	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
632	glColor @$color;	634	glColor_premultiply @$color;
633		635
634	glBegin GL_QUADS;	636	glBegin GL_QUADS;
635	glVertex 0 , 0;	637	glVertex 0 , 0;
636	glVertex 0 , $h;	638	glVertex 0 , $h;
637	glVertex $w, $h;	639	glVertex $w, $h;
…		…
856	my $tex = $self->{texture}	858	my $tex = $self->{texture}
857	or return;	859	or return;
858		860
859	glEnable GL_TEXTURE_2D;	861	glEnable GL_TEXTURE_2D;
860	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	862	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
861	glColor 1, 1, 1, 1;	863	glColor 0, 0, 0, 1;
862		864
863	$tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);	865	$tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
864		866
865	glDisable GL_TEXTURE_2D;	867	glDisable GL_TEXTURE_2D;
866	}	868	}
…		…
1035		1037
1036	if ($self->{bg}) {	1038	if ($self->{bg}) {
1037	my ($w, $h) = @$self{qw(w h)};	1039	my ($w, $h) = @$self{qw(w h)};
1038		1040
1039	glEnable GL_BLEND;	1041	glEnable GL_BLEND;
1040	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	1042	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1041	glColor @{ $self->{bg} };	1043	glColor_premultiply @{ $self->{bg} };
1042		1044
1043	glBegin GL_QUADS;	1045	glBegin GL_QUADS;
1044	glVertex 0 , 0;	1046	glVertex 0 , 0;
1045	glVertex 0 , $h;	1047	glVertex 0 , $h;
1046	glVertex $w, $h;	1048	glVertex $w, $h;
…		…
1537		1539
1538	delete $self->{texture};	1540	delete $self->{texture};
1539	$self->SUPER::update;	1541	$self->SUPER::update;
1540	}	1542	}
1541		1543
		1544	sub realloc {
		1545	my ($self) = @_;
		1546
		1547	delete $self->{ox};
		1548	$self->SUPER::realloc;
		1549	}
		1550
1542	sub set_text {	1551	sub set_text {
1543	my ($self, $text) = @_;	1552	my ($self, $text) = @_;
1544		1553
1545	return if $self->{text} eq "T$text";	1554	return if $self->{text} eq "T$text";
1546	$self->{text} = "T$text";	1555	$self->{text} = "T$text";
1547		1556
1548	$self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;	1557	$self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1549	$self->{layout}->set_text ($text);	1558	$self->{layout}->set_text ($text);
1550		1559
		1560	delete $self->{size_req};
1551	$self->realloc;	1561	$self->realloc;
1552	$self->update;	1562	$self->update;
1553	}	1563	}
1554		1564
1555	sub set_markup {	1565	sub set_markup {
…		…
1561	my $rgba = $markup =~ /span.*(?:foreground\|background)/;	1571	my $rgba = $markup =~ /span.*(?:foreground\|background)/;
1562		1572
1563	$self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;	1573	$self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1564	$self->{layout}->set_markup ($markup);	1574	$self->{layout}->set_markup ($markup);
1565		1575
		1576	delete $self->{size_req};
1566	$self->realloc;	1577	$self->realloc;
1567	$self->update;	1578	$self->update;
1568	}	1579	}
1569		1580
1570	sub size_request {	1581	sub size_request {
1571	my ($self) = @_;	1582	my ($self) = @_;
1572		1583
		1584	$self->{size_req} \|\|= do {
1573	$self->{layout}->set_font ($self->{font}) if $self->{font};	1585	$self->{layout}->set_font ($self->{font}) if $self->{font};
1574	$self->{layout}->set_width ($self->{max_w} \|\| -1);	1586	$self->{layout}->set_width ($self->{max_w} \|\| -1);
1575	$self->{layout}->set_ellipsise ($self->{ellipsise});	1587	$self->{layout}->set_ellipsise ($self->{ellipsise});
1576	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});	1588	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1577	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	1589	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1578		1590
1579	my ($w, $h) = $self->{layout}->size;	1591	my ($w, $h) = $self->{layout}->size;
1580		1592
1581	if (exists $self->{template}) {	1593	if (exists $self->{template}) {
1582	$self->{template}->set_font ($self->{font}) if $self->{font};	1594	$self->{template}->set_font ($self->{font}) if $self->{font};
1583	$self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);	1595	$self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1584		1596
1585	my ($w2, $h2) = $self->{template}->size;	1597	my ($w2, $h2) = $self->{template}->size;
1586		1598
1587	$w = List::Util::max $w, $w2;	1599	$w = List::Util::max $w, $w2;
1588	$h = List::Util::max $h, $h2;	1600	$h = List::Util::max $h, $h2;
		1601	}
		1602
		1603	[$w, $h]
1589	}	1604	};
1590		1605
1591	($w, $h)	1606	@{ $self->{size_req} }
1592	}	1607	}
1593		1608
1594	sub size_allocate {	1609	sub size_allocate {
1595	my ($self, $w, $h) = @_;	1610	my ($self, $w, $h) = @_;
1596		1611
…		…
1605		1620
1606	$self->{fontsize} = $fontsize;	1621	$self->{fontsize} = $fontsize;
1607	delete $self->{texture};	1622	delete $self->{texture};
1608		1623
1609	$self->realloc;	1624	$self->realloc;
		1625	}
		1626
		1627	sub reconfigure {
		1628	my ($self) = @_;
		1629
		1630	delete $self->{size_req};
		1631
		1632	$self->SUPER::reconfigure;
1610	}	1633	}
1611		1634
1612	sub _draw {	1635	sub _draw {
1613	my ($self) = @_;	1636	my ($self) = @_;
1614		1637
…		…
1634	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}	1657	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1635	: ($self->{h} - $tex->{h}) * 0.5);	1658	: ($self->{h} - $tex->{h}) * 0.5);
1636	};	1659	};
1637		1660
1638	glEnable GL_TEXTURE_2D;	1661	glEnable GL_TEXTURE_2D;
1639	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	1662
		1663	my $w = List::Util::min $self->{w} + 4, $tex->{w};
		1664	my $h = List::Util::min $self->{h} + 2, $tex->{h};
1640		1665
1641	if ($tex->{format} == GL_ALPHA) {	1666	if ($tex->{format} == GL_ALPHA) {
		1667	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1642	glColor @{$self->{fg}};	1668	glColor @{$self->{fg}};
1643	$tex->draw_quad_alpha ($self->{ox}, $self->{oy});	1669	$tex->draw_quad_alpha ($self->{ox}, $self->{oy}, $w, $h);
1644	} else {	1670	} else {
		1671	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1645	$tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});	1672	$tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}, $w, $h);
1646	}	1673	}
1647		1674
1648	glDisable GL_TEXTURE_2D;	1675	glDisable GL_TEXTURE_2D;
1649	}	1676	}
1650		1677
…		…
1667	can_hover => 1,	1694	can_hover => 1,
1668	can_focus => 1,	1695	can_focus => 1,
1669	valign => 0,	1696	valign => 0,
1670	can_events => 1,	1697	can_events => 1,
1671	#text => ...	1698	#text => ...
		1699	#hidden => "*",
1672	@_	1700	@_
1673	)	1701	)
1674	}	1702	}
1675		1703
1676	sub _set_text {	1704	sub _set_text {
…		…
1683	$self->{last_activity} = $::NOW;	1711	$self->{last_activity} = $::NOW;
1684	$self->{text} = $text;	1712	$self->{text} = $text;
1685		1713
1686	$text =~ s/./*/g if $self->{hidden};	1714	$text =~ s/./*/g if $self->{hidden};
1687	$self->{layout}->set_text ("$text ");	1715	$self->{layout}->set_text ("$text ");
		1716	delete $self->{size_req};
1688		1717
1689	$self->_emit (changed => $self->{text});	1718	$self->_emit (changed => $self->{text});
		1719
		1720	$self->realloc;
1690	$self->update;	1721	$self->update;
1691	}	1722	}
1692		1723
1693	sub set_text {	1724	sub set_text {
1694	my ($self, $text) = @_;	1725	my ($self, $text) = @_;
1695		1726
1696	$self->{cursor} = length $text;	1727	$self->{cursor} = length $text;
1697	$self->_set_text ($text);	1728	$self->_set_text ($text);
1698
1699	$self->realloc;
1700	}	1729	}
1701		1730
1702	sub get_text {	1731	sub get_text {
1703	$_[0]{text}	1732	$_[0]{text}
1704	}	1733	}
…		…
1784	my ($self) = @_;	1813	my ($self) = @_;
1785		1814
1786	local $self->{fg} = $self->{fg};	1815	local $self->{fg} = $self->{fg};
1787		1816
1788	if ($FOCUS == $self) {	1817	if ($FOCUS == $self) {
1789	glColor @{$self->{active_bg}};	1818	glColor_premultiply @{$self->{active_bg}};
1790	$self->{fg} = $self->{active_fg};	1819	$self->{fg} = $self->{active_fg};
1791	} else {	1820	} else {
1792	glColor @{$self->{bg}};	1821	glColor_premultiply @{$self->{bg}};
1793	}	1822	}
1794		1823
1795	glEnable GL_BLEND;	1824	glEnable GL_BLEND;
1796	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	1825	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1797	glBegin GL_QUADS;	1826	glBegin GL_QUADS;
1798	glVertex 0 , 0;	1827	glVertex 0 , 0;
1799	glVertex 0 , $self->{h};	1828	glVertex 0 , $self->{h};
1800	glVertex $self->{w}, $self->{h};	1829	glVertex $self->{w}, $self->{h};
1801	glVertex $self->{w}, 0;	1830	glVertex $self->{w}, 0;
…		…
1911	}	1940	}
1912		1941
1913	sub _draw {	1942	sub _draw {
1914	my ($self) = @_;	1943	my ($self) = @_;
1915		1944
1916	local $self->{fg} = $self->{fg};	1945	local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1917
1918	if ($GRAB == $self) {
1919	$self->{fg} = $self->{active_fg};
1920	}
1921		1946
1922	glEnable GL_TEXTURE_2D;	1947	glEnable GL_TEXTURE_2D;
1923	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	1948	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1924	glColor 0, 0, 0, 1;	1949	glColor 0, 0, 0, 1;
1925		1950
…		…
2150		2175
2151	my $h1 = $self->{h} * (1 - $ycut1);	2176	my $h1 = $self->{h} * (1 - $ycut1);
2152	my $h2 = $self->{h} * (1 - $ycut2);	2177	my $h2 = $self->{h} * (1 - $ycut2);
2153		2178
2154	glEnable GL_BLEND;	2179	glEnable GL_BLEND;
2155	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	2180	glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
		2181	GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2156	glEnable GL_TEXTURE_2D;	2182	glEnable GL_TEXTURE_2D;
2157	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2183	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2158		2184
2159	glBindTexture GL_TEXTURE_2D, $t1->{name};	2185	glBindTexture GL_TEXTURE_2D, $t1->{name};
2160	glBegin GL_QUADS;	2186	glBegin GL_QUADS;
…		…
2281	sub set_range {	2307	sub set_range {
2282	my ($self, $range) = @_;	2308	my ($self, $range) = @_;
2283		2309
2284	($range, $self->{range}) = ($self->{range}, $range);	2310	($range, $self->{range}) = ($self->{range}, $range);
2285		2311
2286	$self->update
2287	if "@$range" ne "@{$self->{range}}";	2312	if ("@$range" ne "@{$self->{range}}") {
		2313	$self->update;
		2314	$self->set_value ($self->{range}[0]);
		2315	}
2288	}	2316	}
2289		2317
2290	sub set_value {	2318	sub set_value {
2291	my ($self, $value) = @_;	2319	my ($self, $value) = @_;
2292		2320
…		…
2451	my $class = shift;	2479	my $class = shift;
2452		2480
2453	my $self = $class->SUPER::new (	2481	my $self = $class->SUPER::new (
2454	fontsize => 1,	2482	fontsize => 1,
2455	can_events => 0,	2483	can_events => 0,
		2484	indent => 0,
2456	#font => default_font	2485	#font => default_font
2457	@_,	2486	@_,
2458		2487
2459	layout => (new CFClient::Layout 1),	2488	layout => (new CFClient::Layout 1),
2460	par => [],	2489	par => [],
…		…
2483	$self->SUPER::size_allocate ($w, $h);	2512	$self->SUPER::size_allocate ($w, $h);
2484		2513
2485	$self->{layout}->set_font ($self->{font}) if $self->{font};	2514	$self->{layout}->set_font ($self->{font}) if $self->{font};
2486	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	2515	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2487	$self->{layout}->set_width ($self->{children}[0]{w});	2516	$self->{layout}->set_width ($self->{children}[0]{w});
		2517	$self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2488		2518
2489	$self->reflow;	2519	$self->reflow;
2490	}	2520	}
2491		2521
2492	sub text_size {	2522	sub text_size {
…		…
2494		2524
2495	my $layout = $self->{layout};	2525	my $layout = $self->{layout};
2496		2526
2497	$layout->set_height ($self->{fontsize} * $::FONTSIZE);	2527	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
2498	$layout->set_width ($self->{children}[0]{w} - $indent);	2528	$layout->set_width ($self->{children}[0]{w} - $indent);
		2529	$layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2499	$layout->set_markup ($text);	2530	$layout->set_markup ($text);
2500		2531
2501	$layout->size	2532	$layout->size
2502	}	2533	}
2503		2534
…		…
2542		2573
2543	return unless $self->{h} > 0;	2574	return unless $self->{h} > 0;
2544		2575
2545	delete $self->{texture};	2576	delete $self->{texture};
2546		2577
2547	$ROOT->on_post_alloc ($self, sub {	2578	$ROOT->on_post_alloc ($self => sub {
2548	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};	2579	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2549		2580
2550	if (delete $self->{need_reflow}) {	2581	if (delete $self->{need_reflow}) {
2551	my $height = 0;	2582	my $height = 0;
2552		2583
…		…
2555	$layout->set_height ($self->{fontsize} * $::FONTSIZE);	2586	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
2556		2587
2557	for (@{$self->{par}}) {	2588	for (@{$self->{par}}) {
2558	if (1 \|\| $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support	2589	if (1 \|\| $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
2559	$layout->set_width ($W - $_->[3]);	2590	$layout->set_width ($W - $_->[3]);
		2591	$layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2560	$layout->set_markup ($_->[4]);	2592	$layout->set_markup ($_->[4]);
2561	my ($w, $h) = $layout->size;	2593	my ($w, $h) = $layout->size;
2562	$_->[0] = $w + $_->[3];	2594	$_->[0] = $w + $_->[3];
2563	$_->[1] = $h;	2595	$_->[1] = $h;
2564	}	2596	}
…		…
2567	}	2599	}
2568		2600
2569	$self->{height} = $height;	2601	$self->{height} = $height;
2570		2602
2571	$self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);	2603	$self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2572		2604
2573	delete $self->{texture};	2605	delete $self->{texture};
2574	}	2606	}
2575		2607
2576	$self->{texture} \|\|= new_from_opengl CFClient::Texture $W, $H, sub {	2608	$self->{texture} \|\|= new_from_opengl CFClient::Texture $W, $H, sub {
2577	glClearColor 0.5, 0.5, 0.5, 0;	2609	glClearColor 0, 0, 0, 0;
2578	glClear GL_COLOR_BUFFER_BIT;	2610	glClear GL_COLOR_BUFFER_BIT;
2579		2611
2580	my $top = int $self->{children}[1]{range}[0];	2612	my $top = int $self->{children}[1]{range}[0];
2581		2613
2582	my $y0 = $top;	2614	my $y0 = $top;
…		…
2596	my $h = $par->[1];	2628	my $h = $par->[1];
2597		2629
2598	if ($y0 < $y + $h && $y < $y1) {	2630	if ($y0 < $y + $h && $y < $y1) {
2599	$layout->set_foreground (@{ $par->[2] });	2631	$layout->set_foreground (@{ $par->[2] });
2600	$layout->set_width ($W - $par->[3]);	2632	$layout->set_width ($W - $par->[3]);
		2633	$layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2601	$layout->set_markup ($par->[4]);	2634	$layout->set_markup ($par->[4]);
2602		2635
2603	my ($w, $h, $data, $format, $internalformat) = $layout->render;	2636	my ($w, $h, $data, $format, $internalformat) = $layout->render;
2604		2637
2605	glRasterPos $par->[3], $y - $y0;	2638	glRasterPos $par->[3], $y - $y0;
…		…
2617	sub _draw {	2650	sub _draw {
2618	my ($self) = @_;	2651	my ($self) = @_;
2619		2652
2620	glEnable GL_TEXTURE_2D;	2653	glEnable GL_TEXTURE_2D;
2621	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2654	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2622	glColor 1, 1, 1, 1;	2655	glColor 0, 0, 0, 1;
2623	$self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});	2656	$self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2624	glDisable GL_TEXTURE_2D;	2657	glDisable GL_TEXTURE_2D;
2625		2658
2626	$self->{children}[1]->draw;	2659	$self->{children}[1]->draw;
2627		2660
2628	}	2661	}
…		…
2756	or return;	2789	or return;
2757		2790
2758	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);	2791	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2759		2792
2760	($x, $y) = $widget->coord2global (-$self->{w}, 0)	2793	($x, $y) = $widget->coord2global (-$self->{w}, 0)
2761	if $x + $self->{w} > $::WIDTH;	2794	if $x + $self->{w} > $self->{root}{w};
2762		2795
2763	$self->move_abs ($x, $y);	2796	$self->move_abs ($x, $y);
2764	});	2797	});
2765	}	2798	}
2766		2799
…		…
2855	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face \|\| $self->{face}]];	2888	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face \|\| $self->{face}]];
2856		2889
2857	if ($tex) {	2890	if ($tex) {
2858	glEnable GL_TEXTURE_2D;	2891	glEnable GL_TEXTURE_2D;
2859	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2892	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2860	glColor 1, 1, 1, 1;	2893	glColor 0, 0, 0, 1;
2861	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});	2894	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2862	glDisable GL_TEXTURE_2D;	2895	glDisable GL_TEXTURE_2D;
2863	}	2896	}
2864	}	2897	}
2865		2898
…		…
2898	);	2931	);
2899		2932
2900	$self->add ($self->{vbox} = new CFClient::UI::VBox);	2933	$self->add ($self->{vbox} = new CFClient::UI::VBox);
2901		2934
2902	for my $item (@{ $self->{items} }) {	2935	for my $item (@{ $self->{items} }) {
2903	my ($widget, $cb) = @$item;	2936	my ($widget, $cb, $tooltip) = @$item;
2904		2937
2905	# handle various types of items, only text for now	2938	# handle various types of items, only text for now
2906	if (!ref $widget) {	2939	if (!ref $widget) {
2907	$widget = new CFClient::UI::Label	2940	$widget = new CFClient::UI::Label
2908	can_hover => 1,	2941	can_hover => 1,
2909	can_events => 1,	2942	can_events => 1,
2910	text => $widget;	2943	text => $widget,
		2944	tooltip => $tooltip
2911	}	2945	}
2912		2946
2913	$self->{item}{$widget} = $item;	2947	$self->{item}{$widget} = $item;
2914		2948
2915	$self->{vbox}->add ($widget);	2949	$self->{vbox}->add ($widget);
…		…
3066	$self->_emit (page_changed => $self->{multiplexer}{current});	3100	$self->_emit (page_changed => $self->{multiplexer}{current});
3067	}	3101	}
3068		3102
3069	#############################################################################	3103	#############################################################################
3070		3104
3071	package CFClient::UI::Statusbox;	3105	package CFClient::UI::Combobox;
3072		3106
		3107	use utf8;
		3108
3073	our @ISA = CFClient::UI::VBox::;	3109	our @ISA = CFClient::UI::Button::;
3074		3110
3075	sub new {	3111	sub new {
3076	my $class = shift;	3112	my $class = shift;
3077		3113
3078	$class->SUPER::new (	3114	my $self = $class->SUPER::new (
		3115	options => [], # [title, value, tooltip], ...
		3116	value => undef,
		3117	@_,
		3118	);
		3119
		3120	$self->_set_value ($self->{value});
		3121
		3122	$self
		3123	}
		3124
		3125	sub button_down {
		3126	my ($self, $ev) = @_;
		3127
		3128	my @menu_items;
		3129
		3130	for (@{ $self->{options} }) {
		3131	my ($title, $value, $tooltip) = @$_;
		3132
		3133	push @menu_items, [$tooltip, sub { $self->set_value ($value) }];
		3134	}
		3135
		3136	CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
		3137	}
		3138
		3139	sub _set_value {
		3140	my ($self, $value) = @_;
		3141
		3142	my ($item) = grep $_->[1] eq $value, @{ $self->{options} }
		3143	or return;
		3144
		3145	$self->{value} = $item->[1];
		3146	$self->set_markup ("$item->[0] ⇓");
		3147	$self->set_tooltip ($item->[2]);
		3148	}
		3149
		3150	sub set_value {
		3151	my ($self, $value) = @_;
		3152
		3153	return unless $self->{value} ne $value;
		3154
		3155	$self->_set_value ($value);
		3156	$self->_emit (changed => $value);
		3157	}
		3158
		3159	#############################################################################
		3160
		3161	package CFClient::UI::Statusbox;
		3162
		3163	our @ISA = CFClient::UI::VBox::;
		3164
		3165	sub new {
		3166	my $class = shift;
		3167
		3168	my $self = $class->SUPER::new (
3079	fontsize => 0.8,	3169	fontsize => 0.8,
3080	@_,	3170	@_,
3081	)	3171	);
		3172
		3173	Scalar::Util::weaken (my $this = $self);
		3174
		3175	$self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
		3176
		3177	$self
3082	}	3178	}
3083		3179
3084	sub reorder {	3180	sub reorder {
3085	my ($self) = @_;	3181	my ($self) = @_;
3086	my $NOW = time;	3182	my $NOW = Time::HiRes::time;
		3183
		3184	# freeze display when hovering over any label
		3185	return if $CFClient::UI::TOOLTIP->{owner}
		3186	&& grep $CFClient::UI::TOOLTIP->{owner} == $_->{label},
		3187	values %{ $self->{item} };
3087		3188
3088	while (my ($k, $v) = each %{ $self->{item} }) {	3189	while (my ($k, $v) = each %{ $self->{item} }) {
3089	delete $self->{item}{$k} if $v->{timeout} < $NOW;	3190	delete $self->{item}{$k} if $v->{timeout} < $NOW;
3090	}	3191	}
3091		3192
…		…
3094	my @items = sort {	3195	my @items = sort {
3095	$a->{pri} <=> $b->{pri}	3196	$a->{pri} <=> $b->{pri}
3096	or $b->{id} <=> $a->{id}	3197	or $b->{id} <=> $a->{id}
3097	} values %{ $self->{item} };	3198	} values %{ $self->{item} };
3098		3199
		3200	$self->{timer}->interval (1);
		3201
3099	my $count = 10 + 1;	3202	my $count = 10 + 1;
3100	for my $item (@items) {	3203	for my $item (@items) {
3101	last unless --$count;	3204	last unless --$count;
3102		3205
3103	push @widgets, $item->{label} \|\|= do {	3206	my $label = $item->{label} \|\|= do {
3104	# TODO: doesn't handle markup well (read as: at all)	3207	# TODO: doesn't handle markup well (read as: at all)
3105	my $short = $item->{count} > 1	3208	my $short = $item->{count} > 1
3106	? "<b>$item->{count} ×</b> $item->{text}"	3209	? "<b>$item->{count} ×</b> $item->{text}"
3107	: $item->{text};	3210	: $item->{text};
3108		3211
…		…
3116	tooltip => $item->{tooltip},	3219	tooltip => $item->{tooltip},
3117	tooltip_font => $::FONT_PROP,	3220	tooltip_font => $::FONT_PROP,
3118	tooltip_width => 0.67,	3221	tooltip_width => 0.67,
3119	fontsize => $item->{fontsize} \|\| $self->{fontsize},	3222	fontsize => $item->{fontsize} \|\| $self->{fontsize},
3120	max_w => $::WIDTH * 0.44,	3223	max_w => $::WIDTH * 0.44,
3121	fg => $item->{fg},	3224	fg => [@{ $item->{fg} }],
3122	can_events => 1,	3225	can_events => 1,
3123	can_hover => 1	3226	can_hover => 1
3124	};	3227	};
		3228
		3229	if ((my $diff = $item->{timeout} - $NOW) < 2) {
		3230	$label->{fg}[3] = ($item->{fg}[3] \|\| 1) * $diff / 2;
		3231	$label->update;
		3232	$label->set_max_size (undef, $label->{req_h} * $diff)
		3233	if $diff < 1;
		3234	$self->{timer}->interval (1/30);
		3235	} else {
		3236	$label->{fg}[3] = $item->{fg}[3] \|\| 1;
		3237	}
		3238
		3239	push @widgets, $label;
3125	}	3240	}
3126		3241
3127	$self->clear;	3242	$self->clear;
3128	$self->SUPER::add (reverse @widgets);	3243	$self->SUPER::add (reverse @widgets);
3129	}	3244	}
…		…
3134	$text =~ s/^\s+//;	3249	$text =~ s/^\s+//;
3135	$text =~ s/\s+$//;	3250	$text =~ s/\s+$//;
3136		3251
3137	return unless $text;	3252	return unless $text;
3138		3253
3139	my $timeout = time + ((delete $arg{timeout}) \|\| 60);	3254	my $timeout = (int time) + ((delete $arg{timeout}) \|\| 60);
3140		3255
3141	my $group = exists $arg{group} ? $arg{group} : ++$self->{id};	3256	my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
3142		3257
3143	if (my $item = $self->{item}{$group}) {	3258	if (my $item = $self->{item}{$group}) {
3144	if ($item->{text} eq $text) {	3259	if ($item->{text} eq $text) {
…		…
3174		3289
3175	$self->reorder;	3290	$self->reorder;
3176	$self->SUPER::reconfigure;	3291	$self->SUPER::reconfigure;
3177	}	3292	}
3178		3293
		3294	sub DESTROY {
		3295	my ($self) = @_;
		3296
		3297	$self->{timer}->cancel;
		3298
		3299	$self->SUPER::DESTROY;
		3300	}
		3301
3179	#############################################################################	3302	#############################################################################
3180		3303
3181	package CFClient::UI::Inventory;	3304	package CFClient::UI::Inventory;
3182		3305
3183	our @ISA = CFClient::UI::ScrolledWindow::;	3306	our @ISA = CFClient::UI::ScrolledWindow::;
…		…
3429	commands => [],	3552	commands => [],
3430	@_,	3553	@_,
3431	)	3554	)
3432	}	3555	}
3433		3556
3434	# XXX: Do sorting? Argl...	3557	my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
		3558	"<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.");
		3559	my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
		3560	"<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.");
		3561	my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
		3562	"<b>Damage</b>. The amount of damage the spell deals when it hits.");
		3563
		3564	sub rebuild_spell_list {
		3565	my ($self) = @_;
		3566
		3567	$CFClient::UI::ROOT->on_refresh ($self => sub {
		3568	$self->clear;
		3569
		3570	$self->add (1, 0, new CFClient::UI::Label text => "Spell Name");
		3571	$self->add (2, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
		3572	$self->add (3, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
		3573	$self->add (4, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
		3574
		3575	my $row = 0;
		3576
		3577	for (sort { $a cmp $b } keys %{ $self->{spell} }) {
		3578	my $spell = $self->{spell}{$_};
		3579
		3580	$row++;
		3581
		3582	$self->add (0, $row, new CFClient::UI::Face
		3583	face => $spell->{face},
		3584	can_hover => 1,
		3585	can_events => 1,
		3586	tooltip => $spell->{message},
		3587	);
		3588
		3589	$self->add (1, $row, new CFClient::UI::Label
		3590	expand => 1,
		3591	text => $spell->{name},
		3592	can_hover => 1,
		3593	can_events => 1,
		3594	tooltip => $spell->{message},
		3595	);
		3596
		3597	$self->add (2, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
		3598	$self->add (3, $row, new CFClient::UI::Label text => $spell->{mana} \|\| $spell->{grace}, @TOOLTIP_SP);
		3599	$self->add (4, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
		3600
		3601	# TODO: should be done via popup
		3602	$self->add (5, $row, new CFClient::UI::Button
		3603	text => "bind",
		3604	tooltip => "bind spell readying (cast command) to key",
		3605	on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) },
		3606	);
		3607	}
		3608	});
		3609	}
		3610
3435	sub add_spell {	3611	sub add_spell {
3436	my ($self, $spell) = @_;	3612	my ($self, $spell) = @_;
		3613
3437	$self->{spells}->{$spell->{name}} = $spell;	3614	$self->{spell}->{$spell->{name}} = $spell;
3438		3615	$self->rebuild_spell_list;
3439	$self->add (0, $self->{tbl_idx}, new CFClient::UI::Face
3440	face => $spell->{face},
3441	can_hover => 1,
3442	can_events => 1,
3443	tooltip => $spell->{message});
3444
3445	$self->add (1, $self->{tbl_idx}, new CFClient::UI::Label
3446	text => $spell->{name},
3447	can_hover => 1,
3448	can_events => 1,
3449	tooltip => $spell->{message},
3450	expand => 1);
3451
3452	$self->add (2, $self->{tbl_idx}, new CFClient::UI::Label
3453	text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
3454	$spell->{level}, ($spell->{mana} \|\| $spell->{grace}), $spell->{damage}),
3455	expand => 1);
3456
3457	$self->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
3458	text => "bind to key",
3459	on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
3460	}
3461
3462	sub rebuild_spell_list {
3463	my ($self) = @_;
3464	$self->{tbl_idx} = 0;
3465	$self->add_spell ($_) for values %{$self->{spells}};
3466	}	3616	}
3467		3617
3468	sub remove_spell {	3618	sub remove_spell {
3469	my ($self, $spell) = @_;	3619	my ($self, $spell) = @_;
		3620
3470	delete $self->{spells}->{$spell->{name}};	3621	delete $self->{spell}->{$spell->{name}};
3471	$self->rebuild_spell_list;	3622	$self->rebuild_spell_list;
3472	}	3623	}
3473		3624
3474	#############################################################################	3625	#############################################################################
3475		3626
3476	package CFClient::UI::Root;	3627	package CFClient::UI::Root;
3477		3628
3478	our @ISA = CFClient::UI::Container::;	3629	our @ISA = CFClient::UI::Container::;
		3630
		3631	use List::Util qw(min max);
3479		3632
3480	use CFClient::OpenGL;	3633	use CFClient::OpenGL;
3481		3634
3482	sub new {	3635	sub new {
3483	my $class = shift;	3636	my $class = shift;
…		…
3618		3771
3619	delete $queue{$widget+0};	3772	delete $queue{$widget+0};
3620		3773
3621	my ($w, $h) = $widget->size_request;	3774	my ($w, $h) = $widget->size_request;
3622		3775
3623	$w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2;	3776	$w = max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3624	$h = List::Util::max $widget->{min_h}, $h + $widget->{padding_y} * 2;	3777	$h = max $widget->{min_h}, $h + $widget->{padding_y} * 2;
		3778
		3779	$w = min $widget->{max_w}, $w if exists $widget->{max_w};
		3780	$h = min $widget->{max_h}, $h if exists $widget->{max_h};
3625		3781
3626	$w = $widget->{force_w} if exists $widget->{force_w};	3782	$w = $widget->{force_w} if exists $widget->{force_w};
3627	$h = $widget->{force_h} if exists $widget->{force_h};	3783	$h = $widget->{force_h} if exists $widget->{force_h};
3628		3784
3629	if ($widget->{req_w} != $w \|\| $widget->{req_h} != $h	3785	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.277 by root, Sun Jun 4 00:21:52 2006 UTC vs. Revision 1.296 by root, Wed Jun 7 05:48:53 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.277 by root, Sun Jun 4 00:21:52 2006 UTC vs.
Revision 1.296 by root, Wed Jun 7 05:48:53 2006 UTC