[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.292 by root, Tue Jun 6 03:02:15 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);
…		…
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;
…		…
794	$self->{children}[0]->configure (0, 0, $w, $h);	796	$self->{children}[0]->configure (0, 0, $w, $h);
795	}	797	}
796		798
797	#############################################################################	799	#############################################################################
798		800
		801	# back-buffered drawing area
		802
799	package CFClient::UI::Window;	803	package CFClient::UI::Window;
800		804
801	our @ISA = CFClient::UI::Bin::;	805	our @ISA = CFClient::UI::Bin::;
802		806
803	use CFClient::OpenGL;	807	use CFClient::OpenGL;
…		…
854	my $tex = $self->{texture}	858	my $tex = $self->{texture}
855	or return;	859	or return;
856		860
857	glEnable GL_TEXTURE_2D;	861	glEnable GL_TEXTURE_2D;
858	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	862	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
859	glColor 1, 1, 1, 1;	863	glColor 0, 0, 0, 1;
860		864
861	$tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);	865	$tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
862		866
863	glDisable GL_TEXTURE_2D;	867	glDisable GL_TEXTURE_2D;
864	}	868	}
…		…
1033		1037
1034	if ($self->{bg}) {	1038	if ($self->{bg}) {
1035	my ($w, $h) = @$self{qw(w h)};	1039	my ($w, $h) = @$self{qw(w h)};
1036		1040
1037	glEnable GL_BLEND;	1041	glEnable GL_BLEND;
1038	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	1042	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1039	glColor @{ $self->{bg} };	1043	glColor_premultiply @{ $self->{bg} };
1040		1044
1041	glBegin GL_QUADS;	1045	glBegin GL_QUADS;
1042	glVertex 0 , 0;	1046	glVertex 0 , 0;
1043	glVertex 0 , $h;	1047	glVertex 0 , $h;
1044	glVertex $w, $h;	1048	glVertex $w, $h;
…		…
1158	my $dy = $ev->{y} - $oy;	1162	my $dy = $ev->{y} - $oy;
1159		1163
1160	$self->{force_w} = $bw + $dx * ($mx ? -1 : 1);	1164	$self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
1161	$self->{force_h} = $bh + $dy * ($my ? -1 : 1);	1165	$self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1162		1166
		1167	$self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1163	$self->realloc;	1168	$self->realloc;
1164	$self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1165	};	1169	};
1166		1170
1167	} elsif ($lr ^ $td) {	1171	} elsif ($lr ^ $td) {
1168	my ($ox, $oy) = ($ev->{x}, $ev->{y});	1172	my ($ox, $oy) = ($ev->{x}, $ev->{y});
1169	my ($bx, $by) = ($self->{x}, $self->{y});	1173	my ($bx, $by) = ($self->{x}, $self->{y});
…		…
1172	my ($ev, $x, $y) = @_;	1176	my ($ev, $x, $y) = @_;
1173		1177
1174	($x, $y) = ($ev->{x}, $ev->{y});	1178	($x, $y) = ($ev->{x}, $ev->{y});
1175		1179
1176	$self->move_abs ($bx + $x - $ox, $by + $y - $oy);	1180	$self->move_abs ($bx + $x - $ox, $by + $y - $oy);
		1181	# HACK: the next line is required to enforce placement
		1182	$self->{parent}->size_allocate ($self->{parent}{w}, $self->{parent}{h});
1177	};	1183	};
1178	} else {	1184	} else {
1179	return 0;	1185	return 0;
1180	}	1186	}
1181		1187
…		…
1533		1539
1534	delete $self->{texture};	1540	delete $self->{texture};
1535	$self->SUPER::update;	1541	$self->SUPER::update;
1536	}	1542	}
1537		1543
		1544	sub realloc {
		1545	my ($self) = @_;
		1546
		1547	delete $self->{ox};
		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";
1543		1556
1544	$self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;	1557	$self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1545	$self->{layout}->set_text ($text);	1558	$self->{layout}->set_text ($text);
1546		1559
		1560	delete $self->{size_req};
1547	$self->realloc;	1561	$self->realloc;
1548	$self->update;	1562	$self->update;
1549	}	1563	}
1550		1564
1551	sub set_markup {	1565	sub set_markup {
…		…
1557	my $rgba = $markup =~ /span.*(?:foreground\|background)/;	1571	my $rgba = $markup =~ /span.*(?:foreground\|background)/;
1558		1572
1559	$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;
1560	$self->{layout}->set_markup ($markup);	1574	$self->{layout}->set_markup ($markup);
1561		1575
		1576	delete $self->{size_req};
1562	$self->realloc;	1577	$self->realloc;
1563	$self->update;	1578	$self->update;
1564	}	1579	}
1565		1580
1566	sub size_request {	1581	sub size_request {
1567	my ($self) = @_;	1582	my ($self) = @_;
1568		1583
		1584	$self->{size_req} \|\|= do {
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;
		1601	}
		1602
		1603	[$w, $h]
1585	}	1604	};
1586		1605
1587	($w, $h)	1606	@{ $self->{size_req} }
1588	}	1607	}
1589		1608
1590	sub size_allocate {	1609	sub size_allocate {
1591	my ($self, $w, $h) = @_;	1610	my ($self, $w, $h) = @_;
1592		1611
…		…
1601		1620
1602	$self->{fontsize} = $fontsize;	1621	$self->{fontsize} = $fontsize;
1603	delete $self->{texture};	1622	delete $self->{texture};
1604		1623
1605	$self->realloc;	1624	$self->realloc;
		1625	}
		1626
		1627	sub reconfigure {
		1628	my ($self) = @_;
		1629
		1630	delete $self->{size_req};
		1631
		1632	$self->SUPER::reconfigure;
1606	}	1633	}
1607		1634
1608	sub _draw {	1635	sub _draw {
1609	my ($self) = @_;	1636	my ($self) = @_;
1610		1637
…		…
1630	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}	1657	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1631	: ($self->{h} - $tex->{h}) * 0.5);	1658	: ($self->{h} - $tex->{h}) * 0.5);
1632	};	1659	};
1633		1660
1634	glEnable GL_TEXTURE_2D;	1661	glEnable GL_TEXTURE_2D;
1635	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1636		1662
1637	if ($tex->{format} == GL_ALPHA) {	1663	if ($tex->{format} == GL_ALPHA) {
		1664	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1638	glColor @{$self->{fg}};	1665	glColor @{$self->{fg}};
1639	$tex->draw_quad_alpha ($self->{ox}, $self->{oy});	1666	$tex->draw_quad_alpha ($self->{ox}, $self->{oy});
1640	} else {	1667	} else {
		1668	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1641	$tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});	1669	$tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1642	}	1670	}
