ViewVC Help

View File | Revision Log | Show Annotations | Download File

/cvs/deliantra/Deliantra-Client/DC/UI.pm

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.267 by root, Thu Jun 1 04:10:29 2006 UTC vs.
Revision 1.291 by root, Tue Jun 6 02:55:50 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	}
…		…
171	sub rescale_widgets {	172	sub rescale_widgets {
172	my ($sx, $sy) = @_;	173	my ($sx, $sy) = @_;
173		174
174	for my $widget (values %WIDGET) {	175	for my $widget (values %WIDGET) {
175	if ($widget->{is_toplevel}) {	176	if ($widget->{is_toplevel}) {
176	$widget->{x} += $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;	177	$widget->{x} += int $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
177	$widget->{y} += $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;	178	$widget->{y} += int $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
178		179
179	$widget->{x} = int 0.5 + $widget->{x} * $sx if $widget->{x} =~ /^[0-9.]+$/;	180	$widget->{x} = int 0.5 + $widget->{x} * $sx if $widget->{x} =~ /^[0-9.]+$/;
180	$widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};	181	$widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};
181	$widget->{force_w} = int 0.5 + $widget->{force_w} * $sx if exists $widget->{force_w};	182	$widget->{force_w} = int 0.5 + $widget->{force_w} * $sx if exists $widget->{force_w};
182	$widget->{y} = int 0.5 + $widget->{y} * $sy if $widget->{y} =~ /^[0-9.]+$/;	183	$widget->{y} = int 0.5 + $widget->{y} * $sy if $widget->{y} =~ /^[0-9.]+$/;
183	$widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};	184	$widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};
184	$widget->{force_h} = int 0.5 + $widget->{force_h} * $sy if exists $widget->{force_h};	185	$widget->{force_h} = int 0.5 + $widget->{force_h} * $sy if exists $widget->{force_h};
185		186
186	$widget->{x} -= $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;	187	$widget->{x} -= int $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
187	$widget->{y} -= $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;	188	$widget->{y} -= int $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
188		189
189	}	190	}
190	}	191	}
191		192
192	reconfigure_widgets;	193	reconfigure_widgets;
…		…
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 {
…		…
439		447
440	$::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus	448	$::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus
441	unless $FOCUS;	449	unless $FOCUS;
442	}	450	}
443		451
444	sub mouse_motion { }	452	sub mouse_motion { 0 }
445	sub button_up { }	453	sub button_up { 0 }
446	sub key_down { }	454	sub key_down { 0 }
447	sub key_up { }	455	sub key_up { 0 }
448		456
449	sub button_down {	457	sub button_down {
450	my ($self, $ev, $x, $y) = @_;	458	my ($self, $ev, $x, $y) = @_;
451		459
452	$self->focus_in;	460	$self->focus_in;
		461
		462	0
453	}	463	}
454		464
455	sub find_widget {	465	sub find_widget {
456	my ($self, $x, $y) = @_;	466	my ($self, $x, $y) = @_;
457		467
…		…
529	sub draw {	539	sub draw {
530	my ($self) = @_;	540	my ($self) = @_;
531		541
532	return unless $self->{h} && $self->{w};	542	return unless $self->{h} && $self->{w};
533		543
		544	# update screen rectangle
534	local $draw_x = $draw_x + $self->{x};	545	local $draw_x = $draw_x + $self->{x};
535	local $draw_y = $draw_y + $self->{y};	546	local $draw_y = $draw_y + $self->{y};
		547	local $draw_w = $draw_x + $self->{w};
		548	local $draw_h = $draw_y + $self->{h};
536		549
537	return if $draw_x + $self->{w} < 0;	550	# skip widgets that are entirely outside the drawing area
538	return if $draw_x >= $draw_w;	551	return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
539	return if $draw_y + $self->{h} < 0;	552	|| ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
540	return if $draw_y >= $draw_h;
541		553
542	glPushMatrix;	554	glPushMatrix;
543	glTranslate $self->{x}, $self->{y}, 0;	555	glTranslate $self->{x}, $self->{y}, 0;
544	$self->_draw;
545	glPopMatrix;
546		556
547	if ($self == $HOVER && $self->{can_hover}) {	557	if ($self == $HOVER && $self->{can_hover}) {
548	my ($x, $y) = @$self{qw(x y)};
549
550	glColor 1, 0.8, 0.5, 0.2;	558	glColor 1*0.2, 0.8*0.2, 0.5*0.2, 0.2;
551	glEnable GL_BLEND;	559	glEnable GL_BLEND;
552	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	560	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
553	glBegin GL_QUADS;	561	glBegin GL_QUADS;
554	glVertex $x , $y;	562	glVertex 0 , 0;
555	glVertex $x + $self->{w}, $y;	563	glVertex $self->{w}, 0;
556	glVertex $x + $self->{w}, $y + $self->{h};	564	glVertex $self->{w}, $self->{h};
557	glVertex $x , $y + $self->{h};	565	glVertex 0 , $self->{h};
558	glEnd;	566	glEnd;
559	glDisable GL_BLEND;	567	glDisable GL_BLEND;
560	}	568	}
561		569
562	if ($ENV{CFPLUS_DEBUG} & 1) {	570	if ($ENV{CFPLUS_DEBUG} & 1) {
563	glPushMatrix;	571	glPushMatrix;
564	glColor 1, 1, 0, 1;	572	glColor 1, 1, 0, 1;
565	glTranslate $self->{x} + 0.375, $self->{y} + 0.375;	573	glTranslate 0.375, 0.375;
566	glBegin GL_LINE_LOOP;	574	glBegin GL_LINE_LOOP;
567	glVertex 0 , 0;	575	glVertex 0 , 0;
568	glVertex $self->{w} - 1, 0;	576	glVertex $self->{w} - 1, 0;
569	glVertex $self->{w} - 1, $self->{h} - 1;	577	glVertex $self->{w} - 1, $self->{h} - 1;
570	glVertex 0 , $self->{h} - 1;	578	glVertex 0 , $self->{h} - 1;
571	glEnd;	579	glEnd;
572	glPopMatrix;	580	glPopMatrix;
573	#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;
574	}	582	}
		583
		584	$self->_draw;
		585	glPopMatrix;
575	}	586	}
576		587
577	sub _draw {	588	sub _draw {
578	my ($self) = @_;	589	my ($self) = @_;
579		590
…		…
617		628
618	if ($color && (@$color < 4 || $color->[3])) {	629	if ($color && (@$color < 4 || $color->[3])) {
619	my ($w, $h) = @$self{qw(w h)};	630	my ($w, $h) = @$self{qw(w h)};
620		631
621	glEnable GL_BLEND;	632	glEnable GL_BLEND;
622	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	633	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
623	glColor @$color;	634	glColor_premultiply @$color;
624		635
625	glBegin GL_QUADS;	636	glBegin GL_QUADS;
626	glVertex 0 , 0;	637	glVertex 0 , 0;
627	glVertex 0 , $h;	638	glVertex 0 , $h;
628	glVertex $w, $h;	639	glVertex $w, $h;
…		…
659	our @ISA = CFClient::UI::Base::;	670	our @ISA = CFClient::UI::Base::;
660		671
661	sub new {	672	sub new {
662	my ($class, %arg) = @_;	673	my ($class, %arg) = @_;
663		674
664	my $children = delete $arg{children} || [];	675	my $children = delete $arg{children};
665		676
666	my $self = $class->SUPER::new (	677	my $self = $class->SUPER::new (
667	children => [],	678	children => [],
668	can_events => 0,	679	can_events => 0,
669	%arg,	680	%arg,
670	);	681	);
		682
671	$self->add ($_) for @$children;	683	$self->add (@$children)
		684	if $children;
672		685
673	$self	686	$self
674	}	687	}
675		688
676	sub add {	689	sub add {
…		…
724	$x -= $self->{x};	737	$x -= $self->{x};
725	$y -= $self->{y};	738	$y -= $self->{y};
726		739
727	my $res;	740	my $res;
728		741
729	for (reverse @{ $self->{children} }) {	742	for (reverse $self->visible_children) {
730	$res = $_->find_widget ($x, $y)	743	$res = $_->find_widget ($x, $y)
731	and return $res;	744	and return $res;
732	}	745	}
733		746
734	$self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})	747	$self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
…		…
783	$self->{children}[0]->configure (0, 0, $w, $h);	796	$self->{children}[0]->configure (0, 0, $w, $h);
784	}	797	}
785		798
786	#############################################################################	799	#############################################################################
787		800
		801	# back-buffered drawing area
		802
788	package CFClient::UI::Window;	803	package CFClient::UI::Window;
789		804
790	our @ISA = CFClient::UI::Bin::;	805	our @ISA = CFClient::UI::Bin::;
791		806
792	use CFClient::OpenGL;	807	use CFClient::OpenGL;
…		…
843	my $tex = $self->{texture}	858	my $tex = $self->{texture}
844	or return;	859	or return;
845		860
846	glEnable GL_TEXTURE_2D;	861	glEnable GL_TEXTURE_2D;
847	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	862	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
848	glColor 1, 1, 1, 1;	863	glColor 0, 0, 0, 1;
849		864
850	$tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);	865	$tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
851		866
852	glDisable GL_TEXTURE_2D;	867	glDisable GL_TEXTURE_2D;
853	}	868	}
…		…
944	package CFClient::UI::ScrolledWindow;	959	package CFClient::UI::ScrolledWindow;
945		960
946	our @ISA = CFClient::UI::HBox::;	961	our @ISA = CFClient::UI::HBox::;
947		962
948	sub new {	963	sub new {
949	my $class = shift;	964	my ($class, %arg) = @_;
		965
		966	my $child = delete $arg{child};
950		967
951	my $self;	968	my $self;
952		969
953	my $slider = new CFClient::UI::Slider	970	my $slider = new CFClient::UI::Slider
954	vertical => 1,	971	vertical => 1,
…		…
959	;	976	;
960		977
961	$self = $class->SUPER::new (	978	$self = $class->SUPER::new (
962	vp => (new CFClient::UI::ViewPort expand => 1),	979	vp => (new CFClient::UI::ViewPort expand => 1),
963	slider => $slider,	980	slider => $slider,
964	@_,	981	%arg,
965	);	982	);
966		983
967	$self->{vp}->add ($self->{scrolled});
968	$self->add ($self->{vp});
969	$self->add ($self->{slider});	984	$self->SUPER::add ($self->{vp}, $self->{slider});
		985	$self->add ($child) if $child;
970		986
971	$self	987	$self
		988	}
		989
		990	sub add {
		991	my ($self, $widget) = @_;
		992
		993	$self->{vp}->add ($self->{child} = $widget);
972	}	994	}
973		995
974	sub update {	996	sub update {
975	my ($self) = @_;	997	my ($self) = @_;
976		998
…		…
1015		1037
1016	if ($self->{bg}) {	1038	if ($self->{bg}) {
1017	my ($w, $h) = @$self{qw(w h)};	1039	my ($w, $h) = @$self{qw(w h)};
1018		1040
1019	glEnable GL_BLEND;	1041	glEnable GL_BLEND;
1020	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	1042	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1021	glColor @{ $self->{bg} };	1043	glColor_premultiply @{ $self->{bg} };
1022		1044
1023	glBegin GL_QUADS;	1045	glBegin GL_QUADS;
1024	glVertex 0 , 0;	1046	glVertex 0 , 0;
1025	glVertex 0 , $h;	1047	glVertex 0 , $h;
1026	glVertex $w, $h;	1048	glVertex $w, $h;
…		…
1048	my @border =	1070	my @border =
1049	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	1071	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1050	qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);	1072	qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1051		1073
1052	sub new {	1074	sub new {
1053	my $class = shift;	1075	my ($class, %arg) = @_;
		1076
		1077	my $title = delete $arg{title};
1054		1078
1055	my $self = $class->SUPER::new (	1079	my $self = $class->SUPER::new (
1056	bg => [1, 1, 1, 1],	1080	bg => [1, 1, 1, 1],
1057	border_bg => [1, 1, 1, 1],	1081	border_bg => [1, 1, 1, 1],
1058	border => 0.6,	1082	border => 0.6,
1059	can_events => 1,	1083	can_events => 1,
1060	min_w => 16,	1084	min_w => 16,
1061	min_h => 16,	1085	min_h => 16,
1062	@_	1086	%arg,
1063	);	1087	);
1064		1088
1065	$self->{title} &&= new CFClient::UI::Label	1089	$self->{title} = new CFClient::UI::Label
1066	align => 0,	1090	align => 0,
1067	valign => 1,	1091	valign => 1,
1068	text => $self->{title},	1092	text => $title,
1069	fontsize => $self->{border};	1093	fontsize => $self->{border}
		1094	if defined $title;
1070		1095
1071	$self	1096	$self
		1097	}
		1098
		1099	sub add {
		1100	my ($self, @widgets) = @_;
		1101
		1102	$self->SUPER::add (@widgets);
		1103	$self->CFClient::UI::Container::add ($self->{title}) if $self->{title};
1072	}	1104	}
1073		1105
1074	sub border {	1106	sub border {
1075	int $_[0]{border} * $::FONTSIZE	1107	int $_[0]{border} * $::FONTSIZE
1076	}	1108	}
1077		1109
1078	sub size_request {	1110	sub size_request {
1079	my ($self) = @_;	1111	my ($self) = @_;
		1112
		1113	$self->{title}->size_request
		1114	if $self->{title};
1080		1115
1081	my ($w, $h) = $self->SUPER::size_request;	1116	my ($w, $h) = $self->SUPER::size_request;
1082		1117
1083	(	1118	(
1084	$w + $self->border * 2,	1119	$w + $self->border * 2,
…		…
1087	}	1122	}
1088		1123
1089	sub size_allocate {	1124	sub size_allocate {
1090	my ($self, $w, $h) = @_;	1125	my ($self, $w, $h) = @_;
1091		1126
		1127	if ($self->{title}) {
		1128	$self->{title}{w} = $w;
		1129	$self->{title}{h} = $h;
		1130	$self->{title}->size_allocate ($w, $h);
		1131	}
		1132
		1133	my $border = $self->border;
		1134
1092	$h -= List::Util::max 0, $self->border * 2;	1135	$h -= List::Util::max 0, $border * 2;
1093	$w -= List::Util::max 0, $self->border * 2;	1136	$w -= List::Util::max 0, $border * 2;
1094		1137
1095	$self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
1096	if $self->{title};
1097
1098	$self->child->configure ($self->border, $self->border, $w, $h);	1138	$self->child->configure ($border, $border, $w, $h);
1099	}	1139	}
1100		1140
1101	sub button_down {	1141	sub button_down {
1102	my ($self, $ev, $x, $y) = @_;	1142	my ($self, $ev, $x, $y) = @_;
1103		1143
…		…
1122	my $dy = $ev->{y} - $oy;	1162	my $dy = $ev->{y} - $oy;
1123		1163
1124	$self->{force_w} = $bw + $dx * ($mx ? -1 : 1);	1164	$self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
1125	$self->{force_h} = $bh + $dy * ($my ? -1 : 1);	1165	$self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1126		1166
		1167	$self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1127	$self->realloc;	1168	$self->realloc;
1128	$self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1129	};	1169	};
1130		1170
1131	} elsif ($lr ^ $td) {	1171	} elsif ($lr ^ $td) {
1132	my ($ox, $oy) = ($ev->{x}, $ev->{y});	1172	my ($ox, $oy) = ($ev->{x}, $ev->{y});
1133	my ($bx, $by) = ($self->{x}, $self->{y});	1173	my ($bx, $by) = ($self->{x}, $self->{y});
…		…
1136	my ($ev, $x, $y) = @_;	1176	my ($ev, $x, $y) = @_;
1137		1177
1138	($x, $y) = ($ev->{x}, $ev->{y});	1178	($x, $y) = ($ev->{x}, $ev->{y});
1139		1179
1140	$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});
1141	};	1183	};
		1184	} else {
		1185	return 0;
		1186	}
		1187
1142	}	1188	1
1143	}	1189	}
1144		1190
1145	sub button_up {	1191	sub button_up {
1146	my ($self, $ev, $x, $y) = @_;	1192	my ($self, $ev, $x, $y) = @_;
1147		1193
1148	delete $self->{motion};	1194	!!delete $self->{motion}
1149	}	1195	}
1150		1196
1151	sub mouse_motion {	1197	sub mouse_motion {
1152	my ($self, $ev, $x, $y) = @_;	1198	my ($self, $ev, $x, $y) = @_;
1153		1199
1154	$self->{motion}->($ev, $x, $y) if $self->{motion};	1200	$self->{motion}->($ev, $x, $y) if $self->{motion};
		1201
		1202	!!$self->{motion}
1155	}	1203	}
1156		1204
1157	sub _draw {	1205	sub _draw {
1158	my ($self) = @_;	1206	my ($self) = @_;
1159		1207
		1208	my $child = $self->{children}[0];
		1209
1160	my ($w, $h ) = ($self->{w}, $self->{h});	1210	my ($w, $h ) = ($self->{w}, $self->{h});
1161	my ($cw, $ch) = ($self->child->{w}, $self->child->{h});	1211	my ($cw, $ch) = ($child->{w}, $child->{h});
1162		1212
1163	glEnable GL_TEXTURE_2D;	1213	glEnable GL_TEXTURE_2D;
1164	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	1214	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1165		1215
1166	my $border = $self->border;	1216	my $border = $self->border;
…		…
1181	$bg->draw_quad_alpha ($border, $border, $cw, $ch);	1231	$bg->draw_quad_alpha ($border, $border, $cw, $ch);
1182	}	1232	}
1183		1233
1184	glDisable GL_TEXTURE_2D;	1234	glDisable GL_TEXTURE_2D;
1185		1235
1186	$self->{title}->draw if $self->{title};
1187
1188	$self->child->draw;	1236	$child->draw;
		1237
		1238	if ($self->{title}) {
		1239	glTranslate 0, $border - $self->{h};
		1240	$self->{title}->_draw;
		1241	}
