[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.294 by root, Tue Jun 6 03:19:26 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;	1662
		1663	my $w = List::Util::min $self->{w} + 4, $tex->{w};
		1664	my $h = List::Util::min $self->{h} + 2, $tex->{h};
1636		1665
1637	if ($tex->{format} == GL_ALPHA) {	1666	if ($tex->{format} == GL_ALPHA) {
		1667	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1638	glColor @{$self->{fg}};	1668	glColor @{$self->{fg}};
1639	$tex->draw_quad_alpha ($self->{ox}, $self->{oy});	1669	$tex->draw_quad_alpha ($self->{ox}, $self->{oy}, $w, $h);
1640	} else {	1670	} else {
		1671	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1641	$tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});	1672	$tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}, $w, $h);
1642	}	1673	}
1643		1674
1644	glDisable GL_TEXTURE_2D;	1675	glDisable GL_TEXTURE_2D;
1645	}	1676	}
1646		1677
…		…
1663	can_hover => 1,	1694	can_hover => 1,
1664	can_focus => 1,	1695	can_focus => 1,
1665	valign => 0,	1696	valign => 0,
1666	can_events => 1,	1697	can_events => 1,
1667	#text => ...	1698	#text => ...
		1699	#hidden => "*",
1668	@_	1700	@_
1669	)	1701	)
1670	}	1702	}
1671		1703
1672	sub _set_text {	1704	sub _set_text {
…		…
1674		1706
1675	delete $self->{cur_h};	1707	delete $self->{cur_h};
1676		1708
1677	return if $self->{text} eq $text;	1709	return if $self->{text} eq $text;
1678		1710
1679	delete $self->{texture};
1680
1681	$self->{last_activity} = $::NOW;	1711	$self->{last_activity} = $::NOW;
1682	$self->{text} = $text;	1712	$self->{text} = $text;
1683		1713
1684	$text =~ s/./*/g if $self->{hidden};	1714	$text =~ s/./*/g if $self->{hidden};
1685	$self->{layout}->set_text ("$text ");	1715	$self->{layout}->set_text ("$text ");
		1716	delete $self->{size_req};
1686		1717
1687	$self->_emit (changed => $self->{text});	1718	$self->_emit (changed => $self->{text});
		1719
		1720	$self->realloc;
		1721	$self->update;
1688	}	1722	}
1689		1723
1690	sub set_text {	1724	sub set_text {
1691	my ($self, $text) = @_;	1725	my ($self, $text) = @_;
1692		1726
1693	$self->{cursor} = length $text;	1727	$self->{cursor} = length $text;
1694	$self->_set_text ($text);	1728	$self->_set_text ($text);
1695
1696	$self->realloc;
1697	}	1729	}
1698		1730
1699	sub get_text {	1731	sub get_text {
1700	$_[0]{text}	1732	$_[0]{text}
1701	}	1733	}
…		…
1781	my ($self) = @_;	1813	my ($self) = @_;
1782		1814
1783	local $self->{fg} = $self->{fg};	1815	local $self->{fg} = $self->{fg};
1784		1816
1785	if ($FOCUS == $self) {	1817	if ($FOCUS == $self) {
1786	glColor @{$self->{active_bg}};	1818	glColor_premultiply @{$self->{active_bg}};
1787	$self->{fg} = $self->{active_fg};	1819	$self->{fg} = $self->{active_fg};
1788	} else {	1820	} else {
1789	glColor @{$self->{bg}};	1821	glColor_premultiply @{$self->{bg}};
1790	}	1822	}
1791		1823
1792	glEnable GL_BLEND;	1824	glEnable GL_BLEND;
1793	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	1825	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1794	glBegin GL_QUADS;	1826	glBegin GL_QUADS;
1795	glVertex 0 , 0;	1827	glVertex 0 , 0;
1796	glVertex 0 , $self->{h};	1828	glVertex 0 , $self->{h};
1797	glVertex $self->{w}, $self->{h};	1829	glVertex $self->{w}, $self->{h};
1798	glVertex $self->{w}, 0;	1830	glVertex $self->{w}, 0;
…		…
1908	}	1940	}
1909		1941
1910	sub _draw {	1942	sub _draw {
1911	my ($self) = @_;	1943	my ($self) = @_;
1912		1944
1913	local $self->{fg} = $self->{fg};	1945	local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1914
1915	if ($GRAB == $self) {
1916	$self->{fg} = $self->{active_fg};
1917	}
1918		1946
1919	glEnable GL_TEXTURE_2D;	1947	glEnable GL_TEXTURE_2D;
1920	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	1948	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1921	glColor 0, 0, 0, 1;	1949	glColor 0, 0, 0, 1;
1922		1950
…		…
2147		2175
2148	my $h1 = $self->{h} * (1 - $ycut1);	2176	my $h1 = $self->{h} * (1 - $ycut1);
2149	my $h2 = $self->{h} * (1 - $ycut2);	2177	my $h2 = $self->{h} * (1 - $ycut2);
2150		2178
2151	glEnable GL_BLEND;	2179	glEnable GL_BLEND;
2152	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;
2153	glEnable GL_TEXTURE_2D;	2182	glEnable GL_TEXTURE_2D;
2154	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2183	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2155		2184
2156	glBindTexture GL_TEXTURE_2D, $t1->{name};	2185	glBindTexture GL_TEXTURE_2D, $t1->{name};
2157	glBegin GL_QUADS;	2186	glBegin GL_QUADS;
…		…
2342	}	2371	}
2343		2372
2344	sub update {	2373	sub update {
2345	my ($self) = @_;	2374	my ($self) = @_;
2346		2375
2347	$CFClient::UI::ROOT->on_post_alloc ($self => sub {	2376	delete $self->{knob_w};
		2377	$self->SUPER::update;
		2378	}
		2379
		2380	sub _draw {
		2381	my ($self) = @_;
		2382
		2383	unless ($self->{knob_w}) {
2348	$self->set_value ($self->{range}[0]);	2384	$self->set_value ($self->{range}[0]);
2349		2385
2350	my ($value, $lo, $hi, $page) = @{$self->{range}};	2386	my ($value, $lo, $hi, $page) = @{$self->{range}};
2351	my $range = ($hi - $page - $lo) \|\| 1e-100;	2387	my $range = ($hi - $page - $lo) \|\| 1e-100;
2352		2388
…		…
2358	$value = ($value - $lo) / $range;	2394	$value = ($value - $lo) / $range;
2359	$value = $value * $self->{scale} + $self->{offset};	2395	$value = $value * $self->{scale} + $self->{offset};
2360		2396
2361	$self->{knob_x} = $value - $knob_w * 0.5;	2397	$self->{knob_x} = $value - $knob_w * 0.5;
2362	$self->{knob_w} = $knob_w;	2398	$self->{knob_w} = $knob_w;
2363	});	2399	}
2364
2365	$self->SUPER::update;
2366	}
2367
2368	sub _draw {
2369	my ($self) = @_;
2370		2400
2371	$self->SUPER::_draw ();	2401	$self->SUPER::_draw ();
2372		2402
2373	glScale $self->{w}, $self->{h};	2403	glScale $self->{w}, $self->{h};
2374		2404
…		…
2447	my $class = shift;	2477	my $class = shift;
2448		2478
2449	my $self = $class->SUPER::new (	2479	my $self = $class->SUPER::new (
2450	fontsize => 1,	2480	fontsize => 1,
2451	can_events => 0,	2481	can_events => 0,
		2482	indent => 0,
2452	#font => default_font	2483	#font => default_font
2453	@_,	2484	@_,
2454		2485
2455	layout => (new CFClient::Layout 1),	2486	layout => (new CFClient::Layout 1),
2456	par => [],	2487	par => [],
…		…
2479	$self->SUPER::size_allocate ($w, $h);	2510	$self->SUPER::size_allocate ($w, $h);
2480		2511
2481	$self->{layout}->set_font ($self->{font}) if $self->{font};	2512	$self->{layout}->set_font ($self->{font}) if $self->{font};
2482	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	2513	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2483	$self->{layout}->set_width ($self->{children}[0]{w});	2514	$self->{layout}->set_width ($self->{children}[0]{w});
		2515	$self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2484		2516
2485	$self->reflow;	2517	$self->reflow;
2486	}	2518	}
2487		2519
2488	sub text_size {	2520	sub text_size {
…		…
2490		2522
2491	my $layout = $self->{layout};	2523	my $layout = $self->{layout};
2492		2524
2493	$layout->set_height ($self->{fontsize} * $::FONTSIZE);	2525	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
2494	$layout->set_width ($self->{children}[0]{w} - $indent);	2526	$layout->set_width ($self->{children}[0]{w} - $indent);
		2527	$layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2495	$layout->set_markup ($text);	2528	$layout->set_markup ($text);
2496		2529
2497	$layout->size	2530	$layout->size
2498	}	2531	}
2499		2532
…		…
2551	$layout->set_height ($self->{fontsize} * $::FONTSIZE);	2584	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
2552		2585
2553	for (@{$self->{par}}) {	2586	for (@{$self->{par}}) {
2554	if (1 \|\| $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support	2587	if (1 \|\| $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
2555	$layout->set_width ($W - $_->[3]);	2588	$layout->set_width ($W - $_->[3]);
		2589	$layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2556	$layout->set_markup ($_->[4]);	2590	$layout->set_markup ($_->[4]);
2557	my ($w, $h) = $layout->size;	2591	my ($w, $h) = $layout->size;
2558	$_->[0] = $w + $_->[3];	2592	$_->[0] = $w + $_->[3];
2559	$_->[1] = $h;	2593	$_->[1] = $h;
2560	}	2594	}
…		…
2568		2602
2569	delete $self->{texture};	2603	delete $self->{texture};
2570	}	2604	}
2571		2605
2572	$self->{texture} \|\|= new_from_opengl CFClient::Texture $W, $H, sub {	2606	$self->{texture} \|\|= new_from_opengl CFClient::Texture $W, $H, sub {
2573	glClearColor 0.5, 0.5, 0.5, 0;	2607	glClearColor 0, 0, 0, 0;
2574	glClear GL_COLOR_BUFFER_BIT;	2608	glClear GL_COLOR_BUFFER_BIT;
2575		2609
2576	my $top = int $self->{children}[1]{range}[0];	2610	my $top = int $self->{children}[1]{range}[0];
2577		2611
2578	my $y0 = $top;	2612	my $y0 = $top;
…		…
2592	my $h = $par->[1];	2626	my $h = $par->[1];
2593		2627
2594	if ($y0 < $y + $h && $y < $y1) {	2628	if ($y0 < $y + $h && $y < $y1) {
2595	$layout->set_foreground (@{ $par->[2] });	2629	$layout->set_foreground (@{ $par->[2] });
2596	$layout->set_width ($W - $par->[3]);	2630	$layout->set_width ($W - $par->[3]);
		2631	$layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2597	$layout->set_markup ($par->[4]);	2632	$layout->set_markup ($par->[4]);
2598		2633
2599	my ($w, $h, $data, $format, $internalformat) = $layout->render;	2634	my ($w, $h, $data, $format, $internalformat) = $layout->render;
2600		2635
2601	glRasterPos $par->[3], $y - $y0;	2636	glRasterPos $par->[3], $y - $y0;
…		…
2613	sub _draw {	2648	sub _draw {
2614	my ($self) = @_;	2649	my ($self) = @_;
2615		2650
2616	glEnable GL_TEXTURE_2D;	2651	glEnable GL_TEXTURE_2D;
2617	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2652	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2618	glColor 1, 1, 1, 1;	2653	glColor 0, 0, 0, 1;
2619	$self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});	2654	$self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2620	glDisable GL_TEXTURE_2D;	2655	glDisable GL_TEXTURE_2D;
2621		2656
2622	$self->{children}[1]->draw;	2657	$self->{children}[1]->draw;
2623		2658
2624	}	2659	}
…		…
2851	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face \|\| $self->{face}]];	2886	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face \|\| $self->{face}]];
2852		2887
2853	if ($tex) {	2888	if ($tex) {
2854	glEnable GL_TEXTURE_2D;	2889	glEnable GL_TEXTURE_2D;
2855	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2890	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2856	glColor 1, 1, 1, 1;	2891	glColor 0, 0, 0, 1;
2857	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});	2892	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2858	glDisable GL_TEXTURE_2D;	2893	glDisable GL_TEXTURE_2D;
2859	}	2894	}
2860	}	2895	}
2861		2896
…		…
2894	);	2929	);
2895		2930
2896	$self->add ($self->{vbox} = new CFClient::UI::VBox);	2931	$self->add ($self->{vbox} = new CFClient::UI::VBox);
2897		2932
2898	for my $item (@{ $self->{items} }) {	2933	for my $item (@{ $self->{items} }) {
2899	my ($widget, $cb) = @$item;	2934	my ($widget, $cb, $tooltip) = @$item;
2900		2935
2901	# handle various types of items, only text for now	2936	# handle various types of items, only text for now
2902	if (!ref $widget) {	2937	if (!ref $widget) {
2903	$widget = new CFClient::UI::Label	2938	$widget = new CFClient::UI::Label
2904	can_hover => 1,	2939	can_hover => 1,
2905	can_events => 1,	2940	can_events => 1,
2906	text => $widget;	2941	text => $widget,
		2942	tooltip => $tooltip
2907	}	2943	}
2908		2944
2909	$self->{item}{$widget} = $item;	2945	$self->{item}{$widget} = $item;
2910		2946
2911	$self->{vbox}->add ($widget);	2947	$self->{vbox}->add ($widget);
…		…
3062	$self->_emit (page_changed => $self->{multiplexer}{current});	3098	$self->_emit (page_changed => $self->{multiplexer}{current});
3063	}	3099	}
3064		3100
3065	#############################################################################	3101	#############################################################################
3066		3102
3067	package CFClient::UI::Statusbox;	3103	package CFClient::UI::Combobox;
3068		3104
		3105	use utf8;
		3106