1643		1671
1644	glDisable GL_TEXTURE_2D;	1672	glDisable GL_TEXTURE_2D;
1645	}	1673	}
…		…
1663	can_hover => 1,	1691	can_hover => 1,
1664	can_focus => 1,	1692	can_focus => 1,
1665	valign => 0,	1693	valign => 0,
1666	can_events => 1,	1694	can_events => 1,
1667	#text => ...	1695	#text => ...
		1696	#hidden => "*",
1668	@_	1697	@_
1669	)	1698	)
1670	}	1699	}
1671		1700
1672	sub _set_text {	1701	sub _set_text {
…		…
1674		1703
1675	delete $self->{cur_h};	1704	delete $self->{cur_h};
1676		1705
1677	return if $self->{text} eq $text;	1706	return if $self->{text} eq $text;
1678		1707
1679	delete $self->{texture};
1680
1681	$self->{last_activity} = $::NOW;	1708	$self->{last_activity} = $::NOW;
1682	$self->{text} = $text;	1709	$self->{text} = $text;
1683		1710
1684	$text =~ s/./*/g if $self->{hidden};	1711	$text =~ s/./*/g if $self->{hidden};
1685	$self->{layout}->set_text ("$text ");	1712	$self->{layout}->set_text ("$text ");
		1713	delete $self->{size_req};
1686		1714
1687	$self->_emit (changed => $self->{text});	1715	$self->_emit (changed => $self->{text});
		1716
		1717	$self->realloc;
		1718	$self->update;
1688	}	1719	}
1689		1720
1690	sub set_text {	1721	sub set_text {
1691	my ($self, $text) = @_;	1722	my ($self, $text) = @_;
1692		1723
1693	$self->{cursor} = length $text;	1724	$self->{cursor} = length $text;
1694	$self->_set_text ($text);	1725	$self->_set_text ($text);
1695
1696	$self->realloc;
1697	}	1726	}
1698		1727
1699	sub get_text {	1728	sub get_text {
1700	$_[0]{text}	1729	$_[0]{text}
1701	}	1730	}
…		…
1781	my ($self) = @_;	1810	my ($self) = @_;
1782		1811
1783	local $self->{fg} = $self->{fg};	1812	local $self->{fg} = $self->{fg};
1784		1813
1785	if ($FOCUS == $self) {	1814	if ($FOCUS == $self) {
1786	glColor @{$self->{active_bg}};	1815	glColor_premultiply @{$self->{active_bg}};
1787	$self->{fg} = $self->{active_fg};	1816	$self->{fg} = $self->{active_fg};
1788	} else {	1817	} else {
1789	glColor @{$self->{bg}};	1818	glColor_premultiply @{$self->{bg}};
1790	}	1819	}
1791		1820
1792	glEnable GL_BLEND;	1821	glEnable GL_BLEND;
1793	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	1822	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1794	glBegin GL_QUADS;	1823	glBegin GL_QUADS;
1795	glVertex 0 , 0;	1824	glVertex 0 , 0;
1796	glVertex 0 , $self->{h};	1825	glVertex 0 , $self->{h};
1797	glVertex $self->{w}, $self->{h};	1826	glVertex $self->{w}, $self->{h};
1798	glVertex $self->{w}, 0;	1827	glVertex $self->{w}, 0;
…		…
1908	}	1937	}
1909		1938
1910	sub _draw {	1939	sub _draw {
1911	my ($self) = @_;	1940	my ($self) = @_;
1912		1941
1913	local $self->{fg} = $self->{fg};	1942	local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1914
1915	if ($GRAB == $self) {
1916	$self->{fg} = $self->{active_fg};
1917	}
1918		1943
1919	glEnable GL_TEXTURE_2D;	1944	glEnable GL_TEXTURE_2D;
1920	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	1945	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1921	glColor 0, 0, 0, 1;	1946	glColor 0, 0, 0, 1;
1922		1947
…		…
2147		2172
2148	my $h1 = $self->{h} * (1 - $ycut1);	2173	my $h1 = $self->{h} * (1 - $ycut1);
2149	my $h2 = $self->{h} * (1 - $ycut2);	2174	my $h2 = $self->{h} * (1 - $ycut2);
2150		2175
2151	glEnable GL_BLEND;	2176	glEnable GL_BLEND;
2152	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	2177	glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
		2178	GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2153	glEnable GL_TEXTURE_2D;	2179	glEnable GL_TEXTURE_2D;
2154	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2180	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2155		2181
2156	glBindTexture GL_TEXTURE_2D, $t1->{name};	2182	glBindTexture GL_TEXTURE_2D, $t1->{name};
2157	glBegin GL_QUADS;	2183	glBegin GL_QUADS;
…		…
2342	}	2368	}
2343		2369
2344	sub update {	2370	sub update {
2345	my ($self) = @_;	2371	my ($self) = @_;
2346		2372
2347	$CFClient::UI::ROOT->on_post_alloc ($self => sub {	2373	delete $self->{knob_w};
		2374	$self->SUPER::update;
		2375	}
		2376
		2377	sub _draw {
		2378	my ($self) = @_;
		2379
		2380	unless ($self->{knob_w}) {
2348	$self->set_value ($self->{range}[0]);	2381	$self->set_value ($self->{range}[0]);
2349		2382
2350	my ($value, $lo, $hi, $page) = @{$self->{range}};	2383	my ($value, $lo, $hi, $page) = @{$self->{range}};
2351	my $range = ($hi - $page - $lo) \|\| 1e-100;	2384	my $range = ($hi - $page - $lo) \|\| 1e-100;
2352		2385
…		…
2358	$value = ($value - $lo) / $range;	2391	$value = ($value - $lo) / $range;
2359	$value = $value * $self->{scale} + $self->{offset};	2392	$value = $value * $self->{scale} + $self->{offset};
2360		2393
2361	$self->{knob_x} = $value - $knob_w * 0.5;	2394	$self->{knob_x} = $value - $knob_w * 0.5;
2362	$self->{knob_w} = $knob_w;	2395	$self->{knob_w} = $knob_w;
2363	});	2396	}
2364
2365	$self->SUPER::update;
2366	}
2367
2368	sub _draw {
2369	my ($self) = @_;
2370		2397
2371	$self->SUPER::_draw ();	2398	$self->SUPER::_draw ();
2372		2399
2373	glScale $self->{w}, $self->{h};	2400	glScale $self->{w}, $self->{h};
2374		2401
…		…
2479	$self->SUPER::size_allocate ($w, $h);	2506	$self->SUPER::size_allocate ($w, $h);
2480		2507
2481	$self->{layout}->set_font ($self->{font}) if $self->{font};	2508	$self->{layout}->set_font ($self->{font}) if $self->{font};
2482	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	2509	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2483	$self->{layout}->set_width ($self->{children}[0]{w});	2510	$self->{layout}->set_width ($self->{children}[0]{w});
		2511	$self->{layout}->set_indent (-$self->{fontsize} * $::FONTSIZE * 4);
2484		2512
2485	$self->reflow;	2513	$self->reflow;
2486	}	2514	}
2487		2515
2488	sub text_size {	2516	sub text_size {
…		…
2490		2518
2491	my $layout = $self->{layout};	2519	my $layout = $self->{layout};
2492		2520
2493	$layout->set_height ($self->{fontsize} * $::FONTSIZE);	2521	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
2494	$layout->set_width ($self->{children}[0]{w} - $indent);	2522	$layout->set_width ($self->{children}[0]{w} - $indent);
		2523	$layout->set_indent (-$self->{fontsize} * $::FONTSIZE * 4);
2495	$layout->set_markup ($text);	2524	$layout->set_markup ($text);
2496		2525
2497	$layout->size	2526	$layout->size
2498	}	2527	}
2499		2528
…		…
2551	$layout->set_height ($self->{fontsize} * $::FONTSIZE);	2580	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
2552		2581
2553	for (@{$self->{par}}) {	2582	for (@{$self->{par}}) {
2554	if (1 \|\| $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support	2583	if (1 \|\| $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
2555	$layout->set_width ($W - $_->[3]);	2584	$layout->set_width ($W - $_->[3]);
		2585	$layout->set_indent (-$self->{fontsize} * $::FONTSIZE * 4);
2556	$layout->set_markup ($_->[4]);	2586	$layout->set_markup ($_->[4]);
2557	my ($w, $h) = $layout->size;	2587	my ($w, $h) = $layout->size;
2558	$_->[0] = $w + $_->[3];	2588	$_->[0] = $w + $_->[3];
2559	$_->[1] = $h;	2589	$_->[1] = $h;
2560	}	2590	}
…		…
2568		2598
2569	delete $self->{texture};	2599	delete $self->{texture};
2570	}	2600	}
2571		2601
2572	$self->{texture} \|\|= new_from_opengl CFClient::Texture $W, $H, sub {	2602	$self->{texture} \|\|= new_from_opengl CFClient::Texture $W, $H, sub {
2573	glClearColor 0.5, 0.5, 0.5, 0;	2603	glClearColor 0, 0, 0, 0;
2574	glClear GL_COLOR_BUFFER_BIT;	2604	glClear GL_COLOR_BUFFER_BIT;
2575		2605
2576	my $top = int $self->{children}[1]{range}[0];	2606	my $top = int $self->{children}[1]{range}[0];
2577		2607
2578	my $y0 = $top;	2608	my $y0 = $top;
…		…
2592	my $h = $par->[1];	2622	my $h = $par->[1];
2593		2623
2594	if ($y0 < $y + $h && $y < $y1) {	2624	if ($y0 < $y + $h && $y < $y1) {
2595	$layout->set_foreground (@{ $par->[2] });	2625	$layout->set_foreground (@{ $par->[2] });
2596	$layout->set_width ($W - $par->[3]);	2626	$layout->set_width ($W - $par->[3]);
		2627	$layout->set_indent (-$self->{fontsize} * $::FONTSIZE * 4);
2597	$layout->set_markup ($par->[4]);	2628	$layout->set_markup ($par->[4]);
2598		2629
2599	my ($w, $h, $data, $format, $internalformat) = $layout->render;	2630	my ($w, $h, $data, $format, $internalformat) = $layout->render;
2600		2631
2601	glRasterPos $par->[3], $y - $y0;	2632	glRasterPos $par->[3], $y - $y0;
…		…
2613	sub _draw {	2644	sub _draw {
2614	my ($self) = @_;	2645	my ($self) = @_;
2615		2646
2616	glEnable GL_TEXTURE_2D;	2647	glEnable GL_TEXTURE_2D;
2617	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2648	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2618	glColor 1, 1, 1, 1;	2649	glColor 0, 0, 0, 1;
2619	$self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});	2650	$self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2620	glDisable GL_TEXTURE_2D;	2651	glDisable GL_TEXTURE_2D;
2621		2652
2622	$self->{children}[1]->draw;	2653	$self->{children}[1]->draw;
2623		2654
2624	}	2655	}
…		…
2851	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face \|\| $self->{face}]];	2882	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face \|\| $self->{face}]];
2852		2883
2853	if ($tex) {	2884	if ($tex) {
2854	glEnable GL_TEXTURE_2D;	2885	glEnable GL_TEXTURE_2D;
2855	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2886	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2856	glColor 1, 1, 1, 1;	2887	glColor 0, 0, 0, 1;
2857	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});	2888	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2858	glDisable GL_TEXTURE_2D;	2889	glDisable GL_TEXTURE_2D;
2859	}	2890	}
2860	}	2891	}
2861		2892
…		…
2894	);	2925	);
2895		2926
2896	$self->add ($self->{vbox} = new CFClient::UI::VBox);	2927	$self->add ($self->{vbox} = new CFClient::UI::VBox);
2897		2928
2898	for my $item (@{ $self->{items} }) {	2929	for my $item (@{ $self->{items} }) {
2899	my ($widget, $cb) = @$item;	2930	my ($widget, $cb, $tooltip) = @$item;
2900		2931
2901	# handle various types of items, only text for now	2932	# handle various types of items, only text for now
2902	if (!ref $widget) {	2933	if (!ref $widget) {
2903	$widget = new CFClient::UI::Label	2934	$widget = new CFClient::UI::Label
2904	can_hover => 1,	2935	can_hover => 1,
2905	can_events => 1,	2936	can_events => 1,
2906	text => $widget;	2937	text => $widget,
		2938	tooltip => $tooltip
2907	}	2939	}
2908		2940
2909	$self->{item}{$widget} = $item;	2941	$self->{item}{$widget} = $item;
2910		2942
2911	$self->{vbox}->add ($widget);	2943	$self->{vbox}->add ($widget);
…		…
3062	$self->_emit (page_changed => $self->{multiplexer}{current});	3094	$self->_emit (page_changed => $self->{multiplexer}{current});
3063	}	3095	}
3064		3096
3065	#############################################################################	3097	#############################################################################
3066		3098
3067	package CFClient::UI::Statusbox;	3099	package CFClient::UI::Combobox;
3068		3100
		3101	use utf8;
		3102
