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

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.271 by root, Fri Jun 2 22:13:47 2006 UTC vs.
Revision 1.287 by root, Mon Jun 5 05:31:13 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);
…		…
371	sub size_allocate {	372	sub size_allocate {
372	# nothing to be done	373	# nothing to be done
373	}	374	}
374		375
375	sub children {	376	sub children {
		377	# nop
		378	}
		379
		380	sub visible_children {
		381	$_[0]->children
376	}	382	}
377		383
378	sub set_max_size {	384	sub set_max_size {
379	my ($self, $w, $h) = @_;	385	my ($self, $w, $h) = @_;
380		386
381	delete $self->{max_w}; $self->{max_w} = $w if $w;	387	$self->{max_w} = int $w if defined $w;
382	delete $self->{max_h}; $self->{max_h} = $h if $h;	388	$self->{max_h} = int $h if defined $h;
		389
		390	$self->realloc;
383	}	391	}
384		392
385	sub set_tooltip {	393	sub set_tooltip {
386	my ($self, $tooltip) = @_;	394	my ($self, $tooltip) = @_;
387		395
…		…
392		400
393	$self->{tooltip} = $tooltip;	401	$self->{tooltip} = $tooltip;
394		402
395	if ($CFClient::UI::TOOLTIP->{owner} == $self) {	403	if ($CFClient::UI::TOOLTIP->{owner} == $self) {
396	delete $CFClient::UI::TOOLTIP->{owner};	404	delete $CFClient::UI::TOOLTIP->{owner};
397	CFClient::UI::check_tooltip;	405	$CFClient::UI::TOOLTIP_WATCHER->cb->();
398	}	406	}
399	}	407	}
400		408
401	# translate global coordinates to local coordinate system	409	# translate global coordinates to local coordinate system
402	sub coord2local {	410	sub coord2local {
…		…
543	return if ($draw_x + $self->{w} < 0) \|\| ($draw_x >= $draw_w)	551	return if ($draw_x + $self->{w} < 0) \|\| ($draw_x >= $draw_w)
544	\|\| ($draw_y + $self->{h} < 0) \|\| ($draw_y >= $draw_h);	552	\|\| ($draw_y + $self->{h} < 0) \|\| ($draw_y >= $draw_h);
545		553
546	glPushMatrix;	554	glPushMatrix;
547	glTranslate $self->{x}, $self->{y}, 0;	555	glTranslate $self->{x}, $self->{y}, 0;
548	$self->_draw;
549	glPopMatrix;
550		556
551	if ($self == $HOVER && $self->{can_hover}) {	557	if ($self == $HOVER && $self->{can_hover}) {
552	my ($x, $y) = @$self{qw(x y)};
553
554	glColor 1, 0.8, 0.5, 0.2;	558	glColor 10.2, 0.80.2, 0.5*0.2, 0.2;
555	glEnable GL_BLEND;	559	glEnable GL_BLEND;
556	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	560	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
557	glBegin GL_QUADS;	561	glBegin GL_QUADS;
558	glVertex $x , $y;	562	glVertex 0 , 0;
559	glVertex $x + $self->{w}, $y;	563	glVertex $self->{w}, 0;
560	glVertex $x + $self->{w}, $y + $self->{h};	564	glVertex $self->{w}, $self->{h};
561	glVertex $x , $y + $self->{h};	565	glVertex 0 , $self->{h};
562	glEnd;	566	glEnd;
563	glDisable GL_BLEND;	567	glDisable GL_BLEND;
564	}	568	}
565		569
566	if ($ENV{CFPLUS_DEBUG} & 1) {	570	if ($ENV{CFPLUS_DEBUG} & 1) {
567	glPushMatrix;	571	glPushMatrix;
568	glColor 1, 1, 0, 1;	572	glColor 1, 1, 0, 1;
569	glTranslate $self->{x} + 0.375, $self->{y} + 0.375;	573	glTranslate 0.375, 0.375;
570	glBegin GL_LINE_LOOP;	574	glBegin GL_LINE_LOOP;
571	glVertex 0 , 0;	575	glVertex 0 , 0;
572	glVertex $self->{w} - 1, 0;	576	glVertex $self->{w} - 1, 0;
573	glVertex $self->{w} - 1, $self->{h} - 1;	577	glVertex $self->{w} - 1, $self->{h} - 1;
574	glVertex 0 , $self->{h} - 1;	578	glVertex 0 , $self->{h} - 1;
575	glEnd;	579	glEnd;
576	glPopMatrix;	580	glPopMatrix;
577	#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;
578	}	582	}
		583
		584	$self->_draw;
		585	glPopMatrix;
579	}	586	}
580		587
581	sub _draw {	588	sub _draw {
582	my ($self) = @_;	589	my ($self) = @_;
583		590
…		…
621		628
622	if ($color && (@$color < 4 \|\| $color->[3])) {	629	if ($color && (@$color < 4 \|\| $color->[3])) {
623	my ($w, $h) = @$self{qw(w h)};	630	my ($w, $h) = @$self{qw(w h)};
624		631
625	glEnable GL_BLEND;	632	glEnable GL_BLEND;
626	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	633	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
627	glColor @$color;	634	glColor_premultiply @$color;
628		635
629	glBegin GL_QUADS;	636	glBegin GL_QUADS;
630	glVertex 0 , 0;	637	glVertex 0 , 0;
631	glVertex 0 , $h;	638	glVertex 0 , $h;
632	glVertex $w, $h;	639	glVertex $w, $h;
…		…
663	our @ISA = CFClient::UI::Base::;	670	our @ISA = CFClient::UI::Base::;
664		671
665	sub new {	672	sub new {
666	my ($class, %arg) = @_;	673	my ($class, %arg) = @_;
667		674
668	my $children = delete $arg{children} \|\| [];	675	my $children = delete $arg{children};
669		676
670	my $self = $class->SUPER::new (	677	my $self = $class->SUPER::new (
671	children => [],	678	children => [],
672	can_events => 0,	679	can_events => 0,
673	%arg,	680	%arg,
674	);	681	);
		682
675	$self->add ($_) for @$children;	683	$self->add (@$children)
		684	if $children;
676		685
677	$self	686	$self
678	}	687	}
679		688
680	sub add {	689	sub add {
…		…
728	$x -= $self->{x};	737	$x -= $self->{x};
729	$y -= $self->{y};	738	$y -= $self->{y};
730		739
731	my $res;	740	my $res;
732		741
733	for (reverse @{ $self->{children} }) {	742	for (reverse $self->visible_children) {
734	$res = $_->find_widget ($x, $y)	743	$res = $_->find_widget ($x, $y)
735	and return $res;	744	and return $res;
736	}	745	}
737		746
738	$self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})	747	$self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
…		…
787	$self->{children}[0]->configure (0, 0, $w, $h);	796	$self->{children}[0]->configure (0, 0, $w, $h);
788	}	797	}
789		798
790	#############################################################################	799	#############################################################################
791		800
		801	# back-buffered drawing area
		802
792	package CFClient::UI::Window;	803	package CFClient::UI::Window;
793		804
794	our @ISA = CFClient::UI::Bin::;	805	our @ISA = CFClient::UI::Bin::;
795		806
796	use CFClient::OpenGL;	807	use CFClient::OpenGL;
…		…
847	my $tex = $self->{texture}	858	my $tex = $self->{texture}
848	or return;	859	or return;
849		860
850	glEnable GL_TEXTURE_2D;	861	glEnable GL_TEXTURE_2D;
851	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	862	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
852	glColor 1, 1, 1, 1;	863	glColor 0, 0, 0, 1;
853		864
854	$tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);	865	$tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
855		866
856	glDisable GL_TEXTURE_2D;	867	glDisable GL_TEXTURE_2D;
857	}	868	}
…		…
948	package CFClient::UI::ScrolledWindow;	959	package CFClient::UI::ScrolledWindow;
949		960
950	our @ISA = CFClient::UI::HBox::;	961	our @ISA = CFClient::UI::HBox::;
951		962
952	sub new {	963	sub new {
953	my $class = shift;	964	my ($class, %arg) = @_;
		965
		966	my $child = delete $arg{child};
954		967
955	my $self;	968	my $self;
956		969
957	my $slider = new CFClient::UI::Slider	970	my $slider = new CFClient::UI::Slider
958	vertical => 1,	971	vertical => 1,
…		…
963	;	976	;
964		977
965	$self = $class->SUPER::new (	978	$self = $class->SUPER::new (
966	vp => (new CFClient::UI::ViewPort expand => 1),	979	vp => (new CFClient::UI::ViewPort expand => 1),
967	slider => $slider,	980	slider => $slider,
968	@_,	981	%arg,
969	);	982	);
970		983
971	$self->{vp}->add ($self->{scrolled});
972	$self->add ($self->{vp});
973	$self->add ($self->{slider});	984	$self->SUPER::add ($self->{vp}, $self->{slider});
		985	$self->add ($child) if $child;
974		986
975	$self	987	$self
		988	}
		989
		990	sub add {
		991	my ($self, $widget) = @_;
		992
		993	$self->{vp}->add ($self->{child} = $widget);
976	}	994	}
977		995
978	sub update {	996	sub update {
979	my ($self) = @_;	997	my ($self) = @_;
980		998
…		…
1019		1037
1020	if ($self->{bg}) {	1038	if ($self->{bg}) {
1021	my ($w, $h) = @$self{qw(w h)};	1039	my ($w, $h) = @$self{qw(w h)};
1022		1040
1023	glEnable GL_BLEND;	1041	glEnable GL_BLEND;
1024	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	1042	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1025	glColor @{ $self->{bg} };	1043	glColor_premultiply @{ $self->{bg} };
1026		1044
1027	glBegin GL_QUADS;	1045	glBegin GL_QUADS;
1028	glVertex 0 , 0;	1046	glVertex 0 , 0;
1029	glVertex 0 , $h;	1047	glVertex 0 , $h;
1030	glVertex $w, $h;	1048	glVertex $w, $h;
…		…
1144	my $dy = $ev->{y} - $oy;	1162	my $dy = $ev->{y} - $oy;
1145		1163
1146	$self->{force_w} = $bw + $dx * ($mx ? -1 : 1);	1164	$self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
1147	$self->{force_h} = $bh + $dy * ($my ? -1 : 1);	1165	$self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1148		1166
		1167	$self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1149	$self->realloc;	1168	$self->realloc;
1150	$self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1151	};	1169	};
1152		1170
1153	} elsif ($lr ^ $td) {	1171	} elsif ($lr ^ $td) {
1154	my ($ox, $oy) = ($ev->{x}, $ev->{y});	1172	my ($ox, $oy) = ($ev->{x}, $ev->{y});
1155	my ($bx, $by) = ($self->{x}, $self->{y});	1173	my ($bx, $by) = ($self->{x}, $self->{y});
…		…
1158	my ($ev, $x, $y) = @_;	1176	my ($ev, $x, $y) = @_;
1159		1177
1160	($x, $y) = ($ev->{x}, $ev->{y});	1178	($x, $y) = ($ev->{x}, $ev->{y});
1161		1179
1162	$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});
1163	};	1183	};
1164	} else {	1184	} else {
1165	return 0;	1185	return 0;
1166	}	1186	}
1167		1187
…		…
1519		1539
1520	delete $self->{texture};	1540	delete $self->{texture};
1521	$self->SUPER::update;	1541	$self->SUPER::update;
1522	}	1542	}
1523		1543
		1544	sub realloc {
		1545	my ($self) = @_;
		1546
		1547	delete $self->{ox};
		1548	$self->SUPER::realloc;
		1549	}
		1550