1189	}	1242	}
1190		1243
1191	#############################################################################	1244	#############################################################################
1192		1245
1193	package CFClient::UI::Table;	1246	package CFClient::UI::Table;
…		…
1486		1539
1487	delete $self->{texture};	1540	delete $self->{texture};
1488	$self->SUPER::update;	1541	$self->SUPER::update;
1489	}	1542	}
1490		1543
		1544	sub realloc {
		1545	my ($self) = @_;
		1546
		1547	delete $self->{ox};
		1548	$self->SUPER::realloc;
		1549	}
		1550
1491	sub set_text {	1551	sub set_text {
1492	my ($self, $text) = @_;	1552	my ($self, $text) = @_;
1493		1553
1494	return if $self->{text} eq "T$text";	1554	return if $self->{text} eq "T$text";
1495	$self->{text} = "T$text";	1555	$self->{text} = "T$text";
1496		1556
1497	$self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;	1557	$self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1498	$self->{layout}->set_text ($text);	1558	$self->{layout}->set_text ($text);
1499		1559
		1560	delete $self->{size_req};
1500	$self->realloc;	1561	$self->realloc;
1501	$self->update;	1562	$self->update;
1502	}	1563	}
1503		1564
1504	sub set_markup {	1565	sub set_markup {
…		…
1510	my $rgba = $markup =~ /span.*(?:foreground|background)/;	1571	my $rgba = $markup =~ /span.*(?:foreground|background)/;
1511		1572
1512	$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;
1513	$self->{layout}->set_markup ($markup);	1574	$self->{layout}->set_markup ($markup);
1514		1575
		1576	delete $self->{size_req};
1515	$self->realloc;	1577	$self->realloc;
1516	$self->update;	1578	$self->update;
1517	}	1579	}
1518		1580
1519	sub size_request {	1581	sub size_request {
1520	my ($self) = @_;	1582	my ($self) = @_;
1521		1583
		1584	$self->{size_req} ||= do {
1522	$self->{layout}->set_font ($self->{font}) if $self->{font};	1585	$self->{layout}->set_font ($self->{font}) if $self->{font};
1523	$self->{layout}->set_width ($self->{max_w} || -1);	1586	$self->{layout}->set_width ($self->{max_w} || -1);
1524	$self->{layout}->set_ellipsise ($self->{ellipsise});	1587	$self->{layout}->set_ellipsise ($self->{ellipsise});
1525	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});	1588	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1526	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	1589	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1527		1590
1528	my ($w, $h) = $self->{layout}->size;	1591	my ($w, $h) = $self->{layout}->size;
1529		1592
1530	if (exists $self->{template}) {	1593	if (exists $self->{template}) {
1531	$self->{template}->set_font ($self->{font}) if $self->{font};	1594	$self->{template}->set_font ($self->{font}) if $self->{font};
1532	$self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);	1595	$self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1533		1596
1534	my ($w2, $h2) = $self->{template}->size;	1597	my ($w2, $h2) = $self->{template}->size;
1535		1598
1536	$w = List::Util::max $w, $w2;	1599	$w = List::Util::max $w, $w2;
1537	$h = List::Util::max $h, $h2;	1600	$h = List::Util::max $h, $h2;
		1601	}
		1602
		1603	[$w, $h]
1538	}	1604	};
1539		1605
1540	($w, $h)	1606	@{ $self->{size_req} }
1541	}	1607	}
1542		1608
1543	sub size_allocate {	1609	sub size_allocate {
1544	my ($self, $w, $h) = @_;	1610	my ($self, $w, $h) = @_;
1545		1611
		1612	delete $self->{ox};
		1613
1546	delete $self->{texture}	1614	delete $self->{texture}
1547	unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};	1615	unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1548	}	1616	}
1549		1617
1550	sub set_fontsize {	1618	sub set_fontsize {
…		…
1552		1620
1553	$self->{fontsize} = $fontsize;	1621	$self->{fontsize} = $fontsize;
1554	delete $self->{texture};	1622	delete $self->{texture};
1555		1623
1556	$self->realloc;	1624	$self->realloc;
		1625	}
		1626
		1627	sub reconfigure {
		1628	my ($self) = @_;
		1629
		1630	delete $self->{size_req};
		1631
		1632	$self->SUPER::reconfigure;
1557	}	1633	}
1558		1634
1559	sub _draw {	1635	sub _draw {
1560	my ($self) = @_;	1636	my ($self) = @_;
1561		1637
…		…
1567	$self->{layout}->set_width ($self->{w});	1643	$self->{layout}->set_width ($self->{w});
1568	$self->{layout}->set_ellipsise ($self->{ellipsise});	1644	$self->{layout}->set_ellipsise ($self->{ellipsise});
1569	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});	1645	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1570	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	1646	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1571		1647
1572	my $tex = new_from_layout CFClient::Texture $self->{layout};	1648	new_from_layout CFClient::Texture $self->{layout}
		1649	};