3069	our @ISA = CFClient::UI::VBox::;	3103	our @ISA = CFClient::UI::Button::;
3070		3104
3071	sub new {	3105	sub new {
3072	my $class = shift;	3106	my $class = shift;
3073		3107
3074	$class->SUPER::new (	3108	my $self = $class->SUPER::new (
		3109	options => [], # [title, value, tooltip], ...
		3110	value => undef,
		3111	@_,
		3112	);
		3113
		3114	$self->_set_value ($self->{value});
		3115
		3116	$self
		3117	}
		3118
		3119	sub button_down {
		3120	my ($self, $ev) = @_;
		3121
		3122	my @menu_items;
		3123
		3124	for (@{ $self->{options} }) {
		3125	my ($title, $value, $tooltip) = @$_;
		3126
		3127	push @menu_items, [$tooltip, sub { $self->set_value ($value) }];
		3128	}
		3129
		3130	CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
		3131	}
		3132
		3133	sub _set_value {
		3134	my ($self, $value) = @_;
		3135
		3136	my ($item) = grep $_->[1] eq $value, @{ $self->{options} }
		3137	or return;
		3138
		3139	$self->{value} = $item->[1];
		3140	$self->set_markup ("$item->[0] ⇓");
		3141	$self->set_tooltip ($item->[2]);
		3142	}
		3143
		3144	sub set_value {
		3145	my ($self, $value) = @_;
		3146
		3147	return unless $self->{value} ne $value;
		3148
		3149	$self->_set_value ($value);
		3150	$self->_emit (changed => $value);
		3151	}
		3152
		3153	#############################################################################
		3154
		3155	package CFClient::UI::Statusbox;
		3156
		3157	our @ISA = CFClient::UI::VBox::;
		3158
		3159	sub new {
		3160	my $class = shift;
		3161
		3162	my $self = $class->SUPER::new (
3075	fontsize => 0.8,	3163	fontsize => 0.8,
3076	@_,	3164	@_,
3077	)	3165	);
		3166
		3167	Scalar::Util::weaken (my $this = $self);
		3168
		3169	$self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
		3170
		3171	$self
3078	}	3172	}
3079		3173
3080	sub reorder {	3174	sub reorder {
3081	my ($self) = @_;	3175	my ($self) = @_;
3082	my $NOW = time;	3176	my $NOW = Time::HiRes::time;
		3177
		3178	# freeze display when hovering over any label
		3179	return if $CFClient::UI::TOOLTIP->{owner}
		3180	&& grep $CFClient::UI::TOOLTIP->{owner} == $_->{label},
		3181	values %{ $self->{item} };
3083		3182
3084	while (my ($k, $v) = each %{ $self->{item} }) {	3183	while (my ($k, $v) = each %{ $self->{item} }) {
3085	delete $self->{item}{$k} if $v->{timeout} < $NOW;	3184	delete $self->{item}{$k} if $v->{timeout} < $NOW;
3086	}	3185	}
3087		3186
…		…
3090	my @items = sort {	3189	my @items = sort {
3091	$a->{pri} <=> $b->{pri}	3190	$a->{pri} <=> $b->{pri}
3092	or $b->{id} <=> $a->{id}	3191	or $b->{id} <=> $a->{id}
3093	} values %{ $self->{item} };	3192	} values %{ $self->{item} };
3094		3193
		3194	$self->{timer}->interval (1);
		3195
3095	my $count = 10 + 1;	3196	my $count = 10 + 1;
3096	for my $item (@items) {	3197	for my $item (@items) {
3097	last unless --$count;	3198	last unless --$count;
3098		3199
3099	push @widgets, $item->{label} \|\|= do {	3200	my $label = $item->{label} \|\|= do {
3100	# TODO: doesn't handle markup well (read as: at all)	3201	# TODO: doesn't handle markup well (read as: at all)
3101	my $short = $item->{count} > 1	3202	my $short = $item->{count} > 1
3102	? "<b>$item->{count} ×</b> $item->{text}"	3203	? "<b>$item->{count} ×</b> $item->{text}"
3103	: $item->{text};	3204	: $item->{text};
3104		3205
…		…
3112	tooltip => $item->{tooltip},	3213	tooltip => $item->{tooltip},
3113	tooltip_font => $::FONT_PROP,	3214	tooltip_font => $::FONT_PROP,
3114	tooltip_width => 0.67,	3215	tooltip_width => 0.67,
3115	fontsize => $item->{fontsize} \|\| $self->{fontsize},	3216	fontsize => $item->{fontsize} \|\| $self->{fontsize},
3116	max_w => $::WIDTH * 0.44,	3217	max_w => $::WIDTH * 0.44,
3117	fg => $item->{fg},	3218	fg => [@{ $item->{fg} }],
3118	can_events => 1,	3219	can_events => 1,
3119	can_hover => 1	3220	can_hover => 1
3120	};	3221	};
		3222
		3223	if ((my $diff = $item->{timeout} - $NOW) < 2) {
		3224	$label->{fg}[3] = ($item->{fg}[3] \|\| 1) * $diff / 2;
		3225	$label->update;
		3226	$label->set_max_size (undef, $label->{req_h} * $diff)
		3227	if $diff < 1;
		3228	$self->{timer}->interval (1/30);
		3229	} else {
		3230	$label->{fg}[3] = $item->{fg}[3] \|\| 1;
		3231	}
		3232
		3233	push @widgets, $label;
3121	}	3234	}
3122		3235
3123	$self->clear;	3236	$self->clear;
3124	$self->SUPER::add (reverse @widgets);	3237	$self->SUPER::add (reverse @widgets);
3125	}	3238	}
…		…
3130	$text =~ s/^\s+//;	3243	$text =~ s/^\s+//;
3131	$text =~ s/\s+$//;	3244	$text =~ s/\s+$//;
3132		3245
3133	return unless $text;	3246	return unless $text;
3134		3247
3135	my $timeout = time + ((delete $arg{timeout}) \|\| 60);	3248	my $timeout = (int time) + ((delete $arg{timeout}) \|\| 60);
3136		3249
3137	my $group = exists $arg{group} ? $arg{group} : ++$self->{id};	3250	my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
3138		3251
3139	if (my $item = $self->{item}{$group}) {	3252	if (my $item = $self->{item}{$group}) {
3140	if ($item->{text} eq $text) {	3253	if ($item->{text} eq $text) {
…		…
3170		3283
3171	$self->reorder;	3284	$self->reorder;
3172	$self->SUPER::reconfigure;	3285	$self->SUPER::reconfigure;
3173	}	3286	}
3174		3287
		3288	sub DESTROY {
		3289	my ($self) = @_;
		3290
		3291	$self->{timer}->cancel;
		3292
		3293	$self->SUPER::DESTROY;
		3294	}
		3295
3175	#############################################################################	3296	#############################################################################
3176		3297
3177	package CFClient::UI::Inventory;	3298	package CFClient::UI::Inventory;
3178		3299
3179	our @ISA = CFClient::UI::ScrolledWindow::;	3300	our @ISA = CFClient::UI::ScrolledWindow::;
…		…
3425	commands => [],	3546	commands => [],
3426	@_,	3547	@_,
3427	)	3548	)
3428	}	3549	}
3429		3550
3430	# XXX: Do sorting? Argl...	3551	my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
		3552	"<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.");
		3553	my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
		3554	"<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.");
		3555	my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
		3556	"<b>Damage</b>. The amount of damage the spell deals when it hits.");
		3557
		3558	sub rebuild_spell_list {
		3559	my ($self) = @_;
		3560
		3561	$CFClient::UI::ROOT->on_refresh ($self => sub {
		3562	$self->clear;
		3563
		3564	$self->add (1, 0, new CFClient::UI::Label text => "Spell Name");
		3565	$self->add (2, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
		3566	$self->add (3, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
		3567	$self->add (4, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
		3568
		3569	my $row = 0;
		3570
		3571	for (sort { $a cmp $b } keys %{ $self->{spell} }) {
		3572	my $spell = $self->{spell}{$_};
		3573
		3574	$row++;
		3575
		3576	$self->add (0, $row, new CFClient::UI::Face
		3577	face => $spell->{face},
		3578	can_hover => 1,
		3579	can_events => 1,
		3580	tooltip => $spell->{message},
		3581	);
		3582
		3583	$self->add (1, $row, new CFClient::UI::Label
		3584	expand => 1,
		3585	text => $spell->{name},
		3586	can_hover => 1,
		3587	can_events => 1,
		3588	tooltip => $spell->{message},
		3589	);
		3590
		3591	$self->add (2, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
		3592	$self->add (3, $row, new CFClient::UI::Label text => $spell->{mana} \|\| $spell->{grace}, @TOOLTIP_SP);
		3593	$self->add (4, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
		3594
		3595	# TODO: should be done via popup
		3596	$self->add (5, $row, new CFClient::UI::Button
		3597	text => "bind",
		3598	tooltip => "bind spell readying (cast command) to key",
		3599	on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) },
		3600	);
		3601	}
		3602	});
		3603	}
		3604
3431	sub add_spell {	3605	sub add_spell {
3432	my ($self, $spell) = @_;	3606	my ($self, $spell) = @_;
		3607
3433	$self->{spells}->{$spell->{name}} = $spell;	3608	$self->{spell}->{$spell->{name}} = $spell;
3434		3609	$self->rebuild_spell_list;
3435	$self->add (0, $self->{tbl_idx}, new CFClient::UI::Face
3436	face => $spell->{face},
3437	can_hover => 1,
3438	can_events => 1,
3439	tooltip => $spell->{message});
3440
3441	$self->add (1, $self->{tbl_idx}, new CFClient::UI::Label
3442	text => $spell->{name},
3443	can_hover => 1,
3444	can_events => 1,
3445	tooltip => $spell->{message},
3446	expand => 1);
3447
3448	$self->add (2, $self->{tbl_idx}, new CFClient::UI::Label
3449	text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
3450	$spell->{level}, ($spell->{mana} \|\| $spell->{grace}), $spell->{damage}),
3451	expand => 1);
3452
3453	$self->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
3454	text => "bind to key",
3455	on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
3456	}
3457
3458	sub rebuild_spell_list {
3459	my ($self) = @_;
3460	$self->{tbl_idx} = 0;
3461	$self->add_spell ($_) for values %{$self->{spells}};
3462	}	3610	}
3463		3611
3464	sub remove_spell {	3612	sub remove_spell {
3465	my ($self, $spell) = @_;	3613	my ($self, $spell) = @_;
		3614
3466	delete $self->{spells}->{$spell->{name}};	3615	delete $self->{spell}->{$spell->{name}};
3467	$self->rebuild_spell_list;	3616	$self->rebuild_spell_list;
3468	}	3617	}
3469		3618
3470	#############################################################################	3619	#############################################################################
3471		3620
3472	package CFClient::UI::Root;	3621	package CFClient::UI::Root;
3473		3622
3474	our @ISA = CFClient::UI::Container::;	3623	our @ISA = CFClient::UI::Container::;
		3624
		3625	use List::Util qw(min max);
3475		3626
3476	use CFClient::OpenGL;	3627	use CFClient::OpenGL;
3477		3628
3478	sub new {	3629	sub new {
3479	my $class = shift;	3630	my $class = shift;
…		…
3614		3765
3615	delete $queue{$widget+0};	3766	delete $queue{$widget+0};
3616		3767
3617	my ($w, $h) = $widget->size_request;	3768	my ($w, $h) = $widget->size_request;
3618		3769
3619	$w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2;	3770	$w = max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3620	$h = List::Util::max $widget->{min_h}, $h + $widget->{padding_y} * 2;	3771	$h = max $widget->{min_h}, $h + $widget->{padding_y} * 2;
		3772
		3773	$w = min $widget->{max_w}, $w if exists $widget->{max_w};
		3774	$h = min $widget->{max_h}, $h if exists $widget->{max_h};
3621		3775
3622	$w = $widget->{force_w} if exists $widget->{force_w};	3776	$w = $widget->{force_w} if exists $widget->{force_w};
3623	$h = $widget->{force_h} if exists $widget->{force_h};	3777	$h = $widget->{force_h} if exists $widget->{force_h};
3624		3778
3625	if ($widget->{req_w} != $w \|\| $widget->{req_h} != $h	3779	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.292 by root, Tue Jun 6 03:02:15 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.292 by root, Tue Jun 6 03:02:15 2006 UTC