1524	sub set_text {	1551	sub set_text {
1525	my ($self, $text) = @_;	1552	my ($self, $text) = @_;
1526		1553
1527	return if $self->{text} eq "T$text";	1554	return if $self->{text} eq "T$text";
1528	$self->{text} = "T$text";	1555	$self->{text} = "T$text";
1529		1556
1530	$self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;	1557	$self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1531	$self->{layout}->set_text ($text);	1558	$self->{layout}->set_text ($text);
		1559	delete $self->{req_h};
1532		1560
1533	$self->realloc;	1561	$self->realloc;
1534	$self->update;	1562	$self->update;
1535	}	1563	}
1536		1564
…		…
1542		1570
1543	my $rgba = $markup =~ /span.*(?:foreground\|background)/;	1571	my $rgba = $markup =~ /span.*(?:foreground\|background)/;
1544		1572
1545	$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;
1546	$self->{layout}->set_markup ($markup);	1574	$self->{layout}->set_markup ($markup);
		1575	delete $self->{req_h};
1547		1576
1548	$self->realloc;	1577	$self->realloc;
1549	$self->update;	1578	$self->update;
1550	}	1579	}
1551		1580
1552	sub size_request {	1581	sub size_request {
1553	my ($self) = @_;	1582	my ($self) = @_;
1554		1583
		1584	if (exists $self->{req_h}) {
		1585	@$self{qw(req_w req_h)}
		1586	} else {
1555	$self->{layout}->set_font ($self->{font}) if $self->{font};	1587	$self->{layout}->set_font ($self->{font}) if $self->{font};
1556	$self->{layout}->set_width ($self->{max_w} \|\| -1);	1588	$self->{layout}->set_width ($self->{max_w} \|\| -1);
1557	$self->{layout}->set_ellipsise ($self->{ellipsise});	1589	$self->{layout}->set_ellipsise ($self->{ellipsise});
1558	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});	1590	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1559	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	1591	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1560		1592
1561	my ($w, $h) = $self->{layout}->size;	1593	my ($w, $h) = $self->{layout}->size;
1562		1594
1563	if (exists $self->{template}) {	1595	if (exists $self->{template}) {
1564	$self->{template}->set_font ($self->{font}) if $self->{font};	1596	$self->{template}->set_font ($self->{font}) if $self->{font};
1565	$self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);	1597	$self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1566		1598
1567	my ($w2, $h2) = $self->{template}->size;	1599	my ($w2, $h2) = $self->{template}->size;
1568		1600
1569	$w = List::Util::max $w, $w2;	1601	$w = List::Util::max $w, $w2;
1570	$h = List::Util::max $h, $h2;	1602	$h = List::Util::max $h, $h2;
1571	}	1603	}
1572		1604
1573	($w, $h)	1605	($w, $h)
		1606	}