1573		1650
		1651	unless (exists $self->{ox}) {
1574	$self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}	1652	$self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1575	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}	1653	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1576	: ($self->{w} - $tex->{w}) * 0.5);	1654	: ($self->{w} - $tex->{w}) * 0.5);
1577		1655
1578	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}	1656	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1579	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}	1657	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1580	: ($self->{h} - $tex->{h}) * 0.5);	1658	: ($self->{h} - $tex->{h}) * 0.5);
1581
1582	$tex
1583	};	1659	};
1584		1660
1585	glEnable GL_TEXTURE_2D;	1661	glEnable GL_TEXTURE_2D;
1586	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1587		1662
1588	if ($tex->{format} == GL_ALPHA) {	1663	if ($tex->{format} == GL_ALPHA) {
		1664	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1589	glColor @{$self->{fg}};	1665	glColor @{$self->{fg}};
1590	$tex->draw_quad_alpha ($self->{ox}, $self->{oy});	1666	$tex->draw_quad_alpha ($self->{ox}, $self->{oy});
1591	} else {	1667	} else {
		1668	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1592	$tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});	1669	$tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1593	}	1670	}
1594		1671
1595	glDisable GL_TEXTURE_2D;	1672	glDisable GL_TEXTURE_2D;
1596	}	1673	}
…		…
1614	can_hover => 1,	1691	can_hover => 1,
1615	can_focus => 1,	1692	can_focus => 1,
1616	valign => 0,	1693	valign => 0,
1617	can_events => 1,	1694	can_events => 1,
1618	#text => ...	1695	#text => ...
		1696	#hidden => "*",