3069	our @ISA = CFClient::UI::VBox::;	3107	our @ISA = CFClient::UI::Button::;
3070		3108
3071	sub new {	3109	sub new {
3072	my $class = shift;	3110	my $class = shift;
3073		3111
3074	$class->SUPER::new (	3112	my $self = $class->SUPER::new (
		3113	options => [], # [title, value, tooltip], ...
		3114	value => undef,
		3115	@_,
		3116	);
		3117
		3118	$self->_set_value ($self->{value});
		3119
		3120	$self
		3121	}
		3122
		3123	sub button_down {
		3124	my ($self, $ev) = @_;
		3125
		3126	my @menu_items;
		3127
		3128	for (@{ $self->{options} }) {
		3129	my ($title, $value, $tooltip) = @$_;
		3130
		3131	push @menu_items, [$tooltip, sub { $self->set_value ($value) }];
		3132	}
		3133
		3134	CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
		3135	}
		3136
		3137	sub _set_value {
		3138	my ($self, $value) = @_;
		3139
		3140	my ($item) = grep $_->[1] eq $value, @{ $self->{options} }
		3141	or return;
		3142
		3143	$self->{value} = $item->[1];
		3144	$self->set_markup ("$item->[0] ⇓");
		3145	$self->set_tooltip ($item->[2]);
		3146	}
		3147
		3148	sub set_value {
		3149	my ($self, $value) = @_;
		3150
		3151	return unless $self->{value} ne $value;
		3152
		3153	$self->_set_value ($value);
		3154	$self->_emit (changed => $value);
		3155	}
		3156
		3157	#############################################################################
		3158
		3159	package CFClient::UI::Statusbox;
		3160
		3161	our @ISA = CFClient::UI::VBox::;
		3162
		3163	sub new {
		3164	my $class = shift;
		3165
		3166	my $self = $class->SUPER::new (
3075	fontsize => 0.8,	3167	fontsize => 0.8,
3076	@_,	3168	@_,
3077	)	3169	);
		3170
		3171	Scalar::Util::weaken (my $this = $self);
		3172
		3173	$self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
		3174
		3175	$self
3078	}	3176	}
3079		3177
3080	sub reorder {	3178	sub reorder {
3081	my ($self) = @_;	3179	my ($self) = @_;
3082	my $NOW = time;	3180	my $NOW = Time::HiRes::time;
		3181
		3182	# freeze display when hovering over any label
		3183	return if $CFClient::UI::TOOLTIP->{owner}
		3184	&& grep $CFClient::UI::TOOLTIP->{owner} == $_->{label},
		3185	values %{ $self->{item} };
3083		3186
3084	while (my ($k, $v) = each %{ $self->{item} }) {	3187	while (my ($k, $v) = each %{ $self->{item} }) {
3085	delete $self->{item}{$k} if $v->{timeout} < $NOW;	3188	delete $self->{item}{$k} if $v->{timeout} < $NOW;
3086	}	3189	}
3087		3190
…		…
3090	my @items = sort {	3193	my @items = sort {
3091	$a->{pri} <=> $b->{pri}	3194	$a->{pri} <=> $b->{pri}
3092	or $b->{id} <=> $a->{id}	3195	or $b->{id} <=> $a->{id}
3093	} values %{ $self->{item} };	3196	} values %{ $self->{item} };
3094		3197
		3198	$self->{timer}->interval (1);
		3199
3095	my $count = 10 + 1;	3200	my $count = 10 + 1;
3096	for my $item (@items) {	3201	for my $item (@items) {
3097	last unless --$count;	3202	last unless --$count;
3098		3203
3099	push @widgets, $item->{label} \|\|= do {	3204	my $label = $item->{label} \|\|= do {
3100	# TODO: doesn't handle markup well (read as: at all)	3205	# TODO: doesn't handle markup well (read as: at all)
3101	my $short = $item->{count} > 1	3206	my $short = $item->{count} > 1
3102	? "<b>$item->{count} ×</b> $item->{text}"	3207	? "<b>$item->{count} ×</b> $item->{text}"
3103	: $item->{text};	3208	: $item->{text};
3104		3209
…		…
3112	tooltip => $item->{tooltip},	3217	tooltip => $item->{tooltip},
3113	tooltip_font => $::FONT_PROP,	3218	tooltip_font => $::FONT_PROP,
3114	tooltip_width => 0.67,	3219	tooltip_width => 0.67,
3115	fontsize => $item->{fontsize} \|\| $self->{fontsize},	3220	fontsize => $item->{fontsize} \|\| $self->{fontsize},
3116	max_w => $::WIDTH * 0.44,	3221	max_w => $::WIDTH * 0.44,
3117	fg => $item->{fg},	3222	fg => [@{ $item->{fg} }],
3118	can_events => 1,	3223	can_events => 1,
3119	can_hover => 1	3224	can_hover => 1
3120	};	3225	};
		3226
		3227	if ((my $diff = $item->{timeout} - $NOW) < 2) {
		3228	$label->{fg}[3] = ($item->{fg}[3] \|\| 1) * $diff / 2;
		3229	$label->update;
		3230	$label->set_max_size (undef, $label->{req_h} * $diff)
		3231	if $diff < 1;
		3232	$self->{timer}->interval (1/30);
		3233	} else {
		3234	$label->{fg}[3] = $item->{fg}[3] \|\| 1;
		3235	}
		3236
		3237	push @widgets, $label;
3121	}	3238	}
3122		3239
3123	$self->clear;	3240	$self->clear;
3124	$self->SUPER::add (reverse @widgets);	3241	$self->SUPER::add (reverse @widgets);
3125	}	3242	}
…		…
3130	$text =~ s/^\s+//;	3247	$text =~ s/^\s+//;
3131	$text =~ s/\s+$//;	3248	$text =~ s/\s+$//;
3132		3249
3133	return unless $text;	3250	return unless $text;
3134		3251
3135	my $timeout = time + ((delete $arg{timeout}) \|\| 60);	3252	my $timeout = (int time) + ((delete $arg{timeout}) \|\| 60);
3136		3253
3137	my $group = exists $arg{group} ? $arg{group} : ++$self->{id};	3254	my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
3138		3255
3139	if (my $item = $self->{item}{$group}) {	3256	if (my $item = $self->{item}{$group}) {
3140	if ($item->{text} eq $text) {	3257	if ($item->{text} eq $text) {
…		…
3170		3287
3171	$self->reorder;	3288	$self->reorder;
3172	$self->SUPER::reconfigure;	3289	$self->SUPER::reconfigure;
3173	}	3290	}
3174		3291
		3292	sub DESTROY {
		3293	my ($self) = @_;
		3294
		3295	$self->{timer}->cancel;
		3296
		3297	$self->SUPER::DESTROY;
		3298	}
		3299
3175	#############################################################################	3300	#############################################################################
3176		3301
3177	package CFClient::UI::Inventory;	3302	package CFClient::UI::Inventory;
3178		3303
3179	our @ISA = CFClient::UI::ScrolledWindow::;	3304	our @ISA = CFClient::UI::ScrolledWindow::;
…		…
3425	commands => [],	3550	commands => [],
3426	@_,	3551	@_,
3427	)	3552	)
3428	}	3553	}
3429		3554
3430	# XXX: Do sorting? Argl...	3555	my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
		3556	"<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.");
		3557	my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
		3558	"<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.");
		3559	my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
		3560	"<b>Damage</b>. The amount of damage the spell deals when it hits.");
		3561
		3562	sub rebuild_spell_list {
		3563	my ($self) = @_;
		3564
		3565	$CFClient::UI::ROOT->on_refresh ($self => sub {
		3566	$self->clear;
		3567
		3568	$self->add (1, 0, new CFClient::UI::Label text => "Spell Name");
		3569	$self->add (2, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
		3570	$self->add (3, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
		3571	$self->add (4, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
		3572
		3573	my $row = 0;
		3574
		3575	for (sort { $a cmp $b } keys %{ $self->{spell} }) {
		3576	my $spell = $self->{spell}{$_};
		3577
		3578	$row++;
		3579
		3580	$self->add (0, $row, new CFClient::UI::Face
		3581	face => $spell->{face},
		3582	can_hover => 1,
		3583	can_events => 1,
		3584	tooltip => $spell->{message},
		3585	);
		3586
		3587	$self->add (1, $row, new CFClient::UI::Label
		3588	expand => 1,
		3589	text => $spell->{name},
		3590	can_hover => 1,
		3591	can_events => 1,
		3592	tooltip => $spell->{message},
		3593	);
		3594
		3595	$self->add (2, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
		3596	$self->add (3, $row, new CFClient::UI::Label text => $spell->{mana} \|\| $spell->{grace}, @TOOLTIP_SP);
		3597	$self->add (4, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
		3598
		3599	# TODO: should be done via popup
		3600	$self->add (5, $row, new CFClient::UI::Button
		3601	text => "bind",
		3602	tooltip => "bind spell readying (cast command) to key",
		3603	on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) },
		3604	);
		3605	}
		3606	});
		3607	}
		3608
3431	sub add_spell {	3609	sub add_spell {
3432	my ($self, $spell) = @_;	3610	my ($self, $spell) = @_;
		3611
3433	$self->{spells}->{$spell->{name}} = $spell;	3612	$self->{spell}->{$spell->{name}} = $spell;
3434		3613	$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	}	3614	}
3463		3615
3464	sub remove_spell {	3616	sub remove_spell {
3465	my ($self, $spell) = @_;	3617	my ($self, $spell) = @_;
		3618
3466	delete $self->{spells}->{$spell->{name}};	3619	delete $self->{spell}->{$spell->{name}};
3467	$self->rebuild_spell_list;	3620	$self->rebuild_spell_list;
3468	}	3621	}
3469		3622
3470	#############################################################################	3623	#############################################################################
3471		3624
3472	package CFClient::UI::Root;	3625	package CFClient::UI::Root;
3473		3626
3474	our @ISA = CFClient::UI::Container::;	3627	our @ISA = CFClient::UI::Container::;
		3628
		3629	use List::Util qw(min max);
3475		3630
3476	use CFClient::OpenGL;	3631	use CFClient::OpenGL;
3477		3632
3478	sub new {	3633	sub new {
3479	my $class = shift;	3634	my $class = shift;
…		…
3614		3769
3615	delete $queue{$widget+0};	3770	delete $queue{$widget+0};
3616		3771
3617	my ($w, $h) = $widget->size_request;	3772	my ($w, $h) = $widget->size_request;
3618		3773
3619	$w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2;	3774	$w = max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3620	$h = List::Util::max $widget->{min_h}, $h + $widget->{padding_y} * 2;	3775	$h = max $widget->{min_h}, $h + $widget->{padding_y} * 2;
		3776
		3777	$w = min $widget->{max_w}, $w if exists $widget->{max_w};
		3778	$h = min $widget->{max_h}, $h if exists $widget->{max_h};
3621		3779
3622	$w = $widget->{force_w} if exists $widget->{force_w};	3780	$w = $widget->{force_w} if exists $widget->{force_w};
3623	$h = $widget->{force_h} if exists $widget->{force_h};	3781	$h = $widget->{force_h} if exists $widget->{force_h};
3624		3782
3625	if ($widget->{req_w} != $w \|\| $widget->{req_h} != $h	3783	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.294 by root, Tue Jun 6 03:19:26 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.294 by root, Tue Jun 6 03:19:26 2006 UTC