1574	}	1607	}
1575		1608
1576	sub size_allocate {	1609	sub size_allocate {
1577	my ($self, $w, $h) = @_;	1610	my ($self, $w, $h) = @_;
1578		1611
…		…
1616	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}	1649	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1617	: ($self->{h} - $tex->{h}) * 0.5);	1650	: ($self->{h} - $tex->{h}) * 0.5);
1618	};	1651	};
1619		1652
1620	glEnable GL_TEXTURE_2D;	1653	glEnable GL_TEXTURE_2D;
1621	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1622		1654
1623	if ($tex->{format} == GL_ALPHA) {	1655	if ($tex->{format} == GL_ALPHA) {
		1656	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1624	glColor @{$self->{fg}};	1657	glColor @{$self->{fg}};
1625	$tex->draw_quad_alpha ($self->{ox}, $self->{oy});	1658	$tex->draw_quad_alpha ($self->{ox}, $self->{oy});
1626	} else {	1659	} else {
		1660	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1627	$tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});	1661	$tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1628	}	1662	}
1629		1663
1630	glDisable GL_TEXTURE_2D;	1664	glDisable GL_TEXTURE_2D;
1631	}	1665	}
…		…
1660		1694
1661	delete $self->{cur_h};	1695	delete $self->{cur_h};
1662		1696
1663	return if $self->{text} eq $text;	1697	return if $self->{text} eq $text;
1664		1698
1665	delete $self->{texture};
1666
1667	$self->{last_activity} = $::NOW;	1699	$self->{last_activity} = $::NOW;
1668	$self->{text} = $text;	1700	$self->{text} = $text;
1669		1701
1670	$text =~ s/./*/g if $self->{hidden};	1702	$text =~ s/./*/g if $self->{hidden};
1671	$self->{layout}->set_text ("$text ");	1703	$self->{layout}->set_text ("$text ");
		1704	delete $self->{req_h};