1619	@_	1697	@_
1620	)	1698	)
1621	}	1699	}
1622		1700
1623	sub _set_text {	1701	sub _set_text {
…		…
1625		1703
1626	delete $self->{cur_h};	1704	delete $self->{cur_h};
1627		1705
1628	return if $self->{text} eq $text;	1706	return if $self->{text} eq $text;
1629		1707
1630	delete $self->{texture};
1631
1632	$self->{last_activity} = $::NOW;	1708	$self->{last_activity} = $::NOW;
1633	$self->{text} = $text;	1709	$self->{text} = $text;
1634		1710
1635	$text =~ s/./*/g if $self->{hidden};	1711	$text =~ s/./*/g if $self->{hidden};
1636	$self->{layout}->set_text ("$text ");	1712	$self->{layout}->set_text ("$text ");
		1713	delete $self->{size_req};
1637		1714
1638	$self->_emit (changed => $self->{text});	1715	$self->_emit (changed => $self->{text});
		1716
		1717	$self->realloc;
		1718	$self->update;
1639	}	1719	}
1640		1720
1641	sub set_text {	1721	sub set_text {
1642	my ($self, $text) = @_;	1722	my ($self, $text) = @_;
1643		1723
1644	$self->{cursor} = length $text;	1724	$self->{cursor} = length $text;
1645	$self->_set_text ($text);	1725	$self->_set_text ($text);
1646
1647	$self->realloc;
1648	}	1726	}
1649		1727
1650	sub get_text {	1728	sub get_text {
1651	$_[0]{text}	1729	$_[0]{text}
1652	}	1730	}
…		…
1682	$self->{cursor} = length $text;	1760	$self->{cursor} = length $text;
1683	} elsif ($uni == 27) {	1761	} elsif ($uni == 27) {
1684	$self->_emit ('escape');	1762	$self->_emit ('escape');
1685	} elsif ($uni) {	1763	} elsif ($uni) {
1686	substr $text, $self->{cursor}++, 0, chr $uni;	1764	substr $text, $self->{cursor}++, 0, chr $uni;
		1765	} else {
		1766	return 0;
1687	}	1767	}
1688		1768
1689	$self->_set_text ($text);	1769	$self->_set_text ($text);
1690		1770
1691	$self->realloc;	1771	$self->realloc;
		1772
		1773	1
1692	}	1774	}
1693		1775
1694	sub focus_in {	1776	sub focus_in {
1695	my ($self) = @_;	1777	my ($self) = @_;
1696		1778
…		…
1711	utf8::encode $text;	1793	utf8::encode $text;
1712	$self->{cursor} = length substr $text, 0, $idx;	1794	$self->{cursor} = length substr $text, 0, $idx;
1713		1795
1714	$self->_set_text ($self->{text});	1796	$self->_set_text ($self->{text});
1715	$self->update;	1797	$self->update;
		1798
		1799	1
1716	}	1800	}
1717		1801
1718	sub mouse_motion {	1802	sub mouse_motion {
1719	my ($self, $ev, $x, $y) = @_;	1803	my ($self, $ev, $x, $y) = @_;
1720	# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#	1804	# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
		1805
		1806	0
1721	}	1807	}
1722		1808
1723	sub _draw {	1809	sub _draw {
1724	my ($self) = @_;	1810	my ($self) = @_;
1725		1811
1726	local $self->{fg} = $self->{fg};	1812	local $self->{fg} = $self->{fg};
1727		1813
1728	if ($FOCUS == $self) {	1814	if ($FOCUS == $self) {
1729	glColor @{$self->{active_bg}};	1815	glColor_premultiply @{$self->{active_bg}};
1730	$self->{fg} = $self->{active_fg};	1816	$self->{fg} = $self->{active_fg};
1731	} else {	1817	} else {
1732	glColor @{$self->{bg}};	1818	glColor_premultiply @{$self->{bg}};
1733	}	1819	}
1734		1820
1735	glEnable GL_BLEND;	1821	glEnable GL_BLEND;
1736	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	1822	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1737	glBegin GL_QUADS;	1823	glBegin GL_QUADS;
1738	glVertex 0 , 0;	1824	glVertex 0 , 0;
1739	glVertex 0 , $self->{h};	1825	glVertex 0 , $self->{h};
1740	glVertex $self->{w}, $self->{h};	1826	glVertex $self->{w}, $self->{h};
1741	glVertex $self->{w}, 0;	1827	glVertex $self->{w}, 0;
…		…
1802	} else {	1888	} else {
1803	$self->set_text ($self->{history_saveback});	1889	$self->set_text ($self->{history_saveback});
1804	}	1890	}
1805		1891
1806	} else {	1892	} else {
1807	$self->SUPER::key_down ($ev);	1893	return $self->SUPER::key_down ($ev)
		1894	}
		1895