1672		1705
1673	$self->_emit (changed => $self->{text});	1706	$self->_emit (changed => $self->{text});
		1707
		1708	$self->realloc;
		1709	$self->update;
1674	}	1710	}
1675		1711
1676	sub set_text {	1712	sub set_text {
1677	my ($self, $text) = @_;	1713	my ($self, $text) = @_;
1678		1714
1679	$self->{cursor} = length $text;	1715	$self->{cursor} = length $text;
1680	$self->_set_text ($text);	1716	$self->_set_text ($text);
1681
1682	$self->realloc;
1683	}	1717	}
1684		1718
1685	sub get_text {	1719	sub get_text {
1686	$_[0]{text}	1720	$_[0]{text}
1687	}	1721	}
…		…
1767	my ($self) = @_;	1801	my ($self) = @_;
1768		1802
1769	local $self->{fg} = $self->{fg};	1803	local $self->{fg} = $self->{fg};
1770		1804
1771	if ($FOCUS == $self) {	1805	if ($FOCUS == $self) {
1772	glColor @{$self->{active_bg}};	1806	glColor_premultiply @{$self->{active_bg}};
1773	$self->{fg} = $self->{active_fg};	1807	$self->{fg} = $self->{active_fg};
1774	} else {	1808	} else {
1775	glColor @{$self->{bg}};	1809	glColor_premultiply @{$self->{bg}};
1776	}	1810	}
1777		1811
1778	glEnable GL_BLEND;	1812	glEnable GL_BLEND;
1779	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	1813	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1780	glBegin GL_QUADS;	1814	glBegin GL_QUADS;
1781	glVertex 0 , 0;	1815	glVertex 0 , 0;
1782	glVertex 0 , $self->{h};	1816	glVertex 0 , $self->{h};
1783	glVertex $self->{w}, $self->{h};	1817	glVertex $self->{w}, $self->{h};
1784	glVertex $self->{w}, 0;	1818	glVertex $self->{w}, 0;
…		…
1894	}	1928	}
1895		1929
1896	sub _draw {	1930	sub _draw {
1897	my ($self) = @_;	1931	my ($self) = @_;
1898		1932
1899	local $self->{fg} = $self->{fg};	1933	local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1900
1901	if ($GRAB == $self) {
1902	$self->{fg} = $self->{active_fg};
1903	}
1904		1934
1905	glEnable GL_TEXTURE_2D;	1935	glEnable GL_TEXTURE_2D;
1906	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	1936	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1907	glColor 0, 0, 0, 1;	1937	glColor 0, 0, 0, 1;
1908		1938
…		…
2133		2163
2134	my $h1 = $self->{h} * (1 - $ycut1);	2164	my $h1 = $self->{h} * (1 - $ycut1);
2135	my $h2 = $self->{h} * (1 - $ycut2);	2165	my $h2 = $self->{h} * (1 - $ycut2);
2136		2166
2137	glEnable GL_BLEND;	2167	glEnable GL_BLEND;
2138	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	2168	glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
		2169	GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2139	glEnable GL_TEXTURE_2D;	2170	glEnable GL_TEXTURE_2D;
2140	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2171	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2141		2172
2142	glBindTexture GL_TEXTURE_2D, $t1->{name};	2173	glBindTexture GL_TEXTURE_2D, $t1->{name};
2143	glBegin GL_QUADS;	2174	glBegin GL_QUADS;
…		…
2328	}	2359	}
2329		2360
2330	sub update {	2361	sub update {
2331	my ($self) = @_;	2362	my ($self) = @_;
2332		2363
2333	$CFClient::UI::ROOT->on_post_alloc ($self => sub {	2364	delete $self->{knob_w};
		2365	$self->SUPER::update;
		2366	}
		2367
		2368	sub _draw {
		2369	my ($self) = @_;
		2370
		2371	unless ($self->{knob_w}) {
2334	$self->set_value ($self->{range}[0]);	2372	$self->set_value ($self->{range}[0]);
2335		2373
2336	my ($value, $lo, $hi, $page) = @{$self->{range}};	2374	my ($value, $lo, $hi, $page) = @{$self->{range}};
2337	my $range = ($hi - $page - $lo) \|\| 1e-100;	2375	my $range = ($hi - $page - $lo) \|\| 1e-100;
2338		2376
…		…
2344	$value = ($value - $lo) / $range;	2382	$value = ($value - $lo) / $range;
2345	$value = $value * $self->{scale} + $self->{offset};	2383	$value = $value * $self->{scale} + $self->{offset};
2346		2384
2347	$self->{knob_x} = $value - $knob_w * 0.5;	2385	$self->{knob_x} = $value - $knob_w * 0.5;
2348	$self->{knob_w} = $knob_w;	2386	$self->{knob_w} = $knob_w;
2349	});	2387	}
2350
2351	$self->SUPER::update;
2352	}
2353
2354	sub _draw {
2355	my ($self) = @_;
2356		2388
2357	$self->SUPER::_draw ();	2389	$self->SUPER::_draw ();
2358		2390
2359	glScale $self->{w}, $self->{h};	2391	glScale $self->{w}, $self->{h};
2360		2392
…		…
2554		2586
2555	delete $self->{texture};	2587	delete $self->{texture};
2556	}	2588	}
2557		2589
2558	$self->{texture} \|\|= new_from_opengl CFClient::Texture $W, $H, sub {	2590	$self->{texture} \|\|= new_from_opengl CFClient::Texture $W, $H, sub {
2559	glClearColor 0.5, 0.5, 0.5, 0;	2591	glClearColor 0, 0, 0, 0;
2560	glClear GL_COLOR_BUFFER_BIT;	2592	glClear GL_COLOR_BUFFER_BIT;
2561		2593
2562	my $top = int $self->{children}[1]{range}[0];	2594	my $top = int $self->{children}[1]{range}[0];
2563		2595
2564	my $y0 = $top;	2596	my $y0 = $top;
…		…
2599	sub _draw {	2631	sub _draw {
2600	my ($self) = @_;	2632	my ($self) = @_;
2601		2633
2602	glEnable GL_TEXTURE_2D;	2634	glEnable GL_TEXTURE_2D;
2603	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2635	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2604	glColor 1, 1, 1, 1;	2636	glColor 0, 0, 0, 1;
2605	$self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});	2637	$self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2606	glDisable GL_TEXTURE_2D;	2638	glDisable GL_TEXTURE_2D;
2607		2639
2608	$self->{children}[1]->draw;	2640	$self->{children}[1]->draw;
2609		2641
2610	}	2642	}
…		…
2837	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face \|\| $self->{face}]];	2869	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face \|\| $self->{face}]];
2838		2870
2839	if ($tex) {	2871	if ($tex) {
2840	glEnable GL_TEXTURE_2D;	2872	glEnable GL_TEXTURE_2D;
2841	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2873	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2842	glColor 1, 1, 1, 1;	2874	glColor 0, 0, 0, 1;
2843	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});	2875	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2844	glDisable GL_TEXTURE_2D;	2876	glDisable GL_TEXTURE_2D;
2845	}	2877	}
2846	}	2878	}
2847		2879
…		…
2851	$self->{timer}->cancel	2883	$self->{timer}->cancel
2852	if $self->{timer};	2884	if $self->{timer};
2853		2885
2854	$self->SUPER::DESTROY;	2886	$self->SUPER::DESTROY;
2855	}	2887	}
		2888
		2889	#############################################################################
		2890
		2891	package CFClient::UI::Buttonbar;
		2892
		2893	our @ISA = CFClient::UI::HBox::;
		2894
		2895	# TODO: should actualyl wrap buttons and other goodies.