1808	}	1896	1
1809
1810	}	1897	}
1811		1898
1812	#############################################################################	1899	#############################################################################
1813		1900
1814	package CFClient::UI::Button;	1901	package CFClient::UI::Button;
…		…
1843	my ($self, $ev, $x, $y) = @_;	1930	my ($self, $ev, $x, $y) = @_;
1844		1931
1845	$self->emit ("activate")	1932	$self->emit ("activate")
1846	if $x >= 0 && $x < $self->{w}	1933	if $x >= 0 && $x < $self->{w}
1847	&& $y >= 0 && $y < $self->{h};	1934	&& $y >= 0 && $y < $self->{h};
		1935
		1936	1
1848	}	1937	}
1849		1938
1850	sub _draw {	1939	sub _draw {
1851	my ($self) = @_;	1940	my ($self) = @_;
1852		1941
1853	local $self->{fg} = $self->{fg};	1942	local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1854
1855	if ($GRAB == $self) {
1856	$self->{fg} = $self->{active_fg};
1857	}
1858		1943
1859	glEnable GL_TEXTURE_2D;	1944	glEnable GL_TEXTURE_2D;
1860	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	1945	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1861	glColor 0, 0, 0, 1;	1946	glColor 0, 0, 0, 1;
1862		1947
…		…
1906		1991
1907	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}	1992	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1908	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {	1993	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1909	$self->{state} = !$self->{state};	1994	$self->{state} = !$self->{state};
1910	$self->_emit (changed => $self->{state});	1995	$self->_emit (changed => $self->{state});
		1996	} else {
		1997	return 0
		1998	}
		1999
1911	}	2000	1
1912	}	2001	}
1913		2002
1914	sub _draw {	2003	sub _draw {
1915	my ($self) = @_;	2004	my ($self) = @_;
1916		2005
…		…
2083		2172
2084	my $h1 = $self->{h} * (1 - $ycut1);	2173	my $h1 = $self->{h} * (1 - $ycut1);
2085	my $h2 = $self->{h} * (1 - $ycut2);	2174	my $h2 = $self->{h} * (1 - $ycut2);
2086		2175
2087	glEnable GL_BLEND;	2176	glEnable GL_BLEND;
2088	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;
2089	glEnable GL_TEXTURE_2D;	2179	glEnable GL_TEXTURE_2D;
2090	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2180	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2091		2181
2092	glBindTexture GL_TEXTURE_2D, $t1->{name};	2182	glBindTexture GL_TEXTURE_2D, $t1->{name};
2093	glBegin GL_QUADS;	2183	glBegin GL_QUADS;
…		…
2254		2344
2255	$self->SUPER::button_down ($ev, $x, $y);	2345	$self->SUPER::button_down ($ev, $x, $y);
2256		2346
2257	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];	2347	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2258		2348
2259	$self->mouse_motion ($ev, $x, $y);	2349	$self->mouse_motion ($ev, $x, $y)
2260	}	2350	}
2261		2351
2262	sub mouse_motion {	2352	sub mouse_motion {
2263	my ($self, $ev, $x, $y) = @_;	2353	my ($self, $ev, $x, $y) = @_;
2264		2354
…		…
2268	my (undef, $lo, $hi, $page) = @{$self->{range}};	2358	my (undef, $lo, $hi, $page) = @{$self->{range}};
2269		2359
2270	$x = ($x - $self->{click}[1]) / ($w * $self->{scale});	2360	$x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2271		2361
2272	$self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));	2362	$self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
		2363	} else {
		2364	return 0;
		2365	}
		2366
2273	}	2367	1
2274	}	2368	}
2275		2369
2276	sub update {	2370	sub update {
2277	my ($self) = @_;	2371	my ($self) = @_;
2278		2372
2279	$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}) {
2280	$self->set_value ($self->{range}[0]);	2381	$self->set_value ($self->{range}[0]);
2281		2382
2282	my ($value, $lo, $hi, $page) = @{$self->{range}};	2383	my ($value, $lo, $hi, $page) = @{$self->{range}};
2283	my $range = ($hi - $page - $lo) || 1e-100;	2384	my $range = ($hi - $page - $lo) || 1e-100;
2284		2385
…		…
2290	$value = ($value - $lo) / $range;	2391	$value = ($value - $lo) / $range;
2291	$value = $value * $self->{scale} + $self->{offset};	2392	$value = $value * $self->{scale} + $self->{offset};
2292		2393
2293	$self->{knob_x} = $value - $knob_w * 0.5;	2394	$self->{knob_x} = $value - $knob_w * 0.5;
2294	$self->{knob_w} = $knob_w;	2395	$self->{knob_w} = $knob_w;
2295	});	2396	}
2296
2297	$self->SUPER::update;
2298	}
2299
2300	sub _draw {
2301	my ($self) = @_;
2302		2397
2303	$self->SUPER::_draw ();	2398	$self->SUPER::_draw ();
2304		2399
2305	glScale $self->{w}, $self->{h};	2400	glScale $self->{w}, $self->{h};
2306		2401
…		…
2500		2595
2501	delete $self->{texture};	2596	delete $self->{texture};
2502	}	2597	}
2503		2598
2504	$self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {	2599	$self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2505	glClearColor 0.5, 0.5, 0.5, 0;	2600	glClearColor 0, 0, 0, 0;
2506	glClear GL_COLOR_BUFFER_BIT;	2601	glClear GL_COLOR_BUFFER_BIT;
2507		2602
2508	my $top = int $self->{children}[1]{range}[0];	2603	my $top = int $self->{children}[1]{range}[0];
2509		2604
2510	my $y0 = $top;	2605	my $y0 = $top;
…		…
2545	sub _draw {	2640	sub _draw {
2546	my ($self) = @_;	2641	my ($self) = @_;
2547		2642
2548	glEnable GL_TEXTURE_2D;	2643	glEnable GL_TEXTURE_2D;
2549	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2644	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2550	glColor 1, 1, 1, 1;	2645	glColor 0, 0, 0, 1;
2551	$self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});	2646	$self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2552	glDisable GL_TEXTURE_2D;	2647	glDisable GL_TEXTURE_2D;
2553		2648
2554	$self->{children}[1]->draw;	2649	$self->{children}[1]->draw;
2555		2650
2556	}	2651	}
…		…
2783	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];	2878	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2784		2879
2785	if ($tex) {	2880	if ($tex) {
2786	glEnable GL_TEXTURE_2D;	2881	glEnable GL_TEXTURE_2D;
2787	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2882	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2788	glColor 1, 1, 1, 1;	2883	glColor 0, 0, 0, 1;
2789	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});	2884	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2790	glDisable GL_TEXTURE_2D;	2885	glDisable GL_TEXTURE_2D;
2791	}	2886	}
2792	}	2887	}
2793		2888
…		…
2797	$self->{timer}->cancel	2892	$self->{timer}->cancel
2798	if $self->{timer};	2893	if $self->{timer};
2799		2894
2800	$self->SUPER::DESTROY;	2895	$self->SUPER::DESTROY;
2801	}	2896	}
		2897
		2898	#############################################################################
		2899
		2900	package CFClient::UI::Buttonbar;
		2901
		2902	our @ISA = CFClient::UI::HBox::;
		2903
		2904	# TODO: should actualyl wrap buttons and other goodies.
2802		2905
2803	#############################################################################	2906	#############################################################################
2804		2907
2805	package CFClient::UI::Menu;	2908	package CFClient::UI::Menu;
2806		2909
…		…
2818	);	2921	);
2819		2922
2820	$self->add ($self->{vbox} = new CFClient::UI::VBox);	2923	$self->add ($self->{vbox} = new CFClient::UI::VBox);
2821		2924
2822	for my $item (@{ $self->{items} }) {	2925	for my $item (@{ $self->{items} }) {
2823	my ($widget, $cb) = @$item;	2926	my ($widget, $cb, $tooltip) = @$item;
2824		2927
2825	# handle various types of items, only text for now	2928	# handle various types of items, only text for now
2826	if (!ref $widget) {	2929	if (!ref $widget) {
2827	$widget = new CFClient::UI::Label	2930	$widget = new CFClient::UI::Label
2828	can_hover => 1,	2931	can_hover => 1,
2829	can_events => 1,	2932	can_events => 1,
2830	text => $widget;	2933	text => $widget,
		2934	tooltip => $tooltip
2831	}	2935	}
2832		2936
2833	$self->{item}{$widget} = $item;	2937	$self->{item}{$widget} = $item;
2834		2938
2835	$self->{vbox}->add ($widget);	2939	$self->{vbox}->add ($widget);
…		…
2856	my ($self, $ev, $x, $y) = @_;	2960	my ($self, $ev, $x, $y) = @_;
2857		2961
2858	# TODO: should use vbox->find_widget or so	2962	# TODO: should use vbox->find_widget or so
2859	$HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});	2963	$HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2860	$self->{hover} = $self->{item}{$HOVER};	2964	$self->{hover} = $self->{item}{$HOVER};
		2965
		2966	0