2856		2896
2857	#############################################################################	2897	#############################################################################
2858		2898
2859	package CFClient::UI::Menu;	2899	package CFClient::UI::Menu;
2860		2900
…		…
2932	1	2972	1
2933	}	2973	}
2934		2974
2935	#############################################################################	2975	#############################################################################
2936		2976
2937	package CFClient::UI::Statusbox;	2977	package CFClient::UI::Multiplexer;
2938		2978
2939	our @ISA = CFClient::UI::VBox::;	2979	our @ISA = CFClient::UI::Container::;
2940		2980
2941	sub new {	2981	sub new {
2942	my $class = shift;	2982	my $class = shift;
2943		2983
2944	$class->SUPER::new (	2984	my $self = $class->SUPER::new (
		2985	@_,
		2986	);
		2987
		2988	$self->{current} = $self->{children}[0]
		2989	if @{ $self->{children} };
		2990
		2991	$self
		2992	}
		2993
		2994	sub add {
		2995	my ($self, @widgets) = @_;
		2996
		2997	$self->SUPER::add (@widgets);
		2998
		2999	$self->{current} = $self->{children}[0]
		3000	if @{ $self->{children} };
		3001	}
		3002
		3003	sub set_current_page {
		3004	my ($self, $page_or_widget) = @_;
		3005
		3006	my $widget = ref $page_or_widget
		3007	? $page_or_widget
		3008	: $self->{children}[$page_or_widget];
		3009
		3010	$self->{current} = $widget;
		3011	$self->{current}->configure (0, 0, $self->{w}, $self->{h});
		3012
		3013	$self->_emit (page_changed => $self->{current});
		3014
		3015	$self->realloc;
		3016	}
		3017
		3018	sub visible_children {
		3019	$_[0]{current}
		3020	}
		3021
		3022	sub size_request {
		3023	my ($self) = @_;
		3024
		3025	$self->{current}->size_request
		3026	}
		3027
		3028	sub size_allocate {
		3029	my ($self, $w, $h) = @_;
		3030
		3031	$self->{current}->configure (0, 0, $w, $h);
		3032	}
		3033
		3034	sub _draw {
		3035	my ($self) = @_;
		3036
		3037	$self->{current}->draw;
		3038	}
		3039
		3040	#############################################################################
		3041
		3042	package CFClient::UI::Notebook;
		3043
		3044	our @ISA = CFClient::UI::VBox::;
		3045
		3046	sub new {
		3047	my $class = shift;
		3048
		3049	my $self = $class->SUPER::new (
		3050	buttonbar => (new CFClient::UI::Buttonbar),
		3051	multiplexer => (new CFClient::UI::Multiplexer expand => 1),
		3052	# filter => # will be put between multiplexer and $self
		3053	@_,
		3054	);
		3055
		3056	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};
		3057	$self->SUPER::add ($self->{buttonbar}, $self->{filter} \|\| $self->{multiplexer});
		3058
		3059	$self
		3060	}
		3061
		3062	sub add {
		3063	my ($self, $title, $widget, $tooltip) = @_;
		3064
		3065	Scalar::Util::weaken $self;
		3066
		3067	$self->{buttonbar}->add (new CFClient::UI::Button
		3068	markup => $title,
		3069	tooltip => $tooltip,
		3070	on_activate => sub { $self->set_current_page ($widget) },
		3071	);
		3072
		3073	$self->{multiplexer}->add ($widget);
		3074	}
		3075
		3076	sub set_current_page {
		3077	my ($self, $page) = @_;
		3078
		3079	$self->{multiplexer}->set_current_page ($page);
		3080	$self->_emit (page_changed => $self->{multiplexer}{current});
		3081	}
		3082
		3083	#############################################################################
		3084
		3085	package CFClient::UI::Statusbox;
		3086
		3087	our @ISA = CFClient::UI::VBox::;
		3088
		3089	sub new {
		3090	my $class = shift;
		3091
		3092	my $self = $class->SUPER::new (
2945	fontsize => 0.8,	3093	fontsize => 0.8,
2946	@_,	3094	@_,
2947	)	3095	);
		3096
		3097	Scalar::Util::weaken (my $this = $self);
		3098
		3099	$self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
		3100
		3101	$self
2948	}	3102	}
2949		3103
2950	sub reorder {	3104	sub reorder {
2951	my ($self) = @_;	3105	my ($self) = @_;
2952	my $NOW = time;	3106	my $NOW = Time::HiRes::time;
		3107
		3108	# freeze display when hovering over any label
		3109	return if $CFClient::UI::TOOLTIP->{owner}
		3110	&& grep $CFClient::UI::TOOLTIP->{owner} == $_->{label},
		3111	values %{ $self->{item} };
2953		3112
2954	while (my ($k, $v) = each %{ $self->{item} }) {	3113	while (my ($k, $v) = each %{ $self->{item} }) {
2955	delete $self->{item}{$k} if $v->{timeout} < $NOW;	3114	delete $self->{item}{$k} if $v->{timeout} < $NOW;
2956	}	3115	}
2957		3116
…		…
2960	my @items = sort {	3119	my @items = sort {
2961	$a->{pri} <=> $b->{pri}	3120	$a->{pri} <=> $b->{pri}
2962	or $b->{id} <=> $a->{id}	3121	or $b->{id} <=> $a->{id}
2963	} values %{ $self->{item} };	3122	} values %{ $self->{item} };
2964		3123
		3124	$self->{timer}->interval (1);
		3125
2965	my $count = 10 + 1;	3126	my $count = 10 + 1;
2966	for my $item (@items) {	3127	for my $item (@items) {
2967	last unless --$count;	3128	last unless --$count;
2968		3129
2969	push @widgets, $item->{label} \|\|= do {	3130	my $label = $item->{label} \|\|= do {
2970	# TODO: doesn't handle markup well (read as: at all)	3131	# TODO: doesn't handle markup well (read as: at all)
2971	my $short = $item->{count} > 1	3132	my $short = $item->{count} > 1
2972	? "<b>$item->{count} ×</b> $item->{text}"	3133	? "<b>$item->{count} ×</b> $item->{text}"
2973	: $item->{text};	3134	: $item->{text};
2974		3135
…		…
2982	tooltip => $item->{tooltip},	3143	tooltip => $item->{tooltip},
2983	tooltip_font => $::FONT_PROP,	3144	tooltip_font => $::FONT_PROP,
2984	tooltip_width => 0.67,	3145	tooltip_width => 0.67,
2985	fontsize => $item->{fontsize} \|\| $self->{fontsize},	3146	fontsize => $item->{fontsize} \|\| $self->{fontsize},
2986	max_w => $::WIDTH * 0.44,	3147	max_w => $::WIDTH * 0.44,
2987	fg => $item->{fg},	3148	fg => [@{ $item->{fg} }],
2988	can_events => 1,	3149	can_events => 1,
2989	can_hover => 1	3150	can_hover => 1
2990	};	3151	};
		3152
		3153	if ((my $diff = $item->{timeout} - $NOW) < 2) {
		3154	$label->{fg}[3] = ($item->{fg}[3] \|\| 1) * $diff / 2;
		3155	$label->update;
		3156	$label->set_max_size (undef, $label->{req_h} * $diff)
		3157	if $diff < 1;
		3158	$self->{timer}->interval (1/30);
		3159	} else {
		3160	$label->{fg}[3] = $item->{fg}[3] \|\| 1;
		3161	}
		3162
		3163	push @widgets, $label;
2991	}	3164	}
2992		3165
2993	$self->clear;	3166	$self->clear;
2994	$self->SUPER::add (reverse @widgets);	3167	$self->SUPER::add (reverse @widgets);
2995	}	3168	}
…		…
3000	$text =~ s/^\s+//;	3173	$text =~ s/^\s+//;
3001	$text =~ s/\s+$//;	3174	$text =~ s/\s+$//;
3002		3175
3003	return unless $text;	3176	return unless $text;
3004		3177
3005	my $timeout = time + ((delete $arg{timeout}) \|\| 60);	3178	my $timeout = (int time) + ((delete $arg{timeout}) \|\| 60);
3006		3179
3007	my $group = exists $arg{group} ? $arg{group} : ++$self->{id};	3180	my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
3008		3181
3009	if (my $item = $self->{item}{$group}) {	3182	if (my $item = $self->{item}{$group}) {
3010	if ($item->{text} eq $text) {	3183	if ($item->{text} eq $text) {
…		…
3040		3213
3041	$self->reorder;	3214	$self->reorder;
3042	$self->SUPER::reconfigure;	3215	$self->SUPER::reconfigure;
3043	}	3216	}
3044		3217
		3218	sub DESTROY {
		3219	my ($self) = @_;
		3220
		3221	$self->{timer}->cancel;
		3222
		3223	$self->SUPER::DESTROY;
		3224	}
		3225
3045	#############################################################################	3226	#############################################################################
3046		3227
3047	package CFClient::UI::Inventory;	3228	package CFClient::UI::Inventory;
3048		3229
3049	our @ISA = CFClient::UI::ScrolledWindow::;	3230	our @ISA = CFClient::UI::ScrolledWindow::;
3050		3231
3051	sub new {	3232	sub new {
3052	my $class = shift;	3233	my $class = shift;
3053		3234
3054	my $self = $class->SUPER::new (	3235	my $self = $class->SUPER::new (
3055	scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),	3236	child => (new CFClient::UI::Table col_expand => [0, 1, 0]),
3056	@_,	3237	@_,
3057	);	3238	);
3058		3239
3059	$self	3240	$self
3060	}	3241	}
3061		3242
3062	sub set_items {	3243	sub set_items {
3063	my ($self, $items) = @_;	3244	my ($self, $items) = @_;
3064		3245
3065	$self->{scrolled}->clear;	3246	$self->{child}->clear;
3066	return unless $items;	3247	return unless $items;
3067		3248
3068	my @items = sort {	3249	my @items = sort {
3069	($a->{type} <=> $b->{type})	3250	($a->{type} <=> $b->{type})
3070	or ($a->{name} cmp $b->{name})	3251	or ($a->{name} cmp $b->{name})
…		…
3074		3255
3075	my $row = 0;	3256	my $row = 0;
3076	for my $item (@items) {	3257	for my $item (@items) {
3077	CFClient::Item::update_widgets $item;	3258	CFClient::Item::update_widgets $item;
3078		3259
3079	$self->{scrolled}->add (0, $row, $item->{face_widget});	3260	$self->{child}->add (0, $row, $item->{face_widget});
3080	$self->{scrolled}->add (1, $row, $item->{desc_widget});	3261	$self->{child}->add (1, $row, $item->{desc_widget});
3081	$self->{scrolled}->add (2, $row, $item->{weight_widget});	3262	$self->{child}->add (2, $row, $item->{weight_widget});
3082		3263
3083	$row++;	3264	$row++;
3084	}	3265	}
3085	}	3266	}
3086		3267
…		…
3283		3464
3284	#############################################################################	3465	#############################################################################
3285		3466
3286	package CFClient::UI::SpellList;	3467	package CFClient::UI::SpellList;
3287		3468
3288	our @ISA = CFClient::UI::FancyFrame::;	3469	our @ISA = CFClient::UI::Table::;
3289		3470
3290	sub new {	3471	sub new {
3291	my $class = shift;	3472	my $class = shift;
3292		3473
3293	my $self = $class->SUPER::new (binding => [], commands => [], @_);	3474	my $self = $class->SUPER::new (
3294		3475	binding => [],
3295	$self->add (new CFClient::UI::ScrolledWindow	3476	commands => [],
3296	scrolled => $self->{spellbox} = new CFClient::UI::Table);	3477	@_,
3297		3478	)
3298	$self;
3299	}	3479	}
3300		3480
3301	# XXX: Do sorting? Argl...	3481	# XXX: Do sorting? Argl...
3302	sub add_spell {	3482	sub add_spell {
3303	my ($self, $spell) = @_;	3483	my ($self, $spell) = @_;
3304	$self->{spells}->{$spell->{name}} = $spell;	3484	$self->{spells}->{$spell->{name}} = $spell;
3305		3485
3306	$self->{spellbox}->add (0, $self->{tbl_idx}, new CFClient::UI::Face	3486	$self->add (0, $self->{tbl_idx}, new CFClient::UI::Face
3307	face => $spell->{face},	3487	face => $spell->{face},
3308	can_hover => 1,	3488	can_hover => 1,
3309	can_events => 1,	3489	can_events => 1,
3310	tooltip => $spell->{message});	3490	tooltip => $spell->{message});
3311		3491
3312	$self->{spellbox}->add (1, $self->{tbl_idx}, new CFClient::UI::Label	3492	$self->add (1, $self->{tbl_idx}, new CFClient::UI::Label
3313	text => $spell->{name},	3493	text => $spell->{name},
3314	can_hover => 1,	3494	can_hover => 1,
3315	can_events => 1,	3495	can_events => 1,
3316	tooltip => $spell->{message},	3496	tooltip => $spell->{message},
3317	expand => 1);	3497	expand => 1);
3318		3498
3319	$self->{spellbox}->add (2, $self->{tbl_idx}, new CFClient::UI::Label	3499	$self->add (2, $self->{tbl_idx}, new CFClient::UI::Label
3320	text => (sprintf "lvl: %2d sp: %2d dmg: %2d",	3500	text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
3321	$spell->{level}, ($spell->{mana} \|\| $spell->{grace}), $spell->{damage}),	3501	$spell->{level}, ($spell->{mana} \|\| $spell->{grace}), $spell->{damage}),
3322	expand => 1);	3502	expand => 1);
3323		3503
3324	$self->{spellbox}->add (3, $self->{tbl_idx}++, new CFClient::UI::Button	3504	$self->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
3325	text => "bind to key",	3505	text => "bind to key",
3326	on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });	3506	on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
3327	}	3507	}
3328		3508
3329	sub rebuild_spell_list {	3509	sub rebuild_spell_list {
…		…
3341	#############################################################################	3521	#############################################################################
3342		3522
3343	package CFClient::UI::Root;	3523	package CFClient::UI::Root;
3344		3524
3345	our @ISA = CFClient::UI::Container::;	3525	our @ISA = CFClient::UI::Container::;
		3526
		3527	use List::Util qw(min max);
3346		3528
3347	use CFClient::OpenGL;	3529	use CFClient::OpenGL;
3348		3530
3349	sub new {	3531	sub new {
3350	my $class = shift;	3532	my $class = shift;
…		…
3485		3667
3486	delete $queue{$widget+0};	3668	delete $queue{$widget+0};
3487		3669
3488	my ($w, $h) = $widget->size_request;	3670	my ($w, $h) = $widget->size_request;
3489		3671
3490	$w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2;	3672	$w = max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3491	$h = List::Util::max $widget->{min_h}, $h + $widget->{padding_y} * 2;	3673	$h = max $widget->{min_h}, $h + $widget->{padding_y} * 2;
		3674
		3675	$w = min $widget->{max_w}, $w if exists $widget->{max_w};
		3676	$h = min $widget->{max_h}, $h if exists $widget->{max_h};
3492		3677
3493	$w = $widget->{force_w} if exists $widget->{force_w};	3678	$w = $widget->{force_w} if exists $widget->{force_w};
3494	$h = $widget->{force_h} if exists $widget->{force_h};	3679	$h = $widget->{force_h} if exists $widget->{force_h};
3495		3680
3496	if ($widget->{req_w} != $w \|\| $widget->{req_h} != $h	3681	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.271 by root, Fri Jun 2 22:13:47 2006 UTC vs. Revision 1.287 by root, Mon Jun 5 05:31:13 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.271 by root, Fri Jun 2 22:13:47 2006 UTC vs.
Revision 1.287 by root, Mon Jun 5 05:31:13 2006 UTC