2861	}	2967	}
2862		2968
2863	sub button_up {	2969	sub button_up {
2864	my ($self, $ev, $x, $y) = @_;	2970	my ($self, $ev, $x, $y) = @_;
2865		2971
…		…
2867	undef $GRAB;	2973	undef $GRAB;
2868	$self->hide;	2974	$self->hide;
2869		2975
2870	$self->_emit ("popdown");	2976	$self->_emit ("popdown");
2871	$self->{hover}[1]->() if $self->{hover};	2977	$self->{hover}[1]->() if $self->{hover};
		2978	} else {
		2979	return 0
		2980	}
		2981
2872	}	2982	1
2873	}	2983	}
2874		2984
2875	#############################################################################	2985	#############################################################################
2876		2986
2877	package CFClient::UI::Statusbox;	2987	package CFClient::UI::Multiplexer;
2878		2988
2879	our @ISA = CFClient::UI::VBox::;	2989	our @ISA = CFClient::UI::Container::;
2880		2990
2881	sub new {	2991	sub new {
2882	my $class = shift;	2992	my $class = shift;
2883		2993
2884	$class->SUPER::new (	2994	my $self = $class->SUPER::new (
		2995	@_,
		2996	);
		2997
		2998	$self->{current} = $self->{children}[0]
		2999	if @{ $self->{children} };
		3000
		3001	$self
		3002	}
		3003
		3004	sub add {
		3005	my ($self, @widgets) = @_;
		3006
		3007	$self->SUPER::add (@widgets);
		3008
		3009	$self->{current} = $self->{children}[0]
		3010	if @{ $self->{children} };
		3011	}
		3012
		3013	sub set_current_page {
		3014	my ($self, $page_or_widget) = @_;
		3015
		3016	my $widget = ref $page_or_widget
		3017	? $page_or_widget
		3018	: $self->{children}[$page_or_widget];
		3019
		3020	$self->{current} = $widget;
		3021	$self->{current}->configure (0, 0, $self->{w}, $self->{h});
		3022
		3023	$self->_emit (page_changed => $self->{current});
		3024
		3025	$self->realloc;
		3026	}
		3027
		3028	sub visible_children {
		3029	$_[0]{current}
		3030	}
		3031
		3032	sub size_request {
		3033	my ($self) = @_;
		3034
		3035	$self->{current}->size_request
		3036	}
		3037
		3038	sub size_allocate {
		3039	my ($self, $w, $h) = @_;
		3040
		3041	$self->{current}->configure (0, 0, $w, $h);
		3042	}
		3043
		3044	sub _draw {
		3045	my ($self) = @_;
		3046
		3047	$self->{current}->draw;
		3048	}
		3049
		3050	#############################################################################
		3051
		3052	package CFClient::UI::Notebook;
		3053
		3054	our @ISA = CFClient::UI::VBox::;
		3055
		3056	sub new {
		3057	my $class = shift;
		3058
		3059	my $self = $class->SUPER::new (
		3060	buttonbar => (new CFClient::UI::Buttonbar),
		3061	multiplexer => (new CFClient::UI::Multiplexer expand => 1),
		3062	# filter => # will be put between multiplexer and $self
		3063	@_,
		3064	);
		3065
		3066	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};
		3067	$self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
		3068
		3069	$self
		3070	}
		3071
		3072	sub add {
		3073	my ($self, $title, $widget, $tooltip) = @_;
		3074
		3075	Scalar::Util::weaken $self;
		3076
		3077	$self->{buttonbar}->add (new CFClient::UI::Button
		3078	markup => $title,
		3079	tooltip => $tooltip,
		3080	on_activate => sub { $self->set_current_page ($widget) },
		3081	);
		3082
		3083	$self->{multiplexer}->add ($widget);
		3084	}
		3085
		3086	sub set_current_page {
		3087	my ($self, $page) = @_;
		3088
		3089	$self->{multiplexer}->set_current_page ($page);
		3090	$self->_emit (page_changed => $self->{multiplexer}{current});
		3091	}
		3092
		3093	#############################################################################
		3094
		3095	package CFClient::UI::Combobox;
		3096
		3097	use utf8;
		3098
		3099	our @ISA = CFClient::UI::Button::;
		3100
		3101	sub new {
		3102	my $class = shift;
		3103
		3104	my $self = $class->SUPER::new (
		3105	options => [], # [title, value, tooltip], ...
		3106	value => undef,
		3107	@_,
		3108	);
		3109
		3110	$self->_set_value ($self->{value});
		3111
		3112	$self
		3113	}
		3114
		3115	sub button_down {
		3116	my ($self, $ev) = @_;
		3117
		3118	my @menu_items;
		3119
		3120	for (@{ $self->{options} }) {
		3121	my ($title, $value, $tooltip) = @$_;
		3122
		3123	push @menu_items, [$tooltip, sub { $self->set_value ($value) }];
		3124	}
		3125
		3126	CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
		3127	}
		3128
		3129	sub _set_value {
		3130	my ($self, $value) = @_;
		3131
		3132	my ($item) = grep $_->[1] eq $value, @{ $self->{options} }
		3133	or return;
		3134
		3135	$self->{value} = $item->[1];
		3136	$self->set_markup ("$item->[0] ⇓");
		3137	$self->set_tooltip ($item->[2]);
		3138	}
		3139
		3140	sub set_value {
		3141	my ($self, $value) = @_;
		3142
		3143	return unless $self->{value} ne $value;
		3144
		3145	$self->_set_value ($value);
		3146	$self->_emit (changed => $value);
		3147	}
		3148
		3149	#############################################################################
		3150
		3151	package CFClient::UI::Statusbox;
		3152
		3153	our @ISA = CFClient::UI::VBox::;
		3154
		3155	sub new {
		3156	my $class = shift;
		3157
		3158	my $self = $class->SUPER::new (
2885	fontsize => 0.8,	3159	fontsize => 0.8,
2886	@_,	3160	@_,
2887	)	3161	);
		3162
		3163	Scalar::Util::weaken (my $this = $self);
		3164
		3165	$self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
		3166
		3167	$self
2888	}	3168	}
2889		3169
2890	sub reorder {	3170	sub reorder {
2891	my ($self) = @_;	3171	my ($self) = @_;
2892	my $NOW = time;	3172	my $NOW = Time::HiRes::time;
		3173
		3174	# freeze display when hovering over any label
		3175	return if $CFClient::UI::TOOLTIP->{owner}
		3176	&& grep $CFClient::UI::TOOLTIP->{owner} == $_->{label},
		3177	values %{ $self->{item} };
2893		3178
2894	while (my ($k, $v) = each %{ $self->{item} }) {	3179	while (my ($k, $v) = each %{ $self->{item} }) {
2895	delete $self->{item}{$k} if $v->{timeout} < $NOW;	3180	delete $self->{item}{$k} if $v->{timeout} < $NOW;
2896	}	3181	}
2897		3182
…		…
2900	my @items = sort {	3185	my @items = sort {
2901	$a->{pri} <=> $b->{pri}	3186	$a->{pri} <=> $b->{pri}
2902	or $b->{id} <=> $a->{id}	3187	or $b->{id} <=> $a->{id}
2903	} values %{ $self->{item} };	3188	} values %{ $self->{item} };
2904		3189
		3190	$self->{timer}->interval (1);
		3191
2905	my $count = 10 + 1;	3192	my $count = 10 + 1;
2906	for my $item (@items) {	3193	for my $item (@items) {
2907	last unless --$count;	3194	last unless --$count;
2908		3195
2909	push @widgets, $item->{label} ||= do {	3196	my $label = $item->{label} ||= do {
2910	# TODO: doesn't handle markup well (read as: at all)	3197	# TODO: doesn't handle markup well (read as: at all)
2911	my $short = $item->{count} > 1	3198	my $short = $item->{count} > 1
2912	? "<b>$item->{count} ×</b> $item->{text}"	3199	? "<b>$item->{count} ×</b> $item->{text}"
2913	: $item->{text};	3200	: $item->{text};
2914		3201
…		…
2922	tooltip => $item->{tooltip},	3209	tooltip => $item->{tooltip},
2923	tooltip_font => $::FONT_PROP,	3210	tooltip_font => $::FONT_PROP,
2924	tooltip_width => 0.67,	3211	tooltip_width => 0.67,
2925	fontsize => $item->{fontsize} || $self->{fontsize},	3212	fontsize => $item->{fontsize} || $self->{fontsize},
2926	max_w => $::WIDTH * 0.44,	3213	max_w => $::WIDTH * 0.44,
2927	fg => $item->{fg},	3214	fg => [@{ $item->{fg} }],
2928	can_events => 1,	3215	can_events => 1,
2929	can_hover => 1	3216	can_hover => 1
2930	};	3217	};
		3218
		3219	if ((my $diff = $item->{timeout} - $NOW) < 2) {
		3220	$label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
		3221	$label->update;
		3222	$label->set_max_size (undef, $label->{req_h} * $diff)
		3223	if $diff < 1;
		3224	$self->{timer}->interval (1/30);
		3225	} else {
		3226	$label->{fg}[3] = $item->{fg}[3] || 1;
		3227	}
		3228
		3229	push @widgets, $label;
2931	}	3230	}
2932		3231
2933	$self->clear;	3232	$self->clear;
2934	$self->SUPER::add (reverse @widgets);	3233	$self->SUPER::add (reverse @widgets);
2935	}	3234	}
…		…
2940	$text =~ s/^\s+//;	3239	$text =~ s/^\s+//;
2941	$text =~ s/\s+$//;	3240	$text =~ s/\s+$//;
2942		3241
2943	return unless $text;	3242	return unless $text;
2944		3243
2945	my $timeout = time + ((delete $arg{timeout}) || 60);	3244	my $timeout = (int time) + ((delete $arg{timeout}) || 60);
2946		3245
2947	my $group = exists $arg{group} ? $arg{group} : ++$self->{id};	3246	my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2948		3247
2949	if (my $item = $self->{item}{$group}) {	3248	if (my $item = $self->{item}{$group}) {
2950	if ($item->{text} eq $text) {	3249	if ($item->{text} eq $text) {
…		…
2980		3279
2981	$self->reorder;	3280	$self->reorder;
2982	$self->SUPER::reconfigure;	3281	$self->SUPER::reconfigure;
2983	}	3282	}
2984		3283
		3284	sub DESTROY {
		3285	my ($self) = @_;
		3286
		3287	$self->{timer}->cancel;
		3288
		3289	$self->SUPER::DESTROY;
		3290	}
		3291
2985	#############################################################################	3292	#############################################################################
2986		3293
2987	package CFClient::UI::Inventory;	3294	package CFClient::UI::Inventory;
2988		3295
2989	our @ISA = CFClient::UI::ScrolledWindow::;	3296	our @ISA = CFClient::UI::ScrolledWindow::;
2990		3297
2991	sub new {	3298	sub new {
2992	my $class = shift;	3299	my $class = shift;
2993		3300
2994	my $self = $class->SUPER::new (	3301	my $self = $class->SUPER::new (
2995	scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),	3302	child => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2996	@_,	3303	@_,
2997	);	3304	);
2998		3305
2999	$self	3306	$self
3000	}	3307	}
3001		3308
3002	sub set_items {	3309	sub set_items {
3003	my ($self, $items) = @_;	3310	my ($self, $items) = @_;
3004		3311
3005	$self->{scrolled}->clear;	3312	$self->{child}->clear;
3006	return unless $items;	3313	return unless $items;
3007		3314
3008	my @items = sort {	3315	my @items = sort {
3009	($a->{type} <=> $b->{type})	3316	($a->{type} <=> $b->{type})
3010	or ($a->{name} cmp $b->{name})	3317	or ($a->{name} cmp $b->{name})
…		…
3014		3321
3015	my $row = 0;	3322	my $row = 0;
3016	for my $item (@items) {	3323	for my $item (@items) {
3017	CFClient::Item::update_widgets $item;	3324	CFClient::Item::update_widgets $item;
3018		3325
3019	$self->{scrolled}->add (0, $row, $item->{face_widget});	3326	$self->{child}->add (0, $row, $item->{face_widget});
3020	$self->{scrolled}->add (1, $row, $item->{desc_widget});	3327	$self->{child}->add (1, $row, $item->{desc_widget});
3021	$self->{scrolled}->add (2, $row, $item->{weight_widget});	3328	$self->{child}->add (2, $row, $item->{weight_widget});
3022		3329
3023	$row++;	3330	$row++;
3024	}	3331	}
3025	}	3332	}
3026		3333
…		…
3124	$rec = $::CONN->stop_record if $::CONN;	3431	$rec = $::CONN->stop_record if $::CONN;
3125	return unless ref $rec eq 'ARRAY';	3432	return unless ref $rec eq 'ARRAY';
3126	$self->set_command_list ($rec);	3433	$self->set_command_list ($rec);
3127	}	3434	}
3128		3435
3129	# if $commit is true, the binding will be set after the user entered a key combo	3436
		3437	sub ask_for_bind_and_commit {
		3438	my ($self) = @_;
		3439	$self->ask_for_bind (1);
		3440	}
		3441
3130	sub ask_for_bind {	3442	sub ask_for_bind {
3131	my ($self, $commit) = @_;	3443	my ($self, $commit) = @_;
3132		3444
3133	CFClient::Binder::open_binding_dialog (sub {	3445	CFClient::Binder::open_binding_dialog (sub {
3134	my ($mod, $sym) = @_;	3446	my ($mod, $sym) = @_;
…		…
3218		3530
3219	#############################################################################	3531	#############################################################################
3220		3532
3221	package CFClient::UI::SpellList;	3533	package CFClient::UI::SpellList;
3222		3534
3223	our @ISA = CFClient::UI::FancyFrame::;	3535	our @ISA = CFClient::UI::Table::;
3224		3536
3225	sub new {	3537	sub new {
3226	my $class = shift;	3538	my $class = shift;
3227		3539
3228	my $self = $class->SUPER::new (binding => [], commands => [], @_);	3540	my $self = $class->SUPER::new (
3229		3541	binding => [],
3230	$self->add (new CFClient::UI::ScrolledWindow	3542	commands => [],
3231	scrolled => $self->{spellbox} = new CFClient::UI::Table);	3543	@_,
3232		3544	)
3233	$self;
3234	}	3545	}
3235		3546
3236	# XXX: Do sorting? Argl...	3547	my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
		3548	"<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.");
		3549	my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
		3550	"<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.");
		3551	my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
		3552	"<b>Damage</b>. The amount of damage the spell deals when it hits.");
		3553
		3554	sub rebuild_spell_list {
		3555	my ($self) = @_;
		3556
		3557	$CFClient::UI::ROOT->on_refresh ($self => sub {
		3558	$self->clear;
		3559
		3560	$self->add (1, 0, new CFClient::UI::Label text => "Spell Name");
		3561	$self->add (2, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
		3562	$self->add (3, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
		3563	$self->add (4, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
		3564
		3565	my $row = 0;
		3566
		3567	for (sort { $a cmp $b } keys %{ $self->{spell} }) {
		3568	my $spell = $self->{spell}{$_};
		3569
		3570	$row++;
		3571
		3572	$self->add (0, $row, new CFClient::UI::Face
		3573	face => $spell->{face},
		3574	can_hover => 1,
		3575	can_events => 1,
		3576	tooltip => $spell->{message},
		3577	);
		3578
		3579	$self->add (1, $row, new CFClient::UI::Label
		3580	expand => 1,
		3581	text => $spell->{name},
		3582	can_hover => 1,
		3583	can_events => 1,
		3584	tooltip => $spell->{message},
		3585	);
		3586
		3587	$self->add (2, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
		3588	$self->add (3, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
		3589	$self->add (4, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
		3590
		3591	# TODO: should be done via popup
		3592	$self->add (5, $row, new CFClient::UI::Button
		3593	text => "bind",
		3594	tooltip => "bind spell readying (cast command) to key",
		3595	on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) },
		3596	);
		3597	}
		3598	});
		3599	}
		3600
3237	sub add_spell {	3601	sub add_spell {
3238	my ($self, $spell) = @_;	3602	my ($self, $spell) = @_;
		3603
3239	$self->{spells}->{$spell->{name}} = $spell;	3604	$self->{spell}->{$spell->{name}} = $spell;
3240		3605	$self->rebuild_spell_list;
3241	$self->{spellbox}->add (0, $self->{tbl_idx}, new CFClient::UI::Face
3242	face => $spell->{face},
3243	can_hover => 1,
3244	can_events => 1,
3245	tooltip => $spell->{message});
3246
3247	$self->{spellbox}->add (1, $self->{tbl_idx}, new CFClient::UI::Label
3248	text => $spell->{name},
3249	can_hover => 1,
3250	can_events => 1,
3251	tooltip => $spell->{message},
3252	expand => 1);
3253
3254	$self->{spellbox}->add (2, $self->{tbl_idx}, new CFClient::UI::Label
3255	text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
3256	$spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}),
3257	expand => 1);
3258
3259	$self->{spellbox}->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
3260	text => "bind to key",
3261	on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
3262	}
3263
3264	sub rebuild_spell_list {
3265	my ($self) = @_;
3266	$self->{tbl_idx} = 0;
3267	$self->add_spell ($_) for values %{$self->{spells}};
3268	}	3606	}
3269		3607
3270	sub remove_spell {	3608	sub remove_spell {
3271	my ($self, $spell) = @_;	3609	my ($self, $spell) = @_;
		3610
3272	delete $self->{spells}->{$spell->{name}};	3611	delete $self->{spell}->{$spell->{name}};
3273	$self->rebuild_spell_list;	3612	$self->rebuild_spell_list;
3274	}	3613	}
3275		3614
3276	#############################################################################	3615	#############################################################################
3277		3616
3278	package CFClient::UI::Root;	3617	package CFClient::UI::Root;
3279		3618
3280	our @ISA = CFClient::UI::Container::;	3619	our @ISA = CFClient::UI::Container::;
		3620
		3621	use List::Util qw(min max);
3281		3622
3282	use CFClient::OpenGL;	3623	use CFClient::OpenGL;
3283		3624
3284	sub new {	3625	sub new {
3285	my $class = shift;	3626	my $class = shift;
…		…
3420		3761
3421	delete $queue{$widget+0};	3762	delete $queue{$widget+0};
3422		3763
3423	my ($w, $h) = $widget->size_request;	3764	my ($w, $h) = $widget->size_request;
3424		3765
3425	$w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2;	3766	$w = max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3426	$h = List::Util::max $widget->{min_h}, $h + $widget->{padding_y} * 2;	3767	$h = max $widget->{min_h}, $h + $widget->{padding_y} * 2;
		3768
		3769	$w = min $widget->{max_w}, $w if exists $widget->{max_w};
		3770	$h = min $widget->{max_h}, $h if exists $widget->{max_h};
3427		3771
3428	$w = $widget->{force_w} if exists $widget->{force_w};	3772	$w = $widget->{force_w} if exists $widget->{force_w};
3429	$h = $widget->{force_h} if exists $widget->{force_h};	3773	$h = $widget->{force_h} if exists $widget->{force_h};
3430		3774
3431	if ($widget->{req_w} != $w || $widget->{req_h} != $h	3775	if ($widget->{req_w} != $w || $widget->{req_h} != $h

Diff Legend

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